森林防火调整

src/types/components.d.ts

@@ -97,6 +97,7 @@ declare module 'vue' {
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
     VideoTagEdit: typeof import('./../components/VideoTagEdit/index.vue')['default']
     YMap: typeof import('./../components/Map/YMap.vue')['default']
+    YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
 }

src/views/globalMap/RightMenu/ForestDefenseVideo/DetailDialog.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="detail-box">
-    <div class="tabs">
-      <div v-for="(item, index) in tabs" :key="index" class="tab">
-        <i :class="item.icon" />
-      </div>
-    </div>
+<!--    <div class="tabs">-->
+<!--      <div v-for="(item, index) in tabs" :key="index" class="tab">-->
+<!--        <i :class="item.icon" />-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="content">
       <div class="line">
         <div class="common-title-box">{{ detailData.title }}</div>

src/views/globalMap/RightMenu/ForestDefenseVideo/index.vue

@@ -7,11 +7,11 @@
       <div class="data-line">
         <div class="text-box1">
           <div class="data-label">设备总数</div>
-          <div class="gradient-text3">{{ !['', null, undefined].includes(statisticsData.data1) ? statisticsData.data1 : '-' }}</div>
+          <div class="gradient-text3">{{ !['', null, undefined].includes(statisticsData.total) ? statisticsData.total : '-' }}</div>
         </div>
         <div class="text-box2">
           <div class="data-label">在线</div>
-          <div class="gradient-text3">{{ !['', null, undefined].includes(statisticsData.data2) ? statisticsData.data2 : '-' }}</div>
+          <div class="gradient-text3">{{ !['', null, undefined].includes(statisticsData.online) ? statisticsData.online : '-' }}</div>
         </div>
       </div>
       <div class="query-box">
@@ -57,7 +57,7 @@
         <div class="tree-box">
           <el-tree ref="tree" :data="treeData" default-expand-all>
             <template #default="{ node, data }">
-              <span v-if="data.online && data.total" class="custom-tree-node">
+              <span v-if="![null, undefined, ''].includes(data.online) && ![null, undefined, ''].includes(data.total)" class="custom-tree-node">
                 <span>{{ node.label }}</span>
                 <span>（{{ data.online }}/{{ data.total }}）</span>
               </span>
@@ -82,8 +82,8 @@ const props = defineProps({
   activeMap: String
 });
 const statisticsData = ref({
-  data1: '',
-  data2: ''
+  online: '',
+  total: ''
 });
 // 查询条件
 const queryParams = reactive({
@@ -98,6 +98,8 @@ let treeData = ref([]);
 const getData = () => {
   getVideoForestFireList().then((res) => {
     treeData.value = res.data;
+    statisticsData.value.online = res.online;
+    statisticsData.value.total = res.total;
   });
 };
 let detailId = ref('');
@@ -112,10 +114,6 @@ const handleClick = (data) => {
   }
 };
 onMounted(() => {
-  statisticsData.value = {
-    data1: '125',
-    data2: '121'
-  };
   selectOptions1.value = [
     { label: '测试1', value: 1 },
     { label: '测试2', value: 2 },