修改4F页面

yangwl
夜笙歌 2 weeks ago
parent a85bdad3da
commit 563ade512c

@ -8,3 +8,12 @@ export function getHourProductionList(query) {
params: query params: query
}); });
} }
// 查询产量
export function getAgvData(query) {
return request({
url: 'http://192.168.202.25:9001/api/scada/agvdata',
method: 'get',
params: query
});
}

@ -66,12 +66,12 @@
<div class="box" style="top: 64.3%;left: 85.3%;"></div> <div class="box" style="top: 64.3%;left: 85.3%;"></div>
<div class="box" style="top: 70.6%;left: 85.3%;"></div> <div class="box" style="top: 70.6%;left: 85.3%;"></div>
<div v-for="(i,k) in hfData" :class="hfLocation[k].isProd? 'hf1':'hf'" <div v-for="(i,k) in hfData" :class="(hfLocation[k].isProd || parseFloat(i.quantity))? 'hf1':'hf'"
:style="`top: ${hfLocation[k].top}%;`"> :style="`top: ${hfLocation[k].top}%;`">
<span> <span>
烘房{{ k + 1 }} 产量{{ i.quantity }} 烘房{{ k + 1 }} 产量{{ i.quantity }}
</span> </span>
<div v-if="hfLocation[k].isProd" class="inProd"> <div v-if="hfLocation[k].isProd || parseFloat(i.quantity)" class="inProd">
<svg t="1723106843182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" <svg t="1723106843182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
p-id="1501"> p-id="1501">
<path <path
@ -83,7 +83,7 @@
</div> </div>
<div class="infoModel" :style="`display:${loopIndex === k?'inline-block':''}`"> <div class="infoModel" :style="`display:${loopIndex === k?'inline-block':''}`">
<div class="title">{{ i.equName }}</div> <div class="title">{{ i.equName }}</div>
<div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div> <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
<div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div> <div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
</div> </div>
</div> </div>
@ -93,7 +93,7 @@
<div :class="equipmentLocation[k].isRight?`equipmentName1`:`equipmentName`" <div :class="equipmentLocation[k].isRight?`equipmentName1`:`equipmentName`"
:style="`display:${loopIndex === 18+k?'inline-block':''}`"> :style="`display:${loopIndex === 18+k?'inline-block':''}`">
<div class="title">{{ i.equName }}</div> <div class="title">{{ i.equName }}</div>
<div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div> <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
<div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div> <div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
</div> </div>
</div> </div>
@ -108,7 +108,7 @@
<script> <script>
import * as TWEEN from '@tweenjs/tween.js' import * as TWEEN from '@tweenjs/tween.js'
import {getHourProductionList} from "../../api/board/cs2"; import {getAgvData, getHourProductionList} from "../../api/board/cs2";
export default { export default {
data() { data() {
@ -308,6 +308,9 @@ export default {
return ` left: ${xLocation}%;top: ${yLocation}%;` return ` left: ${xLocation}%;top: ${yLocation}%;`
}, },
getData() { getData() {
getAgvData().then(e=>{
console.log(e)
})
getHourProductionList().then(e => { getHourProductionList().then(e => {
let hfArr = [] let hfArr = []
let equipmentArr = [] let equipmentArr = []
@ -319,7 +322,6 @@ export default {
} }
this.hfData = hfArr this.hfData = hfArr
this.equipmentData = equipmentArr this.equipmentData = equipmentArr
console.log(equipmentArr)
}) })
} }
}, },
@ -734,6 +736,7 @@ export default {
} }
} }
} }
.ring, .ring1 { .ring, .ring1 {
position: absolute; position: absolute;
width: 10px; width: 10px;
@ -754,11 +757,12 @@ export default {
} }
} }
.ring{ .ring {
border: 1px solid #90EE90; /* 设置边框为黑色宽度为5px */ border: 1px solid #90EE90; /* 设置边框为黑色宽度为5px */
box-shadow: 0 0 3px 3px #90EE9099; box-shadow: 0 0 3px 3px #90EE9099;
} }
.ring1{
.ring1 {
border: 1px solid #ff603b; /* 设置边框为黑色宽度为5px */ border: 1px solid #ff603b; /* 设置边框为黑色宽度为5px */
box-shadow: 0 0 3px 3px #ff603b99; box-shadow: 0 0 3px 3px #ff603b99;
} }

Loading…
Cancel
Save