|
|
@@ -1,20 +1,80 @@
|
|
|
<template>
|
|
|
<div class="app-container home">
|
|
|
- <div class="showImg">
|
|
|
+ <el-row :gutter="20" style="padding:10px;">
|
|
|
+ <el-col :span="6">
|
|
|
+ <div class="grid-content bg-fff">
|
|
|
+ <div class="gird-header assets-all">记录设备</div>
|
|
|
+ <div class="gird-num">9999</div>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <div class="grid-content bg-fff">
|
|
|
+ <div class="gird-header assets-borrow">借出设备</div>
|
|
|
+ <div class="gird-num">9999</div>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <div class="grid-content bg-fff">
|
|
|
+ <div class="gird-header assets-fault">故障设备</div>
|
|
|
+ <div class="gird-num">9999</div>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <div class="grid-content bg-fff">
|
|
|
+ <div class="gird-header assets-scrap">报废设备</div>
|
|
|
+ <div class="gird-num">9999</div>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="20" style="padding:10px;">
|
|
|
+ <el-col :span="12" style="height:500px;">
|
|
|
+ <div style="font-size: 20px;text-align: center; line-height: 70px; background-color: #fff;">常用设备数据分析图</div>
|
|
|
+ <div style="width: 100%;height: 430px;" >
|
|
|
+ <div ref="chartp" style="width: 100%;height: 100%;background-color: #fff;"></div>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12" style="height:500px;" class="col-data">
|
|
|
+
|
|
|
+ <el-row style="height:100%;background-color: #fff;padding: 0 10px;">
|
|
|
+ <div style="font-size: 20px;text-align: center; line-height: 70px;">最新借出记录</div>
|
|
|
+ <el-table
|
|
|
+ :data="tableData"
|
|
|
+ height="420"
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ prop="assetBarCode"
|
|
|
+ label="设备编码"
|
|
|
+ width="170">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="username"
|
|
|
+ label="借用人"
|
|
|
+ width="80">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="borrowDate"
|
|
|
+ label="借用时间">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="isreturn"
|
|
|
+ label="是否归还"
|
|
|
+ width="80">
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-row>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <!-- <div class="showImg">
|
|
|
<img
|
|
|
@mouseover="changeInterval(true)"
|
|
|
@mouseleave="changeInterval(false)"
|
|
|
v-for="item in imgArr"
|
|
|
:key="item.id"
|
|
|
- :src="require(item.url)"
|
|
|
+ :src="item.url"
|
|
|
v-show="item.id === currentIndex"
|
|
|
/>
|
|
|
- <!-- <div @click="clickIcon('up')" class="iconDiv icon-left">
|
|
|
- <i class="el-icon-caret-left"></i>
|
|
|
- </div>
|
|
|
- <div @click="clickIcon('down')" class="iconDiv icon-right">
|
|
|
- <i class="el-icon-caret-right"></i>
|
|
|
- </div> -->
|
|
|
+
|
|
|
<div class="banner-circle">
|
|
|
<ul>
|
|
|
<li
|
|
|
@@ -25,29 +85,58 @@
|
|
|
></li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div ref="chartp" style="width: 50%; height: 400px"></div>
|
|
|
+ </div> -->
|
|
|
+ <!-- <div @click="clickIcon('up')" class="iconDiv icon-left">
|
|
|
+ <i class="el-icon-caret-left"></i>
|
|
|
+ </div>
|
|
|
+ <div @click="clickIcon('down')" class="iconDiv icon-right">
|
|
|
+ <i class="el-icon-caret-right"></i>
|
|
|
+ </div> -->
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { countNumber } from "@/api/asset/borrow";
|
|
|
+import { countNumber,listBorrow } from "@/api/asset/borrow";
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
currentIndex: 0, //当前所在图片下标
|
|
|
timer: null, //定时轮询
|
|
|
imgArr: [
|
|
|
- { id: 0, url: "@/assets/images/1.jpg" }
|
|
|
+ { id: 0, url: require("../assets/images/st02.jpg") },
|
|
|
+ { id: 1, url: require("../assets/images/xzl02.jpg") }
|
|
|
],
|
|
|
countData: [
|
|
|
{countNum: '', typeName: ''}
|
|
|
],
|
|
|
+ tableData: [{
|
|
|
+ date: '2016-05-02',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1518 弄'
|
|
|
+ }, {
|
|
|
+ date: '2016-05-04',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1517 弄'
|
|
|
+ }, {
|
|
|
+ date: '2016-05-01',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1519 弄'
|
|
|
+ }, {
|
|
|
+ date: '2016-05-03',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1516 弄'
|
|
|
+ },{
|
|
|
+ date: '2016-02-03',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1516 弄'
|
|
|
+ }]
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.startInterval();
|
|
|
+ // this.startInterval();
|
|
|
this.getEchartPicture();
|
|
|
+ this.getNewBorrowList()
|
|
|
},
|
|
|
methods: {
|
|
|
//开启定时器
|
|
|
@@ -105,11 +194,11 @@ export default {
|
|
|
arr.push({name:item.typeName,value:item.countNum})
|
|
|
})
|
|
|
let option = {
|
|
|
- title: {
|
|
|
- text: "常用设备数据分析图",
|
|
|
- left: "center",
|
|
|
- padding: [0, 0, "5px", 0],
|
|
|
- },
|
|
|
+ // title: {
|
|
|
+ // text: "常用设备数据分析图",
|
|
|
+ // left: "center",
|
|
|
+ // margin: [0, 0, 0, 0],
|
|
|
+ // },
|
|
|
tooltip: {
|
|
|
trigger: "item",
|
|
|
},
|
|
|
@@ -152,6 +241,20 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ getNewBorrowList(){
|
|
|
+ listBorrow({
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:10
|
|
|
+ }).then(res=>{
|
|
|
+ console.log(res)
|
|
|
+ if(res.rows){
|
|
|
+ this.tableData = res.rows
|
|
|
+ }else{
|
|
|
+ this.tableData = []
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
@@ -161,6 +264,12 @@ export default {
|
|
|
padding: 0;
|
|
|
margin: 0;
|
|
|
}
|
|
|
+.home{
|
|
|
+ min-height: calc(100vh - 84px);
|
|
|
+ background-color: rgb(240,242,245);
|
|
|
+ overflow-y: scroll;
|
|
|
+ overflow-x: hidden;
|
|
|
+}
|
|
|
/* 清除li前面的圆点 */
|
|
|
li {
|
|
|
list-style-type: none;
|
|
|
@@ -168,14 +277,14 @@ li {
|
|
|
.showImg {
|
|
|
position: relative;
|
|
|
width: 80%;
|
|
|
- height: 250px;
|
|
|
+ // height: 250px;
|
|
|
margin: 30px auto;
|
|
|
- overflow: hidden;
|
|
|
+ overflow: auto;
|
|
|
}
|
|
|
/* 轮播图片 */
|
|
|
.showImg img {
|
|
|
- width: 100%;
|
|
|
- height: 100%;
|
|
|
+ // width: 100%;
|
|
|
+ height: 100%;
|
|
|
}
|
|
|
|
|
|
/* 箭头图标 */
|
|
|
@@ -227,5 +336,72 @@ li {
|
|
|
.active {
|
|
|
background-color: black !important;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ .el-row {
|
|
|
+ &:last-child {
|
|
|
+ margin-bottom: 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .bg-fff{
|
|
|
+ background-color: #fff;
|
|
|
+ }
|
|
|
+ .el-col {
|
|
|
+ border-radius: 4px;
|
|
|
+ }
|
|
|
+ .col-data{
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: space-between;
|
|
|
+ .data-borrow,.data-fault{
|
|
|
+ height: 240px;
|
|
|
+ width: 100%;
|
|
|
+ background-color: #fff;
|
|
|
+ -webkit-box-flex: 1;
|
|
|
+ /* flex: 1; */
|
|
|
+ overflow-y: scroll;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .grid-content {
|
|
|
+ min-height: 100px;
|
|
|
+ text-align: center;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ color: #fff;
|
|
|
+ }
|
|
|
+ .gird-header{
|
|
|
+ height: 100%;
|
|
|
+ display: inline-block;
|
|
|
+ /* height: 100%; */
|
|
|
+ min-height: 100px;
|
|
|
+ width: 35%;
|
|
|
+ font-size: 26px;
|
|
|
+ padding: 16px;
|
|
|
+ flex: 1;
|
|
|
+ }
|
|
|
+ .gird-num{
|
|
|
+ width: 65%;
|
|
|
+ color: #666;
|
|
|
+ font-size: 45px;
|
|
|
+ }
|
|
|
+ .assets-all{
|
|
|
+ background-color:#148ac6;
|
|
|
+ // background-color:rgb(52, 103, 107);
|
|
|
+ }
|
|
|
+ .assets-borrow{
|
|
|
+ background-color: #c95734;
|
|
|
+ // background-color: rgb(162, 49, 15);
|
|
|
+ }
|
|
|
+ .assets-fault{
|
|
|
+ background-color: rgb(196, 166, 78);
|
|
|
+ // background-color: rgb(196, 166, 78);
|
|
|
+ }
|
|
|
+ .assets-scrap{
|
|
|
+ background-color: rgb(133, 142, 81);
|
|
|
+ // background-color: rgb(133, 142, 81);
|
|
|
+ }
|
|
|
</style>
|
|
|
|
