bug修改

front/src/views/home/DetailsPageconetent.vue

@@ -306,7 +306,7 @@
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" style="left: 0.16rem" v-else>
-      <detailsPageInfrastructureTreeXha />
+      <detailsPageInfrastructureTreeXha v-show="showFlag" />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
@@ -511,9 +511,9 @@
         :resourceTotal="resourceTotal"
       ></KnowledgeBase>
     </div>
-    <template v-if="Cardsname == '基础设施'">
+    <div v-if="Cardsname == '基础设施'" v-show="showFlag">
       <infrastructureApplication></infrastructureApplication>
-    </template>
+    </div>
     <div
       class="talk-monitor"
       @click="openMonitor"
@@ -1650,10 +1650,15 @@
           resourceList.data = list
         })
       }
+      const showFlag = ref(true)
       mybus.on('getCameraByParentId', (ids) => {
         paramsGetResources2.value.regionId = ids
         getAppResources()
       })
+      mybus.on('changeShowFlag', (flag) => {
+        console.log('改变')
+        showFlag.value = flag
+      })
       mybus.on('changeSearchValue', (val) => {
         searchValue.value = val
       })
@@ -1960,6 +1965,7 @@
         saveSearchCodition,
         searchResultListDom,
         handleSetSearchData, // todo
+        showFlag,
       }
     },
     components: {
@@ -1979,6 +1985,7 @@
     },
     beforeUnmount() {
       mybus.off('getCameraByParentId')
+      mybus.off('changeShowFlag')
       mybus.off('changeSearchValue')
       mybus.off('selectCardsitem')
       mybus.off('paramsGetResources')

front/src/views/home/infrastructurePageXha.vue

@@ -1469,6 +1469,7 @@
           tabList.value[1].title = '视频标签'
         }
         selectType.value = '视频资源'
+        mybus.emit('changeShowFlag', true)
         console.log('444------------>', 444)
       } else if (name == '政务云资源') {
         room.value = true
@@ -1525,6 +1526,7 @@
         dataSource.value = []
         dataSource2.value = []
         room.value = true
+        mybus.emit('changeShowFlag', true)
         getCameraAllLabel().then((res) => {
           res.data.data.forEach((val) => {
             if (tabList.value[1]) {
@@ -1618,9 +1620,11 @@
         emits('add', 3)
       } else if (name == '无人机') {
         pagination.value.current = 1
+        mybus.emit('changeShowFlag', false)
         getSoldierData(indexFather, name)
       } else if (name == '单兵设备') {
         pagination.value.current = 1
+        mybus.emit('changeShowFlag', false)
         getSoldierData(indexFather, name)
       } else if (name == '城市云脑会客厅') {
         showMap.value = false

front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue

@@ -31,8 +31,8 @@
               <h5-player :video-url="videoUrl" :stop-flag="selectedFlag"></h5-player>
               </div>
               <div class="text-label des-label">
-                <span>通道名称: {{cameraDataList[defaultIndex].channelName}}</span>
-                <span>通道编码: {{cameraDataList[defaultIndex].channelId}}</span>
+                <span>监控名称: {{cameraDataList[defaultIndex].channelName}}</span>
+                <span>监控编码: {{cameraDataList[defaultIndex].channelId}}</span>
               </div>
               <div class="footer-button" v-if="showFlag">
                 <a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button>