指挥调度修改

ruoyi-ui/src/assets/styles/picture-common.scss

@@ -239,7 +239,9 @@ body {
     cursor: pointer;
   }
 .p-emergency-plan-item.active{border: 1px solid #42e983;
-.p-emergency-plan-text{color: #42e983!important;}}
+.p-emergency-plan-text{color: #42e983!important;
+  overflow: hidden;
+  text-overflow: ellipsis;}}
   .p-emergency-plan-item:not(:last-child) {
     margin-bottom: $p-spacer-mini
   }

ruoyi-ui/src/views/components/p-tabs/BaseTabs.vue

@@ -52,7 +52,8 @@ export default {
       this.getTabs().forEach(function(pane,index){
         _this.navList.push({
           label:pane.label,
-          name:pane.name || index
+          name:pane.name || index,
+          code:pane.code
         });
         // 如果没有给pane设置那么，默认设置它的索引
         if(!pane.name) pane.name = index;
@@ -78,6 +79,7 @@ export default {
       var name = nav.name;
       // 改变当前选中的tab，并触发下面的watch
       this.currentValue = name;
+      console.log(this.navList)
       this.$emit('handleChange',name)
     }
   },

ruoyi-ui/src/views/picture/alarm-desk/index.vue

@@ -9,13 +9,13 @@
     <div class="p-pages-map">
       <div class="p-mapSelect row">
         <div class="col-6">
-          <div class="p-mapSelect-box row shuzi" :class="mapActive=='0'?'active':''" @click="delSatellitMap()">
+          <div class="p-mapSelect-box row shuzi" :class="mapActive=='0'?'active':''" @click="delSatellitMap('0')">
             <span class="p-mapSelect-icon"></span>
             <span class="p-mapSelect-text">数字地图</span>
           </div>
         </div>
         <div class="col-6">
-          <div class="p-mapSelect-box row weixin" :class="mapActive=='1'?'active':''" @click="addSatellitMap()">
+          <div class="p-mapSelect-box row weixin" :class="mapActive=='1'?'active':''" @click="addSatellitMap('1')">
             <span class="p-mapSelect-icon"></span>
             <span class="p-mapSelect-text">卫星地图</span>
           </div>
@@ -407,14 +407,14 @@ export default {
       })
     },
     //添加卫星地图
-    addSatellitMap() {
-      this.mapActive = '1'
+    addSatellitMap(value) {
+      this.mapActive = value
       this.satelliteLayer = new AMap.TileLayer.Satellite();
       this.map.add([this.satelliteLayer]);
     },
     //删除卫星地图
-    delSatellitMap() {
-      this.mapActive = '0'
+    delSatellitMap(value) {
+      this.mapActive = value
       this.map.remove(this.satelliteLayer);
     },
     //获取警源

ruoyi-ui/src/views/picture/command-dispatch/index.vue

@@ -8,13 +8,13 @@
     <div class="p-pages-map">
       <div class="p-mapSelect row">
         <div class="col-6">
-          <div class="p-mapSelect-box row shuzi" :class="mapActive=='0'?'active':''" @click="delSatellitMap()">
+          <div class="p-mapSelect-box row shuzi" :class="mapActive=='0'?'active':''" @click="delSatellitMap('0')">
             <span class="p-mapSelect-icon"></span>
             <span class="p-mapSelect-text">数字地图</span>
           </div>
         </div>
         <div class="col-6">
-          <div class="p-mapSelect-box row weixin" :class="mapActive=='1'?'active':''" @click="addSatellitMap()">
+          <div class="p-mapSelect-box row weixin" :class="mapActive=='1'?'active':''" @click="addSatellitMap('1')">
             <span class="p-mapSelect-icon"></span>
             <span class="p-mapSelect-text">卫星地图</span>
           </div>
@@ -198,7 +198,7 @@
               </div>
               <base-tabs v-model="tabType" class="m-t-large" @handleChange="getFatherValue">
                 <base-pane label="应急预案" name="1">
-                  <base-tabs v-model="yuanType" class="m-t-small m-son-pane" @handleChange="getValuep(tabType,$event)">
+                  <base-tabs v-model="yuanType" class="m-t-small m-son-pane" @handleChange="getValue(tabType,$event)">
                     <base-pane v-for="item in groupData" :label="item.classificationName"
                                :name="item.classificationCode"
                     >
@@ -222,7 +222,7 @@
                 <base-pane label="应急资源" name="2">
                   <base-tabs v-model="type" class="m-t-small m-son-pane" @handleChange="getValuep(tabType,$event)">
                     <base-pane v-for="item in groupDatas" :label="item.name"
-                               :name="item.typeCode"
+                               :name="item.dataType"
                     >
                       <div class="p-module-small">
                         <base-overflow height="20vh">
@@ -1137,12 +1137,14 @@ export default {
       })
     },
     //添加卫星地图
-    addSatellitMap() {
+    addSatellitMap(value) {
+      this.mapActive = value
       this.satelliteLayer = new AMap.TileLayer.Satellite();
       this.map.add([this.satelliteLayer]);
     },
     //删除卫星地图
-    delSatellitMap() {
+    delSatellitMap(value) {
+      this.mapActive = value
       this.map.remove(this.satelliteLayer);
     },
     //收起
@@ -1347,7 +1349,10 @@ export default {
       this.getPlanEmergency(tabType, type)
     },
     getValuep(tabType, type) {
-      this.ResourcesOneId=type
+      let newdata=this.groupDatas.find((item, index, arr) => {
+        return item.dataType > type
+      })
+      this.ResourcesOneId=newdata.typeCode
       this.getPlanEmergency(tabType, type)
     },
     //物资清单详情

ruoyi-ui/src/views/picture/resource-monitoring/index.vue

@@ -8,13 +8,13 @@
     <div class="p-pages-map">
       <div class="p-mapSelect row">
         <div class="col-6">
-          <div class="p-mapSelect-box row shuzi" :class="mapActive=='0'?'active':''" @click="delSatellitMap()">
+          <div class="p-mapSelect-box row shuzi" :class="mapActive=='0'?'active':''" @click="delSatellitMap('0')">
             <span class="p-mapSelect-icon"></span>
             <span class="p-mapSelect-text">数字地图</span>
           </div>
         </div>
         <div class="col-6">
-          <div class="p-mapSelect-box row weixin" :class="mapActive=='1'?'active':''" @click="addSatellitMap()">
+          <div class="p-mapSelect-box row weixin" :class="mapActive=='1'?'active':''" @click="addSatellitMap('1')">
             <span class="p-mapSelect-icon"></span>
             <span class="p-mapSelect-text">卫星地图</span>
           </div>
@@ -540,15 +540,16 @@ export default {
       })
     },
     //添加卫星地图
-    addSatellitMap() {
+    addSatellitMap(value) {
+      this.mapActive = value
       this.satelliteLayer = new AMap.TileLayer.Satellite();
       this.map.add([this.satelliteLayer]);
     },
     //删除卫星地图
-    delSatellitMap() {
+    delSatellitMap(value) {
+      this.mapActive = value
       this.map.remove(this.satelliteLayer);
     },
-
     //获取旅游资源统计数据
     getResourceType() {
       getBasicResourceCount().then(response => {