Skip to content

H
hg-smart
Commit 1d9778cd by 宋祥
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 411ddeb5 de014bef
Showing with 25 additions and 5 deletions
src/main/webapp/HG/BI/HGBI003.jsp
......@@ -123,6 +123,20 @@
font-size: 16px;
font-weight: bold;
}
.device-img{
position: relative;
display: flex;
justify-content: center;
align-items: center;
width: 84%;
height: 100%;
}
.device-img img{
display: block;
height: 100%;
width: 100%;
border-radius: 4px;
}
</style>
</head>
<body>
......@@ -200,7 +214,11 @@
<div style="color: #01A9FF;font-size: 1vw;">{{ item.deviceModel }}</div>
</div>
<div style="height: 15.5vh;width: 100%;display: flex;justify-content: center;align-items: center;">
<img src="${ctx}/common/img/avi.png" style="width: 3vw;height: 6vh;" alt/>
<div v-if="item.imgUrl" class="device-img">
<img :src="item.imgUrl" style="height: 100%;" alt="">
</div>
<img v-else src="${ctx}/common/img/avi.png" style="width: 3vw;height: 6vh;" alt/>
</div>
</div>
</div>
......@@ -239,7 +257,8 @@
<div style="color: #01A9FF;font-size: 1vw;">{{ item.deviceModel }}</div>
</div>
<div style="height: 15.5vh;width: 100%;display: flex;justify-content: center;align-items: center;">
<img src="${ctx}/common/img/avi.png" style="width: 3vw;height: 6vh;" alt/>
<img v-if="item.imgUrl" :src="item.imgUrl" style="height: 100%;" alt="">
<img v-else src="${ctx}/common/img/avi.png" style="width: 3vw;height: 6vh;" alt/>
</div>
</div>
</div>
......@@ -356,6 +375,7 @@
deviceName:'数控龙门加工中心',
status:'3',
deviceModel:'NSP42014C',
imgUrl:`${ctx}/common/img/device_01.jpg`
},
{
deviceName:'数控平面钻床1号',
......@@ -385,7 +405,7 @@
_this.queryBySbStatusList = res.extAttr.result;
}
let newArr = deviceList.slice(_this.queryBySbStatusList.length,5-_this.queryBySbStatusList.length);
let newArr = deviceList.slice(_this.queryBySbStatusList.length,deviceList.length);
_this.queryBySbStatusList.push(...newArr)
_this.querySbYes();
_this.querySbNo();
......@@ -548,7 +568,7 @@
})
}
let newArr = list.slice(_this.querySbYesList.length,5-_this.querySbYesList.length);
let newArr = list.slice(_this.querySbYesList.length,list.length);
_this.querySbYesList.push(...newArr)
console.log(_this.querySbYesList,999998888)
},
......@@ -700,7 +720,7 @@
})
}
let newArr = list.slice(_this.querySbNoList.length,5-_this.querySbNoList.length);
let newArr = list.slice(_this.querySbNoList.length,list.length);
_this.querySbNoList.push(...newArr)
console.log(_this.querySbNoList,77776666)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment