Merge branch 'v4' of ssh://git.mmcuav.cn:8222/root/mmc-stl-vue2 into v4

iframe/src/App.vue

@@ -14,6 +14,7 @@
     @uavChange="dispatchEvent('uavChange', $event)"
     @taskAdd="dispatchEvent('taskAdd', $event)"
     @taskBatchAdd="dispatchEvent('taskBatchAdd', $event)"
+    @getLabelList="dispatchEvent('getLabelList',$event)"
     @airwayAdd="dispatchEvent('airwayAdd', $event)"
     @hangarChange="dispatchEvent('hangarChange', $event)"
     @hangarTaskTabChange="dispatchEvent('hangarTaskTabChange', $event)"

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/airwayList/components/airwayEdit/index.vue

@@ -55,7 +55,15 @@
           <el-input clearable v-model="curForm.altitude"></el-input>
         </el-form-item>
         <el-form-item label="航线标签" prop="label">
-          <el-input clearable v-model="curForm.label"></el-input>
+          <el-select multiple v-model="flightLabel">
+              <el-option
+                v-for="item in labelList"
+                :key="item.id"
+                :label="item.flightLabelName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
         </el-form-item>
         <el-form-item label="航点动作">
           <el-button type="text" @click="showActions = true">{{curForm.actions.length}}个动作</el-button>
@@ -116,6 +124,7 @@ export default {
   data() {
     return {
       name: "", //航线名
+      flightLabel:"",//航线标签
       form: [], //表单集合
       pageIndex: 0, //当前页码
       locationIcon: null, //定位图标
@@ -126,6 +135,7 @@ export default {
       isPickAddress: false, //是否通过目标位置对地理信息
       showActions: false, // 打开航点动作
       saveLoading: false,
+      labelList:[],//航线标签列表
     };
   },
   computed: {
@@ -184,6 +194,7 @@ export default {
       Cesium.ScreenSpaceEventType.LEFT_CLICK
     );
     this.pickerPointInit();
+    this.getLabel()
   },
   beforeDestroy() {
     this.handler.removeInputAction(
@@ -201,6 +212,13 @@ export default {
     this.dataSource.show = false;
   },
   methods: {
+    async getLabel() {
+      this.rootNode.$emit("getLabelList", {
+        callback: (data) => {
+          this.labelList = data
+        }
+      })
+    },
     // 保存航线
     async onSave() {
       if (!this.name) {
@@ -291,6 +309,7 @@ export default {
           distance: this.distance,
           dutyOrganizationId: "",
           name: this.name,
+          flightLabel:this.flightLabel.join(","),
           speed: this.form[0].speed,
         },
         callback: (data) => {
@@ -633,5 +652,8 @@ export default {
       text-align: right;
     }
   }
+  ::v-deep .el-select{
+    width: 100%;
+  }
 }
 </style>
\ No newline at end of file

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/index.vue

@@ -7,7 +7,7 @@
         :class="showHealth ? 'active' : ''"
         @click="onSwitchShow('showHealth')"
       >
-        <img src="./assets/images/health.svg" />
+        <img :class="{active:showHealth}" src="./assets/images/health.svg" />
         <span class="">健康管理</span>
       </div>
       <!-- 机库信息 -->
@@ -17,7 +17,7 @@
         :class="showMount ? 'active' : ''"
         @click="onSwitchShow('showMount')"
       >
-        <img src="./assets/images/mount.svg" />
+        <img :class="{active:showMount}" src="./assets/images/mount.svg" />
         <span class="">挂载</span>
       </div>
       <div
@@ -25,7 +25,7 @@
         :class="showControlList ? 'active' : ''"
         @click="onSwitchShow('showControlList')"
       >
-        <img src="./assets/images/uav.svg" />
+        <img :class="{active:showControlList}" src="./assets/images/uav.svg" />
         <span class="">无人机</span>
       </div>
       <div
@@ -34,7 +34,7 @@
         :class="showAlarmLamp ? 'active' : ''"
         @click="onSwitchShow('showAlarmLamp')"
       >
-        <img src="./assets/images/lamp.svg" />
+        <img :class="{active:showAlarmLamp}" src="./assets/images/lamp.svg" />
         <span class="">警灯</span>
       </div>
       <div
@@ -42,7 +42,7 @@
         :class="showViewLib ? 'active' : ''"
         @click="onSwitchShow('showViewLib')"
       >
-        <img src="./assets/images/files.svg" />
+        <img :class="{active:showViewLib}" src="./assets/images/files.svg" />
         <span class="">视图库</span>
       </div>
       <ViewLib v-if="showViewLib"></ViewLib>
@@ -55,7 +55,7 @@
       :isHangar="isHangar"
     ></ControlList>
     <Health v-if="showHealth" @exit="showHealth = false"></Health>
-    <Mount :show="showMount"></Mount>
+    <Mount v-if="showMount" :show="showMount"></Mount>
     <!-- 喊话器 -->
     <MMCGimbalP1
       class="PagerP1"
@@ -194,6 +194,11 @@ export default {
 
       &.active {
         border: 1px solid #3C3C3C;
+        color: #3388ff;
+      }
+      .active {
+        filter: drop-shadow(#3388ff 100px 0);
+        transform: translateX(-100px);
       }
     }
   }

src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/components/list/components/item/index.vue

@@ -66,8 +66,9 @@
               </template>-->
               <template>
                 <div class="uav_version status-icon cp">
-                  <img src="./assets/images/I.svg" />
-                  <img src="./assets/images/I.svg" />
+                  <!-- <img src="./assets/images/I.svg" />
+                  <img src="./assets/images/I.svg" /> -->
+                  {{ device.modelName }}
                 </div>
               </template>
             </div>
@@ -531,13 +532,16 @@ export default {
 }
 .uav_version {
   margin-top: 1px;
-  width: 14px;
-  height: 12px;
+  // width: 14px;
+  // height: 12px;
   background: rgba(255, 255, 255, 0.4);
   border-radius: 2px;
   display: flex;
   justify-content: center;
   align-items: center;
+  padding: 4px;
+  color: #fff;
+  font-size: 8px;
 }
 .symbol-icon-box {
   display: flex;