zc

src/README.md

@@ -6,14 +6,12 @@ views
     laboratoryManagement
       subject
         indexOne.vue
-        infoPageOne.vue
       building
         indexOne.vue
   emergencyManagement
     evacuation
       emergencyEvacuation
         indexOne.vue
-        addPageOne.vue
         performEvacuationOne.vue
   emergencyEvacuationBigOne.vue(本地静态路由需要同步修改)
         

src/layout/components/AppMain.vue

@@ -43,6 +43,9 @@ export default {
       textWork:"",
       workType:"",
       userType:"",
+      buttonId:"",
+      buildingId:"",
+      address:"",
     }
   },
   created() {
@@ -106,13 +109,12 @@ export default {
       });
       this.client.on("message", (topic, message) => {
         if (message){
+          console.log("topic",topic);
           let data = JSON.parse(message)
+          console.log("data",data);
           if(topic == this.mtopic){
             //报警
-            if(data.data == 'SUB_RISKPLAN_EXIT'){
-              console.log("报警信息",data);
-              this.getListStatus();
-            }
+            this.getListStatus();
           }
           if(topic == this.mtopicTwo){
             //工作通知
@@ -134,22 +136,18 @@ export default {
     async getListStatus(){
       let self = this;
       const { data } = await getListStatus();
-      console.log("data",data);
+      console.log("getListStatusgetListStatusgetListStatusgetListStatus",data);
       if(data.code==200){
-        let num = 0;
-        for(let i=0;i<data.data.length;i++){
-          if(data.data[i].floorId == 5){
-            num++;
-            self.text = data.data[i].buildName + data.data[i].floorName + data.data[i].roomName + data.data[i].subjectName + '发生应急预案';
-            self.textName = data.data[i].subjectName;
-            self.subjectId = data.data[i].subjectId;
-            self.textType = self.userType != '22';
-            self.closePlan =data.data[i].closePlan;
-            self.closeId = data.data[i].id;
-          }
-        }
-        if(num == 0){
-          self.textType = false;
+        if(data.data[0].floorId != 7){
+          self.text = data.data[0].buildName + data.data[0].floorName + data.data[0].roomName + data.data[0].subjectName + '发生应急预案';
+          self.textName = data.data[0].subjectName;
+          self.subjectId = data.data[0].subjectId;
+          self.textType = self.userType != '22';
+          self.closePlan =data.data[0].closePlan;
+          self.closeId = data.data[0].id;
+          self.buttonId = data.data[0].floorId;
+          self.buildingId = data.data[0].buildId;
+          self.address = data.data[0].deptName +'-'+data.data[0].buildName+''+data.data[0].floorName;
         }
       }
     },
@@ -186,6 +184,9 @@ export default {
               query: {
                 subId: self.subjectId,
                 text:self.textName,
+                buttonId:self.buttonId,
+                buildingId:self.buildingId,
+                address:self.address,
                 type:"1",
               }
             })
@@ -196,6 +197,9 @@ export default {
               query: {
                 subId: self.subjectId,
                 text:self.textName,
+                buttonId:self.buttonId,
+                buildingId:self.buildingId,
+                address:self.address,
                 type:"2",
               }
             })

src/layout/index.vue

@@ -69,7 +69,6 @@ export default {
     }
   },
   mounted(){
-    console.log('刷新啦');
     if(localStorage.getItem('setSmartAlarmType')){
       store.dispatch('settings/setSmartAlarmType', localStorage.getItem('setSmartAlarmType'))
     }

src/views/emergencyEvacuationBigOne.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="emergencyEvacuationBig scrollbar-box">
     <div class="top-max-title-box">
-      <p>{{title}}<span>{{minTitle}}</span></p>
+      <p>{{title}}<span>{{address}}</span></p>
       <!--<p class="inquire-button-one" @click="clickClosure">{{evacuationType?'执行疏散':'结束疏散'}}</p>-->
       <p></p>
       <p></p>
@@ -34,7 +34,7 @@
     <div class="map-max-box">
       <div class="map-left-box">
         <!--<div class="max-title-box">-->
-        <!--<p>{{minTitle}}</p>-->
+        <!--<p>{{address}}</p>-->
         <!--<p>疏散路径：</p>-->
         <!--<el-select v-model="value" placeholder="请选择" @change="lineEvacuate">-->
         <!--<el-option-->
@@ -51,7 +51,8 @@
                  v-for="(item,index) in fjList" :key="index">
               {{item.room}}
             </div>
-            <img class="map-min-img" src="@/assets/ZDimages/icon_sjt.gif" v-show="lightList[0].type">
+            <!--<img class="map-min-img" src="@/assets/ZDimages/icon_sjt.gif" v-show="lightList[0].type">-->
+            <img class="map-min-img" src="@/assets/ZDimages/icon_zjt.gif" v-show="lightList[0].type">
             <img class="map-min-img" src="@/assets/ZDimages/icon_yjt.gif" v-show="lightList[1].type">
             <img class="map-min-img" src="@/assets/ZDimages/icon_zjt.gif" v-show="lightList[2].type">
             <img class="map-min-img" src="@/assets/ZDimages/icon_yjt.gif" v-show="lightList[3].type">
@@ -131,7 +132,7 @@
         type:"",
         value:"0",
         title:"",
-        minTitle:"环境学院-祈福楼 环境与气象研究所",
+        address:"",
         //疏散方向数据
         routeList:[
           {
@@ -190,6 +191,7 @@
         videoPage:1,
         videoPageSize:4,
         videoPageList:[],
+        buildingId:null,
         buttonId:null
       }
     },
@@ -203,7 +205,6 @@
         //预案报警进入
         this.buttonType = false;
       }
-      this.lablayout();
     },
     mounted(){
       this.subscriptionMQTT();
@@ -217,7 +218,7 @@
         });
       },
       getCameraByFloor(){
-        getCameraByFloor({floorId:5}).then(response => {
+        getCameraByFloor({floorId:this.buttonId}).then(response => {
           this.startUrl(response.data);
         });
       },
@@ -271,7 +272,7 @@
       //获取喇叭列表
       getDeviceList(){
         let obj ={
-          floorId:5,
+          floorId:this.buttonId,
           page:1,
           pageSize:100,
         };
@@ -327,33 +328,45 @@
           if(data.data){
             this.subId = data.data.subId;
             this.title = data.data.subName;
+            this.buildingId = data.data.buildId;
+            this.buttonId = data.data.floorId;
+            this.address = data.data.deptName+'-'+data.data.buildName+'-'+data.data.floorName;
             this.evacuationType = false;
             this.evacuate();
           }else{
             if(localStorage.getItem('evacuationSubId')){
+              console.log("1=================>")
               this.subId = localStorage.getItem('evacuationSubId');
               this.title = localStorage.getItem('evacuationTitel');
               this.buttonId = localStorage.getItem('evacuationButtonId');
+              this.buildingId = localStorage.getItem('evacuationBuildingId');
+              this.address = localStorage.getItem('evacuationAddress');
               localStorage.removeItem('evacuationSubId')
               localStorage.removeItem('evacuationTitel')
               localStorage.removeItem('evacuationButtonId')
+              localStorage.removeItem('evacuationBuildingId')
+              localStorage.removeItem('evacuationAddress')
             }else{
               this.subId = this.$route.query.subId;
               this.title = this.$route.query.text;
               this.buttonId = this.$route.query.buttonId;
+              this.buildingId = this.$route.query.buildingId;
+              this.address = this.$route.query.address;
             }
             this.evacuationType = true;
             this.lineEvacuateTow(this.subId,0);
           }
+          this.lablayout();
         });
       },
       //获取实验室数据
       lablayout(){
         let self = this;
-        let id = 137;
+        let id = this.buildingId;
         lablayout(id).then(response => {
+          console.log("response.dataresponse.dataresponse.dataresponse.data",response.data)
           for(let i=0;i<response.data.length;i++){
-            if(response.data[i].id == 5){
+            if(response.data[i].id == this.buttonId){
               self.fjList = response.data[i].list;
             }
           }
@@ -465,6 +478,8 @@
           query: {
             subId: this.subId,
             text:this.title,
+            buttonId : this.buttonId,
+            buildingId : this.buildingId,
             type:"2",
           }
         })
@@ -477,6 +492,8 @@
           query: {
             subId: self.subId,
             text:self.title,
+            buttonId : self.buttonId,
+            buildingId : self.buildingId,
           }
         })
       },

src/views/emergencyManagement/evacuation/emergencyEvacuation/addPageOne.vue

@@ -53,7 +53,8 @@
             <p><i v-if="!item.checkType&&item.subjectId != -1" class="el-icon-circle-plus-outline" @click="addItem(item)"></i></p>
             <p>{{item.room}}</p>
           </div>
-          <img class="map-min-img" src="@/assets/ZDimages/icon_sjt.gif">
+          <!--<img class="map-min-img" src="@/assets/ZDimages/icon_sjt.gif">-->
+          <img class="map-min-img" src="@/assets/ZDimages/icon_zjt.gif">
           <img class="map-min-img" src="@/assets/ZDimages/icon_yjt.gif">
           <img class="map-min-img" src="@/assets/ZDimages/icon_zjt.gif">
           <img class="map-min-img" src="@/assets/ZDimages/icon_yjt.gif">

src/views/emergencyManagement/evacuation/emergencyEvacuation/indexOne.vue

@@ -3,7 +3,7 @@
   <div class="app-container emergencyEvacuation">
     <div class="emergencyEvacuation-page scrollbar-box" v-if="pageType == 1">
       <div class="top-title-box building-box">
-        <el-select v-model="buildingId" placeholder="请选择">
+        <el-select v-model="buildingId" @change="selectChange" placeholder="请选择">
           <el-option
             v-for="item in buildingList"
             :key="item.value"
@@ -116,7 +116,15 @@
     methods: {
       getBuilding(id){
         getBuilding(id).then(response => {
-          this.$set(this,'floorList',response.data);
+          // this.$set(this,'floorList',response.data);
+          // 过滤了三楼
+          let list = [];
+          for(let i=0;i<response.data.length;i++){
+            if(response.data[i].id != 7){
+              list.push(response.data[i]);
+            }
+          }
+          this.$set(this,'floorList',list);
           if(response.data[0]){
             this.$set(this,'buttonId',response.data[0].id);
             this.$set(this,'fjList',response.data[0].list);
@@ -206,6 +214,11 @@
           this.pageType = 2;
         }
       },
+      //选择疏散方向
+      selectChange(e){
+        this.$set(this,'buildingId',e);
+        this.getBuilding(this.buildingId);
+      },
     }
   };
 </script>

src/views/emergencyManagement/evacuation/emergencyEvacuation/performEvacuationOne.vue

@@ -3,7 +3,7 @@
   <div class="app-container performEvacuation">
     <div class="performEvacuation-page scrollbar-box" v-if="pageType == 1">
       <div class="top-title-box building-box">
-        <el-select v-model="buildingId" placeholder="请选择">
+        <el-select v-model="buildingId" @change="selectChange" placeholder="请选择">
           <el-option
             v-for="item in buildingList"
             :key="item.value"
@@ -17,16 +17,6 @@
         <div class="for-button-min-box" :class="buttonId == item.id ?'button-one':'button-two'"
              @click="buttonListClick(item.id,index)"
              v-for="(item,index) in floorList" :key="index">{{item.name}}</div>
-        <!--<div class="for-button-null-box">疏散路径:</div>-->
-        <!--<el-select v-model="form.lightDirection" clearable-->
-        <!--@change="selectChange" placeholder="请选择疏散路径">-->
-        <!--<el-option-->
-        <!--v-for="item in routeList"-->
-        <!--:key="item.id"-->
-        <!--:label="item.name"-->
-        <!--:value="item.id">-->
-        <!--</el-option>-->
-        <!--</el-select>-->
       </div>
       <div class="map-big-box">
         <div class="map-min-box" :class="buttonId == '5'?'map-min-box-1':(buttonId == '6'?'map-min-box-2':(buttonId == '7'?'map-min-box-3':''))">
@@ -107,7 +97,15 @@
     methods:{
       getBuilding(id){
         getBuilding(id).then(response => {
-          this.$set(this,'floorList',response.data);
+          // this.$set(this,'floorList',response.data);
+          // 过滤了三楼
+          let list = [];
+          for(let i=0;i<response.data.length;i++){
+            if(response.data[i].id != 7){
+              list.push(response.data[i]);
+            }
+          }
+          this.$set(this,'floorList',list);
           if(response.data[0]){
             this.$set(this,'buttonId',response.data[0].id);
             this.$set(this,'fjList',response.data[0].list);
@@ -138,10 +136,17 @@
       buttonListClick(id,index){
         this.$set(this,'buttonId',id);
         this.$set(this,'fjList',this.floorList[index].list);
+        this.$set(this,'subId',"");
+        this.$set(this,'title',"");
       },
       goPage(type){
-        if(this.pageType != type){
-          this.pageType = type;
+        if(type == 2){
+          this.pageType = 2;
+        }else if(type == 1){
+          this.treeselectByUser();
+          this.$set(this,'subId',"");
+          this.$set(this,'title',"");
+          this.pageType = 1;
         }
       },
       //获取当前疏散页面
@@ -174,6 +179,7 @@
       },
       //确认疏散
       goEvacuation(){
+        let self = this;
         if(!this.subId){
           this.msgError("请选择需要查看的实验室");
           return
@@ -181,12 +187,25 @@
         localStorage.setItem('evacuationSubId',this.subId)
         localStorage.setItem('evacuationTitel',this.title)
         localStorage.setItem('evacuationButtonId',this.buttonId)
+        localStorage.setItem('evacuationBuildingId',this.buildingId)
+        let address = "";
+        for(let i=0;i<self.buildingList.length;i++){
+          if(self.buildingList[i].value == self.buildingId){
+            address = self.buildingList[i].label
+          }
+        }
+        for(let i=0;i<self.floorList.length;i++){
+          if(self.floorList[i].id == self.buttonId){
+            address = address +'-'+self.floorList[i].name;
+          }
+        }
+        localStorage.setItem('evacuationAddress',address)
         this.pageType = 2;
       },
       //选择疏散方向
       selectChange(e){
-        console.log("e",e)
-        this.form.lightDirection = e;
+        this.$set(this,'buildingId',e);
+        this.getBuilding(this.buildingId);
       },
     }
   }