hmm 8 月之前
父节点
当前提交
0efdcaf03d

+ 9 - 2
src/views/emergencyCommandMap/LeftSection/VideoMonitor.vue

@@ -29,7 +29,14 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="name">
-            <el-input class="custom-input2" placeholder="请输入摄像头名称" size="large" style="width: 500px" />
+            <el-input
+              v-model="queryParams.name"
+              class="custom-input2"
+              placeholder="请输入摄像头名称"
+              size="large"
+              style="width: 500px"
+              @input="getList"
+            />
           </el-form-item>
           <el-form-item>
             <div class="common-btn-primary" @click="handleQuery">搜索</div>
@@ -208,7 +215,7 @@ const handleSave = () => {
   });
 };
 
-initData()
+initData();
 </script>
 
 <style lang="scss" scoped>

+ 21 - 7
src/views/globalMap/RightMenu/MobileUnmannedVehicle.vue

@@ -12,23 +12,22 @@
         <el-button class="btn" @click="handleCancel">取消</el-button>
       </div>
     </div>
-    <!--    </div>-->
-    <div>机动无人机</div>
+    <div class="flex-container">
+      <div class="text-item">机动无人机</div>
+      <div class="button-item common-btn-primary2 edit-icon" style="margin-top: -20px">全部播放</div>
+    </div>
     <div class="custom-table">
       <div class="th">
         <div class="td">机动无人机</div>
-        <div class="td">工作单位</div>
-        <div class="td">职务</div>
         <div class="td">操作</div>
       </div>
       <div class="table-content">
         <div v-for="(item, index) in dataList" :key="item.id" class="tr">
           <div class="td">{{ item.drone_name }}</div>
-          <div class="td">{{ item.work_unit }}</div>
           <div class="td">{{ item.position }}</div>
           <div class="td">
-            <div class="text" @click="handleConnect(index, item)">连线</div>
-            <div class="text" @click="handleCollaborate(index, item)">协同</div>
+            <div class="text" @click="handleConnect(index, item)">视频</div>
+<!--            <div class="text" @click="handleCollaborate(index, item)">协同</div>-->
             <div class="text" @click="handleTrack(item)">轨迹</div>
           </div>
         </div>
@@ -194,4 +193,19 @@ onMounted(() => {
     margin-right: 0;
   }
 }
+
+.flex-container {
+  display: flex;
+  justify-content: space-between; /* 左右两端对齐 */
+  align-items: center; /* 垂直居中对齐 */
+}
+.text-item {
+  font-size: 32px; /* 根据需要设置字体大小 */
+  line-height: 1; /* 确保行高一致 */
+}
+
+.button-item {
+  font-size: 32px; /* 根据需要设置字体大小 */
+  line-height: 1; /* 确保行高一致 */
+}
 </style>

+ 5 - 1
src/views/globalMap/RightMenu/index.vue

@@ -66,7 +66,10 @@
         <!--卫星电话-->
         <SatellitePhone v-if="menuState.showMenu && menuState.menuData[menuState.activeIndex]?.name === '卫星电话'" @handle-menu="handleMenu" />
         <!--机动无人机-->
-        <MobileUnmannedVehicle v-if="menuState.showMenu && menuState.menuData[menuState.activeIndex]?.name === '机动无人机'" @handle-menu="handleMenu" />
+        <MobileUnmannedVehicle
+          v-if="menuState.showMenu && menuState.menuData[menuState.activeIndex]?.name === '机动无人机'"
+          @handle-menu="handleMenu"
+        />
       </div>
     </div>
   </div>
@@ -93,6 +96,7 @@ import CommunicationSupport from './CommunicationSupport.vue';
 import MobilePlatform from './MobilePlatform.vue';
 import KeyVehicles from './KeyVehicles.vue';
 import SatellitePhone from './SatellitePhone.vue';
+import MobileUnmannedVehicle from './MobileUnmannedVehicle.vue';
 interface Props {
   pointType: PointType[];
 }

+ 3 - 8
src/views/globalMap/index.vue

@@ -3,12 +3,7 @@
     <div class="global-map">
       <MapLogical v-if="activeMap === 'logical'" :map-data="mapData" />
       <!--      <YMap v-else-if="['imageMap', 'satellite2', 'satellite3'].includes(activeMap)" :activeMap="activeMap" />-->
-      <YztMap
-        v-else-if="['imageMap'].includes(activeMap)"
-        ref="map2Ref"
-        :active-map="activeMap"
-        :point-type="pointType"
-      />
+      <YztMap v-else-if="['imageMap'].includes(activeMap)" ref="map2Ref" :active-map="activeMap" :point-type="pointType" />
       <Map
         v-else
         ref="mapRef"
@@ -64,7 +59,7 @@ let activeMap = ref('satellite');
 const communicationSupport = reactive({
   show: false,
   data: {}
-})
+});
 
 const switchMap = (key) => {
   activeMap.value = key;
@@ -143,7 +138,7 @@ const clickMenu = (item, dataList) => {
     if (item.checked || (!item.checked && index === 0)) {
       rightMenuRef.value.updateMenu(
         checked,
-        ['易涝隐患点', '无人机', '铁塔运行监测', '物资与装备', '通讯保障', '手机工作台','机动无人机'].includes(item.name)
+        ['易涝隐患点', '无人机', '铁塔运行监测', '物资与装备', '通讯保障', '手机工作台', '机动无人机'].includes(item.name)
           ? item
           : { name: '图层分析', meta: { icon: 'icon1' } }
       );