代码提交

This commit is contained in:
lixiaobang 2023-04-24 15:07:30 +08:00
commit 4ed697d5fa
5 changed files with 253 additions and 203 deletions

View File

@ -564,6 +564,7 @@ export default {
const temp = utf8decoder.decode(u8arr); // const temp = utf8decoder.decode(u8arr); //
const msg = JSON.parse(temp); //JSON const msg = JSON.parse(temp); //JSON
console.log("msg", msg); console.log("msg", msg);
console.log("msg", msg);
if (msg.params.设备运行状态 == 1) { if (msg.params.设备运行状态 == 1) {
msg.params.设备运行状态 = "正常"; msg.params.设备运行状态 = "正常";
} else { } else {
@ -786,12 +787,12 @@ export default {
name: { name: {
padding: [0, 10, 0, 8], padding: [0, 10, 0, 8],
color: "auto", color: "auto",
fontSize: "0.7rem", fontSize: "0.9rem",
}, },
percent: { percent: {
padding: [0, 0, 0, 8], padding: [0, 0, 0, 8],
color: "auto", color: "auto",
fontSize: "0.7rem", fontSize: "0.9rem",
}, },
}, },
}, },
@ -959,7 +960,7 @@ export default {
axisLabel: { axisLabel: {
// interval: 0, // interval: 0,
show: true, show: true,
fontSize: "0.7rem", fontSize: "0.9rem",
color: "#ffffff", color: "#ffffff",
fontFamily: "SourceHanSansCN-Normal, SourceHanSansCN", fontFamily: "SourceHanSansCN-Normal, SourceHanSansCN",
}, },
@ -971,7 +972,7 @@ export default {
axisTick: { show: false }, axisTick: { show: false },
axisLabel: { axisLabel: {
show: true, show: true,
fontSize: "0.7rem", fontSize: "0.9rem",
color: "#ffffff", color: "#ffffff",
fontFamily: "SourceHanSansCN-Normal, SourceHanSansCN", fontFamily: "SourceHanSansCN-Normal, SourceHanSansCN",
formatter: "{value}", formatter: "{value}",
@ -987,7 +988,7 @@ export default {
axisTick: { show: false }, axisTick: { show: false },
axisLabel: { axisLabel: {
show: true, show: true,
fontSize: "0.7rem", fontSize: "0.9rem",
color: "#ffffff", color: "#ffffff",
fontFamily: "SourceHanSansCN-Normal, SourceHanSansCN", fontFamily: "SourceHanSansCN-Normal, SourceHanSansCN",
formatter: "{value}", formatter: "{value}",

View File

@ -469,6 +469,33 @@ export default {
this.upmqttData(val); this.upmqttData(val);
}, },
}, },
watch: {
alarmAllLevel(val) {
// resize使
console.log("alarmAllLevel",val)
this.upmqttData(val)
},
alarmFirstLevel(val) {
// resize使
console.log("alarmFirstLevel",val)
if(val.length!=0){
this.upmqttData(val)
}
},
alarmSecondLevel(val) {
// resize使
console.log("alarmSecondLevel",val)
this.upmqttData(val)
},
alarmThirdLevel(val) {
// resize使
console.log("alarmThirdLevel",val)
this.upmqttData(val)
},
},
methods: { methods: {
// //
addZoom() { addZoom() {
@ -1596,7 +1623,6 @@ export default {
background: url(../assets/images/warnDottedLine.png) no-repeat; background: url(../assets/images/warnDottedLine.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
overflow: auto; overflow: auto;
.warnListContent { .warnListContent {
height: 27%; height: 27%;
width: 100%; width: 100%;

View File

@ -257,6 +257,8 @@ export default {
}, },
], ],
}, },
], ],
warnCameraList: [ warnCameraList: [
{ {
@ -372,6 +374,27 @@ export default {
this.upmqttData(val); this.upmqttData(val);
}, },
}, },
watch: {
alarmFirstLevel(val) {
// resize使
console.log("alarmFirstLevel",val)
if(val.length!=0){
this.upmqttData(val)
}
},
alarmSecondLevel(val) {
// resize使
console.log("alarmSecondLevel",val)
this.upmqttData(val)
},
alarmThirdLevel(val) {
// resize使
console.log("alarmThirdLevel",val)
this.upmqttData(val)
},
},
methods: { methods: {
// //
getAlarmCount() { getAlarmCount() {