Hwf пре 6 месеци
родитељ
комит
814621d7e8

+ 1 - 1
src/components/Dialog/index.vue

@@ -88,7 +88,7 @@ const computedHeight = computed(() => {
   } else if (props.type === 'xl') {
     return '720px';
   } else {
-    return '800px';
+    return '760px';
   }
 });
 // 关闭弹窗

+ 1 - 1
src/components/VideoTagEdit/index.vue

@@ -62,7 +62,7 @@
 
 <script lang="ts" setup name="VideoTagEdit">
 const props = defineProps({
-  modelValue: String,
+  modelValue: Boolean,
   id: String
 });
 const emits = defineEmits(['update:modelValue']);

+ 21 - 12
src/views/globalMap/LeftMenu.vue

@@ -62,7 +62,7 @@
               >
                 <div class="text1" :title="item.name" @click="handleShowDialog(item)">{{ item.name }}</div>
                 <div class="tags">
-                  <div v-for="(item2, index2) in item.tags" :key="index2" class="tag">{{ item2 }}</div>
+                  <div v-for="(item2, index2) in item.tags" :key="index2" class="tag">{{ item2.name }}</div>
                 </div>
               </div>
               <div v-show="searchState.showList && searchState.videoList.length === 0" style="text-align: center">无数据</div>
@@ -117,7 +117,16 @@
         </div>
       </Transition>
     </div>
-    <Dialog v-if="showDialog" v-model="showDialog" type="md" title="视频" hide-footer>
+    <Dialog
+      v-if="showDialog"
+      v-model="showDialog"
+      v-model:tags="videoMonitorData.tags"
+      type="lg"
+      header-type="header2"
+      title="视频"
+      :get-tag-id="videoMonitorData.video_code"
+      hide-footer
+    >
       <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center">
         <HKVideo :dot_data="videoMonitorData" />
       </div>
@@ -141,7 +150,7 @@ const searchState = reactive({
   videoList: []
 });
 let showDialog = ref(false);
-let videoMonitorData = ref([]);
+let videoMonitorData = ref({});
 const changeSearchText = () => {
   if (!searchState.searchText) {
     searchState.showList = false;
@@ -177,15 +186,15 @@ const changeSearchText = () => {
       ];
       searchState.videoList = [
         {
-          'name': '01083.159乡道石鳌塘村交汇路口.X320',
-          'address': '44092251001320000110',
-          'area': '茂名市视频数据共享管理平台/茂名市公安局/1市局直属/官渡派出所',
-          'area_name': '市辖区',
-          'longitude': 110.92495,
-          'latitude': 21.67629167,
-          'status': '在线',
-          'video_code': '44092251001320000110',
-          tags: ['路网视频', '森林防火']
+          name: '01083.159乡道石鳌塘村交汇路口.X320',
+          address: '44092251001320000110',
+          area: '茂名市视频数据共享管理平台/茂名市公安局/1市局直属/官渡派出所',
+          area_name: '市辖区',
+          longitude: 110.92495,
+          latitude: 21.67629167,
+          status: '在线',
+          video_code: '44092251001320000110',
+          tags: [{ name: '路网视频' }, { name: '森林防火' }]
         }
       ];
     });

+ 2 - 6
src/views/globalMap/RightMenu/RiverMonitor.vue

@@ -34,7 +34,7 @@
       </div>
     </div>
   </div>
-  <Dialog v-model="showDialog" type="xl" headerType="header2" title="河道监测" getTagId="1" v-model:tags="tags" hide-footer>
+  <Dialog v-model="showDialog" type="xl" title="河道监测" hide-footer>
     <div class="flex">
       <div class="detail-container">
         <div class="flex">
@@ -111,7 +111,7 @@ const queryParams = reactive({
 });
 // 总数量
 let total = ref(0);
-let tags = ref([]);
+
 // 数据
 const riverMonitorData = reactive({
   time: '',
@@ -126,10 +126,6 @@ const initData = async () => {
   getRiverWaterStatus().then((res) => {
     riverMonitorData.statusList = res.rows || [];
   });
-  tags.value = [
-    { name: '河坝' },
-    { name: '水库' }
-  ]
 };
 
 initData();