diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..6277acd
Binary files /dev/null and b/dist.zip differ
diff --git a/src/components/monitoring/light.vue b/src/components/monitoring/light.vue
index 6bb3484..a464ffc 100644
--- a/src/components/monitoring/light.vue
+++ b/src/components/monitoring/light.vue
@@ -494,7 +494,7 @@ export default {
       console.log("socket连接错误")
     },
     getMessage(msg) {
-      console.log('scoket 模拟',msg)
+      // console.log('scoket 模拟',msg)
       let retData = JSON.parse(msg.data);
       if (this.tableData.floorData && this.tableData.floorData.length > 0) {
         this.tableData.floorData.map((item1,index) => {
@@ -504,11 +504,23 @@ export default {
             if(retData.openStatus == 1){
               //开灯
               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}]);
             }else{
               //关灯
               console.log(item1.lightList[lightObjIndex].name,'关灯')
               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;
+              }
             }
           }
         })
diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue
index 285fdf3..cb569b4 100644
--- a/src/components/monitoring/warm.vue
+++ b/src/components/monitoring/warm.vue
@@ -658,9 +658,9 @@ export default {
         this.getHistoryWarm(); //历史用热统计
         this.getCurWarm(); //本月用热
         this.getMode(); //模式
-        // this.getWarmLists(); //获取热量表列表 20230317bim加载状态监听内执行
+        this.getWarmLists(); //获取热量表列表 20230317bim加载状态监听内执行
         // this.getWarmGK(); //获取热量表概况
-        // this.getHeatWarnList(); //告警列表 20230317bim加载状态监听内执行
+        this.getHeatWarnList(); //告警列表 20230317bim加载状态监听内执行
       }
     },
     clickAlarm(item) {
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index b722ead..a66e976 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -62,9 +62,9 @@
 					//租户ID
 					tenantId: "000000",
 					//用户名
-					username: "admin",
+					username: "",
 					//密码
-					password: "admin",
+					password: "",
 					//账号类型
 					type: "account",
 					//验证码的值
diff --git a/src/views/equipment/index.vue b/src/views/equipment/index.vue
index 8ae0608..4e46363 100644
--- a/src/views/equipment/index.vue
+++ b/src/views/equipment/index.vue
@@ -466,21 +466,21 @@
 						message: '请输入内容',
 						trigger: 'blur'
 					}],
-					tendingUser: [{
-						required: true,
-						message: '请输入内容',
-						trigger: 'blur'
-					}],
-					tendingPhone: [{
-						required: true,
-						message: '请输入内容',
-						trigger: 'blur'
-					}],
-					tendingTime: [{
-						required: true,
-						message: '请输入内容',
-						trigger: 'change'
-					}],
+					// tendingUser: [{
+					// 	required: true,
+					// 	message: '请输入内容',
+					// 	trigger: 'blur'
+					// }],
+					// tendingPhone: [{
+					// 	required: true,
+					// 	message: '请输入内容',
+					// 	trigger: 'blur'
+					// }],
+					// tendingTime: [{
+					// 	required: true,
+					// 	message: '请输入内容',
+					// 	trigger: 'change'
+					// }],
 				},
 				equipmentBox: false,
 				equipmentTit: "新增设备",