Merge remote-tracking branch 'origin/dev' into dev

src/views/globalMap/RightMenu/Helicopter.vue

@@ -15,16 +15,16 @@
     <div class="custom-table">
       <div class="th">
         <div class="td">直升机</div>
-        <div class="td" style="width: 220px; flex: unset">操作</div>
+<!--        <div class="td" style="width: 220px; flex: unset">操作</div>-->
       </div>
       <div class="table-content">
         <div v-for="item in dataList" :key="item.id" class="tr">
           <div class="td">{{ item.helicopter_name }}</div>
-          <div class="td" style="width: 220px; flex: unset">
-            <div class="text" @click="handleConnect">连线</div>
-            <!--            <div class="text" @click="handleCollaborate(index, item)">协同</div>-->
-            <div class="text" @click="handleTrack(item)">轨迹</div>
-          </div>
+<!--          <div class="td" style="width: 220px; flex: unset">-->
+<!--            <div class="text" @click="handleConnect">连线</div>-->
+<!--            &lt;!&ndash;            <div class="text" @click="handleCollaborate(index, item)">协同</div>&ndash;&gt;-->
+<!--            <div class="text" @click="handleTrack(item)">轨迹</div>-->
+<!--          </div>-->
         </div>
       </div>
       <div class="footer">

src/views/globalMap/RightMenu/KeyVehicles.vue

@@ -30,8 +30,8 @@
           </div>
           <div class="td">{{ parseTime(item.gpsDate) }}</div>
           <div class="td" style="width: 330px; flex: unset">
-            <div class="text" @click="handleConnect">连线</div>
-            <div class="text" @click="handleCollaborate">协同</div>
+<!--            <div class="text" @click="handleConnect">连线</div>-->
+<!--            <div class="text" @click="handleCollaborate">协同</div>-->
             <div class="text" @click="handleTrack(item)">轨迹</div>
           </div>
         </div>

src/views/globalMap/RightMenu/MobileUnmannedVehicle.vue

@@ -19,16 +19,16 @@
     <div class="custom-table">
       <div class="th">
         <div class="td">机动无人机</div>
-        <div class="td" style="width: 220px; flex: unset">操作</div>
+<!--        <div class="td" style="width: 220px; flex: unset">操作</div>-->
       </div>
       <div class="table-content">
         <div v-for="item in dataList" :key="item.id" class="tr">
           <div class="td">{{ item.drone_name }}</div>
-          <div class="td" style="width: 220px; flex: unset">
-            <div class="text" @click="handleConnect">视频</div>
-<!--            <div class="text" @click="handleCollaborate(index, item)">协同</div>-->
-            <div class="text" @click="handleTrack(item)">轨迹</div>
-          </div>
+<!--          <div class="td" style="width: 220px; flex: unset">-->
+<!--            <div class="text" @click="handleConnect(index, item)">视频</div>-->
+<!--&lt;!&ndash;            <div class="text" @click="handleCollaborate(index, item)">协同</div>&ndash;&gt;-->
+<!--            <div class="text" @click="handleTrack(item)">轨迹</div>-->
+<!--          </div>-->
         </div>
       </div>
       <div class="footer">