代码找回 (详情按钮，西海岸智能算法支持，融合服务详情，西海岸登录默认基础设施) 【2022-09-30：修改文件 】

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',

front/src/views/home/DetailsPageconetent.vue

@@ -12,48 +12,25 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources2"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
+          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
-            class="button-reset"
-            style="margin-left: 0.1rem"
-            @click="globalSearch()"
-          >
             全局搜索
           </button>
-          <button
+          <button v-if="Cardsname == '应用资源'" class="button-reset" @click="applyAll()" style="margin-left: 0.1rem">
-            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
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span v-if="globalData.data.length > 0">
             {{
             item.name +
@@ -69,89 +46,45 @@
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template
+        <template v-if="
-          v-if="
           Cardsname == '组件服务' ||
           Cardsname == '应用资源' ||
           Cardsname == ''
-          "
+        ">
-        >
           <div class="top-content-son">
-            <div
+            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
-              v-for="(item, index) in ListContent.records"
-              :key="index"
-              class="top-content"
-            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div
+              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                class="leixingsumfather"
+                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                :class="!item.shrinkFlag ? 'shrink' : ''"
+                  <a-checkable-tag :checked="
-              >
-                <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="
-                    @change="
                     (checked) => handleChange(item2, checked, item.name)
-                    "
+                  ">
-                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
+              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                class="shrinkTag"
+                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                v-if="item.showShrink"
+                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
-                :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
+      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-        v-show="resourceList.data && resourceList.data.length > 0"
+        :key="listKey2" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        :resourceList="resourceList"
+        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
-        :key="listKey2"
-        :resourceTotal="resourceTotal"
-        :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition"
-        ref="searchResultListDom"
-      />
       <div class="pagination">
-        <a-pagination
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          v-model:current="currentPage"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
-          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
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-        v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 2rem"
-      >
         <a-empty />
       </div>
     </div>
@@ -159,40 +92,22 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources2"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
+          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
-            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
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span v-if="globalData.data.length > 0">
             {{
             item.name +
@@ -208,51 +123,29 @@
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage
+        <infrastructurePage ref="camera" @add="handleAdd" :searchValue="searchValue" />
-          ref="camera"
-          @add="handleAdd"
-          :searchValue="searchValue"
-        />
       </div>
     </div>
     <div class="top" v-else>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources2"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
+          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
-            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
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span v-if="globalData.data.length > 0">
             {{
             item.name +
@@ -267,10 +160,7 @@
           </span>
         </div>
       </div>
-      <KnowledgeBase
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></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
+        <li v-for="item in abilitySquare" :key="item" @click="abilitySquareFunction(item)">
-          v-for="item in abilitySquare"
-          :key="item"
-          @click="abilitySquareFunction(item)"
-        >
           {{ item }}
         </li>
       </ul>
     </div>
   </div>
   <!-- 西海岸 -->
-  <div
+  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowXiHaiAn">
-    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
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
-            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
+        <template v-if="
-          v-if="
           Cardsname == '组件服务' ||
           Cardsname == '应用资源' ||
           Cardsname == ''
-          "
+        ">
-        >
           <div class="top-content-son">
-            <div
+            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
-              v-for="(item, index) in ListContent.records"
-              :key="index"
-              class="top-content"
-            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div
+              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                class="leixingsumfather"
+                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                :class="!item.shrinkFlag ? 'shrink' : ''"
+                  <a-checkable-tag :checked="
-              >
-                <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="
-                    @change="
                     (checked) => handleChange(item2, checked, item.name)
-                    "
+                  ">
-                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
+              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                class="shrinkTag"
+                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                v-if="item.showShrink"
+                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
-                :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
+      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
-        v-show="resourceList.data && resourceList.data.length > 0"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        :key="listKey2"
+        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition"
-        ref="searchResultListDom"
-      />
       <div class="pagination">
-        <a-pagination
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          v-model:current="currentPage"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
-          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
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-        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
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -449,41 +267,24 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-      ></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -493,139 +294,75 @@
     </div>
   </div>
   <!-- 包头 -->
-  <div
+  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowBaoTou">
-    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
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
-      <div
+      <div v-show="Cardsname !== '数据资源'" class="resultListSearchInput-father">
-        v-show="Cardsname !== '数据资源'"
-        class="resultListSearchInput-father"
-      >
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
-            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
+        <template v-if="
-          v-if="
           Cardsname == '组件服务' ||
           Cardsname == '应用资源' ||
           Cardsname == ''
-          "
+        ">
-        >
           <div class="top-content-son">
-            <div
+            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
-              v-for="(item, index) in ListContent.records"
-              :key="index"
-              class="top-content"
-            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div
+              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                class="leixingsumfather"
+                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                :class="!item.shrinkFlag ? 'shrink' : ''"
+                  <a-checkable-tag :checked="
-              >
-                <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="
-                    @change="
                     (checked) => handleChange(item2, checked, item.name)
-                    "
+                  ">
-                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
+              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                class="shrinkTag"
+                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                v-if="item.showShrink"
+                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
-                :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
+      <searchResultList v-show="resourceList.data && resourceList.data.length" :key="listKey2"
-        v-show="resourceList.data && resourceList.data.length"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        :key="listKey2"
+        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition"
-        ref="searchResultListDom"
-      />
       <div class="pagination">
-        <a-pagination
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          v-model:current="currentPage"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
-          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
+            <div class="title" @click="dianjitiaozhaun('青岛市政务资源管理平台')">
-              class="title"
-              @click="dianjitiaozhaun('青岛市政务资源管理平台')"
-            >
               青岛市政务资源管理平台{{ dataShowdev }}
             </div>
           </div>
@@ -641,28 +378,18 @@
           </div>
         </div>
       </div>
-      <div
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-        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
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -670,41 +397,24 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div
+        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          v-for="item in titleName"
+          @click="changeCards(item.name)">
-          :key="item.name"
+          <span class="photo" :style="{
-          :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)"
-        >
-          <span
-            class="photo"
-            :style="{
             backgroundImage: `url(${item.photo}) `,
             backgroundSize: 'cover',
-            }"
+          }"></span>
-          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase
+      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-      ></KnowledgeBase>
     </div>
   </div>
   <home-footer></home-footer>
@@ -782,7 +492,6 @@
     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
@@ -817,7 +526,6 @@
     // 读取本地存储查询条件
     let storageSearchInfo = null
     const handleSetSearchData = () => {
-        if (whoShow1.value.itShowXiHaiAn) {
       if (localStorage.getItem('DetailsPageconetent')) {
         storageSearchInfo = JSON.parse(
           localStorage.getItem('DetailsPageconetent')
@@ -852,7 +560,6 @@
         })
       }
     }
-      }
 
     //西海岸查询参数
     let paramsGetResources2 = ref({
@@ -1086,13 +793,14 @@
         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++
       })
@@ -1150,7 +858,7 @@
         paramsGetResources.type == '基础设施'
       ) {
         console.log('camera2', camera)
-          // camera.value.getCamera(true, searchValue.value)
+        camera.value.getCamera(true, searchValue.value)
       } else {
         if (storageSearchInfo) {
           getAppResources('分页查询')
@@ -1259,6 +967,9 @@
               paramsGetResources.pageNum = 1
             }
             pageWithAttrs(paramsGetResources).then((res) => {
+              if (res.data.code != 0) {
+                return message.error(res.data.msg)
+              }
               console.log(
                 '查询列表====22========>',
                 resourceList,
@@ -1825,8 +1536,7 @@
           display: flex;
           align-items: center;
 
-          .tupian {
+          .tupian {}
-          }
 
           .title {
             margin-left: 0.1rem;
@@ -1870,8 +1580,7 @@
           display: flex;
           align-items: center;
 
-          .tupian {
+          .tupian {}
-          }
 
           .title {
             margin-left: 0.1rem;
@@ -1929,8 +1638,7 @@
           align-items: center;
           margin-left: 0.2rem;
 
-          .tupian {
+          .tupian {}
-          }
 
           .title {
             margin-left: 0.1rem;

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专区':

front/src/views/home/components/searchResultList.vue

@@ -10,89 +10,51 @@
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul
+        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
-          v-if="
           selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
+        "></IntegrationServiceOrder>
-        >
-          <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>
         <ul v-else>
-          <li
+          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
-            v-for="item in selList"
-            :key="item.value"
-            @click="changeCondition(item.value)"
-            v-show="
             item.show &&
             item.name !== '评分' &&
             selectCardsname !== '数据资源'
-            "
+          ">
-          >
             {{ item.name }}
-            <span
+            <span class="arrow" :class="
-              class="arrow"
+              orderObj.orderType == 'ASC' &&
-              :class="item.value == selData ? 'down' : ''"
+              orderObj.orderField == item.value
-            ></span>
+                ? 'down'
+                : ''
+            "></span>
           </li>
         </ul>
       </div>
+
     </div>
-    <div
+    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
-      class="result-list"
-      v-for="(item, index) in resourceList.data"
-      :key="item.index"
-    >
       <div class="item" :key="showKey">
-        <div
+        <div class="left" style="display: flex; align-items: center" v-if="
-          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="
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
               .attrValue
-            "
+          " />
-          />
         </div>
-        <div
+        <div class="left" style="display: flex; align-items: center" v-else-if="
-          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="
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
             item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
               .attrValue
-            "
+          " />
-          />
         </div>
-        <div
+        <div class="left" :class="
-          class="left"
-          :class="
           item.type == '应用资源'
             ? 'yyzy'
             : !item.type
@@ -117,55 +79,33 @@
                 .attrValue == '业务组件'
             ? 'ywzj'
             : ''
-          "
+        " @click="toView('details', item)" v-else-if="
-          @click="toView('details', item)"
-          v-else-if="
           selectCardsname !== '基础设施' &&
           selectCardsname !== '融合服务' &&
           selectCardsname !== '赋能场景'
-          "
+        "></div>
-        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div
+        <div class="left rhfw" v-else-if="
-          class="left rhfw"
-          v-else-if="
           selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
+        "></div>
-        ></div>
         <div class="right" @click="toView('details', item)">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
               <!-- 已申请--通过 -->
-              <svg
+              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
-                t="1652322568870"
+                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="
-                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"
+                  fill="#d81e06" p-id="3063"></path>
-                  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"
+                  fill="#d81e06" p-id="3064"></path>
-                  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"
+                  fill="#d81e06" p-id="3065"></path>
-                  p-id="3065"
-                ></path>
               </svg>
               <!-- 审核中 -->
               <!-- <svg
@@ -211,28 +151,19 @@
               </span> -->
             </span>
             <div class="header-right">
-              <div
+              <div v-if="
-                v-if="
                 selectCardsname === '融合服务' ||
                 selectCardsname === '赋能场景'
-                "
+              " class="label-content">
-                class="label-content"
+                <template v-if="
-              >
-                <template
-                  v-if="
                   item.fuseAttrList &&
                   item.fuseAttrList.filter(
                     (val) => val.attrType == '应用领域'
                   )[0]
-                  "
+                ">
-                >
+                  <span class="label" v-for="(data, index) in item.fuseAttrList
-                  <span
-                    class="label"
-                    v-for="(data, index) in item.fuseAttrList
                   .filter((val) => val.attrType == '应用领域')[0]
-                      .attrValue.split(';')"
+                  .attrValue.split(';')" :key="index">
-                    :key="index"
-                  >
                     {{ data }}
                   </span>
                 </template>
@@ -250,21 +181,15 @@
             </div>
           </div>
           <div class="dec">
-            <div
+            <div v-if="
-              v-if="
               selectCardsname !== '融合服务' &&
               selectCardsname !== '赋能场景' &&
               selectCardsname !== '基础设施'
-              "
+            ">
-            >
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div
+          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
-            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
+                <div v-if="
-                  v-if="
                   selectCardsname !== '数据资源' &&
                   selectCardsname !== '融合服务' &&
                   selectCardsname !== '赋能场景'
-                  "
+                ">
-                >
                   浏览量：{{ item.visits || 0 }}次
                 </div>
-                <div
+                <div v-if="
-                  v-if="
                   selectCardsname !== '数据资源' &&
                   selectCardsname !== '融合服务' &&
                   selectCardsname !== '赋能场景' &&
                   (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                  "
+                ">
-                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div
+                <div v-if="
-                  v-if="
                   selectCardsname === '数据资源' &&
                   selectCardsname !== '融合服务' &&
                   selectCardsname !== '赋能场景'
-                  "
+                ">
-                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -308,75 +227,39 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template
+                <template v-if="
-                  v-if="
                   (selectCardsname == '组件服务' &&
                     item.infoList.filter(
                       (val) => val.attrType == '外部服务地址'
                     ).length === 0) ||
                   (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                  "
+                ">
-                >
+                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
-                  <span
+                  <span class="shopping-on" v-else @click.stop="addShoppingCart(item, index)"></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
+                <span class="sc-down" v-if="item.isCollect == 'false'" @click.stop="addCollect(item)"></span>
-                  class="sc-down"
+                <span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></span>
-                  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
+              <div class="shopping pk" :key="pk" v-show="
-                class="shopping pk"
-                :key="pk"
-                v-show="
                 cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
+              ">
-              >
+                <span class="pk-on" @click.stop="goComparePk(item, index)"></span>
-                <span
-                  class="pk-on"
-                  @click.stop="goComparePk(item, index)"
-                ></span>
               </div>
-              <a-button
+              <a-button type="primary" @click.stop="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
-                type="primary"
-                @click.stop="toView('details', item)"
-                v-if="!whoShow1.itShowBaoTou"
-              >
                 查看详情
               </a-button>
-              <a-button
+              <a-button style="margin-left: 10px" v-show="
-                style="margin-left: 10px"
-                v-show="
                 selectCardsname === '融合服务' ||
                 selectCardsname === '赋能场景'
-                "
+              " @click.stop="handleAKeyApplication(item)">
-                @click.stop="handleAKeyApplication(item)"
-              >
                 一键申请
               </a-button>
-              <a-button
+              <a-button type="primary" @click.stop="toView('apply', item)" v-show="
-                type="primary"
-                @click.stop="toView('apply', item)"
-                v-show="
                 cardType == '组件服务' ||
                 (cardType == '应用资源' && whoShow1.itShowQingDao)
-                "
+              ">
-              >
                 {{
                 item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
@@ -391,12 +274,7 @@
         </div>
       </div>
     </div>
-    <a-modal
+    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
-      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%">
@@ -414,9 +292,10 @@
 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', 'resourceTotal', 'selectCardsname'],
   props: {
     resourceList: {
       type: Object,
@@ -428,116 +307,22 @@
     },
     selectCardsname: {
       type: String,
-        default: '组件服务',
+      default: '应用资源',
     },
   },
-    computed: {
+  components: {
-      dataList() {
+    IntegrationServiceOrder,
-        const newArr = []
+    ComponentServiceTag,
-        for (let i = 0; i < this.resourceList.data.length; i++) {
-          let arr = [
-            {
-              name: '应用名称',
-              value: '',
   },
-            {
+  setup(props, context) {
-              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 ''
-      },
-    },
-    components: {},
-    setup(props) {
-      // eslint-disable-next-line no-undef
     const whoShow1 = whoShow
     const showKey = ref(0)
     let shoppingKey = ref(1)
-      // 融合服务排序
+    let orderObj = reactive({
-      const orderList = ref([
+      orderField: '',
-        {
+      orderType: '',
-          value: 'collectCount',
+    })
-          name: '收藏量',
+    const integrationServiceOrderDom = ref(null)
-          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 },
@@ -546,6 +331,10 @@
       { 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 === '数据资源') {
@@ -562,6 +351,14 @@
         })
       }
     }
+
+    // 西海岸--智能算法--列表增加标签显示
+    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) {
@@ -616,6 +413,7 @@
           )
         }
       } else if (props.selectCardsname === '融合服务') {
+        context.emit('saveSearchCodition')
         // 打包模式
         router.push({
           path: '/packagingDetails',
@@ -682,11 +480,7 @@
             })
           }
         } else {
-            console.log(
+          context.emit('saveSearchCodition')
-              '111111111111111111===========>',
-              router,
-              props.selectCardsname
-            )
           router.push({
             path: '/details',
             query: {
@@ -748,29 +542,28 @@
         }
       }
     }
-      // 更换查询条件
-      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) => {
+     * val: 排序字段值
-        let newType = type === 'DESC' ? 'ASC' : 'DESC'
+     * isFromFather: 是否来自父组件传值
-        orderList.value[i].orderType = newType
+     */
-        mybus.emit('changeCondition', {
+    const changeCondition = (item, isFromFather = false) => {
-          orderField: val,
+      console.log('item, isFromFather------------>', item, isFromFather);
-          orderType: newType,
+      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 || []
@@ -801,7 +594,6 @@
       }
       otherArray.map((v) => {
         let resource = v.resource || {}
-          console.log('resource------------>', resource)
         let obj = {
           arr: [
             {
@@ -822,64 +614,25 @@
       localStorage.setItem('applyList', JSON.stringify(_applyList))
       router.push({
         path: '/apply',
+        query: {
+          integrationServicesId: item.id,
+        },
       })
     }
     
-      // 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 === '赋能场景')
+        (typeObj.type === '融合服务' || typeObj.type === '打包模式')
       ) {
-          orderList.value = [
+        integrationServiceOrderDom.value.reset &&
-            {
+          integrationServiceOrderDom.value.reset()
-              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', //播放器宽度
@@ -950,9 +703,10 @@
       goComparePk,
       whoShow1,
       showKey,
-        orderList,
       handleAKeyApplication,
-        changeOrder,
+      integrationServiceOrderDom,
+      orderObj,
+      getTagList,
     }
   },
   beforeUnmount() {

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">
-            <!-- 预览视频--遮罩 -->
+            <!-- 西海岸--预览视频--遮罩 todo-->
-            <div class="video-cover" @click="videoShowMsg"></div>
+            <div class="video-cover" @click="videoShowMsg" v-show="isXiHaiAn"></div>
-            <div class="waterMark waterMark-left-top">
+            <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-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div>
-            <div class="batch-waterMark batch-waterMark-left-top">
+            <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: '名称',

front/src/views/home/integrationServices.vue

@@ -5,13 +5,8 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div
+        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
-          v-for="(item, index) in titleName"
+          :class="{ sel: index == number }">
-          :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
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
+          <button class="button-reset" @click="resetAction()">重置</button>
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
-          <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div v-loading="loadingData">
-        <searchResultList
+        <searchResultList v-if="number === 0" v-show="resourceList.data && resourceList.data.length > 0"
-          v-if="number === 0"
+          :resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
-          v-show="resourceList.data && resourceList.data.length > 0"
+          ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-          :key="listKey2"
+        <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-          :resourceList="resourceList"
+          @saveSearchCodition="saveSearchCodition" :resourceTotal="resourceTotal"
-          :resourceTotal="resourceTotal"
+          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
-        <CanAssignCase
-          v-else
-          v-show="resourceList.data && resourceList.data.length > 0"
-          :key="listKey2"
-          :resourceList="resourceList"
-          :resourceTotal="resourceTotal"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
         <div class="pagination">
-          <a-pagination
+          <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-            v-if="resourceList.data && resourceList.data.length > 0"
+            v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
-            v-model:current="currentPage"
+            :total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange"
-            v-model:pageSize="currentPageSize"
+            @showSizeChange="onShowSizeChange" />
-            show-size-changer
-            show-less-items
-            show-quick-jumper
-            :total="resourceTotal"
-            :page-size-options="pageSizeOptions"
-            @change="pageChange"
-            @showSizeChange="onShowSizeChange"
-          />
         </div>
-        <div
+        <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-          v-if="resourceList.data && resourceList.data.length <= 0"
-          style="margin-top: 2rem"
-        >
           <a-empty />
         </div>
       </div>
@@ -78,8 +45,7 @@
 <script>
 import HomeFooter from '@/views/newHome/components/Footer'
 import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+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'
@@ -88,19 +54,27 @@
 import { message } from 'ant-design-vue'
 
 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(10)
+    const currentPageSize = ref(5)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
+    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 current = ref(1)
     const loadingData = ref(false)
     // 选项卡
     const titleName = ref([
@@ -111,80 +85,84 @@
         name: '赋能场景',
       },
     ])
-
     const number = ref(0)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-
     // 查询参数
     const paramsGetResources = {
-        pageNum: 1,
+      page: currentPage.value,
-        pageSize: currentPageSize.value,
+      limit: currentPageSize.value,
       type: titleName.value[number.value].name,
-        name: '',
+      name: searchValue.value,
-        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      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)
+        })
+        getIntegrationList()
+      }
+    }
 
     const changeCards = (val) => {
-        console.log(val)
+      // 打包模式
-        number.value = val
+      number.value = val;
-        chongzhi()
+      paramsGetResources.type = titleName.value[number.value].name;
+      resetAction()
     }
 
     // 查询
     const onSearch = () => {
-        loading.value = true
       currentPage.value = 1
+      getIntegrationList()
     }
     // 重置数据
-      const chongzhi = () => {
+    const resetAction = () => {
-        loading.value = true
       // 重置模糊查字段
       searchValue.value = ''
       // 分页
       currentPage.value = 1
-        currentPageSize.value = 10
+      currentPageSize.value = 5
       // 重置查询条件
-        paramsGetResources.pageNum = 1
+      paramsGetResources.page = 1
-        paramsGetResources.pageSize = 10
+      paramsGetResources.limit = 5
       paramsGetResources.orderField = 'create_date'
       paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi', {
+
+      mybus.emit('resetAction', {
         type: titleName.value[number.value].name,
       })
-        getAppResources()
-      }
-
-      const getAppResources = () => {
       getIntegrationList()
     }
 
     // 获取融合服务列表
     const getIntegrationList = () => {
       loadingData.value = true
-        console.log('获取融合服务列表------------>')
+      paramsGetResources.name = searchValue.value;
-        let postData = {
+      console.log('paramsGetResources------参数下发------>', paramsGetResources);
-          limit: currentPageSize.value,
+      getIntegrationServicesList(paramsGetResources).then(
-          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
@@ -199,75 +177,81 @@
       } else {
         delete paramsGetResources.deptIds
       }
-        getAppResources()
+      getIntegrationList()
-        console.log('paramsGetResources', paramsGetResources)
     })
+
     mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
+      paramsGetResources.page = page
-        getAppResources('分页查询')
+      getIntegrationList()
     })
+
     mybus.on('changeSelcted', () => {
-        getAppResources()
+      getIntegrationList()
     })
 
     mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
+      paramsGetResources.page = 1
       currentPage.value = 1
-        getAppResources()
+      getIntegrationList()
     })
     mybus.on('changeCondition', (condition) => {
       paramsGetResources.orderField = condition.orderField
       paramsGetResources.orderType = condition.orderType
-        getAppResources()
+      getIntegrationList()
     })
 
     const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
       currentPage.value = val
-        paramsGetResources.pageNum = val
+      paramsGetResources.page = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
     }
 
-      onMounted(() => {
-        console.log('222----onMounted-------->', 222)
-        listKey2.value++
-        getAppResources()
-      })
-
     // 分页
     const onShowSizeChange = (current, pageSize) => {
       currentPage.value = current
       currentPageSize.value = pageSize
-        paramsGetResources.pageNum = current
+      paramsGetResources.page = current
-        paramsGetResources.pageSize = pageSize
+      paramsGetResources.limit = pageSize
-        getAppResources()
+      getIntegrationList()
+    }
+
+    // 存储查询条件到本地
+    const saveSearchCodition = (n) => {
+      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
+      localStorage.setItem(
+        'integrationServices',
+        JSON.stringify(paramsGetResources)
+      )
+    }
+
+    onMounted(() => {
+      if (storageSearchInfo) {
+        handleSetSearchData()
+      } else {
+        getIntegrationList()
       }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
     })
 
     return {
-        listKey,
       searchValue,
       currentPage,
       resourceList,
       resourceTotal,
       pageChange,
-        listKey2,
       Cardsname,
-        getAppResources,
+      getIntegrationList,
-        chongzhi,
+      resetAction,
       onSearch,
       currentPageSize,
       pageSizeOptions,
-        current,
       loading,
       titleName,
       changeCards,
       number,
       loadingData,
+      onShowSizeChange,
+      saveSearchCodition,
+      searchResultListDom,
     }
   },
   components: {
@@ -289,8 +273,6 @@
   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;