dedsudiyu 2 年之前
父节点
当前提交
9e0493fad5
共有 4 个文件被更改,包括 12 次插入5 次删除
  1. 3 0
      src/README.md
  2. 2 2
      src/router/index.js
  3. 3 1
      src/views/emergencyEvacuationBig.vue
  4. 4 2
      src/views/emergencyEvacuationBigOne.vue

+ 3 - 0
src/README.md

@@ -24,6 +24,9 @@ views
     laboratoryManagement
       subject
         indexOne.vue
+    message
+      noticeconfig
+        indexOne.vue
     system
       publicConfig
         indexOne.vue

+ 2 - 2
src/router/index.js

@@ -52,7 +52,7 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    component: (resolve) => require(['@/views/loginOne'], resolve),
+    component: (resolve) => require(['@/views/login'], resolve),
     hidden: true
   },
   {
@@ -72,7 +72,7 @@ export const constantRoutes = [
   },
   {
     path: '/emergencyEvacuationBig',
-    component: (resolve) => require(['@/views/emergencyEvacuationBig'], resolve),
+    component: (resolve) => require(['@/views/emergencyEvacuationBigOne'], resolve),
     hidden: true
   },
   {

+ 3 - 1
src/views/emergencyEvacuationBig.vue

@@ -217,7 +217,9 @@
       },
       getCameraByFloor(){
         getCameraByFloor({floorId:5}).then(response => {
-          this.startUrl(response.data);
+          if(response.data[0]){
+            this.startUrl(response.data);
+          }
         });
       },
       //文字转语音播放

+ 4 - 2
src/views/emergencyEvacuationBigOne.vue

@@ -208,7 +208,6 @@
     },
     mounted(){
       this.subscriptionMQTT();
-      this.getDeviceList();
     },
     methods:{
       //获取实验室的疏散数据
@@ -219,7 +218,9 @@
       },
       getCameraByFloor(){
         getCameraByFloor({floorId:this.buttonId}).then(response => {
-          this.startUrl(response.data);
+          if(response.data[0]){
+            this.startUrl(response.data);
+          }
         });
       },
       //文字转语音播放
@@ -357,6 +358,7 @@
             this.lineEvacuateTow(this.subId,0);
           }
           this.lablayout();
+          this.getDeviceList();
         });
       },
       //获取实验室数据