diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue
index 10478c69..0fd4b614 100644
--- a/back/src/views/modules/myAgent/ConferenceRoom.vue
+++ b/back/src/views/modules/myAgent/ConferenceRoom.vue
@@ -208,7 +208,7 @@
 <script>
 import Cookies from 'js-cookie'
 export default {
-  data() {
+  data () {
     // let validatorImg = (rule, value, callback) => {
     //   console.log(value, 11111111)
     //   //验证器
@@ -231,7 +231,7 @@ export default {
         area: 0,
         capacity: '',
         pic: '',
-        id: '',
+        id: ''
       },
       limit: 10,
       page: 1,
@@ -242,11 +242,11 @@ export default {
       rules: {
         name: [
           { required: true, message: '请输入会议室名称', trigger: 'blur' },
-          { min: 1, trigger: 'blur' },
+          { min: 1, trigger: 'blur' }
         ],
         area: [
           { required: true, message: '请输入会议室面积', trigger: 'blur' },
-          { min: 1, type: 'number', trigger: 'blur' },
+          { min: 1, message: '请输入数字', type: 'number', trigger: 'blur' }
         ],
         description: [
           { required: true, message: '请填写描述内容', trigger: 'blur' },
@@ -254,22 +254,22 @@ export default {
             min: 1,
             max: 500,
             message: '长度在 1 到 500 个字符',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       formLabelWidth: '120px',
       checkImgSuccess: true,
       dialogVisible: false,
-      flge: '',
+      flge: ''
     }
   },
-  mounted() {
+  mounted () {
     this.queryData()
   },
   methods: {
     // 页面查询接口
-    queryData() {
+    queryData () {
       this.$http
         .get(`/meeting/page?limit=${this.limit}&page=${this.page}`)
         .then(({ data: res }) => {
@@ -278,31 +278,31 @@ export default {
         })
     },
     // 分页
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.limit = val
       this.queryData()
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.page = val
       this.queryData()
     },
     // 新增
-    addRooom() {
+    addRooom () {
       this.dialogFormVisible = true
       this.flge = 'add'
       this.ruleForm = {}
       this.fileList = []
     },
-    handlePictureCardPreview(file) {
+    handlePictureCardPreview (file) {
       this.dialogImageUrl = file.url
       this.dialogVisible = true
     },
-    //上传个数限制
-    beforeUpload(file, fileList) {
+    // 上传个数限制
+    beforeUpload (file, fileList) {
       this.$message.error('最多只能上传一张图片！')
     },
-    //图片上传成功时钩子
-    onSuccess(response, file, fileList) {
+    // 图片上传成功时钩子
+    onSuccess (response, file, fileList) {
       const isLt2M = file.size / 1024 / 1024 < 100
       if (!isLt2M) {
         this.$message.error('上传图片大小不能超过100MB！')
@@ -313,17 +313,17 @@ export default {
         this.checkImgSuccess = true
       }
     },
-    //图片删除时钩子
-    onRemove(file, fileList) {
+    // 图片删除时钩子
+    onRemove (file, fileList) {
       this.$nextTick(() => {
         if (fileList.length == 0) {
-          this.checkImgSuccess = false //检查图片是否加载成功
+          this.checkImgSuccess = false // 检查图片是否加载成功
           //   this.$refs.ruleForm.validate() //删除图片,重新触发校验
         }
       })
     },
     // 保存
-    submitForm(formName, i) {
+    submitForm (formName, i) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (i === 'add') {
@@ -337,9 +337,9 @@ export default {
             })
           } else if (i === 'edit') {
             this.dialogFormVisible = false
-            this.$http.put(`/meeting`, this.ruleForm).then(({ data: res }) => {
+            this.$http.put('/meeting', this.ruleForm).then(({ data: res }) => {
               this.ruleForm = res.data
-              let imgUrl = { name: res.data.name, url: res.data.pic }
+              const imgUrl = { name: res.data.name, url: res.data.pic }
               this.fileList.push(imgUrl)
             })
           }
@@ -350,7 +350,7 @@ export default {
       })
     },
     // 详情
-    taskDetails(row) {
+    taskDetails (row) {
       this.ruleForm = {}
       this.fileList = []
       this.flge = 'look'
@@ -366,45 +366,45 @@ export default {
         }
       })
     },
-    //修改
-    taskUpdate(row) {
+    // 修改
+    taskUpdate (row) {
       this.dialogFormVisible = true
       this.fileList = []
       this.flge = 'edit'
       this.ruleForm = row
       if (row.pic != null) {
-        let imgUrl = { name: row.name, url: row.pic }
+        const imgUrl = { name: row.name, url: row.pic }
         this.fileList.push(imgUrl)
       } else {
         this.fileList = []
       }
     },
-    //删除图片
-    taskDelete(row) {
+    // 删除图片
+    taskDelete (row) {
       this.$confirm('此操作将永久删除该会议室, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$http.put(`/meeting`, { delFlag: 1, id: row.id }).then(() => {
+          this.$http.put('/meeting', { delFlag: 1, id: row.id }).then(() => {
             this.queryData()
             this.$message({
               type: 'success',
-              message: '删除成功!',
+              message: '删除成功!'
             })
           })
         })
         .catch(() => {
           this.$message({
             type: 'info',
-            message: '已取消删除',
+            message: '已取消删除'
           })
         })
     },
-    //监听关闭按钮时间
-    outDialog() {},
-  },
+    // 监听关闭按钮时间
+    outDialog () {}
+  }
 }
 </script>
 <style scoped lang="scss">
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index c0069111..68271b96 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -12,32 +12,55 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
-          <button v-if="Cardsname == '应用资源'" class="button-reset" @click="applyAll()" style="margin-left: 0.1rem">
+          <button
+            v-if="Cardsname == '应用资源'"
+            class="button-reset"
+            @click="applyAll()"
+            style="margin-left: 0.1rem"
+          >
             全部申请
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -46,45 +69,89 @@
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-        :key="listKey2" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length > 0"
+        :resourceList="resourceList"
+        :key="listKey2"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty />
       </div>
     </div>
@@ -92,29 +159,47 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -123,36 +208,58 @@
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage ref="camera" @add="handleAdd" :searchValue="searchValue" />
+        <infrastructurePage
+          ref="camera"
+          @add="handleAdd"
+          :searchValue="searchValue"
+        />
       </div>
     </div>
     <div class="top" v-else>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -160,7 +267,10 @@
           </span>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -172,14 +282,21 @@
       <p></p>
       <p>能力广场</p>
       <ul v-show="visibleAbilitySquare">
-        <li v-for="item in abilitySquare" :key="item" @click="abilitySquareFunction(item)">
+        <li
+          v-for="item in abilitySquare"
+          :key="item"
+          @click="abilitySquareFunction(item)"
+        >
           {{ item }}
         </li>
       </ul>
     </div>
   </div>
   <!-- 西海岸 -->
-  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowXiHaiAn">
+  <div
+    class="details-pageconetent"
+    v-else-if="whoShow1 && whoShow1.itShowXiHaiAn"
+  >
     <home-header></home-header>
     <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
@@ -189,75 +306,140 @@
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
-        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length > 0"
+        :key="listKey2"
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname === '基础设施'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -267,24 +449,41 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -294,75 +493,139 @@
     </div>
   </div>
   <!-- 包头 -->
-  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowBaoTou">
+  <div
+    class="details-pageconetent"
+    v-else-if="whoShow1 && whoShow1.itShowBaoTou"
+  >
     <home-header></home-header>
     <div class="details-pageconetent-left">
       <detailsPageconetentTree />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '数据资源'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
-      <div v-show="Cardsname !== '数据资源'" class="resultListSearchInput-father">
+      <div
+        v-show="Cardsname !== '数据资源'"
+        class="resultListSearchInput-father"
+      >
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length" :key="listKey2"
-        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length"
+        :key="listKey2"
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
       <div class="shujuziyuan" v-if="Cardsname == '数据资源'">
         <div class="yunziyuan">
           <div class="yunziyuan-title">
             <div class="tupian"></div>
-            <div class="title" @click="dianjitiaozhaun('青岛市政务资源管理平台')">
+            <div
+              class="title"
+              @click="dianjitiaozhaun('青岛市政务资源管理平台')"
+            >
               青岛市政务资源管理平台{{ dataShowdev }}
             </div>
           </div>
@@ -378,18 +641,28 @@
           </div>
         </div>
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty v-if="!(Cardsname == '数据资源')" />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname == '数据资源'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -397,489 +670,625 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
   </div>
   <home-footer></home-footer>
 </template>
 <script>
-import HomeFooter from '@/views/newHome/components/Footer'
-import mybus from '@/myplugins/mybus'
-import { defineComponent, reactive, ref, toRefs, onMounted, watch, nextTick } from 'vue'
-import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-import {
-  selectDicStoreAll,
-  pageWithAttrs,
-  getDataResource,
-  getCountByFuzzyQuery,
-} from '@/api/home.js'
-import { getSgcList } from '@/api/personalCenter'
-import { useRouter } from 'vue-router'
-import HomeHeader from '@/views/home/components/header'
-import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
-import searchResultList from '@/views/home/components/searchResultList.vue'
-import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
-// 数据资源引用
-import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
-// 基础设施引用
-import infrastructurePage from '@/views/home/infrastructurePage.vue'
-import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
+  import HomeFooter from '@/views/newHome/components/Footer'
+  import mybus from '@/myplugins/mybus'
+  import {
+    defineComponent,
+    reactive,
+    ref,
+    toRefs,
+    onMounted,
+    watch,
+    nextTick,
+  } from 'vue'
+  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import {
+    selectDicStoreAll,
+    pageWithAttrs,
+    getDataResource,
+    getCountByFuzzyQuery,
+  } from '@/api/home.js'
+  import { getSgcList } from '@/api/personalCenter'
+  import { useRouter } from 'vue-router'
+  import HomeHeader from '@/views/home/components/header'
+  import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
+  import searchResultList from '@/views/home/components/searchResultList.vue'
+  import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
+  // 数据资源引用
+  import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
+  // 基础设施引用
+  import infrastructurePage from '@/views/home/infrastructurePage.vue'
+  import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
 
-import { message } from 'ant-design-vue'
-import {
-  titleNameArray,
-  keyongziyuanqingkaungArray,
-  shujuziyuanqingkuangArray,
-} from './constantData/showData.js'
+  import { message } from 'ant-design-vue'
+  import {
+    titleNameArray,
+    keyongziyuanqingkaungArray,
+    shujuziyuanqingkuangArray,
+  } from './constantData/showData.js'
 
-export default defineComponent({
-  beforeRouteLeave(to, from, next) {
-    console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
-    console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
-    console.log('next---DetailsPageconetent--beforeRouteLeave------->', next)
-    if (to.name !== 'details') {
-      localStorage.removeItem('DetailsPageconetent')
-    }
-    next()
-  },
-  setup() {
-    //会议室传的标识6
-    const flag = ref('')
-    let componentTypeArray = ['组件类型', '应用领域']
-    const handleAdd = (value) => {
-      flag.value = value
-    }
-    const titleName = ref(titleNameArray)
-
-    const openMonitor = () => {
-      window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
-    }
-    // 模糊查询
-    const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
-    const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
-
-    // 青岛数据资源页
-    const whoShow1 = ref(whoShow)
-    // 分页
-    const loading = ref(true)
-    let currentPage = ref(1)
-    let currentPageSize = ref(5)
-    const pageSizeOptions = ref(['5', '10', '20', '50'])
-    const router = useRouter()
-    let select = router.currentRoute.value.query.select || '应用资源'
-    const select2 = router.currentRoute.value.query.select
-    const str = router.currentRoute.value.query.str
-    const searchValue = ref(str)
-    let tecHnosphere = router.currentRoute.value.query.tecHnosphere
-    let appLiCation = router.currentRoute.value.query.appLiCation
-    const Cardsname = ref(select)
-    // 刷新筛选条件组件
-    let listKey = ref(0)
-    // 刷新筛选列表信息组件
-    const listKey2 = ref(0)
-    // 储存筛选条件状态
-    const state = reactive({
-      selectedTags: [],
-      diyici: [],
-    })
-    // 查询参数
-    let paramsGetResources = {
-      districtId: '',
-      deptIds: [],
-      pageNum: 1,
-      pageSize: currentPageSize.value,
-      type: Cardsname.value,
-      name: '',
-      infoList: [],
-      orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-      orderType: 'DESC', // ASC 升序  DESC 降序
-    }
-
-    const searchResultListDom = ref(null)
-
-    // 读取本地存储查询条件
-    let storageSearchInfo = null
-    const handleSetSearchData = () => {
-      if (whoShow1.value.itShowXiHaiAn) {
-        if (localStorage.getItem('DetailsPageconetent')) {
-          storageSearchInfo = JSON.parse(localStorage.getItem('DetailsPageconetent'));
-        }
-        console.log('storageSearchInfo------------>', storageSearchInfo)
-        // 读取本地存储：表单赋值
-        if (storageSearchInfo) {
-          paramsGetResources = Object.assign({}, paramsGetResources, storageSearchInfo)
-          // 搜索名称
-          searchValue.value = storageSearchInfo.name;
-          currentPage.value = storageSearchInfo.pageNum;
-          currentPageSize.value = storageSearchInfo.pageSize;
-          paramsGetResources.pageNum = storageSearchInfo.pageNum;
-          paramsGetResources.pageSize = storageSearchInfo.pageSize;
-          paramsGetResources.deptIds = storageSearchInfo.deptIds;
-          paramsGetResources.districtId = storageSearchInfo.districtId;
-
-          // 延迟使用，因为还没有返回跟挂载
-          nextTick(() => {
-            searchResultListDom.value.changeCondition({
-              value: storageSearchInfo.orderField,
-              orderType: storageSearchInfo.orderType,
-            }, true)
-          })
-        }
+  export default defineComponent({
+    beforeRouteLeave(to, from, next) {
+      console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
+      console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
+      console.log('next---DetailsPageconetent--beforeRouteLeave------->', next)
+      if (to.name !== 'details') {
+        localStorage.removeItem('DetailsPageconetent')
       }
-    }
-
-    //西海岸查询参数
-    let paramsGetResources2 = ref({
-      regionId: '70be8c5b664f4bcf869d82f2e8335051',
-      pageNum: 1,
-      pageSize: currentPageSize.value,
-      name: '',
-    })
-    // 查询
-    const onSearch = () => {
-      loading.value = true
-      paramsGetResources.name = searchValue.value
-      currentPage.value = 1
-    }
-    // 免批
-    const tagFlag = ref('')
-    const current = ref(5)
-    const chagneTag = (name) => {
-      console.log('name------------>', name)
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      if (tagFlag.value == name) {
-        tagFlag.value = ''
-        paramsGetResources.shareCondition = ''
-      } else {
-        tagFlag.value = name
-        paramsGetResources.shareCondition = name
+      next()
+    },
+    setup() {
+      //会议室传的标识6
+      const flag = ref('')
+      let componentTypeArray = ['组件类型', '应用领域']
+      const handleAdd = (value) => {
+        flag.value = value
       }
-      listKey.value++
-      getAppResources()
-      console.log('paramsGetResources-----chagneTag------->', paramsGetResources);
-    }
+      const titleName = ref(titleNameArray)
 
-    // 重置数据
-    const chongzhi = (flag) => {
-      loading.value = true
-      // 重置模糊查字段
-      if (!flag) {
-        searchValue.value = ''
-        globalFlag.value = false
-        globalData.data = []
+      const openMonitor = () => {
+        window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
       }
-      paramsGetResources.name = searchValue.value
-      // 重置筛选条件
-      ListContent.records.forEach((val) => {
-        val.selectedTags = []
-      })
+      // 模糊查询
+      const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
+      const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
+
+      // 青岛数据资源页
+      const whoShow1 = ref(whoShow)
       // 分页
-      currentPage.value = 1
-      currentPageSize.value = 5
-      // 重置查询条件
-      paramsGetResources2.value = {
+      const loading = ref(true)
+      let currentPage = ref(1)
+      let currentPageSize = ref(5)
+      const pageSizeOptions = ref(['5', '10', '20', '50'])
+      const router = useRouter()
+      let select = router.currentRoute.value.query.select || '应用资源'
+      const select2 = router.currentRoute.value.query.select
+      const str = router.currentRoute.value.query.str
+      const searchValue = ref(str)
+      let tecHnosphere = router.currentRoute.value.query.tecHnosphere
+      let appLiCation = router.currentRoute.value.query.appLiCation
+      const Cardsname = ref(select)
+      // 刷新筛选条件组件
+      let listKey = ref(0)
+      // 刷新筛选列表信息组件
+      const listKey2 = ref(0)
+      // 储存筛选条件状态
+      const state = reactive({
+        selectedTags: [],
+        diyici: [],
+      })
+      // 查询参数
+      let paramsGetResources = {
+        districtId: '',
+        deptIds: [],
+        pageNum: 1,
+        pageSize: currentPageSize.value,
+        type: Cardsname.value,
+        name: '',
+        infoList: [],
+        orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+        orderType: 'DESC', // ASC 升序  DESC 降序
+      }
+
+      const searchResultListDom = ref(null)
+
+      // 读取本地存储查询条件
+      let storageSearchInfo = null
+      const handleSetSearchData = () => {
+        if (whoShow1.value.itShowXiHaiAn) {
+          if (localStorage.getItem('DetailsPageconetent')) {
+            storageSearchInfo = JSON.parse(
+              localStorage.getItem('DetailsPageconetent')
+            )
+          }
+          console.log('storageSearchInfo------------>', storageSearchInfo)
+          // 读取本地存储：表单赋值
+          if (storageSearchInfo) {
+            paramsGetResources = Object.assign(
+              {},
+              paramsGetResources,
+              storageSearchInfo
+            )
+            // 搜索名称
+            searchValue.value = storageSearchInfo.name
+            currentPage.value = storageSearchInfo.pageNum
+            currentPageSize.value = storageSearchInfo.pageSize
+            paramsGetResources.pageNum = storageSearchInfo.pageNum
+            paramsGetResources.pageSize = storageSearchInfo.pageSize
+            paramsGetResources.deptIds = storageSearchInfo.deptIds
+            paramsGetResources.districtId = storageSearchInfo.districtId
+
+            // 延迟使用，因为还没有返回跟挂载
+            nextTick(() => {
+              searchResultListDom.value.changeCondition(
+                {
+                  value: storageSearchInfo.orderField,
+                  orderType: storageSearchInfo.orderType,
+                },
+                true
+              )
+            })
+          }
+        }
+      }
+
+      //西海岸查询参数
+      let paramsGetResources2 = ref({
         regionId: '70be8c5b664f4bcf869d82f2e8335051',
         pageNum: 1,
         pageSize: currentPageSize.value,
         name: '',
+      })
+      // 查询
+      const onSearch = () => {
+        loading.value = true
+        paramsGetResources.name = searchValue.value
+        currentPage.value = 1
       }
-      paramsGetResources.districtId = ''
-      paramsGetResources.deptIds = []
-      paramsGetResources.pageNum = 1
-      paramsGetResources.pageSize = 5
-      paramsGetResources.name = ''
-      paramsGetResources.shareCondition = ''
-      paramsGetResources.infoList = []
-      paramsGetResources.orderField = ''
-      paramsGetResources.orderType = 'DESC'
-      mybus.emit('chongzhi')
-      console.log('paramsGetResources---chongzhi-重置-------->', paramsGetResources);
-      getAppResources()
-    }
-
-    //跳转链接
-    function dianjitiaozhaun(name) {
-      switch (name) {
-        case '青岛市政务资源管理平台':
-          window.open('http://15.72.158.81/web/root/homepage.aspx')
-          console.log('name', name)
-          break
-        case '青岛市视频资源管理平台':
-          window.open('http://15.72.183.88:8760/yzy/main')
-          console.log('name', name)
-          break
-      }
-    }
-
-    // 点击筛选条件回调
-    const handleChange = (tag, checked, name) => {
-      loading.value = true
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      console.log('点击筛选条件=================>', tag, checked, name)
-
-      // 西海岸-智能算法 特殊处理
-      if (whoShow1.value.itShowXiHaiAn) {
-        if (tag.dict_label == '智能算法' && checked) {
-          if(ListContentCopy.value[2]) {
-            ListContent.records.splice(2, 1, ListContentCopy.value[2])
-          }
+      // 免批
+      const tagFlag = ref('')
+      const current = ref(5)
+      const chagneTag = (name) => {
+        console.log('name------------>', name)
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        if (tagFlag.value == name) {
+          tagFlag.value = ''
+          paramsGetResources.shareCondition = ''
         } else {
-          if (name == '组件类型') {
-            ListContent.records.splice(2, 1)
-            paramsGetResources.infoList = paramsGetResources.infoList.filter(
-              (item) => componentTypeArray.includes(item.attrType)
-            )
-          }
+          tagFlag.value = name
+          paramsGetResources.shareCondition = name
+        }
+        listKey.value++
+        getAppResources()
+        console.log(
+          'paramsGetResources-----chagneTag------->',
+          paramsGetResources
+        )
+      }
+
+      // 重置数据
+      const chongzhi = (flag) => {
+        loading.value = true
+        // 重置模糊查字段
+        if (!flag) {
+          searchValue.value = ''
+          globalFlag.value = false
+          globalData.data = []
+        }
+        paramsGetResources.name = searchValue.value
+        // 重置筛选条件
+        ListContent.records.forEach((val) => {
+          val.selectedTags = []
+        })
+        // 分页
+        currentPage.value = 1
+        currentPageSize.value = 5
+        // 重置查询条件
+        paramsGetResources2.value = {
+          regionId: '70be8c5b664f4bcf869d82f2e8335051',
+          pageNum: 1,
+          pageSize: currentPageSize.value,
+          name: '',
+        }
+        paramsGetResources.districtId = ''
+        paramsGetResources.deptIds = []
+        paramsGetResources.pageNum = 1
+        paramsGetResources.pageSize = 5
+        paramsGetResources.name = ''
+        paramsGetResources.shareCondition = ''
+        paramsGetResources.infoList = []
+        paramsGetResources.orderField = ''
+        paramsGetResources.orderType = 'DESC'
+        mybus.emit('chongzhi')
+        console.log(
+          'paramsGetResources---chongzhi-重置-------->',
+          paramsGetResources
+        )
+        getAppResources()
+      }
+
+      //跳转链接
+      function dianjitiaozhaun(name) {
+        switch (name) {
+          case '青岛市政务资源管理平台':
+            window.open('http://15.72.158.81/web/root/homepage.aspx')
+            console.log('name', name)
+            break
+          case '青岛市视频资源管理平台':
+            window.open('http://15.72.183.88:8760/yzy/main')
+            console.log('name', name)
+            break
         }
       }
 
-      ListContent.records.forEach((val) => {
-        if (!val) {
-          return;
-        }
-        if (val.name === name) {
-          paramsGetResources.infoList = paramsGetResources.infoList.filter(
-            (item) => item.attrType !== name
-          )
-          if (val.selectedTags && val.selectedTags.indexOf(tag.dict_label) == -1) {
-            val.selectedTags = [tag.dict_label]
-            paramsGetResources.infoList.push({
-              attrType: name,
-              attrValue: tag.dict_label,
-            })
-          } else {
-            val.selectedTags && val.selectedTags.splice(val.selectedTags.indexOf(tag.dict_label), 1)
-          }
+      // 点击筛选条件回调
+      const handleChange = (tag, checked, name) => {
+        loading.value = true
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        console.log('点击筛选条件=================>', tag, checked, name)
 
-          // 西海岸-智能算法 特殊处理
-          if (whoShow1.value.itShowXiHaiAn) {
-            if ((val.selectedTags.length == 0 && tag.dict_label == '智能算法' && !checked) || (tag.dict_label !== '智能算法' && name == '组件类型')) {
-              if (ListContentCopy.value[2]) {
-                ListContentCopy.value[2].selectedTags = []
+        // 西海岸-智能算法 特殊处理
+        if (whoShow1.value.itShowXiHaiAn) {
+          if (tag.dict_label == '智能算法' && checked) {
+            if (ListContentCopy.value[2]) {
+              ListContent.records.splice(2, 1, ListContentCopy.value[2])
+            }
+          } else {
+            if (name == '组件类型') {
+              ListContent.records.splice(2, 1)
+              paramsGetResources.infoList = paramsGetResources.infoList.filter(
+                (item) => componentTypeArray.includes(item.attrType)
+              )
+            }
+          }
+        }
+
+        ListContent.records.forEach((val) => {
+          if (!val) {
+            return
+          }
+          if (val.name === name) {
+            paramsGetResources.infoList = paramsGetResources.infoList.filter(
+              (item) => item.attrType !== name
+            )
+            if (
+              val.selectedTags &&
+              val.selectedTags.indexOf(tag.dict_label) == -1
+            ) {
+              val.selectedTags = [tag.dict_label]
+              paramsGetResources.infoList.push({
+                attrType: name,
+                attrValue: tag.dict_label,
+              })
+            } else {
+              val.selectedTags &&
+                val.selectedTags.splice(
+                  val.selectedTags.indexOf(tag.dict_label),
+                  1
+                )
+            }
+
+            // 西海岸-智能算法 特殊处理
+            if (whoShow1.value.itShowXiHaiAn) {
+              if (
+                (val.selectedTags.length == 0 &&
+                  tag.dict_label == '智能算法' &&
+                  !checked) ||
+                (tag.dict_label !== '智能算法' && name == '组件类型')
+              ) {
+                if (ListContentCopy.value[2]) {
+                  ListContentCopy.value[2].selectedTags = []
+                }
               }
             }
           }
-        }
-      })
-      listKey.value++
-      console.log('paramsGetResources---handleChange--------->', paramsGetResources);
-      getAppResources()
-    }
-    const getNewList = () => {
-      tecHnosphere = router.currentRoute.value.query.tecHnosphere
-      appLiCation = router.currentRoute.value.query.appLiCation
-      const params = {
-        topCategoryName: Cardsname.value,
+        })
+        listKey.value++
+        console.log(
+          'paramsGetResources---handleChange--------->',
+          paramsGetResources
+        )
+        getAppResources()
       }
-      selectDicStoreAll(params).then((res) => {
-        console.log('selectDicStoreAll============>', res)
-        const { data } = res.data;
-        let dataCopy = data
+      const getNewList = () => {
         tecHnosphere = router.currentRoute.value.query.tecHnosphere
         appLiCation = router.currentRoute.value.query.appLiCation
-        mybus.emit('getDeptList')
-        dataCopy.forEach((val) => {
-          val.selectedTags = []
-          if (val.name == '应用领域' && appLiCation) {
-            val.selectedTags[0] = []
-            val.selectedTags[0] = appLiCation
-            paramsGetResources.infoList.push({
-              attrType: '应用领域',
-              attrValue: appLiCation,
-            })
-            if (searchValue.value) {
-              paramsGetResources.name = searchValue.value
-            }
-
-            pageWithAttrs(paramsGetResources).then((res) => {
-              resourceList.data = []
-              resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-            })
-          }
-          tecHnosphere = router.currentRoute.value.query.tecHnosphere
-          appLiCation = router.currentRoute.value.query.appLiCation
-          if (val.name == '技术领域' && tecHnosphere) {
-            val.selectedTags[1] = tecHnosphere
-            paramsGetResources.infoList.push({
-              attrType: '技术领域',
-              attrValue: tecHnosphere,
-            })
-            if (searchValue.value) {
-              paramsGetResources.name = searchValue.value
-            }
-            pageWithAttrs(paramsGetResources).then((res) => {
-              resourceList.data = []
-              resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-            })
-            console.log('paramsGetResources', paramsGetResources)
-          }
-          tecHnosphere = router.currentRoute.value.query.tecHnosphere
-          appLiCation = router.currentRoute.value.query.appLiCation
-          if (val.typeList && val.typeList.length > 8) {
-            val.showShrink = true
-            val.shrinkFlag = true
-          }
-
-          if (storageSearchInfo) {
-            let obj =
-              (storageSearchInfo.infoList || []).find(
-                (x) => x.attrType === val.name
-              );
-            if (obj) {
-              val.selectedTags = [obj.attrValue] || []
-            }
-          }
-        })
-        ListContentCopy.value = []
-        ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy));
-        ListContent.records = []
-        ListContent.records = JSON.parse(JSON.stringify(dataCopy));
-
-        // 智能算法-特殊处理
-        if (!storageSearchInfo) {
-          let _tag_list = dataCopy.filter(v => componentTypeArray.includes(v.name))
-          ListContent.records = _tag_list
+        const params = {
+          topCategoryName: Cardsname.value,
         }
+        selectDicStoreAll(params).then((res) => {
+          console.log('selectDicStoreAll============>', res)
+          const { data } = res.data
+          let dataCopy = data
+          tecHnosphere = router.currentRoute.value.query.tecHnosphere
+          appLiCation = router.currentRoute.value.query.appLiCation
+          mybus.emit('getDeptList')
+          dataCopy.forEach((val) => {
+            val.selectedTags = []
+            if (val.name == '应用领域' && appLiCation) {
+              val.selectedTags[0] = []
+              val.selectedTags[0] = appLiCation
+              paramsGetResources.infoList.push({
+                attrType: '应用领域',
+                attrValue: appLiCation,
+              })
+              if (searchValue.value) {
+                paramsGetResources.name = searchValue.value
+              }
 
-        listKey.value++
-        listKey2.value++
-      })
-      console.log('selectDicStoreAll', ListContent)
-    }
-    // 筛选条件
-    let ListContent = reactive({
-      records: [],
-    })
-    let ListContentCopy = ref([])
-    const resourceList = reactive({ data: [] })
-    const videoList = reactive({ data: [] })
-    const resourceTotal = ref('')
-    // 全局搜索
-    const camera = ref(null)
-    const globalData = reactive({ data: [] })
-    const globalFlag = ref(false)
-    const globalSearch = () => {
-      if (searchValue.value) {
-        globalFlag.value = true
-        getCountByFuzzyQuery(searchValue.value || '').then((res) => {
-          console.log('全局搜索==========》', res.data.data)
-          globalData.data = res.data.data
-          let mapFlag = true
-          res.data.data.map((val) => {
-            if (mapFlag && val.count != 0) {
-              mapFlag = false
-              changeCards(val.type)
+              pageWithAttrs(paramsGetResources).then((res) => {
+                resourceList.data = []
+                resourceList.data = res.data.data.records || []
+                resourceTotal.value = res.data.data.total || ''
+              })
+            }
+            tecHnosphere = router.currentRoute.value.query.tecHnosphere
+            appLiCation = router.currentRoute.value.query.appLiCation
+            if (val.name == '技术领域' && tecHnosphere) {
+              val.selectedTags[1] = tecHnosphere
+              paramsGetResources.infoList.push({
+                attrType: '技术领域',
+                attrValue: tecHnosphere,
+              })
+              if (searchValue.value) {
+                paramsGetResources.name = searchValue.value
+              }
+              pageWithAttrs(paramsGetResources).then((res) => {
+                resourceList.data = []
+                resourceList.data = res.data.data.records || []
+                resourceTotal.value = res.data.data.total || ''
+              })
+              console.log('paramsGetResources', paramsGetResources)
+            }
+            tecHnosphere = router.currentRoute.value.query.tecHnosphere
+            appLiCation = router.currentRoute.value.query.appLiCation
+            if (val.typeList && val.typeList.length > 8) {
+              val.showShrink = true
+              val.shrinkFlag = true
+            }
+
+            if (storageSearchInfo) {
+              let obj = (storageSearchInfo.infoList || []).find(
+                (x) => x.attrType === val.name
+              )
+              if (obj) {
+                val.selectedTags = [obj.attrValue] || []
+              }
             }
           })
-          if (!mapFlag) {
-            return
+          ListContentCopy.value = []
+          ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
+          ListContent.records = []
+          ListContent.records = JSON.parse(JSON.stringify(dataCopy))
+
+          // 智能算法-特殊处理
+          if (!storageSearchInfo) {
+            let _tag_list = dataCopy.filter((v) =>
+              componentTypeArray.includes(v.name)
+            )
+            ListContent.records = _tag_list
           }
-          if (paramsGetResources.type == '基础设施') {
-            console.log('camera1', camera.value)
-            camera.value.getCamera(true, searchValue.value)
+
+          listKey.value++
+          listKey2.value++
+        })
+        console.log('selectDicStoreAll', ListContent)
+      }
+      // 筛选条件
+      let ListContent = reactive({
+        records: [],
+      })
+      let ListContentCopy = ref([])
+      const resourceList = reactive({ data: [] })
+      const videoList = reactive({ data: [] })
+      const resourceTotal = ref('')
+      // 全局搜索
+      const camera = ref(null)
+      const globalData = reactive({ data: [] })
+      const globalFlag = ref(false)
+      const globalSearch = () => {
+        if (searchValue.value) {
+          globalFlag.value = true
+          getCountByFuzzyQuery(searchValue.value || '').then((res) => {
+            console.log('全局搜索==========》', res.data.data)
+            globalData.data = res.data.data
+            let mapFlag = true
+            res.data.data.map((val) => {
+              if (mapFlag && val.count != 0) {
+                mapFlag = false
+                changeCards(val.type)
+              }
+            })
+            if (!mapFlag) {
+              return
+            }
+            if (paramsGetResources.type == '基础设施') {
+              console.log('camera1', camera.value)
+              camera.value.getCamera(true, searchValue.value)
+            } else {
+              getAppResources()
+            }
+            console.log(
+              'paramsGetResources--globalSearch---------->',
+              paramsGetResources
+            )
+          })
+        } else {
+          message.warning('全局搜索必须输入关键词！')
+        }
+      }
+      // 校验
+      const re = /^[0-9\u4E00-\u9FA5]*$/
+      const getAppResources2 = () => {
+        globalFlag.value = false
+        if (
+          whoShow1.value.itShowQingDao &&
+          paramsGetResources.type == '基础设施'
+        ) {
+          console.log('camera2', camera)
+          // camera.value.getCamera(true, searchValue.value)
+        } else {
+          if (storageSearchInfo) {
+            getAppResources('分页查询')
           } else {
             getAppResources()
           }
-          console.log('paramsGetResources--globalSearch---------->', paramsGetResources);
-
-        })
-      } else {
-        message.warning('全局搜索必须输入关键词！')
-      }
-    }
-    // 校验
-    const re = /^[0-9\u4E00-\u9FA5]*$/
-    const getAppResources2 = () => {
-      globalFlag.value = false
-      if (
-        whoShow1.value.itShowQingDao &&
-        paramsGetResources.type == '基础设施'
-      ) {
-        console.log('camera2', camera)
-        camera.value.getCamera(true, searchValue.value)
-      } else {
-        if (storageSearchInfo) {
-          getAppResources('分页查询')
-        } else {
-          getAppResources()
         }
       }
-    }
-    const getAppResources = (switchIndex) => {
-      if (!globalFlag.value) {
-        globalData.data = []
-      }
-      select = router.currentRoute.value.query.select
-      if (
-        (select == '应用资源' &&
-          (paramsGetResources.orderField == '' ||
-            paramsGetResources.orderField == 'deptSort' ||
-            paramsGetResources.orderField == 'pin_top')) ||
-        (paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0] &&
+      const getAppResources = (switchIndex) => {
+        if (!globalFlag.value) {
+          globalData.data = []
+        }
+        select = router.currentRoute.value.query.select
+        if (
+          (select == '应用资源' &&
+            (paramsGetResources.orderField == '' ||
+              paramsGetResources.orderField == 'deptSort' ||
+              paramsGetResources.orderField == 'pin_top')) ||
+          (paramsGetResources.infoList.filter(
+            (val) => val.attrType == '组件类型'
+          )[0] &&
+            paramsGetResources.infoList.filter(
+              (val) => val.attrType == '组件类型'
+            )[0].attrValue == '图层服务' &&
+            (paramsGetResources.orderField == '' ||
+              paramsGetResources.orderField == 'deptSort' ||
+              paramsGetResources.orderField == 'pin_top'))
+        ) {
+          paramsGetResources.orderField = 'deptSort'
+        } else if (
           paramsGetResources.infoList.filter(
             (val) => val.attrType == '组件类型'
-          )[0].attrValue == '图层服务' &&
+          )[0] &&
+          paramsGetResources.infoList.filter(
+            (val) => val.attrType == '组件类型'
+          )[0].attrValue == '智能算法' &&
           (paramsGetResources.orderField == '' ||
             paramsGetResources.orderField == 'deptSort' ||
-            paramsGetResources.orderField == 'pin_top'))
-      ) {
-        paramsGetResources.orderField = 'deptSort'
-      } else if (
-        paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0] &&
-        paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0].attrValue == '智能算法' &&
-        (paramsGetResources.orderField == '' ||
+            paramsGetResources.orderField == 'pin_top')
+        ) {
+          paramsGetResources.orderField = 'pin_top'
+        } else if (
+          paramsGetResources.orderField == '' ||
           paramsGetResources.orderField == 'deptSort' ||
-          paramsGetResources.orderField == 'pin_top')
-      ) {
-        paramsGetResources.orderField = 'pin_top'
-      } else if (
-        paramsGetResources.orderField == '' ||
-        paramsGetResources.orderField == 'deptSort' ||
-        paramsGetResources.orderField == 'pin_top'
-      ) {
-        paramsGetResources.orderField = ''
-      }
-      if (searchValue.value) {
-        let str = ''
-        let r = null
-        if (
-          searchValue.value.length >= 2 &&
-          paramsGetResources.type !== '基础设施'
+          paramsGetResources.orderField == 'pin_top'
         ) {
-          str = searchValue.value.substring(0, 2)
-          r = re.test(str)
+          paramsGetResources.orderField = ''
         }
-        if (
-          (searchValue.value.length > 1 && r) ||
-          paramsGetResources.type === '基础设施'
-        ) {
+        if (searchValue.value) {
+          let str = ''
+          let r = null
+          if (
+            searchValue.value.length >= 2 &&
+            paramsGetResources.type !== '基础设施'
+          ) {
+            str = searchValue.value.substring(0, 2)
+            r = re.test(str)
+          }
+          if (
+            (searchValue.value.length > 1 && r) ||
+            paramsGetResources.type === '基础设施'
+          ) {
+            paramsGetResources.name = searchValue.value
+            paramsGetResources.type = Cardsname.value
+            if (
+              !whoShow1.value.itShowBaoTou &&
+              paramsGetResources.type === '数据资源'
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              let dataResourceParams = {
+                serviceName: paramsGetResources.name || '', //资源名称
+                orderField: whoShow1.value.itShowQingDao
+                  ? paramsGetResources.orderField == 'applyCount'
+                    ? 'syqk'
+                    : 'fbrq'
+                  : paramsGetResources.orderField == 'applyCount'
+                  ? 'requestCount'
+                  : 'createTime', //排序字段
+                orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+                pageNum: paramsGetResources.pageNum, //页码
+                pageSize: paramsGetResources.pageSize, //分页大小
+              }
+              getDataResource(dataResourceParams).then((res) => {
+                loading.value = false
+                console.log('res.data.data----874-------->', res.data.data)
+                if (whoShow1.value.itShowQingDao) {
+                  if (whoShow1.value.itShowZhanTingDev) {
+                    // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样
+                    console.log('999----->', res.data.data.list)
+                    getXiHaiAn(res)
+                  } else {
+                    getQingDao(res)
+                  }
+                } else if (whoShow1.value.itShowXiHaiAn) {
+                  getXiHaiAn(res)
+                }
+              })
+            } else if (
+              paramsGetResources.type !== '数据资源' &&
+              (paramsGetResources.type !== '基础设施' ||
+                !whoShow1.value.itShowXiHaiAn)
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              pageWithAttrs(paramsGetResources).then((res) => {
+                console.log(
+                  '查询列表====22========>',
+                  resourceList,
+                  res.data.data
+                )
+                resourceList.data = []
+                videoList.data = []
+                if (Cardsname.value === '基础设施') {
+                  resourceList.data = res.data.data.records || []
+                  resourceTotal.value = res.data.data.total || ''
+                  loading.value = false
+                } else {
+                  resourceTotal.value = res.data.data.total || ''
+                  resourceList.data = res.data.data.records || []
+                }
+              })
+            } else if (
+              paramsGetResources.type === '基础设施' &&
+              whoShow1.value.itShowXiHaiAn
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              paramsGetResources2.value.pageNum = paramsGetResources.pageNum
+              paramsGetResources2.value.pageSize = paramsGetResources.pageSize
+              paramsGetResources2.value.name = paramsGetResources.name
+            }
+          } else {
+            message.error('请以两位以上汉字或数字开头')
+          }
+        } else {
+          //switchIndex这个参数是下面的分页传过来的参数
           paramsGetResources.name = searchValue.value
           paramsGetResources.type = Cardsname.value
           if (
@@ -896,25 +1305,24 @@ export default defineComponent({
                   ? 'syqk'
                   : 'fbrq'
                 : paramsGetResources.orderField == 'applyCount'
-                  ? 'requestCount'
-                  : 'createTime', //排序字段
+                ? 'requestCount'
+                : 'createTime', //排序字段
               orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
               pageNum: paramsGetResources.pageNum, //页码
               pageSize: paramsGetResources.pageSize, //分页大小
             }
             getDataResource(dataResourceParams).then((res) => {
               loading.value = false
-              console.log('res.data.data----874-------->', res.data.data);
+              console.log('res.data.data----982-------->', res.data.data)
               if (whoShow1.value.itShowQingDao) {
                 if (whoShow1.value.itShowZhanTingDev) {
-                  // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样
-                  console.log('999----->', res.data.data.list)
                   getXiHaiAn(res)
                 } else {
                   getQingDao(res)
                 }
               } else if (whoShow1.value.itShowXiHaiAn) {
                 getXiHaiAn(res)
+                loading.value = false
               }
             })
           } else if (
@@ -926,7 +1334,11 @@ export default defineComponent({
               paramsGetResources.pageNum = 1
             }
             pageWithAttrs(paramsGetResources).then((res) => {
-              console.log('查询列表====22========>', resourceList, res.data.data)
+              console.log(
+                '查询列表===11=========>',
+                resourceList,
+                res.data.data
+              )
               resourceList.data = []
               videoList.data = []
               if (Cardsname.value === '基础设施') {
@@ -939,7 +1351,7 @@ export default defineComponent({
               }
             })
           } else if (
-            paramsGetResources.type === '基础设施' &&
+            paramsGetResources.type === '基础设施' ||
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -947,390 +1359,345 @@ export default defineComponent({
             }
             paramsGetResources2.value.pageNum = paramsGetResources.pageNum
             paramsGetResources2.value.pageSize = paramsGetResources.pageSize
-            paramsGetResources2.value.name = paramsGetResources.name
           }
-        } else {
-          message.error('请以两位以上汉字或数字开头')
-        }
-      } else {
-        //switchIndex这个参数是下面的分页传过来的参数
-        paramsGetResources.name = searchValue.value
-        paramsGetResources.type = Cardsname.value
-        if (
-          !whoShow1.value.itShowBaoTou &&
-          paramsGetResources.type === '数据资源'
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          let dataResourceParams = {
-            serviceName: paramsGetResources.name || '', //资源名称
-            orderField: whoShow1.value.itShowQingDao
-              ? paramsGetResources.orderField == 'applyCount'
-                ? 'syqk'
-                : 'fbrq'
-              : paramsGetResources.orderField == 'applyCount'
-                ? 'requestCount'
-                : 'createTime', //排序字段
-            orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-            pageNum: paramsGetResources.pageNum, //页码
-            pageSize: paramsGetResources.pageSize, //分页大小
-          }
-          getDataResource(dataResourceParams).then((res) => {
-            loading.value = false
-            console.log('res.data.data----982-------->', res.data.data);
-            if (whoShow1.value.itShowQingDao) {
-              if (whoShow1.value.itShowZhanTingDev) {
-                getXiHaiAn(res)
-              } else {
-                getQingDao(res)
-              }
-            } else if (whoShow1.value.itShowXiHaiAn) {
-              getXiHaiAn(res)
-              loading.value = false
-            }
-          })
-        } else if (
-          paramsGetResources.type !== '数据资源' &&
-          (paramsGetResources.type !== '基础设施' ||
-            !whoShow1.value.itShowXiHaiAn)
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          pageWithAttrs(paramsGetResources).then((res) => {
-            console.log('查询列表===11=========>', resourceList, res.data.data)
-            resourceList.data = []
-            videoList.data = []
-            if (Cardsname.value === '基础设施') {
-              resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-              loading.value = false
-            } else {
-              resourceTotal.value = res.data.data.total || ''
-              resourceList.data = res.data.data.records || []
-            }
-          })
-        } else if (
-          paramsGetResources.type === '基础设施' ||
-          whoShow1.value.itShowXiHaiAn
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          paramsGetResources2.value.pageNum = paramsGetResources.pageNum
-          paramsGetResources2.value.pageSize = paramsGetResources.pageSize
         }
       }
-    }
 
-    // 青岛-数据处理
-    const getQingDao = (res) => {
-      (res.data && res.data.data && res.data.data.data || []).forEach((val) => {
-        val.id = val.guid // id
-        val.name = val.zyname // 名字
-        val.sjlCount = val.sjcczl // 数据量
-        val.applyCount = val.syqk // 申请量
-        val.deptName = val.TGBM // 部门
-        val.createDate = val.fbrq // 发布时间
-        val.description = val.xgxt // 描述
-      })
-      resourceList.data = res.data.data.data || []
-      resourceTotal.value = res.data.data.rows || ''
-    }
-    // 青岛-西海岸处理
-    const getXiHaiAn = (res) => {
-      (res.data && res.data.data && res.data.data.list || []).forEach((val) => {
-        val.id = val.serviceId // id
-        val.name = val.serviceName // 名字
-        val.sjlCount = val.requestQuantity // 数据量
-        val.applyCount = val.requestCount // 申请量
-        val.deptName = val.departmentName // 部门
-        val.createTime = val.createTime.split('.')[0]
-        val.createDate = val.createTime // 发布时间
-      })
-      resourceList.data = res.data.data.list || []
-      resourceTotal.value = res.data.data.total || ''
-    }
-
-    let shoppingCartList = ref([])
-    // 获取申购车列表
-    const getShoppingCartList = (list) => {
-      getSgcList({
-        pageNum: 1,
-        pageSize: 500,
-        name: '',
-        type: '',
-      }).then((res) => {
-        console.log('申购车列表================>', res.data.data.records)
-        shoppingCartList.value = res.data.data.records = console.log(
-          '经过过滤后的列表信息',
-          list
+      // 青岛-数据处理
+      const getQingDao = (res) => {
+        ;((res.data && res.data.data && res.data.data.data) || []).forEach(
+          (val) => {
+            val.id = val.guid // id
+            val.name = val.zyname // 名字
+            val.sjlCount = val.sjcczl // 数据量
+            val.applyCount = val.syqk // 申请量
+            val.deptName = val.TGBM // 部门
+            val.createDate = val.fbrq // 发布时间
+            val.description = val.xgxt // 描述
+          }
         )
-        resourceList.data = list
+        resourceList.data = res.data.data.data || []
+        resourceTotal.value = res.data.data.rows || ''
+      }
+      // 青岛-西海岸处理
+      const getXiHaiAn = (res) => {
+        ;((res.data && res.data.data && res.data.data.list) || []).forEach(
+          (val) => {
+            val.id = val.serviceId // id
+            val.name = val.serviceName // 名字
+            val.sjlCount = val.requestQuantity // 数据量
+            val.applyCount = val.requestCount // 申请量
+            val.deptName = val.departmentName // 部门
+            val.createTime = val.createTime.split('.')[0]
+            val.createDate = val.createTime // 发布时间
+          }
+        )
+        resourceList.data = res.data.data.list || []
+        resourceTotal.value = res.data.data.total || ''
+      }
+
+      let shoppingCartList = ref([])
+      // 获取申购车列表
+      const getShoppingCartList = (list) => {
+        getSgcList({
+          pageNum: 1,
+          pageSize: 500,
+          name: '',
+          type: '',
+        }).then((res) => {
+          console.log('申购车列表================>', res.data.data.records)
+          shoppingCartList.value = res.data.data.records = console.log(
+            '经过过滤后的列表信息',
+            list
+          )
+          resourceList.data = list
+        })
+      }
+      mybus.on('getCameraByParentId', (ids) => {
+        paramsGetResources2.value.regionId = ids
+        getAppResources()
       })
-    }
-    mybus.on('getCameraByParentId', (ids) => {
-      paramsGetResources2.value.regionId = ids
-      getAppResources()
-    })
-    mybus.on('paramsGetResources', (ids) => {
-      if (ids && ids.length > 0) {
-        paramsGetResources.deptIds = ids
-      } else {
-        delete paramsGetResources.deptIds
-      }
-      getAppResources()
-      console.log('paramsGetResources-----paramsGetResources------->', paramsGetResources);
-    })
-    mybus.on('changePage', (page) => {
-      paramsGetResources.pageNum = page
-      getAppResources('分页查询')
-      console.log('paramsGetResources----changePage-------->', paramsGetResources);
-    })
-    mybus.on('changeSelcted', () => {
-      // 添加申购车后，返回第一页
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      getAppResources()
-      console.log('paramsGetResources----changeSelcted-------->', paramsGetResources);
-    })
-    mybus.on('changeInfo', (info) => {
-      paramsGetResources.pageNum = 1
-      console.log('paramsGetResources.infoList', paramsGetResources.infoList)
-      paramsGetResources.infoList = paramsGetResources.infoList.filter(
-        (item) => item.attrType !== '文件类型'
-      )
-      if (info) {
-        paramsGetResources.infoList.push(info)
-      }
-      getAppResources()
-      console.log('paramsGetResources-----changeInfo------->', paramsGetResources);
-
-    })
-    mybus.on('refresh', () => {
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      getAppResources()
-      console.log('paramsGetResources-----refresh------->', paramsGetResources);
-    })
-
-    mybus.on('changeCondition', (condition) => {
-      if (!storageSearchInfo) {
-        // 回到第一页，分页页码为1
+      mybus.on('paramsGetResources', (ids) => {
+        if (ids && ids.length > 0) {
+          paramsGetResources.deptIds = ids
+        } else {
+          delete paramsGetResources.deptIds
+        }
+        getAppResources()
+        console.log(
+          'paramsGetResources-----paramsGetResources------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changePage', (page) => {
+        paramsGetResources.pageNum = page
+        getAppResources('分页查询')
+        console.log(
+          'paramsGetResources----changePage-------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changeSelcted', () => {
+        // 添加申购车后，返回第一页
         paramsGetResources.pageNum = 1
         currentPage.value = 1
-      }
-      // orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-      // orderType: 'ASC'  ASC 升序  DESC 降序
-      paramsGetResources.orderField = condition.orderField
-      paramsGetResources.orderType = condition.orderType
-      if (storageSearchInfo) {
-        getAppResources('分页查询')
-      } else {
         getAppResources()
-      }
-      console.log('paramsGetResources---changeCondition--------->', paramsGetResources);
-    })
+        console.log(
+          'paramsGetResources----changeSelcted-------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changeInfo', (info) => {
+        paramsGetResources.pageNum = 1
+        console.log('paramsGetResources.infoList', paramsGetResources.infoList)
+        paramsGetResources.infoList = paramsGetResources.infoList.filter(
+          (item) => item.attrType !== '文件类型'
+        )
+        if (info) {
+          paramsGetResources.infoList.push(info)
+        }
+        getAppResources()
+        console.log(
+          'paramsGetResources-----changeInfo------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('refresh', () => {
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        getAppResources()
+        console.log(
+          'paramsGetResources-----refresh------->',
+          paramsGetResources
+        )
+      })
 
-    const pageChange = (val) => {
-      console.log('pageChange------------>', val);
-      loading.value = true
-      currentPage.value = val
-      paramsGetResources.pageNum = val
-      getAppResources('分页查询') //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-      console.log('paramsGetResources-----pageChange------->', paramsGetResources);
-    }
-
-    onMounted(() => {
-      // 从本地读取查询条件，赋值
-      handleSetSearchData()
-
-      listKey2.value++
-      // 获取筛选条件
-      getNewList()
-      if (!tecHnosphere && !appLiCation) {
-        if (searchValue.value && !select2) {
-          globalSearch()
+      mybus.on('changeCondition', (condition) => {
+        if (!storageSearchInfo) {
+          // 回到第一页，分页页码为1
+          paramsGetResources.pageNum = 1
+          currentPage.value = 1
+        }
+        // orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+        // orderType: 'ASC'  ASC 升序  DESC 降序
+        paramsGetResources.orderField = condition.orderField
+        paramsGetResources.orderType = condition.orderType
+        if (storageSearchInfo) {
+          getAppResources('分页查询')
         } else {
-          getAppResources2()
+          getAppResources()
+        }
+        console.log(
+          'paramsGetResources---changeCondition--------->',
+          paramsGetResources
+        )
+      })
+
+      const pageChange = (val) => {
+        console.log('pageChange------------>', val)
+        loading.value = true
+        currentPage.value = val
+        paramsGetResources.pageNum = val
+        getAppResources('分页查询') //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+        console.log(
+          'paramsGetResources-----pageChange------->',
+          paramsGetResources
+        )
+      }
+
+      onMounted(() => {
+        // 从本地读取查询条件，赋值
+        handleSetSearchData()
+
+        listKey2.value++
+        // 获取筛选条件
+        getNewList()
+        if (!tecHnosphere && !appLiCation) {
+          if (searchValue.value && !select2) {
+            globalSearch()
+          } else {
+            getAppResources2()
+          }
+        }
+      })
+      // 全部申请
+      const applyAll = () => {
+        router.push({
+          path: '/apply',
+          query: {
+            applyAll: true,
+          },
+        })
+      }
+      // 分页
+      const onShowSizeChange = (current, pageSize) => {
+        currentPage.value = current
+        currentPageSize.value = pageSize
+        paramsGetResources.pageNum = current
+        paramsGetResources.pageSize = pageSize
+        getAppResources()
+        console.log(
+          'paramsGetResources----onShowSizeChange-------->',
+          paramsGetResources
+        )
+      }
+      watch(currentPageSize, () => {
+        console.log('pageSize', currentPageSize.value)
+      })
+
+      const changeShrink = (name) => {
+        ListContent.records.forEach((val) => {
+          if (val.name === name) {
+            console.log(val)
+            val.shrinkFlag = !val.shrinkFlag
+          }
+        })
+      }
+      const changeCards = (name) => {
+        resourceList.data = []
+        videoList.data = []
+        resourceTotal.value = ''
+        router.currentRoute.value.query.tecHnosphere = ''
+        router.currentRoute.value.query.appLiCation = ''
+        tecHnosphere = router.currentRoute.value.query.tecHnosphere
+        appLiCation = router.currentRoute.value.query.appLiCation
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        Cardsname.value = name
+        newQuery.select = Cardsname.value
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {
+            tagFlag.value = false
+            chongzhi(true)
+            getNewList()
+          })
+      }
+      // 监听地址栏变化
+      window.addEventListener('hashchange', () => {
+        location.reload()
+        console.log('URL发生变化了')
+      })
+      // 能力广场
+      const visibleAbilitySquare = ref(false)
+      let abilitySquare = ref(['应用广场', '算法广场', 'GIS广场'])
+      const showAbilitySquareNum = ref(0)
+      const showAbilitySquare = () => {
+        if (showAbilitySquareNum.value === 0) {
+          showAbilitySquareNum.value = 1
+          visibleAbilitySquare.value = true
+        } else if (showAbilitySquareNum.value === 1) {
+          showAbilitySquareNum.value = 0
+          visibleAbilitySquare.value = false
         }
       }
-    })
-    // 全部申请
-    const applyAll = () => {
-      router.push({
-        path: '/apply',
-        query: {
-          applyAll: true,
-        },
-      })
-    }
-    // 分页
-    const onShowSizeChange = (current, pageSize) => {
-      currentPage.value = current
-      currentPageSize.value = pageSize
-      paramsGetResources.pageNum = current
-      paramsGetResources.pageSize = pageSize
-      getAppResources()
-      console.log('paramsGetResources----onShowSizeChange-------->', paramsGetResources);
-
-    }
-    watch(currentPageSize, () => {
-      console.log('pageSize', currentPageSize.value)
-    })
-
-    const changeShrink = (name) => {
-      ListContent.records.forEach((val) => {
-        if (val.name === name) {
-          console.log(val)
-          val.shrinkFlag = !val.shrinkFlag
+      let abilitySquareFunctionData = ref('智能算法')
+      const abilitySquareFunction = (e) => {
+        let snumSquare = ref({})
+        if (e === '应用广场') {
+          abilitySquareFunctionData.value = '应用资源'
+        } else if (e === '算法广场') {
+          abilitySquareFunctionData.value = '智能算法'
+        } else if (e === 'GIS广场') {
+          abilitySquareFunctionData.value = '图层服务'
         }
-      })
-    }
-    const changeCards = (name) => {
-      resourceList.data = []
-      videoList.data = []
-      resourceTotal.value = ''
-      router.currentRoute.value.query.tecHnosphere = ''
-      router.currentRoute.value.query.appLiCation = ''
-      tecHnosphere = router.currentRoute.value.query.tecHnosphere
-      appLiCation = router.currentRoute.value.query.appLiCation
-      let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
-      Cardsname.value = name
-      newQuery.select = Cardsname.value
-      router
-        .replace({
-          query: newQuery,
+        snumSquare.value = {
+          abilityToType: abilitySquareFunctionData.value,
+        }
+        const applypage = router.resolve({
+          path: '/capacitySquare', // 跳转的页面路由
+          query: snumSquare.value,
         })
-        .then(() => {
-          tagFlag.value = false
-          chongzhi(true)
-          getNewList()
-        })
-    }
-    // 监听地址栏变化
-    window.addEventListener('hashchange', () => {
-      location.reload()
-      console.log('URL发生变化了')
-    })
-    // 能力广场
-    const visibleAbilitySquare = ref(false)
-    let abilitySquare = ref(['应用广场', '算法广场', 'GIS广场'])
-    const showAbilitySquareNum = ref(0)
-    const showAbilitySquare = () => {
-      if (showAbilitySquareNum.value === 0) {
-        showAbilitySquareNum.value = 1
-        visibleAbilitySquare.value = true
-      } else if (showAbilitySquareNum.value === 1) {
-        showAbilitySquareNum.value = 0
+        window.open(applypage.href, '_blank')
         visibleAbilitySquare.value = false
-      }
-    }
-    let abilitySquareFunctionData = ref('智能算法')
-    const abilitySquareFunction = (e) => {
-      let snumSquare = ref({})
-      if (e === '应用广场') {
-        abilitySquareFunctionData.value = '应用资源'
-      } else if (e === '算法广场') {
         abilitySquareFunctionData.value = '智能算法'
-      } else if (e === 'GIS广场') {
-        abilitySquareFunctionData.value = '图层服务'
       }
-      snumSquare.value = {
-        abilityToType: abilitySquareFunctionData.value,
+
+      // 存储查询条件到本地 todo
+      const saveSearchCodition = () => {
+        console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
+        localStorage.setItem(
+          'DetailsPageconetent',
+          JSON.stringify(paramsGetResources)
+        )
       }
-      const applypage = router.resolve({
-        path: '/capacitySquare', // 跳转的页面路由
-        query: snumSquare.value,
-      })
-      window.open(applypage.href, '_blank')
-      visibleAbilitySquare.value = false
-      abilitySquareFunctionData.value = '智能算法'
-    }
 
-    // 存储查询条件到本地 todo
-    const saveSearchCodition = () => {
-      console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
-      localStorage.setItem(
-        'DetailsPageconetent',
-        JSON.stringify(paramsGetResources)
-      )
-    }
-
-    return {
-      listKey,
-      ListContent,
-      searchValue,
-      currentPage,
-      ...toRefs(state),
-      changeCards,
-      handleChange,
-      resourceList,
-      videoList,
-      resourceTotal,
-      pageChange,
-      listKey2,
-      Cardsname,
-      getNewList,
-      getAppResources,
-      getAppResources2,
-      chongzhi,
-      onSearch,
-      onShowSizeChange,
-      currentPageSize,
-      pageSizeOptions,
-      changeShrink,
-      titleName,
-      keyongziyuanqingkaung,
-      shujuziyuanqingkuang,
-      dianjitiaozhaun,
-      chagneTag,
-      tagFlag,
-      current,
-      openMonitor,
-      loading,
-      getShoppingCartList,
-      whoShow1,
-      applyAll,
-      handleAdd,
-      flag,
-      abilitySquare,
-      visibleAbilitySquare,
-      showAbilitySquare,
-      abilitySquareFunction,
-      abilitySquareFunctionData,
-      showAbilitySquareNum,
-      globalData,
-      globalSearch,
-      camera,
-      saveSearchCodition,
-      searchResultListDom,
-      handleSetSearchData, // todo
-    }
-  },
-  components: {
-    HomeHeader,
-    HomeFooter,
-    detailsPageconetentTree,
-    searchResultList,
-    UpOutlined,
-    DownOutlined,
-    KnowledgeBase,
-    DetailsPageResource,
-    infrastructurePage,
-    detailsPageInfrastructureTree,
-  },
-  beforeUnmount() {
-    mybus.off('getCameraByParentId')
-    mybus.off('selectCardsitem')
-    mybus.off('paramsGetResources')
-    mybus.off('changeCondition')
-    mybus.off('refresh')
-    mybus.off('changePage')
-    mybus.off('changeInfo')
-  },
-})
+      return {
+        listKey,
+        ListContent,
+        searchValue,
+        currentPage,
+        ...toRefs(state),
+        changeCards,
+        handleChange,
+        resourceList,
+        videoList,
+        resourceTotal,
+        pageChange,
+        listKey2,
+        Cardsname,
+        getNewList,
+        getAppResources,
+        getAppResources2,
+        chongzhi,
+        onSearch,
+        onShowSizeChange,
+        currentPageSize,
+        pageSizeOptions,
+        changeShrink,
+        titleName,
+        keyongziyuanqingkaung,
+        shujuziyuanqingkuang,
+        dianjitiaozhaun,
+        chagneTag,
+        tagFlag,
+        current,
+        openMonitor,
+        loading,
+        getShoppingCartList,
+        whoShow1,
+        applyAll,
+        handleAdd,
+        flag,
+        abilitySquare,
+        visibleAbilitySquare,
+        showAbilitySquare,
+        abilitySquareFunction,
+        abilitySquareFunctionData,
+        showAbilitySquareNum,
+        globalData,
+        globalSearch,
+        camera,
+        saveSearchCodition,
+        searchResultListDom,
+        handleSetSearchData, // todo
+      }
+    },
+    components: {
+      HomeHeader,
+      HomeFooter,
+      detailsPageconetentTree,
+      searchResultList,
+      UpOutlined,
+      DownOutlined,
+      KnowledgeBase,
+      DetailsPageResource,
+      infrastructurePage,
+      detailsPageInfrastructureTree,
+    },
+    beforeUnmount() {
+      mybus.off('getCameraByParentId')
+      mybus.off('selectCardsitem')
+      mybus.off('paramsGetResources')
+      mybus.off('changeCondition')
+      mybus.off('refresh')
+      mybus.off('changePage')
+      mybus.off('changeInfo')
+    },
+  })
 </script>
 <style lang="less" scoped>
 @font-face {
@@ -1452,7 +1819,8 @@ export default defineComponent({
           display: flex;
           align-items: center;
 
-          .tupian {}
+          .tupian {
+          }
 
           .title {
             margin-left: 0.1rem;
@@ -1485,7 +1853,7 @@ export default defineComponent({
         }
       }
 
-      .yunziyuan>div {
+      .yunziyuan > div {
         margin-bottom: 0.1rem;
       }
 
@@ -1496,7 +1864,8 @@ export default defineComponent({
           display: flex;
           align-items: center;
 
-          .tupian {}
+          .tupian {
+          }
 
           .title {
             margin-left: 0.1rem;
@@ -1520,12 +1889,12 @@ export default defineComponent({
         }
       }
 
-      .shipin>div {
+      .shipin > div {
         margin-bottom: 0.1rem;
       }
     }
 
-    .jichusheshi>div {
+    .jichusheshi > div {
       padding-top: 0.1rem;
       border-radius: 0.04rem;
       margin-bottom: 0.2rem;
@@ -1554,7 +1923,8 @@ export default defineComponent({
           align-items: center;
           margin-left: 0.2rem;
 
-          .tupian {}
+          .tupian {
+          }
 
           .title {
             margin-left: 0.1rem;
@@ -1587,12 +1957,12 @@ export default defineComponent({
         }
       }
 
-      .yunziyuan>div {
+      .yunziyuan > div {
         margin-bottom: 0.1rem;
       }
     }
 
-    .shujuziyuan>div {
+    .shujuziyuan > div {
       background: #eaf4ff;
       padding-top: 0.1rem;
       border-radius: 0.04rem;
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 05bef9e8..822b67c6 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -315,8 +315,7 @@
                 openVideo(
                   record.channelCode ||
                     record.channelId ||
-                    record.channelCode.channelId,
-                  record
+                    record.channelCode.channelId, record
                 )
               ">
                 预览
@@ -345,7 +344,9 @@
               <a-button @click="goToApply(record)" type="link" :disabled="record.state != 1">
                 申请
               </a-button>
-              <a-button @click="showWrj(record)" type="link">详情</a-button>
+              <a-button @click="showWrj(record)" type="link">
+                详情
+              </a-button>
             </template>
           </template>
         </a-table>
@@ -354,7 +355,7 @@
       <a-modal wrapClassName="single-preview-modal" v-model:visible="visible" title="视频预览" :width="960" destroyOnClose>
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
-          <div style="width: 100%; height: 100%; position: relative">
+          <div style="width: 100%; height: 100%;position:relative">
             <!-- 预览视频--遮罩 -->
             <div class="video-cover" @click="videoShowMsg"></div>
             <vue3VideoPlay v-bind="options" />
@@ -388,7 +389,7 @@
         destroyOnClose @cancel="videoClean">
         <template #footer></template>
         <div class="batch-video">
-          <div v-for="(item, index) in videoList" :key="item.id" style="width: 100%; height: 100%; position: relative">
+          <div v-for="(item, index) in videoList" :key="item.id" style="width: 100%; height: 100%;position:relative">
             <!-- 批量预览视频--遮罩 -->
             <div class="batch-video-cover" @click="videoShowMsg(index)"></div>
             <p></p>
@@ -403,11 +404,11 @@
         <div v-for="(db, key) in wrjData" :key="key">
           <template v-if="typeof db == 'object'">
             <div style="
-                font-size: 20px;
-                font-weight: 600;
-                margin: 10px 0;
-                text-align: center;
-              ">
+                  font-size: 20px;
+                  font-weight: 600;
+                  margin: 10px 0;
+                  text-align: center;
+                ">
               {{ db.attrType || '--' }}
             </div>
             <template v-if="db.attrValue">
@@ -435,6 +436,7 @@ import {
   nextTick,
   defineExpose,
   computed,
+
 } from 'vue'
 import {
   getCameraByParentId,
@@ -463,7 +465,7 @@ const current = ref(1)
 const videoTotal = ref(0)
 const router = useRouter()
 const whoShow1 = ref(whoShow)
-const isXiHaiAn = whoShow1.value.itShowXiHaiAn || true
+const isXiHaiAn = whoShow1.value.itShowXiHaiAn;
 const options = reactive({
   width: '912px', //播放器宽度
   height: '513px', //播放器高度
@@ -480,18 +482,16 @@ const options = reactive({
   ligthOff: false, //关灯模式
   volume: 0.3, //默认音量大小
   control: isXiHaiAn ? false : true, //是否显示控制
-  controlBtns: isXiHaiAn
-    ? []
-    : [
-      'audioTrack',
-      'quality',
-      'speedRate',
-      'volume',
-      'setting',
-      'pip',
-      'pageFullScreen',
-      'fullScreen',
-    ], //显示所有按钮,
+  controlBtns: isXiHaiAn ? [] : [
+    'audioTrack',
+    'quality',
+    'speedRate',
+    'volume',
+    'setting',
+    'pip',
+    'pageFullScreen',
+    'fullScreen',
+  ], //显示所有按钮,
 })
 const videoList = ref([])
 let visible = ref(false) // 视频预览
@@ -635,9 +635,7 @@ const selectedRowKeys = ref([])
 const tabList = ref([
   {
     title: '设施类型',
-    content: isXiHaiAn
-      ? ['视频资源']
-      : ['视频资源', '云资源', '感知资源', '城市云脑会客厅'],
+    content: isXiHaiAn ? ['视频资源'] : ['视频资源', '云资源', '感知资源', '城市云脑会客厅'],
   },
 ])
 if (!isXiHaiAn) {
@@ -691,10 +689,13 @@ if (whoShow1.value.itShowXiHaiAn) {
   tabList.value[0].content.push('单兵设备')
 }
 
+// 单个预览，当前点击数据
 const rowClickData = ref(null)
-// 打开视频预览
-const openVideo = (id, record) => {
-  rowClickData.value = record
+// 打开视频预览 todo1
+const openVideo = (id, item) => {
+  if(item) {
+    rowClickData.value = item;
+  }
   console.log('打开视频', id)
   const param = {
     key: id,
@@ -1077,6 +1078,7 @@ const tabClick = (indexFather, name) => {
       if (tabList.value[1]) {
         tabList.value[1].title = '视频标签'
       }
+
     } else if (name == '云资源') {
       room.value = true
       tableHeight.value = 600
@@ -1189,10 +1191,10 @@ const tabClick = (indexFather, name) => {
       wrjFlag.value = false
       emits('add', 3)
     } else if (name == '无人机') {
-      pagination.value.current = 1
+      pagination.value.current = 1;
       getSoldierData(indexFather, name)
     } else if (name == '单兵设备') {
-      pagination.value.current = 1
+      pagination.value.current = 1;
       getSoldierData(indexFather, name)
     } else if (name == '城市云脑会客厅') {
       showMap.value = false
@@ -1245,7 +1247,7 @@ const wrjStateObj = {
   0: '待审批',
   1: '未申请',
   2: '通过',
-  3: '未通过',
+  3: '未通过'
 }
 // 获取无人机、单兵设备
 const getSoldierData = (indexFather, name) => {
@@ -1269,41 +1271,41 @@ const getSoldierData = (indexFather, name) => {
     page: pagination.value.current,
     limit: pagination.value.pageSize,
   }
-  getSoldierList(_params)
-    .then((res) => {
-      console.log('res---获取无人机、单兵设备--------->', res)
-      if (res.data.code !== 0) {
-        return message.error(res.data.msg)
-      }
-      let { list = [], total = 0 } = res.data.data
-      pagination.value.total = total
-      if (name == '无人机') {
-        list.map((wrj) => {
-          dataSource2.value.push({
-            wrjName: wrj.name,
-            wrjState: wrjStateObj[wrj.state],
-            url: wrj.url,
-            details: wrj.details,
-            ...wrj,
-          })
-        })
-      }
+  getSoldierList(_params).then(res => {
+    console.log('res---获取无人机、单兵设备--------->', res);
+    if (res.data.code !== 0) {
+      return message.error(res.data.msg)
+    }
+    let { list = [], total = 0 } = res.data.data;
+    console.log('total------------>', total);
 
-      if (name == '单兵设备') {
-        list.map((db) => {
-          dataSource2.value.push({
-            wrjName: db.name,
-            wrjState: wrjStateObj[db.state],
-            details: db.details,
-            type: db.type,
-            ...db,
-          })
+    pagination.value.total = total
+    if (name == '无人机') {
+      list.map((wrj) => {
+        dataSource2.value.push({
+          wrjName: wrj.name,
+          wrjState: wrjStateObj[wrj.state],
+          url: wrj.url,
+          details: wrj.details,
+          ...wrj
         })
-      }
-    })
-    .catch((err) => {
-      message.error(err)
-    })
+      })
+    }
+    if (name == '单兵设备') {
+      list.map((db) => {
+        dataSource2.value.push({
+          wrjName: db.name,
+          wrjState: wrjStateObj[db.state],
+          details: db.details,
+          type: db.type,
+          ...db
+        })
+      })
+    }
+
+  }).catch(err => {
+    message.error(err)
+  })
 }
 // 打开视频批量预览
 const batchPreview = async function (page) {
@@ -1339,22 +1341,20 @@ const batchPreview = async function (page) {
           ligthOff: false, //关灯模式
           volume: 0.3, //默认音量大小
           control: isXiHaiAn ? false : true, //是否显示控制
-          controlBtns: isXiHaiAn
-            ? []
-            : [
-              'audioTrack',
-              'quality',
-              'speedRate',
-              'volume',
-              'setting',
-              'pip',
-              'pageFullScreen',
-              'fullScreen',
-            ], //显示所有按钮,
+          controlBtns: isXiHaiAn ? [] : [
+            'audioTrack',
+            'quality',
+            'speedRate',
+            'volume',
+            'setting',
+            'pip',
+            'pageFullScreen',
+            'fullScreen',
+          ], //显示所有按钮,
         },
       }
       await getStreamByChannelCode(param).then((res) => {
-        // 视频测试-勿删
+        // 视频测试
         // ob.options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
         ob.options.src = res.data.data
         console.log('监测ob的变化', ob)
@@ -1432,7 +1432,7 @@ const changePage = (page) => { }
 const dept = reactive({})
 // eslint-disable-next-line no-undef
 if (infrastructure) {
-  console.log('infrastructure------------>', infrastructure)
+  console.log('infrastructure------------>', infrastructure);
 
   // eslint-disable-next-line no-undef
   dept.deptId = infrastructure.deptId || ''
@@ -1471,10 +1471,7 @@ const apply = () => {
 // }
 const wrjFlag = ref(false)
 const getCamera = (flag, str) => {
-  console.log(
-    'mapSearchParam.value.cameraName------------>',
-    mapSearchParam.value.cameraName
-  )
+  console.log('mapSearchParam.value.cameraName------------>', mapSearchParam.value.cameraName);
   if (flag) {
     mapSearchParam.value.cameraName = str
     console.log('赋值===============》', str, mapSearchParam.value)
@@ -1488,7 +1485,7 @@ const getCamera = (flag, str) => {
       pagination.value.total = res.data.count
     })
   } else {
-    console.log('mapSearchParam------------>', mapSearchParam)
+    console.log('mapSearchParam------------>', mapSearchParam);
     let params = {
       regionId:
         mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@@ -1498,7 +1495,7 @@ const getCamera = (flag, str) => {
       longitude: mapSearchParam.value.gpsX || '',
       latitude: mapSearchParam.value.gpsY || '',
       radius: mapSearchParam.value.radius || '',
-      name: mapSearchParam.value.cameraName,
+      name: mapSearchParam.value.cameraName
     }
     // todo-临时放开
     // if (
@@ -1577,21 +1574,21 @@ const columns2 = ref([
     title: '名称',
     dataIndex: 'wrjName',
     key: 'wrjName',
-    align: 'center',
+    align: 'center'
   },
   {
     title: '申请状态',
     dataIndex: 'wrjState',
     width: '60%',
     key: 'wrjState',
-    align: 'center',
+    align: 'center'
   },
   {
     title: '操作',
     dataIndex: 'operation',
     width: '20%',
     key: 'wrjName',
-    align: 'center',
+    align: 'center'
   },
 ])
 // const allClick = ref([])
@@ -1656,10 +1653,7 @@ const handleTableChange = (val) => {
   mapSearchParam.value.pageNum = val.current
   mapSearchParam.value.pageSize = val.pageSize
 
-  let _arr =
-    clickList.value.filter(
-      (v) => v.content.includes('单兵设备') || v.content.includes('无人机')
-    ) || []
+  let _arr = clickList.value.filter(v => v.content.includes('单兵设备') || v.content.includes('无人机')) || []
   let _tab_name = _arr[0] && _arr[0].content && _arr[0].content[0]
   // 无人机、单兵设备
   if (_tab_name) {
@@ -1671,15 +1665,12 @@ const handleTableChange = (val) => {
 
 // 视频预览 提示
 const videoShowMsg = (index) => {
-  let itemData = null
+  let itemData = null;
   if (index) {
     itemData = selectedList.value[index]
   }
   let msg = '请申请后在我的申请中预览视频!'
-  if (
-    (itemData && itemData.status != 1) ||
-    (rowClickData.value && rowClickData.value.status != 1)
-  ) {
+  if ((itemData && itemData.status != 1) || (rowClickData.value && rowClickData.value.status != 1)) {
     msg = '当前视频离线不可预览!'
   } else {
     msg = '请申请后在我的申请中预览视频!'
@@ -2128,4 +2119,5 @@ video::-webkit-media-controls {
   margin-top: 14px;
   cursor: pointer;
 }
+
 </style>
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index 6013b08d..c2a83e73 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -53,6 +53,10 @@
       <span class="gengduo"></span>
     </div>
     <div class="fixedmount">
+      <div @click="applyResource()">
+        <p></p>
+        <p>资源申请</p>
+      </div>
       <div @click="toView()">
         <p></p>
         <p>需求申请</p>
@@ -255,14 +259,24 @@
   const toView = () => {
     window.open(newpage.href, '_blank')
   }
-  
+  // const toApply = () => {
+  //   window.open(applypage.href, '_blank')
+  // }
   getList()
- 
+  // dataList.value.map((item, index) => {
+  //   dataList.value[index].tupian = tupain.value[index]
+  //   console.log('item', item, dataList.value)
+  // })
   function jumpPage() {
+    // 点击内存入store
+    // store.commit('WorkDynList', {
+    //   selectCardsnum: '组件服务',
+    // })
     console.log(
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
+    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/WorkDynList',
     })
@@ -301,6 +315,15 @@
   function handlecancelAbilitySquare() {
     abilitySquareFunctionData.value = '智能算法'
   }
+  const applyResource = () => {
+    console.log('点击===============》')
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        select: "基础设施",
+      },
+    })
+  }
 </script>
 <style lang="less">
   .shangjia-class {
@@ -569,10 +592,10 @@
   }
 
   .fixedmount {
-    height: 1.5rem;
+    height: 2.4rem;
     display: flex;
     position: fixed;
-    bottom: 2.56rem;
+    bottom: 1.56rem;
     right: 1.9rem;
     z-index: 10;
     flex-direction: column;
@@ -608,7 +631,8 @@
   .fixedmount div:nth-child(1) p:nth-child(1) {
     height: 0.24rem;
     width: 0.24rem;
-    background: url('~@/assets/home/shenqing.png') no-repeat;
+    //background: url('~@/assets/home/shenqing.png') no-repeat;
+    background: url('~@/assets/newHome/banner-yy.png') no-repeat;
     background-size: contain;
     background-position: center;
   }