zc

src/views/emergencyManagement/plan/newAssociatedPage.vue

@@ -137,11 +137,11 @@
               <p class="reset-button-one" @click="resetForm">重置</p>
             </el-form-item>
           </el-form>
-          <div style="display: flex;background: rgb(202,229,253);height:40px;line-height:40px;font-size:16px;padding:0 82px;margin-bottom:20px;">
-            <p style="margin-right:24px;">已选择 <span style="color:#0183FA;">{{allNum}}</span> 项</p>
-            <p style="color:#0183FA;cursor: pointer;" @click="allButton(1)">全选本页</p>
-            <p style="color:#0183FA;margin:0 32px 0 30px;cursor: pointer;"  @click="allButton(2)">选择全部</p>
-          </div>
+          <!--<div style="display: flex;background: rgb(202,229,253);height:40px;line-height:40px;font-size:16px;padding:0 82px;margin-bottom:20px;">-->
+            <!--<p style="margin-right:24px;">已选择 <span style="color:#0183FA;">{{allNum}}</span> 项</p>-->
+            <!--<p style="color:#0183FA;cursor: pointer;" @click="allButton(1)">全选本页</p>-->
+            <!--<p style="color:#0183FA;margin:0 32px 0 30px;cursor: pointer;"  @click="allButton(2)">选择全部</p>-->
+          <!--</div>-->
           <el-table ref="table" v-loading="loading" border :data="dialogTableData" @selection-change="handleSelectionChange" :row-key="getRowKeys">
             <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
             <el-table-column label="实验室" width="220" align="center" prop="id" />

src/views/newEvacuationBigData.vue

@@ -309,11 +309,7 @@
             <p>是否确认执行一键灭火</p>
             <p>该操作存在风险，请您务必确认实验室内人员已安全撤离</p>
           </div>
-          <div class="text-box" v-if="shadeType == 2">
-            <p>{{shadeText}}</p>
-            <p></p>
-          </div>
-          <div class="text-box" v-if="shadeType == 3">
+          <div class="text-box" v-if="shadeType == 2 || shadeType == 3 || shadeType == 4">
             <p>{{shadeText}}</p>
             <p></p>
           </div>
@@ -630,7 +626,20 @@
           }else if(this.shadeType == 3){
             //设备开关弹窗
             this.switchChange(this.shadeData)
+          }else if(this.shadeType == 4){
+            //结束疏散
+            let obj = {
+              buildId:this.buildingId,
+              floorId:this.floorId,
+            }
+            endEvacuation(obj).then(response => {
+              this.$set(this,'shadeType',0);
+              this.getBuildingData();
+            })
           }
+        }else if(type == 6){
+          this.$set(this,'shadeText','是否结束疏散?');
+          this.$set(this,'shadeType',4);
         }
       },
       //实验室视频展开收起开关
@@ -683,13 +692,7 @@
         let self = this;
         if(this.evacuationType){
           //结束疏散
-          let obj = {
-            buildId:this.buildingId,
-            floorId:this.floorId,
-          }
-          endEvacuation(obj).then(response => {
-            this.getBuildingData();
-          })
+          this.shadeButton(6);
         }else{
           //开始疏散
           //默认勾选所有疏散口
@@ -1607,6 +1610,7 @@
         this.floorClient.subscribe(self.evacuationTopic+self.floorId, (err) => {
           if (!err) {
             console.log("疏散-订阅成功:" + self.evacuationTopic+self.floorId);
+            self.getRedisEvacuation();
           }
         });
         this.floorClient.subscribe(self.userTopic+self.floorId, (err) => {
@@ -1630,11 +1634,13 @@
                 if(data.data == 'FLOOR_EXITLINE'){
                   //疏散消息
                   self.getRedisEvacuation();
+                }else if(data.data == 'FLOOR_OVER_EXITLINE'){
+                  self.getBuildingData();
                 }
               }else if(topic == (self.userTopic+self.floorId)){
                 console.log('实验室人数-状态');
                 //实验室人数
-                self.getRedisEvacuation(data.data);
+                self.subOnlineUser(data.data);
               }
             }
           }