diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 5699daa0..e342c33f 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-09-27 16:48:51
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-08-29 09:55:56
  * @Description: 数据资源参数配置
  */
 // eslint-disable-next-line no-undef
@@ -26,22 +26,18 @@ const footerDataList = {}
 // qingdao
 if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
   whoShow.itShowQingDao = true
-  if (newLocation == 'zhanTingDev' || newLocation == 'dev') {
-    whoShow.itShowZhanTingDev = true
-  }
-
   infrastructure.deptName = '青岛市大数据发展管理局'
   infrastructure.deptId = '1067246875800000066'
   navListManagement.navList = [
     { name: '共享门户', key: 'home' },
     { name: '能力集市', key: 'DetailsPageconetent' },
-    // { name: '能力云图', key: 'capabilityCloud' },
+    { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
-    { name: '技术文档', key: 'instructionManual' },
+    { name: '新手指南', key: 'instructionManual' },
     { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
-    // { name: '区市站点', key: 'mapTest' },
+    { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
     //  { name: '典型赋能案例', key: 'assignCase' },
     { name: '融合服务', key: 'integrationServices' },
@@ -126,15 +122,12 @@ else if (newLocation === 'baotou') {
     { name: '能力集市', key: 'DetailsPageconetent' },
     { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
-    { name: '技术文档', key: 'instructionManual' },
     // { name: '开发指南', key: 'developmentGuide' },
     { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
     // { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
     { name: '赋能案例', key: 'assignCase' },
-    { name: '融合服务', key: 'integrationServices' },
-    { name: 'CIM专区', key: 'cimSpecialArea' },
   ]
   footerDataList.footerList = {
     company: {
@@ -500,15 +493,12 @@ else if (newLocation === 'xihaian') {
     { name: '能力集市', key: 'DetailsPageconetent' },
     { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
-    // { name: '技术文档', key: 'instructionManual' },
     // { name: '开发指南', key: 'developmentGuide' },
     { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
     // { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
     { name: '赋能案例', key: 'assignCase' },
-    // { name: '融合服务', key: 'integrationServices' },
-    // { name: 'CIM专区', key: 'cimSpecialArea' },
   ]
   footerDataList.footerList = {
     company: {
diff --git a/front/public/static/doc/userbook.docx b/front/public/static/doc/userbook.docx
new file mode 100644
index 00000000..7af29aac
Binary files /dev/null and b/front/public/static/doc/userbook.docx differ
diff --git a/front/src/assets/developmentGuide/download.png b/front/src/assets/developmentGuide/download.png
new file mode 100644
index 00000000..110983ee
Binary files /dev/null and b/front/src/assets/developmentGuide/download.png differ
diff --git a/front/src/router/index.js b/front/src/router/index.js
index 4a2076bc..8f3e1d09 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -85,7 +85,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: whoShow.itShowXiHaiAn ? '/DetailsPageconetent' : '/home',
+    redirect: '/home',
     meta: {
       title: '能力管理平台编目',
       icon: 'apps-line',
@@ -495,7 +495,7 @@ export const constantRoutes = [
     name: 'instructionManual',
     component: () => import('@/views/instructionManual/index'),
     meta: {
-      title: '技术文档',
+      title: '新手指南',
       icon: 'error-warning-line',
     },
   },
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index c3719752..b50fc5c5 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -131,44 +131,56 @@
   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'],
   })
+  // user.username.value = store.getters(['user/username'])
   const select = ref(router.currentRoute.value.name)
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
   console.log('navListManagement------------>', navListManagement)
 
+  // eslint-disable-next-line no-undef
   const navList = ref(navListManagement.navList)
   console.log('navList------------>', navList)
 
   const props = defineProps({
     showView: { type: String, default: '' },
   })
-  
+  // // 获取用户信息
+  // getUser().then((res) => {
+  //   user.value = res.data.data
+  //   // console.log('user===============>', user.value)
+  // })
   // 退出登录
   const logout = async () => {
     await store.dispatch('user/logout')
-    // 移除本地存储查询条件
-    localStorage.removeItem('integrationServices')
-    localStorage.removeItem('DetailsPageconetent')
     window.sessionStorage.setItem('visits', JSON.stringify([]))
     // 西海岸不返回登录页
-    // if (!whoShow1.itShowXiHaiAn) {
-    //   if (recordRoute) {
-    //     const fullPath = route.fullPath
-    //     router.push(`/login?redirect=${fullPath}`)
-    //   } else {
-    //     router.push('/login')
-    //   }
-    // }
+    if (!whoShow1.itShowXiHaiAn) {
+      if (recordRoute) {
+        const fullPath = route.fullPath
+        router.push(`/login?redirect=${fullPath}`)
+      } else {
+        router.push('/login')
+      }
+    }
   }
   // 返回首页
   const goToHome = () => {
@@ -196,8 +208,7 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            // select: '组件服务',
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+            select: '组件服务',
           },
         })
         break
@@ -206,7 +217,12 @@
           path: '/capabilityCloud',
         })
         break
-      case '技术文档':
+      // case '技术文档':
+      //   router.push({
+      //     path: '/developmentGuide',
+      //   })
+      //   break
+      case '新手指南':
         router.push({
           path: '/instructionManual',
         })
@@ -239,6 +255,10 @@
       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 c18da6ae..881030d5 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -1,127 +1,238 @@
 <template>
   <div id="search-result-list-container">
     <div class="shai-xuan">
+      <!-- <div class="circle">!</div> -->
       <div class="result">
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-        cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
-        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
-          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-        "></IntegrationServiceOrder>
-        <ul v-else>
-          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
-            item.show &&
-            item.name !== '评分' &&
-            selectCardsname !== '数据资源'
-          ">
+        <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="
-              orderObj.orderType == 'ASC' &&
-              orderObj.orderField == item.value
-                ? 'down'
-                : ''
-            "></span>
+            <span
+              class="arrow"
+              :class="item.orderType == 'ASC' ? 'down' : ''"
+            ></span>
+          </li>
+        </ul>
+        <ul v-else>
+          <li
+            v-for="item in selList"
+            :key="item.value"
+            @click="changeCondition(item.value)"
+            v-show="
+              item.show &&
+              item.name !== '评分' &&
+              selectCardsname !== '数据资源'
+            "
+          >
+            {{ item.name }}
+            <span
+              class="arrow"
+              :class="item.value == selData ? '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 &&
-          item.infoList.filter((val) => val.attrType == '应用图片')[0]
-        ">
-          <a-image :width="106" :preview="false" :src="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-if="
+            item.type === '应用资源' &&
+            item.infoList &&
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-              .attrValue
-          " />
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '应用图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <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="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-else-if="
+            (selectCardsname === '融合服务' ||
+              selectCardsname === '赋能场景') &&
+            item.fuseAttrList &&
             item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-              .attrValue
-          " />
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+                .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 }}
-              <!-- 西海岸-智能算法-算法类型-标签显示 -->
-              <ComponentServiceTag v-if="selectCardsname === '组件服务' && whoShow1.itShowXiHaiAn" :componentServiceTagList="getTagList(item)"></ComponentServiceTag>
               <!-- 已申请--通过 -->
-              <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
+                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"
+              >
+                <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>
+                <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>
+              </svg>
+              <span
+                v-if="
+                  item.applyState == '已申请' && item.approveStatus == '审核中'
+                "
+                style="
+                  font-size: 12px;
+                  -webkit-transform: scale(0.75);
+                  color: #d81e06;
+                  position: relative;
+                  left: -35px;
+                  top: -0.6px;
+                  font-weight: 500;
+                "
+              >
+                审核中
+              </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>
@@ -139,15 +250,21 @@
             </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 || '--' }}
@@ -157,7 +274,7 @@
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
                 <div
-                  v-if="!whoShow1.itShowXiHaiAn &&
+                  v-if="
                     selectCardsname !== '数据资源' &&
                     selectCardsname !== '融合服务' &&
                     selectCardsname !== '赋能场景'
@@ -165,18 +282,23 @@
                 >
                   浏览量：{{ item.visits || 0 }}次
                 </div>
-                <div v-if="
-                  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 !== '数据资源'">
@@ -186,41 +308,77 @@
             </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>
@@ -233,7 +391,12 @@
         </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%">
@@ -244,805 +407,940 @@
   </div>
 </template>
 <script>
-import { ref, reactive, nextTick, defineEmits, defineExpose, getCurrentInstance } 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: () => { },
+  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: '组件服务',
+      },
     },
-    resourceTotal: {
-      type: String,
-      default: '0',
-    },
-    selectCardsname: {
-      type: String,
-      default: '应用资源',
-    },
-  },
-  components: {
-    IntegrationServiceOrder,
-    ComponentServiceTag,
-  },
-  setup(props, context) {
-    const whoShow1 = whoShow
-    console.log('whoShow1------------>', whoShow1);
-    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, orderType: 'DESC' },
-      { name: '浏览量', value: 'visits', show: true, orderType: 'DESC' },
-      { name: '申请量', value: 'applyCount', show: true, orderType: 'DESC' },
-      { name: '收藏量', value: 'collectCount', show: true, orderType: 'DESC' },
-      { name: '评分', value: 'score', show: true, orderType: 'DESC' },
-    ])
-    // 西海岸-去掉浏览量
-    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 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)
-        }
-      }
-    })
-    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) {
-      // debugger
-      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 === '融合服务') {
-        context.emit('saveSearchCodition')
-        // 打包模式
-        router.push({
-          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
+    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
             }
-            // 内部跳转申请页面
-            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',
-            })
+            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)
+      // 融合服务排序
+      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 === '申请量')
+        )
+      }
+      const findComponentName = (list, name) => {
+        if (list.infoList) {
+          return list.infoList.find((item) => {
+            if (item.attrType === '组件类型') {
+              return item.attrValue === name
+            }
+          })
+        }
+      }
+      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)
           }
-        } else {
-          context.emit('saveSearchCodition')
+        }
+      })
+      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: '/details',
+            path: '/packagingDetails',
             query: {
               id: item.id,
             },
           })
-        }
-      }
-    }
-    // 加入申购车
-    const addShoppingCart = (item, index) => {
-      console.log('item===============>', item)
-      if (flag.value && item.id) {
-        flag.value = false
-        sgcInsert({
-          delFlag: '0',
-          resourceId: item.id,
-        }).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 if (props.selectCardsname === '赋能场景') {
+          router.push({
+            path: '/integrationServicesDetails',
+            query: {
+              id: item.id,
+            },
           })
         } 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)
+          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,
+              },
+            })
+          }
+        }
+      }
+      // 加入申购车
+      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,用于过滤图标
       }
-    }
-
-    /**更换查询条件
-     * val: 排序字段值
-     * isFromFather: 是否来自父组件传值
-     */
-    const changeCondition = (item, isFromFather = false) => {
-      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,
+      // 添加收藏
+      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)
+              }
+            })
+          }
         }
-        _applyList.push(obj)
-      })
-      _applyList = jcss.concat(_applyList)
-      localStorage.setItem('applyList', JSON.stringify(_applyList))
-      // 融合服务
-      router.push({
-        path: '/apply',
-          query: {
-            integrationServicesId: item.id,
+      }
+      // 更换查询条件
+      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: '',
           },
-      })
-
-       
-    }
-
-    mybus.on('chongzhi', (typeObj) => {
-      if (!typeObj) {
-        selData.value = 'total'
+        ]
+        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))
+        router.push({
+          path: '/apply',
+        })
       }
-      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')
-  },
-}
+      // 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',
+          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,
+      }
+    },
+    beforeUnmount() {
+      mybus.off('chongzhi')
+      // mybus.emit('changeSelcted')
+    },
+  }
 </script>
 <style scoped lang="less">
-.activeBg {
-  background-color: #0087ff;
-}
+  #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;
-  }
-
-  .shai-xuan {
-    width: 1047px;
-    height: 36px;
-    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;
+    .detail-content {
+      // 超出
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 130px;
+      display: inline-block;
     }
 
-    .result {
-      font-size: 14px;
-      font-weight: 500;
-      color: #212121;
+    .shai-xuan {
+      width: 1047px;
+      height: 36px;
+      // margin: 11px 0 20px;
+      // background: #e5f2ff;
+      // padding-left: 20px;
+      display: flex;
+      align-items: center;
+      position: relative;
 
-      span {
-        font-size: 18px;
-        color: #0087ff;
-      }
-    }
-
-    .condition {
-      position: absolute;
-      right: 20px;
-      top: 10px;
-
-      ul li {
-        list-style-type: none;
+      .circle {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #0087ff;
+        text-align: center;
+        color: #fff;
+        line-height: 16px;
+        margin-right: 21px;
       }
 
-      ul {
-        display: flex;
+      .result {
+        font-size: 14px;
+        font-weight: 500;
+        color: #212121;
 
-        li {
-          width: 90px;
-          height: 12px;
-          text-align: center;
-          cursor: pointer;
+        span {
+          font-size: 18px;
+          color: #0087ff;
+        }
+      }
+
+      .condition {
+        position: absolute;
+        right: 20px;
+        top: 10px;
+
+        ul li {
+          list-style-type: none;
+        }
+
+        ul {
           display: flex;
-          justify-content: center;
-          align-items: center;
 
-          .arrow {
-            display: inline-block;
-            width: 12px;
+          li {
+            width: 90px;
             height: 12px;
-            background: url('~@/assets/newHome/arrow.png');
-            margin-left: 10px;
-          }
+            text-align: center;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
 
-          .down {
-            background: url('~@/assets/newHome/down.png');
-            margin-top: 6px;
+            .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;
+    .result-list {
+      width: 1048px;
       display: flex;
-      align-items: center;
+      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;
 
-      .left {
-        display: inline-block;
-        width: 120px;
-        height: 110px;
-        margin-right: 16px;
-      }
-
-      .right {
+      .item {
         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 {
+        margin-top: 10px;
         display: flex;
-        justify-content: space-between;
         align-items: center;
-        margin: 0 10px 0 0;
 
-        .header-right {
+        .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 {
           display: flex;
-          font-size: 14px;
-          color: #212121;
+          justify-content: space-between;
+          align-items: center;
+          margin: 0 10px 0 0;
 
-          span {
+          .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;
+            }
+          }
+
+          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: 24px;
+            margin-right: 10px;
+            background: rgba(0, 88, 225, 0.1);
+            padding-left: 10px;
+            padding-right: 10px;
           }
 
-          .label-content {
+          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;
 
-            .label {
-              padding: 0.01rem 0.1rem;
-              margin-right: 0.1rem;
-              border-radius: 0.13rem;
-              background: #0087ff;
-              color: #fff;
+            .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');
+              }
             }
-          }
-        }
 
-        .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;
-
-        .right {
-          flex: 1;
-          display: flex;
-          justify-content: flex-end;
-          margin: 0 10px;
-          align-items: center;
-
-          .shopping {
-            span {
+            .pk-on {
               display: inline-block;
               height: 32px;
               width: 32px;
+              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-            }
-
-            .shopping-on {
-              background: url('~@/assets/newHome/shopping-on.png');
+              background: url('~@/assets/newHome/pk-on.png');
               cursor: pointer;
             }
 
-            .shopping-down {
-              background: url('~@/assets/newHome/shopping-down.png');
-            }
-          }
-
-          .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;
-          }
-
-          .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;
-          }
-        }
-      }
-
-      .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) {
+            .sc {
+              // margin-top: 4px;
+              cursor: pointer;
               display: flex;
               align-items: center;
 
-              :deep(.ant-rate-star:not(:last-child)) {
-                margin-right: 4px;
+              .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;
+            }
+          }
+        }
+
+        .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(.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/integrationServices.vue b/front/src/views/home/integrationServices.vue
index d62b5a88..ae1b7a32 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -5,8 +5,13 @@
     <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>
@@ -15,26 +20,54 @@
       <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="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
-          <button class="button-reset" @click="resetAction()">重置</button>
+          <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 v-loading="loadingData">
-        <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 ? '融合服务' : '赋能场景'" />
+        <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 ? '融合服务' : '赋能场景'"
+        />
         <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>
@@ -43,357 +76,342 @@
   <home-footer></home-footer>
 </template>
 <script>
-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 HomeFooter from '@/views/newHome/components/Footer'
+  import mybus from '@/myplugins/mybus'
+  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from '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(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)
-        })
-        getIntegrationList()
-      }
-    }
+  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'
 
-    const changeCards = (val) => {
-      // 打包模式
-      number.value = val;
-      paramsGetResources.type = titleName.value[number.value].name;
-      resetAction()
-    }
-
-    // 查询
-    const onSearch = () => {
-      currentPage.value = 1
-      getIntegrationList()
-    }
-    // 重置数据
-    const resetAction = () => {
-      // 重置模糊查字段
-      searchValue.value = ''
+  export default defineComponent({
+    setup() {
       // 分页
-      currentPage.value = 1
-      currentPageSize.value = 5
-      // 重置查询条件
-      paramsGetResources.page = 1
-      paramsGetResources.limit = 5
-      paramsGetResources.orderField = 'create_date'
-      paramsGetResources.orderType = 'DESC'
-
-      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
+      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: '打包模式',
         },
-        (err) => {
-          loadingData.value = false
-          message.error(err)
-        }
-      )
-    }
+        {
+          name: '赋能场景',
+        },
+      ])
 
-    mybus.on('paramsGetResources', (ids) => {
-      if (ids && ids.length > 0) {
-        paramsGetResources.deptIds = ids
-      } else {
-        delete paramsGetResources.deptIds
+      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 降序
       }
-      getIntegrationList()
-    })
 
-    mybus.on('changePage', (page) => {
-      paramsGetResources.page = page
-      getIntegrationList()
-    })
+      const changeCards = (val) => {
+        console.log(val)
+        number.value = val
+        chongzhi()
+      }
 
-    mybus.on('changeSelcted', () => {
-      getIntegrationList()
-    })
+      // 查询
+      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,
+        })
+        getAppResources()
+      }
 
-    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 {
+      const getAppResources = () => {
         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')
-  },
-})
+      // 获取融合服务列表
+      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 onShowSizeChange = (current, pageSize) => {
+        currentPage.value = current
+        currentPageSize.value = pageSize
+        paramsGetResources.pageNum = current
+        paramsGetResources.pageSize = pageSize
+        getAppResources()
+      }
+      watch(currentPageSize, () => {
+        console.log('pageSize', currentPageSize.value)
+      })
+
+      return {
+        listKey,
+        searchValue,
+        currentPage,
+        resourceList,
+        resourceTotal,
+        pageChange,
+        listKey2,
+        Cardsname,
+        getAppResources,
+        chongzhi,
+        onSearch,
+        currentPageSize,
+        pageSizeOptions,
+        current,
+        loading,
+        titleName,
+        changeCards,
+        number,
+        loadingData,
+      }
+    },
+    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;
 
-  .resultListSearchInput-son {
-    background: #fff;
-    padding: 0.2rem 0.2rem 0rem 0.3rem;
+    // padding-left: 0.2rem;
+    // padding-top: 0.2rem;
+    .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) {
+      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-search-button) {
+  .button-reset {
+    border: 0;
+    outline: none;
     width: 0.8rem;
     height: 0.36rem;
-    background: #0087ff;
-    border-radius: 0.04rem !important;
+    background: #e1edfa;
+    border-radius: 0.04rem;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #fff;
+    color: #0087ff;
     line-height: 0.34rem;
-    margin-left: 0.1rem;
+    margin-left: 2.5rem;
+    cursor: pointer;
   }
 
-  :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;
-    width: 11.5rem;
+  .details-pageconetent {
+    height: 100%;
+    width: 100%;
     display: flex;
-    padding-top: 0.2rem;
-    flex-direction: column;
-    font-size: 0.16rem;
-    justify-content: left;
-    background: #f3f5f9;
+    justify-content: center;
+    align-items: center;
+    margin-top: 0.67rem;
+    position: relative;
+    background: rgba(245, 243, 243, 0.3);
 
-    .pagination {
-      background: #f3f5f9;
-      padding-bottom: 0.6rem;
+    .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-title {
-      padding: 0.2rem;
+    .top {
+      min-height: 7.2rem;
+      position: relative;
+      width: 11.5rem;
       display: flex;
-      font-size: 18px;
+      padding-top: 0.2rem;
+      flex-direction: column;
+      font-size: 0.16rem;
+      justify-content: left;
+      background: #f3f5f9;
 
-      .tabAll {
+      .pagination {
+        background: #f3f5f9;
+        padding-bottom: 0.6rem;
+      }
+
+      .top-title {
+        padding: 0.2rem;
+        display: flex;
         font-size: 18px;
-        color: #000000;
-        margin-right: 35px;
-        cursor: pointer;
-      }
 
-      .tabAll:nth-child(1) {
-        margin-left: 20px;
-      }
+        .tabAll {
+          font-size: 18px;
+          color: #000000;
+          margin-right: 35px;
+          cursor: pointer;
+        }
 
-      .sel {
-        font-weight: 600;
-        color: #0087ff;
-        border-bottom: 0.02rem solid #0087ff;
+        .tabAll:nth-child(1) {
+          margin-left: 20px;
+        }
+
+        .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>
diff --git a/front/src/views/instructionManual/index.vue b/front/src/views/instructionManual/index.vue
index af55827a..55c9bb3d 100644
--- a/front/src/views/instructionManual/index.vue
+++ b/front/src/views/instructionManual/index.vue
@@ -2,42 +2,26 @@
   <home-header></home-header>
   <div class="menu-container">
     <div id="container" class="content-menu">
-      <div class="left">
-        <div
-          class="first-title-text doc"
-          :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
-          @click="changeName({ name: '技术文档' })"
-        >
+      <!-- <div class="left">
+        <div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
+          @click="changeName({ name: '技术文档' })">
           技术文档
         </div>
-        <abilityDocTree
-          style="max-height: 320px; overflow-y: auto"
-          :dataList="treeArray"
-          @treeClick="treeClick"
-          :clickData="clickData"
-        ></abilityDocTree>
-      </div>
+        <abilityDocTree style="max-height:320px;overflow-y:auto" :dataList="treeArray" @treeClick="treeClick"
+          :clickData="clickData"></abilityDocTree>
+      </div> -->
 
-      <div
-        class="first-title-text new-guide-box"
-        :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }"
-        @click="changeName({ name: '使用手册' })"
-      >
+      <div class="first-title-text new-guide-box" :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }"
+        @click="changeName({ name: '使用手册' })">
         <div class="guide-text">使用手册</div>
-        <el-icon :size="20" color="#0058e1" @click="downloadEvt()"><Download /></el-icon>
+        <img src="@/assets/developmentGuide/download.png"   @click="downloadDoc('/static/doc/userbook.docx', '通用能力服务平台USC用户手册')" alt="" />
       </div>
 
       <!-- 技术文档 -->
       <div class="right" v-if="titleData.name !== '使用手册'">
         <div style="height: 100%">
-          <iframe
-            name="iframeName"
-            width="1300"
-            height="100%"
-            id="iframeId"
-            :frameborder="0"
-            :src="doc_base_url + clickData.doc"
-          ></iframe>
+          <iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
+            :src="doc_base_url + clickData.doc"></iframe>
         </div>
       </div>
     </div>
@@ -112,7 +96,7 @@ const changeName = (item) => {
           title: val.title,
           show:
             (i === 0 && val.children && val.children.length > 0) ||
-            typeList.includes(val.title)
+              typeList.includes(val.title)
               ? true
               : false,
           children: [],
@@ -131,7 +115,7 @@ const formData = (children = [], dataItem) => {
       title: item.title,
       show:
         (index === 0 && item.children && item.children.length > 0) ||
-        typeList.includes(item.title)
+          typeList.includes(item.title)
           ? true
           : false,
       children: [],
@@ -150,14 +134,15 @@ const getFirstData = (firstObj = {}) => {
     clickData.value = firstObj
   }
 }
-
+const downloadDoc = (path, name) => {
+  const a = document.createElement('a')
+      a.href = path
+      a.download =name
+      a.click()
+  }
 onMounted(() => {
   getTreeData()
 })
-
-const downloadEvt = (url = '') => {
-  window.open('/static/download/通用能力服务平台UCS用户手册-v3.5.docx', '_self')
-}
 </script>
 
 <style scoped lang="less">
@@ -213,7 +198,7 @@ const downloadEvt = (url = '') => {
   top: 300px;
   right: 205px;
   width: 74px;
-  height: 170px;
+  height: 150px;
   background: url('~@/assets/menu/new-bg.png') no-repeat;
   background-size: 100% 100%;
   display: flex;
@@ -229,8 +214,6 @@ const downloadEvt = (url = '') => {
   word-wrap: break-word;
   font-size: 20px;
   color: #0058e1;
-  height: 136px;
-  margin-bottom: 4px;
 }
 
 .right {
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index 573635f0..59f6b843 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -79,11 +79,7 @@
           <a-list-item>
             <a-list-item-meta description="">
               <template #title>
-                <div
-                  class="left"
-                  @click="read(item)"
-                  :class="item.readStatus === 1 ? '' : 'pointer'"
-                >
+                <div class="left" @click="read(item)">
                   {{ item.content }}
                 </div>
                 <div class="right">{{ '发布时间：' + item.senderDate }}</div>
@@ -115,340 +111,342 @@
   </div>
 </template>
 <script setup>
-// import { SearchOutlined } from '@ant-design/icons-vue'
-import { ref, reactive, onBeforeUnmount } from 'vue'
-import mybus from '@/myplugins/mybus'
-import { message } from 'ant-design-vue'
-import { mynotice, mynoticeRead } from '@/api/home'
-import { useRouter } from 'vue-router'
-const router = useRouter()
-const total = ref(0)
-const pageSize = ref(8)
-const pageNum = ref(1)
-const value = ref('全部消息')
-const obj = reactive({ page: pageNum.value, limit: pageSize.value })
-const navList = reactive([
-  {
-    title: '全部',
-    key: 'all',
-    num: 0,
-  },
-  {
-    title: '通知',
-    key: 'notice',
-    num: 0,
-  },
-  {
-    title: '评论',
-    key: 'comment',
-    num: 0,
-  },
-  {
-    title: '其它',
-    key: 'other',
-    num: 0,
-  },
-])
-const selectNav = ref('all')
-const selectData = ref([])
-const data = ref([])
-const changeNav = (nav) => {
-  selectNav.value = nav.key
-  if (nav.key === 'all') {
-    delete obj.from
-  } else {
-    obj.from = nav.title
+  // import { SearchOutlined } from '@ant-design/icons-vue'
+  import { ref, reactive, onBeforeUnmount } from 'vue'
+  import mybus from '@/myplugins/mybus'
+  import { message } from 'ant-design-vue'
+  import { mynotice, mynoticeRead } from '@/api/home'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const total = ref(0)
+  const pageSize = ref(8)
+  const pageNum = ref(1)
+  const value = ref('全部消息')
+  const obj = reactive({ page: pageNum.value, limit: pageSize.value })
+  const navList = reactive([
+    {
+      title: '全部',
+      key: 'all',
+      num: 0,
+    },
+    {
+      title: '通知',
+      key: 'notice',
+      num: 0,
+    },
+    {
+      title: '评论',
+      key: 'comment',
+      num: 0,
+    },
+    {
+      title: '其它',
+      key: 'other',
+      num: 0,
+    },
+  ])
+  const selectNav = ref('all')
+  const selectData = ref([])
+  const data = ref([])
+  const changeNav = (nav) => {
+    selectNav.value = nav.key
+    if (nav.key === 'all') {
+      delete obj.from
+    } else {
+      obj.from = nav.title
+    }
+    value.value = '全部消息'
+    delete obj.readStatus
+    init()
   }
-  value.value = '全部消息'
-  delete obj.readStatus
-  init()
-}
-const changeCheckBox = (item) => {
-  item.checked = !item.checked
-  if (item.checked) {
-    selectData.value.push(item.id)
-  } else {
-    selectData.value = selectData.value.filter((val) => val !== item.id)
+  const changeCheckBox = (item) => {
+    item.checked = !item.checked
+    if (item.checked) {
+      selectData.value.push(item.id)
+    } else {
+      selectData.value = selectData.value.filter((val) => val !== item.id)
+    }
   }
-}
-const changeCheckAll = () => {
-  if (selectData.value.length == data.value.length) {
-    selectData.value = []
-    data.value.forEach((val) => {
-      val.checked = false
-    })
-  } else {
-    selectData.value = []
-    data.value.forEach((val) => {
-      val.checked = true
-      selectData.value.push(val.id)
+  const changeCheckAll = () => {
+    if (selectData.value.length == data.value.length) {
+      selectData.value = []
+      data.value.forEach((val) => {
+        val.checked = false
+      })
+    } else {
+      selectData.value = []
+      data.value.forEach((val) => {
+        val.checked = true
+        selectData.value.push(val.id)
+      })
+    }
+  }
+  const changePageNum = (page) => {
+    pageNum.value = page
+    obj.page = pageNum.value
+    init()
+  }
+  const handleChange = () => {
+    pageNum.value = 1
+    obj.page = pageNum.value
+    switch (value.value) {
+      case '全部消息':
+        delete obj.readStatus
+        break
+      case '已读消息':
+        obj.readStatus = 1
+        break
+      case '未读消息':
+        obj.readStatus = 0
+        break
+      default:
+        delete obj.readStatus
+        break
+    }
+    init()
+  }
+  const goBack = (url) => {
+    router.push({
+      path: url,
     })
   }
-}
-const changePageNum = (page) => {
-  pageNum.value = page
-  obj.page = pageNum.value
-  init()
-}
-const handleChange = () => {
-  pageNum.value = 1
-  obj.page = pageNum.value
-  switch (value.value) {
-    case '全部消息':
-      delete obj.readStatus
-      break
-    case '已读消息':
-      obj.readStatus = 1
-      break
-    case '未读消息':
-      obj.readStatus = 0
-      break
-    default:
-      delete obj.readStatus
-      break
-  }
-  init()
-}
-const goBack = (url) => {
-  router.push({
-    path: url,
-  })
-}
-const read = (item) => {
-  // console.log(item)
-  if (selectData.value.length === 0 && !item) {
-    message.error('未选择消息！')
-    return
-  }
-  console.log(selectData.value)
-
-  if (item) {
-    // 已读状态
-    if (item.readStatus === 1) {
+  const read = (item) => {
+    // console.log(item)
+    if (selectData.value.length === 0 && !item) {
+      message.error('未选择消息！')
       return
     }
-    mynoticeRead(item.id).then((res) => {
-      if (res.data.code == 0) {
-        message.success('操作成功！')
-        mybus.emit('getMynotice')
-        init()
-      } else {
-        message.error('操作失败！')
-      }
-    })
-  } else {
-    console.log('提交')
-    selectData.value.map((val) => {
-      mynoticeRead(val).then((res) => {
-        if (res.data.code == 0) {
-          // message.success('操作成功！')
+    console.log(selectData.value)
+    // let str = ''
+    // selectData.value.forEach((val, index) => {
+    //   str += val
+    //   if (index < selectData.value.length - 1) {
+    //     str += ';'
+    //   }
+    // })
+    if (item) {
+      mynoticeRead(item.id).then((res) => {
+        if (res.data.code == 0 ) {
+          message.success('通知已读！')
+        //    if(item.readStatus == 1){
+        //   message.success('通知已读！')
+        // }  if(item.readStatus == 0){
+        //   message.success('通知已设为已读！')
+        // }
           mybus.emit('getMynotice')
           init()
         } else {
           message.error('操作失败！')
         }
       })
+    } else {
+      console.log('提交')
+      selectData.value.map((val) => {
+        mynoticeRead(val).then((res) => {
+          if (res.data.code == 0) {
+            // message.success('操作成功！')
+            mybus.emit('getMynotice')
+            init()
+          } else {
+            message.error('操作失败！')
+          }
+        })
+      })
+    }
+  }
+  const init = () => {
+    // from 通知 评论 readStatus 0 未读  1 已读
+    mynotice(obj).then((res) => {
+      console.log('消息=============>', res.data.data)
+      res.data.data.list.forEach((val) => {
+        if (val.from === '通知') {
+          val.src = require('@/assets/mynoticeView/notice.png')
+        } else if (val.from === '评论') {
+          val.src = require('@/assets/mynoticeView/comment.png')
+        } else if (val.from === '其它') {
+          val.src = require('@/assets/mynoticeView/other.png')
+        }
+        val.checked = false
+      })
+      data.value = res.data.data.list
+      total.value = res.data.data.total
+      selectData.value = []
     })
   }
-}
-const init = () => {
-  // from 通知 评论 readStatus 0 未读  1 已读
-  mynotice(obj).then((res) => {
-    console.log('消息=============>', res.data.data)
-    res.data.data.list.forEach((val) => {
-      if (val.from === '通知') {
-        val.src = require('@/assets/mynoticeView/notice.png')
-      } else if (val.from === '评论') {
-        val.src = require('@/assets/mynoticeView/comment.png')
-      } else if (val.from === '其它') {
-        val.src = require('@/assets/mynoticeView/other.png')
-      }
-      val.checked = false
-    })
-    data.value = res.data.data.list
-    total.value = res.data.data.total
-    selectData.value = []
+  navList.forEach((val) => {
+    if (val.title === '全部') {
+      mynotice({ page: pageNum.value, limit: pageSize.value }).then((res) => {
+        val.num = res.data.data.total
+      })
+    } else {
+      mynotice({
+        page: pageNum.value,
+        limit: pageSize.value,
+        from: val.title,
+      }).then((res) => {
+        val.num = res.data.data.total
+      })
+    }
   })
-}
-navList.forEach((val) => {
-  if (val.title === '全部') {
-    mynotice({ page: pageNum.value, limit: pageSize.value }).then((res) => {
-      val.num = res.data.data.total
-    })
-  } else {
-    mynotice({
-      page: pageNum.value,
-      limit: pageSize.value,
-      from: val.title,
-    }).then((res) => {
-      val.num = res.data.data.total
-    })
-  }
-})
-init()
-mybus.on('noticeListInit', () => {
   init()
-})
-onBeforeUnmount(() => {
-  mybus.off('noticeListInit')
-})
+  mybus.on('noticeListInit', () => {
+    init()
+  })
+  onBeforeUnmount(() => {
+    mybus.off('noticeListInit')
+  })
 </script>
 <style lang="less" scoped>
-.notice-list {
-  padding: 0.64rem 0 0;
-  background: #f4f5f8;
-  .ant-breadcrumb {
-    padding: 0.1rem 3.1rem;
-  }
-  .top {
-    background: #fff;
-    padding: 0.18rem 3.1rem 0;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .left {
-      display: flex;
-      .item {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        margin-left: 1.28rem;
-        margin-bottom: 0.16rem;
-        border-bottom: 3px solid #fff;
-        i {
-          display: inline-block;
-          width: 0.48rem;
-          height: 0.48rem;
-          margin-bottom: 0.15rem;
-          cursor: pointer;
-        }
-        .all {
-          background: url('~@/assets/mynoticeView/all.png') no-repeat;
-          background-size: 100%;
-        }
-        .notice {
-          background: url('~@/assets/mynoticeView/notice.png') no-repeat;
-          background-size: 100%;
-        }
-        .comment {
-          background: url('~@/assets/mynoticeView/comment.png') no-repeat;
-          background-size: 100%;
-        }
-        .other {
-          background: url('~@/assets/mynoticeView/other.png') no-repeat;
-          background-size: 100%;
-        }
-      }
-      .item:nth-of-type(1) {
-        margin-left: 0;
-      }
-      .select {
-        border-bottom: 3px solid #0058e1;
-        color: #0058e1;
-      }
+  .notice-list {
+    padding: 0.64rem 0 0;
+    background: #f4f5f8;
+    .ant-breadcrumb {
+      padding: 0.1rem 3.1rem;
     }
-    .right {
+    .top {
+      background: #fff;
+      padding: 0.18rem 3.1rem 0;
       display: flex;
+      justify-content: space-between;
       align-items: center;
-      height: 0.32rem;
-      div {
-        width: 0.5rem;
-      }
-      .reset {
-        color: #0058e1;
-        cursor: pointer;
-      }
-    }
-  }
-  .btn {
-    background: #fff;
-    margin-top: 0.16rem;
-    padding: 0.14rem 3.1rem 0;
-    display: flex;
-    justify-content: space-between;
-
-    .left {
-      display: flex;
-      align-items: center;
-      .ant-select {
-        margin-right: 0.24rem;
-      }
-      .check {
+      .left {
         display: flex;
-        align-items: center;
-        div {
-          margin-left: 0.24rem;
-          span {
-            font-size: 18px;
-            color: #0058e1;
+        .item {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          margin-left: 1.28rem;
+          margin-bottom: 0.16rem;
+          border-bottom: 3px solid #fff;
+          i {
+            display: inline-block;
+            width: 0.48rem;
+            height: 0.48rem;
+            margin-bottom: 0.15rem;
+            cursor: pointer;
+          }
+          .all {
+            background: url('~@/assets/mynoticeView/all.png') no-repeat;
+            background-size: 100%;
+          }
+          .notice {
+            background: url('~@/assets/mynoticeView/notice.png') no-repeat;
+            background-size: 100%;
+          }
+          .comment {
+            background: url('~@/assets/mynoticeView/comment.png') no-repeat;
+            background-size: 100%;
+          }
+          .other {
+            background: url('~@/assets/mynoticeView/other.png') no-repeat;
+            background-size: 100%;
           }
         }
-        div:nth-of-type(1) {
-          margin-left: 0.12rem;
+        .item:nth-of-type(1) {
+          margin-left: 0;
         }
-      }
-    }
-    .right {
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      div {
-        margin: 0 0.1rem;
-      }
-      span {
-        cursor: pointer;
-        color: #0058e1;
-        text-align: center;
-        align-self: center;
-        padding: 0.05rem 0.1rem;
-      }
-
-      span:hover {
-        background: rgba(0, 88, 225, 0.1);
-      }
-    }
-  }
-  .main {
-    background: #fff;
-    padding: 0 3.1rem;
-    height: 4.75rem;
-    overflow-y: scroll;
-    :deep(.ant-list-item-meta) {
-      display: flex;
-      align-items: center;
-      .ant-checkbox-wrapper {
-        margin-right: 0.3rem;
-      }
-      .ant-list-item-meta-title {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        .left {
-          width: 9.2rem;
-          max-height: 0.43rem;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 2;
-          -webkit-box-orient: vertical;
-          word-break: break-all;
-        }
-        .pointer {
-          cursor: pointer;
-        }
-        .left:hover {
+        .select {
+          border-bottom: 3px solid #0058e1;
           color: #0058e1;
         }
       }
+      .right {
+        display: flex;
+        align-items: center;
+        height: 0.32rem;
+        div {
+          width: 0.5rem;
+        }
+        .reset {
+          color: #0058e1;
+          cursor: pointer;
+        }
+      }
+    }
+    .btn {
+      background: #fff;
+      margin-top: 0.16rem;
+      padding: 0.14rem 3.1rem 0;
+      display: flex;
+      justify-content: space-between;
+      .left {
+        display: flex;
+        align-items: center;
+        .ant-select {
+          margin-right: 0.24rem;
+        }
+        .check {
+          display: flex;
+          align-items: center;
+          div {
+            margin-left: 0.24rem;
+            span {
+              font-size: 18px;
+              color: #0058e1;
+            }
+          }
+          div:nth-of-type(1) {
+            margin-left: 0.12rem;
+          }
+        }
+      }
+      .right {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        div {
+          margin: 0 0.1rem;
+        }
+        span {
+          cursor: pointer;
+          color: #0058e1;
+          text-align: center;
+          align-self: center;
+          padding: 0.05rem 0.1rem;
+        }
+
+        span:hover {
+          background: rgba(0, 88, 225, 0.1);
+        }
+      }
+    }
+    .main {
+      background: #fff;
+      padding: 0 3.1rem;
+      height: 4.75rem;
+      overflow-y: scroll;
+      :deep(.ant-list-item-meta) {
+        display: flex;
+        align-items: center;
+        .ant-checkbox-wrapper {
+          margin-right: 0.3rem;
+        }
+        .ant-list-item-meta-title {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .left {
+            cursor: pointer;
+            width: 9.2rem;
+            max-height: 0.43rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+          .left:hover {
+            color: #0058e1;
+          }
+        }
+      }
+    }
+    .ant-pagination {
+      background: #fff;
+      margin-top: 0;
+      padding: 0.2rem 0 0.2rem;
     }
   }
-  .ant-pagination {
-    background: #fff;
-    margin-top: 0;
-    padding: 0.2rem 0 0.2rem;
-  }
-}
 </style>