空管bim暖表设备标签未加载修复,去掉默认登录账号、设备维保信息编辑去掉非空校验,空开全开全关状态遗漏已修复

dev
zhangqun 3 years ago
parent 4e29b129ad
commit 34627f2100
  1. BIN
      dist.zip
  2. 14
      src/components/monitoring/light.vue
  3. 4
      src/components/monitoring/warm.vue
  4. 4
      src/page/login/userlogin.vue
  5. 30
      src/views/equipment/index.vue

Binary file not shown.

@ -494,7 +494,7 @@ export default {
console.log("socket连接错误") console.log("socket连接错误")
}, },
getMessage(msg) { getMessage(msg) {
console.log('scoket 模拟',msg) // console.log('scoket ',msg)
let retData = JSON.parse(msg.data); let retData = JSON.parse(msg.data);
if (this.tableData.floorData && this.tableData.floorData.length > 0) { if (this.tableData.floorData && this.tableData.floorData.length > 0) {
this.tableData.floorData.map((item1,index) => { this.tableData.floorData.map((item1,index) => {
@ -504,11 +504,23 @@ export default {
if(retData.openStatus == 1){ if(retData.openStatus == 1){
// //
console.log(item1.lightList[lightObjIndex].name,'开灯') console.log(item1.lightList[lightObjIndex].name,'开灯')
//
let checkOpenStatus = item1.lightList.filter(item2 => item2.openStatus == 1);
console.log('全开',checkOpenStatus)
if(checkOpenStatus != undefined && checkOpenStatus.length == item1.lightList.length){
item1.floorStatus = 1;
}
this.getLight([{arr: item1.lightList[lightObjIndex].ctrlList.split(','),build: item1.lightList[lightObjIndex].build}]); this.getLight([{arr: item1.lightList[lightObjIndex].ctrlList.split(','),build: item1.lightList[lightObjIndex].build}]);
}else{ }else{
// //
console.log(item1.lightList[lightObjIndex].name,'关灯') console.log(item1.lightList[lightObjIndex].name,'关灯')
this.cleanLight([{arr: item1.lightList[lightObjIndex].ctrlList.split(','),build: item1.lightList[lightObjIndex].build}]); this.cleanLight([{arr: item1.lightList[lightObjIndex].ctrlList.split(','),build: item1.lightList[lightObjIndex].build}]);
//
let checkOpenStatus = item1.lightList.filter(item2 => item2.openStatus == 2);
console.log('全关',checkOpenStatus)
if(checkOpenStatus != undefined && checkOpenStatus.length == item1.lightList.length){
item1.floorStatus = 2;
}
} }
} }
}) })

@ -658,9 +658,9 @@ export default {
this.getHistoryWarm(); // this.getHistoryWarm(); //
this.getCurWarm(); // this.getCurWarm(); //
this.getMode(); // this.getMode(); //
// this.getWarmLists(); // 20230317bim this.getWarmLists(); // 20230317bim
// this.getWarmGK(); // // this.getWarmGK(); //
// this.getHeatWarnList(); // 20230317bim this.getHeatWarnList(); // 20230317bim
} }
}, },
clickAlarm(item) { clickAlarm(item) {

@ -62,9 +62,9 @@
//ID //ID
tenantId: "000000", tenantId: "000000",
// //
username: "admin", username: "",
// //
password: "admin", password: "",
// //
type: "account", type: "account",
// //

@ -466,21 +466,21 @@
message: '请输入内容', message: '请输入内容',
trigger: 'blur' trigger: 'blur'
}], }],
tendingUser: [{ // tendingUser: [{
required: true, // required: true,
message: '请输入内容', // message: '',
trigger: 'blur' // trigger: 'blur'
}], // }],
tendingPhone: [{ // tendingPhone: [{
required: true, // required: true,
message: '请输入内容', // message: '',
trigger: 'blur' // trigger: 'blur'
}], // }],
tendingTime: [{ // tendingTime: [{
required: true, // required: true,
message: '请输入内容', // message: '',
trigger: 'change' // trigger: 'change'
}], // }],
}, },
equipmentBox: false, equipmentBox: false,
equipmentTit: "新增设备", equipmentTit: "新增设备",

Loading…
Cancel
Save