dedsudiyu 2 years ago
parent
commit
795018afae

+ 1 - 1
src/router/index.js

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

+ 12 - 9
src/views/emergencyManagement/evacuation/emergencyEvacuation/indexOne.vue

@@ -23,7 +23,7 @@
         </div>
         <div class="for-button-right-box button-one" @click="pageTypeClick(2)" v-hasPermi="['laboratory:line:add']">新增疏散路线</div>
       </div>
-      <div class="map-big-box">
+      <div class="map-big-box" v-if="buttonId == '5'||buttonId == '6'||buttonId == '7'">
         <div :class="buttonId == '5'?'map-min-box-1':(buttonId == '6'?'map-min-box-2':(buttonId == '7'?'map-min-box-3':''))">
           <div class="map-min-for-box"
                v-for="(item,index) in fjList" :key="index">
@@ -37,6 +37,7 @@
           <img class="map-min-img" src="@/assets/ZDimages/icon_yjt.gif">
         </div>
       </div>
+      <p v-if="buttonId != '5'&& buttonId != '6'&& buttonId != '7'" style="text-align: center;color:#999;">缺少对应场景地图</p>
       <div class="table-box">
         <el-table v-loading="loading" border :data="routeList">
           <el-table-column label="路径类别" align="left" prop="lightDirection" width="200">
@@ -137,14 +138,16 @@
         treeselectByUser().then(response => {
           let list = [];
           for(let i=0;i<response.data.length;i++){
-            for(let o=0;o<response.data[i].children.length;o++){
-              let obj = {
-                label:response.data[i].label+'-'+response.data[i].children[o].label,
-                value:response.data[i].children[o].id,
-              }
-              list.push(obj);
-              if(i==0&&o==0){
-                this.$set(this,'buildingId',response.data[i].children[o].id);
+            if(response.data[i].children){
+              for(let o=0;o<response.data[i].children.length;o++){
+                let obj = {
+                  label:response.data[i].label+'-'+response.data[i].children[o].label,
+                  value:response.data[i].children[o].id,
+                }
+                list.push(obj);
+                if(i==0&&o==0){
+                  this.$set(this,'buildingId',response.data[i].children[o].id);
+                }
               }
             }
           }

+ 10 - 8
src/views/emergencyManagement/evacuation/emergencyEvacuation/performEvacuationOne.vue

@@ -117,14 +117,16 @@
         treeselectByUser().then(response => {
           let list = [];
           for(let i=0;i<response.data.length;i++){
-            for(let o=0;o<response.data[i].children.length;o++){
-              let obj = {
-                label:response.data[i].label+'-'+response.data[i].children[o].label,
-                value:response.data[i].children[o].id,
-              }
-              list.push(obj);
-              if(i==0&&o==0){
-                this.$set(this,'buildingId',response.data[i].children[o].id);
+            if(response.data[i].children){
+              for(let o=0;o<response.data[i].children.length;o++){
+                let obj = {
+                  label:response.data[i].label+'-'+response.data[i].children[o].label,
+                  value:response.data[i].children[o].id,
+                }
+                list.push(obj);
+                if(i==0&&o==0){
+                  this.$set(this,'buildingId',response.data[i].children[o].id);
+                }
               }
             }
           }