Merge branch 'hi-ucs-dev' into release

# Conflicts:
#	front/public/static/config/basicConfig.js

back/src/views/modules/activiti/RoomExamineAdmin.vue

@@ -2,7 +2,7 @@
   <el-card shadow="never" class="roomBox">
     <div class="roomExamineSearch">
       <el-input
-        v-model="roomName"
+        v-model="roomNameA"
         style="width: 160px"
         placeholder="请输入会议室名称"
       ></el-input>
@@ -195,6 +195,17 @@
             <el-input type="textarea" v-model="desc"></el-input>
           </el-col>
         </el-row>
+        <el-row style="display: flex; margin-top: 20px">
+          <el-col :span="2">附件：</el-col>
+          <el-col :span="16">
+            <el-button
+              v-if="file != ''"
+              size="mini"
+              @click="downloadTemplate(file)"
+              >下载</el-button
+            >
+          </el-col>
+        </el-row>
         <div slot="footer" class="dialog-footer">
           <el-button @click="No">取 消</el-button>
           <el-button type="primary" @click="ok">确 定</el-button>
@@ -233,8 +244,8 @@ export default {
       num: '',
       file: '',
       name: '',
-      roomName: '',
       creator: '',
+      roomNameA: '',
     }
   },
   mounted() {
@@ -244,10 +255,9 @@ export default {
     getSerach() {
       this.$http
         .get(
-          `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomName}&state=${this.value}`
+          `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomNameA}&state=${this.value}`
         )
         .then(({ data: res }) => {
-          console.log(res, 7777777)
           this.tableData = res.data.list
           this.total = res.data.total
         })
@@ -276,10 +286,10 @@ export default {
         this.creator = item.creator
       } else {
         this.dialogVisible = true
+      }
       this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => {
         this.file = res.data.file
       })
-      }
       this.lookData = item
     },
 

back/src/views/modules/myAgent/ConferenceRoom.vue

@@ -228,7 +228,7 @@ export default {
       ruleForm: {
         name: '',
         num: '',
-        area: '',
+        area: 0,
         capacity: '',
         pic: '',
         id: '',
@@ -246,7 +246,7 @@ export default {
         ],
         area: [
           { required: true, message: '请输入会议室面积', trigger: 'blur' },
-          { min: 1, trigger: 'blur' },
+          { min: 1, type: 'number', trigger: 'blur' },
         ],
         description: [
           { required: true, message: '请填写描述内容', trigger: 'blur' },

back/src/views/modules/putOnTheShelf/index.vue

@@ -39,7 +39,7 @@
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package' &&item.name != '上传附件'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
                 tip="支持.zip类型，大小不超过100M"></upload>
                 <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx,.zip' :list="item" v-else-if="item.name == '上传附件'" type="附件" btnName="上传附件" :maxCount="1" :dataList="item"
-                tip="大小不超过100M"></upload>
+                tip="支持.doc,.docx,.zip,.ppt,.pdf类型，大小不超过100M"></upload>
               <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
               <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
               <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>

front/public/static/config/basicConfig.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-29 09:57:31
+ * @LastEditTime: 2022-09-14 10:50:37
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -43,6 +43,7 @@ var CONFIGITEM = {
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',
       websocketURL: '10.134.135.9:8888/renren-admin',
+      // websocketURL: '10.18.1.99:8889/renren-admin', // 研发
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -57,7 +58,8 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.236:9796/',
-      websocketURL: '192.168.124.236:8888/renren-admin',
+      // websocketURL: '192.168.124.236:8888/renren-admin',
+      websocketURL: '10.18.1.99:8889/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },

front/public/static/config/location.js

@@ -122,12 +122,15 @@ 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: {
@@ -493,12 +496,15 @@ 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/App.vue

@@ -20,14 +20,6 @@
 import mybus from '@/myplugins/mybus'
 const router = useRouter()
 
-  // export default {
-  //   name: 'App',
-  //   data() {
-  //     return {
-  //       ,
-  //     }
-  //   },
-  // }
 const locale = zhCN
 const token = Cookies.get('ucsToken')
 console.log('token=================>', token)
@@ -60,6 +52,7 @@
 </script>
 <style lang="less">
 @import '~@/vab/styles/vab.less';
+
 #vue-admin-beautiful {
   max-width: 1920px;
   // max-height: 1080px;
@@ -68,6 +61,7 @@
   position: relative;
   background-color: #fff;
 }
+
 body {
   font-size: 0.14rem;
 }

front/src/api/home.js

@@ -368,6 +368,16 @@ export function getIntegrationServicesList(params) {
     params,
   })
 }
+
+// 融合服务--更新
+export function updateIntegrationServices(data) {
+  return request({
+    url: '/fuse',
+    method: 'put',
+    data,
+  })
+}
+
 // 全局搜索
 export function getCountByFuzzyQuery(params) {
   return request({

front/src/global/GlobalConfig.js

@@ -505,3 +505,6 @@ export const RECOURCE_G_ICON = {
   resourceProtection:
     '/src/assets/resourceManageMap/pic/point-resettlement-circle.png',
 }
+
+// 能力集市-默认选中tab
+export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = '应用资源'

front/src/supermap/advance-init.js

@@ -60,7 +60,7 @@ export function MapFun(mapObj) {
   /**
    * 定义地物编辑服务
    */
-  const featureService = L.supermap.featureService(
+  const featureService = L.supermap && L.supermap.featureService && L.supermap.featureService(
     _mapConfig.config.EDITORDATA_URL
   )
 

front/src/supermap/map-init.js

@@ -123,7 +123,8 @@ export function HieimpMap() {
     // debugger;
 
     // 获取图层信息
-    L.supermap
+    L.supermap && L.supermap
+    .layerInfoService && L.supermap
       .layerInfoService(_mapConfig.config.QUERY_URL)
       .getLayersInfo(function (result) {
         // doSomething

front/src/views/capabilityCloud/components/capabilityCloudBack.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="detail-back" @click="previousPage" :style="{ color: textColor }">
+    ＜返回
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, watch, defineProps } from 'vue'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+
+const props = defineProps({
+  textColor: { type: String, default: '' },
+})
+
+const previousPage = () => {
+  window.history.go(-1)
+}
+</script>
+
+<style scoped lang="less">
+.detail-back {
+  position: absolute;
+  opacity: 0.7;
+  top: 0.5rem;
+  left: 100px;
+  font-size: 0.20rem;
+  cursor: pointer;
+  background: -webkit-linear-gradient(90deg, #99a8d0, #fff);
+  font-weight: 600;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+</style>

front/src/views/capabilityCloud/index.vue

@@ -7,6 +7,7 @@
 -->
 <template>
   <div class="capability-cloud">
+    <capability-cloud-back></capability-cloud-back>
     <div class="header">
       <span class="title" @click="goHome">数字能力超市</span>
     </div>
@@ -29,6 +30,7 @@
   import Infrastructure from '@/views/capabilityCloud/components/Infrastructure.vue'
   import DataResources from '@/views/capabilityCloud/components/DataResources.vue'
   import KnowledgeBase from '@/views/capabilityCloud/components/KnowledgeBase.vue'
+  import capabilityCloudBack from '@/views/capabilityCloud/components/capabilityCloudBack.vue'
   import { useRouter } from 'vue-router'
   const router = useRouter()
   const goHome = () => {

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -309,7 +309,7 @@
                 :data="item"
                 :busType="2"
                 :list="props.fileList2"
-                tip="支持文件类型，大小不超过100M"
+                tip="支持.doc,.docx,.zip,.ppt,.pdf类型，大小不超过100M"
               ></upload>
               <upload
                 v-else-if="item.type == 'package'"
@@ -692,27 +692,29 @@
             data.value.list.push(item)
           }
         })
-      } else if (item.name === '部门联系人') {
-        if (!item.note1) {
-          getUserInfo().then(({ data: res1 }) => {
-            console.log(res1.data)
-            item.note1 = res1.data.realName || ''
-          })
-          data.value.list.push(item)
-        } else {
-          data.value.list.push(item)
       } 
-      } else if (item.name === '部门联系人电话') {
+      // else if (item.name === '部门联系人') {
-        if (!item.note1) {
+      //   if (!item.note1) {
-          getUserInfo().then(({ data: res1 }) => {
+      //     getUserInfo().then(({ data: res1 }) => {
-            console.log(res1.data)
+      //       console.log(res1.data)
-            item.note1 = res1.data.mobile || ''
+      //       item.note1 = res1.data.realName || ''
-          })
+      //     })
-          data.value.list.push(item)
+      //     data.value.list.push(item)
-        } else {
+      //   } else {
-          data.value.list.push(item)
+      //     data.value.list.push(item)
-        }
+      //   }
-      } else if (item.name === '来源应用') {
+      // } else if (item.name === '部门联系人电话') {
+      //   if (!item.note1) {
+      //     getUserInfo().then(({ data: res1 }) => {
+      //       console.log(res1.data)
+      //       item.note1 = res1.data.mobile || ''
+      //     })
+      //     data.value.list.push(item)
+      //   } else {
+      //     data.value.list.push(item)
+      //   }
+      // } 
+      else if (item.name === '来源应用') {
         queryApplicationRelByResourceId({
           referenceId: 0,
         }).then((res) => {

front/src/views/capacitySquare/index.vue

@@ -26,6 +26,8 @@
   import layer from './components/layer.vue'
   import application from './components/application.vue'
   import { useRouter } from 'vue-router'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  
   const router = useRouter()
   const abilityToType = router.currentRoute.value.query.abilityToType
   const show = ref('algorithm')
@@ -47,7 +49,8 @@
     const newpage = router.resolve({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
     window.location.href = newpage.href

front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue

@@ -116,6 +116,11 @@
     // dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
     console.log('dataList', props.dataList)
     props.dataList.infoList.map((item) => {
+      handleInfoList(item)
+    })
+  }
+}
+const handleInfoList = (item) => {
   if (item.attrType === '服务类型') {
     dataFromLeft.value.content[0].values = item.attrValue || '123'
   } else if (item.attrType === '覆盖区域') {
@@ -133,9 +138,9 @@
   } else if (item.attrType === '图层类型') {
     dataFromRight.value.content[1].values = item.attrValue || '--'
   } else if (item.attrType === '最大级别') {
+    if (dataFromRight.value.content && dataFromRight.value.content[2]) {
       dataFromRight.value.content[2].values = item.attrValue || '--'
     }
-      })
   }
 }
 watch(
@@ -157,29 +162,30 @@
       if (!obj) {
         flag.value = false
       } else {
-          // dataFrom.value.content[0].link.value = val.apiUrl
-          // dataFrom.value.content[0].facilitator.value = val.deptContacts
         console.log('dataList', val)
         val.infoList.map((item) => {
-            if (item.attrType === '服务类型') {
+          handleInfoList(item)
-              dataFromLeft.value.content[0].values = item.attrValue || '123'
+          // if (item.attrType === '服务类型') {
-            } else if (item.attrType === '覆盖区域') {
+          //   dataFromLeft.value.content[0].values = item.attrValue || '123'
-              dataFromLeft.value.content[1].values = item.attrValue || '--'
+          // } else if (item.attrType === '覆盖区域') {
-            } else if (item.attrType === '切片策略') {
+          //   dataFromLeft.value.content[1].values = item.attrValue || '--'
-              dataFromLeft.value.content[2].values = item.attrValue || '--'
+          // } else if (item.attrType === '切片策略') {
-            } else if (item.attrType === '坐标系') {
+          //   dataFromLeft.value.content[2].values = item.attrValue || '--'
-              dataFromCenter.value.content[0].values = item.attrValue || '--'
+          // } else if (item.attrType === '坐标系') {
-            } else if (item.attrType === '切片尺寸') {
+          //   dataFromCenter.value.content[0].values = item.attrValue || '--'
-              dataFromCenter.value.content[1].values = item.attrValue || '--'
+          // } else if (item.attrType === '切片尺寸') {
-            } else if (item.attrType === '最小级别') {
+          //   dataFromCenter.value.content[1].values = item.attrValue || '--'
-              dataFromCenter.value.content[2].values = item.attrValue || '--'
+          // } else if (item.attrType === '最小级别') {
-            } else if (item.attrType === '数据范围') {
+          //   dataFromCenter.value.content[2].values = item.attrValue || '--'
-              dataFromRight.value.content[0].values = item.attrValue || '--'
+          // } else if (item.attrType === '数据范围') {
-            } else if (item.attrType === '图层类型') {
+          //   dataFromRight.value.content[0].values = item.attrValue || '--'
-              dataFromRight.value.content[1].values = item.attrValue || '--'
+          // } else if (item.attrType === '图层类型') {
-            } else if (item.attrType === '最大级别') {
+          //   dataFromRight.value.content[1].values = item.attrValue || '--'
-              dataFromRight.value.content[2].values = item.attrValue || '--'
+          // } else if (item.attrType === '最大级别') {
-            }
+          //   if (dataFromRight.value.content && dataFromRight.value.content[2]) {
+          //     dataFromRight.value.content[2].values = item.attrValue || '--'
+          //   }
+          // }
         })
       }
     }
@@ -193,9 +199,11 @@
   flex-direction: column;
   align-items: center;
   padding: 0.8rem 0;
+
   .content {
     margin-top: 0.3rem;
     display: flex;
+
     .content-left {
       height: 2.8rem;
       width: 13rem;
@@ -216,10 +224,12 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+
         ul {
           padding: 0;
           margin: 0;
         }
+
         ul li {
           list-style: none;
           display: flex;
@@ -227,11 +237,13 @@
           margin-bottom: 0.3rem;
           line-height: 0.25rem;
         }
+
         img {
           margin: 0 0.2rem 0 0;
           width: 0.15rem;
           height: 0.15rem;
         }
+
         span {
           font-size: 0.2rem;
           color: #666666;
@@ -239,6 +251,7 @@
           margin-right: 0.5rem;
           width: 120px;
         }
+
         p {
           width: 2rem;
           margin-bottom: 0;

front/src/views/home/apply.vue

@@ -2,9 +2,6 @@
   <div>
     <home-header></home-header>
     <div id="apply-container">
-      <!-- <aside>
-        <aside-menu></aside-menu>
-      </aside> -->
       <article>
         <div class="from-card" v-if="applySuccess && !applyAll">
           <AbilityToApplyFor :dataList="list"></AbilityToApplyFor>
@@ -126,59 +123,6 @@
                   />
                 </a-form-item>
               </div>
-              <!-- <div>
-                <a-form-item
-                  label="期望效果"
-                  name="effectWish"
-                  :rules="[{ required: true, message: '请输入期望效果' }]"
-                >
-                  <a-textarea
-                    placeholder="请输入期望效果"
-                    v-model:value="formName.effectWish"
-                    :rows="4"
-                  />
-                </a-form-item>
-              </div> -->
-              <!-- <a-form-item
-                style="color: #666; font-size: 16px"
-                label="申请单附件"
-                name="applyDoc"
-              >
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  :action="`${baseURL}/upload`"
-                  :headers="headers"
-                  @change="handleChange"
-                  :before-upload="beforeUpload"
-                  :maxCount="1"
-                >
-                  <a-button
-                    style="
-                      width: 100px;
-                      height: 30px;
-                      margin-right: 10px;
-                      background: #edf4fc;
-                      color: #0087ff;
-                      font-size: 14px;
-                      border-radius: 6px;
-                      border: 1px solid #bbd3ef;
-                      padding: 0;
-                      text-align: center;
-                    "
-                  >
-                    <upload-outlined></upload-outlined>
-                    文件上传
-                  </a-button>
-                  <span style="font-size: 14px; color: #999">
-                    支持doc、docx、jpg、png、jpeg、pdf、xlxs、ppt类型文件
-                  </span>
-                  <div v-if="fileList.length < 1">
-                    <plus-outlined />
-                    <div style="margin-top: 8px">上传限一个文件</div>
-                  </div>
-                </a-upload>
-              </a-form-item> -->
               <div class="bottom-btn">
                 <a-button
                   style="
@@ -238,7 +182,6 @@
 import { useRouter } from 'vue-router'
 import { message } from 'ant-design-vue'
 import qs from 'qs'
-  // import { UploadOutlined } from '@ant-design/icons-vue'
 import { Upload } from 'ant-design-vue'
 import {
   lastestPage,
@@ -255,23 +198,29 @@
 import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
 import mybus from '@/myplugins/mybus'
 import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import { pageWithAttrs } from '@/api/home'
+import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
-  // import { baseURL } from '@/config'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-  // import AsideMenu from './components/asideMenu.vue'
+
 export default {
   name: '',
   props: {},
   components: {
     HomeHeader,
     AbilityToApplyFor,
-      // AsideMenu,
-      // UploadOutlined,
   },
   setup() {
     const router = useRouter()
     const disabled = ref(false)
     const flag = ref(false)
     const list = ref(JSON.parse(localStorage.getItem('applyList')))
+    const integrationServicesItemInfo = ref(
+      JSON.parse(localStorage.getItem('integrationServicesItemInfo') || '{}')
+    )
+    console.log(
+      'integrationServicesItemInfo------------>',
+      integrationServicesItemInfo
+    )
+
     const applyAll = router.currentRoute.value.query.applyAll
     const num = ref(0)
     if (!applyAll) {
@@ -294,13 +243,7 @@
         }
       })
     }
-      console.log(
+    console.log('list', list.value)
-        'list',
-        list.value
-        // list.value[0].children.filter(
-        //   (val) => val.id == list.value[0].checkedList[0]
-        // )[0].resourceName
-      )
     const baseURL = window.SITE_CONFIG.apiURL
     let record = ref('1')
     const text = ref('')
@@ -318,7 +261,6 @@
             )
         : '申请' + list.value[0].arr[0].resourceName, // 标题
       applicationSystem: '', // 应用系统
-        // applicationSystem: [], // 应用系统
       applicationScene: [], // 应用领域
       applicationBackground: '', // 应用背景
       effectWish: '', // 期望效果
@@ -337,14 +279,12 @@
     if (id) {
       getApplyForm(id).then((res) => {
         console.log('修改==============>', res.data.data)
-          // formName.id = res.data.data.id || ''
         formName.applicationSystem = res.data.data.applicationSystem || ''
         formName.applicationScene = res.data.data.applicationScene || []
         formName.applicationBackground =
           res.data.data.applicationBackground || ''
         formName.effectWish = res.data.data.effectWish || ''
         formName.phone = res.data.data.phone || ''
-          // formName.system = res.data.data.system || []
         formName.enclosure = res.data.data.enclosure || ''
         formName.enclosureName = res.data.data.enclosureName || ''
         if (res.data.data.enclosure) {
@@ -365,7 +305,6 @@
         formName.unit = res.data.data.deptName
       })
     })
-      // console.log('本地存储====================》', list.value)
     const applicationSceneOpthion = ref([])
     getCategoryTreePage({
       page: 1,
@@ -384,7 +323,6 @@
     // console.log(formName.system)
     const formRef = ref()
     const applySuccess = ref(true)
-      // const rootObj = null
     const dataForm = {
       processDefinitionKey: 'abilityprocess',
     }
@@ -400,7 +338,19 @@
     const resetFields = () => {
       window.history.go(-1)
     }
+
+    // 跳转到能力集市
+    const jumpToDetailsPageconetent = () => {
+      router.push({
+        path: '/DetailsPageconetent',
+        query: {
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        },
+      })
+    }
+
     const processStartHandle = () => {
+      debugger
       formRef.value.validate().then(() => {
         if (!formUrl) {
           return message.error('请设置保存表单的URL')
@@ -471,36 +421,22 @@
                               sxt = false
                             }
                             mybus.emit('getSgcNum')
-                              router.push({
+                            jumpToDetailsPageconetent()
-                                path: '/DetailsPageconetent',
-                                query: {
-                                  select: '组件服务',
-                                },
-                              })
                           }
                         })
                       } else {
-                          if (
+                        if (res.data.msg === 'success' && falgNum == 0 && sxt) {
-                            res.data.msg === 'success' &&
-                            falgNum == 0 &&
-                            sxt
-                          ) {
                           message.success('申请提交成功，请到消息中心查看！')
                           sxt = false
                         }
-                          router.push({
+                        jumpToDetailsPageconetent()
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
                       }
                     })
                   }
                 })
               })
               console.log(
-                  '提交数据==========================>',
+                '提交数据============submitApply==============>',
                 formName,
                 ids
               )
@@ -517,21 +453,15 @@
                       sgcDel({ ids: ids }).then((res) => {
                         if (res.data.msg === 'success') {
                           mybus.emit('getSgcNum')
-                            router.push({
+                          jumpToDetailsPageconetent()
-                              path: '/DetailsPageconetent',
-                              query: {
-                                select: '组件服务',
-                              },
-                            })
                         }
                       })
                     } else {
-                        router.push({
+                      // todo 融合服务
-                          path: '/DetailsPageconetent',
+                      if (Object.keys(integrationServicesItemInfo).length > 0) {
-                          query: {
+                        updateIntegrationServiceAction()
-                            select: '组件服务',
+                      }
-                          },
+                      jumpToDetailsPageconetent()
-                        })
                     }
                   } else {
                     message.error('申请失败！')
@@ -546,12 +476,7 @@
             // 单兵设备为了演示 添加  不做处理
             if (list.value[0].arr[0].type == '单兵设备') {
               message.success('单兵设备申请提交成功！')
-                router.push({
+              jumpToDetailsPageconetent()
-                  path: '/DetailsPageconetent',
-                  query: {
-                    select: '组件服务',
-                  },
-                })
             } else {
               let ids = []
               let falgNum = 0
@@ -613,39 +538,21 @@
                               sxt = false
                             }
                             mybus.emit('getSgcNum')
-                              router.push({
+                            jumpToDetailsPageconetent()
-                                path: '/DetailsPageconetent',
-                                query: {
-                                  select: '组件服务',
-                                },
-                              })
                           }
                         })
                       } else {
-                          if (
+                        if (res.data.msg === 'success' && falgNum == 0 && sxt) {
-                            res.data.msg === 'success' &&
-                            falgNum == 0 &&
-                            sxt
-                          ) {
                           message.success('申请提交成功，请到消息中心查看！')
                           sxt = false
                         }
-                          router.push({
+                        jumpToDetailsPageconetent()
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
                       }
                     })
                   }
                 })
               })
-                console.log(
+              console.log('提交数据==========================>', formName, ids)
-                  '提交数据==========================>',
-                  formName,
-                  ids
-                )
               if (formName.system.length !== 0) {
                 if (formName.applicationSystem.length == 0) {
                   formName.applicationSystem = ''
@@ -659,21 +566,15 @@
                       sgcDel({ ids: ids }).then((res) => {
                         if (res.data.msg === 'success') {
                           mybus.emit('getSgcNum')
-                            router.push({
+                          jumpToDetailsPageconetent()
-                              path: '/DetailsPageconetent',
-                              query: {
-                                select: '组件服务',
-                              },
-                            })
                         }
                       })
                     } else {
-                        router.push({
+                      // todo 融合服务
-                          path: '/DetailsPageconetent',
+                      if (Object.keys(integrationServicesItemInfo).length > 0) {
-                          query: {
+                        updateIntegrationServiceAction()
-                            select: '组件服务',
+                      }
-                          },
+                      jumpToDetailsPageconetent()
-                        })
                     }
                   } else {
                     message.error('申请失败！')
@@ -686,12 +587,7 @@
             applyAllApplication(formName).then((res) => {
               if (res.data.code == 0) {
                 message.success('申请提交成功，请到消息中心查看！')
-                  router.push({
+                jumpToDetailsPageconetent()
-                    path: '/DetailsPageconetent',
-                    query: {
-                      select: '组件服务',
-                    },
-                  })
               } else {
                 message.error('申请失败！')
               }
@@ -707,10 +603,8 @@
         businessKey: businessKey,
         variables: formData,
       }
-        // proxy.$http['post']('/act/running/startOfBusinessKey', data)
       startOfBusinessKey(data)
         .then(({ data: res }) => {
-            // applySuccess.value = false
           if (res.code !== 0) {
             if (callbacks.startProcessErrorCallback) {
               callbacks.startProcessErrorCallback(res.data)
@@ -732,11 +626,7 @@
               processDefinitionKey: processDefinitionKey,
               businessKey: businessKey,
             })
-              // proxy.$http['post'](instanceIdUrl + '?' + params)
+            updateInstanceId(params).then(() => {})
-              updateInstanceId(params).then(
-                // ({ data: res }) => {}
-                () => {}
-              )
           }
         })
         .catch(() => {})
@@ -803,11 +693,6 @@
       console.log(`selected ${value}`)
     }
     const systemHandleSearch = (value) => {
-        // console.log(`search ${value}`)
-        // text.value = value
-        // systemOptions.value = systemOptions2.value.filter(
-        //   (item) => item.label.search(text.value) > -1
-        // )
       let valueArray = []
       systemOptions.value.map((val) => {
         valueArray.push(val.value)
@@ -847,8 +732,6 @@
     }
     const handleFocus = () => {
       console.log('focus')
-        // console.log(formName.applicationSystem)
-        // formName.applicationSystem = []
       let arrId = []
       for (var valueIndex of systemOptions2.value) {
         if (arrId.indexOf(valueIndex['value']) == -1) {
@@ -856,15 +739,27 @@
           systemOptions.value.push(valueIndex)
         }
       }
-        // systemOptions.value = systemOptions2.value
-        // systemOptions.value = []
     }
-      // const filterOption = (input, option) => {
+
-      //   return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      // }
     onBeforeUnmount(() => {
       mybus.off('reomveOldData')
     })
+
+    // 融合服务-更新 todo
+    const updateIntegrationServiceAction = () => {
+      let _applyCount =
+        Number(integrationServicesItemInfo.value.applyCount || 0) + 1
+      let _data = Object.assign({}, integrationServicesItemInfo.value, {
+        applyCount: _applyCount,
+      })
+      updateIntegrationServices(_data)
+        .then((res) => {
+          console.log('res---更新--------->', res)
+        })
+        .catch((err) => {
+          console.log('err----更新-------->', err)
+        })
+    }
     return {
       formRef,
       formName,

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

@@ -1,19 +1,11 @@
 <template>
   <div class="box">
     <div class="CanCase">
-      <div
+      <div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)">
-        class="caseBox"
+        <a-image :preview="false" :src="
-        v-for="(item, index) in caseList"
-        :key="index"
-        @click="toView(item)"
-      >
-        <a-image
-          :preview="false"
-          :src="
           item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
             .attrValue
-          "
+        " />
-        />
         <h3>{{ item.name }}</h3>
         <p>发布时间 {{ item.updateDate }}</p>
       </div>
@@ -21,8 +13,7 @@
   </div>
 </template>
 <script setup>
-  import { ref, onMounted, onBeforeUnmount } from 'vue'
+import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
-  import { defineProps } from 'vue'
 
 import { useRouter } from 'vue-router'
 const router = useRouter()
@@ -36,14 +27,17 @@
     default: '组件服务',
   },
 })
+const emits = defineEmits(['saveSearchCodition'])
+
 const caseList = ref([])
 
 onMounted(() => {
   caseList.value = props.resourceList.data
-    console.log(caseList.value, 'caseList.value')
+  console.log('caseList.value------------>', caseList.value);
 })
 onBeforeUnmount(() => { })
 function toView(item) {
+  emits('saveSearchCodition', 1)
   router.push({
     path: '/integrationServicesDetails',
     query: {
@@ -51,6 +45,15 @@
     },
   })
 }
+
+watch(
+  () => props.resourceList.data,
+  (val) => {
+    if (val) {
+      caseList.value = val
+    }
+  }
+)
 </script>
 <style lang="less" scoped>
 .box {
@@ -60,6 +63,7 @@
     grid-template-columns: 33.33% 33.33% 33.33%;
     align-items: center;
     justify-items: center;
+
     .caseBox {
       width: 3.5rem;
       height: 3rem;
@@ -69,15 +73,18 @@
       padding: 0.2rem;
       margin-bottom: 0.2rem;
       cursor: pointer;
+
       img {
         width: 3rem;
         height: 1.8rem;
       }
+
       h3 {
         font-size: 0.18rem;
         font-weight: bold;
         margin-top: 0.1rem;
       }
+
       p {
         font-size: 0.16rem;
         color: #797979;

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

@@ -131,46 +131,34 @@
   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) {
@@ -208,7 +196,8 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            select: '组件服务',
+            // select: '组件服务',
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
         break
@@ -217,11 +206,6 @@
           path: '/capabilityCloud',
         })
         break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
       case '技术文档':
         router.push({
           path: '/instructionManual',
@@ -255,10 +239,6 @@
       case '融合服务':
         router.push({
           path: '/integrationServices',
-          //  path: '/DetailsPageconetent',
-          query: {
-            select: '融合服务',
-          },
         })
         break
       case 'CIM专区':

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

@@ -0,0 +1,100 @@
+<template>
+  <ul class="integrationServiceOrder">
+    <li v-for="(item, i) in integrationOrderList" :key="i" @click="
+      changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
+    ">
+      {{ item.name }}
+      <span class="arrow" :class="
+        integrationOrder.orderType == 'ASC' &&
+        integrationOrder.orderField == item.value
+          ? 'down'
+          : ''
+      "></span>
+    </li>
+  </ul>
+</template>
+<script setup>
+import { ref, reactive, nextTick, defineExpose } from 'vue'
+import mybus from '@/myplugins/mybus'
+
+const orderList = [
+  {
+    value: 'apply_count',
+    name: '申请量',
+    orderType: 'DESC',
+  },
+  {
+    value: 'collectCount',
+    name: '收藏量',
+    orderType: 'DESC',
+  },
+  {
+    value: 'create_date',
+    name: '发布时间',
+    orderType: 'DESC',
+  },
+  {
+    value: 'update_date',
+    name: '更新时间',
+    orderType: 'DESC',
+  },
+]
+const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
+const integrationOrder = reactive({
+  orderField: '',
+  orderType: '',
+})
+
+// 融合服务--排序
+const changeOrder = (i, val, type) => {
+  console.log('i, val, type------------>', i, val, type);
+  integrationOrder.orderField = val
+  integrationOrder.orderType = type;
+  // 0 apply_count ASC
+  let _index = integrationOrderList.value.findIndex(x => x.value = val)
+  if (_index > -1) {
+    integrationOrderList.value[_index].orderType = type
+  }
+  mybus.emit('changeCondition', {
+    orderField: val,
+    orderType: type,
+  })
+}
+
+const reset = () => {
+  integrationOrderList.value = JSON.parse(JSON.stringify(orderList))
+  integrationOrder.orderField = ''
+  integrationOrder.orderType = ''
+}
+defineExpose({
+  reset,
+})
+</script>
+<style lang="less" scoped>
+.integrationServiceOrder {
+  display: flex;
+
+  li {
+    width: 90px;
+    height: 12px;
+    text-align: center;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .arrow {
+      display: inline-block;
+      width: 12px;
+      height: 12px;
+      background: url('~@/assets/newHome/arrow.png');
+      margin-left: 10px;
+    }
+
+    .down {
+      background: url('~@/assets/newHome/down.png');
+      margin-top: 6px;
+    }
+  }
+}
+</style>

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

@@ -1,7 +1,6 @@
 <template>
   <div id="search-result-list-container">
     <div class="shai-xuan">
-      <!-- <div class="circle">!</div> -->
       <div class="result">
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
@@ -10,89 +9,55 @@
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul
+        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
-          v-if="
           selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
+        "></IntegrationServiceOrder>
-        >
-          <li
-            v-for="(item, i) in orderList"
-            :key="item.value"
-            @click="changeOrder(i, item.value, item.orderType)"
-          >
-            {{ item.name }}
-            <span
-              class="arrow"
-              :class="item.orderType == 'ASC' ? 'down' : ''"
-            ></span>
-          </li>
-        </ul>
         <ul v-else>
-          <li
+          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
-            v-for="item in selList"
-            :key="item.value"
-            @click="changeCondition(item.value)"
-            v-show="
             item.show &&
             item.name !== '评分' &&
             selectCardsname !== '数据资源'
-            "
+          ">
-          >
             {{ item.name }}
-            <span
+            <!-- {{orderObj.orderType}}{{orderObj.orderField}} -->
-              class="arrow"
+            <!-- <span class="arrow" :class="item.value == selData ? 'down' : ''"></span> -->
-              :class="item.value == selData ? 'down' : ''"
+            <!-- {{orderObj.orderType == 'ASC' ? '11' : '22'}} -->
-            ></span>
+            <!-- {{orderObj.orderField == item.value ? '11' : '22'}} -->
+            <span class="arrow" :class="
+              orderObj.orderType == 'ASC' &&
+              orderObj.orderField == item.value
+                ? 'down'
+                : ''
+            "></span>
           </li>
         </ul>
+        <!-- {{JSON.stringify(orderObj)}} -->
       </div>
     </div>
-    <div
+    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
-      class="result-list"
-      v-for="(item, index) in resourceList.data"
-      :key="item.index"
-    >
       <div class="item" :key="showKey">
-        <div
+        <div class="left" style="display: flex; align-items: center" v-if="
-          class="left"
-          style="display: flex; align-items: center"
-          v-if="
           item.type === '应用资源' &&
           item.infoList &&
           item.infoList.filter((val) => val.attrType == '应用图片')[0]
-          "
+        ">
-        >
+          <a-image :width="106" :preview="false" :src="
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
               .attrValue
-            "
+          " />
-          />
         </div>
-        <div
+        <div class="left" style="display: flex; align-items: center" v-else-if="
-          class="left"
-          style="display: flex; align-items: center"
-          v-else-if="
           (selectCardsname === '融合服务' ||
             selectCardsname === '赋能场景') &&
           item.fuseAttrList &&
           item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-          "
+        ">
-        >
+          <a-image :width="106" :preview="false" :src="
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
             item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
               .attrValue
-            "
+          " />
-          />
         </div>
-        <div
+        <div class="left" :class="
-          class="left"
-          :class="
           item.type == '应用资源'
             ? 'yyzy'
             : !item.type
@@ -117,122 +82,49 @@
                 .attrValue == '业务组件'
             ? 'ywzj'
             : ''
-          "
+        " @click="toView('details', item)" v-else-if="
-          @click="toView('details', item)"
-          v-else-if="
           selectCardsname !== '基础设施' &&
           selectCardsname !== '融合服务' &&
           selectCardsname !== '赋能场景'
-          "
+        "></div>
-        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div
+        <div class="left rhfw" v-else-if="
-          class="left rhfw"
-          v-else-if="
           selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-          "
+        "></div>
-        ></div>
         <div class="right" @click="toView('details', item)">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
               <!-- 已申请--通过 -->
-              <svg
+              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
-                t="1652322568870"
+                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="
-                class="icon"
-                viewBox="0 0 3072 1024"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                p-id="3062"
-                width="40"
-                height="40"
-                v-if="
                   item.applyState == '已申请' && item.approveStatus == '通过'
-                "
+                " style="margin-left: 10px; min-width: 40px">
-                style="margin-left: 10px; min-width: 40px"
-              >
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06"
+                  fill="#d81e06" p-id="3063"></path>
-                  p-id="3063"
-                ></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06"
+                  fill="#d81e06" p-id="3064"></path>
-                  p-id="3064"
-                ></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06"
+                  fill="#d81e06" p-id="3065"></path>
-                  p-id="3065"
-                ></path>
               </svg>
-              <!-- 审核中 -->
-              <!-- <svg
-                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
+              <div v-if="
-                v-if="
                 selectCardsname === '融合服务' ||
                 selectCardsname === '赋能场景'
-                "
+              " class="label-content">
-                class="label-content"
+                <template v-if="
-              >
-                <template
-                  v-if="
                   item.fuseAttrList &&
                   item.fuseAttrList.filter(
                     (val) => val.attrType == '应用领域'
                   )[0]
-                  "
+                ">
-                >
+                  <span class="label" v-for="(data, index) in item.fuseAttrList
-                  <span
-                    class="label"
-                    v-for="(data, index) in item.fuseAttrList
                   .filter((val) => val.attrType == '应用领域')[0]
-                      .attrValue.split(';')"
+                  .attrValue.split(';')" :key="index">
-                    :key="index"
-                  >
                     {{ data }}
                   </span>
                 </template>
@@ -250,21 +142,15 @@
             </div>
           </div>
           <div class="dec">
-            <div
+            <div v-if="
-              v-if="
               selectCardsname !== '融合服务' &&
               selectCardsname !== '赋能场景' &&
               selectCardsname !== '基础设施'
-              "
+            ">
-            >
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div
+          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
-            v-if="selectCardsname !== '基础设施'"
-            style="margin-top: 0.1rem"
-            class="description"
-          >
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -273,7 +159,7 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div
+                <!-- <div
                   v-if="
                     selectCardsname !== '数据资源' &&
                     selectCardsname !== '融合服务' &&
@@ -281,24 +167,19 @@
                   "
                 >
                   浏览量：{{ item.visits || 0 }}次
-                </div>
+                </div> -->
-                <div
+                <div v-if="
-                  v-if="
                   selectCardsname !== '数据资源' &&
-                    selectCardsname !== '融合服务' &&
                   selectCardsname !== '赋能场景' &&
                   (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                  "
+                ">
-                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div
+                <div v-if="
-                  v-if="
                   selectCardsname === '数据资源' &&
                   selectCardsname !== '融合服务' &&
                   selectCardsname !== '赋能场景'
-                  "
+                ">
-                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -308,75 +189,39 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template
+                <template v-if="
-                  v-if="
                   (selectCardsname == '组件服务' &&
                     item.infoList.filter(
                       (val) => val.attrType == '外部服务地址'
                     ).length === 0) ||
                   (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                  "
+                ">
-                >
+                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
-                  <span
+                  <span class="shopping-on" v-else @click.stop="addShoppingCart(item, index)"></span>
-                    class="shopping-down"
-                    v-if="item.isInShoppingCart"
-                  ></span>
-                  <span
-                    class="shopping-on"
-                    v-else
-                    @click.stop="addShoppingCart(item, index)"
-                  ></span>
                 </template>
               </div>
               <div class="sc">
-                <span
+                <span class="sc-down" v-if="item.isCollect == 'false'" @click.stop="addCollect(item)"></span>
-                  class="sc-down"
+                <span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></span>
-                  v-if="item.isCollect == 'false'"
-                  @click.stop="addCollect(item)"
-                ></span>
-                <span
-                  class="sc-on"
-                  v-if="item.isCollect == 'true'"
-                  @click.stop="addCollect(item)"
-                ></span>
               </div>
-              <div
+              <div class="shopping pk" :key="pk" v-show="
-                class="shopping pk"
-                :key="pk"
-                v-show="
                 cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
+              ">
-              >
+                <span class="pk-on" @click.stop="goComparePk(item, index)"></span>
-                <span
-                  class="pk-on"
-                  @click.stop="goComparePk(item, index)"
-                ></span>
               </div>
-              <a-button
+              <a-button type="primary" @click.stop="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
-                type="primary"
-                @click.stop="toView('details', item)"
-                v-if="!whoShow1.itShowBaoTou"
-              >
                 查看详情
               </a-button>
-              <a-button
+              <a-button style="margin-left: 10px" v-show="
-                style="margin-left: 10px"
-                v-show="
                 selectCardsname === '融合服务' ||
                 selectCardsname === '赋能场景'
-                "
+              " @click.stop="handleAKeyApplication(item)">
-                @click.stop="handleAKeyApplication(item)"
-              >
                 一键申请
               </a-button>
-              <a-button
+              <a-button type="primary" @click.stop="toView('apply', item)" v-show="
-                type="primary"
-                @click.stop="toView('apply', item)"
-                v-show="
                 cardType == '组件服务' ||
                 (cardType == '应用资源' && whoShow1.itShowQingDao)
-                "
+              ">
-              >
                 {{
                 item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
@@ -391,12 +236,7 @@
         </div>
       </div>
     </div>
-    <a-modal
+    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
-      v-model:visible="visible"
-      title="视频预览"
-      :width="750"
-      destroyOnClose
-    >
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -407,16 +247,16 @@
   </div>
 </template>
 <script>
-  import { ref, reactive } from 'vue'
+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'
 export default {
   name: '',
-    // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
   props: {
     resourceList: {
       type: Object,
@@ -503,48 +343,34 @@
         })
         newArr.push(arr)
       }
-        console.log(
+      console.log('dataList======================>', newArr, this.resourceList)
-          'dataList======================>',
-          newArr,
-          this.resourceList
-        )
       return newArr
     },
     isShoppingCartOrNot() {
       return ''
     },
   },
-    components: {},
+  components: {
-    setup(props) {
+    IntegrationServiceOrder,
-      // eslint-disable-next-line no-undef
+  },
+  setup(props, context) {
     const whoShow1 = whoShow
     const showKey = ref(0)
     let shoppingKey = ref(1)
-      // 融合服务排序
+    let orderObj = reactive({
-      const orderList = ref([
+      // orderField: 'tdr.create_date',
-        {
+      // orderType: 'ASC',
-          value: 'collectCount',
+      orderField: '',
-          name: '收藏量',
+      orderType: '',
-          orderType: 'DESC',
+    })
-        },
+    const integrationServiceOrderDom = ref(null)
-        {
-          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: 'tdr.create_date', show: true, orderType: 'DESC' },
-        { name: '浏览量', value: 'visits', show: true },
+      { name: '浏览量', value: 'visits', show: true, orderType: 'DESC' },
-        { name: '申请量', value: 'applyCount', show: true },
+      { name: '申请量', value: 'applyCount', show: true, orderType: 'DESC' },
-        { name: '收藏量', value: 'collectCount', show: true },
+      { name: '收藏量', value: 'collectCount', show: true, orderType: 'DESC' },
-        { name: '评分', value: 'score', show: true },
+      { name: '评分', value: 'score', show: true, orderType: 'DESC' },
     ])
     if (props.selectCardsname === '基础设施') {
       selList.value.map((val) => (val.show = false))
@@ -553,6 +379,7 @@
         (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
       )
     }
+
     const findComponentName = (list, name) => {
       if (list.infoList) {
         return list.infoList.find((item) => {
@@ -565,9 +392,7 @@
     console.log('this.resourceList', props.resourceList.data)
     props.resourceList.data.map((val) => {
       if (val.infoList) {
-          let obj = val.infoList.filter(
+        let obj = val.infoList.filter((item) => item.attrType == '组件类型')[0]
-            (item) => item.attrType == '组件类型'
-          )[0]
         if (obj) {
           switch (obj.attrValue) {
             case '智能算法':
@@ -589,6 +414,7 @@
     })
     showKey.value++
     const selData = ref('total')
+
     const flag = ref(true)
     // userId
     const userId = ref('')
@@ -603,8 +429,9 @@
       console.log('use value', searchValue)
       console.log('or use this.value', searchValue.value)
     }
+
     function toView(type, item) {
-        debugger
+      // debugger
       if (props.selectCardsname == '数据资源') {
         if (whoShow1.itShowQingDao) {
           window.open(
@@ -612,11 +439,10 @@
             item.guid
           )
         } else {
-            window.open(
+          window.open('http://10.134.135.24:30090/#/home?id=' + item.serviceId)
-              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
-            )
         }
       } else if (props.selectCardsname === '融合服务') {
+        context.emit('saveSearchCodition')
         // 打包模式
         router.push({
           path: '/packagingDetails',
@@ -683,11 +509,7 @@
             })
           }
         } else {
-            console.log(
+          context.emit('saveSearchCodition')
-              '111111111111111111===========>',
-              router,
-              props.selectCardsname
-            )
           router.push({
             path: '/details',
             query: {
@@ -705,7 +527,6 @@
         sgcInsert({
           delFlag: '0',
           resourceId: item.id,
-            // userId: userId.value,
         }).then((res) => {
           console.log(res)
           message.success('添加申购车成功！')
@@ -749,29 +570,32 @@
         }
       }
     }
-      // 更换查询条件
-      const changeCondition = (val) => {
-        selData.value = selData.value == val ? 'total' : val
-        const orderType = selData.value == val ? 'ASC' : 'DESC'
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: orderType,
-        })
-        console.log('选择===========》', val, selData.value)
-      }
 
-      // 融合服务--排序
+    /**更换查询条件
-      const changeOrder = (i, val, type) => {
+     * val: 排序字段值
-        let newType = type === 'DESC' ? 'ASC' : 'DESC'
+     * isFromFather: 是否来自父组件传值
-        orderList.value[i].orderType = newType
+     */
-        mybus.emit('changeCondition', {
+    const changeCondition = (item, isFromFather = false) => {
-          orderField: val,
+      console.log('item, isFromFather------------>', item, isFromFather);
-          orderType: newType,
+      let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC';
+      if (isFromFather) {
+        newType = item.orderType;
+      }
+      orderObj.orderField = item.value;
+      orderObj.orderType = newType;
+      let _index = selList.value.findIndex(x => x.value == item.value)
+      if (_index > -1) {
+        selList.value[_index].orderType = newType
+      }
+      selList.value = selList.value.splice(0);
+      nextTick(() => {
+        console.log('orderObj------------>', orderObj);
+        console.log('selList------------>', selList.value);
       })
+      mybus.emit('changeCondition', orderObj)
     }
 
     // 融合服务--一键申请
-      // 一键申请
     const handleAKeyApplication = (item) => {
       let _applyList = []
       let fuseResourceList = item.fuseResourceList || []
@@ -802,7 +626,6 @@
       }
       otherArray.map((v) => {
         let resource = v.resource || {}
-          console.log('resource------------>', resource)
         let obj = {
           arr: [
             {
@@ -821,64 +644,23 @@
       })
       _applyList = jcss.concat(_applyList)
       localStorage.setItem('applyList', JSON.stringify(_applyList))
+      // 融合服务
+      localStorage.setItem('integrationServicesItemInfo', JSON.stringify(item))
       router.push({
         path: '/apply',
       })
     }
 
-      // const handleAKeyApplication = (item) => {
-      //   let _applyList = []
-      //     ; (item.fuseResourceList || []).map((v) => {
-      //       let resource = v.resource || {}
-      //       let obj = {
-      //         arr: [
-      //           {
-      //             delFlag: resource.delFlag,
-      //             description: resource.description,
-      //             resourceId: resource.id,
-      //             resourceName: resource.name,
-      //             time: resource.createDate,
-      //             type: resource.type,
-      //           },
-      //         ],
-      //         deptId: resource.deptId,
-      //         deptName: resource.deptName,
-      //       }
-      //       _applyList.push(obj)
-      //     })
-
-      //   localStorage.setItem('applyList', JSON.stringify(_applyList))
-      //   router.push({
-      //     path: '/apply',
-      //   })
-      // }
-
     mybus.on('chongzhi', (typeObj) => {
-        console.log('typeObj------------>', typeObj)
       if (!typeObj) {
         selData.value = 'total'
       }
       if (
         typeObj &&
-          (typeObj.type === '融合服务' || typeObj.type === '赋能场景')
+        (typeObj.type === '融合服务' || typeObj.type === '打包模式')
       ) {
-          orderList.value = [
+        integrationServiceOrderDom.value.reset &&
-            {
+          integrationServiceOrderDom.value.reset()
-              value: 'collectCount',
-              name: '收藏量',
-              orderType: 'DESC',
-            },
-            {
-              value: 'create_date',
-              name: '发布时间',
-              orderType: 'DESC',
-            },
-            {
-              value: 'update_date',
-              name: '更新时间',
-              orderType: 'DESC',
-            },
-          ]
       }
     })
     let videoUrl = ref('')
@@ -932,6 +714,7 @@
         },
       })
     }
+
     return {
       onSearch,
       resultList,
@@ -951,18 +734,21 @@
       goComparePk,
       whoShow1,
       showKey,
-        orderList,
       handleAKeyApplication,
-        changeOrder,
+      integrationServiceOrderDom,
+      orderObj,
     }
   },
   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;
@@ -980,9 +766,6 @@
   .shai-xuan {
     width: 1047px;
     height: 36px;
-      // margin: 11px 0 20px;
-      // background: #e5f2ff;
-      // padding-left: 20px;
     display: flex;
     align-items: center;
     position: relative;
@@ -1197,19 +980,6 @@
         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;

front/src/views/home/constantData/showData.js

@@ -1,12 +1,12 @@
 export const titleNameArray = [
-  {
-    photo: require('@/assets/newHome/banner-zj.png'),
-    name: '组件服务',
-  },
   {
     photo: require('@/assets/newHome/banner-yy.png'),
     name: '应用资源',
   },
+  {
+    photo: require('@/assets/newHome/banner-zj.png'),
+    name: '组件服务',
+  },
   {
     photo: require('@/assets/newHome/banner-jc.png'),
     name: '基础设施',

front/src/views/home/detailBack.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="detail-back" @click="previousPage" :style="{ color: textColor }">
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, watch, defineProps } from 'vue'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+console.log('router------------>', router)
+
+const props = defineProps({
+  textColor: { type: String, default: '' },
+})
+
+const previousPage = () => {
+  window.history.go(-1)
+}
+</script>
+
+<style scoped lang="less">
+.detail-back {
+  position: absolute;
+  top: 0.85rem;
+  left: 100px;
+  font-size:  0.18rem;
+  color: #fff;
+  cursor: pointer;
+  width: 50px;
+  height: 50px;
+  background-image: url('~@/assets/detailsAll/back.png');
+  background-size: 100% 100%;
+}
+</style>

front/src/views/home/details.vue

@@ -9,6 +9,7 @@
   <div>
     <div id="apply-container">
       <home-header :showView="showView"></home-header>
+      <detail-back></detail-back>
       <details-view v-if="showView === 'details-view'"></details-view>
       <algorithm-details
         v-else-if="showView === 'algorithm-details'"
@@ -38,6 +39,7 @@
   import DeveloperComponents from '@/views/detailsAll/DeveloperComponents'
   import BusinessDetails from '@/views/detailsAll/BusinessDetails'
   import LayerService from '@/views/detailsAll/LayerService'
+  import detailBack from '@/views/home/detailBack.vue'
   import { selectOne } from '@/api/home'
   import { useRouter } from 'vue-router'
   export default defineComponent({
@@ -52,6 +54,7 @@
       DeveloperComponents,
       BusinessDetails,
       LayerService,
+      detailBack
     },
     setup() {
       const formState = reactive({
@@ -163,6 +166,7 @@
         }
       }
       init()
+      
       return {
         formState,
         options,

front/src/views/home/infrastructurePage.vue

@@ -432,7 +432,7 @@
               placeholder="请输入关键词"
               enter-button="搜索"
               size="large"
-              @change="getCamera"
+              @change="(e) => getCamera(true, e.target.value)"
             />
             <a-button
               type="primary"
@@ -809,6 +809,7 @@
     dept: '',
     matter: '',
     file: '',
+    roomName: '',
   })
   const fileList = ref([])
   const useForm = Form.useForm
@@ -838,7 +839,7 @@
     phone: [
       {
         required: true,
-        pattern: /^1[3|4|5|7|8][0-9]\d{8}$/,
+        pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
         message: '请输入正确的手机号',
       },
     ],
@@ -1239,8 +1240,10 @@
   }
   //预约
   const appointment = (item) => {
+    console.log(item, 8888888888)
     dateId.value = item.id
     formState.roomId = item.id
+    formState.roomName = item.name
     appointmentRoom.value = true
   }
   //预约弹框 选择日期
@@ -1297,6 +1300,12 @@
       .then(() => {
         setSubmit(formState).then(({ data: res }) => {
           appointmentRoom.value = false
+          rulesRef.bookDate = []
+          rulesRef.startTime = []
+          rulesRef.name = []
+          rulesRef.matter = []
+          rulesRef.phone = []
+          rulesRef.dept = []
           formState.roomId = ''
           formState.bookDate = ''
           formState.startTime = '' //开始时间
@@ -1688,6 +1697,7 @@
   // }
   const wrjFlag = ref(false)
   const getCamera = (flag, str) => {
+    console.log('mapSearchParam.value.cameraName------------>', mapSearchParam.value.cameraName);
     if (flag) {
       mapSearchParam.value.cameraName = str
       console.log('赋值===============》', str, mapSearchParam.value)
@@ -1701,6 +1711,8 @@
         pagination.value.total = res.data.count
       })
     } else {
+      console.log('mapSearchParam------------>', mapSearchParam);
+      
       let params = {
         regionId:
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@@ -1711,6 +1723,7 @@
         latitude: mapSearchParam.value.gpsY || '',
         radius: mapSearchParam.value.radius || '',
         status: 1,
+        name: mapSearchParam.value.cameraName
       }
       if (
         params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&

front/src/views/home/integrationServices.vue

@@ -5,13 +5,8 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div
+        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
-          v-for="(item, index) in titleName"
+          :class="{ sel: index == number }">
-          :key="index"
-          class="tabAll"
-          @click="changeCards(index)"
-          :class="{ sel: index == number }"
-        >
           <span>
             {{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }}
           </span>
@@ -20,54 +15,26 @@
       <div class="resultListSearchInput-father" v-if="number === 0">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
+          <button class="button-reset" @click="resetAction()">重置</button>
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
-          <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div v-loading="loadingData">
-        <searchResultList
+        <searchResultList v-if="number === 0" v-show="resourceList.data && resourceList.data.length > 0"
-          v-if="number === 0"
+          :resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
-          v-show="resourceList.data && resourceList.data.length > 0"
+          ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-          :key="listKey2"
+        <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-          :resourceList="resourceList"
+          @saveSearchCodition="saveSearchCodition" :resourceTotal="resourceTotal"
-          :resourceTotal="resourceTotal"
+          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
-        <CanAssignCase
-          v-else
-          v-show="resourceList.data && resourceList.data.length > 0"
-          :key="listKey2"
-          :resourceList="resourceList"
-          :resourceTotal="resourceTotal"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
-        />
         <div class="pagination">
-          <a-pagination
+          <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-            v-if="resourceList.data && resourceList.data.length > 0"
+            v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
-            v-model:current="currentPage"
+            :total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange"
-            v-model:pageSize="currentPageSize"
+            @showSizeChange="onShowSizeChange" />
-            show-size-changer
-            show-less-items
-            show-quick-jumper
-            :total="resourceTotal"
-            :page-size-options="pageSizeOptions"
-            @change="pageChange"
-            @showSizeChange="onShowSizeChange"
-          />
         </div>
-        <div
+        <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-          v-if="resourceList.data && resourceList.data.length <= 0"
-          style="margin-top: 2rem"
-        >
           <a-empty />
         </div>
       </div>
@@ -78,8 +45,7 @@
 <script>
 import HomeFooter from '@/views/newHome/components/Footer'
 import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+import { defineComponent, reactive, ref, toRefs, onMounted, nextTick } from 'vue'
-
 import { getIntegrationServicesList } from '@/api/home.js'
 import { useRouter } from 'vue-router'
 import HomeHeader from '@/views/home/components/header'
@@ -88,19 +54,27 @@
 import { message } from 'ant-design-vue'
 
 export default defineComponent({
+  beforeRouteLeave(to, from, next) {
+    console.log('to---integrationServices--beforeRouteLeave------->', to)
+    console.log('from---integrationServices--beforeRouteLeave------->', from)
+    console.log('next---integrationServices--beforeRouteLeave------->', next)
+    if (to.name !== 'packagingDetails' && to.name !== 'integrationServicesDetails') {
+      localStorage.removeItem('integrationServices')
+    }
+    next()
+  },
   setup() {
     // 分页
     const loading = ref(true)
     const currentPage = ref(1)
     const currentPageSize = ref(5)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
     const router = useRouter()
     const select = router.currentRoute.value.query.select
     const searchValue = ref('')
     const Cardsname = ref(select)
     const resourceList = reactive({ data: [] })
     const resourceTotal = ref(0)
-      const current = ref(1)
     const loadingData = ref(false)
     // 选项卡
     const titleName = ref([
@@ -111,80 +85,84 @@
         name: '赋能场景',
       },
     ])
-
     const number = ref(0)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-
     // 查询参数
     const paramsGetResources = {
-        pageNum: 1,
+      page: currentPage.value,
-        pageSize: currentPageSize.value,
+      limit: currentPageSize.value,
       type: titleName.value[number.value].name,
-        name: '',
+      name: searchValue.value,
-        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      orderField: 'create_date',
       orderType: 'DESC', // ASC 升序  DESC 降序
     }
+    const searchResultListDom = ref(null)
+    const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
+    // 读取本地存储：表单赋值
+    const handleSetSearchData = () => {
+      if (storageSearchInfo) {
+        number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
+        // 搜索名称 
+        searchValue.value = storageSearchInfo.name;
+        currentPage.value = storageSearchInfo.page;
+        currentPageSize.value = storageSearchInfo.limit;
+        paramsGetResources.limit = storageSearchInfo.limit;
+        paramsGetResources.page = storageSearchInfo.page;
+        paramsGetResources.type = storageSearchInfo.type;
+        // 延迟使用，因为还没有返回跟挂载
+        nextTick(() => {
+          searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
+            value: storageSearchInfo.orderField,
+            orderType: storageSearchInfo.orderType,
+          }, true)
+        })
+        getIntegrationList()
+      }
+    }
 
     const changeCards = (val) => {
-        console.log(val)
+      // 打包模式
-        number.value = val
+      number.value = val;
-        chongzhi()
+      paramsGetResources.type = titleName.value[number.value].name;
+      resetAction()
     }
 
     // 查询
     const onSearch = () => {
-        loading.value = true
       currentPage.value = 1
+      getIntegrationList()
     }
     // 重置数据
-      const chongzhi = () => {
+    const resetAction = () => {
-        loading.value = true
       // 重置模糊查字段
       searchValue.value = ''
       // 分页
       currentPage.value = 1
       currentPageSize.value = 5
       // 重置查询条件
-        paramsGetResources.pageNum = 1
+      paramsGetResources.page = 1
-        paramsGetResources.pageSize = 5
+      paramsGetResources.limit = 5
       paramsGetResources.orderField = 'create_date'
       paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi', {
+
+      mybus.emit('resetAction', {
         type: titleName.value[number.value].name,
       })
-        getAppResources()
-      }
-
-      const getAppResources = () => {
       getIntegrationList()
     }
 
     // 获取融合服务列表
     const getIntegrationList = () => {
       loadingData.value = true
-        console.log('获取融合服务列表------------>')
+      paramsGetResources.name = searchValue.value;
-        let postData = {
+      console.log('paramsGetResources------参数下发------>', paramsGetResources);
-          limit: currentPageSize.value,
+      getIntegrationServicesList(paramsGetResources).then(
-          page: currentPage.value,
-          orderField: paramsGetResources.orderField,
-          orderType: paramsGetResources.orderType,
-          name: searchValue.value,
-          type: titleName.value[number.value].name,
-        }
-        getIntegrationServicesList(postData).then(
         (res) => {
           loadingData.value = false
           if (res.data.code !== 0) {
             return message.error(res.data.msg)
           }
-            console.log('res.data------------>', res.data)
-
           resourceList.data = res.data.data.list || []
           resourceTotal.value = res.data.data.total || 0
-            listKey2.value++
         },
         (err) => {
           loadingData.value = false
@@ -199,75 +177,81 @@
       } else {
         delete paramsGetResources.deptIds
       }
-        getAppResources()
+      getIntegrationList()
-        console.log('paramsGetResources', paramsGetResources)
     })
+
     mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
+      paramsGetResources.page = page
-        getAppResources('分页查询')
+      getIntegrationList()
     })
+
     mybus.on('changeSelcted', () => {
-        getAppResources()
+      getIntegrationList()
     })
 
     mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
+      paramsGetResources.page = 1
       currentPage.value = 1
-        getAppResources()
+      getIntegrationList()
     })
     mybus.on('changeCondition', (condition) => {
       paramsGetResources.orderField = condition.orderField
       paramsGetResources.orderType = condition.orderType
-        getAppResources()
+      getIntegrationList()
     })
 
     const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
       currentPage.value = val
-        paramsGetResources.pageNum = val
+      paramsGetResources.page = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
     }
 
-      onMounted(() => {
-        console.log('222----onMounted-------->', 222)
-        listKey2.value++
-        getAppResources()
-      })
-
     // 分页
     const onShowSizeChange = (current, pageSize) => {
       currentPage.value = current
       currentPageSize.value = pageSize
-        paramsGetResources.pageNum = current
+      paramsGetResources.page = current
-        paramsGetResources.pageSize = pageSize
+      paramsGetResources.limit = pageSize
-        getAppResources()
+      getIntegrationList()
+    }
+
+    // 存储查询条件到本地
+    const saveSearchCodition = (n) => {
+      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
+      localStorage.setItem(
+        'integrationServices',
+        JSON.stringify(paramsGetResources)
+      )
+    }
+
+    onMounted(() => {
+      if (storageSearchInfo) {
+        handleSetSearchData()
+      } else {
+        getIntegrationList()
       }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
     })
 
     return {
-        listKey,
       searchValue,
       currentPage,
       resourceList,
       resourceTotal,
       pageChange,
-        listKey2,
       Cardsname,
-        getAppResources,
+      getIntegrationList,
-        chongzhi,
+      resetAction,
       onSearch,
       currentPageSize,
       pageSizeOptions,
-        current,
       loading,
       titleName,
       changeCards,
       number,
       loadingData,
+      onShowSizeChange,
+      saveSearchCodition,
+      searchResultListDom,
     }
   },
   components: {
@@ -289,8 +273,6 @@
   background: #f3f5f9;
   padding: 0.2rem;
 
-    // padding-left: 0.2rem;
-    // padding-top: 0.2rem;
   .resultListSearchInput-son {
     background: #fff;
     padding: 0.2rem 0.2rem 0rem 0.3rem;

front/src/views/home/integrationServicesDetails.vue

@@ -2,21 +2,15 @@
 <template>
   <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
     <home-header></home-header>
+    <detail-back></detail-back>
     <!-- 头部基本信息 -->
-    <application-top-details
+    <application-top-details :dataList="detailInfoObj" :navList="navList"></application-top-details>
-      :dataList="detailInfoObj"
-      :navList="navList"
-    ></application-top-details>
 
     <!-- 导航 -->
     <div :class="{ fixed: scrollTop >= 600 }">
       <div class="application-navigation">
         <template v-for="nav in navList" :key="nav.key">
-          <div
+          <div class="nav" :class="{ selectNow: nav.key == selectNow }" @click="selectNav(nav.key)">
-            class="nav"
-            :class="{ selectNow: nav.key == selectNow }"
-            @click="selectNav(nav.key)"
-          >
             {{ nav.name }}
             <span class="line"></span>
           </div>
@@ -30,19 +24,16 @@
         <DetalsTitle title="场景痛点" type="PAIN POINT"></DetalsTitle>
       </div>
       <div class="flex-row-center">
-        <div class="bg cjtd"><a-image :preview="false" :src="bgImg" /></div>
+        <div class="bg cjtd">
+          <a-image :preview="false" :src="bgImg" />
+        </div>
 
         <div class="content" style="margin-left: 0.5rem">
-          <div
+          <div class="content-item" v-for="(item, i) in painPoint" :key="i" style="
-            class="content-item"
-            v-for="(item, i) in painPoint"
-            :key="i"
-            style="
               margin-bottom: 0.2rem;
               font-size: 0.18rem;
               line-height: 0.3rem;
-            "
+            ">
-          >
             {{ i + 1 + '、' + item.description }}
           </div>
         </div>
@@ -50,26 +41,17 @@
     </div>
 
     <!-- 解决方案 -->
-    <div
+    <div id="integration-solution" class="solution scrollBox" style="background: #eee">
-      id="integration-solution"
-      class="solution scrollBox"
-      style="background: #eee"
-    >
       <div class="title-1">
         <DetalsTitle title="解决方案" type="SOLUTION"></DetalsTitle>
       </div>
       <div class="flex-row-center">
         <div class="content" style="background: #fff; margin-top: 0.2rem">
-          <div
+          <div class="content-item" v-for="(item, i) in solution" :key="i" style="
-            class="content-item"
-            v-for="(item, i) in solution"
-            :key="i"
-            style="
               margin-bottom: 0.2rem;
               font-size: 0.18rem;
               line-height: 0.3rem;
-            "
+            ">
-          >
             {{ i + 1 + '、' + item.description }}
           </div>
         </div>
@@ -81,48 +63,20 @@
       <div class="title-1">
         <DetalsTitle title="使用能力" type="ABILITY"></DetalsTitle>
       </div>
-      <div
+      <div class="flex-row-center combine-content" v-for="(item, i) in combineList" :key="i" style="display: block">
-        class="flex-row-center combine-content"
+        <div class="top" style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem">
-        v-for="(item, i) in combineList"
-        :key="i"
-        style="display: block"
-      >
-        <div
-          class="top"
-          style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem"
-        >
           {{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
         </div>
         <div class="bottom" style="display: flex; align-items: flex-start">
           <div class="title" :class="'title' + i"></div>
-          <div>
+          <div class="table-box">
-            <el-table
+            <el-table class="table" :data="item.list" stripe :header-cell-style="{ 'text-align': 'center' }">
-              class="table"
+              <el-table-column prop="name" label="数据" align="center" width="200" show-overflow-tooltip="true">
-              :data="item.list"
+              </el-table-column>
-              stripe
+              <el-table-column prop="dept" label="能力来源" align="center" width="300" show-overflow-tooltip="true">
-              :header-cell-style="{ 'text-align': 'center' }"
+              </el-table-column>
-            >
+              <el-table-column prop="platform" label="申请平台" align="center" width="100" show-overflow-tooltip="true">
-              <el-table-column
+              </el-table-column>
-                prop="name"
-                label="数据"
-                align="center"
-                width="200"
-                show-overflow-tooltip="true"
-              ></el-table-column>
-              <el-table-column
-                prop="dept"
-                label="能力来源"
-                align="center"
-                width="300"
-                show-overflow-tooltip="true"
-              ></el-table-column>
-              <el-table-column
-                prop="platform"
-                label="申请平台"
-                align="center"
-                width="100"
-                show-overflow-tooltip="true"
-              ></el-table-column>
             </el-table>
           </div>
         </div>
@@ -136,12 +90,7 @@
       </div>
       <div class="flex-row-center step-content">
         <el-steps direction="vertical" :space="150" :active="step.length">
-          <el-step
+          <el-step v-for="(item, i) in step" :key="i" :title="item.question" :description="item.answer"></el-step>
-            v-for="(item, i) in step"
-            :key="i"
-            :title="item.question"
-            :description="item.answer"
-          ></el-step>
         </el-steps>
       </div>
     </div>
@@ -155,6 +104,7 @@
 import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
 import HomeFooter from '@/views/newHome/components/Footer'
 import HomeHeader from '@/views/home/components/header'
+import detailBack from '@/views/home/detailBack.vue'
 import { ref, onMounted, onBeforeUnmount } from 'vue'
 import { useRouter } from 'vue-router'
 import { getIntegrationDetail } from '@/api/home'
@@ -265,6 +215,14 @@
   mybus.emit('flyToView', selectNow.value)
 }
 
+const getAttrValue = (fuseAttrList, data, text) => {
+  let _obj = fuseAttrList.find((v) => v.attrType === text) || {};
+  data =
+    JSON.parse(
+      _obj.attrValue || '[]'
+    ) || []
+}
+
 // 融合服务--详情
 const getIntegrationServicesDeatil = (id) => {
   getIntegrationDetail(id).then(
@@ -283,18 +241,9 @@
         attrType: '常见问题',
         attrValue: questionValue.attrValue || '[]',
       }
-        painPoint.value =
+      getAttrValue(fuseAttrList, painPoint.value, '场景痛点');
-          JSON.parse(
+      getAttrValue(fuseAttrList, solution.value, '解决方案');
-            fuseAttrList.find((v) => v.attrType === '场景痛点').attrValue
+      getAttrValue(fuseAttrList, step.value, '使用步骤');
-          ) || []
-        solution.value =
-          JSON.parse(
-            fuseAttrList.find((v) => v.attrType === '解决方案').attrValue
-          ) || []
-        step.value =
-          JSON.parse(
-            fuseAttrList.find((v) => v.attrType === '使用步骤').attrValue
-          ) || []
       bgImg.value =
         fuseAttrList.find((v) => v.attrType === '服务图片').attrValue || ''
       let areaObj = {
@@ -498,11 +447,9 @@
       height: 1.5rem;
       width: 6.2rem;
       border-radius: 0.2rem;
-        background: linear-gradient(
+      background: linear-gradient(to right,
-          to right,
           rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
+          rgba(148, 163, 252, 0.4));
-        );
       padding: 0 0.3rem;
       display: flex;
       justify-content: center;
@@ -538,6 +485,7 @@
 .pain-point {
   padding: 0.8rem 0;
   background: rgb(247, 248, 250);
+
   .bg {
     height: 3rem;
     width: 3rem;
@@ -545,17 +493,20 @@
     // background-size: 100%;
     margin-top: 0.3rem;
   }
+
   .cjtd {
     width: 5.75rem;
     height: 3.4rem;
     background: url('~@/assets/home/fn/cjtd.png') no-repeat;
     background-size: 100%;
   }
+
   .content {
     overflow: auto;
     height: 3rem;
     width: 7rem;
     margin-top: 0.3rem;
+
     .content-item {
       font-size: 16px;
       margin: 0rem 0rem 0.1rem 0.1rem;
@@ -566,8 +517,10 @@
 .solution {
   padding: 0.8rem 0;
   background: rgb(247, 248, 250);
+
   .content {
     width: 11rem;
+
     .content-item {
       font-size: 16px;
       margin: 0.3rem;
@@ -578,18 +531,22 @@
 .step {
   padding: 0.8rem 0;
   background: rgb(247, 248, 250);
+
   .step-content {
     margin: 0.3rem 4.5rem;
     padding: 0.3rem;
     background: #fff;
+
     :deep(.el-step__description.is-finish) {
       color: #333;
       line-height: 0.24rem;
       margin-top: 0.05rem;
     }
+
     /deep/ .el-step__title {
       font-size: 18px;
     }
+
     /deep/ .el-step__description {
       font-size: 14px;
     }
@@ -608,38 +565,49 @@
     margin-top: 0.3rem;
     align-items: flex-start;
     border-bottom: 1px solid #ccc;
-      margin: 0.2rem 4rem 0;
+    margin: 0.2rem 3.5rem 0;
     padding: 0.2rem 0;
+
     .title {
       height: 3rem;
       width: 3rem;
-        margin-right: 0.5rem;
+      margin-right: 0.4rem;
       background: url('~@/assets/home/rhfw_square.png') no-repeat;
-        background-size: 100%;
+      background-size: 100% 100%;
     }
+
     .title0 {
       width: 5.6rem;
       height: 3.45rem;
       background: url('~@/assets/home/fn/jcss.png') no-repeat;
-        background-size: 100%;
+      background-size: 100% 100%;
     }
+
     .title1 {
       width: 5.6rem;
       height: 3.45rem;
       background: url('~@/assets/home/fn/zjfw.png') no-repeat;
-        background-size: 100%;
+      background-size: 100% 100%;
     }
+
     .title2 {
       width: 5.6rem;
       height: 3.45rem;
       background: url('~@/assets/home/fn/sjzy.png') no-repeat;
-        background-size: 100%;
+      background-size: 100% 100%;
     }
+    .table-box {
+      height: 3.45rem;
+      flex: 1;
+      overflow-y: auto;
+    }
+
     .table {
-        width: 100%;
+      // width: 100%;
       font-size: 16px;
     }
   }
+
   .name-box {
     display: flex;
     flex-direction: row;

front/src/views/home/latestAbility.vue

@@ -35,6 +35,8 @@
   import { useRouter } from 'vue-router'
   import { ref } from 'vue'
   import { selectNewest } from '@/api/home'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
   export default {
     name: 'latestAbility',
     components: {},
@@ -45,7 +47,8 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            select: '组件服务',
+            // select: '组件服务',
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
       }

front/src/views/home/packagingDetails.vue

@@ -2,6 +2,7 @@
   <!-- 青岛 -->
   <div class="details-pageconetent">
     <home-header></home-header>
+    <detail-back></detail-back>
     <div class="content-box" v-loading="loadingPage">
       <div class="package-title">打包模式</div>
       <div class="basic-info">
@@ -70,6 +71,7 @@ import { message } from 'ant-design-vue'
 import { getIntegrationDetail } from '@/api/home'
 import HomeHeader from '@/views/home/components/header'
 import { scInsert, scDel } from '@/api/personalCenter'
+import detailBack from '@/views/home/detailBack.vue'
 
 const router = useRouter()
 const id = router.currentRoute.value.query.id
@@ -110,7 +112,6 @@ const getIntegrationServicesDeatil = (id) => {
       }
       detailInfoObj.value = res.data.data || {}
       console.log('detailInfoObj------------>', detailInfoObj);
-
       let fuseResourceList = detailInfoObj.value.fuseResourceList || []
       abilityList.value.map(v => {
         let list = fuseResourceList.filter(x => x.type == v.name) || [];
@@ -197,7 +198,6 @@ const addCollect = () => {
         }
       })
         .catch(err => {
-          console.log('err------------>', err);
           message.success(err)
         })
     } else {
@@ -216,16 +216,13 @@ const addCollect = () => {
         }
       })
         .catch(err => {
-          console.log('err------------>', err);
           message.success(err)
         })
     }
   }
 }
-
 getIntegrationServicesDeatil(id)
 
-
 </script>
 <style lang="less" scoped>
 .flex-row-start {

front/src/views/home/videoSurveillance/index.vue

@@ -252,7 +252,7 @@
       // 初始化地址匹配服务
       initAddressMatchService() {
         this.L = window.L || {}
-        this.addressMatchService = L.supermap.addressMatchService(
+        this.addressMatchService = L.supermap && L.supermap.addressMatchService && L.supermap.addressMatchService(
           this.addressMatchUrl
         )
       },

front/src/views/instructionManual/components/abilityDocTree.vue

@@ -26,7 +26,7 @@ import {
   ref,
   watch,
   defineProps,
-  nextTick,
+  defineEmits,
 } from 'vue'
 import { getDevelopDocTree } from '@/api/home'
 import { message } from 'ant-design-vue'

front/src/views/instructionManual/components/menuBook.vue

@@ -118,6 +118,7 @@
   import TheOverallProcess from './TheOverallProcess.vue'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const router = useRouter()
   const seviceList = ref([
     {
@@ -255,7 +256,8 @@
       const newpage = router.resolve({
         path: '/DetailsPageconetent',
         query: {
-          select: '组件服务',
+          // select: '组件服务',
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
         },
       })
       window.location.href = newpage.href

front/src/views/instructionManual/index.vue

@@ -3,24 +3,41 @@
   <div class="menu-container">
     <div id="container" class="content-menu">
       <div class="left">
-        <div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
+        <div
-          @click="changeName({ name: '技术文档' })">
+          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"
+        <abilityDocTree
-          :clickData="clickData"></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' : '' }"
+      <div
-        @click="changeName({ name: '使用手册' })">
+        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>
       </div>
 
       <!-- 技术文档 -->
       <div class="right" v-if="titleData.name !== '使用手册'">
         <div style="height: 100%">
-          <iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
+          <iframe
-            :src="doc_base_url + clickData.doc"></iframe>
+            name="iframeName"
+            width="1300"
+            height="100%"
+            id="iframeId"
+            :frameborder="0"
+            :src="doc_base_url + clickData.doc"
+          ></iframe>
         </div>
       </div>
     </div>
@@ -137,6 +154,10 @@ const getFirstData = (firstObj = {}) => {
 onMounted(() => {
   getTreeData()
 })
+
+const downloadEvt = (url = '') => {
+  window.open('/static/download/通用能力服务平台UCS用户手册-v3.5.docx', '_self')
+}
 </script>
 
 <style scoped lang="less">
@@ -192,7 +213,7 @@ onMounted(() => {
   top: 300px;
   right: 205px;
   width: 74px;
-  height: 136px;
+  height: 170px;
   background: url('~@/assets/menu/new-bg.png') no-repeat;
   background-size: 100% 100%;
   display: flex;
@@ -208,6 +229,8 @@ onMounted(() => {
   word-wrap: break-word;
   font-size: 20px;
   color: #0058e1;
+  height: 136px;
+  margin-bottom: 4px;
 }
 
 .right {

front/src/views/login/index.vue

@@ -15,22 +15,16 @@
               </a-input>
             </a-form-item>
             <a-form-item>
-              <a-input
+              <a-input v-model:value="form.password" type="password" placeholder="Password">
-                v-model:value="form.password"
-                type="password"
-                placeholder="Password"
-              >
                 <template v-slot:prefix>
                   <LockOutlined style="color: rgba(0, 0, 0, 0.25)" />
                 </template>
               </a-input>
             </a-form-item>
             <a-form-item>
-              <a-button
+              <!-- IE Chrome  || judgeAgent() !== 'Chrome'-->
-                type="primary"
+              <a-button type="primary" html-type="submit"
-                html-type="submit"
+                :disabled="form.username === '' || form.password === '' || !canOpen.includes(judgeAgent())">
-                :disabled="form.username === '' || form.password === ''"
-              >
                 登录
               </a-button>
             </a-form-item>
@@ -46,7 +40,7 @@
 import { mapActions, mapGetters } from 'vuex'
 import { Encrypt } from '@/utils/crypto'
 import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
-  import { message } from 'ant-design-vue'
+import { message, Modal } from 'ant-design-vue'
 
 export default {
   name: 'Login',
@@ -63,6 +57,9 @@
       redirect: undefined,
       dependencies: dependencies,
       devDependencies: devDependencies,
+      is360: false,
+      isIE: false,
+      canOpen: ['FF', 'Chrome']
     }
   },
   computed: {
@@ -82,14 +79,52 @@
   mounted() {
     this.form.username = ''
     this.form.password = ''
-      /*  setTimeout(() => {
+
-        this.handleSubmit()
+    if (!this.canOpen.includes(this.judgeAgent())) {
-      }, 3000) */
+      Modal.warning({
+        title: '提示',
+        content: '请使用谷歌或火狐浏览器！',
+      });
+    }
   },
   methods: {
     ...mapActions({
       login: 'user/login',
     }),
+    // 判断浏览器
+    judgeAgent() {
+      let userAgent = navigator.userAgent // 取得浏览器的userAgent字符串
+      console.log('userAgent------------>', userAgent);
+      let isOpera = userAgent.indexOf('Opera') > -1
+      //判断是否Opera浏览器
+      if (isOpera) {
+        return 'Opera'
+      }
+      //判断是否Firefox浏览器
+      if (userAgent.indexOf('Firefox') > -1) {
+        return 'FF'
+      }
+      //判断是否chorme浏览器
+      if (userAgent.indexOf('Chrome') > -1) {
+        return 'Chrome'
+      }
+      //判断是否Safari浏览器
+      if (userAgent.indexOf('Safari') > -1) {
+        return 'Safari'
+      }
+      //判断是否IE浏览器
+      if (
+        userAgent.indexOf('compatible') > -1 &&
+        userAgent.indexOf('MSIE') > -1 &&
+        !isOpera
+      ) {
+        return 'IE'
+      }
+      //判断是否Edge浏览器
+      if (userAgent.indexOf('Trident') > -1) {
+        return 'Edge'
+      }
+    },
     handleRoute() {
       return this.redirect === '/404' || this.redirect === '/403'
         ? '/home'
@@ -124,6 +159,7 @@
   height: 100vh;
   background: url('~@/assets/login_images/login_background.png');
   background-size: cover;
+
   &-form {
     width: calc(100% - 40px);
     height: 380px;
@@ -136,15 +172,18 @@
     border-radius: 10px;
     box-shadow: 0 2px 8px 0 rgba(7, 17, 27, 0.06);
   }
+
   &-hello {
     font-size: 32px;
     color: #fff;
   }
+
   &-title {
     margin-bottom: 30px;
     font-size: 20px;
     color: #fff;
   }
+
   &-tips {
     position: fixed;
     bottom: @vab-margin;
@@ -153,13 +192,16 @@
     color: rgba(255, 255, 255, 0.856);
     text-align: center;
   }
+
   .ant-col {
     width: 100%;
     padding: 0 10px 0 10px;
   }
+
   .ant-input {
     height: 35px;
   }
+
   .ant-btn {
     width: 100%;
     height: 45px;

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

@@ -79,7 +79,11 @@
           <a-list-item>
             <a-list-item-meta description="">
               <template #title>
-                <div class="left" @click="read(item)">
+                <div
+                  class="left"
+                  @click="read(item)"
+                  :class="item.readStatus === 1 ? '' : 'pointer'"
+                >
                   {{ item.content }}
                 </div>
                 <div class="right">{{ '发布时间：' + item.senderDate }}</div>
@@ -217,14 +221,12 @@
     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) {
         message.success('操作成功！')
@@ -304,6 +306,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .left {
       display: flex;
       .item {
@@ -365,6 +368,7 @@
     padding: 0.14rem 3.1rem 0;
     display: flex;
     justify-content: space-between;
+
     .left {
       display: flex;
       align-items: center;
@@ -421,8 +425,8 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+
         .left {
-            cursor: pointer;
           width: 9.2rem;
           max-height: 0.43rem;
           overflow: hidden;
@@ -432,6 +436,9 @@
           -webkit-box-orient: vertical;
           word-break: break-all;
         }
+        .pointer {
+          cursor: pointer;
+        }
         .left:hover {
           color: #0058e1;
         }

front/src/views/newHome/components/LatestCapabilities.vue

@@ -32,6 +32,7 @@
   import { ref } from 'vue'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   const productServiceData = ref([])
@@ -76,7 +77,8 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }

front/src/views/newHome/components/PopularAbility.vue

@@ -61,6 +61,7 @@
   import { pageWithAttrs } from '@/api/home.js'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   const select = ref('浏览量')
@@ -134,11 +135,11 @@
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
-    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }

front/src/views/newHome/components/RecommendationAbility.vue

@@ -47,6 +47,7 @@
   import { selectRecommend } from '@/api/home.js'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   let dataList = ref([])
@@ -94,7 +95,7 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }

front/src/views/newHome/components/WorkDynamics.vue

@@ -255,24 +255,14 @@
   const toView = () => {
     window.open(newpage.href, '_blank')
   }
-  // const toApply = () => {
+  
-  //   window.open(applypage.href, '_blank')
-  // }
   getList()
-  // dataList.value.map((item, index) => {
+ 
-  //   dataList.value[index].tupian = tupain.value[index]
-  //   console.log('item', item, dataList.value)
-  // })
   function jumpPage() {
-    // 点击内存入store
-    // store.commit('WorkDynList', {
-    //   selectCardsnum: '组件服务',
-    // })
     console.log(
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
-    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/WorkDynList',
     })