From cccea9db0bbc03e48f8f0da78b53eb5d76eec964 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 14 Nov 2022 17:48:35 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 30 ++++++++++----------
 front/src/views/home/infrastructurePage.vue  | 18 +++++++-----
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 1947a3ba..fbf52dd8 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -904,6 +904,9 @@
           searchValue.value = ''
           globalFlag.value = false
           globalData.data = []
+          if (Cardsname.value == '基础设施') {
+            camera.value.reSetSearch()
+          }
         }
         paramsGetResources.name = searchValue.value
         // 重置筛选条件
@@ -932,8 +935,10 @@
         mybus.emit('chongzhi')
         console.log(
           'paramsGetResources---chongzhi-重置-------->',
-          paramsGetResources
+          paramsGetResources,
+          flag
         )
+
         getAppResources()
       }
       //跳转链接
@@ -1196,25 +1201,20 @@
               return sortArr.indexOf(a) - sortArr.indexOf(b)
             })
             console.log('arr', arr, Cardsname.value)
-            // if (Cardsname.value === arr[0]) {
-            // getAppResources2()
-            // } else {
-            // changeCards(arr[0])
-            // }
-            if (arr[0]) {
-              changeCards(arr[0])
+            if (Cardsname.value === arr[0] && arr[0] == '基础设施') {
+              getAppResources2()
             } else {
-              changeCards('应用资源')
+              changeCards(arr[0])
             }
             if (!mapFlag) {
               return
             }
-            if (paramsGetResources.type == '基础设施') {
-              console.log('camera1', camera.value)
-              camera.value.getCamera(true, searchValue.value)
-            } else {
-              getAppResources()
-            }
+            // if (paramsGetResources.type == '基础设施') {
+            //   console.log('camera1', camera.value)
+            //   camera.value.getCamera(true, searchValue.value)
+            // } else {
+            //   getAppResources()
+            // }
             console.log(
               'paramsGetResources--globalSearch---------->',
               paramsGetResources
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 5031c4f4..85d16d64 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -55,12 +55,12 @@
             size="large"
             @search="onSearch"
           />
-          <a-button
+          <!-- <a-button
             style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
             @click="reSetSearch"
           >
             重置
-          </a-button>
+          </a-button> -->
         </div>
       </div>
       <div v-if="roomYuyue">
@@ -945,10 +945,6 @@
   const fileList = ref([])
   const useForm = Form.useForm
   const roomInput = ref('')
-  let roomStr = router.currentRoute.value.query.str
-  if (roomStr) {
-    roomInput.value = roomStr
-  }
   const rulesRef = reactive({
     bookDate: [
       {
@@ -1028,6 +1024,12 @@
   // 设施类型--无人机和单兵设备
   let facilitiesType = router.currentRoute.value.query.facilitiesType || ''
   onMounted(() => {
+    console.log('基础设施初始化')
+    let roomStr = router.currentRoute.value.query.str
+    if (roomStr) {
+      roomInput.value = roomStr
+      getCamera()
+    }
     // 获取用户信息
     handleUser()
     if (jcssType.value) {
@@ -1264,6 +1266,7 @@
   }
   //重置
   const reSetSearch = () => {
+    console.log('重置')
     roomInput.value = ''
     searchData()
     chengguoSearch()
@@ -2025,7 +2028,7 @@
     if (flag) {
       mapSearchParam.value.cameraName = str
     }
-    console.log('初始化调用')
+    console.log('初始化调用', flag)
     console.log(
       '不选左侧树的时候不调用接口',
       mapSearchParam.value,
@@ -2098,6 +2101,7 @@
   }
   defineExpose({
     getCamera,
+    reSetSearch,
   })
   //加入申购车
   const addShoppingCart = () => {