fix：1、添加摇杆状态2、任务库任务执行中或完成时删除按钮消失

src/components/MMCDataTransferPanel/controlMenu/mixins/joystick.js

@@ -81,7 +81,7 @@ export default {
             }
             let data = JSON.parse(event.currentTarget.result).data;
             window.$log('src/components/observe/fckernel/uav/control/controlMenu/mixins/joystick.js message', data)
-
+            
             if (data && this.wsShow) {
               const yaw = data.channel01//偏航-1000-1000
               const x = data.channel02//俯仰-1000-1000

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/components/timedTask/index.vue

@@ -65,7 +65,7 @@
             <i class="el-icon-turn-off"></i>
           </el-tooltip> -->
           <el-tooltip content="删除" placement="top">
-            <i class="el-icon-delete" @click="onDelAirway(item)"></i>
+            <i v-if="item.status !== '执行中' && item.status !== '已完成'" class="el-icon-delete" @click="onDelAirway(item)"></i>
           </el-tooltip>
         </div>
       </div>

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/assets/images/manual1.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 17</title>
+    <g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-1072.000000, -923.000000)">
+            <g id="编组-25" transform="translate(1059.000000, 916.000000)">
+                <g id="编组-17" transform="translate(13.000000, 7.000000)">
+                    <rect id="矩形" x="0" y="0" width="22" height="22"></rect>
+                    <path d="M15.8851398,2.2006884 C18.4513254,2.2006884 20.5316299,4.34209967 20.5316299,6.98366435 C20.5316299,9.62522902 18.4513254,11.7666403 15.8851398,11.7666403 C13.3189542,11.7666403 11.2386497,9.62522902 11.2386497,6.98366435 C11.2386497,4.34209967 13.3189542,2.2006884 15.8851398,2.2006884 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
+                    <path d="M4.07412626,9.38141381 C2.93497627,9.38141381 2.01151275,8.43082449 2.01151275,7.25821315 C2.01151275,6.08560181 2.93497627,5.1350125 4.07412626,5.1350125 C5.21327625,5.1350125 6.13673978,6.08560181 6.13673978,7.25821315 C6.13673978,8.43082449 5.21327625,9.38141381 4.07412626,9.38141381 L4.07412626,9.38141381 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
+                    <path d="M7.78746356,5.5594665 C6.64837243,5.5594665 5.72493331,4.60897169 5.7248501,3.43642094 C5.72476689,2.2638702 6.6480711,1.31323655 7.78716221,1.31306522 C8.92625333,1.31289388 9.84982739,2.26324972 9.85007712,3.43580045 C9.850197,3.9989889 9.6329395,4.53915287 9.24611143,4.93743089 C8.85928337,5.33570892 8.33458102,5.5594665 7.78746356,5.5594665 L7.78746356,5.5594665 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
+                    <path d="M11.4438326,19.3760946 C13.8976211,19.3567809 16.3492167,19.5318262 18.7769164,19.8996809 C18.6033789,20.1815037 18.4983837,20.5022294 18.4708249,20.8346897 C16.5583183,20.6652804 14.1154641,20.5628902 11.4438326,20.5628902 C5.69003612,20.5628902 0.963477237,21.0329544 0.420922173,21.6333333 C0.388765361,21.5789522 0.370130228,21.5172484 0.366666667,21.453685 C0.366666667,20.3064493 5.32607207,19.3760946 11.4438326,19.3760946 Z M17.0194901,1.27722864 C17.0425487,1.28327896 17.064703,1.29212177 17.0877616,1.29863749 C17.1108203,1.30515321 17.1270969,1.30468781 17.1465384,1.30980733 C20.2783269,2.07257018 22.2164465,5.30430294 21.4754496,8.52808447 C20.7344528,11.751866 17.59494,13.7469158 14.4631515,12.984153 L12.4837298,15.8157077 L13.0262848,15.8157077 C13.7778855,15.8859857 14.360153,16.5229174 14.3826725,17.299435 C14.3814616,17.4595724 14.3598772,17.6188566 14.3184701,17.7732224 C15.913582,18.0571225 16.9824155,18.5686082 16.9824155,19.154094 C16.9809982,19.2018663 16.9718291,19.2490583 16.9552878,19.293717 C16.7653935,18.96793 15.549618,19.154094 13.8518728,19.0172634 C13.6838982,19.1627519 13.4723007,19.2441235 13.2528016,19.2476414 L10.087897,19.2476414 C9.85125189,19.2442624 9.62405888,19.1515108 9.44949056,18.9870118 C7.53743608,19.1103455 6.13764401,18.9404708 5.93282951,19.2941824 C5.91631263,19.2495165 5.9071444,19.2023288 5.90570176,19.1545594 C5.90570176,18.5169476 7.17166356,17.9672984 9.00549968,17.7038763 C8.97481916,17.5710172 8.95859341,17.4350569 8.95712184,17.2985041 C8.95712184,16.478917 9.46305444,15.8147769 10.0874449,15.8147769 L11.6943121,15.8147769 L13.7044787,12.769599 C13.5472439,12.7129244 13.3924704,12.6492585 13.2405941,12.5787808 C13.2207004,12.5699381 13.2003546,12.5624915 13.1804609,12.5531833 C13.0389445,12.4866296 12.9028535,12.4135603 12.7685712,12.3353714 C12.7414434,12.3200129 12.7138635,12.3060506 12.6871879,12.2888304 C12.5599483,12.2120974 12.4356687,12.130278 12.3146335,12.0435593 C12.285245,12.0226158 12.2549524,12.0030686 12.2242076,11.9816597 C12.1075583,11.8960243 11.998143,11.8048039 11.8864671,11.7107911 C11.8566265,11.6851935 11.8258817,11.6600614 11.7960412,11.6339984 C11.6911915,11.5402607 11.5898414,11.442454 11.4922104,11.3407901 L11.4017846,11.2477081 C11.3081938,11.1467141 11.2209329,11.0424623 11.130507,10.935418 C11.1015708,10.8995814 11.0726345,10.8637448 11.0446025,10.8269774 C10.9626163,10.7205536 10.8845487,10.611958 10.8103995,10.5011904 L10.728112,10.3750643 C10.6584841,10.2646069 10.5923225,10.152288 10.5296273,10.0381074 C10.5034038,9.99156638 10.4780846,9.94083666 10.4527653,9.89150321 C10.3951623,9.77919803 10.3408818,9.66512011 10.2899988,9.54942682 C10.2655838,9.49357762 10.2447859,9.43679758 10.220823,9.38001758 C10.1756101,9.26738833 10.1303972,9.15429369 10.0942269,9.03840659 C10.0790966,8.97295723 10.0617544,8.90807069 10.042232,8.8438652 C10.0087156,8.73300435 9.97855909,8.62109664 9.95180615,8.50830457 C9.93462523,8.43430437 9.92106135,8.35937334 9.9065932,8.28444231 C9.88534312,8.17693259 9.86409307,8.06942287 9.84872069,7.95865529 C9.83696531,7.87348525 9.83018338,7.78738438 9.82204505,7.70174894 C9.81209822,7.60028954 9.80079497,7.49929557 9.79582157,7.39643994 C9.79084817,7.29358431 9.79356091,7.19817526 9.79582157,7.09857752 C9.79582157,7.0054955 9.79310879,6.91567137 9.79582157,6.82305478 C9.80124712,6.70297899 9.81571526,6.5824378 9.82837487,6.46189657 C9.83606108,6.38836177 9.83967809,6.31529241 9.85007707,6.24175761 C9.87765694,6.04675079 9.91427941,5.85081317 9.96130086,5.65534095 C10.3323119,4.11070926 11.2847264,2.78130799 12.6086737,1.96007893 C13.932621,1.13884986 15.5194489,0.89318879 17.0194901,1.27722864 Z M13.4784141,18.003135 L10.7656387,18.003135 C10.5159347,18.003135 10.3135095,18.2115061 10.3135095,18.468545 C10.3135095,18.7255839 10.5159347,18.9339551 10.7656387,18.9339551 L13.4784141,18.9339551 C13.7281181,18.9339551 13.9305433,18.7255839 13.9305433,18.468545 C13.9305433,18.2115061 13.7281181,18.003135 13.4784141,18.003135 Z M13.2523494,16.8735848 L10.0874449,16.8735848 C9.71308192,16.8735848 9.40925108,16.8065657 9.40925108,17.2985041 C9.40925108,17.7904425 9.71308192,17.7234235 10.0874449,17.7234235 L13.2523494,17.7234235 C13.6267124,17.7234235 13.9305433,17.7904426 13.9305433,17.2985041 C13.9305433,16.8065657 13.6267124,16.8735848 13.2523494,16.8735848 Z M5.56615269,13.8144445 C6.19041287,13.8144445 6.69647573,14.3353725 6.69647573,14.9779696 C6.69647573,15.6205668 6.19041287,16.1414947 5.56615269,16.1414947 C4.94189251,16.1414947 4.43582965,15.6205668 4.43582965,14.9779696 C4.43582965,14.3353725 4.94189251,13.8144445 5.56615269,13.8144445 Z M7.6007342,11.7200993 C8.22499437,11.7200993 8.73105725,12.2410272 8.73105725,12.8836244 C8.73105725,13.1922105 8.61197,13.4881576 8.3999933,13.7063609 C8.1880166,13.9245642 7.9005145,14.0471496 7.60073418,14.0471496 C6.97647401,14.0471496 6.47041117,13.5262216 6.47041117,12.8836244 C6.47041117,12.2410273 6.97647403,11.7200993 7.6007342,11.7200993 Z M3.53157122,11.7200993 C4.15583139,11.7200993 4.66189427,12.2410272 4.66189427,12.8836244 C4.66189427,13.1922105 4.54280701,13.4881576 4.33083032,13.7063609 C4.11885362,13.9245642 3.83135152,14.0471496 3.5315712,14.0471496 C2.90731103,14.0471496 2.40124819,13.5262216 2.40124819,12.8836244 C2.40124819,12.2410273 2.90731105,11.7200993 3.53157122,11.7200993 Z M15.6938472,2.07726852 C13.7371468,2.07726852 11.9731157,3.29057916 11.2243188,5.1514356 C10.475522,7.01229204 10.8894222,9.15423045 12.2730183,10.5784683 C13.6566145,12.0027062 15.737431,12.4287642 17.5451865,11.6579722 C19.352942,10.8871802 20.5316299,9.0713325 20.5316299,7.05715601 C20.5316299,4.30684009 18.3656808,2.07726852 15.6938472,2.07726852 Z M5.56615271,9.62575412 C6.19041288,9.62575412 6.69647576,10.146682 6.69647576,10.7892792 C6.69647576,11.0978652 6.57738851,11.3938124 6.36541181,11.6120157 C6.15343511,11.830219 5.86593301,11.9528043 5.56615269,11.9528043 C4.94189252,11.9528043 4.43582968,11.4318764 4.43582968,10.7892792 C4.43582968,10.146682 4.94189254,9.62575412 5.56615271,9.62575412 Z M12.0392868,7.02736978 L12.6483048,7.1953828 C12.551277,7.73410365 12.6749886,8.29014528 12.9901145,8.73170139 L12.5443151,9.19431897 C12.0726108,8.5845918 11.8876634,7.79102923 12.0392868,7.02736978 Z M14.545439,3.5875241 L14.545439,4.23909818 C13.5952179,4.31491998 12.8400303,5.09150061 12.7654063,6.0695559 L12.134686,6.0695559 C12.2108376,4.7327597 13.2468036,3.66616323 14.545439,3.5875241 Z" id="形状结合" fill="#4E4E4E" fill-rule="nonzero"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

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

@@ -21,9 +21,10 @@
         <img src="./assets/images/auto.svg" />
         <span class="dib">自动</span>
       </div>
-      <div v-else-if="controlType === 1" :class="manualControlStatus? 'active control-bottom-item':'control-bottom-item'" @click="onModeKeyboard">
-        <img src="./assets/images/manual.svg" />
-        <span class="dib">摇杆</span>
+      <div v-else-if="controlType === 1"
+        :class="manualControlStatus ? 'active control-bottom-item' : 'control-bottom-item'" @click="onModeKeyboard">
+        <img :src="require(`./assets/images/${manualControlStatus ? 'manual' : 'manual1'}.svg`)" />
+        <span class="dib">摇杆 </span>
       </div>
       <div v-else-if="controlType === 2" class="control-bottom-item" @click="onModeAuto">
         <img src="../../assets/images/keyboard.png" alt />
@@ -69,15 +70,15 @@ export default {
   data() {
     return {
       // 摇杆手动控制状态
-      manualControlStatus:false,
+      manualControlStatus: false,
       controlType: 0, //控制类型, 0: 自动 1: 摇杆 2: 键盘
     };
   },
   watch: {
     // 状态改变时摇杆会切换为手动模式
-    "onModeManualState":{
+    "onModeManualState": {
       handler(val) {
-        if(val){
+        if (val) {
           this.onModeManual()
         }
       }
@@ -85,16 +86,16 @@ export default {
     "manualControlStatus": {
       handler(val) {
         this.$store.commit("MMCFlightControlCenter/joystick/setState", {
-              key: "manualControlStatus",
-              value: val,
-            });
+          key: "manualControlStatus",
+          value: val,
+        });
       },
     },
     immediate: true,
   },
   computed: {
     ...mapState("MMCFlightControlCenter/uav", ["uav", "airlineData"]),
-    ...mapState("MMCFlightControlCenter/joystick", ["onModeManualState"]), 
+    ...mapState("MMCFlightControlCenter/joystick", ["onModeManualState"]),
   },
   methods: {
     /**
@@ -228,11 +229,11 @@ export default {
     /**
      * 键盘控制
      */
-    clickControl() {},
+    clickControl() { },
     /**
      * 停止键盘控制
      */
-    cancelControl() {},
+    cancelControl() { },
   },
 };
 </script>
@@ -267,7 +268,8 @@ export default {
       transform: scale(1.1);
     }
   }
-  .active{
+
+  .active {
     background-color: #0cc81f;
   }
 }
@@ -284,6 +286,7 @@ export default {
   background: rgba(32, 32, 30, 0.8);
   border-radius: 10px;
   padding: 8px;
+
   .head {
     width: 360px;
     color: #fff;
@@ -291,15 +294,19 @@ export default {
     line-height: 32px;
     display: flex;
   }
+
   .content {
     display: flex;
     align-items: center;
-    > div {
+
+    >div {
       flex-direction: column;
       display: flex;
       align-items: center;
-      > div {
+
+      >div {
         display: flex;
+
         div {
           background: #333;
           width: 32px;
@@ -313,22 +320,21 @@ export default {
           align-items: center;
           justify-content: center;
         }
+
         .active {
           background: #ead91b;
         }
       }
     }
+
     .line {
       width: 1px;
       height: 60px;
       border: 1px solid;
-      border-image: linear-gradient(
-          180deg,
+      border-image: linear-gradient(180deg,
           rgba(255, 255, 255, 0),
           rgba(255, 255, 255, 1),
-          rgba(255, 255, 255, 0)
-        )
-        1 1;
+          rgba(255, 255, 255, 0)) 1 1;
     }
   }
 }

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

@@ -338,7 +338,6 @@ export default {
           this.showInfieldControlDialog = true;
         } else {
           this.$message.success("摇杆即将切换为手动模式,请稍等！");
-          // onModeKeyboard
           this.changeModeManualState();
         }
       }

src/components/MMCFlightControlCenter/mixins/joystick.js

@@ -73,7 +73,7 @@ export default {
           }
           let data = JSON.parse(event.currentTarget.result).data;
           let y = data.channel03; //油门值 0-1000
-          this.keyboardFlag = true
+          this.manualControlStatus = true
           // console.log(data.channel03,data,"yyyyyyyy");
           if (y || y == 0) {
             this.$store.commit("MMCFlightControlCenter/joystick/setState", {
@@ -179,7 +179,7 @@ export default {
         return;
       }
       this.cameraMountCtr("stop", this.lastMountCtrl);
-      this.keyboardFlag = false
+      this.manualControlStatus = false
       setTimeout(() => {
         this.wsJoystick.send(JSON.stringify({ type: 2010, data: {} }));
         this.wsJoystick && this.wsJoystick.close();