diff --git a/front/src/router/index.js b/front/src/router/index.js
index 8f3e1d09..47c429c7 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -85,7 +85,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/home',
+    redirect: whoShow.itShowXiHaiAn ? '/DetailsPageconetent' : '/home',
     meta: {
       title: '能力管理平台编目',
       icon: 'apps-line',
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 6929f236..b17ab6b2 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -12,55 +12,32 @@
       <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>
@@ -69,89 +46,45 @@
         </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>
@@ -159,47 +92,29 @@
       <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>
@@ -208,58 +123,36 @@
         </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>
@@ -267,10 +160,7 @@
           </span>
         </div>
       </div>
-      <KnowledgeBase
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-      ></KnowledgeBase>
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -282,21 +172,14 @@
       <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 />
@@ -306,140 +189,75 @@
     </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>
@@ -449,41 +267,24 @@
     </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>
@@ -493,139 +294,75 @@
     </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>
@@ -641,28 +378,18 @@
           </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>
@@ -670,627 +397,530 @@
     </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 { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+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 { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
 
-  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')
+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 || DETAIL_PAGE_CONTENT_DEFAULT_TAB
+    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 (localStorage.getItem('DetailsPageconetent')) {
+        storageSearchInfo = JSON.parse(
+          localStorage.getItem('DetailsPageconetent')
+        )
       }
-      next()
-    },
-    setup() {
-      //会议室传的标识6
-      const flag = ref('')
-      let componentTypeArray = ['组件类型', '应用领域']
-      const handleAdd = (value) => {
-        flag.value = value
-      }
-      const titleName = ref(titleNameArray)
+      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
 
-      const openMonitor = () => {
-        window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
+        // 延迟使用，因为还没有返回跟挂载
+        nextTick(() => {
+          searchResultListDom.value.changeCondition(
+            {
+              value: storageSearchInfo.orderField,
+              orderType: storageSearchInfo.orderType,
+            },
+            true
+          )
+        })
       }
-      // 模糊查询
-      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 || '应用资源'
-      let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
-      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 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
+      }
+      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 = []
       })
-      // 查询参数
-      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({
+      // 分页
+      currentPage.value = 1
+      currentPageSize.value = 5
+      // 重置查询条件
+      paramsGetResources2.value = {
         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 = ''
+      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])
+          }
         } else {
-          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
-        }
-      }
-
-      // 点击筛选条件回调
-      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])
-            }
-          } 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) {
+          if (name == '组件类型') {
+            ListContent.records.splice(2, 1)
             paramsGetResources.infoList = paramsGetResources.infoList.filter(
-              (item) => item.attrType !== name
+              (item) => componentTypeArray.includes(item.attrType)
             )
-            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 = []
-                }
+      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()
+        }
+      })
+      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,
       }
-      const getNewList = () => {
+      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
-        const params = {
-          topCategoryName: Cardsname.value,
-        }
-        selectDicStoreAll(params).then((res) => {
-          console.log('selectDicStoreAll============>', res)
-          const { data } = res.data
-          let dataCopy = data
+        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
-          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
-              }
+          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
+          }
 
-              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 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 (whoShow1.value.itShowXiHaiAn) {
           if (!storageSearchInfo) {
             let _tag_list = dataCopy.filter((v) =>
               componentTypeArray.includes(v.name)
             )
             ListContent.records = _tag_list
           }
-
-          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('分页查询')
+        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()
         }
       }
-      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] &&
-          paramsGetResources.infoList.filter(
-            (val) => val.attrType == '组件类型'
-          )[0].attrValue == '智能算法' &&
+    }
+    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.orderField = 'pin_top'
-        } else if (
-          paramsGetResources.orderField == '' ||
+            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] &&
+        paramsGetResources.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0].attrValue == '智能算法' &&
+        (paramsGetResources.orderField == '' ||
           paramsGetResources.orderField == 'deptSort' ||
-          paramsGetResources.orderField == 'pin_top'
+          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 = ''
+          str = searchValue.value.substring(0, 2)
+          r = re.test(str)
         }
-        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这个参数是下面的分页传过来的参数
+        if (
+          (searchValue.value.length > 1 && r) ||
+          paramsGetResources.type === '基础设施'
+        ) {
           paramsGetResources.name = searchValue.value
           paramsGetResources.type = Cardsname.value
           if (
@@ -1307,24 +937,25 @@
                   ? '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----982-------->', res.data.data)
+              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)
-                loading.value = false
               }
             })
           } else if (
@@ -1336,8 +967,11 @@
               paramsGetResources.pageNum = 1
             }
             pageWithAttrs(paramsGetResources).then((res) => {
+              if (res.data.code != 0) {
+                return message.error(res.data.msg)
+              }
               console.log(
-                '查询列表===11=========>',
+                '查询列表====22========>',
                 resourceList,
                 res.data.data
               )
@@ -1353,7 +987,7 @@
               }
             })
           } else if (
-            paramsGetResources.type === '基础设施' ||
+            paramsGetResources.type === '基础设施' &&
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -1361,349 +995,426 @@
             }
             paramsGetResources2.value.pageNum = paramsGetResources.pageNum
             paramsGetResources2.value.pageSize = paramsGetResources.pageSize
+            paramsGetResources2.value.name = paramsGetResources.name
           }
-        }
-      }
-
-      // 青岛-数据处理
-      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
-          )
-          resourceList.data = list
-        })
-      }
-      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
+          message.error('请以两位以上汉字或数字开头')
         }
-        getAppResources()
-        console.log(
-          'paramsGetResources-----paramsGetResources------->',
-          paramsGetResources
+      } 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
         )
+        resourceList.data = list
       })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
+    }
+    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
+        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('分页查询')
-        console.log(
-          'paramsGetResources----changePage-------->',
-          paramsGetResources
-        )
-      })
-      mybus.on('changeSelcted', () => {
-        // 添加申购车后，返回第一页
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
+      } else {
         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
-        )
-      })
+      }
+      console.log(
+        'paramsGetResources---changeCondition--------->',
+        paramsGetResources
+      )
+    })
 
-      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('分页查询')
+    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 {
-          getAppResources()
+          getAppResources2()
         }
-        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
-        )
       }
+    })
+    // 全部申请
+    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)
+    })
 
-      onMounted(() => {
-        // 从本地读取查询条件，赋值
-        handleSetSearchData()
-
-        listKey2.value++
-        // 获取筛选条件
-        getNewList()
-        if (!tecHnosphere && !appLiCation) {
-          if (searchValue.value && !select2) {
-            globalSearch()
-          } else {
-            getAppResources2()
-          }
+    const changeShrink = (name) => {
+      ListContent.records.forEach((val) => {
+        if (val.name === name) {
+          console.log(val)
+          val.shrinkFlag = !val.shrinkFlag
         }
       })
-      // 全部申请
-      const applyAll = () => {
-        router.push({
-          path: '/apply',
-          query: {
-            applyAll: true,
-          },
+    }
+    const changeCards = (name) => {
+      // 西海岸-特殊处理
+      if(whoShow1.value.itShowXiHaiAn && name !== '基础设施') {
+        return message.warn('正在建设中！')
+      }
+      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,
         })
-      }
-      // 分页
-      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
-          }
+        .then(() => {
+          tagFlag.value = false
+          chongzhi(true)
+          getNewList()
         })
-      }
-      const changeCards = (name) => {
-        // 西海岸-特殊处理
-        if(whoShow1.value.itShowXiHaiAn && name !== '基础设施') {
-          return message.warn('正在建设中！')
-        }
-        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
-        }
-      }
-      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,
-        }
-        const applypage = router.resolve({
-          path: '/capacitySquare', // 跳转的页面路由
-          query: snumSquare.value,
-        })
-        window.open(applypage.href, '_blank')
+    }
+    // 监听地址栏变化
+    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
+      }
+    }
+    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,
+      }
+      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)
-        )
-      }
+    // 存储查询条件到本地 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 {
@@ -1825,8 +1536,7 @@
           display: flex;
           align-items: center;
 
-          .tupian {
-          }
+          .tupian {}
 
           .title {
             margin-left: 0.1rem;
@@ -1859,7 +1569,7 @@
         }
       }
 
-      .yunziyuan > div {
+      .yunziyuan>div {
         margin-bottom: 0.1rem;
       }
 
@@ -1870,8 +1580,7 @@
           display: flex;
           align-items: center;
 
-          .tupian {
-          }
+          .tupian {}
 
           .title {
             margin-left: 0.1rem;
@@ -1895,12 +1604,12 @@
         }
       }
 
-      .shipin > div {
+      .shipin>div {
         margin-bottom: 0.1rem;
       }
     }
 
-    .jichusheshi > div {
+    .jichusheshi>div {
       padding-top: 0.1rem;
       border-radius: 0.04rem;
       margin-bottom: 0.2rem;
@@ -1929,8 +1638,7 @@
           align-items: center;
           margin-left: 0.2rem;
 
-          .tupian {
-          }
+          .tupian {}
 
           .title {
             margin-left: 0.1rem;
@@ -1963,12 +1671,12 @@
         }
       }
 
-      .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/components/header.vue b/front/src/views/home/components/header.vue
index b50fc5c5..ada50a51 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -131,21 +131,12 @@
   import { getSgcTotal } from '@/api/home'
   import Cookies from 'js-cookie'
   import mybus from '@/myplugins/mybus'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
   const store = useStore()
   const router = useRouter()
   const route = useRoute()
-  // const navListManagement = ref([
-  //   { name: '共享门户', key: 'home' },
-  //   { name: '能力集市', key: 'DetailsPageconetent' },
-  //   { name: '能力云图', key: 'capabilityCloud' },
-  //   { name: '能力统计', key: 'abilityStatistics' },
-  //   { name: '开发指南', key: 'developmentGuide' },
-  //   { name: '需求中心', key: 'demandCenter' },
-  //   // { name: '个人中心', key: 'personalCenter' },
-  //   { name: '区市站点', key: 'mapTest' },
-  //   // { name: '后台管理', key: 'houtaiguanli' },
-  //   { name: '赋能案例', key: 'assignCase' },
-  // ])
+ 
   const whoShow1 = whoShow
   const user = ref({
     username: store.getters['user/username'],
@@ -208,7 +199,7 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            select: '组件服务',
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
         break
@@ -255,10 +246,6 @@
       case '融合服务':
         router.push({
           path: '/integrationServices',
-          //  path: '/DetailsPageconetent',
-          query: {
-            select: '融合服务',
-          },
         })
         break
       case 'CIM专区':
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 881030d5..c32a2f60 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -6,166 +6,106 @@
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+        cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul
-          v-if="
-            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
-        >
-          <li
-            v-for="(item, i) in orderList"
-            :key="item.value"
-            @click="changeOrder(i, item.value, item.orderType)"
-          >
-            {{ item.name }}
-            <span
-              class="arrow"
-              :class="item.orderType == 'ASC' ? 'down' : ''"
-            ></span>
-          </li>
-        </ul>
+        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
+          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+        "></IntegrationServiceOrder>
         <ul v-else>
-          <li
-            v-for="item in selList"
-            :key="item.value"
-            @click="changeCondition(item.value)"
-            v-show="
-              item.show &&
-              item.name !== '评分' &&
-              selectCardsname !== '数据资源'
-            "
-          >
+          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
+            item.show &&
+            item.name !== '评分' &&
+            selectCardsname !== '数据资源'
+          ">
             {{ item.name }}
-            <span
-              class="arrow"
-              :class="item.value == selData ? 'down' : ''"
-            ></span>
+            <span class="arrow" :class="
+              orderObj.orderType == 'ASC' &&
+              orderObj.orderField == item.value
+                ? 'down'
+                : ''
+            "></span>
           </li>
         </ul>
       </div>
+
     </div>
-    <div
-      class="result-list"
-      v-for="(item, index) in resourceList.data"
-      :key="item.index"
-    >
+    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
       <div class="item" :key="showKey">
-        <div
-          class="left"
-          style="display: flex; align-items: center"
-          v-if="
-            item.type === '应用资源' &&
-            item.infoList &&
+        <div class="left" style="display: flex; align-items: center" v-if="
+          item.type === '应用资源' &&
+          item.infoList &&
+          item.infoList.filter((val) => val.attrType == '应用图片')[0]
+        ">
+          <a-image :width="106" :preview="false" :src="
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-          "
-        >
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
-              item.infoList.filter((val) => val.attrType == '应用图片')[0]
-                .attrValue
-            "
-          />
+              .attrValue
+          " />
         </div>
-        <div
-          class="left"
-          style="display: flex; align-items: center"
-          v-else-if="
-            (selectCardsname === '融合服务' ||
-              selectCardsname === '赋能场景') &&
-            item.fuseAttrList &&
+        <div class="left" style="display: flex; align-items: center" v-else-if="
+          (selectCardsname === '融合服务' ||
+            selectCardsname === '赋能场景') &&
+          item.fuseAttrList &&
+          item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+        ">
+          <a-image :width="106" :preview="false" :src="
             item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-          "
-        >
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
-              item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-                .attrValue
-            "
-          />
+              .attrValue
+          " />
         </div>
-        <div
-          class="left"
-          :class="
-            item.type == '应用资源'
-              ? 'yyzy'
-              : !item.type
-              ? 'sjzy'
-              : !item.infoList ||
-                !item.infoList.filter((val) => val.attrType == '组件类型')[0]
-              ? 'znsf'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '智能算法'
-              ? 'znsf'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '图层服务'
-              ? 'tcfw'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '开发组件'
-              ? 'kfzj'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '业务组件'
-              ? 'ywzj'
-              : ''
-          "
-          @click="toView('details', item)"
-          v-else-if="
-            selectCardsname !== '基础设施' &&
-            selectCardsname !== '融合服务' &&
-            selectCardsname !== '赋能场景'
-          "
-        ></div>
+        <div class="left" :class="
+          item.type == '应用资源'
+            ? 'yyzy'
+            : !item.type
+            ? 'sjzy'
+            : !item.infoList ||
+              !item.infoList.filter((val) => val.attrType == '组件类型')[0]
+            ? 'znsf'
+            : item.infoList &&
+              item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                .attrValue == '智能算法'
+            ? 'znsf'
+            : item.infoList &&
+              item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                .attrValue == '图层服务'
+            ? 'tcfw'
+            : item.infoList &&
+              item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                .attrValue == '开发组件'
+            ? 'kfzj'
+            : item.infoList &&
+              item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                .attrValue == '业务组件'
+            ? 'ywzj'
+            : ''
+        " @click="toView('details', item)" v-else-if="
+          selectCardsname !== '基础设施' &&
+          selectCardsname !== '融合服务' &&
+          selectCardsname !== '赋能场景'
+        "></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div
-          class="left rhfw"
-          v-else-if="
-            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
-        ></div>
+        <div class="left rhfw" v-else-if="
+          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+        "></div>
         <div class="right" @click="toView('details', item)">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
               <!-- 已申请--通过 -->
-              <svg
-                t="1652322568870"
-                class="icon"
-                viewBox="0 0 3072 1024"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                p-id="3062"
-                width="40"
-                height="40"
-                v-if="
+              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
+                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="
                   item.applyState == '已申请' && item.approveStatus == '通过'
-                "
-                style="margin-left: 10px; min-width: 40px"
-              >
+                " style="margin-left: 10px; min-width: 40px">
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06"
-                  p-id="3063"
-                ></path>
+                  fill="#d81e06" p-id="3063"></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06"
-                  p-id="3064"
-                ></path>
+                  fill="#d81e06" p-id="3064"></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06"
-                  p-id="3065"
-                ></path>
+                  fill="#d81e06" p-id="3065"></path>
               </svg>
               <!-- 审核中 -->
               <!-- <svg
@@ -211,28 +151,19 @@
               </span> -->
             </span>
             <div class="header-right">
-              <div
-                v-if="
-                  selectCardsname === '融合服务' ||
-                  selectCardsname === '赋能场景'
-                "
-                class="label-content"
-              >
-                <template
-                  v-if="
-                    item.fuseAttrList &&
-                    item.fuseAttrList.filter(
-                      (val) => val.attrType == '应用领域'
-                    )[0]
-                  "
-                >
-                  <span
-                    class="label"
-                    v-for="(data, index) in item.fuseAttrList
-                      .filter((val) => val.attrType == '应用领域')[0]
-                      .attrValue.split(';')"
-                    :key="index"
-                  >
+              <div v-if="
+                selectCardsname === '融合服务' ||
+                selectCardsname === '赋能场景'
+              " class="label-content">
+                <template v-if="
+                  item.fuseAttrList &&
+                  item.fuseAttrList.filter(
+                    (val) => val.attrType == '应用领域'
+                  )[0]
+                ">
+                  <span class="label" v-for="(data, index) in item.fuseAttrList
+                  .filter((val) => val.attrType == '应用领域')[0]
+                  .attrValue.split(';')" :key="index">
                     {{ data }}
                   </span>
                 </template>
@@ -250,21 +181,15 @@
             </div>
           </div>
           <div class="dec">
-            <div
-              v-if="
-                selectCardsname !== '融合服务' &&
-                selectCardsname !== '赋能场景' &&
-                selectCardsname !== '基础设施'
-              "
-            >
+            <div v-if="
+              selectCardsname !== '融合服务' &&
+              selectCardsname !== '赋能场景' &&
+              selectCardsname !== '基础设施'
+            ">
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div
-            v-if="selectCardsname !== '基础设施'"
-            style="margin-top: 0.1rem"
-            class="description"
-          >
+          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -273,32 +198,26 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div
-                  v-if="
-                    selectCardsname !== '数据资源' &&
-                    selectCardsname !== '融合服务' &&
-                    selectCardsname !== '赋能场景'
-                  "
-                >
+                <div v-if="
+                  selectCardsname !== '数据资源' &&
+                  selectCardsname !== '融合服务' &&
+                  selectCardsname !== '赋能场景'
+                ">
                   浏览量：{{ item.visits || 0 }}次
                 </div>
-                <div
-                  v-if="
-                    selectCardsname !== '数据资源' &&
-                    selectCardsname !== '融合服务' &&
-                    selectCardsname !== '赋能场景' &&
-                    (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                  "
-                >
+                <div v-if="
+                  selectCardsname !== '数据资源' &&
+                  selectCardsname !== '融合服务' &&
+                  selectCardsname !== '赋能场景' &&
+                  (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
+                ">
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div
-                  v-if="
-                    selectCardsname === '数据资源' &&
-                    selectCardsname !== '融合服务' &&
-                    selectCardsname !== '赋能场景'
-                  "
-                >
+                <div v-if="
+                  selectCardsname === '数据资源' &&
+                  selectCardsname !== '融合服务' &&
+                  selectCardsname !== '赋能场景'
+                ">
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -308,77 +227,41 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template
-                  v-if="
-                    (selectCardsname == '组件服务' &&
-                      item.infoList.filter(
-                        (val) => val.attrType == '外部服务地址'
-                      ).length === 0) ||
-                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                  "
-                >
-                  <span
-                    class="shopping-down"
-                    v-if="item.isInShoppingCart"
-                  ></span>
-                  <span
-                    class="shopping-on"
-                    v-else
-                    @click.stop="addShoppingCart(item, index)"
-                  ></span>
+                <template v-if="
+                  (selectCardsname == '组件服务' &&
+                    item.infoList.filter(
+                      (val) => val.attrType == '外部服务地址'
+                    ).length === 0) ||
+                  (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
+                ">
+                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
+                  <span class="shopping-on" v-else @click.stop="addShoppingCart(item, index)"></span>
                 </template>
               </div>
               <div class="sc">
-                <span
-                  class="sc-down"
-                  v-if="item.isCollect == 'false'"
-                  @click.stop="addCollect(item)"
-                ></span>
-                <span
-                  class="sc-on"
-                  v-if="item.isCollect == 'true'"
-                  @click.stop="addCollect(item)"
-                ></span>
+                <span class="sc-down" v-if="item.isCollect == 'false'" @click.stop="addCollect(item)"></span>
+                <span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></span>
               </div>
-              <div
-                class="shopping pk"
-                :key="pk"
-                v-show="
-                  cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
-              >
-                <span
-                  class="pk-on"
-                  @click.stop="goComparePk(item, index)"
-                ></span>
+              <div class="shopping pk" :key="pk" v-show="
+                cardType == '组件服务' && findComponentName(item, '智能算法')
+              ">
+                <span class="pk-on" @click.stop="goComparePk(item, index)"></span>
               </div>
-              <a-button
-                type="primary"
-                @click.stop="toView('details', item)"
-                v-if="!whoShow1.itShowBaoTou"
-              >
+              <a-button type="primary" @click.stop="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
                 查看详情
               </a-button>
-              <a-button
-                style="margin-left: 10px"
-                v-show="
-                  selectCardsname === '融合服务' ||
-                  selectCardsname === '赋能场景'
-                "
-                @click.stop="handleAKeyApplication(item)"
-              >
+              <a-button style="margin-left: 10px" v-show="
+                selectCardsname === '融合服务' ||
+                selectCardsname === '赋能场景'
+              " @click.stop="handleAKeyApplication(item)">
                 一键申请
               </a-button>
-              <a-button
-                type="primary"
-                @click.stop="toView('apply', item)"
-                v-show="
-                  cardType == '组件服务' ||
-                  (cardType == '应用资源' && whoShow1.itShowQingDao)
-                "
-              >
+              <a-button type="primary" @click.stop="toView('apply', item)" v-show="
+                cardType == '组件服务' ||
+                (cardType == '应用资源' && whoShow1.itShowQingDao)
+              ">
                 {{
-                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+                item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -391,12 +274,7 @@
         </div>
       </div>
     </div>
-    <a-modal
-      v-model:visible="visible"
-      title="视频预览"
-      :width="750"
-      destroyOnClose
-    >
+    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -407,940 +285,816 @@
   </div>
 </template>
 <script>
-  import { ref, reactive } from 'vue'
-  import { message } from 'ant-design-vue'
-  import { useRouter } from 'vue-router'
-  import { getUser, sgcInsert } from '@/api/home'
-  import { scInsert, scDel } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
-  import { getHls } from '@/api/home.js'
-  export default {
-    name: '',
-    // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
-    props: {
-      resourceList: {
-        type: Object,
-        default: () => {},
-      },
-      resourceTotal: {
-        type: String,
-        default: '0',
-      },
-      selectCardsname: {
-        type: String,
-        default: '组件服务',
-      },
+import { ref, reactive } from 'vue'
+import { message } from 'ant-design-vue'
+import { useRouter } from 'vue-router'
+import { getUser, sgcInsert } from '@/api/home'
+import { scInsert, scDel } from '@/api/personalCenter'
+import mybus from '@/myplugins/mybus'
+import { getHls } from '@/api/home.js'
+import IntegrationServiceOrder from './integrationServiceOrder.vue';
+import ComponentServiceTag from './ComponentServiceTag.vue';
+export default {
+  name: '',
+  props: {
+    resourceList: {
+      type: Object,
+      default: () => { },
     },
-    computed: {
-      dataList() {
-        const newArr = []
-        for (let i = 0; i < this.resourceList.data.length; i++) {
-          let arr = [
-            {
-              name: '应用名称',
-              value: '',
-            },
-            {
-              name: '应用ID',
-              value: '',
-              dataResourceId: '',
-            },
-            {
-              name: '应用领域',
-              value: '',
-            },
-            {
-              name: '组件类型',
-              value: '',
-            },
-            {
-              name: '技术领域',
-              value: '',
-            },
-            {
-              name: '共享类型',
-              value: '',
-            },
-            {
-              name: '共享条件',
-              value: '',
-            },
-          ]
-          arr.map((item) => {
-            if (item.name === '应用名称') {
-              item.value = this.resourceList.data[i].name
-            }
-            if (item.name === '应用ID') {
-              item.value = this.resourceList.data[i].id
-              item.dataResourceId =
-                this.resourceList.data[i].infoList[0].dataResourceId
-            }
-            if (item.name === '应用领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '组件类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '技术领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享条件') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
-              })
-            }
-          })
-          newArr.push(arr)
-        }
-        console.log(
-          'dataList======================>',
-          newArr,
-          this.resourceList
-        )
-        return newArr
-      },
-      isShoppingCartOrNot() {
-        return ''
-      },
+    resourceTotal: {
+      type: String,
+      default: '0',
     },
-    components: {},
-    setup(props) {
-      // eslint-disable-next-line no-undef
-      const whoShow1 = whoShow
-      const showKey = ref(0)
-      let shoppingKey = ref(1)
-      // 融合服务排序
-      const orderList = ref([
-        {
-          value: 'collectCount',
-          name: '收藏量',
-          orderType: 'DESC',
-        },
-        {
-          value: 'create_date',
-          name: '发布时间',
-          orderType: 'DESC',
-        },
-        // {
-        //   value: 'update_date',
-        //   name: '更新时间',
-        //   orderType: 'DESC',
-        // },
-      ])
-      // 购物车id列表
-      const selList = ref([
-        { name: '发布时间', value: 'tdr.create_date', show: true },
-        { name: '浏览量', value: 'visits', show: true },
-        { name: '申请量', value: 'applyCount', show: true },
-        { name: '收藏量', value: 'collectCount', show: true },
-        { name: '评分', value: 'score', show: true },
-      ])
-      if (props.selectCardsname === '基础设施') {
-        selList.value.map((val) => (val.show = false))
-      } else if (props.selectCardsname === '数据资源') {
-        selList.value.map(
-          (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
-        )
+    selectCardsname: {
+      type: String,
+      default: '应用资源',
+    },
+  },
+  components: {
+    IntegrationServiceOrder,
+    ComponentServiceTag,
+  },
+  setup(props, context) {
+    const whoShow1 = whoShow
+    const showKey = ref(0)
+    let shoppingKey = ref(1)
+    let orderObj = reactive({
+      orderField: '',
+      orderType: '',
+    })
+    const integrationServiceOrderDom = ref(null)
+    // 购物车id列表
+    const selList = ref([
+      { name: '发布时间', value: 'tdr.create_date', show: true },
+      { name: '浏览量', value: 'visits', show: true },
+      { name: '申请量', value: 'applyCount', show: true },
+      { name: '收藏量', value: 'collectCount', show: true },
+      { name: '评分', value: 'score', show: true },
+    ])
+    // 西海岸-去掉浏览量
+    if (whoShow1.itShowXiHaiAn) {
+      selList.value = selList.value.filter(v => v.name !== '浏览量')
+    }
+    if (props.selectCardsname === '基础设施') {
+      selList.value.map((val) => (val.show = false))
+    } else if (props.selectCardsname === '数据资源') {
+      selList.value.map(
+        (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
+      )
+    }
+    const findComponentName = (list, name) => {
+      if (list.infoList) {
+        return list.infoList.find((item) => {
+          if (item.attrType === '组件类型') {
+            return item.attrValue === name
+          }
+        })
       }
-      const findComponentName = (list, name) => {
-        if (list.infoList) {
-          return list.infoList.find((item) => {
-            if (item.attrType === '组件类型') {
-              return item.attrValue === name
-            }
-          })
+    }
+
+    // 西海岸--智能算法--列表增加标签显示
+    const showTagArray = ['已落地', '需要计算支持']
+    const getTagList = (item) => {
+      let _arr = item.infoList.filter((x) => showTagArray.includes(x.attrValue)) || []
+      let tagArray = _arr.map(v => v.attrValue)
+      return tagArray
+    }
+    console.log('this.resourceList', props.resourceList.data)
+    props.resourceList.data.map((val) => {
+      if (val.infoList) {
+        let obj = val.infoList.filter(
+          (item) => item.attrType == '组件类型'
+        )[0]
+        if (obj) {
+          switch (obj.attrValue) {
+            case '智能算法':
+              val.applicationType = 'znsf'
+              break
+            case '图层服务':
+              val.applicationType = 'tcfw'
+              break
+            case '开发组件':
+              val.applicationType = 'kfzj'
+              break
+            case '业务组件':
+              val.applicationType = 'ywzj'
+              break
+          }
+          console.log('obj', val.applicationType)
         }
       }
-      console.log('this.resourceList', props.resourceList.data)
-      props.resourceList.data.map((val) => {
-        if (val.infoList) {
-          let obj = val.infoList.filter(
-            (item) => item.attrType == '组件类型'
-          )[0]
-          if (obj) {
-            switch (obj.attrValue) {
-              case '智能算法':
-                val.applicationType = 'znsf'
-                break
-              case '图层服务':
-                val.applicationType = 'tcfw'
-                break
-              case '开发组件':
-                val.applicationType = 'kfzj'
-                break
-              case '业务组件':
-                val.applicationType = 'ywzj'
-                break
-            }
-            console.log('obj', val.applicationType)
-          }
-        }
-      })
-      showKey.value++
-      const selData = ref('total')
-      const flag = ref(true)
-      // userId
-      const userId = ref('')
-      getUser().then((res) => {
-        console.log('getUser============>', res)
-        userId.value = res.data.data.id
-      })
-      const resultList = [1, 2, 3, 4]
-      const router = useRouter()
-      const cardType = router.currentRoute.value.query.select
-      const onSearch = (searchValue) => {
-        console.log('use value', searchValue)
-        console.log('or use this.value', searchValue.value)
-      }
-      function toView(type, item) {
-        if (props.selectCardsname == '数据资源') {
-          if (whoShow1.itShowQingDao) {
-            window.open(
-              'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-                item.guid
-            )
-          } else {
-            window.open(
-              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
-            )
-          }
-        } else if (props.selectCardsname === '融合服务') {
-          // 打包模式
-          router.push({
-            path: '/packagingDetails',
-            query: {
-              id: item.id,
-            },
-          })
-        } else if (props.selectCardsname === '赋能场景') {
-          router.push({
-            path: '/integrationServicesDetails',
-            query: {
-              id: item.id,
-            },
-          })
+    })
+    showKey.value++
+    const selData = ref('total')
+    const flag = ref(true)
+    // userId
+    const userId = ref('')
+    getUser().then((res) => {
+      console.log('getUser============>', res)
+      userId.value = res.data.data.id
+    })
+    const resultList = [1, 2, 3, 4]
+    const router = useRouter()
+    const cardType = router.currentRoute.value.query.select
+    const onSearch = (searchValue) => {
+      console.log('use value', searchValue)
+      console.log('or use this.value', searchValue.value)
+    }
+    function toView(type, item) {
+      if (props.selectCardsname == '数据资源') {
+        if (whoShow1.itShowQingDao) {
+          window.open(
+            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
+            item.guid
+          )
         } else {
-          if (type === 'apply') {
-            // 外部服务地址跳转到外部
-            const webUrl = item.infoList.filter(
-              (val) => val.attrType == '外部服务地址'
-            )[0]?.attrValue
-            if (webUrl) {
-              window.open(webUrl)
-            } else {
-              if (
-                !(
-                  props.selectCardsname === '应用资源' ||
-                  props.selectCardsname === '组件服务'
-                ) ||
-                whoShow1.itShowBaoTou
-              ) {
-                return
-              }
-              // 内部跳转申请页面
-              console.log('一键申请===================>', item)
-              localStorage.setItem(
-                'applyList',
-                JSON.stringify([
-                  {
-                    arr: [
-                      {
-                        delFlag: item.delFlag,
-                        description: item.description,
-                        resourceId: item.id,
-                        resourceName: item.name,
-                        time: item.createDate,
-                        type: item.type,
-                        componentType:
-                          (item.infoList.filter(
-                            (val) => val.attrType == '组件类型'
-                          )[0] &&
-                            item.infoList.filter(
-                              (val) => val.attrType == '组件类型'
-                            )[0].attrValue) ||
-                          '',
-                      },
-                    ],
-                    deptId: item.deptId,
-                    deptName: item.deptName,
-                  },
-                ])
-              )
-              router.push({
-                path: '/apply',
-              })
-            }
-          } else {
-            console.log(
-              '111111111111111111===========>',
-              router,
-              props.selectCardsname
-            )
-            router.push({
-              path: '/details',
-              query: {
-                id: item.id,
-              },
-            })
-          }
+          window.open(
+            'http://10.134.135.24:30090/#/home?id=' + item.serviceId
+          )
         }
-      }
-      // 加入申购车
-      const addShoppingCart = (item, index) => {
-        console.log('item===============>', item)
-        if (flag.value && item.id) {
-          flag.value = false
-          sgcInsert({
-            delFlag: '0',
-            resourceId: item.id,
-            // userId: userId.value,
-          }).then((res) => {
-            console.log(res)
-            message.success('添加申购车成功！')
-            mybus.emit('getSgcNum')
-            mybus.emit('changeSelcted', index)
-            flag.value = true
-          })
-        }
-        shoppingKey.value++
-        // 查询申购车中已有id,用于过滤图标
-      }
-      // 添加收藏
-      const addCollect = (item) => {
-        console.log('收藏===============>', item, flag.value)
-        if (flag.value && item.id) {
-          flag.value = false
-          if (item.isCollect == 'true') {
-            scDel([item.id]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('取消成功')
-                item.isCollect = 'false'
-                item.collectCount--
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
-            })
-          } else {
-            scInsert([
-              {
-                resourceId: item.id,
-              },
-            ]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('添加收藏成功！')
-                item.isCollect = 'true'
-                item.collectCount++
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
-            })
-          }
-        }
-      }
-      // 更换查询条件
-      const changeCondition = (val) => {
-        selData.value = selData.value == val ? 'total' : val
-        const orderType = selData.value == val ? 'ASC' : 'DESC'
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: orderType,
-        })
-        console.log('选择===========》', val, selData.value)
-      }
-
-      // 融合服务--排序
-      const changeOrder = (i, val, type) => {
-        let newType = type === 'DESC' ? 'ASC' : 'DESC'
-        orderList.value[i].orderType = newType
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: newType,
-        })
-      }
-
-      // 融合服务--一键申请
-      // 一键申请
-      const handleAKeyApplication = (item) => {
-        let _applyList = []
-        let fuseResourceList = item.fuseResourceList || []
-        let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
-        let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
-        jcssArray = jcssArray.map((v) => {
-          v = Object.assign(v, v.resource)
-          return v
-        })
-        let jcss = [
-          {
-            arr: [
-              {
-                description: '',
-                note1: JSON.stringify(jcssArray),
-                resourceId: '1522550195055828996',
-                resourceName: '摄像头列表',
-                type: '基础设施',
-              },
-            ],
-            deptId: '',
-            deptName: '',
-          },
-        ]
-        if (infrastructure) {
-          jcss[0].deptId = infrastructure.deptId
-          jcss[0].deptName = infrastructure.deptName
-        }
-        otherArray.map((v) => {
-          let resource = v.resource || {}
-          console.log('resource------------>', resource)
-          let obj = {
-            arr: [
-              {
-                delFlag: resource.delFlag,
-                description: resource.description,
-                resourceId: resource.id,
-                resourceName: resource.name,
-                time: resource.createDate,
-                type: resource.type,
-              },
-            ],
-            deptId: resource.deptId,
-            deptName: resource.deptName,
-          }
-          _applyList.push(obj)
-        })
-        _applyList = jcss.concat(_applyList)
-        localStorage.setItem('applyList', JSON.stringify(_applyList))
+      } else if (props.selectCardsname === '融合服务') {
+        context.emit('saveSearchCodition')
+        // 打包模式
         router.push({
-          path: '/apply',
-        })
-      }
-
-      // const handleAKeyApplication = (item) => {
-      //   let _applyList = []
-      //     ; (item.fuseResourceList || []).map((v) => {
-      //       let resource = v.resource || {}
-      //       let obj = {
-      //         arr: [
-      //           {
-      //             delFlag: resource.delFlag,
-      //             description: resource.description,
-      //             resourceId: resource.id,
-      //             resourceName: resource.name,
-      //             time: resource.createDate,
-      //             type: resource.type,
-      //           },
-      //         ],
-      //         deptId: resource.deptId,
-      //         deptName: resource.deptName,
-      //       }
-      //       _applyList.push(obj)
-      //     })
-
-      //   localStorage.setItem('applyList', JSON.stringify(_applyList))
-      //   router.push({
-      //     path: '/apply',
-      //   })
-      // }
-
-      mybus.on('chongzhi', (typeObj) => {
-        console.log('typeObj------------>', typeObj)
-        if (!typeObj) {
-          selData.value = 'total'
-        }
-        if (
-          typeObj &&
-          (typeObj.type === '融合服务' || typeObj.type === '赋能场景')
-        ) {
-          orderList.value = [
-            {
-              value: 'collectCount',
-              name: '收藏量',
-              orderType: 'DESC',
-            },
-            {
-              value: 'create_date',
-              name: '发布时间',
-              orderType: 'DESC',
-            },
-            {
-              value: 'update_date',
-              name: '更新时间',
-              orderType: 'DESC',
-            },
-          ]
-        }
-      })
-      let videoUrl = ref('')
-      const options = reactive({
-        width: '700px', //播放器宽度
-        height: '400px', //播放器高度
-        color: '#409eff', //主题色
-        title: '', //视频名称
-        src: '', //视频源
-        type: 'm3u8', // 视频源类型
-        muted: false, //静音
-        webFullScreen: false,
-        speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-        autoPlay: true, //自动播放
-        loop: false, //循环播放
-        mirror: false, //镜像画面
-        ligthOff: false, //关灯模式
-        volume: 0.3, //默认音量大小
-        control: true, //是否显示控制
-        controlBtns: [
-          'audioTrack',
-          'quality',
-          'speedRate',
-          'volume',
-          'setting',
-          'pip',
-          'pageFullScreen',
-          'fullScreen',
-        ], //显示所有按钮,
-      })
-      let visible = ref(false)
-      // 打开视频预览
-      const openVideo = (item) => {
-        videoUrl.value = ''
-        const param = {
-          key: item.link,
-        }
-        getHls(param).then((res) => {
-          console.log('获取视频地址===============>', res)
-          // videoUrl.value = res.data.data
-          options.src = res.data.data
-          visible.value = true
-        })
-      }
-      // 算法对比跳转
-      const goComparePk = (item) => {
-        router.push({
-          path: '/algorithmCompare',
+          path: '/packagingDetails',
           query: {
             id: item.id,
           },
         })
+      } else if (props.selectCardsname === '赋能场景') {
+        router.push({
+          path: '/integrationServicesDetails',
+          query: {
+            id: item.id,
+          },
+        })
+      } else {
+        if (type === 'apply') {
+          // 外部服务地址跳转到外部
+          const webUrl = item.infoList.filter(
+            (val) => val.attrType == '外部服务地址'
+          )[0]?.attrValue
+          if (webUrl) {
+            window.open(webUrl)
+          } else {
+            if (
+              !(
+                props.selectCardsname === '应用资源' ||
+                props.selectCardsname === '组件服务'
+              ) ||
+              whoShow1.itShowBaoTou
+            ) {
+              return
+            }
+            // 内部跳转申请页面
+            console.log('一键申请===================>', item)
+            localStorage.setItem(
+              'applyList',
+              JSON.stringify([
+                {
+                  arr: [
+                    {
+                      delFlag: item.delFlag,
+                      description: item.description,
+                      resourceId: item.id,
+                      resourceName: item.name,
+                      time: item.createDate,
+                      type: item.type,
+                      componentType:
+                        (item.infoList.filter(
+                          (val) => val.attrType == '组件类型'
+                        )[0] &&
+                          item.infoList.filter(
+                            (val) => val.attrType == '组件类型'
+                          )[0].attrValue) ||
+                        '',
+                    },
+                  ],
+                  deptId: item.deptId,
+                  deptName: item.deptName,
+                },
+              ])
+            )
+            router.push({
+              path: '/apply',
+            })
+          }
+        } else {
+          context.emit('saveSearchCodition')
+          router.push({
+            path: '/details',
+            query: {
+              id: item.id,
+            },
+          })
+        }
       }
-      return {
-        onSearch,
-        resultList,
-        toView,
-        addShoppingCart,
-        changeCondition,
-        selData,
-        selList,
-        addCollect,
-        cardType,
-        findComponentName,
-        shoppingKey,
-        openVideo,
-        videoUrl,
-        options,
-        visible,
-        goComparePk,
-        whoShow1,
-        showKey,
-        orderList,
-        handleAKeyApplication,
-        changeOrder,
+    }
+    // 加入申购车
+    const addShoppingCart = (item, index) => {
+      console.log('item===============>', item)
+      if (flag.value && item.id) {
+        flag.value = false
+        sgcInsert({
+          delFlag: '0',
+          resourceId: item.id,
+          // userId: userId.value,
+        }).then((res) => {
+          console.log(res)
+          message.success('添加申购车成功！')
+          mybus.emit('getSgcNum')
+          mybus.emit('changeSelcted', index)
+          flag.value = true
+        })
       }
-    },
-    beforeUnmount() {
-      mybus.off('chongzhi')
-      // mybus.emit('changeSelcted')
-    },
-  }
+      shoppingKey.value++
+      // 查询申购车中已有id,用于过滤图标
+    }
+    // 添加收藏
+    const addCollect = (item) => {
+      console.log('收藏===============>', item, flag.value)
+      if (flag.value && item.id) {
+        flag.value = false
+        if (item.isCollect == 'true') {
+          scDel([item.id]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('取消成功')
+              item.isCollect = 'false'
+              item.collectCount--
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
+          })
+        } else {
+          scInsert([
+            {
+              resourceId: item.id,
+            },
+          ]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('添加收藏成功！')
+              item.isCollect = 'true'
+              item.collectCount++
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
+          })
+        }
+      }
+    }
+
+    /**更换查询条件
+     * val: 排序字段值
+     * isFromFather: 是否来自父组件传值
+     */
+    const changeCondition = (item, isFromFather = false) => {
+      console.log('item, isFromFather------------>', item, isFromFather);
+      let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC';
+      if (isFromFather) {
+        newType = item.orderType;
+      }
+      orderObj.orderField = item.value;
+      orderObj.orderType = newType;
+      let _index = selList.value.findIndex(x => x.value == item.value)
+      if (_index > -1) {
+        selList.value[_index].orderType = newType
+      }
+      selList.value = selList.value.splice(0);
+      mybus.emit('changeCondition', orderObj)
+    }
+
+    // 融合服务--一键申请
+    const handleAKeyApplication = (item) => {
+      let _applyList = []
+      let fuseResourceList = item.fuseResourceList || []
+      let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
+      let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
+      jcssArray = jcssArray.map((v) => {
+        v = Object.assign(v, v.resource)
+        return v
+      })
+      let jcss = [
+        {
+          arr: [
+            {
+              description: '',
+              note1: JSON.stringify(jcssArray),
+              resourceId: '1522550195055828996',
+              resourceName: '摄像头列表',
+              type: '基础设施',
+            },
+          ],
+          deptId: '',
+          deptName: '',
+        },
+      ]
+      if (infrastructure) {
+        jcss[0].deptId = infrastructure.deptId
+        jcss[0].deptName = infrastructure.deptName
+      }
+      otherArray.map((v) => {
+        let resource = v.resource || {}
+        let obj = {
+          arr: [
+            {
+              delFlag: resource.delFlag,
+              description: resource.description,
+              resourceId: resource.id,
+              resourceName: resource.name,
+              time: resource.createDate,
+              type: resource.type,
+            },
+          ],
+          deptId: resource.deptId,
+          deptName: resource.deptName,
+        }
+        _applyList.push(obj)
+      })
+      _applyList = jcss.concat(_applyList)
+      localStorage.setItem('applyList', JSON.stringify(_applyList))
+      router.push({
+        path: '/apply',
+        query: {
+          integrationServicesId: item.id,
+        },
+      })
+    }
+    
+    mybus.on('chongzhi', (typeObj) => {
+      if (!typeObj) {
+        selData.value = 'total'
+      }
+      if (
+        typeObj &&
+        (typeObj.type === '融合服务' || typeObj.type === '打包模式')
+      ) {
+        integrationServiceOrderDom.value.reset &&
+          integrationServiceOrderDom.value.reset()
+      }
+    })
+
+    let videoUrl = ref('')
+    const options = reactive({
+      width: '700px', //播放器宽度
+      height: '400px', //播放器高度
+      color: '#409eff', //主题色
+      title: '', //视频名称
+      src: '', //视频源
+      type: 'm3u8', // 视频源类型
+      muted: false, //静音
+      webFullScreen: false,
+      speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+      autoPlay: true, //自动播放
+      loop: false, //循环播放
+      mirror: false, //镜像画面
+      ligthOff: false, //关灯模式
+      volume: 0.3, //默认音量大小
+      control: true, //是否显示控制
+      controlBtns: [
+        'audioTrack',
+        'quality',
+        'speedRate',
+        'volume',
+        'setting',
+        'pip',
+        'pageFullScreen',
+        'fullScreen',
+      ], //显示所有按钮,
+    })
+    let visible = ref(false)
+    // 打开视频预览
+    const openVideo = (item) => {
+      videoUrl.value = ''
+      const param = {
+        key: item.link,
+      }
+      getHls(param).then((res) => {
+        console.log('获取视频地址===============>', res)
+        // videoUrl.value = res.data.data
+        options.src = res.data.data
+        visible.value = true
+      })
+    }
+    // 算法对比跳转
+    const goComparePk = (item) => {
+      router.push({
+        path: '/algorithmCompare',
+        query: {
+          id: item.id,
+        },
+      })
+    }
+    return {
+      onSearch,
+      resultList,
+      toView,
+      addShoppingCart,
+      changeCondition,
+      selData,
+      selList,
+      addCollect,
+      cardType,
+      findComponentName,
+      shoppingKey,
+      openVideo,
+      videoUrl,
+      options,
+      visible,
+      goComparePk,
+      whoShow1,
+      showKey,
+      handleAKeyApplication,
+      integrationServiceOrderDom,
+      orderObj,
+      getTagList,
+    }
+  },
+  beforeUnmount() {
+    mybus.off('chongzhi')
+    // mybus.emit('changeSelcted')
+  },
+}
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
-    width: 1088px;
-    padding: 0 20px;
-    background: #f3f5f9;
+#search-result-list-container {
+  width: 1088px;
+  padding: 0 20px;
+  background: #f3f5f9;
 
-    .detail-content {
-      // 超出
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      width: 130px;
-      display: inline-block;
+  .detail-content {
+    // 超出
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 130px;
+    display: inline-block;
+  }
+
+  .shai-xuan {
+    width: 1047px;
+    height: 36px;
+    // margin: 11px 0 20px;
+    // background: #e5f2ff;
+    // padding-left: 20px;
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    .circle {
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      background-color: #0087ff;
+      text-align: center;
+      color: #fff;
+      line-height: 16px;
+      margin-right: 21px;
     }
 
-    .shai-xuan {
-      width: 1047px;
-      height: 36px;
-      // margin: 11px 0 20px;
-      // background: #e5f2ff;
-      // padding-left: 20px;
+    .result {
+      font-size: 14px;
+      font-weight: 500;
+      color: #212121;
+
+      span {
+        font-size: 18px;
+        color: #0087ff;
+      }
+    }
+
+    .condition {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+
+      ul li {
+        list-style-type: none;
+      }
+
+      ul {
+        display: flex;
+
+        li {
+          width: 90px;
+          height: 12px;
+          text-align: center;
+          cursor: pointer;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          .arrow {
+            display: inline-block;
+            width: 12px;
+            height: 12px;
+            background: url('~@/assets/newHome/arrow.png');
+            margin-left: 10px;
+          }
+
+          .down {
+            background: url('~@/assets/newHome/down.png');
+            margin-top: 6px;
+          }
+        }
+      }
+    }
+  }
+
+  .result-list {
+    width: 1048px;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+    border-top: 1px rgba(150, 144, 144, 0.3) solid;
+    padding: 10px 0;
+
+    .item {
+      width: 100%;
+      margin-top: 10px;
       display: flex;
       align-items: center;
-      position: relative;
 
-      .circle {
-        width: 16px;
-        height: 16px;
-        border-radius: 50%;
-        background-color: #0087ff;
-        text-align: center;
-        color: #fff;
-        line-height: 16px;
-        margin-right: 21px;
+      .left {
+        display: inline-block;
+        width: 120px;
+        height: 110px;
+        margin-right: 16px;
       }
 
-      .result {
-        font-size: 14px;
-        font-weight: 500;
-        color: #212121;
-
-        span {
-          font-size: 18px;
-          color: #0087ff;
-        }
-      }
-
-      .condition {
-        position: absolute;
-        right: 20px;
-        top: 10px;
-
-        ul li {
-          list-style-type: none;
-        }
-
-        ul {
-          display: flex;
-
-          li {
-            width: 90px;
-            height: 12px;
-            text-align: center;
-            cursor: pointer;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            .arrow {
-              display: inline-block;
-              width: 12px;
-              height: 12px;
-              background: url('~@/assets/newHome/arrow.png');
-              margin-left: 10px;
-            }
-
-            .down {
-              background: url('~@/assets/newHome/down.png');
-              margin-top: 6px;
-            }
-          }
-        }
-      }
-    }
-
-    .result-list {
-      width: 1048px;
-      display: flex;
-      flex-direction: column;
-      flex-wrap: wrap;
-      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-      border-top: 1px rgba(150, 144, 144, 0.3) solid;
-      padding: 10px 0;
-
-      .item {
+      .right {
         width: 100%;
-        margin-top: 10px;
+      }
+
+      .yyzy {
+        background: url('~@/assets/home/yyzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .sjzy {
+        background: url('~@/assets/home/sjzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .znsf {
+        background: url('~@/assets/home/znsf_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .tcfw {
+        background: url('~@/assets/home/tcfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .kfzj {
+        background: url('~@/assets/home/kfzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .ywzj {
+        background: url('~@/assets/home/ywzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .rhfw {
+        background: url('~@/assets/home/rhfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .jcss {
+        background: url('~@/assets/home/sxt_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .header {
         display: flex;
+        justify-content: space-between;
         align-items: center;
+        margin: 0 10px 0 0;
 
-        .left {
-          display: inline-block;
-          width: 120px;
-          height: 110px;
-          margin-right: 16px;
-        }
-
-        .right {
-          width: 100%;
-        }
-
-        .yyzy {
-          background: url('~@/assets/home/yyzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .sjzy {
-          background: url('~@/assets/home/sjzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .znsf {
-          background: url('~@/assets/home/znsf_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .tcfw {
-          background: url('~@/assets/home/tcfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .kfzj {
-          background: url('~@/assets/home/kfzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .ywzj {
-          background: url('~@/assets/home/ywzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .rhfw {
-          background: url('~@/assets/home/rhfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .jcss {
-          background: url('~@/assets/home/sxt_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .header {
+        .header-right {
           display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin: 0 10px 0 0;
-
-          .header-right {
-            display: flex;
-            font-size: 14px;
-            color: #212121;
-
-            span {
-              font-size: 14px;
-              color: #212121;
-            }
-
-            div {
-              margin-right: 24px;
-            }
-
-            .label-content {
-              flex: 1;
-              display: flex;
-              justify-content: flex-end;
-
-              .label {
-                padding: 0.01rem 0.1rem;
-                margin-right: 0.1rem;
-                border-radius: 0.13rem;
-                background: #0087ff;
-                color: #fff;
-              }
-            }
-          }
-
-          .header-right:last-child {
-            div {
-              margin-right: 16px;
-            }
-          }
+          font-size: 14px;
+          color: #212121;
 
           span {
-            font-size: 20px;
-            font-weight: 600;
-            // color: #0087ff;
+            font-size: 14px;
+            color: #212121;
           }
-        }
-
-        .dec {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          // white-space: nowrap;
-          color: #0058e1;
-          display: flex;
-          margin-top: 10px;
 
           div {
-            margin-right: 10px;
-            background: rgba(0, 88, 225, 0.1);
-            padding-left: 10px;
-            padding-right: 10px;
+            margin-right: 24px;
           }
 
-          div:nth-child(2) {
-            max-width: 200px;
-            display: -webkit-box;
-            /*设置为弹性盒子*/
-            -webkit-line-clamp: 1;
-            /*最多显示3行*/
-            overflow: hidden;
-            /*超出隐藏*/
-            text-overflow: ellipsis;
-            /*超出显示为省略号*/
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
-        }
-
-        .btn {
-          display: flex;
-          justify-content: space-between;
-          font-size: 14px;
-          margin: 5px 0;
-
-          // .left {
-          //   width: 600px;
-          //   display: flex;
-          //   justify-content: space-between;
-          //   flex-wrap: wrap;
-          //   & > div {
-          //     width: 300px;
-          //     & > span {
-          //       color: #0087ff;
-          //       font-weight: 600;
-          //     }
-          //   }
-          // }
-          .right {
+          .label-content {
             flex: 1;
             display: flex;
             justify-content: flex-end;
-            margin: 0 10px;
-            align-items: center;
 
-            .shopping {
-              span {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                margin-right: 10px;
-                margin-top: 5px;
-              }
-
-              .shopping-on {
-                background: url('~@/assets/newHome/shopping-on.png');
-                cursor: pointer;
-              }
-
-              .shopping-down {
-                background: url('~@/assets/newHome/shopping-down.png');
-              }
+            .label {
+              padding: 0.01rem 0.1rem;
+              margin-right: 0.1rem;
+              border-radius: 0.13rem;
+              background: #0087ff;
+              color: #fff;
             }
+          }
+        }
 
-            .pk-on {
+        .header-right:last-child {
+          div {
+            margin-right: 16px;
+          }
+        }
+
+        span {
+          font-size: 20px;
+          font-weight: 600;
+          // color: #0087ff;
+        }
+      }
+
+      .dec {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        // white-space: nowrap;
+        color: #0058e1;
+        display: flex;
+        margin-top: 10px;
+
+        div {
+          margin-right: 10px;
+          background: rgba(0, 88, 225, 0.1);
+          padding-left: 10px;
+          padding-right: 10px;
+        }
+
+        div:nth-child(2) {
+          max-width: 200px;
+          display: -webkit-box;
+          /*设置为弹性盒子*/
+          -webkit-line-clamp: 1;
+          /*最多显示3行*/
+          overflow: hidden;
+          /*超出隐藏*/
+          text-overflow: ellipsis;
+          /*超出显示为省略号*/
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+      }
+
+      .btn {
+        display: flex;
+        justify-content: space-between;
+        font-size: 14px;
+        margin: 5px 0;
+
+        // .left {
+        //   width: 600px;
+        //   display: flex;
+        //   justify-content: space-between;
+        //   flex-wrap: wrap;
+        //   & > div {
+        //     width: 300px;
+        //     & > span {
+        //       color: #0087ff;
+        //       font-weight: 600;
+        //     }
+        //   }
+        // }
+        .right {
+          flex: 1;
+          display: flex;
+          justify-content: flex-end;
+          margin: 0 10px;
+          align-items: center;
+
+          .shopping {
+            span {
               display: inline-block;
               height: 32px;
               width: 32px;
-              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-              background: url('~@/assets/newHome/pk-on.png');
+            }
+
+            .shopping-on {
+              background: url('~@/assets/newHome/shopping-on.png');
               cursor: pointer;
             }
 
-            .sc {
-              // margin-top: 4px;
-              cursor: pointer;
-              display: flex;
-              align-items: center;
-
-              .sc-down {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-down.png');
-              }
-
-              .sc-on {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-on.png');
-              }
-            }
-
-            .ant-btn {
-              background: transparent;
-              background: #0058e1;
-              color: white;
-              width: 80px;
-              height: 32px;
-              font-weight: 600;
-              border-radius: 2px;
-              text-align: center;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              margin-left: 10px;
-            }
-
-            .ant-btn:last-child {
-              background: #0058e1;
-              color: white;
+            .shopping-down {
+              background: url('~@/assets/newHome/shopping-down.png');
             }
           }
-        }
 
-        .bottom {
-          display: flex;
-          justify-content: space-between;
-          margin-top: 10px;
-          align-items: center;
+          .pk-on {
+            display: inline-block;
+            height: 32px;
+            width: 32px;
+            margin-left: 10px;
+            margin-right: 10px;
+            margin-top: 5px;
+            background: url('~@/assets/newHome/pk-on.png');
+            cursor: pointer;
+          }
 
-          & > div {
+          .sc {
+            // margin-top: 4px;
+            cursor: pointer;
             display: flex;
             align-items: center;
 
-            & > div {
-              margin: 0 10px;
+            .sc-down {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-down.png');
+            }
+
+            .sc-on {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-on.png');
             }
           }
 
-          .pingfen {
-            :deep(span) {
+          .ant-btn {
+            background: transparent;
+            background: #0058e1;
+            color: white;
+            width: 80px;
+            height: 32px;
+            font-weight: 600;
+            border-radius: 2px;
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 10px;
+          }
+
+          .ant-btn:last-child {
+            background: #0058e1;
+            color: white;
+          }
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10px;
+        align-items: center;
+
+        &>div {
+          display: flex;
+          align-items: center;
+
+          &>div {
+            margin: 0 10px;
+          }
+        }
+
+        .pingfen {
+          :deep(span) {
+            display: flex;
+            align-items: center;
+
+            :deep(ul) {
               display: flex;
               align-items: center;
 
-              :deep(ul) {
-                display: flex;
-                align-items: center;
-
-                :deep(.ant-rate-star:not(:last-child)) {
-                  margin-right: 4px;
-                }
+              :deep(.ant-rate-star:not(:last-child)) {
+                margin-right: 4px;
               }
             }
           }
         }
       }
+    }
 
-      .item:nth-of-type(1) {
-        margin-top: 0;
-      }
+    .item:nth-of-type(1) {
+      margin-top: 0;
     }
   }
+}
 
-  .description {
-    max-width: 990px;
-    height: 52px;
-    font-size: 14px;
-    line-height: 18px;
-    display: -webkit-box;
-    -webkit-line-clamp: 3;
-    /*最多显示3行*/
-    overflow: hidden;
-    /*超出隐藏*/
-    text-overflow: ellipsis;
-    /*超出显示为省略号*/
-    -webkit-box-orient: vertical;
-    word-break: break-all;
-  }
+.description {
+  max-width: 990px;
+  height: 52px;
+  font-size: 14px;
+  line-height: 18px;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  /*最多显示3行*/
+  overflow: hidden;
+  /*超出隐藏*/
+  text-overflow: ellipsis;
+  /*超出显示为省略号*/
+  -webkit-box-orient: vertical;
+  word-break: break-all;
+}
 </style>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 2de40eeb..caa2cf86 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -510,7 +510,6 @@
             </template>
             <template v-if="column.dataIndex === 'operation'">
               <a
-                v-if="isXiHaiAn"
                 @click="
                   openVideo(
                     record.channelCode ||
@@ -577,18 +576,18 @@
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
           <div style="width: 100%; height: 100%; position: relative">
-            <!-- 预览视频--遮罩 -->
-            <div class="video-cover" @click="videoShowMsg"></div>
-            <div class="waterMark waterMark-left-top">
+            <!-- 西海岸--预览视频--遮罩 todo-->
+            <div class="video-cover" @click="videoShowMsg" v-show="isXiHaiAn"></div>
+            <div class="waterMark waterMark-left-top" v-show="isXiHaiAn">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="waterMark waterMark-right-top">
+            <div class="waterMark waterMark-right-top" v-show="isXiHaiAn">
               {{ userInfo.realNameShow }}
             </div>
-            <div class="waterMark waterMark-left-bottom">
+            <div class="waterMark waterMark-left-bottom" v-show="isXiHaiAn">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="waterMark waterMark-right-bottom">
+            <div class="waterMark waterMark-right-bottom" v-show="isXiHaiAn">
               {{ userInfo.realNameShow }}
             </div>
             <vue3VideoPlay v-bind="options" />
@@ -660,17 +659,17 @@
             style="width: 100%; height: 100%; position: relative"
           >
             <!-- 批量预览视频--遮罩 -->
-            <div class="batch-video-cover" @click="videoShowMsg(index)"></div>
-            <div class="batch-waterMark batch-waterMark-left-top">
+            <div class="batch-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div>
+            <div class="batch-waterMark batch-waterMark-left-top" v-show="isXiHaiAn">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="batch-waterMark batch-waterMark-right-top">
+            <div class="batch-waterMark batch-waterMark-right-top" v-show="isXiHaiAn">
               {{ userInfo.realNameShow }}
             </div>
-            <div class="batch-waterMark batch-waterMark-left-bottom">
+            <div class="batch-waterMark batch-waterMark-left-bottom" v-show="isXiHaiAn">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="batch-waterMark batch-waterMark-right-bottom">
+            <div class="batch-waterMark batch-waterMark-right-bottom" v-show="isXiHaiAn">
               {{ userInfo.realNameShow }}
             </div>
             <p></p>
@@ -1950,12 +1949,6 @@
       width: '60%',
       key: 'managementUnitName',
     },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: '10%',
-      key: 'status',
-    },
     {
       title: '操作',
       dataIndex: 'operation',
@@ -1963,6 +1956,15 @@
       key: 'channelId',
     },
   ])
+  // 西海岸--状态展示
+  if(isXiHaiAn) {
+    columns.value = columns.value.splice(2, 0, {
+      title: '状态',
+      dataIndex: 'status',
+      width: '10%',
+      key: 'status',
+    })
+  }
   const columns2 = ref([
     {
       title: '名称',
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index ae1b7a32..d62b5a88 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -5,13 +5,8 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div
-          v-for="(item, index) in titleName"
-          :key="index"
-          class="tabAll"
-          @click="changeCards(index)"
-          :class="{ sel: index == number }"
-        >
+        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
+          :class="{ sel: index == number }">
           <span>
             {{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }}
           </span>
@@ -20,54 +15,26 @@
       <div class="resultListSearchInput-father" v-if="number === 0">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <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>
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
+          <button class="button-reset" @click="resetAction()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div v-loading="loadingData">
-        <searchResultList
-          v-if="number === 0"
-          v-show="resourceList.data && resourceList.data.length > 0"
-          :key="listKey2"
-          :resourceList="resourceList"
-          :resourceTotal="resourceTotal"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
-        <CanAssignCase
-          v-else
-          v-show="resourceList.data && resourceList.data.length > 0"
-          :key="listKey2"
-          :resourceList="resourceList"
-          :resourceTotal="resourceTotal"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
+        <searchResultList v-if="number === 0" v-show="resourceList.data && resourceList.data.length > 0"
+          :resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
+          ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
+        <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
+          @saveSearchCodition="saveSearchCodition" :resourceTotal="resourceTotal"
+          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
         <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>
@@ -76,342 +43,357 @@
   <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 } from 'vue'
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import { defineComponent, reactive, ref, toRefs, onMounted, nextTick } from 'vue'
+import { getIntegrationServicesList } from '@/api/home.js'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
+import { message } from 'ant-design-vue'
 
-  import { getIntegrationServicesList } from '@/api/home.js'
-  import { useRouter } from 'vue-router'
-  import HomeHeader from '@/views/home/components/header'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
-  import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
-  import { message } from 'ant-design-vue'
-
-  export default defineComponent({
-    setup() {
-      // 分页
-      const loading = ref(true)
-      const currentPage = ref(1)
-      const currentPageSize = ref(10)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
-      const router = useRouter()
-      const select = router.currentRoute.value.query.select
-      const searchValue = ref('')
-      const Cardsname = ref(select)
-      const resourceList = reactive({ data: [] })
-      const resourceTotal = ref(0)
-      const current = ref(1)
-      const loadingData = ref(false)
-      // 选项卡
-      const titleName = ref([
-        {
-          name: '打包模式',
-        },
-        {
-          name: '赋能场景',
-        },
-      ])
-
-      const number = ref(0)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-
-      // 查询参数
-      const paramsGetResources = {
-        pageNum: 1,
-        pageSize: currentPageSize.value,
-        type: titleName.value[number.value].name,
-        name: '',
-        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-        orderType: 'DESC', // ASC 升序  DESC 降序
-      }
-
-      const changeCards = (val) => {
-        console.log(val)
-        number.value = val
-        chongzhi()
-      }
-
-      // 查询
-      const onSearch = () => {
-        loading.value = true
-        currentPage.value = 1
-      }
-      // 重置数据
-      const chongzhi = () => {
-        loading.value = true
-        // 重置模糊查字段
-        searchValue.value = ''
-        // 分页
-        currentPage.value = 1
-        currentPageSize.value = 10
-        // 重置查询条件
-        paramsGetResources.pageNum = 1
-        paramsGetResources.pageSize = 10
-        paramsGetResources.orderField = 'create_date'
-        paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi', {
-          type: titleName.value[number.value].name,
+export default defineComponent({
+  beforeRouteLeave(to, from, next) {
+    console.log('to---integrationServices--beforeRouteLeave------->', to)
+    console.log('from---integrationServices--beforeRouteLeave------->', from)
+    console.log('next---integrationServices--beforeRouteLeave------->', next)
+    if (to.name !== 'packagingDetails' && to.name !== 'integrationServicesDetails') {
+      localStorage.removeItem('integrationServices')
+    }
+    next()
+  },
+  setup() {
+    // 分页
+    const loading = ref(true)
+    const currentPage = ref(1)
+    const currentPageSize = ref(5)
+    const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
+    const router = useRouter()
+    const select = router.currentRoute.value.query.select
+    const searchValue = ref('')
+    const Cardsname = ref(select)
+    const resourceList = reactive({ data: [] })
+    const resourceTotal = ref(0)
+    const loadingData = ref(false)
+    // 选项卡
+    const titleName = ref([
+      {
+        name: '打包模式',
+      },
+      {
+        name: '赋能场景',
+      },
+    ])
+    const number = ref(0)
+    // 查询参数
+    const paramsGetResources = {
+      page: currentPage.value,
+      limit: currentPageSize.value,
+      type: titleName.value[number.value].name,
+      name: searchValue.value,
+      orderField: 'create_date',
+      orderType: 'DESC', // ASC 升序  DESC 降序
+    }
+    const searchResultListDom = ref(null)
+    const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
+    // 读取本地存储：表单赋值
+    const handleSetSearchData = () => {
+      if (storageSearchInfo) {
+        number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
+        // 搜索名称 
+        searchValue.value = storageSearchInfo.name;
+        currentPage.value = storageSearchInfo.page;
+        currentPageSize.value = storageSearchInfo.limit;
+        paramsGetResources.limit = storageSearchInfo.limit;
+        paramsGetResources.page = storageSearchInfo.page;
+        paramsGetResources.type = storageSearchInfo.type;
+        // 延迟使用，因为还没有返回跟挂载
+        nextTick(() => {
+          searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
+            value: storageSearchInfo.orderField,
+            orderType: storageSearchInfo.orderType,
+          }, true)
         })
-        getAppResources()
-      }
-
-      const getAppResources = () => {
         getIntegrationList()
       }
+    }
 
-      // 获取融合服务列表
-      const getIntegrationList = () => {
-        loadingData.value = true
-        console.log('获取融合服务列表------------>')
-        let postData = {
-          limit: currentPageSize.value,
-          page: currentPage.value,
-          orderField: paramsGetResources.orderField,
-          orderType: paramsGetResources.orderType,
-          name: searchValue.value,
-          type: titleName.value[number.value].name,
-        }
-        getIntegrationServicesList(postData).then(
-          (res) => {
-            loadingData.value = false
-            if (res.data.code !== 0) {
-              return message.error(res.data.msg)
-            }
-            console.log('res.data------------>', res.data)
-
-            resourceList.data = res.data.data.list || []
-            resourceTotal.value = res.data.data.total || 0
-            listKey2.value++
-          },
-          (err) => {
-            loadingData.value = false
-            message.error(err)
-          }
-        )
-      }
-
-      mybus.on('paramsGetResources', (ids) => {
-        if (ids && ids.length > 0) {
-          paramsGetResources.deptIds = ids
-        } else {
-          delete paramsGetResources.deptIds
-        }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
-        getAppResources('分页查询')
-      })
-      mybus.on('changeSelcted', () => {
-        getAppResources()
-      })
-
-      mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        getAppResources()
-      })
-      mybus.on('changeCondition', (condition) => {
-        paramsGetResources.orderField = condition.orderField
-        paramsGetResources.orderType = condition.orderType
-        getAppResources()
-      })
-
-      const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
-        currentPage.value = val
-        paramsGetResources.pageNum = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
-      }
-
-      onMounted(() => {
-        console.log('222----onMounted-------->', 222)
-        listKey2.value++
-        getAppResources()
-      })
+    const changeCards = (val) => {
+      // 打包模式
+      number.value = val;
+      paramsGetResources.type = titleName.value[number.value].name;
+      resetAction()
+    }
 
+    // 查询
+    const onSearch = () => {
+      currentPage.value = 1
+      getIntegrationList()
+    }
+    // 重置数据
+    const resetAction = () => {
+      // 重置模糊查字段
+      searchValue.value = ''
       // 分页
-      const onShowSizeChange = (current, pageSize) => {
-        currentPage.value = current
-        currentPageSize.value = pageSize
-        paramsGetResources.pageNum = current
-        paramsGetResources.pageSize = pageSize
-        getAppResources()
-      }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
-      })
+      currentPage.value = 1
+      currentPageSize.value = 5
+      // 重置查询条件
+      paramsGetResources.page = 1
+      paramsGetResources.limit = 5
+      paramsGetResources.orderField = 'create_date'
+      paramsGetResources.orderType = 'DESC'
 
-      return {
-        listKey,
-        searchValue,
-        currentPage,
-        resourceList,
-        resourceTotal,
-        pageChange,
-        listKey2,
-        Cardsname,
-        getAppResources,
-        chongzhi,
-        onSearch,
-        currentPageSize,
-        pageSizeOptions,
-        current,
-        loading,
-        titleName,
-        changeCards,
-        number,
-        loadingData,
+      mybus.emit('resetAction', {
+        type: titleName.value[number.value].name,
+      })
+      getIntegrationList()
+    }
+
+    // 获取融合服务列表
+    const getIntegrationList = () => {
+      loadingData.value = true
+      paramsGetResources.name = searchValue.value;
+      console.log('paramsGetResources------参数下发------>', paramsGetResources);
+      getIntegrationServicesList(paramsGetResources).then(
+        (res) => {
+          loadingData.value = false
+          if (res.data.code !== 0) {
+            return message.error(res.data.msg)
+          }
+          resourceList.data = res.data.data.list || []
+          resourceTotal.value = res.data.data.total || 0
+        },
+        (err) => {
+          loadingData.value = false
+          message.error(err)
+        }
+      )
+    }
+
+    mybus.on('paramsGetResources', (ids) => {
+      if (ids && ids.length > 0) {
+        paramsGetResources.deptIds = ids
+      } else {
+        delete paramsGetResources.deptIds
       }
-    },
-    components: {
-      HomeHeader,
-      HomeFooter,
-      searchResultList,
-      CanAssignCase,
-    },
-    beforeUnmount() {
-      mybus.off('paramsGetResources')
-      mybus.off('changeCondition')
-      mybus.off('refresh')
-      mybus.off('changePage')
-    },
-  })
+      getIntegrationList()
+    })
+
+    mybus.on('changePage', (page) => {
+      paramsGetResources.page = page
+      getIntegrationList()
+    })
+
+    mybus.on('changeSelcted', () => {
+      getIntegrationList()
+    })
+
+    mybus.on('refresh', () => {
+      paramsGetResources.page = 1
+      currentPage.value = 1
+      getIntegrationList()
+    })
+    mybus.on('changeCondition', (condition) => {
+      paramsGetResources.orderField = condition.orderField
+      paramsGetResources.orderType = condition.orderType
+      getIntegrationList()
+    })
+
+    const pageChange = (val) => {
+      currentPage.value = val
+      paramsGetResources.page = val
+      getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+    }
+
+    // 分页
+    const onShowSizeChange = (current, pageSize) => {
+      currentPage.value = current
+      currentPageSize.value = pageSize
+      paramsGetResources.page = current
+      paramsGetResources.limit = pageSize
+      getIntegrationList()
+    }
+
+    // 存储查询条件到本地
+    const saveSearchCodition = (n) => {
+      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
+      localStorage.setItem(
+        'integrationServices',
+        JSON.stringify(paramsGetResources)
+      )
+    }
+
+    onMounted(() => {
+      if (storageSearchInfo) {
+        handleSetSearchData()
+      } else {
+        getIntegrationList()
+      }
+    })
+
+    return {
+      searchValue,
+      currentPage,
+      resourceList,
+      resourceTotal,
+      pageChange,
+      Cardsname,
+      getIntegrationList,
+      resetAction,
+      onSearch,
+      currentPageSize,
+      pageSizeOptions,
+      loading,
+      titleName,
+      changeCards,
+      number,
+      loadingData,
+      onShowSizeChange,
+      saveSearchCodition,
+      searchResultListDom,
+    }
+  },
+  components: {
+    HomeHeader,
+    HomeFooter,
+    searchResultList,
+    CanAssignCase,
+  },
+  beforeUnmount() {
+    mybus.off('paramsGetResources')
+    mybus.off('changeCondition')
+    mybus.off('refresh')
+    mybus.off('changePage')
+  },
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
-    background: #f3f5f9;
-    padding: 0.2rem;
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
 
-    // padding-left: 0.2rem;
-    // padding-top: 0.2rem;
-    .resultListSearchInput-son {
-      background: #fff;
-      padding: 0.2rem 0.2rem 0rem 0.3rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
 
-      .hengxian {
-        width: 100%;
-        height: 0.01rem;
-        background: rgba(150, 144, 144, 0.3);
-        margin-top: 0.2rem;
-      }
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
     }
   }
+}
 
-  .resultListSearchInput {
-    margin-left: 0.1rem;
+.resultListSearchInput {
+  margin-left: 0.1rem;
 
-    :deep(.ant-input) {
-      width: 4rem;
-      height: 0.36rem;
-      background: #fff;
-      border-radius: 0.04rem;
-    }
-
-    :deep(.ant-input-search-button) {
-      width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
-      font-size: 0.14rem;
-      font-weight: 400;
-      color: #fff;
-      line-height: 0.34rem;
-      margin-left: 0.1rem;
-    }
-
-    :deep(.ant-input-group-addon) {
-      left: 0 !important;
-    }
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
   }
 
-  .button-reset {
-    border: 0;
-    outline: none;
+  :deep(.ant-input-search-button) {
     width: 0.8rem;
     height: 0.36rem;
-    background: #e1edfa;
-    border-radius: 0.04rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    color: #fff;
     line-height: 0.34rem;
-    margin-left: 2.5rem;
-    cursor: pointer;
+    margin-left: 0.1rem;
   }
 
-  .details-pageconetent {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 0.67rem;
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
+
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
     position: relative;
-    background: rgba(245, 243, 243, 0.3);
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
 
-    .details-pageconetent-left {
-      max-height: 6.9rem;
-      position: absolute;
-      width: 2.5rem;
-      top: 0.17rem;
-      left: 2.5rem;
-      margin-right: 0.17rem;
-      overflow: auto;
-    }
-
-    .top {
-      min-height: 7.2rem;
-      position: relative;
-      width: 11.5rem;
-      display: flex;
-      padding-top: 0.2rem;
-      flex-direction: column;
-      font-size: 0.16rem;
-      justify-content: left;
+    .pagination {
       background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
 
-      .pagination {
-        background: #f3f5f9;
-        padding-bottom: 0.6rem;
+    .top-title {
+      padding: 0.2rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
       }
 
-      .top-title {
-        padding: 0.2rem;
-        display: flex;
-        font-size: 18px;
+      .tabAll:nth-child(1) {
+        margin-left: 20px;
+      }
 
-        .tabAll {
-          font-size: 18px;
-          color: #000000;
-          margin-right: 35px;
-          cursor: pointer;
-        }
-
-        .tabAll:nth-child(1) {
-          margin-left: 20px;
-        }
-
-        .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
-        }
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
       }
     }
   }
+}
 
-  :deep(.ant-card-grid) {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 1;
-    word-break: break-all;
-  }
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+}
 </style>