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.$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

@@ -13,62 +13,56 @@
   </div>
 </template>
 <script setup>
-  import zhCN from 'ant-design-vue/es/locale/zh_CN'
+import zhCN from 'ant-design-vue/es/locale/zh_CN'
-  import Cookies from 'js-cookie'
+import Cookies from 'js-cookie'
-  import { onBeforeUnmount } from 'vue'
+import { onBeforeUnmount } from 'vue'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  const router = useRouter()
+const router = useRouter()
 
-  // export default {
+const locale = zhCN
-  //   name: 'App',
+const token = Cookies.get('ucsToken')
-  //   data() {
+console.log('token=================>', token)
-  //     return {
+let ws = new WebSocket(
-  //       ,
+  `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
-  //     }
+)
-  //   },
+// ws.send()给服务器发送信息
-  // }
+// 服务器每次返回信息都会执行一次onmessage方法
-  const locale = zhCN
+ws.onmessage = function (e) {
-  const token = Cookies.get('ucsToken')
+  console.log('WebSocket服务器返回的信息: ' + e.data)
-  console.log('token=================>', token)
+  mybus.emit('getMynotice')
-  let ws = new WebSocket(
+  // 判断当前路由是否是消息中心
+  if (router.currentRoute.value.name === 'mynoticeView') {
+    mybus.emit('noticeListInit')
+  }
+}
+ws.onerror = function (e) {
+  console.log('WebSocket连接异常============================>', e)
+  ws = new WebSocket(
     `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
   )
-  // ws.send()给服务器发送信息
+}
-  // 服务器每次返回信息都会执行一次onmessage方法
+ws.onclose = function (e) {
-  ws.onmessage = function (e) {
+  console.log('WebSocket连接断开============================>', e)
-    console.log('WebSocket服务器返回的信息: ' + e.data)
+}
-    mybus.emit('getMynotice')
+onBeforeUnmount(() => {
-    // 判断当前路由是否是消息中心
+  // 4.卸载前, 关闭链接
-    if (router.currentRoute.value.name === 'mynoticeView') {
+  ws.close()
-      mybus.emit('noticeListInit')
+})
-    }
-  }
-  ws.onerror = function (e) {
-    console.log('WebSocket连接异常============================>', e)
-    ws = new WebSocket(
-      `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
-    )
-  }
-  ws.onclose = function (e) {
-    console.log('WebSocket连接断开============================>', e)
-  }
-  onBeforeUnmount(() => {
-    // 4.卸载前, 关闭链接
-    ws.close()
-  })
 </script>
 <style lang="less">
-  @import '~@/vab/styles/vab.less';
+@import '~@/vab/styles/vab.less';
-  #vue-admin-beautiful {
+
-    max-width: 1920px;
+#vue-admin-beautiful {
-    // max-height: 1080px;
+  max-width: 1920px;
-    margin: auto;
+  // max-height: 1080px;
-    height: 100%;
+  margin: auto;
-    position: relative;
+  height: 100%;
-    background-color: #fff;
+  position: relative;
-  }
+  background-color: #fff;
-  body {
+}
-    font-size: 0.14rem;
+
-  }
+body {
+  font-size: 0.14rem;
+}
 </style>

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) {
+      // else if (item.name === '部门联系人') {
-          getUserInfo().then(({ data: res1 }) => {
+      //   if (!item.note1) {
-            console.log(res1.data)
+      //     getUserInfo().then(({ data: res1 }) => {
-            item.note1 = res1.data.realName || ''
+      //       console.log(res1.data)
-          })
+      //       item.note1 = res1.data.realName || ''
-          data.value.list.push(item)
+      //     })
-        } else {
+      //     data.value.list.push(item)
-          data.value.list.push(item)
+      //   } else {
-        }
+      //     data.value.list.push(item)
-      } else if (item.name === '部门联系人电话') {
+      //   }
-        if (!item.note1) {
+      // } else if (item.name === '部门联系人电话') {
-          getUserInfo().then(({ data: res1 }) => {
+      //   if (!item.note1) {
-            console.log(res1.data)
+      //     getUserInfo().then(({ data: res1 }) => {
-            item.note1 = res1.data.mobile || ''
+      //       console.log(res1.data)
-          })
+      //       item.note1 = res1.data.mobile || ''
-          data.value.list.push(item)
+      //     })
-        } else {
+      //     data.value.list.push(item)
-          data.value.list.push(item)
+      //   } else {
-        }
+      //     data.value.list.push(item)
-      } else if (item.name === '来源应用') {
+      //   }
+      // } 
+      else if (item.name === '来源应用') {
         queryApplicationRelByResourceId({
           referenceId: 0,
         }).then((res) => {
@@ -1119,290 +1121,290 @@
 </script>
 <style></style>
 <style lang="less" scoped>
-  .put-on-the-shelf {
+.put-on-the-shelf {
-    height: 6.8rem;
+  height: 6.8rem;
-    overflow: scroll;
+  overflow: scroll;
-    display: flex;
+  display: flex;
-    flex-direction: column;
+  flex-direction: column;
-    align-items: center;
+  align-items: center;
-    padding: 0.5rem 1rem 0.25rem;
+  padding: 0.5rem 1rem 0.25rem;
-    .Technical-text {
+  .Technical-text {
-      height: 0.3rem;
+    height: 0.3rem;
-      width: 1rem;
+    width: 1rem;
-      border: 0.01rem solid #bbd3ef;
+    border: 0.01rem solid #bbd3ef;
-      border-radius: 0.06rem;
+    border-radius: 0.06rem;
-      background: #edf4fc;
+    background: #edf4fc;
-      color: #0087ff;
+    color: #0087ff;
-      font-size: 0.14rem;
+    font-size: 0.14rem;
-      text-align: center;
+    text-align: center;
-      line-height: 0.3rem;
+    line-height: 0.3rem;
-    }
+  }
-    .Technical-text:hover {
+  .Technical-text:hover {
-      cursor: pointer;
+    cursor: pointer;
-    }
+  }
 
-    & > div {
+  & > div {
-      width: 100%;
+    width: 100%;
-      margin-top: 0.6rem;
+    margin-top: 0.6rem;
 
-      .top {
+    .top {
-        color: #333333;
+      color: #333333;
-        font-size: 0.22rem;
+      font-size: 0.22rem;
-        display: flex;
+      display: flex;
-        justify-content: center;
+      justify-content: center;
-        align-items: center;
+      align-items: center;
-        margin-bottom: 0.25rem;
+      margin-bottom: 0.25rem;
 
-        div:first-child,
+      div:first-child,
-        div:last-child {
+      div:last-child {
-          width: 2.45rem;
+        width: 2.45rem;
-          height: 0.01rem;
+        height: 0.01rem;
-          background: #f0f0f0;
+        background: #f0f0f0;
-        }
-
-        div:nth-child(2) {
-          margin: 0 0.3rem;
-        }
       }
 
-      .bottom {
+      div:nth-child(2) {
-        margin-top: 0.25rem;
+        margin: 0 0.3rem;
+      }
+    }
 
-        .items {
+    .bottom {
-          background: #fafafa;
+      margin-top: 0.25rem;
-          padding: 0.1rem;
 
-          p {
+      .items {
-            display: flex;
+        background: #fafafa;
-            justify-content: space-between;
+        padding: 0.1rem;
 
-            span:nth-of-type(1) {
+        p {
-              width: 2rem;
+          display: flex;
-            }
+          justify-content: space-between;
 
-            span:nth-of-type(2) {
+          span:nth-of-type(1) {
-              width: 100%;
+            width: 2rem;
-              font-weight: 600;
-            }
           }
 
-          p:nth-of-type(1) > span:nth-of-type(1) {
+          span:nth-of-type(2) {
-            font-size: 0.18rem;
+            width: 100%;
             font-weight: 600;
           }
         }
 
-        .add {
+        p:nth-of-type(1) > span:nth-of-type(1) {
-          cursor: pointer;
+          font-size: 0.18rem;
-          margin-top: 0.1rem;
+          font-weight: 600;
-          font-size: 0.16rem;
-          color: #007efb;
-        }
-
-        .form {
-          margin-top: 0.2rem;
-          display: flex;
-          justify-content: flex-start;
-          align-items: center;
-
-          span:first-child {
-            width: 1.2rem;
-          }
-
-          :deep(.ant-input-textarea) {
-            width: 5.2rem;
-          }
-
-          :deep(.ant-radio-group) {
-            width: 5.2rem;
-          }
-
-          :deep(.ant-input-number) {
-            width: 2rem;
-          }
-
-          :deep(.ant-input) {
-            resize: none;
-            width: 5.2rem;
-          }
-
-          .ant-btn {
-            width: 1.6rem;
-            height: 0.32rem;
-            text-align: center;
-            background: #edf4fc;
-            color: #0087ff;
-            border: 0.01rem solid #bbd3ef;
-            border-radius: 0.06rem;
-          }
-        }
-
-        .submit {
-          margin-top: 0.4rem;
-          font-size: 0.14rem;
-          display: flex;
-          justify-content: flex-end;
-
-          .ant-btn {
-            width: 1.8rem;
-            height: 0.3rem;
-            text-align: center;
-            background: #d9ebff;
-            color: #0087ff;
-            border: 0.01rem solid #0087ff;
-            border-radius: 0.06rem;
-          }
         }
       }
-    }
 
-    & > div:nth-of-type(1) {
+      .add {
-      margin-top: 0;
+        cursor: pointer;
-    }
+        margin-top: 0.1rem;
-  }
+        font-size: 0.16rem;
+        color: #007efb;
+      }
 
-  .application-Area {
+      .form {
-    width: 5.2rem;
+        margin-top: 0.2rem;
-    display: grid;
-    margin-top: -0.05rem;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
-
-    .application-Area-son {
-      cursor: pointer;
-      font-size: 0.14rem;
-      width: 0.9rem;
-      height: 0.26rem;
-      border-radius: 0.13rem;
-      color: #333333;
-      background: #f5f5f5;
-      border: 0.01rem #cccccc solid;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-top: 0.1rem;
-      font-weight: 500;
-    }
-
-    .application-Area-down {
-      background: #0087ff;
-      color: #fff;
-    }
-  }
-
-  :deep(.ant-image-img) {
-    width: 100%;
-    height: 100%;
-    object-fit: contain;
-  }
-
-  :deep(.ant-modal) {
-    width: 9.6rem;
-  }
-
-  :deep(.ant-transfer-list) {
-    width: 39.5%;
-    height: 5.2rem;
-  }
-
-  :deep(.ant-transfer-operation) {
-    flex-direction: row-reverse;
-    margin: 0 0.3rem;
-  }
-
-  :deep(.ant-btn) {
-    width: 0.56rem;
-    height: 0.4rem;
-    border-radius: 0.04rem;
-  }
-
-  :deep(.ant-btn:first-child) {
-    margin-left: 0.04rem;
-  }
-
-  :deep(.ant-modal-footer) {
-    border: 0;
-  }
-
-  :deep(.ant-modal-header) {
-    border: 0;
-  }
-
-  :deep(.ant-modal-title) {
-    line-height: 0.24rem;
-    font-size: 0.18rem;
-    color: #303133;
-  }
-
-  :deep(.ant-transfer-list-header) {
-    background: #f5f7fa;
-  }
-
-  :deep(.ant-transfer-list-header-selected) {
-    display: flex;
-    width: 90%;
-    flex-direction: row-reverse;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  :deep(.ant-transfer-list-header-title) {
-    font-size: 0.16rem;
-    color: #303133;
-    font-weight: 400;
-    text-align: left;
-  }
-  :deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
-    display: none !important;
-  }
-  :deep(.ant-upload-list-item-name) {
-    width: 1rem;
-  }
-
-  .del {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    font-size: 0.14rem;
-    margin-left: 0.2rem;
-
-    .delImg {
-      cursor: pointer;
-      display: inline-block;
-      width: 0.16rem;
-      height: 0.18rem;
-      background: url(~@/assets/home/sf_del.png) no-repeat;
-      margin-right: 0.05rem;
-    }
-
-    div {
-      cursor: pointer;
-    }
-  }
-  .item {
-    position: relative;
-    span:first-child {
-      width: unset;
-    }
-    .box {
-      display: flex;
-      align-items: center;
-      // margin: 15px 0;
-      & > div:nth-of-type(1) {
-        width: 105px;
         display: flex;
+        justify-content: flex-start;
         align-items: center;
+
+        span:first-child {
+          width: 1.2rem;
+        }
+
+        :deep(.ant-input-textarea) {
+          width: 5.2rem;
+        }
+
+        :deep(.ant-radio-group) {
+          width: 5.2rem;
+        }
+
+        :deep(.ant-input-number) {
+          width: 2rem;
+        }
+
+        :deep(.ant-input) {
+          resize: none;
+          width: 5.2rem;
+        }
+
+        .ant-btn {
+          width: 1.6rem;
+          height: 0.32rem;
+          text-align: center;
+          background: #edf4fc;
+          color: #0087ff;
+          border: 0.01rem solid #bbd3ef;
+          border-radius: 0.06rem;
+        }
       }
-      .required {
+
-        color: #f56c6c;
+      .submit {
-        margin-right: 3px;
+        margin-top: 0.4rem;
+        font-size: 0.14rem;
+        display: flex;
+        justify-content: flex-end;
+
+        .ant-btn {
+          width: 1.8rem;
+          height: 0.3rem;
+          text-align: center;
+          background: #d9ebff;
+          color: #0087ff;
+          border: 0.01rem solid #0087ff;
+          border-radius: 0.06rem;
+        }
       }
     }
-    .requiredTips {
-      font-size: 14px;
-      color: #f56c6c;
-      position: absolute;
-      bottom: -20px;
-      left: 110px;
-    }
   }
+
+  & > div:nth-of-type(1) {
+    margin-top: 0;
+  }
+}
+
+.application-Area {
+  width: 5.2rem;
+  display: grid;
+  margin-top: -0.05rem;
+  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+
+  .application-Area-son {
+    cursor: pointer;
+    font-size: 0.14rem;
+    width: 0.9rem;
+    height: 0.26rem;
+    border-radius: 0.13rem;
+    color: #333333;
+    background: #f5f5f5;
+    border: 0.01rem #cccccc solid;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 0.1rem;
+    font-weight: 500;
+  }
+
+  .application-Area-down {
+    background: #0087ff;
+    color: #fff;
+  }
+}
+
+:deep(.ant-image-img) {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+:deep(.ant-modal) {
+  width: 9.6rem;
+}
+
+:deep(.ant-transfer-list) {
+  width: 39.5%;
+  height: 5.2rem;
+}
+
+:deep(.ant-transfer-operation) {
+  flex-direction: row-reverse;
+  margin: 0 0.3rem;
+}
+
+:deep(.ant-btn) {
+  width: 0.56rem;
+  height: 0.4rem;
+  border-radius: 0.04rem;
+}
+
+:deep(.ant-btn:first-child) {
+  margin-left: 0.04rem;
+}
+
+:deep(.ant-modal-footer) {
+  border: 0;
+}
+
+:deep(.ant-modal-header) {
+  border: 0;
+}
+
+:deep(.ant-modal-title) {
+  line-height: 0.24rem;
+  font-size: 0.18rem;
+  color: #303133;
+}
+
+:deep(.ant-transfer-list-header) {
+  background: #f5f7fa;
+}
+
+:deep(.ant-transfer-list-header-selected) {
+  display: flex;
+  width: 90%;
+  flex-direction: row-reverse;
+  justify-content: space-between;
+  align-items: center;
+}
+
+:deep(.ant-transfer-list-header-title) {
+  font-size: 0.16rem;
+  color: #303133;
+  font-weight: 400;
+  text-align: left;
+}
+:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
+  display: none !important;
+}
+:deep(.ant-upload-list-item-name) {
+  width: 1rem;
+}
+
+.del {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  font-size: 0.14rem;
+  margin-left: 0.2rem;
+
+  .delImg {
+    cursor: pointer;
+    display: inline-block;
+    width: 0.16rem;
+    height: 0.18rem;
+    background: url(~@/assets/home/sf_del.png) no-repeat;
+    margin-right: 0.05rem;
+  }
+
+  div {
+    cursor: pointer;
+  }
+}
+.item {
+  position: relative;
+  span:first-child {
+    width: unset;
+  }
+  .box {
+    display: flex;
+    align-items: center;
+    // margin: 15px 0;
+    & > div:nth-of-type(1) {
+      width: 105px;
+      display: flex;
+      align-items: center;
+    }
+    .required {
+      color: #f56c6c;
+      margin-right: 3px;
+    }
+  }
+  .requiredTips {
+    font-size: 14px;
+    color: #f56c6c;
+    position: absolute;
+    bottom: -20px;
+    left: 110px;
+  }
+}
 </style>

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

@@ -44,214 +44,227 @@
 </template>
 
 <script setup>
-  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-  import { ref, defineProps, watch } from 'vue'
+import { ref, defineProps, watch } from 'vue'
-  const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png')
+const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png')
-  const dataFromLeft = ref({
+const dataFromLeft = ref({
-    content: [
+  content: [
-      {
+    {
-        type: '服务类型',
+      type: '服务类型',
-        values: '',
+      values: '',
-      },
+    },
-      {
+    {
-        type: '覆盖区域',
+      type: '覆盖区域',
-        values: '',
+      values: '',
-      },
+    },
-      {
+    {
-        type: '切片策略',
+      type: '切片策略',
-        values: '',
+      values: '',
-      },
+    },
-    ],
+  ],
-  })
+})
-  const dataFromCenter = ref({
+const dataFromCenter = ref({
-    content: [
+  content: [
-      {
+    {
-        type: '坐标系',
+      type: '坐标系',
-        values: '',
+      values: '',
-      },
+    },
-      {
+    {
-        type: '切片尺寸',
+      type: '切片尺寸',
-        values: '',
+      values: '',
-      },
+    },
-      {
+    {
-        type: '最小级别',
+      type: '最小级别',
-        values: '',
+      values: '',
-      },
+    },
-    ],
+  ],
-  })
+})
-  const dataFromRight = ref({
+const dataFromRight = ref({
-    content: [
+  content: [
-      {
+    {
-        type: '图层名称',
+      type: '图层名称',
-        values: '',
+      values: '',
-      },
+    },
-      {
+    {
-        type: '最大级别',
+      type: '最大级别',
-        values: '',
+      values: '',
-      },
+    },
-    ],
+  ],
-  })
+})
-  //数据初始化
+//数据初始化
-  const props = defineProps({
+const props = defineProps({
-    dataList: { type: Object, default: null },
+  dataList: { type: Object, default: null },
-  })
+})
-  const flag = ref(true)
+const flag = ref(true)
-  if (props.dataList.infoList) {
+if (props.dataList.infoList) {
-    let obj = props.dataList.infoList.filter(
+  let obj = props.dataList.infoList.filter(
-      (item) =>
+    (item) =>
-        item.attrType === '服务类型' ||
+      item.attrType === '服务类型' ||
-        item.attrType === '覆盖区域' ||
+      item.attrType === '覆盖区域' ||
-        item.attrType === '切片策略' ||
+      item.attrType === '切片策略' ||
-        item.attrType === '坐标系' ||
+      item.attrType === '坐标系' ||
-        item.attrType === '切片尺寸' ||
+      item.attrType === '切片尺寸' ||
-        item.attrType === '最小级别' ||
+      item.attrType === '最小级别' ||
-        item.attrType === '数据范围' ||
+      item.attrType === '数据范围' ||
-        item.attrType === '图层类型' ||
+      item.attrType === '图层类型' ||
-        item.attrType === '最大级别'
+      item.attrType === '最大级别'
-    )[0]
+  )[0]
-    if (!obj) {
+  if (!obj) {
-      flag.value = false
+    flag.value = false
-    } else {
+  } else {
-      // dataFrom.value.content[0].link.value = props.dataList.apiUrl
+    // dataFrom.value.content[0].link.value = props.dataList.apiUrl
-      // dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
+    // dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
-      console.log('dataList', props.dataList)
+    console.log('dataList', props.dataList)
-      props.dataList.infoList.map((item) => {
+    props.dataList.infoList.map((item) => {
-        if (item.attrType === '服务类型') {
+      handleInfoList(item)
-          dataFromLeft.value.content[0].values = item.attrValue || '123'
+    })
-        } else if (item.attrType === '覆盖区域') {
+  }
-          dataFromLeft.value.content[1].values = item.attrValue || '--'
+}
-        } else if (item.attrType === '切片策略') {
+const handleInfoList = (item) => {
-          dataFromLeft.value.content[2].values = item.attrValue || '--'
+  if (item.attrType === '服务类型') {
-        } else if (item.attrType === '坐标系') {
+    dataFromLeft.value.content[0].values = item.attrValue || '123'
-          dataFromCenter.value.content[0].values = item.attrValue || '--'
+  } else if (item.attrType === '覆盖区域') {
-        } else if (item.attrType === '切片尺寸') {
+    dataFromLeft.value.content[1].values = item.attrValue || '--'
-          dataFromCenter.value.content[1].values = item.attrValue || '--'
+  } else if (item.attrType === '切片策略') {
-        } else if (item.attrType === '最小级别') {
+    dataFromLeft.value.content[2].values = item.attrValue || '--'
-          dataFromCenter.value.content[2].values = item.attrValue || '--'
+  } else if (item.attrType === '坐标系') {
-        } else if (item.attrType === '数据范围') {
+    dataFromCenter.value.content[0].values = item.attrValue || '--'
-          dataFromRight.value.content[0].values = item.attrValue || '--'
+  } else if (item.attrType === '切片尺寸') {
-        } else if (item.attrType === '图层类型') {
+    dataFromCenter.value.content[1].values = item.attrValue || '--'
-          dataFromRight.value.content[1].values = item.attrValue || '--'
+  } else if (item.attrType === '最小级别') {
-        } else if (item.attrType === '最大级别') {
+    dataFromCenter.value.content[2].values = item.attrValue || '--'
-          dataFromRight.value.content[2].values = item.attrValue || '--'
+  } else if (item.attrType === '数据范围') {
-        }
+    dataFromRight.value.content[0].values = item.attrValue || '--'
-      })
+  } 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(
+}
-    () => props.dataList,
+watch(
-    (val) => {
+  () => props.dataList,
-      if (val) {
+  (val) => {
-        let obj = val.infoList.filter(
+    if (val) {
-          (item) =>
+      let obj = val.infoList.filter(
-            item.attrType === '服务类型' ||
+        (item) =>
-            item.attrType === '覆盖区域' ||
+          item.attrType === '服务类型' ||
-            item.attrType === '切片策略' ||
+          item.attrType === '覆盖区域' ||
-            item.attrType === '坐标系' ||
+          item.attrType === '切片策略' ||
-            item.attrType === '切片尺寸' ||
+          item.attrType === '坐标系' ||
-            item.attrType === '最小级别' ||
+          item.attrType === '切片尺寸' ||
-            item.attrType === '数据范围' ||
+          item.attrType === '最小级别' ||
-            item.attrType === '图层类型' ||
+          item.attrType === '数据范围' ||
-            item.attrType === '最大级别'
+          item.attrType === '图层类型' ||
-        )[0]
+          item.attrType === '最大级别'
-        if (!obj) {
+      )[0]
-          flag.value = false
+      if (!obj) {
-        } else {
+        flag.value = false
-          // dataFrom.value.content[0].link.value = val.apiUrl
+      } else {
-          // dataFrom.value.content[0].facilitator.value = val.deptContacts
+        console.log('dataList', val)
-          console.log('dataList', val)
+        val.infoList.map((item) => {
-          val.infoList.map((item) => {
+          handleInfoList(item)
-            if (item.attrType === '服务类型') {
+          // if (item.attrType === '服务类型') {
-              dataFromLeft.value.content[0].values = item.attrValue || '123'
+          //   dataFromLeft.value.content[0].values = item.attrValue || '123'
-            } else if (item.attrType === '覆盖区域') {
+          // } else if (item.attrType === '覆盖区域') {
-              dataFromLeft.value.content[1].values = item.attrValue || '--'
+          //   dataFromLeft.value.content[1].values = item.attrValue || '--'
-            } else if (item.attrType === '切片策略') {
+          // } else if (item.attrType === '切片策略') {
-              dataFromLeft.value.content[2].values = item.attrValue || '--'
+          //   dataFromLeft.value.content[2].values = item.attrValue || '--'
-            } else if (item.attrType === '坐标系') {
+          // } else if (item.attrType === '坐标系') {
-              dataFromCenter.value.content[0].values = item.attrValue || '--'
+          //   dataFromCenter.value.content[0].values = item.attrValue || '--'
-            } else if (item.attrType === '切片尺寸') {
+          // } else if (item.attrType === '切片尺寸') {
-              dataFromCenter.value.content[1].values = item.attrValue || '--'
+          //   dataFromCenter.value.content[1].values = item.attrValue || '--'
-            } else if (item.attrType === '最小级别') {
+          // } else if (item.attrType === '最小级别') {
-              dataFromCenter.value.content[2].values = item.attrValue || '--'
+          //   dataFromCenter.value.content[2].values = item.attrValue || '--'
-            } else if (item.attrType === '数据范围') {
+          // } else if (item.attrType === '数据范围') {
-              dataFromRight.value.content[0].values = item.attrValue || '--'
+          //   dataFromRight.value.content[0].values = item.attrValue || '--'
-            } else if (item.attrType === '图层类型') {
+          // } else if (item.attrType === '图层类型') {
-              dataFromRight.value.content[1].values = item.attrValue || '--'
+          //   dataFromRight.value.content[1].values = item.attrValue || '--'
-            } else if (item.attrType === '最大级别') {
+          // } else if (item.attrType === '最大级别') {
-              dataFromRight.value.content[2].values = item.attrValue || '--'
+          //   if (dataFromRight.value.content && dataFromRight.value.content[2]) {
-            }
+          //     dataFromRight.value.content[2].values = item.attrValue || '--'
-          })
+          //   }
-        }
+          // }
+        })
       }
     }
-  )
+  }
+)
 </script>
 
 <style lang="less" scoped>
-  .usage-mode {
+.usage-mode {
-    display: flex;
+  display: flex;
-    flex-direction: column;
+  flex-direction: column;
-    align-items: center;
+  align-items: center;
-    padding: 0.8rem 0;
+  padding: 0.8rem 0;
-    .content {
-      margin-top: 0.3rem;
-      display: flex;
-      .content-left {
-        height: 2.8rem;
-        width: 13rem;
-        background: url('~@/assets/detailsAll/layer-service/layer-bg.png');
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-        border-radius: 0.1rem;
-        box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
-        display: flex;
-        align-items: center;
-        padding: 0 0.35rem;
 
-        .content-left-content {
+  .content {
-          width: 100%;
+    margin-top: 0.3rem;
-          font-size: 0.2rem;
+    display: flex;
-          color: rgba(33, 41, 86, 0.8);
+
-          line-height: 0.2rem;
+    .content-left {
+      height: 2.8rem;
+      width: 13rem;
+      background: url('~@/assets/detailsAll/layer-service/layer-bg.png');
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+      border-radius: 0.1rem;
+      box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
+      display: flex;
+      align-items: center;
+      padding: 0 0.35rem;
+
+      .content-left-content {
+        width: 100%;
+        font-size: 0.2rem;
+        color: rgba(33, 41, 86, 0.8);
+        line-height: 0.2rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        ul {
+          padding: 0;
+          margin: 0;
+        }
+
+        ul li {
+          list-style: none;
           display: flex;
-          justify-content: space-between;
           align-items: center;
-          ul {
+          margin-bottom: 0.3rem;
-            padding: 0;
+          line-height: 0.25rem;
-            margin: 0;
+        }
-          }
+
-          ul li {
+        img {
-            list-style: none;
+          margin: 0 0.2rem 0 0;
-            display: flex;
+          width: 0.15rem;
-            align-items: center;
+          height: 0.15rem;
-            margin-bottom: 0.3rem;
+        }
-            line-height: 0.25rem;
+
-          }
+        span {
-          img {
+          font-size: 0.2rem;
-            margin: 0 0.2rem 0 0;
+          color: #666666;
-            width: 0.15rem;
+          display: block;
-            height: 0.15rem;
+          margin-right: 0.5rem;
-          }
+          width: 120px;
-          span {
+        }
-            font-size: 0.2rem;
+
-            color: #666666;
+        p {
-            display: block;
+          width: 2rem;
-            margin-right: 0.5rem;
+          margin-bottom: 0;
-            width: 120px;
+          font-size: 0.2rem;
-          }
+          color: #333333;
-          p {
+          display: -webkit-box;
-            width: 2rem;
+          overflow: hidden;
-            margin-bottom: 0;
+          -webkit-line-clamp: 1;
-            font-size: 0.2rem;
+          -webkit-box-orient: vertical;
-            color: #333333;
+          word-break: break-all;
-            display: -webkit-box;
-            overflow: hidden;
-            -webkit-line-clamp: 1;
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
         }
       }
     }
   }
+}
 </style>

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"
+          item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-        :key="index"
+            .attrValue
-        @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,68 +13,83 @@
   </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'
+import { useRouter } from 'vue-router'
-  const router = useRouter()
+const router = useRouter()
-  const props = defineProps({
+const props = defineProps({
-    resourceList: {
+  resourceList: {
-      type: Object,
+    type: Object,
-      default: () => {},
+    default: () => { },
-    },
+  },
-    selectCardsname: {
+  selectCardsname: {
-      type: String,
+    type: String,
-      default: '组件服务',
+    default: '组件服务',
+  },
+})
+const emits = defineEmits(['saveSearchCodition'])
+
+const caseList = ref([])
+
+onMounted(() => {
+  caseList.value = props.resourceList.data
+  console.log('caseList.value------------>', caseList.value);
+})
+onBeforeUnmount(() => { })
+function toView(item) {
+  emits('saveSearchCodition', 1)
+  router.push({
+    path: '/integrationServicesDetails',
+    query: {
+      id: item.id,
     },
   })
-  const caseList = ref([])
+}
 
-  onMounted(() => {
+watch(
-    caseList.value = props.resourceList.data
+  () => props.resourceList.data,
-    console.log(caseList.value, 'caseList.value')
+  (val) => {
-  })
+    if (val) {
-  onBeforeUnmount(() => {})
+      caseList.value = val
-  function toView(item) {
+    }
-    router.push({
-      path: '/integrationServicesDetails',
-      query: {
-        id: item.id,
-      },
-    })
   }
+)
 </script>
 <style lang="less" scoped>
-  .box {
+.box {
-    .CanCase {
+  .CanCase {
-      margin-top: 0.2rem;
+    margin-top: 0.2rem;
-      display: grid;
+    display: grid;
-      grid-template-columns: 33.33% 33.33% 33.33%;
+    grid-template-columns: 33.33% 33.33% 33.33%;
-      align-items: center;
+    align-items: center;
-      justify-items: center;
+    justify-items: center;
-      .caseBox {
+
-        width: 3.5rem;
+    .caseBox {
-        height: 3rem;
+      width: 3.5rem;
-        box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152);
+      height: 3rem;
-        background: #ffffff;
+      box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152);
-        border-radius: 0.05rem;
+      background: #ffffff;
-        padding: 0.2rem;
+      border-radius: 0.05rem;
-        margin-bottom: 0.2rem;
+      padding: 0.2rem;
-        cursor: pointer;
+      margin-bottom: 0.2rem;
-        img {
+      cursor: pointer;
-          width: 3rem;
+
-          height: 1.8rem;
+      img {
-        }
+        width: 3rem;
-        h3 {
+        height: 1.8rem;
-          font-size: 0.18rem;
+      }
-          font-weight: bold;
+
-          margin-top: 0.1rem;
+      h3 {
-        }
+        font-size: 0.18rem;
-        p {
+        font-weight: bold;
-          font-size: 0.16rem;
+        margin-top: 0.1rem;
-          color: #797979;
+      }
-        }
+
+      p {
+        font-size: 0.16rem;
+        color: #797979;
       }
     }
   }
+}
 </style>

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/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>
@@ -76,342 +43,357 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
+import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, 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'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
+import { message } from 'ant-design-vue'
 
-  import { getIntegrationServicesList } from '@/api/home.js'
+export default defineComponent({
-  import { useRouter } from 'vue-router'
+  beforeRouteLeave(to, from, next) {
-  import HomeHeader from '@/views/home/components/header'
+    console.log('to---integrationServices--beforeRouteLeave------->', to)
-  import searchResultList from '@/views/home/components/searchResultList.vue'
+    console.log('from---integrationServices--beforeRouteLeave------->', from)
-  import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
+    console.log('next---integrationServices--beforeRouteLeave------->', next)
-  import { message } from 'ant-design-vue'
+    if (to.name !== 'packagingDetails' && to.name !== 'integrationServicesDetails') {
-
+      localStorage.removeItem('integrationServices')
-  export default defineComponent({
+    }
-    setup() {
+    next()
-      // 分页
+  },
-      const loading = ref(true)
+  setup() {
-      const currentPage = ref(1)
+    // 分页
-      const currentPageSize = ref(5)
+    const loading = ref(true)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const currentPage = ref(1)
-      const router = useRouter()
+    const currentPageSize = ref(5)
-      const select = router.currentRoute.value.query.select
+    const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
-      const searchValue = ref('')
+    const router = useRouter()
-      const Cardsname = ref(select)
+    const select = router.currentRoute.value.query.select
-      const resourceList = reactive({ data: [] })
+    const searchValue = ref('')
-      const resourceTotal = ref(0)
+    const Cardsname = ref(select)
-      const current = ref(1)
+    const resourceList = reactive({ data: [] })
-      const loadingData = ref(false)
+    const resourceTotal = ref(0)
-      // 选项卡
+    const loadingData = ref(false)
-      const titleName = ref([
+    // 选项卡
-        {
+    const titleName = ref([
-          name: '打包模式',
+      {
-        },
+        name: '打包模式',
-        {
+      },
-          name: '赋能场景',
+      {
-        },
+        name: '赋能场景',
-      ])
+      },
-
+    ])
-      const number = ref(0)
+    const number = ref(0)
-      // 刷新筛选条件组件
+    // 查询参数
-      let listKey = ref(0)
+    const paramsGetResources = {
-      // 刷新筛选列表信息组件
+      page: currentPage.value,
-      const listKey2 = ref(0)
+      limit: currentPageSize.value,
-
+      type: titleName.value[number.value].name,
-      // 查询参数
+      name: searchValue.value,
-      const paramsGetResources = {
+      orderField: 'create_date',
-        pageNum: 1,
+      orderType: 'DESC', // ASC 升序  DESC 降序
-        pageSize: currentPageSize.value,
+    }
-        type: titleName.value[number.value].name,
+    const searchResultListDom = ref(null)
-        name: '',
+    const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
-        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+    // 读取本地存储：表单赋值
-        orderType: 'DESC', // ASC 升序  DESC 降序
+    const handleSetSearchData = () => {
-      }
+      if (storageSearchInfo) {
-
+        number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
-      const changeCards = (val) => {
+        // 搜索名称 
-        console.log(val)
+        searchValue.value = storageSearchInfo.name;
-        number.value = val
+        currentPage.value = storageSearchInfo.page;
-        chongzhi()
+        currentPageSize.value = storageSearchInfo.limit;
-      }
+        paramsGetResources.limit = storageSearchInfo.limit;
-
+        paramsGetResources.page = storageSearchInfo.page;
-      // 查询
+        paramsGetResources.type = storageSearchInfo.type;
-      const onSearch = () => {
+        // 延迟使用，因为还没有返回跟挂载
-        loading.value = true
+        nextTick(() => {
-        currentPage.value = 1
+          searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
-      }
+            value: storageSearchInfo.orderField,
-      // 重置数据
+            orderType: storageSearchInfo.orderType,
-      const chongzhi = () => {
+          }, true)
-        loading.value = true
-        // 重置模糊查字段
-        searchValue.value = ''
-        // 分页
-        currentPage.value = 1
-        currentPageSize.value = 5
-        // 重置查询条件
-        paramsGetResources.pageNum = 1
-        paramsGetResources.pageSize = 5
-        paramsGetResources.orderField = 'create_date'
-        paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi', {
-          type: titleName.value[number.value].name,
         })
-        getAppResources()
-      }
-
-      const getAppResources = () => {
         getIntegrationList()
       }
+    }
 
-      // 获取融合服务列表
+    const changeCards = (val) => {
-      const getIntegrationList = () => {
+      // 打包模式
-        loadingData.value = true
+      number.value = val;
-        console.log('获取融合服务列表------------>')
+      paramsGetResources.type = titleName.value[number.value].name;
-        let postData = {
+      resetAction()
-          limit: currentPageSize.value,
+    }
-          page: currentPage.value,
-          orderField: paramsGetResources.orderField,
-          orderType: paramsGetResources.orderType,
-          name: searchValue.value,
-          type: titleName.value[number.value].name,
-        }
-        getIntegrationServicesList(postData).then(
-          (res) => {
-            loadingData.value = false
-            if (res.data.code !== 0) {
-              return message.error(res.data.msg)
-            }
-            console.log('res.data------------>', res.data)
-
-            resourceList.data = res.data.data.list || []
-            resourceTotal.value = res.data.data.total || 0
-            listKey2.value++
-          },
-          (err) => {
-            loadingData.value = false
-            message.error(err)
-          }
-        )
-      }
-
-      mybus.on('paramsGetResources', (ids) => {
-        if (ids && ids.length > 0) {
-          paramsGetResources.deptIds = ids
-        } else {
-          delete paramsGetResources.deptIds
-        }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
-        getAppResources('分页查询')
-      })
-      mybus.on('changeSelcted', () => {
-        getAppResources()
-      })
-
-      mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        getAppResources()
-      })
-      mybus.on('changeCondition', (condition) => {
-        paramsGetResources.orderField = condition.orderField
-        paramsGetResources.orderType = condition.orderType
-        getAppResources()
-      })
-
-      const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
-        currentPage.value = val
-        paramsGetResources.pageNum = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
-      }
-
-      onMounted(() => {
-        console.log('222----onMounted-------->', 222)
-        listKey2.value++
-        getAppResources()
-      })
 
+    // 查询
+    const onSearch = () => {
+      currentPage.value = 1
+      getIntegrationList()
+    }
+    // 重置数据
+    const resetAction = () => {
+      // 重置模糊查字段
+      searchValue.value = ''
       // 分页
-      const onShowSizeChange = (current, pageSize) => {
+      currentPage.value = 1
-        currentPage.value = current
+      currentPageSize.value = 5
-        currentPageSize.value = pageSize
+      // 重置查询条件
-        paramsGetResources.pageNum = current
+      paramsGetResources.page = 1
-        paramsGetResources.pageSize = pageSize
+      paramsGetResources.limit = 5
-        getAppResources()
+      paramsGetResources.orderField = 'create_date'
-      }
+      paramsGetResources.orderType = 'DESC'
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
-      })
 
-      return {
+      mybus.emit('resetAction', {
-        listKey,
+        type: titleName.value[number.value].name,
-        searchValue,
+      })
-        currentPage,
+      getIntegrationList()
-        resourceList,
+    }
-        resourceTotal,
+
-        pageChange,
+    // 获取融合服务列表
-        listKey2,
+    const getIntegrationList = () => {
-        Cardsname,
+      loadingData.value = true
-        getAppResources,
+      paramsGetResources.name = searchValue.value;
-        chongzhi,
+      console.log('paramsGetResources------参数下发------>', paramsGetResources);
-        onSearch,
+      getIntegrationServicesList(paramsGetResources).then(
-        currentPageSize,
+        (res) => {
-        pageSizeOptions,
+          loadingData.value = false
-        current,
+          if (res.data.code !== 0) {
-        loading,
+            return message.error(res.data.msg)
-        titleName,
+          }
-        changeCards,
+          resourceList.data = res.data.data.list || []
-        number,
+          resourceTotal.value = res.data.data.total || 0
-        loadingData,
+        },
+        (err) => {
+          loadingData.value = false
+          message.error(err)
+        }
+      )
+    }
+
+    mybus.on('paramsGetResources', (ids) => {
+      if (ids && ids.length > 0) {
+        paramsGetResources.deptIds = ids
+      } else {
+        delete paramsGetResources.deptIds
       }
-    },
+      getIntegrationList()
-    components: {
+    })
-      HomeHeader,
+
-      HomeFooter,
+    mybus.on('changePage', (page) => {
-      searchResultList,
+      paramsGetResources.page = page
-      CanAssignCase,
+      getIntegrationList()
-    },
+    })
-    beforeUnmount() {
+
-      mybus.off('paramsGetResources')
+    mybus.on('changeSelcted', () => {
-      mybus.off('changeCondition')
+      getIntegrationList()
-      mybus.off('refresh')
+    })
-      mybus.off('changePage')
+
-    },
+    mybus.on('refresh', () => {
-  })
+      paramsGetResources.page = 1
+      currentPage.value = 1
+      getIntegrationList()
+    })
+    mybus.on('changeCondition', (condition) => {
+      paramsGetResources.orderField = condition.orderField
+      paramsGetResources.orderType = condition.orderType
+      getIntegrationList()
+    })
+
+    const pageChange = (val) => {
+      currentPage.value = val
+      paramsGetResources.page = val
+      getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+    }
+
+    // 分页
+    const onShowSizeChange = (current, pageSize) => {
+      currentPage.value = current
+      currentPageSize.value = pageSize
+      paramsGetResources.page = current
+      paramsGetResources.limit = pageSize
+      getIntegrationList()
+    }
+
+    // 存储查询条件到本地
+    const saveSearchCodition = (n) => {
+      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
+      localStorage.setItem(
+        'integrationServices',
+        JSON.stringify(paramsGetResources)
+      )
+    }
+
+    onMounted(() => {
+      if (storageSearchInfo) {
+        handleSetSearchData()
+      } else {
+        getIntegrationList()
+      }
+    })
+
+    return {
+      searchValue,
+      currentPage,
+      resourceList,
+      resourceTotal,
+      pageChange,
+      Cardsname,
+      getIntegrationList,
+      resetAction,
+      onSearch,
+      currentPageSize,
+      pageSizeOptions,
+      loading,
+      titleName,
+      changeCards,
+      number,
+      loadingData,
+      onShowSizeChange,
+      saveSearchCodition,
+      searchResultListDom,
+    }
+  },
+  components: {
+    HomeHeader,
+    HomeFooter,
+    searchResultList,
+    CanAssignCase,
+  },
+  beforeUnmount() {
+    mybus.off('paramsGetResources')
+    mybus.off('changeCondition')
+    mybus.off('refresh')
+    mybus.off('changePage')
+  },
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
+.resultListSearchInput-father {
-    background: #f3f5f9;
+  background: #f3f5f9;
-    padding: 0.2rem;
+  padding: 0.2rem;
 
-    // padding-left: 0.2rem;
+  .resultListSearchInput-son {
-    // padding-top: 0.2rem;
+    background: #fff;
-    .resultListSearchInput-son {
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
-      background: #fff;
-      padding: 0.2rem 0.2rem 0rem 0.3rem;
 
-      .hengxian {
+    .hengxian {
-        width: 100%;
+      width: 100%;
-        height: 0.01rem;
+      height: 0.01rem;
-        background: rgba(150, 144, 144, 0.3);
+      background: rgba(150, 144, 144, 0.3);
-        margin-top: 0.2rem;
+      margin-top: 0.2rem;
-      }
     }
   }
+}
 
-  .resultListSearchInput {
+.resultListSearchInput {
-    margin-left: 0.1rem;
+  margin-left: 0.1rem;
 
-    :deep(.ant-input) {
+  :deep(.ant-input) {
-      width: 4rem;
+    width: 4rem;
-      height: 0.36rem;
+    height: 0.36rem;
-      background: #fff;
+    background: #fff;
-      border-radius: 0.04rem;
+    border-radius: 0.04rem;
-    }
-
-    :deep(.ant-input-search-button) {
-      width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
-      font-size: 0.14rem;
-      font-weight: 400;
-      color: #fff;
-      line-height: 0.34rem;
-      margin-left: 0.1rem;
-    }
-
-    :deep(.ant-input-group-addon) {
-      left: 0 !important;
-    }
   }
 
-  .button-reset {
+  :deep(.ant-input-search-button) {
-    border: 0;
-    outline: none;
     width: 0.8rem;
     height: 0.36rem;
-    background: #e1edfa;
+    background: #0087ff;
-    border-radius: 0.04rem;
+    border-radius: 0.04rem !important;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    color: #fff;
     line-height: 0.34rem;
-    margin-left: 2.5rem;
+    margin-left: 0.1rem;
-    cursor: pointer;
   }
 
-  .details-pageconetent {
+  :deep(.ant-input-group-addon) {
-    height: 100%;
+    left: 0 !important;
-    width: 100%;
+  }
-    display: flex;
+}
-    justify-content: center;
+
-    align-items: center;
+.button-reset {
-    margin-top: 0.67rem;
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
     position: relative;
-    background: rgba(245, 243, 243, 0.3);
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
 
-    .details-pageconetent-left {
+    .pagination {
-      max-height: 6.9rem;
-      position: absolute;
-      width: 2.5rem;
-      top: 0.17rem;
-      left: 2.5rem;
-      margin-right: 0.17rem;
-      overflow: auto;
-    }
-
-    .top {
-      min-height: 7.2rem;
-      position: relative;
-      width: 11.5rem;
-      display: flex;
-      padding-top: 0.2rem;
-      flex-direction: column;
-      font-size: 0.16rem;
-      justify-content: left;
       background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
 
-      .pagination {
+    .top-title {
-        background: #f3f5f9;
+      padding: 0.2rem;
-        padding-bottom: 0.6rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
       }
 
-      .top-title {
+      .tabAll:nth-child(1) {
-        padding: 0.2rem;
+        margin-left: 20px;
-        display: flex;
+      }
-        font-size: 18px;
 
-        .tabAll {
+      .sel {
-          font-size: 18px;
+        font-weight: 600;
-          color: #000000;
+        color: #0087ff;
-          margin-right: 35px;
+        border-bottom: 0.02rem solid #0087ff;
-          cursor: pointer;
-        }
-
-        .tabAll:nth-child(1) {
-          margin-left: 20px;
-        }
-
-        .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
-        }
       }
     }
   }
+}
 
-  :deep(.ant-card-grid) {
+:deep(.ant-card-grid) {
-    overflow: hidden;
+  overflow: hidden;
-    white-space: nowrap;
+  white-space: nowrap;
-    text-overflow: ellipsis;
+  text-overflow: ellipsis;
-    -webkit-line-clamp: 1;
+  -webkit-line-clamp: 1;
-    word-break: break-all;
+  word-break: break-all;
-  }
+}
 </style>

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>
@@ -95,7 +112,7 @@ const changeName = (item) => {
           title: val.title,
           show:
             (i === 0 && val.children && val.children.length > 0) ||
-              typeList.includes(val.title)
+            typeList.includes(val.title)
               ? true
               : false,
           children: [],
@@ -114,7 +131,7 @@ const formData = (children = [], dataItem) => {
       title: item.title,
       show:
         (index === 0 && item.children && item.children.length > 0) ||
-          typeList.includes(item.title)
+        typeList.includes(item.title)
           ? true
           : false,
       children: [],
@@ -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>
@@ -42,128 +36,176 @@
   </div>
 </template>
 <script>
-  import { dependencies, devDependencies } from '*/package.json'
+import { dependencies, devDependencies } from '*/package.json'
-  import { mapActions, mapGetters } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
-  import { Encrypt } from '@/utils/crypto'
+import { Encrypt } from '@/utils/crypto'
-  import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
+import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
-  import { message } from 'ant-design-vue'
+import { message, Modal } from 'ant-design-vue'
 
-  export default {
+export default {
-    name: 'Login',
+  name: 'Login',
-    components: {
+  components: {
-      UserOutlined,
+    UserOutlined,
-      LockOutlined,
+    LockOutlined,
+  },
+  data() {
+    return {
+      form: {
+        username: '',
+        password: '',
+      },
+      redirect: undefined,
+      dependencies: dependencies,
+      devDependencies: devDependencies,
+      is360: false,
+      isIE: false,
+      canOpen: ['FF', 'Chrome']
+    }
+  },
+  computed: {
+    ...mapGetters({
+      logo: 'settings/logo',
+      title: 'settings/title',
+    }),
+  },
+  watch: {
+    $route: {
+      handler(route) {
+        this.redirect = (route.query && route.query.redirect) || '/'
+      },
+      immediate: true,
     },
-    data() {
+  },
-      return {
+  mounted() {
-        form: {
+    this.form.username = ''
-          username: '',
+    this.form.password = ''
-          password: '',
+
-        },
+    if (!this.canOpen.includes(this.judgeAgent())) {
-        redirect: undefined,
+      Modal.warning({
-        dependencies: dependencies,
+        title: '提示',
-        devDependencies: devDependencies,
+        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'
       }
     },
-    computed: {
+    handleRoute() {
-      ...mapGetters({
+      return this.redirect === '/404' || this.redirect === '/403'
-        logo: 'settings/logo',
+        ? '/home'
-        title: 'settings/title',
+        : this.redirect
-      }),
     },
-    watch: {
+    async handleSubmit() {
-      $route: {
+      // debugger
-        handler(route) {
+      try {
-          this.redirect = (route.query && route.query.redirect) || '/'
+        // console.log('登录', Decrypt(Encrypt(this.form.password)))
-        },
+        if (this.form.password !== this.form.password.trim()) {
-        immediate: true,
-      },
-    },
-    mounted() {
-      this.form.username = ''
-      this.form.password = ''
-      /*  setTimeout(() => {
-        this.handleSubmit()
-      }, 3000) */
-    },
-    methods: {
-      ...mapActions({
-        login: 'user/login',
-      }),
-      handleRoute() {
-        return this.redirect === '/404' || this.redirect === '/403'
-          ? '/home'
-          : this.redirect
-      },
-      async handleSubmit() {
-        // debugger
-        try {
-          // console.log('登录', Decrypt(Encrypt(this.form.password)))
-          if (this.form.password !== this.form.password.trim()) {
-            message.error('登陆失败，用户名或密码错误！')
-            return
-          }
-          await this.login({
-            password: Encrypt(this.form.password),
-            username: this.form.username,
-          })
-          window.sessionStorage.setItem('visits', JSON.stringify([]))
-          console.log('添加visits========================================>')
-          // console.log(this.handleRoute())
-          await this.$router.push('/home')
-        } catch (error) {
           message.error('登陆失败，用户名或密码错误！')
+          return
         }
-      },
+        await this.login({
+          password: Encrypt(this.form.password),
+          username: this.form.username,
+        })
+        window.sessionStorage.setItem('visits', JSON.stringify([]))
+        console.log('添加visits========================================>')
+        // console.log(this.handleRoute())
+        await this.$router.push('/home')
+      } catch (error) {
+        message.error('登陆失败，用户名或密码错误！')
+      }
     },
-  }
+  },
+}
 </script>
 <style lang="less">
-  .login-container {
+.login-container {
-    width: 100%;
+  width: 100%;
-    height: 100vh;
+  height: 100vh;
-    background: url('~@/assets/login_images/login_background.png');
+  background: url('~@/assets/login_images/login_background.png');
-    background-size: cover;
+  background-size: cover;
-    &-form {
+
-      width: calc(100% - 40px);
+  &-form {
-      height: 380px;
+    width: calc(100% - 40px);
-      padding: 4vh;
+    height: 380px;
-      margin-top: calc((100vh - 380px) / 2);
+    padding: 4vh;
-      margin-right: 20px;
+    margin-top: calc((100vh - 380px) / 2);
-      margin-left: 20px;
+    margin-right: 20px;
-      background: url('~@/assets/login_images/login_form.png');
+    margin-left: 20px;
-      background-size: 100% 100%;
+    background: url('~@/assets/login_images/login_form.png');
-      border-radius: 10px;
+    background-size: 100% 100%;
-      box-shadow: 0 2px 8px 0 rgba(7, 17, 27, 0.06);
+    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;
-      width: 100%;
-      height: 40px;
-      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;
-      border-radius: 99px;
-    }
   }
+
+  &-hello {
+    font-size: 32px;
+    color: #fff;
+  }
+
+  &-title {
+    margin-bottom: 30px;
+    font-size: 20px;
+    color: #fff;
+  }
+
+  &-tips {
+    position: fixed;
+    bottom: @vab-margin;
+    width: 100%;
+    height: 40px;
+    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;
+    border-radius: 99px;
+  }
+}
 </style>

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>
@@ -111,337 +115,340 @@
   </div>
 </template>
 <script setup>
-  // import { SearchOutlined } from '@ant-design/icons-vue'
+// import { SearchOutlined } from '@ant-design/icons-vue'
-  import { ref, reactive, onBeforeUnmount } from 'vue'
+import { ref, reactive, onBeforeUnmount } from 'vue'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
-  import { mynotice, mynoticeRead } from '@/api/home'
+import { mynotice, mynoticeRead } from '@/api/home'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  const router = useRouter()
+const router = useRouter()
-  const total = ref(0)
+const total = ref(0)
-  const pageSize = ref(8)
+const pageSize = ref(8)
-  const pageNum = ref(1)
+const pageNum = ref(1)
-  const value = ref('全部消息')
+const value = ref('全部消息')
-  const obj = reactive({ page: pageNum.value, limit: pageSize.value })
+const obj = reactive({ page: pageNum.value, limit: pageSize.value })
-  const navList = reactive([
+const navList = reactive([
-    {
+  {
-      title: '全部',
+    title: '全部',
-      key: 'all',
+    key: 'all',
-      num: 0,
+    num: 0,
-    },
+  },
-    {
+  {
-      title: '通知',
+    title: '通知',
-      key: 'notice',
+    key: 'notice',
-      num: 0,
+    num: 0,
-    },
+  },
-    {
+  {
-      title: '评论',
+    title: '评论',
-      key: 'comment',
+    key: 'comment',
-      num: 0,
+    num: 0,
-    },
+  },
-    {
+  {
-      title: '其它',
+    title: '其它',
-      key: 'other',
+    key: 'other',
-      num: 0,
+    num: 0,
-    },
+  },
-  ])
+])
-  const selectNav = ref('all')
+const selectNav = ref('all')
-  const selectData = ref([])
+const selectData = ref([])
-  const data = ref([])
+const data = ref([])
-  const changeNav = (nav) => {
+const changeNav = (nav) => {
-    selectNav.value = nav.key
+  selectNav.value = nav.key
-    if (nav.key === 'all') {
+  if (nav.key === 'all') {
-      delete obj.from
+    delete obj.from
-    } else {
+  } else {
-      obj.from = nav.title
+    obj.from = nav.title
-    }
-    value.value = '全部消息'
-    delete obj.readStatus
-    init()
   }
-  const changeCheckBox = (item) => {
+  value.value = '全部消息'
-    item.checked = !item.checked
+  delete obj.readStatus
-    if (item.checked) {
+  init()
-      selectData.value.push(item.id)
+}
-    } else {
+const changeCheckBox = (item) => {
-      selectData.value = selectData.value.filter((val) => val !== item.id)
+  item.checked = !item.checked
-    }
+  if (item.checked) {
+    selectData.value.push(item.id)
+  } else {
+    selectData.value = selectData.value.filter((val) => val !== item.id)
   }
-  const changeCheckAll = () => {
+}
-    if (selectData.value.length == data.value.length) {
+const changeCheckAll = () => {
-      selectData.value = []
+  if (selectData.value.length == data.value.length) {
-      data.value.forEach((val) => {
+    selectData.value = []
-        val.checked = false
+    data.value.forEach((val) => {
-      })
+      val.checked = false
-    } else {
+    })
-      selectData.value = []
+  } else {
-      data.value.forEach((val) => {
+    selectData.value = []
-        val.checked = true
+    data.value.forEach((val) => {
-        selectData.value.push(val.id)
+      val.checked = true
-      })
+      selectData.value.push(val.id)
-    }
-  }
-  const changePageNum = (page) => {
-    pageNum.value = page
-    obj.page = pageNum.value
-    init()
-  }
-  const handleChange = () => {
-    pageNum.value = 1
-    obj.page = pageNum.value
-    switch (value.value) {
-      case '全部消息':
-        delete obj.readStatus
-        break
-      case '已读消息':
-        obj.readStatus = 1
-        break
-      case '未读消息':
-        obj.readStatus = 0
-        break
-      default:
-        delete obj.readStatus
-        break
-    }
-    init()
-  }
-  const goBack = (url) => {
-    router.push({
-      path: url,
     })
   }
-  const read = (item) => {
+}
-    // console.log(item)
+const changePageNum = (page) => {
-    if (selectData.value.length === 0 && !item) {
+  pageNum.value = page
-      message.error('未选择消息！')
+  obj.page = pageNum.value
+  init()
+}
+const handleChange = () => {
+  pageNum.value = 1
+  obj.page = pageNum.value
+  switch (value.value) {
+    case '全部消息':
+      delete obj.readStatus
+      break
+    case '已读消息':
+      obj.readStatus = 1
+      break
+    case '未读消息':
+      obj.readStatus = 0
+      break
+    default:
+      delete obj.readStatus
+      break
+  }
+  init()
+}
+const goBack = (url) => {
+  router.push({
+    path: url,
+  })
+}
+const read = (item) => {
+  // console.log(item)
+  if (selectData.value.length === 0 && !item) {
+    message.error('未选择消息！')
+    return
+  }
+  console.log(selectData.value)
+
+  if (item) {
+    // 已读状态
+    if (item.readStatus === 1) {
       return
     }
-    console.log(selectData.value)
+    mynoticeRead(item.id).then((res) => {
-    // let str = ''
+      if (res.data.code == 0) {
-    // selectData.value.forEach((val, index) => {
+        message.success('操作成功！')
-    //   str += val
+        mybus.emit('getMynotice')
-    //   if (index < selectData.value.length - 1) {
+        init()
-    //     str += ';'
+      } else {
-    //   }
+        message.error('操作失败！')
-    // })
+      }
-    if (item) {
+    })
-      mynoticeRead(item.id).then((res) => {
+  } else {
+    console.log('提交')
+    selectData.value.map((val) => {
+      mynoticeRead(val).then((res) => {
         if (res.data.code == 0) {
-          message.success('操作成功！')
+          // message.success('操作成功！')
           mybus.emit('getMynotice')
           init()
         } else {
           message.error('操作失败！')
         }
       })
-    } else {
-      console.log('提交')
-      selectData.value.map((val) => {
-        mynoticeRead(val).then((res) => {
-          if (res.data.code == 0) {
-            // message.success('操作成功！')
-            mybus.emit('getMynotice')
-            init()
-          } else {
-            message.error('操作失败！')
-          }
-        })
-      })
-    }
-  }
-  const init = () => {
-    // from 通知 评论 readStatus 0 未读  1 已读
-    mynotice(obj).then((res) => {
-      console.log('消息=============>', res.data.data)
-      res.data.data.list.forEach((val) => {
-        if (val.from === '通知') {
-          val.src = require('@/assets/mynoticeView/notice.png')
-        } else if (val.from === '评论') {
-          val.src = require('@/assets/mynoticeView/comment.png')
-        } else if (val.from === '其它') {
-          val.src = require('@/assets/mynoticeView/other.png')
-        }
-        val.checked = false
-      })
-      data.value = res.data.data.list
-      total.value = res.data.data.total
-      selectData.value = []
     })
   }
-  navList.forEach((val) => {
+}
-    if (val.title === '全部') {
+const init = () => {
-      mynotice({ page: pageNum.value, limit: pageSize.value }).then((res) => {
+  // from 通知 评论 readStatus 0 未读  1 已读
-        val.num = res.data.data.total
+  mynotice(obj).then((res) => {
-      })
+    console.log('消息=============>', res.data.data)
-    } else {
+    res.data.data.list.forEach((val) => {
-      mynotice({
+      if (val.from === '通知') {
-        page: pageNum.value,
+        val.src = require('@/assets/mynoticeView/notice.png')
-        limit: pageSize.value,
+      } else if (val.from === '评论') {
-        from: val.title,
+        val.src = require('@/assets/mynoticeView/comment.png')
-      }).then((res) => {
+      } else if (val.from === '其它') {
-        val.num = res.data.data.total
+        val.src = require('@/assets/mynoticeView/other.png')
-      })
+      }
-    }
+      val.checked = false
+    })
+    data.value = res.data.data.list
+    total.value = res.data.data.total
+    selectData.value = []
   })
+}
+navList.forEach((val) => {
+  if (val.title === '全部') {
+    mynotice({ page: pageNum.value, limit: pageSize.value }).then((res) => {
+      val.num = res.data.data.total
+    })
+  } else {
+    mynotice({
+      page: pageNum.value,
+      limit: pageSize.value,
+      from: val.title,
+    }).then((res) => {
+      val.num = res.data.data.total
+    })
+  }
+})
+init()
+mybus.on('noticeListInit', () => {
   init()
-  mybus.on('noticeListInit', () => {
+})
-    init()
+onBeforeUnmount(() => {
-  })
+  mybus.off('noticeListInit')
-  onBeforeUnmount(() => {
+})
-    mybus.off('noticeListInit')
-  })
 </script>
 <style lang="less" scoped>
-  .notice-list {
+.notice-list {
-    padding: 0.64rem 0 0;
+  padding: 0.64rem 0 0;
-    background: #f4f5f8;
+  background: #f4f5f8;
-    .ant-breadcrumb {
+  .ant-breadcrumb {
-      padding: 0.1rem 3.1rem;
+    padding: 0.1rem 3.1rem;
-    }
+  }
-    .top {
+  .top {
-      background: #fff;
+    background: #fff;
-      padding: 0.18rem 3.1rem 0;
+    padding: 0.18rem 3.1rem 0;
-      display: flex;
+    display: flex;
-      justify-content: space-between;
+    justify-content: space-between;
-      align-items: center;
+    align-items: center;
-      .left {
-        display: flex;
-        .item {
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          margin-left: 1.28rem;
-          margin-bottom: 0.16rem;
-          border-bottom: 3px solid #fff;
-          i {
-            display: inline-block;
-            width: 0.48rem;
-            height: 0.48rem;
-            margin-bottom: 0.15rem;
-            cursor: pointer;
-          }
-          .all {
-            background: url('~@/assets/mynoticeView/all.png') no-repeat;
-            background-size: 100%;
-          }
-          .notice {
-            background: url('~@/assets/mynoticeView/notice.png') no-repeat;
-            background-size: 100%;
-          }
-          .comment {
-            background: url('~@/assets/mynoticeView/comment.png') no-repeat;
-            background-size: 100%;
-          }
-          .other {
-            background: url('~@/assets/mynoticeView/other.png') no-repeat;
-            background-size: 100%;
-          }
-        }
-        .item:nth-of-type(1) {
-          margin-left: 0;
-        }
-        .select {
-          border-bottom: 3px solid #0058e1;
-          color: #0058e1;
-        }
-      }
-      .right {
-        display: flex;
-        align-items: center;
-        height: 0.32rem;
-        div {
-          width: 0.5rem;
-        }
-        .reset {
-          color: #0058e1;
-          cursor: pointer;
-        }
-      }
-    }
-    .btn {
-      background: #fff;
-      margin-top: 0.16rem;
-      padding: 0.14rem 3.1rem 0;
-      display: flex;
-      justify-content: space-between;
-      .left {
-        display: flex;
-        align-items: center;
-        .ant-select {
-          margin-right: 0.24rem;
-        }
-        .check {
-          display: flex;
-          align-items: center;
-          div {
-            margin-left: 0.24rem;
-            span {
-              font-size: 18px;
-              color: #0058e1;
-            }
-          }
-          div:nth-of-type(1) {
-            margin-left: 0.12rem;
-          }
-        }
-      }
-      .right {
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        div {
-          margin: 0 0.1rem;
-        }
-        span {
-          cursor: pointer;
-          color: #0058e1;
-          text-align: center;
-          align-self: center;
-          padding: 0.05rem 0.1rem;
-        }
 
-        span:hover {
+    .left {
-          background: rgba(0, 88, 225, 0.1);
+      display: flex;
+      .item {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        margin-left: 1.28rem;
+        margin-bottom: 0.16rem;
+        border-bottom: 3px solid #fff;
+        i {
+          display: inline-block;
+          width: 0.48rem;
+          height: 0.48rem;
+          margin-bottom: 0.15rem;
+          cursor: pointer;
+        }
+        .all {
+          background: url('~@/assets/mynoticeView/all.png') no-repeat;
+          background-size: 100%;
+        }
+        .notice {
+          background: url('~@/assets/mynoticeView/notice.png') no-repeat;
+          background-size: 100%;
+        }
+        .comment {
+          background: url('~@/assets/mynoticeView/comment.png') no-repeat;
+          background-size: 100%;
+        }
+        .other {
+          background: url('~@/assets/mynoticeView/other.png') no-repeat;
+          background-size: 100%;
         }
       }
+      .item:nth-of-type(1) {
+        margin-left: 0;
+      }
+      .select {
+        border-bottom: 3px solid #0058e1;
+        color: #0058e1;
+      }
     }
-    .main {
+    .right {
-      background: #fff;
+      display: flex;
-      padding: 0 3.1rem;
+      align-items: center;
-      height: 4.75rem;
+      height: 0.32rem;
-      overflow-y: scroll;
+      div {
-      :deep(.ant-list-item-meta) {
+        width: 0.5rem;
+      }
+      .reset {
+        color: #0058e1;
+        cursor: pointer;
+      }
+    }
+  }
+  .btn {
+    background: #fff;
+    margin-top: 0.16rem;
+    padding: 0.14rem 3.1rem 0;
+    display: flex;
+    justify-content: space-between;
+
+    .left {
+      display: flex;
+      align-items: center;
+      .ant-select {
+        margin-right: 0.24rem;
+      }
+      .check {
         display: flex;
         align-items: center;
-        .ant-checkbox-wrapper {
+        div {
-          margin-right: 0.3rem;
+          margin-left: 0.24rem;
-        }
+          span {
-        .ant-list-item-meta-title {
+            font-size: 18px;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          .left {
-            cursor: pointer;
-            width: 9.2rem;
-            max-height: 0.43rem;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-line-clamp: 2;
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
-          .left:hover {
             color: #0058e1;
           }
         }
+        div:nth-of-type(1) {
+          margin-left: 0.12rem;
+        }
       }
     }
-    .ant-pagination {
+    .right {
-      background: #fff;
+      display: flex;
-      margin-top: 0;
+      justify-content: space-around;
-      padding: 0.2rem 0 0.2rem;
+      align-items: center;
+      div {
+        margin: 0 0.1rem;
+      }
+      span {
+        cursor: pointer;
+        color: #0058e1;
+        text-align: center;
+        align-self: center;
+        padding: 0.05rem 0.1rem;
+      }
+
+      span:hover {
+        background: rgba(0, 88, 225, 0.1);
+      }
     }
   }
+  .main {
+    background: #fff;
+    padding: 0 3.1rem;
+    height: 4.75rem;
+    overflow-y: scroll;
+    :deep(.ant-list-item-meta) {
+      display: flex;
+      align-items: center;
+      .ant-checkbox-wrapper {
+        margin-right: 0.3rem;
+      }
+      .ant-list-item-meta-title {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .left {
+          width: 9.2rem;
+          max-height: 0.43rem;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+        .pointer {
+          cursor: pointer;
+        }
+        .left:hover {
+          color: #0058e1;
+        }
+      }
+    }
+  }
+  .ant-pagination {
+    background: #fff;
+    margin-top: 0;
+    padding: 0.2rem 0 0.2rem;
+  }
+}
 </style>

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