修改文件

front/public/static/config/location.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-09-27 16:48:51
+ * @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: {

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

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 (!whoShow1.itShowXiHaiAn) {
-    //   if (recordRoute) {
+      if (recordRoute) {
-    //     const fullPath = route.fullPath
+        const fullPath = route.fullPath
-    //     router.push(`/login?redirect=${fullPath}`)
+        router.push(`/login?redirect=${fullPath}`)
-    //   } else {
+      } else {
-    //     router.push('/login')
+        router.push('/login')
-    //   }
+      }
-    // }
+    }
   }
   // 返回首页
   const goToHome = () => {
@@ -196,8 +208,7 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            // select: '组件服务',
+            select: '组件服务',
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
         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专区':

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

@@ -1,6 +1,7 @@
 <template>
   <div id="search-result-list-container">
     <div class="shai-xuan">
+      <!-- <div class="circle">!</div> -->
       <div class="result">
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
@@ -9,50 +10,89 @@
         }}
       </div>
       <div class="condition" :key="showKey">
-        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
+        <ul
+          v-if="
             selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-        "></IntegrationServiceOrder>
+          "
+        >
+          <li
+            v-for="(item, i) in orderList"
+            :key="item.value"
+            @click="changeOrder(i, item.value, item.orderType)"
+          >
+            {{ item.name }}
+            <span
+              class="arrow"
+              :class="item.orderType == 'ASC' ? 'down' : ''"
+            ></span>
+          </li>
+        </ul>
         <ul v-else>
-          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
+          <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="
+            <span
-              orderObj.orderType == 'ASC' &&
+              class="arrow"
-              orderObj.orderField == item.value
+              :class="item.value == selData ? 'down' : ''"
-                ? 'down'
+            ></span>
-                : ''
-            "></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="
+        <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="
+        >
+          <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="
+        <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="
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
               item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
                 .attrValue
-          " />
+            "
+          />
         </div>
-        <div class="left" :class="
+        <div
+          class="left"
+          :class="
             item.type == '应用资源'
               ? 'yyzy'
               : !item.type
@@ -77,51 +117,122 @@
                   .attrValue == '业务组件'
               ? 'ywzj'
               : ''
-        " @click="toView('details', item)" v-else-if="
+          "
+          @click="toView('details', item)"
+          v-else-if="
             selectCardsname !== '基础设施' &&
             selectCardsname !== '融合服务' &&
             selectCardsname !== '赋能场景'
-        "></div>
+          "
+        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div class="left rhfw" v-else-if="
+        <div
+          class="left rhfw"
+          v-else-if="
             selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-        "></div>
+          "
+        ></div>
         <div class="right" @click="toView('details', item)">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
-              <!-- 西海岸-智能算法-算法类型-标签显示 -->
-              <ComponentServiceTag v-if="selectCardsname === '组件服务' && whoShow1.itShowXiHaiAn" :componentServiceTagList="getTagList(item)"></ComponentServiceTag>
               <!-- 已申请--通过 -->
-              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
+              <svg
-                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="
+                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="
+              <div
+                v-if="
                   selectCardsname === '融合服务' ||
                   selectCardsname === '赋能场景'
-              " class="label-content">
+                "
-                <template v-if="
+                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
+                >
+                  <span
+                    class="label"
+                    v-for="(data, index) in item.fuseAttrList
                       .filter((val) => val.attrType == '应用领域')[0]
-                  .attrValue.split(';')" :key="index">
+                      .attrValue.split(';')"
+                    :key="index"
+                  >
                     {{ data }}
                   </span>
                 </template>
@@ -139,15 +250,21 @@
             </div>
           </div>
           <div class="dec">
-            <div v-if="
+            <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="
+                <div
+                  v-if="
                     selectCardsname !== '数据资源' &&
+                    selectCardsname !== '融合服务' &&
                     selectCardsname !== '赋能场景' &&
                     (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                ">
+                  "
+                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div v-if="
+                <div
+                  v-if="
                     selectCardsname === '数据资源' &&
                     selectCardsname !== '融合服务' &&
                     selectCardsname !== '赋能场景'
-                ">
+                  "
+                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -186,39 +308,75 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template v-if="
+                <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>
+                  <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
-                <span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></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="
+              <div
+                class="shopping pk"
+                :key="pk"
+                v-show="
                   cardType == '组件服务' && findComponentName(item, '智能算法')
-              ">
+                "
-                <span class="pk-on" @click.stop="goComparePk(item, index)"></span>
+              >
+                <span
+                  class="pk-on"
+                  @click.stop="goComparePk(item, index)"
+                ></span>
               </div>
-              <a-button 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="
+              <a-button
+                style="margin-left: 10px"
+                v-show="
                   selectCardsname === '融合服务' ||
                   selectCardsname === '赋能场景'
-              " @click.stop="handleAKeyApplication(item)">
+                "
+                @click.stop="handleAKeyApplication(item)"
+              >
                 一键申请
               </a-button>
-              <a-button type="primary" @click.stop="toView('apply', item)" v-show="
+              <a-button
+                type="primary"
+                @click.stop="toView('apply', item)"
+                v-show="
                   cardType == '组件服务' ||
                   (cardType == '应用资源' && whoShow1.itShowQingDao)
-              ">
+                "
+              >
                 {{
                   item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
@@ -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,21 +407,20 @@
   </div>
 </template>
 <script>
-import { ref, reactive, nextTick, defineEmits, defineExpose, getCurrentInstance } from 'vue'
+  import { ref, reactive } from 'vue'
-import { message } from 'ant-design-vue'
+  import { message } from 'ant-design-vue'
-import { useRouter } from 'vue-router'
+  import { useRouter } from 'vue-router'
-import { getUser, sgcInsert } from '@/api/home'
+  import { getUser, sgcInsert } from '@/api/home'
-import { scInsert, scDel } from '@/api/personalCenter'
+  import { scInsert, scDel } from '@/api/personalCenter'
-import mybus from '@/myplugins/mybus'
+  import mybus from '@/myplugins/mybus'
-import { getHls } from '@/api/home.js'
+  import { getHls } from '@/api/home.js'
-import IntegrationServiceOrder from './integrationServiceOrder.vue';
+  export default {
-import ComponentServiceTag from './ComponentServiceTag.vue';
-export default {
     name: '',
+    // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
     props: {
       resourceList: {
         type: Object,
-      default: () => { },
+        default: () => {},
       },
       resourceTotal: {
         type: String,
@@ -266,35 +428,124 @@ export default {
       },
       selectCardsname: {
         type: String,
-      default: '应用资源',
+        default: '组件服务',
       },
     },
-  components: {
+    computed: {
-    IntegrationServiceOrder,
+      dataList() {
-    ComponentServiceTag,
+        const newArr = []
+        for (let i = 0; i < this.resourceList.data.length; i++) {
+          let arr = [
+            {
+              name: '应用名称',
+              value: '',
             },
-  setup(props, context) {
+            {
+              name: '应用ID',
+              value: '',
+              dataResourceId: '',
+            },
+            {
+              name: '应用领域',
+              value: '',
+            },
+            {
+              name: '组件类型',
+              value: '',
+            },
+            {
+              name: '技术领域',
+              value: '',
+            },
+            {
+              name: '共享类型',
+              value: '',
+            },
+            {
+              name: '共享条件',
+              value: '',
+            },
+          ]
+          arr.map((item) => {
+            if (item.name === '应用名称') {
+              item.value = this.resourceList.data[i].name
+            }
+            if (item.name === '应用ID') {
+              item.value = this.resourceList.data[i].id
+              item.dataResourceId =
+                this.resourceList.data[i].infoList[0].dataResourceId
+            }
+            if (item.name === '应用领域') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '组件类型') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '技术领域') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '共享类型') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '共享条件') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
+              })
+            }
+          })
+          newArr.push(arr)
+        }
+        console.log(
+          'dataList======================>',
+          newArr,
+          this.resourceList
+        )
+        return newArr
+      },
+      isShoppingCartOrNot() {
+        return ''
+      },
+    },
+    components: {},
+    setup(props) {
+      // eslint-disable-next-line no-undef
       const whoShow1 = whoShow
-    console.log('whoShow1------------>', whoShow1);
       const showKey = ref(0)
       let shoppingKey = ref(1)
-    let orderObj = reactive({
+      // 融合服务排序
-      orderField: '',
+      const orderList = ref([
-      orderType: '',
+        {
-    })
+          value: 'collectCount',
-    const integrationServiceOrderDom = ref(null)
+          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, orderType: 'DESC' },
+        { name: '发布时间', value: 'tdr.create_date', show: true },
-      { name: '浏览量', value: 'visits', show: true, orderType: 'DESC' },
+        { name: '浏览量', value: 'visits', show: true },
-      { name: '申请量', value: 'applyCount', show: true, orderType: 'DESC' },
+        { name: '申请量', value: 'applyCount', show: true },
-      { name: '收藏量', value: 'collectCount', show: true, orderType: 'DESC' },
+        { name: '收藏量', value: 'collectCount', show: true },
-      { name: '评分', value: 'score', show: true, orderType: 'DESC' },
+        { name: '评分', value: 'score', show: true },
       ])
-    // 西海岸-去掉浏览量
-    if(whoShow1.itShowXiHaiAn) {
-      selList.value = selList.value.filter(v=>v.name !== '浏览量')
-    }
       if (props.selectCardsname === '基础设施') {
         selList.value.map((val) => (val.show = false))
       } else if (props.selectCardsname === '数据资源') {
@@ -302,7 +553,6 @@ export default {
           (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
         )
       }
-
       const findComponentName = (list, name) => {
         if (list.infoList) {
           return list.infoList.find((item) => {
@@ -312,18 +562,12 @@ export default {
           })
         }
       }
-
-    // 智能算法--列表增加标签显示
-    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]
+          let obj = val.infoList.filter(
+            (item) => item.attrType == '组件类型'
+          )[0]
           if (obj) {
             switch (obj.attrValue) {
               case '智能算法':
@@ -345,7 +589,6 @@ export default {
       })
       showKey.value++
       const selData = ref('total')
-
       const flag = ref(true)
       // userId
       const userId = ref('')
@@ -360,9 +603,7 @@ export default {
         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(
@@ -370,10 +611,11 @@ export default {
                 item.guid
             )
           } else {
-          window.open('http://10.134.135.24:30090/#/home?id=' + item.serviceId)
+            window.open(
+              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
+            )
           }
         } else if (props.selectCardsname === '融合服务') {
-        context.emit('saveSearchCodition')
           // 打包模式
           router.push({
             path: '/packagingDetails',
@@ -440,7 +682,11 @@ export default {
               })
             }
           } else {
-          context.emit('saveSearchCodition')
+            console.log(
+              '111111111111111111===========>',
+              router,
+              props.selectCardsname
+            )
             router.push({
               path: '/details',
               query: {
@@ -458,6 +704,7 @@ export default {
           sgcInsert({
             delFlag: '0',
             resourceId: item.id,
+            // userId: userId.value,
           }).then((res) => {
             console.log(res)
             message.success('添加申购车成功！')
@@ -501,27 +748,29 @@ export default {
           }
         }
       }
+      // 更换查询条件
+      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)
+      }
 
-    /**更换查询条件
+      // 融合服务--排序
-     * val: 排序字段值
+      const changeOrder = (i, val, type) => {
-     * isFromFather: 是否来自父组件传值
+        let newType = type === 'DESC' ? 'ASC' : 'DESC'
-     */
+        orderList.value[i].orderType = newType
-    const changeCondition = (item, isFromFather = false) => {
+        mybus.emit('changeCondition', {
-      let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC';
+          orderField: val,
-      if (isFromFather) {
+          orderType: newType,
-        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 || []
@@ -552,6 +801,7 @@ export default {
         }
         otherArray.map((v) => {
           let resource = v.resource || {}
+          console.log('resource------------>', resource)
           let obj = {
             arr: [
               {
@@ -570,27 +820,64 @@ export default {
         })
         _applyList = jcss.concat(_applyList)
         localStorage.setItem('applyList', JSON.stringify(_applyList))
-      // 融合服务
         router.push({
           path: '/apply',
-          query: {
-            integrationServicesId: item.id,
-          },
         })
-
-       
       }
 
+      // const handleAKeyApplication = (item) => {
+      //   let _applyList = []
+      //     ; (item.fuseResourceList || []).map((v) => {
+      //       let resource = v.resource || {}
+      //       let obj = {
+      //         arr: [
+      //           {
+      //             delFlag: resource.delFlag,
+      //             description: resource.description,
+      //             resourceId: resource.id,
+      //             resourceName: resource.name,
+      //             time: resource.createDate,
+      //             type: resource.type,
+      //           },
+      //         ],
+      //         deptId: resource.deptId,
+      //         deptName: resource.deptName,
+      //       }
+      //       _applyList.push(obj)
+      //     })
+
+      //   localStorage.setItem('applyList', JSON.stringify(_applyList))
+      //   router.push({
+      //     path: '/apply',
+      //   })
+      // }
+
       mybus.on('chongzhi', (typeObj) => {
+        console.log('typeObj------------>', typeObj)
         if (!typeObj) {
           selData.value = 'total'
         }
         if (
           typeObj &&
-        (typeObj.type === '融合服务' || typeObj.type === '打包模式')
+          (typeObj.type === '融合服务' || typeObj.type === '赋能场景')
         ) {
-        integrationServiceOrderDom.value.reset &&
+          orderList.value = [
-          integrationServiceOrderDom.value.reset()
+            {
+              value: 'collectCount',
+              name: '收藏量',
+              orderType: 'DESC',
+            },
+            {
+              value: 'create_date',
+              name: '发布时间',
+              orderType: 'DESC',
+            },
+            {
+              value: 'update_date',
+              name: '更新时间',
+              orderType: 'DESC',
+            },
+          ]
         }
       })
       let videoUrl = ref('')
@@ -644,7 +931,6 @@ export default {
           },
         })
       }
-
       return {
         onSearch,
         resultList,
@@ -664,23 +950,19 @@ export default {
         goComparePk,
         whoShow1,
         showKey,
+        orderList,
         handleAKeyApplication,
-      integrationServiceOrderDom,
+        changeOrder,
-      orderObj,
-      getTagList,
       }
     },
     beforeUnmount() {
       mybus.off('chongzhi')
+      // mybus.emit('changeSelcted')
     },
-}
+  }
 </script>
 <style scoped lang="less">
-.activeBg {
+  #search-result-list-container {
-  background-color: #0087ff;
-}
-
-#search-result-list-container {
     width: 1088px;
     padding: 0 20px;
     background: #f3f5f9;
@@ -697,6 +979,9 @@ export default {
     .shai-xuan {
       width: 1047px;
       height: 36px;
+      // margin: 11px 0 20px;
+      // background: #e5f2ff;
+      // padding-left: 20px;
       display: flex;
       align-items: center;
       position: relative;
@@ -911,6 +1196,19 @@ export default {
           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;
@@ -997,11 +1295,11 @@ export default {
           margin-top: 10px;
           align-items: center;
 
-        &>div {
+          & > div {
             display: flex;
             align-items: center;
 
-          &>div {
+            & > div {
               margin: 0 10px;
             }
           }
@@ -1028,9 +1326,9 @@ export default {
         margin-top: 0;
       }
     }
-}
+  }
 
-.description {
+  .description {
     max-width: 990px;
     height: 52px;
     font-size: 14px;
@@ -1044,5 +1342,5 @@ export default {
     /*超出显示为省略号*/
     -webkit-box-orient: vertical;
     word-break: break-all;
-}
+  }
 </style>

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)"
+        <div
-          :class="{ sel: index == number }">
+          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"
+          <a-input-search
-            @search="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
+            v-model:value="searchValue"
-          <button class="button-reset" @click="resetAction()">重置</button>
+            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"
+        <searchResultList
-          :resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
+          v-if="number === 0"
-          ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
+          v-show="resourceList.data && resourceList.data.length > 0"
-        <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
+          :key="listKey2"
-          @saveSearchCodition="saveSearchCodition" :resourceTotal="resourceTotal"
+          :resourceList="resourceList"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
+          :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"
+          <a-pagination
-            v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
+            v-if="resourceList.data && resourceList.data.length > 0"
-            :total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange"
+            v-model:current="currentPage"
-            @showSizeChange="onShowSizeChange" />
+            v-model:pageSize="currentPageSize"
+            show-size-changer
+            show-less-items
+            show-quick-jumper
+            :total="resourceTotal"
+            :page-size-options="pageSizeOptions"
+            @change="pageChange"
+            @showSizeChange="onShowSizeChange"
+          />
         </div>
-        <div 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,38 +76,31 @@
   <home-footer></home-footer>
 </template>
 <script>
-import HomeFooter from '@/views/newHome/components/Footer'
+  import HomeFooter from '@/views/newHome/components/Footer'
-import mybus from '@/myplugins/mybus'
+  import mybus from '@/myplugins/mybus'
-import { defineComponent, reactive, ref, toRefs, onMounted, nextTick } from 'vue'
+  import { defineComponent, reactive, ref, toRefs, onMounted, watch } 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'
 
-export default defineComponent({
+  import { getIntegrationServicesList } from '@/api/home.js'
-  beforeRouteLeave(to, from, next) {
+  import { useRouter } from 'vue-router'
-    console.log('to---integrationServices--beforeRouteLeave------->', to)
+  import HomeHeader from '@/views/home/components/header'
-    console.log('from---integrationServices--beforeRouteLeave------->', from)
+  import searchResultList from '@/views/home/components/searchResultList.vue'
-    console.log('next---integrationServices--beforeRouteLeave------->', next)
+  import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
-    if (to.name !== 'packagingDetails' && to.name !== 'integrationServicesDetails') {
+  import { message } from 'ant-design-vue'
-      localStorage.removeItem('integrationServices')
+
-    }
+  export default defineComponent({
-    next()
-  },
     setup() {
       // 分页
       const loading = ref(true)
       const currentPage = ref(1)
-    const currentPageSize = ref(5)
+      const currentPageSize = ref(10)
-    const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
+      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([
@@ -85,84 +111,80 @@ export default defineComponent({
           name: '赋能场景',
         },
       ])
+
       const number = ref(0)
+      // 刷新筛选条件组件
+      let listKey = ref(0)
+      // 刷新筛选列表信息组件
+      const listKey2 = ref(0)
+
       // 查询参数
       const paramsGetResources = {
-      page: currentPage.value,
+        pageNum: 1,
-      limit: currentPageSize.value,
+        pageSize: currentPageSize.value,
         type: titleName.value[number.value].name,
-      name: searchValue.value,
+        name: '',
-      orderField: 'create_date',
+        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
         orderType: 'DESC', // ASC 升序  DESC 降序
       }
-    const searchResultListDom = ref(null)
-    const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
-    // 读取本地存储：表单赋值
-    const handleSetSearchData = () => {
-      if (storageSearchInfo) {
-        number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
-        // 搜索名称 
-        searchValue.value = storageSearchInfo.name;
-        currentPage.value = storageSearchInfo.page;
-        currentPageSize.value = storageSearchInfo.limit;
-        paramsGetResources.limit = storageSearchInfo.limit;
-        paramsGetResources.page = storageSearchInfo.page;
-        paramsGetResources.type = storageSearchInfo.type;
-        // 延迟使用，因为还没有返回跟挂载
-        nextTick(() => {
-          searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
-            value: storageSearchInfo.orderField,
-            orderType: storageSearchInfo.orderType,
-          }, true)
-        })
-        getIntegrationList()
-      }
-    }
 
       const changeCards = (val) => {
-      // 打包模式
+        console.log(val)
-      number.value = val;
+        number.value = val
-      paramsGetResources.type = titleName.value[number.value].name;
+        chongzhi()
-      resetAction()
       }
 
       // 查询
       const onSearch = () => {
+        loading.value = true
         currentPage.value = 1
-      getIntegrationList()
       }
       // 重置数据
-    const resetAction = () => {
+      const chongzhi = () => {
+        loading.value = true
         // 重置模糊查字段
         searchValue.value = ''
         // 分页
         currentPage.value = 1
-      currentPageSize.value = 5
+        currentPageSize.value = 10
         // 重置查询条件
-      paramsGetResources.page = 1
+        paramsGetResources.pageNum = 1
-      paramsGetResources.limit = 5
+        paramsGetResources.pageSize = 10
         paramsGetResources.orderField = 'create_date'
         paramsGetResources.orderType = 'DESC'
-
+        mybus.emit('chongzhi', {
-      mybus.emit('resetAction', {
           type: titleName.value[number.value].name,
         })
+        getAppResources()
+      }
+
+      const getAppResources = () => {
         getIntegrationList()
       }
 
       // 获取融合服务列表
       const getIntegrationList = () => {
         loadingData.value = true
-      paramsGetResources.name = searchValue.value;
+        console.log('获取融合服务列表------------>')
-      console.log('paramsGetResources------参数下发------>', paramsGetResources);
+        let postData = {
-      getIntegrationServicesList(paramsGetResources).then(
+          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
@@ -177,81 +199,75 @@ export default defineComponent({
         } else {
           delete paramsGetResources.deptIds
         }
-      getIntegrationList()
+        getAppResources()
+        console.log('paramsGetResources', paramsGetResources)
       })
-
       mybus.on('changePage', (page) => {
-      paramsGetResources.page = page
+        paramsGetResources.pageNum = page
-      getIntegrationList()
+        getAppResources('分页查询')
       })
-
       mybus.on('changeSelcted', () => {
-      getIntegrationList()
+        getAppResources()
       })
 
       mybus.on('refresh', () => {
-      paramsGetResources.page = 1
+        paramsGetResources.pageNum = 1
         currentPage.value = 1
-      getIntegrationList()
+        getAppResources()
       })
       mybus.on('changeCondition', (condition) => {
         paramsGetResources.orderField = condition.orderField
         paramsGetResources.orderType = condition.orderType
-      getIntegrationList()
+        getAppResources()
       })
 
       const pageChange = (val) => {
+        console.log(val)
+        loading.value = true
         currentPage.value = val
-      paramsGetResources.page = val
+        paramsGetResources.pageNum = val
-      getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+        getAppResources(params)
       }
 
+      onMounted(() => {
+        console.log('222----onMounted-------->', 222)
+        listKey2.value++
+        getAppResources()
+      })
+
       // 分页
       const onShowSizeChange = (current, pageSize) => {
         currentPage.value = current
         currentPageSize.value = pageSize
-      paramsGetResources.page = current
+        paramsGetResources.pageNum = current
-      paramsGetResources.limit = pageSize
+        paramsGetResources.pageSize = pageSize
-      getIntegrationList()
+        getAppResources()
-    }
-
-    // 存储查询条件到本地
-    const saveSearchCodition = (n) => {
-      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
-      localStorage.setItem(
-        'integrationServices',
-        JSON.stringify(paramsGetResources)
-      )
-    }
-
-    onMounted(() => {
-      if (storageSearchInfo) {
-        handleSetSearchData()
-      } else {
-        getIntegrationList()
       }
+      watch(currentPageSize, () => {
+        console.log('pageSize', currentPageSize.value)
       })
 
       return {
+        listKey,
         searchValue,
         currentPage,
         resourceList,
         resourceTotal,
         pageChange,
+        listKey2,
         Cardsname,
-      getIntegrationList,
+        getAppResources,
-      resetAction,
+        chongzhi,
         onSearch,
         currentPageSize,
         pageSizeOptions,
+        current,
         loading,
         titleName,
         changeCards,
         number,
         loadingData,
-      onShowSizeChange,
-      saveSearchCodition,
-      searchResultListDom,
       }
     },
     components: {
@@ -266,13 +282,15 @@ export default defineComponent({
       mybus.off('refresh')
       mybus.off('changePage')
     },
-})
+  })
 </script>
 <style lang="less" scoped>
-.resultListSearchInput-father {
+  .resultListSearchInput-father {
     background: #f3f5f9;
     padding: 0.2rem;
 
+    // padding-left: 0.2rem;
+    // padding-top: 0.2rem;
     .resultListSearchInput-son {
       background: #fff;
       padding: 0.2rem 0.2rem 0rem 0.3rem;
@@ -284,9 +302,9 @@ export default defineComponent({
         margin-top: 0.2rem;
       }
     }
-}
+  }
 
-.resultListSearchInput {
+  .resultListSearchInput {
     margin-left: 0.1rem;
 
     :deep(.ant-input) {
@@ -311,9 +329,9 @@ export default defineComponent({
     :deep(.ant-input-group-addon) {
       left: 0 !important;
     }
-}
+  }
 
-.button-reset {
+  .button-reset {
     border: 0;
     outline: none;
     width: 0.8rem;
@@ -326,9 +344,9 @@ export default defineComponent({
     line-height: 0.34rem;
     margin-left: 2.5rem;
     cursor: pointer;
-}
+  }
 
-.details-pageconetent {
+  .details-pageconetent {
     height: 100%;
     width: 100%;
     display: flex;
@@ -387,13 +405,13 @@ export default defineComponent({
         }
       }
     }
-}
+  }
 
-:deep(.ant-card-grid) {
+  :deep(.ant-card-grid) {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
     -webkit-line-clamp: 1;
     word-break: break-all;
-}
+  }
 </style>

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="left">
-        <div
+        <div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
-          class="first-title-text doc"
+          @click="changeName({ name: '技术文档' })">
-          :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
-          @click="changeName({ name: '技术文档' })"
-        >
           技术文档
         </div>
-        <abilityDocTree
+        <abilityDocTree style="max-height:320px;overflow-y:auto" :dataList="treeArray" @treeClick="treeClick"
-          style="max-height: 320px; overflow-y: auto"
+          :clickData="clickData"></abilityDocTree>
-          :dataList="treeArray"
+      </div> -->
-          @treeClick="treeClick"
-          :clickData="clickData"
-        ></abilityDocTree>
-      </div>
 
-      <div
+      <div class="first-title-text new-guide-box" :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }"
-        class="first-title-text new-guide-box"
+        @click="changeName({ name: '使用手册' })">
-        :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
+          <iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
-            name="iframeName"
+            :src="doc_base_url + clickData.doc"></iframe>
-            width="1300"
-            height="100%"
-            id="iframeId"
-            :frameborder="0"
-            :src="doc_base_url + clickData.doc"
-          ></iframe>
         </div>
       </div>
     </div>
@@ -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 {

front/src/views/mynoticeView/components/NoticeList.vue

@@ -79,11 +79,7 @@
           <a-list-item>
             <a-list-item-meta description="">
               <template #title>
-                <div
+                <div class="left" @click="read(item)">
-                  class="left"
-                  @click="read(item)"
-                  :class="item.readStatus === 1 ? '' : 'pointer'"
-                >
                   {{ item.content }}
                 </div>
                 <div class="right">{{ '发布时间：' + item.senderDate }}</div>
@@ -115,19 +111,19 @@
   </div>
 </template>
 <script setup>
-// import { SearchOutlined } from '@ant-design/icons-vue'
+  // import { SearchOutlined } from '@ant-design/icons-vue'
-import { ref, reactive, onBeforeUnmount } from 'vue'
+  import { ref, reactive, onBeforeUnmount } from 'vue'
-import mybus from '@/myplugins/mybus'
+  import mybus from '@/myplugins/mybus'
-import { message } from 'ant-design-vue'
+  import { message } from 'ant-design-vue'
-import { mynotice, mynoticeRead } from '@/api/home'
+  import { mynotice, mynoticeRead } from '@/api/home'
-import { useRouter } from 'vue-router'
+  import { useRouter } from 'vue-router'
-const router = useRouter()
+  const router = useRouter()
-const total = ref(0)
+  const total = ref(0)
-const pageSize = ref(8)
+  const pageSize = ref(8)
-const pageNum = ref(1)
+  const pageNum = ref(1)
-const value = ref('全部消息')
+  const value = ref('全部消息')
-const obj = reactive({ page: pageNum.value, limit: pageSize.value })
+  const obj = reactive({ page: pageNum.value, limit: pageSize.value })
-const navList = reactive([
+  const navList = reactive([
     {
       title: '全部',
       key: 'all',
@@ -148,11 +144,11 @@ const navList = reactive([
       key: 'other',
       num: 0,
     },
-])
+  ])
-const selectNav = ref('all')
+  const selectNav = ref('all')
-const selectData = ref([])
+  const selectData = ref([])
-const data = ref([])
+  const data = ref([])
-const changeNav = (nav) => {
+  const changeNav = (nav) => {
     selectNav.value = nav.key
     if (nav.key === 'all') {
       delete obj.from
@@ -162,16 +158,16 @@ const changeNav = (nav) => {
     value.value = '全部消息'
     delete obj.readStatus
     init()
-}
+  }
-const changeCheckBox = (item) => {
+  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 = () => {
+  const changeCheckAll = () => {
     if (selectData.value.length == data.value.length) {
       selectData.value = []
       data.value.forEach((val) => {
@@ -184,13 +180,13 @@ const changeCheckAll = () => {
         selectData.value.push(val.id)
       })
     }
-}
+  }
-const changePageNum = (page) => {
+  const changePageNum = (page) => {
     pageNum.value = page
     obj.page = pageNum.value
     init()
-}
+  }
-const handleChange = () => {
+  const handleChange = () => {
     pageNum.value = 1
     obj.page = pageNum.value
     switch (value.value) {
@@ -208,28 +204,35 @@ const handleChange = () => {
         break
     }
     init()
-}
+  }
-const goBack = (url) => {
+  const goBack = (url) => {
     router.push({
       path: url,
     })
-}
+  }
-const read = (item) => {
+  const read = (item) => {
     // console.log(item)
     if (selectData.value.length === 0 && !item) {
       message.error('未选择消息！')
       return
     }
     console.log(selectData.value)
-
+    // let str = ''
+    // selectData.value.forEach((val, index) => {
+    //   str += val
+    //   if (index < selectData.value.length - 1) {
+    //     str += ';'
+    //   }
+    // })
     if (item) {
-    // 已读状态
-    if (item.readStatus === 1) {
-      return
-    }
       mynoticeRead(item.id).then((res) => {
-      if (res.data.code == 0) {
+        if (res.data.code == 0 ) {
-        message.success('操作成功！')
+          message.success('通知已读！')
+        //    if(item.readStatus == 1){
+        //   message.success('通知已读！')
+        // }  if(item.readStatus == 0){
+        //   message.success('通知已设为已读！')
+        // }
           mybus.emit('getMynotice')
           init()
         } else {
@@ -250,8 +253,8 @@ const read = (item) => {
         })
       })
     }
-}
+  }
-const init = () => {
+  const init = () => {
     // from 通知 评论 readStatus 0 未读  1 已读
     mynotice(obj).then((res) => {
       console.log('消息=============>', res.data.data)
@@ -269,8 +272,8 @@ const init = () => {
       total.value = res.data.data.total
       selectData.value = []
     })
-}
+  }
-navList.forEach((val) => {
+  navList.forEach((val) => {
     if (val.title === '全部') {
       mynotice({ page: pageNum.value, limit: pageSize.value }).then((res) => {
         val.num = res.data.data.total
@@ -284,17 +287,17 @@ navList.forEach((val) => {
         val.num = res.data.data.total
       })
     }
-})
+  })
-init()
-mybus.on('noticeListInit', () => {
   init()
-})
+  mybus.on('noticeListInit', () => {
-onBeforeUnmount(() => {
+    init()
+  })
+  onBeforeUnmount(() => {
     mybus.off('noticeListInit')
-})
+  })
 </script>
 <style lang="less" scoped>
-.notice-list {
+  .notice-list {
     padding: 0.64rem 0 0;
     background: #f4f5f8;
     .ant-breadcrumb {
@@ -306,7 +309,6 @@ onBeforeUnmount(() => {
       display: flex;
       justify-content: space-between;
       align-items: center;
-
       .left {
         display: flex;
         .item {
@@ -368,7 +370,6 @@ onBeforeUnmount(() => {
       padding: 0.14rem 3.1rem 0;
       display: flex;
       justify-content: space-between;
-
       .left {
         display: flex;
         align-items: center;
@@ -425,8 +426,8 @@ onBeforeUnmount(() => {
           display: flex;
           justify-content: space-between;
           align-items: center;
-
           .left {
+            cursor: pointer;
             width: 9.2rem;
             max-height: 0.43rem;
             overflow: hidden;
@@ -436,9 +437,6 @@ onBeforeUnmount(() => {
             -webkit-box-orient: vertical;
             word-break: break-all;
           }
-        .pointer {
-          cursor: pointer;
-        }
           .left:hover {
             color: #0058e1;
           }
@@ -450,5 +448,5 @@ onBeforeUnmount(() => {
       margin-top: 0;
       padding: 0.2rem 0 0.2rem;
     }
-}
+  }
 </style>