From e6528b4b3bb5cc22b5749d80cbda3026fedbb0fb Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 09:23:12 +0800
Subject: [PATCH 01/31] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1BUG=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/main.js                          | 8 +-------
 front/src/views/home/components/header.vue | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/front/src/main.js b/front/src/main.js
index a24e5800..c43d1b20 100644
--- a/front/src/main.js
+++ b/front/src/main.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-05 15:04:47
+ * @LastEditTime: 2022-07-07 09:22:56
  * @Description: 告诉大家这是什么
  */
 import { createApp } from 'vue'
@@ -51,9 +51,3 @@ router.beforeEach((to, from, next) => {
   document.body.scrollTop = 0
   next()
 })
-// 解决bug：页面/路由跳转后，滚动条消失，页面无法滚动
-router.afterEach((to, from, next) => {
-  document
-    .querySelector('body')
-    .setAttribute('style', 'overflow: auto !important;')
-})
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 2d232f3f..aa448adc 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -20,7 +20,7 @@
       {{ item.name }}
     </div>
     <a-badge :count="sgcNum">
-    <!-- 购物车 -->
+      <!-- 购物车 -->
       <svg
         t="1650455446850"
         class="icon"
@@ -41,7 +41,7 @@
       <!-- <a-avatar shape="square" size="large" /> -->
     </a-badge>
     <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
-    <!-- 消息提醒 -->
+      <!-- 消息提醒 -->
       <svg
         t="1654051054113"
         class="icon2"
@@ -267,21 +267,17 @@
     if (mynoticeDom) {
       mynoticeDom.addEventListener('mouseover', () => {
         mynoticeFlag.value = true
-        // document.documentElement.style.overflowY = 'hidden'
       })
       mynoticeDom.addEventListener('mouseout', () => {
         mynoticeFlag.value = false
-        document.documentElement.style.overflowY = 'scroll'
       })
     }
     if (mynotice) {
       mynotice.addEventListener('mouseover', () => {
         mynoticeFlag.value = true
-        // document.documentElement.style.overflowY = 'hidden'
       })
       mynotice.addEventListener('mouseout', () => {
         mynoticeFlag.value = false
-        document.documentElement.style.overflowY = 'scroll'
       })
     }
     mybus.on('getSgcNum', () => {

From 4a1126cf949706162fbbd9cfb4a6fb03e7accc1d Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 10:27:46 +0800
Subject: [PATCH 02/31] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workBench/components/bottom-view.vue      |  95 ++++---
 .../components/frequency-top5-view.vue        | 258 +++++++++---------
 2 files changed, 174 insertions(+), 179 deletions(-)

diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue
index 98acdc7a..75368b2d 100644
--- a/back/src/views/modules/workBench/components/bottom-view.vue
+++ b/back/src/views/modules/workBench/components/bottom-view.vue
@@ -28,108 +28,108 @@
   </div>
 </template>
 <script>
-import contentTitle from "./content-title";
-import * as Apis from '../api';
+import contentTitle from './content-title'
+import * as Apis from '../api'
 export default {
   components: {
     contentTitle
   },
-  data() {
+  data () {
     return {
-      title: { dynamic: "部门发布动态", recommend: "部门推荐能力" },
+      title: { dynamic: '部门发布动态', recommend: '部门推荐能力' },
       list: [],
       columns: [
         {
-          title: "名称",
-          key: "name",
-          dataIndex: "name",
+          title: '名称',
+          key: 'name',
+          dataIndex: 'name',
           width: 250
         },
         {
-          title: "类型",
-          key: "type",
-          dataIndex: "type",
+          title: '类型',
+          key: 'type',
+          dataIndex: 'type',
           width: 76
         },
         {
-          title: "单位",
-          key: "deptContacts",
-          dataIndex: "deptContacts",
+          title: '单位',
+          key: 'deptContacts',
+          dataIndex: 'deptContacts',
           width: 144
         },
         {
-          title: "时间",
-          key: "createDate",
-          dataIndex: "createDate",
+          title: '时间',
+          key: 'createDate',
+          dataIndex: 'createDate',
           width: 153
         },
         {
-          title: "当前申请数",
-          key: "applyCount",
-          dataIndex: "applyCount",
+          title: '当前申请数',
+          key: 'applyCount',
+          dataIndex: 'applyCount',
           width: 145
-        },
+        }
       ],
       tableData: [],
       maxSize: { y: 195 },
       loadingDynamic: false,
-      loadingTable: false,
-    };
+      loadingTable: false
+    }
   },
-  mounted() {
-    this.getResourceByDept();
+  mounted () {
+    this.getResourceByDept()
     this.getApplyByDept()
   },
   methods: {
-    // 发布动态 
-    getResourceByDept() {
-      let data = {
+    // 发布动态
+    getResourceByDept () {
+      const data = {
         limit: 5,
         page: 1
-      };
-      this.loadingDynamic = true;
+      }
+      this.loadingDynamic = true
       Apis.getResourceByDept(
         data,
         res => {
-          this.loadingDynamic = false;
+          this.loadingDynamic = false
           if (res.data.code !== 0) {
             return this.$message.error(res.data.msg)
           }
-          console.log('res.data----发布动态-------->', res.data);
+          console.log('res.data----发布动态-------->', res.data)
           this.list = res.data.data.list || []
-          this.list.push(this.list[0])
-          this.list.push(this.list[0])
+          // this.list.push({})
+          // this.list.push({})
         },
         err => {
-          this.loadingDynamic = false;
+          this.loadingDynamic = false
           this.$message.error(err)
-          console.log('err-----发布动态------->', err);
+          console.log('err-----发布动态------->', err)
         }
-      );
+      )
     },
     // 部门推荐能力
-    getApplyByDept() {
-      let data = {
+    getApplyByDept () {
+      const data = {
         limit: 5,
         page: 1
-      };
-      this.loadingTable = true;
+      }
+      this.loadingTable = true
       Apis.getApplyByDept(
         data,
         res => {
-          this.loadingTable = false;
+          this.loadingTable = false
           if (res.data.code !== 0) {
             return this.$message.error(res.data.msg)
           }
-          console.log('res.data------部门推荐能力------>', res.data);
-          this.tableData = res.data.data.list || [];
+          console.log('res.data------部门推荐能力------>', res.data)
+          this.tableData = res.data.data.list || []
         },
         err => {
-          this.loadingTable = false;
+          this.loadingTable = false
           this.$message.error(err)
-          console.log("err", err);
+          console.log('err', err)
         }
-      );
+      )
     }
   }
 }
@@ -142,7 +142,6 @@ export default {
   text-overflow: ellipsis;
 }
 
-
 .bottom-view {
   width: 100%;
   height: 335px;
@@ -220,4 +219,4 @@ export default {
 ::v-deep .ant-table-thead {
   background-color: #f4f5f8;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/back/src/views/modules/workBench/components/frequency-top5-view.vue b/back/src/views/modules/workBench/components/frequency-top5-view.vue
index 49938ded..61f3133c 100644
--- a/back/src/views/modules/workBench/components/frequency-top5-view.vue
+++ b/back/src/views/modules/workBench/components/frequency-top5-view.vue
@@ -25,7 +25,7 @@
             </div>
             <div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i">
                 <div class="left">
-                    <div class="row-index">{{ i + 3 }}</div>
+                    <div class="row-index">{{ i + 4 }}</div>
                     <el-tooltip effect="dark" :content="data.name" placement="top">
                         <div class="name-text ellipsis">{{ data.name || '--' }}</div>
                     </el-tooltip>
@@ -41,185 +41,181 @@
 import * as Apis from '../api.js'
 import contentTitle from './content-title.vue'
 export default {
-    data() {
-        return {
-            listInfo: [],
-            colorObj: {
-                1: '#4658710',
-                2: '#734204',
-                3: '#805932',
-            },
-            no1Obj: {
-                name: '',
-                count: '',
-            },
-            no2Obj: {
-                name: '',
-                count: '',
-            },
-            no3Obj: {
-                name: '',
-                count: '',
-            },
-            noData: false,
-            loading: true,
-        };
-    },
-    mounted() {
-        this.getData();
-    },
-    methods: {
-        // 频率
-        getData() {
-            let data = {
-                limit: 5,
-                page: 1,
-            };
-            this.loading = true
-            Apis.getFrequence(data, res => {
-                this.loading = false;
-                if (res.data.code !== 0) {
-                    return this.$message.error(res.data.msg);
-                }
-                console.log("res----频率-------->", res.data);
-                let _arr = res.data.data.records || [];
-                if (_arr.length == 0) {
-                    this.noData = true
-                    return;
-                }
-                for (let i = 0; i < 3; i++) {
-                    let k = i + 1;
-                    this[`no${k}Obj`].name = _arr[i].name
-                    this[`no${k}Obj`].count = _arr[i].count
-                }
-                this.listInfo = []
-                this.listInfo.push(_arr[3] || {})
-                this.listInfo.push(_arr[4] || {})
-
-            }, err => {
-                this.loading = false;
-                this.$message.error(err);
-            });
-        },
-        formatCount(count) {
-            return count || count === 0 ? count : '--'
+  data () {
+    return {
+      listInfo: [],
+      colorObj: {
+        1: '#4658710',
+        2: '#734204',
+        3: '#805932'
+      },
+      no1Obj: {
+        name: '',
+        count: ''
+      },
+      no2Obj: {
+        name: '',
+        count: ''
+      },
+      no3Obj: {
+        name: '',
+        count: ''
+      },
+      noData: false,
+      loading: true
+    }
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    // 频率
+    getData () {
+      const data = {
+        limit: 5,
+        page: 1
+      }
+      this.loading = true
+      Apis.getFrequence(data, res => {
+        this.loading = false
+        if (res.data.code !== 0) {
+          return this.$message.error(res.data.msg)
         }
+        console.log('res----频率-------->', res.data)
+        const _arr = res.data.data.records || []
+        if (_arr.length == 0) {
+          this.noData = true
+          return
+        }
+        for (let i = 0; i < 3; i++) {
+          const k = i + 1
+          this[`no${k}Obj`].name = _arr[i].name
+          this[`no${k}Obj`].count = _arr[i].count
+        }
+        this.listInfo = []
+        this.listInfo.push(_arr[3] || {})
+        this.listInfo.push(_arr[4] || {})
+      }, err => {
+        this.loading = false
+        this.$message.error(err)
+      })
     },
-    components: { contentTitle }
+    formatCount (count) {
+      return count || count === 0 ? count : '--'
+    }
+  },
+  components: { contentTitle }
 }
 </script>
 <style lang="scss" scoped>
 .ellipsis {
-    //超出一行省略号
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+  //超出一行省略号
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .flex-row-between {
-    display: flex;
-    width: 100%;
-    margin-bottom: 8px;
-    height: 52px;
-    align-items: center;
-    justify-content: space-between;
-    padding-left: 10px;
-    padding-right: 16px;
-    box-sizing: border-box;
+  display: flex;
+  width: 100%;
+  margin-bottom: 8px;
+  height: 52px;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 10px;
+  padding-right: 16px;
+  box-sizing: border-box;
 }
 
 .left {
-    display: flex;
+  display: flex;
 }
 
 .frequency {
-    width: 540px;
-    height: 335px;
-    background: #fff;
-    padding: 0 16px;
-    box-sizing: border-box;
+  width: 540px;
+  height: 335px;
+  background: #fff;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 .no-box {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    margin-bottom: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  margin-bottom: 24px;
 }
 
 .no1 {
-    width: 170px;
-    height: 120px;
-    margin-top: -20px;
-    background-image: url("~@/assets/img/workBench/NO1.png");
+  width: 170px;
+  height: 120px;
+  margin-top: -20px;
+  background-image: url("~@/assets/img/workBench/NO1.png");
 }
 
 .no {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
 }
 
 .no2 {
-    width: 170px;
-    height: 120px;
-    margin-top: 10px;
-    background-image: url("~@/assets/img/workBench/NO2.png");
+  width: 170px;
+  height: 120px;
+  margin-top: 10px;
+  background-image: url("~@/assets/img/workBench/NO2.png");
 }
 
-
 .no3 {
-    width: 170px;
-    height: 120px;
-    margin-top: 10px;
-    background-image: url("~@/assets/img/workBench/NO3.png");
+  width: 170px;
+  height: 120px;
+  margin-top: 10px;
+  background-image: url("~@/assets/img/workBench/NO3.png");
 }
 
 .name {
-    font-size: 16px;
-    margin-bottom: 10px;
-    margin-top: 70px;
-    width: 150px;
-    text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+  margin-top: 70px;
+  width: 150px;
+  text-align: center;
 }
 
 .count {
-    font-size: 18px;
-    color: #2b2b2b;
+  font-size: 18px;
+  color: #2b2b2b;
 }
 
 .row-name {
-    background: #f4f5f8;
-    border-radius: 1px;
+  background: #f4f5f8;
+  border-radius: 1px;
 }
 
 .row-index {
-    font-size: 16px;
-    color: #414d60;
+  font-size: 16px;
+  color: #414d60;
 }
 
 .name-text {
-    font-size: 16px;
-    color: #464545;
-    margin-left: 10px;
-    width: 430px;
+  font-size: 16px;
+  color: #464545;
+  margin-left: 10px;
+  width: 430px;
 }
 
-
 .num-text {
-    font-size: 14px;
-    color: #2b2b2b;
-
+  font-size: 14px;
+  color: #2b2b2b;
 }
 
 .no-data {
-    width: 540px;
-    height: 300px;
-    background: #fff;
-    line-height: 232px;
-    font-size: 16px;
-    color: #212121;
-    text-align: center;
+  width: 540px;
+  height: 300px;
+  background: #fff;
+  line-height: 232px;
+  font-size: 16px;
+  color: #212121;
+  text-align: center;
 }
-</style>
\ No newline at end of file
+</style>

From b48c2972cec2e520407f38e5cb7e525893973cf5 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 7 Jul 2022 10:42:14 +0800
Subject: [PATCH 03/31] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BA=91=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capabilityCloud/components/ComponentServices.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue
index ae100a9f..bf6082cf 100644
--- a/front/src/views/capabilityCloud/components/ComponentServices.vue
+++ b/front/src/views/capabilityCloud/components/ComponentServices.vue
@@ -271,8 +271,8 @@
       },
       grid: {
         top: '10%',
-        left: '0%',
-        right: '5%',
+        left: '3%',
+        right: '10%',
         bottom: '0%',
         containLabel: true,
       },

From 0ad564616747961c169686b040515f2f8eff35da Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 10:49:37 +0800
Subject: [PATCH 04/31] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/searchResultList.vue      |   5 +-
 .../newHome/components/PopularAbility.vue     | 330 +++++++++---------
 2 files changed, 167 insertions(+), 168 deletions(-)

diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 724084a0..f80a88a9 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -137,7 +137,7 @@
               <div v-if="selectCardsname !== '数据资源'">
                 浏览量：{{ item.visits || 0 }}次
               </div>
-              <div>申购量：{{ item.applyCount || 0 }}次</div>
+              <div>申请量：{{ item.applyCount || 0 }}次</div>
               <div v-if="selectCardsname === '数据资源'">
                 数据量：{{ item.sjlCount || 0 }}
               </div>
@@ -430,8 +430,7 @@
                 item.guid
             )
           } else {
-             window.open(
-            'http://10.134.135.24:30090/#/home')
+            window.open('http://10.134.135.24:30090/#/home')
           }
         } else {
           if (type === 'apply') {
diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue
index 5f86d6c7..ee733fcf 100644
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@@ -16,7 +16,7 @@
           >
             <span
               class="img"
-              :class="sel == '浏览量' ? 'fwl' : sel == '申购量' ? 'sgl' : 'scl'"
+              :class="sel == '浏览量' ? 'fwl' : sel == '申请量' ? 'sgl' : 'scl'"
             ></span>
             <span class="text">{{ sel }}</span>
           </div>
@@ -35,7 +35,7 @@
               <div class="fw" v-if="select == '浏览量'">
                 {{ select }}:{{ item.visits }}
               </div>
-              <div class="fw" v-if="select == '申购量'">
+              <div class="fw" v-if="select == '申请量'">
                 {{ select }}:{{ item.applyCount }}
               </div>
               <div class="fw" v-if="select == '收藏量'">
@@ -64,7 +64,7 @@
   const store = useStore()
   const router = useRouter()
   const select = ref('浏览量')
-  const selList = ref(['浏览量', '申购量', '收藏量'])
+  const selList = ref(['浏览量', '申请量', '收藏量'])
   const list = ref([])
 
   const paramsGetResources = {
@@ -83,7 +83,7 @@
       case '浏览量':
         paramsGetResources.orderField = 'visits'
         break
-      case '申购量':
+      case '申请量':
         paramsGetResources.orderField = 'applyCount'
         break
       case '收藏量':
@@ -153,195 +153,195 @@
   }
 </script>
 <style lang="less" scoped>
-  .popular-ability {
-    height: 6.8rem;
-    background: url('~@/assets/newHome/popular-bg.png') no-repeat;
-    background-size: 100%;
+.popular-ability {
+  height: 6.8rem;
+  background: url('~@/assets/newHome/popular-bg.png') no-repeat;
+  background-size: 100%;
+  display: flex;
+  justify-content: center;
+  .main {
+    width: 13rem;
+    margin-top: 0.78rem;
     display: flex;
-    justify-content: center;
-    .main {
-      width: 13rem;
-      margin-top: 0.78rem;
+    flex-direction: column;
+    flex-wrap: wrap;
+    .top {
+      font-size: 0.3rem;
+      color: #fff;
+      text-align: center;
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
-      .top {
-        font-size: 0.3rem;
-        color: #fff;
-        text-align: center;
+      justify-content: center;
+      align-items: center;
+      .line {
+        width: 0.34rem;
+        height: 0.03rem;
+        background-color: #fff;
+        margin-top: 0.08rem;
+      }
+    }
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 0.52rem;
+      .left {
         display: flex;
         flex-direction: column;
         flex-wrap: wrap;
-        justify-content: center;
-        align-items: center;
-        .line {
-          width: 0.34rem;
-          height: 0.03rem;
-          background-color: #fff;
-          margin-top: 0.08rem;
-        }
-      }
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 0.52rem;
-        .left {
+        .select {
+          cursor: pointer;
           display: flex;
           flex-direction: column;
           flex-wrap: wrap;
-          .select {
-            cursor: pointer;
+          align-items: center;
+          justify-content: center;
+          width: 1.05rem;
+          height: 1.39rem;
+          background: rgba(255, 255, 255, 0.08);
+          margin-bottom: 0.01rem;
+          border-right: 0.02rem solid rgba(233, 233, 233, 0.3);
+          .img {
+            width: 0.36rem;
+            height: 0.36rem;
+            background-size: 100%;
+          }
+          .fwl {
+            background: url('~@/assets/newHome/fwl-no.png') no-repeat;
+            background-size: contain;
+          }
+          .sgl {
+            background: url('~@/assets/newHome/sgl-no.png') no-repeat;
+            background-size: contain;
+          }
+          .scl {
+            background: url('~@/assets/newHome/scl-no.png') no-repeat;
+            background-size: contain;
+          }
+          .text {
+            color: rgba(255, 255, 255, 0.6);
+            font-size: 0.14rem;
+            margin-top: 0.08rem;
+          }
+        }
+        .select:hover {
+          background: rgba(255, 255, 255, 0.12);
+        }
+        .checked {
+          background: rgba(255, 255, 255, 0.18) !important;
+          border-right: 0.02rem solid #fff;
+        }
+      }
+      .right {
+        cursor: pointer;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        margin-left: 0.2rem;
+        .item {
+          width: 3.78rem;
+          height: 2rem;
+          display: flex;
+          .item-left {
+            width: 0.83rem;
+            height: 100%;
             display: flex;
-            flex-direction: column;
-            flex-wrap: wrap;
-            align-items: center;
             justify-content: center;
-            width: 1.05rem;
-            height: 1.39rem;
-            background: rgba(255, 255, 255, 0.08);
-            margin-bottom: 0.01rem;
-            border-right: 0.02rem solid rgba(233, 233, 233, 0.3);
+            align-items: center;
+            background: #eef1f8;
             .img {
-              width: 0.36rem;
-              height: 0.36rem;
+              width: 0.56rem;
+              height: 0.56rem;
               background-size: 100%;
             }
-            .fwl {
-              background: url('~@/assets/newHome/fwl-no.png') no-repeat;
+            .zj {
+              background: url('~@/assets/newHome/popular-zj.png') no-repeat;
               background-size: contain;
             }
-            .sgl {
-              background: url('~@/assets/newHome/sgl-no.png') no-repeat;
+            .yy {
+              background: url('~@/assets/newHome/popular-yy.png') no-repeat;
               background-size: contain;
             }
-            .scl {
-              background: url('~@/assets/newHome/scl-no.png') no-repeat;
+            .jc {
+              background: url('~@/assets/newHome/popular-jc.png') no-repeat;
               background-size: contain;
             }
+            .sj {
+              background: url('~@/assets/newHome/popular-sj.png') no-repeat;
+              background-size: contain;
+            }
+            .zs {
+              background: url('~@/assets/newHome/popular-zs.png') no-repeat;
+              background-size: contain;
+            }
+          }
+          .item-right {
+            width: 100%;
+            height: 100%;
+            background: #fff;
+            .fw {
+              width: 100%;
+              padding-right: 0.1rem;
+              padding-top: 0.03rem;
+              text-align: right;
+              color: 666;
+              font-size: 0.14rem;
+              color: #666;
+            }
+            .name {
+              font-size: 0.18rem;
+              color: #212121;
+              text-align: center;
+              margin-top: 0.05rem;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-line-clamp: 1;
+              -webkit-box-orient: vertical;
+            }
             .text {
-              color: rgba(255, 255, 255, 0.6);
-              font-size: 0.14rem;
-              margin-top: 0.08rem;
-            }
-          }
-          .select:hover {
-            background: rgba(255, 255, 255, 0.12);
-          }
-          .checked {
-            background: rgba(255, 255, 255, 0.18) !important;
-            border-right: 0.02rem solid #fff;
-          }
-        }
-        .right {
-          cursor: pointer;
-          display: flex;
-          justify-content: space-between;
-          flex-wrap: wrap;
-          margin-left: 0.2rem;
-          .item {
-            width: 3.78rem;
-            height: 2rem;
-            display: flex;
-            .item-left {
-              width: 0.83rem;
-              height: 100%;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              background: #eef1f8;
-              .img {
-                width: 0.56rem;
-                height: 0.56rem;
-                background-size: 100%;
-              }
-              .zj {
-                background: url('~@/assets/newHome/popular-zj.png') no-repeat;
-                background-size: contain;
-              }
-              .yy {
-                background: url('~@/assets/newHome/popular-yy.png') no-repeat;
-                background-size: contain;
-              }
-              .jc {
-                background: url('~@/assets/newHome/popular-jc.png') no-repeat;
-                background-size: contain;
-              }
-              .sj {
-                background: url('~@/assets/newHome/popular-sj.png') no-repeat;
-                background-size: contain;
-              }
-              .zs {
-                background: url('~@/assets/newHome/popular-zs.png') no-repeat;
-                background-size: contain;
-              }
-            }
-            .item-right {
               width: 100%;
-              height: 100%;
-              background: #fff;
-              .fw {
-                width: 100%;
-                padding-right: 0.1rem;
-                padding-top: 0.03rem;
-                text-align: right;
-                color: 666;
-                font-size: 0.14rem;
-                color: #666;
-              }
-              .name {
-                font-size: 0.18rem;
-                color: #212121;
-                text-align: center;
-                margin-top: 0.05rem;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-line-clamp: 1;
-                -webkit-box-orient: vertical;
-              }
-              .text {
-                width: 100%;
-                padding: 0.24rem 0.3rem;
-                font-size: 0.14rem;
-                color: #212121;
-                line-height: 0.24rem;
-                height: 1rem;
-                overflow: hidden;
-              }
+              padding: 0.24rem 0.3rem;
+              font-size: 0.14rem;
+              color: #212121;
+              line-height: 0.24rem;
+              height: 1rem;
+              overflow: hidden;
             }
           }
-          .item:nth-of-type(4),
-          .item:nth-of-type(5),
-          .item:nth-of-type(6) {
-            margin-top: 0.2rem;
-          }
-          .item:hover {
-            border-radius: 0.02rem;
-            border: 0.01rem solid #0058e1;
-            box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
-          }
         }
-      }
-      .bottom-btn {
-        cursor: pointer;
-        text-align: center;
-        margin-top: 0.24rem;
-        color: #fff;
-        width: 1rem;
-        height: 0.24rem;
-        line-height: 0.24rem;
-        margin-left: 6rem;
-        span {
-          display: inline-block;
-          width: 0.1rem;
-          height: 0.1rem;
-          background: url('~@/assets/newHome/gd.png') no-repeat;
-          background-size: contain;
+        .item:nth-of-type(4),
+        .item:nth-of-type(5),
+        .item:nth-of-type(6) {
+          margin-top: 0.2rem;
+        }
+        .item:hover {
+          border-radius: 0.02rem;
+          border: 0.01rem solid #0058e1;
+          box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
         }
-      }
-      .bottom-btn:hover {
-        background: rgba(0, 88, 225, 0.1);
       }
     }
+    .bottom-btn {
+      cursor: pointer;
+      text-align: center;
+      margin-top: 0.24rem;
+      color: #fff;
+      width: 1rem;
+      height: 0.24rem;
+      line-height: 0.24rem;
+      margin-left: 6rem;
+      span {
+        display: inline-block;
+        width: 0.1rem;
+        height: 0.1rem;
+        background: url('~@/assets/newHome/gd.png') no-repeat;
+        background-size: contain;
+      }
+    }
+    .bottom-btn:hover {
+      background: rgba(0, 88, 225, 0.1);
+    }
   }
+}
 </style>

From 47744311106d591cd2c7560f28357ca9231c48c6 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 11:25:56 +0800
Subject: [PATCH 05/31] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AtlasResources.vue               | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/AtlasResources.vue b/front/src/views/abilityStatistics/components/AtlasResources.vue
index 4c93e14a..9d9afe04 100644
--- a/front/src/views/abilityStatistics/components/AtlasResources.vue
+++ b/front/src/views/abilityStatistics/components/AtlasResources.vue
@@ -31,7 +31,9 @@
             v-for="(item, index) in bubbleList"
             :key="item.id"
             class="bubble-item"
-            @click.stop.prevent="index == 0 ? showDepartmentList() : ''"
+            @click.stop.prevent="
+              index == 0 ? showDepartmentList() : goToDetails(item)
+            "
           >
             <a-tooltip>
               <template #title>{{ item.name }}</template>
@@ -58,7 +60,7 @@
               </span>
             </nav>
           </article>
-          <p>查看更多&gt;</p>
+          <!-- <p>查看更多&gt;</p> -->
         </div>
         <div class="itemList" v-else-if="navSelect.indexOf('应用领域') > 0">
           <div class="item" v-for="item in dataList" :key="item.deptId">
@@ -136,6 +138,8 @@
     provideDeptTopN,
     applyDeptTopN,
   } from '@/api/abilityStatistics'
+  // import { useRouter } from 'vue-router'
+  // const router = useRouter()
   // 左侧导航
   const navList = ref([
     '能力共享方-应用领域',
@@ -149,6 +153,15 @@
   ])
   const navSelect = ref('能力共享方-应用领域')
   const departmentListFlag = ref(false)
+  const goToDetails = (item) => {
+    // console.log('点击气泡===============>', item)
+    // router.push({
+    //   path: '/details',
+    //   query: {
+    //     id: item.id,
+    //   },
+    // })
+  }
   // 点击导航
   const selectNav = (name) => {
     navSelect.value = name

From 617373eb8ef67ddab80d1ec809f54ee745cab3f2 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 7 Jul 2022 11:37:05 +0800
Subject: [PATCH 06/31] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E6=96=87=E6=A1=A3=E6=B7=BB=E5=8A=A0=E6=9A=82=E6=97=A0?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Algorithm/AlgorithmUsageMode.vue          |  20 +-
 .../components/Business/BusinessUsageMode.vue | 521 +++++++++---------
 .../LayerService/LayerServiceNavigation.vue   | 468 ++++++++--------
 .../LayerService/LayerServiceUsageMode.vue    |  37 +-
 4 files changed, 545 insertions(+), 501 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
index 9f43f6cb..380272aa 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@@ -65,6 +65,7 @@
 
 <script setup>
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import { message } from 'ant-design-vue'
   import { pinyin } from 'pinyin-pro'
   import { ref, defineProps, watch } from 'vue'
   let dataFrom = ref({
@@ -184,12 +185,19 @@
     let obj = props.dataList.infoList.filter(
       (item) => item.attrType === '技术文档'
     )[0]
-    console.log('dataFrom.value.link', obj.attrValue)
-    window.open(
-      window.SITE_CONFIG.previewUrl +
-        'hisense_office/onlinePreview?url=' +
-        btoa(encodeURI(obj.attrValue))
-    )
+    // console.log('dataFrom.value.link', obj.attrValue)
+    if (obj) {
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(obj.attrValue))
+      )
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('暂无上传技术文档')
+    }
   }
 </script>
 
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
index 053d6e75..e1e19e28 100644
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@@ -2,7 +2,10 @@
   <!-- 使用方式 -->
   <div class="usage-mode" v-if="flag">
     <div class="tltle">
-      <DetalsTitle :title="dataFrom.title" :type="dataFrom.englishTitle"></DetalsTitle>
+      <DetalsTitle
+        :title="dataFrom.title"
+        :type="dataFrom.englishTitle"
+      ></DetalsTitle>
     </div>
     <div class="content" v-for="item in dataFrom.content" :key="item.title">
       <div class="content-left">
@@ -84,281 +87,297 @@
 </template>
 
 <script setup>
-import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-import { pinyin } from 'pinyin-pro'
-import { ref, defineProps, watch } from 'vue'
-let dataFrom = ref({
-  title: '使用方式',
-  englishTitle: 'USAGE',
-  content: [
-    {
-      title: '组件地址',
-      link: {
-        name: '接口地址：',
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import { pinyin } from 'pinyin-pro'
+  import { ref, defineProps, watch } from 'vue'
+  import { message } from 'ant-design-vue'
+  let dataFrom = ref({
+    title: '使用方式',
+    englishTitle: 'USAGE',
+    content: [
+      {
+        title: '组件地址',
+        link: {
+          name: '接口地址：',
+        },
+        linkValue: '',
+        contact: '归属部门',
+        facilitator: { name: '归属部门：', value: '' },
+        people: { name: '部门联系人：', value: '' },
+        phone: {
+          name: '联系人电话：',
+          value: '',
+        },
+        contact2: '服务商',
+        facilitator2: { name: '服务商：', value: '' },
+        people2: { name: '服务商联系人：', value: '' },
+        phone2: {
+          name: '联系人电话：',
+          value: '',
+        },
       },
-      linkValue: '',
-      contact: '归属部门',
-      facilitator: { name: '归属部门：', value: '' },
-      people: { name: '部门联系人：', value: '' },
-      phone: {
-        name: '联系人电话：',
-        value: '',
-      },
-      contact2: '服务商',
-      facilitator2: { name: '服务商：', value: '' },
-      people2: { name: '服务商联系人：', value: '' },
-      phone2: {
-        name: '联系人电话：',
-        value: '',
-      },
-    },
-  ],
-})
-//数据初始化
-const props = defineProps({
-  dataList: { type: Object, default: null },
-})
-const flag = ref(true)
-if (props.dataList.infoList) {
-  let obj = props.dataList.infoList.filter(
-    (item) =>
-      item.attrType === '技术文档' ||
-      item.attrType === '服务商' ||
-      item.attrType === '服务商联系人' ||
-      item.attrType === '使用手册' ||
-      item.attrType === '服务地址' ||
-      item.attrType === '样式服务地址' ||
-      item.attrType === '服务商联系电话'
-  )[0]
-  if (!obj) {
-    flag.value = false
-  } else {
-    // eslint-disable-next-line vue/no-setup-props-destructure
-    dataFrom.value.content[0].link.value = props.dataList.apiUrl
-    dataFrom.value.content[0].facilitator.value = props.dataList.deptName
-    dataFrom.value.content[0].people.value = props.dataList.deptContacts
-    dataFrom.value.content[0].phone.value = props.dataList.deptPhone
-    console.log('dataList', props.dataList)
-    props.dataList.infoList.map((item) => {
-      if (item.attrType === '组件地址') {
-        dataFrom.value.content[0].linkValue = item.attrValue || '--'
-      } else if (item.attrType === '服务商') {
-        dataFrom.value.content[0].facilitator2.value = item.attrValue || '--'
-      } else if (item.attrType === '服务商联系人') {
-        dataFrom.value.content[0].people2.value = item.attrValue || '--'
-      } else if (item.attrType === '服务商联系电话') {
-        dataFrom.value.content[0].phone2.value = item.attrValue || '--'
-      }
-    })
-  }
-}
-watch(
-  () => props.dataList,
-  (val) => {
-    if (val) {
-      let obj = val.infoList.filter(
-        (item) =>
-          item.attrType === '技术文档' ||
-          item.attrType === '服务商' ||
-          item.attrType === '服务商联系人' ||
-          item.attrType === '使用手册' ||
-          item.attrType === '服务地址' ||
-          item.attrType === '样式服务地址' ||
-          item.attrType === '服务商联系电话'
-      )[0]
-      if (!obj) {
-        flag.value = false
-      } else {
-        dataFrom.value.content[0].link.value = val.apiUrl
-        dataFrom.value.content[0].facilitator.value = val.deptName
-        dataFrom.value.content[0].people.value = val.deptContacts
-        dataFrom.value.content[0].phone.value = val.deptPhone
-        console.log('dataList', val)
-        val.infoList.map((item) => {
-          if (item.attrType === '组件地址') {
-            dataFrom.value.content[0].linkValue = item.attrValue || '--'
-          } else if (item.attrType === '服务商') {
-            dataFrom.value.content[0].facilitator2.value =
-              item.attrValue || '--'
-          } else if (item.attrType === '服务商联系人') {
-            dataFrom.value.content[0].people2.value = item.attrValue || '--'
-          } else if (item.attrType === '服务商联系电话') {
-            dataFrom.value.content[0].phone2.value = item.attrValue || '--'
-          }
-        })
-      }
+    ],
+  })
+  //数据初始化
+  const props = defineProps({
+    dataList: { type: Object, default: null },
+  })
+  const flag = ref(true)
+  if (props.dataList.infoList) {
+    let obj = props.dataList.infoList.filter(
+      (item) =>
+        item.attrType === '技术文档' ||
+        item.attrType === '服务商' ||
+        item.attrType === '服务商联系人' ||
+        item.attrType === '使用手册' ||
+        item.attrType === '服务地址' ||
+        item.attrType === '样式服务地址' ||
+        item.attrType === '服务商联系电话'
+    )[0]
+    if (!obj) {
+      flag.value = false
+    } else {
+      // eslint-disable-next-line vue/no-setup-props-destructure
+      dataFrom.value.content[0].link.value = props.dataList.apiUrl
+      dataFrom.value.content[0].facilitator.value = props.dataList.deptName
+      dataFrom.value.content[0].people.value = props.dataList.deptContacts
+      dataFrom.value.content[0].phone.value = props.dataList.deptPhone
+      console.log('dataList', props.dataList)
+      props.dataList.infoList.map((item) => {
+        if (item.attrType === '组件地址') {
+          dataFrom.value.content[0].linkValue = item.attrValue || '--'
+        } else if (item.attrType === '服务商') {
+          dataFrom.value.content[0].facilitator2.value = item.attrValue || '--'
+        } else if (item.attrType === '服务商联系人') {
+          dataFrom.value.content[0].people2.value = item.attrValue || '--'
+        } else if (item.attrType === '服务商联系电话') {
+          dataFrom.value.content[0].phone2.value = item.attrValue || '--'
+        }
+      })
     }
   }
-)
-function technical() {
-  // 拼接路径
-  // const type = pinyin(props.dataList.type, {
-  //   pattern: 'initial',
-  // }).replace(/\s*/g, '')
-  // // 打开文档
-  // const id = props.dataList.id
-  // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
-  // console.log('dataFrom.value.link', dataFrom.value.link)
-  let obj = props.dataList.infoList.filter(
-    (item) => item.attrType === '技术文档'
-  )[0]
-  console.log('dataFrom.value.link', obj.attrValue)
-  window.open(
-    window.SITE_CONFIG.previewUrl +
-    'hisense_office/onlinePreview?url=' +
-    btoa(encodeURI(obj.attrValue))
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        let obj = val.infoList.filter(
+          (item) =>
+            item.attrType === '技术文档' ||
+            item.attrType === '服务商' ||
+            item.attrType === '服务商联系人' ||
+            item.attrType === '使用手册' ||
+            item.attrType === '服务地址' ||
+            item.attrType === '样式服务地址' ||
+            item.attrType === '服务商联系电话'
+        )[0]
+        if (!obj) {
+          flag.value = false
+        } else {
+          dataFrom.value.content[0].link.value = val.apiUrl
+          dataFrom.value.content[0].facilitator.value = val.deptName
+          dataFrom.value.content[0].people.value = val.deptContacts
+          dataFrom.value.content[0].phone.value = val.deptPhone
+          console.log('dataList', val)
+          val.infoList.map((item) => {
+            if (item.attrType === '组件地址') {
+              dataFrom.value.content[0].linkValue = item.attrValue || '--'
+            } else if (item.attrType === '服务商') {
+              dataFrom.value.content[0].facilitator2.value =
+                item.attrValue || '--'
+            } else if (item.attrType === '服务商联系人') {
+              dataFrom.value.content[0].people2.value = item.attrValue || '--'
+            } else if (item.attrType === '服务商联系电话') {
+              dataFrom.value.content[0].phone2.value = item.attrValue || '--'
+            }
+          })
+        }
+      }
+    }
   )
-}
-function technicalNew() {
-  // 拼接路径
-  // const type = pinyin(props.dataList.type, {
-  //   pattern: 'initial',
-  // }).replace(/\s*/g, '')
-  // // 打开文档
-  // const id = props.dataList.id
-  // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
-  let obj = props.dataList.infoList.filter(
-    (item) => item.attrType === '使用手册'
-  )[0]
-  console.log('dataFrom.value.link', obj.attrValue)
-  window.open(
-    window.SITE_CONFIG.previewUrl +
-    'hisense_office/onlinePreview?url=' +
-    btoa(encodeURI(obj.attrValue))
-  )
-}
+  function technical() {
+    // 拼接路径
+    // const type = pinyin(props.dataList.type, {
+    //   pattern: 'initial',
+    // }).replace(/\s*/g, '')
+    // // 打开文档
+    // const id = props.dataList.id
+    // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
+    // console.log('dataFrom.value.link', dataFrom.value.link)
+    let obj = props.dataList.infoList.filter(
+      (item) => item.attrType === '技术文档'
+    )[0]
+    if (obj) {
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(obj.attrValue))
+      )
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('暂无上传技术文档')
+    }
+  }
+  function technicalNew() {
+    // 拼接路径
+    // const type = pinyin(props.dataList.type, {
+    //   pattern: 'initial',
+    // }).replace(/\s*/g, '')
+    // // 打开文档
+    // const id = props.dataList.id
+    // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
+    let obj = props.dataList.infoList.filter(
+      (item) => item.attrType === '使用手册'
+    )[0]
+    console.log('dataFrom.value.link', obj.attrValue)
+    if (obj) {
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(obj.attrValue))
+      )
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('暂无上传使用手册')
+    }
+  }
 </script>
 
 <style lang="less" scoped>
-.usage-mode {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 0.8rem 0;
-
-  .content {
-    margin-top: 0.3rem;
+  .usage-mode {
     display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 0.8rem 0;
 
-    .content-left {
-      height: 1.5rem;
-      width: 6.2rem;
-      background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png') no-repeat;
-      background-position: center;
-      background-size: 100% 100%;
-      border-radius: 0.1rem;
-      margin-right: 0.6rem;
-      box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
+    .content {
+      margin-top: 0.3rem;
       display: flex;
-      align-items: center;
-      padding: 0 0.35rem;
 
-      .left {
-        .content-left-title {
-          font-size: 0.26rem;
-          line-height: 0.26rem;
-          color: #212956;
-          margin-bottom: 0.2rem;
+      .content-left {
+        height: 1.5rem;
+        width: 6.2rem;
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
+          no-repeat;
+        background-position: center;
+        background-size: 100% 100%;
+        border-radius: 0.1rem;
+        margin-right: 0.6rem;
+        box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
+        display: flex;
+        align-items: center;
+        padding: 0 0.35rem;
 
-          span:first-child {
-            margin-right: 0.1rem;
+        .left {
+          .content-left-title {
+            font-size: 0.26rem;
+            line-height: 0.26rem;
+            color: #212956;
+            margin-bottom: 0.2rem;
+
+            span:first-child {
+              margin-right: 0.1rem;
+            }
+          }
+
+          .content-left-content {
+            width: 4.2rem;
+            font-size: 0.2rem;
+            color: rgba(33, 41, 86, 0.8);
+            line-height: 0.2rem;
+
+            p {
+              display: -webkit-box;
+              margin-bottom: 0.1rem;
+
+              span:last-of-type {
+                width: 298px;
+                display: -webkit-box;
+                overflow: hidden;
+                -webkit-line-clamp: 1;
+                -webkit-box-orient: vertical;
+              }
+            }
           }
         }
 
-        .content-left-content {
-          width: 4.2rem;
-          font-size: 0.2rem;
+        .right {
+          div {
+            height: 0.4rem;
+            width: 1.3rem;
+            background: #ffffff;
+            border-radius: 0.2rem;
+            color: #526aff;
+            font-size: 0.2rem;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            cursor: pointer;
+          }
+
+          div:first-child {
+            margin-bottom: 0.2rem;
+          }
+        }
+      }
+
+      .content-right {
+        height: 1.5rem;
+        width: 6.2rem;
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
+          no-repeat;
+        background-position: center;
+        background-size: 100% 100%;
+        border-radius: 0.1rem;
+        box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        padding: 0 0.3rem;
+
+        .content-right-left {
+          border-right: 0.01rem solid #707fe0;
+          padding-right: 0.1rem;
+          margin-right: 0.1rem;
+        }
+
+        .content-right-title {
+          font-size: 0.26rem;
+          line-height: 0.26rem;
+          color: #212956;
+          margin-bottom: 0.15rem;
+        }
+
+        .content-right-content {
+          display: flex;
+          font-size: 0.16rem;
           color: rgba(33, 41, 86, 0.8);
           line-height: 0.2rem;
+          overflow: hidden;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          flex-direction: column;
 
           p {
+            // width: 1.60rem;
+            height: 0.2rem;
             display: -webkit-box;
-            margin-bottom: 0.1rem;
+            // overflow: hidden;
+            margin-bottom: 0.08rem;
+            white-space: nowrap;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            margin-right: 0.15rem;
 
-            span:last-of-type {
-              width: 298px;
-              display: -webkit-box;
-              overflow: hidden;
-              -webkit-line-clamp: 1;
-              -webkit-box-orient: vertical;
+            span {
+              cursor: pointer;
             }
           }
         }
       }
-
-      .right {
-        div {
-          height: 0.4rem;
-          width: 1.3rem;
-          background: #ffffff;
-          border-radius: 0.2rem;
-          color: #526aff;
-          font-size: 0.2rem;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          cursor: pointer;
-        }
-
-        div:first-child {
-          margin-bottom: 0.2rem;
-        }
-      }
-    }
-
-    .content-right {
-      height: 1.5rem;
-      width: 6.2rem;
-      background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png') no-repeat;
-      background-position: center;
-      background-size: 100% 100%;
-      border-radius: 0.1rem;
-      box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      padding: 0 0.3rem;
-
-      .content-right-left {
-        border-right: 0.01rem solid #707fe0;
-        padding-right: 0.1rem;
-        margin-right: 0.1rem;
-      }
-
-      .content-right-title {
-        font-size: 0.26rem;
-        line-height: 0.26rem;
-        color: #212956;
-        margin-bottom: 0.15rem;
-      }
-
-      .content-right-content {
-        display: flex;
-        font-size: 0.16rem;
-        color: rgba(33, 41, 86, 0.8);
-        line-height: 0.2rem;
-        overflow: hidden;
-        -webkit-line-clamp: 1;
-        -webkit-box-orient: vertical;
-        flex-direction: column;
-
-        p {
-          // width: 1.60rem;
-          height: 0.2rem;
-          display: -webkit-box;
-          // overflow: hidden;
-          margin-bottom: 0.08rem;
-          white-space: nowrap;
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          margin-right: 0.15rem;
-
-          span {
-            cursor: pointer;
-          }
-        }
-      }
     }
   }
-}
 </style>
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
index b0e395c3..b0585b8f 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
@@ -8,7 +8,12 @@
 <template>
   <div class="business-navigation" v-if="navList.length > 0">
     <template v-for="nav in navList" :key="nav.key">
-      <div class="nav" :class="{ select: nav.key == select }" v-if="nav.show" @click="selectNav(nav.key)">
+      <div
+        class="nav"
+        :class="{ select: nav.key == select }"
+        v-if="nav.show"
+        @click="selectNav(nav.key)"
+      >
         {{ nav.name }}
         <span class="line"></span>
       </div>
@@ -16,248 +21,247 @@
   </div>
 </template>
 <script setup>
-import { ref, defineProps, watch, getCurrentInstance } from 'vue'
-import { useRouter } from 'vue-router'
-import mybus from '@/myplugins/mybus'
-import { queryPartAppByKeyId2 } from '@/api/home'
-// 获取当前路由地址
-const router = useRouter()
-const keyId = router.currentRoute.value.query.id
-const navList = ref([
-  {
-    name: '图层展示',
-    key: 'service-presentation',
-  },
-  {
-    name: '图层信息',
-    key: 'service-information',
-  },
-  {
-    name: '应用场景',
-    key: 'service-application-scenarios',
-  },
-  {
-    name: '应用案例',
-    key: 'service-application-case',
-  },
-  {
-    name: '图层预览',
-    key: 'service-preview',
-  },
-  {
-    name: '使用方式',
-    key: 'service-usage-mode',
-  },
-  {
-    name: '常见问题',
-    key: 'service-common-problem',
-  },
-])
-const props = defineProps({
-  selectNow: { type: String, default: '' },
-  dataList: { type: Object, default: null },
-  associatedComponents: { type: Array, default: null },
-})
-const list = ref([])
-// 根据能力id查询是否存在关联应用
-if (keyId) {
-  queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
-    console.log('ressssssss', res)
-    if (res.data.data.length > 0) {
-      // 存在关联应用时在导航栏加入关联应用
-      navList.value.unshift({
-        name: '关联应用',
-        key: 'layer-service-associated-ability',
-        show: true,
-      })
-      list.value.unshift('关联应用')
-    }
+  import { ref, defineProps, watch, getCurrentInstance } from 'vue'
+  import { useRouter } from 'vue-router'
+  import mybus from '@/myplugins/mybus'
+  import { queryPartAppByKeyId2 } from '@/api/home'
+  // 获取当前路由地址
+  const router = useRouter()
+  const keyId = router.currentRoute.value.query.id
+  const navList = ref([
+    {
+      name: '图层展示',
+      key: 'service-presentation',
+    },
+    {
+      name: '图层信息',
+      key: 'service-information',
+    },
+    {
+      name: '应用场景',
+      key: 'service-application-scenarios',
+    },
+    {
+      name: '应用案例',
+      key: 'service-application-case',
+    },
+    {
+      name: '图层预览',
+      key: 'service-preview',
+    },
+    {
+      name: '使用方式',
+      key: 'service-usage-mode',
+    },
+    {
+      name: '常见问题',
+      key: 'service-common-problem',
+    },
+  ])
+  const props = defineProps({
+    selectNow: { type: String, default: '' },
+    dataList: { type: Object, default: null },
+    associatedComponents: { type: Array, default: null },
   })
-}
-const select = ref('layer-service-associated-ability')
-const selectNav = (key) => {
-  select.value = key
-  console.log(key, select.value)
-  mybus.emit('flyToView', select.value)
-}
-if (props.dataList.infoList) {
-  list.value = []
-  let arr = [
-    '图层缩略图',
-    '坐标系',
-    '应用场景',
-    '应用案例',
-    '是否可预览',
-    '使用方式',
-    '常见问题',
-  ]
-  // 排序
-  // eslint-disable-next-line vue/no-mutating-props
-  props.dataList.infoList.sort((a, b) => {
-    return arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
-  })
-  props.dataList.infoList.map((item) => {
-    if (
-      item.attrType === '常见问题' ||
-      item.attrType === '应用场景' ||
-      item.attrType === '应用案例'
-    ) {
-      list.value.push(item.attrType)
-    } else if (item.attrType === '图层缩略图') {
-      list.value.push('图层展示')
-    } else if (item.attrType === '是否可预览') {
-      if (item.attrValue === '是') {
-        list.value.push('图层预览')
+  const list = ref([])
+  // 根据能力id查询是否存在关联应用
+  if (keyId) {
+    queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
+      console.log('ressssssss', res)
+      if (res.data.data.length > 0) {
+        // 存在关联应用时在导航栏加入关联应用
+        navList.value.unshift({
+          name: '关联应用',
+          key: 'layer-service-associated-ability',
+          show: true,
+        })
+        list.value.unshift('关联应用')
       }
-    } else if (
-      item.attrType === '服务类型' ||
-      item.attrType === '覆盖区域' ||
-      item.attrType === '切片策略' ||
-      item.attrType === '坐标系' ||
-      item.attrType === '切片尺寸' ||
-      item.attrType === '最小级别' ||
-      item.attrType === '数据范围' ||
-      item.attrType === '图层类型' ||
-      item.attrType === '最大级别'
-    ) {
-      list.value.push('图层信息')
-    } else if (
-      item.attrType === '技术文档' ||
-      item.attrType === '服务商' ||
-      item.attrType === '服务商联系人' ||
-      item.attrType === '使用手册' ||
-      item.attrType === '服务地址' ||
-      item.attrType === '样式服务地址' ||
-      item.attrType === '服务商联系电话'
-    ) {
-      list.value.push('使用方式')
-    }
-  })
-  list.value.unshift('关联应用')
-  navList.value.forEach((item) => {
-    console.log(item)
-    if (list.value.indexOf(item.name) > -1) {
-      item.show = true
-    }
-  })
-  select.value = navList.value.filter(
-    (item) => item.name === list.value[0]
-  )[0].key
-  console.log('11111111111111111111111111', list.value, navList.value)
-}
-watch(
-  () => props.selectNow,
-  (newValue) => {
-    select.value = newValue
+    })
   }
-)
-watch(
-  () => props.dataList,
-  (val) => {
-    if (val) {
-      list.value = []
-      let arr = [
-        '图层缩略图',
-        '坐标系',
-        '应用场景',
-        '应用案例',
-        '是否可预览',
-        '使用方式',
-        '常见问题',
-      ]
-      // 排序
-      // eslint-disable-next-line vue/no-mutating-props
-      props.dataList.infoList.sort((a, b) => {
-        // console.log('排序==============>', a, b)
-        return arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
-      })
-      val.infoList.map((item) => {
-        if (
-          item.attrType === '常见问题' ||
-          item.attrType === '应用场景' ||
-          item.attrType === '应用案例'
-        ) {
-          list.value.push(item.attrType)
-        } else if (item.attrType === '图层缩略图') {
-          list.value.push('图层展示')
-        } else if (item.attrType === '是否可预览') {
-          if (item.attrValue === '是') {
-            list.value.push('图层预览')
+  const select = ref('layer-service-associated-ability')
+  const selectNav = (key) => {
+    select.value = key
+    console.log(key, select.value)
+    mybus.emit('flyToView', select.value)
+  }
+  if (props.dataList.infoList) {
+    list.value = []
+    let arr = [
+      '图层缩略图',
+      '坐标系',
+      '应用场景',
+      '应用案例',
+      '是否可预览',
+      '使用方式',
+      '常见问题',
+    ]
+    // 排序
+    // eslint-disable-next-line vue/no-mutating-props
+    props.dataList.infoList.sort((a, b) => {
+      return arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
+    })
+    props.dataList.infoList.map((item) => {
+      if (
+        item.attrType === '常见问题' ||
+        item.attrType === '应用场景' ||
+        item.attrType === '应用案例'
+      ) {
+        list.value.push(item.attrType)
+      } else if (item.attrType === '图层缩略图') {
+        list.value.push('图层展示')
+      } else if (item.attrType === '是否可预览') {
+        if (item.attrValue === '是') {
+          list.value.push('图层预览')
+        }
+      } else if (
+        item.attrType === '服务类型' ||
+        item.attrType === '覆盖区域' ||
+        item.attrType === '切片策略' ||
+        item.attrType === '坐标系' ||
+        item.attrType === '切片尺寸' ||
+        item.attrType === '最小级别' ||
+        item.attrType === '数据范围' ||
+        item.attrType === '图层类型' ||
+        item.attrType === '最大级别'
+      ) {
+        list.value.push('图层信息')
+      } else if (
+        item.attrType === '技术文档' ||
+        item.attrType === '服务商' ||
+        item.attrType === '服务商联系人' ||
+        item.attrType === '使用手册' ||
+        item.attrType === '服务地址' ||
+        item.attrType === '样式服务地址' ||
+        item.attrType === '服务商联系电话'
+      ) {
+        list.value.push('使用方式')
+      }
+    })
+    list.value.unshift('关联应用')
+    navList.value.forEach((item) => {
+      console.log(item)
+      if (list.value.indexOf(item.name) > -1) {
+        item.show = true
+      }
+    })
+    select.value = navList.value.filter(
+      (item) => item.name === list.value[0]
+    )[0].key
+    console.log('11111111111111111111111111', list.value, navList.value)
+  }
+  watch(
+    () => props.selectNow,
+    (newValue) => {
+      select.value = newValue
+    }
+  )
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        list.value = []
+        let arr = [
+          '图层缩略图',
+          '坐标系',
+          '应用场景',
+          '应用案例',
+          '是否可预览',
+          '使用方式',
+          '常见问题',
+        ]
+        // 排序
+        // eslint-disable-next-line vue/no-mutating-props
+        props.dataList.infoList.sort((a, b) => {
+          // console.log('排序==============>', a, b)
+          return arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
+        })
+        val.infoList.map((item) => {
+          if (
+            item.attrType === '常见问题' ||
+            item.attrType === '应用场景' ||
+            item.attrType === '应用案例'
+          ) {
+            list.value.push(item.attrType)
+          } else if (item.attrType === '图层缩略图') {
+            list.value.push('图层展示')
+          } else if (item.attrType === '是否可预览') {
+            if (item.attrValue === '是') {
+              list.value.push('图层预览')
+            }
+          } else if (
+            item.attrType === '服务类型' ||
+            item.attrType === '覆盖区域' ||
+            item.attrType === '切片策略' ||
+            item.attrType === '坐标系' ||
+            item.attrType === '切片尺寸' ||
+            item.attrType === '最小级别' ||
+            item.attrType === '数据范围' ||
+            item.attrType === '图层类型' ||
+            item.attrType === '最大级别'
+          ) {
+            list.value.push('图层信息')
+          } else if (
+            item.attrType === '技术文档' ||
+            item.attrType === '服务商' ||
+            item.attrType === '服务商联系人' ||
+            item.attrType === '使用手册' ||
+            item.attrType === '服务地址' ||
+            item.attrType === '样式服务地址' ||
+            item.attrType === '服务商联系电话'
+          ) {
+            list.value.push('使用方式')
           }
-        } else if (
-          item.attrType === '服务类型' ||
-          item.attrType === '覆盖区域' ||
-          item.attrType === '切片策略' ||
-          item.attrType === '坐标系' ||
-          item.attrType === '切片尺寸' ||
-          item.attrType === '最小级别' ||
-          item.attrType === '数据范围' ||
-          item.attrType === '图层类型' ||
-          item.attrType === '最大级别'
-        ) {
-          list.value.push('图层信息')
-        } else if (
-          item.attrType === '技术文档' ||
-          item.attrType === '服务商' ||
-          item.attrType === '服务商联系人' ||
-          item.attrType === '使用手册' ||
-          item.attrType === '服务地址' ||
-          item.attrType === '样式服务地址' ||
-          item.attrType === '服务商联系电话'
-        ) {
-          list.value.push('使用方式')
+        })
+        list.value.unshift('关联应用')
+        navList.value.forEach((item) => {
+          console.log(item)
+          if (list.value.indexOf(item.name) > -1) {
+            item.show = true
+          }
+        })
+        if (navList.value.filter((item) => item.name === list.value[0])[0]) {
+          select.value = navList.value.filter(
+            (item) => item.name === list.value[0]
+          )[0].key
         }
-      })
-      list.value.unshift('关联应用')
-      navList.value.forEach((item) => {
-        console.log(item)
-        if (list.value.indexOf(item.name) > -1) {
-          item.show = true
-        }
-      })
-      if (list.value.length > 0) {
-        select.value = navList.value.filter(
-          (item) => item.name === list.value[0]
-        )[0].key
       }
-      console.log('11111111111111111111111111', list.value, navList.value)
     }
-  }
-)
+  )
 </script>
 <style lang="less" scoped>
-.business-navigation {
-  width: 19.12rem;
-  height: 0.84rem;
-  line-height: 0.8rem;
-  display: flex;
-  justify-content: space-around;
-  font-size: 0.24rem;
-  color: #666;
-  background: #fff;
-  padding: 0 3rem;
-  box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
-  position: relative;
-
-  .nav {
-    cursor: pointer;
+  .business-navigation {
+    width: 19.12rem;
+    height: 0.84rem;
+    line-height: 0.8rem;
     display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: center;
+    justify-content: space-around;
+    font-size: 0.24rem;
+    color: #666;
+    background: #fff;
+    padding: 0 3rem;
+    box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
+    position: relative;
 
-    .line {
-      width: 0.4rem;
-      height: 0.04rem;
+    .nav {
+      cursor: pointer;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: center;
+
+      .line {
+        width: 0.4rem;
+        height: 0.04rem;
+      }
+    }
+
+    .select {
+      color: #526aff;
+
+      .line {
+        background: #526aff;
+      }
     }
   }
-
-  .select {
-    color: #526aff;
-
-    .line {
-      background: #526aff;
-    }
-  }
-}
 </style>
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index 089ff5c7..401fb247 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -90,6 +90,7 @@
 
 <script setup>
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import { message } from 'ant-design-vue'
   import { pinyin } from 'pinyin-pro'
   import { ref, defineProps, watch } from 'vue'
   let dataFrom = ref({
@@ -213,12 +214,18 @@
     let obj = props.dataList.infoList.filter(
       (item) => item.attrType === '技术文档'
     )[0]
-    console.log('dataFrom.value.link', obj.attrValue)
-    window.open(
-      window.SITE_CONFIG.previewUrl +
-        'hisense_office/onlinePreview?url=' +
-        btoa(encodeURI(obj.attrValue))
-    )
+    if (obj) {
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(obj.attrValue))
+      )
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('暂无上传技术文档')
+    }
   }
   function technicalNew() {
     // 拼接路径
@@ -231,12 +238,18 @@
     let obj = props.dataList.infoList.filter(
       (item) => item.attrType === '使用手册'
     )[0]
-    console.log('dataFrom.value.link', obj.attrValue)
-    window.open(
-      window.SITE_CONFIG.previewUrl +
-        'hisense_office/onlinePreview?url=' +
-        btoa(encodeURI(obj.attrValue))
-    )
+    if (obj) {
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(obj.attrValue))
+      )
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('暂上传使用手册')
+    }
   }
 </script>
 

From 73b9108c08168987baa46bdb8e19e407392cdca1 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 7 Jul 2022 16:46:48 +0800
Subject: [PATCH 07/31] =?UTF-8?q?469,=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abilityStatistics/components/ResourceAggregation.vue      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index a892d2b9..837b6885 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -147,6 +147,10 @@
           break
       }
     })
+    let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+    dataList.value.dataList.sort((a, b) => {
+      return arr.indexOf(a.type) - arr.indexOf(b.type)
+    })
   })
   let datas = ref([])
   let laiyuanDataList = ref([])

From 44479b25e93881bef5dd1f96a7c0d8c2611cd84b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 17:38:13 +0800
Subject: [PATCH 08/31] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue  |  12 +-
 .../home/components/searchResultList.vue      | 596 +++++++++---------
 2 files changed, 307 insertions(+), 301 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 71e324d8..2bb136a0 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -96,7 +96,7 @@
                 />
               </div>
             </div>
-            <div class="top-content">
+            <div class="top-content" v-if="Cardsname == '组件服务'">
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
@@ -106,6 +106,8 @@
                   >
                     申请
                   </a-checkable-tag>
+                </div>
+                <div class="leixingsum">
                   <a-checkable-tag
                     :checked="tagFlag == '免批申请'"
                     @change="() => chagneTag('免批申请')"
@@ -312,7 +314,7 @@
                 />
               </div>
             </div>
-            <div class="top-content">
+            <div class="top-content" v-if="Cardsname == '组件服务'">
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
@@ -322,6 +324,8 @@
                   >
                     申请
                   </a-checkable-tag>
+                </div>
+                <div class="leixingsum">
                   <a-checkable-tag
                     :checked="tagFlag == '免批申请'"
                     @change="() => chagneTag('免批申请')"
@@ -508,7 +512,7 @@
                 />
               </div>
             </div>
-            <div class="top-content">
+            <div class="top-content" v-if="Cardsname == '组件服务'">
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
@@ -518,6 +522,8 @@
                   >
                     申请
                   </a-checkable-tag>
+                </div>
+                <div class="leixingsum">
                   <a-checkable-tag
                     :checked="tagFlag == '免批申请'"
                     @change="() => chagneTag('免批申请')"
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index f80a88a9..56b63cf7 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -619,340 +619,340 @@
   }
 </script>
 <style scoped lang="less">
-#search-result-list-container {
-  width: 1088px;
-  padding: 0 20px;
-  background: #f3f5f9;
+  #search-result-list-container {
+    width: 1088px;
+    padding: 0 20px;
+    background: #f3f5f9;
 
-  .detail-content {
-    // 超出
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: 130px;
-    display: inline-block;
-  }
-
-  .shai-xuan {
-    width: 1047px;
-    height: 36px;
-    // margin: 11px 0 20px;
-    // background: #e5f2ff;
-    // padding-left: 20px;
-    display: flex;
-    align-items: center;
-    position: relative;
-
-    .circle {
-      width: 16px;
-      height: 16px;
-      border-radius: 50%;
-      background-color: #0087ff;
-      text-align: center;
-      color: #fff;
-      line-height: 16px;
-      margin-right: 21px;
+    .detail-content {
+      // 超出
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 130px;
+      display: inline-block;
     }
 
-    .result {
-      font-size: 14px;
-      font-weight: 500;
-      color: #212121;
-
-      span {
-        font-size: 18px;
-        color: #0087ff;
-      }
-    }
-
-    .condition {
-      position: absolute;
-      right: 20px;
-      top: 10px;
-
-      ul li {
-        list-style-type: none;
-      }
-
-      ul {
-        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;
-          }
-        }
-      }
-    }
-  }
-
-  .result-list {
-    width: 1048px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-    border-top: 1px rgba(150, 144, 144, 0.3) solid;
-    padding: 10px 0;
-
-    .item {
-      width: 100%;
-      margin-top: 10px;
+    .shai-xuan {
+      width: 1047px;
+      height: 36px;
+      // margin: 11px 0 20px;
+      // background: #e5f2ff;
+      // padding-left: 20px;
       display: flex;
       align-items: center;
+      position: relative;
 
-      .left {
-        display: inline-block;
-        width: 120px;
-        height: 110px;
-        margin-right: 16px;
+      .circle {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #0087ff;
+        text-align: center;
+        color: #fff;
+        line-height: 16px;
+        margin-right: 21px;
       }
 
-      .right {
-        width: 100%;
-      }
-
-      .yyzy {
-        background: url('~@/assets/home/yyzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .sjzy {
-        background: url('~@/assets/home/sjzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .znsf {
-        background: url('~@/assets/home/znsf_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .tcfw {
-        background: url('~@/assets/home/tcfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .kfzj {
-        background: url('~@/assets/home/kfzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .ywzj {
-        background: url('~@/assets/home/ywzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .header {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin: 0 10px 0 0;
-
-        .header-right {
-          display: flex;
-          font-size: 14px;
-          color: #212121;
-
-          span {
-            font-size: 14px;
-            color: #212121;
-          }
-
-          div {
-            margin-right: 24px;
-          }
-        }
-
-        .header-right:last-child {
-          div {
-            margin-right: 16px;
-          }
-        }
+      .result {
+        font-size: 14px;
+        font-weight: 500;
+        color: #212121;
 
         span {
-          font-size: 20px;
-          font-weight: 600;
-          // color: #0087ff;
+          font-size: 18px;
+          color: #0087ff;
         }
       }
 
-      .dec {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        // white-space: nowrap;
-        color: #0058e1;
-        display: flex;
-        margin-top: 10px;
+      .condition {
+        position: absolute;
+        right: 20px;
+        top: 10px;
 
-        div {
-          margin-right: 10px;
-          background: rgba(0, 88, 225, 0.1);
-          padding-left: 10px;
-          padding-right: 10px;
+        ul li {
+          list-style-type: none;
         }
 
-        div:nth-child(3) {
-          max-width: 200px;
-          display: -webkit-box;
-          /*设置为弹性盒子*/
-          -webkit-line-clamp: 1;
-          /*最多显示3行*/
-          overflow: hidden;
-          /*超出隐藏*/
-          text-overflow: ellipsis;
-          /*超出显示为省略号*/
-          -webkit-box-orient: vertical;
-        }
-      }
-
-      .btn {
-        display: flex;
-        justify-content: space-between;
-        font-size: 14px;
-        margin: 5px 0;
-
-        // .left {
-        //   width: 600px;
-        //   display: flex;
-        //   justify-content: space-between;
-        //   flex-wrap: wrap;
-        //   & > div {
-        //     width: 300px;
-        //     & > span {
-        //       color: #0087ff;
-        //       font-weight: 600;
-        //     }
-        //   }
-        // }
-        .right {
-          flex: 1;
+        ul {
           display: flex;
-          justify-content: flex-end;
-          margin: 0 10px;
-          align-items: center;
 
-          .shopping {
+          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;
+            }
+          }
+        }
+      }
+    }
+
+    .result-list {
+      width: 1048px;
+      display: flex;
+      flex-direction: column;
+      flex-wrap: wrap;
+      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+      border-top: 1px rgba(150, 144, 144, 0.3) solid;
+      padding: 10px 0;
+
+      .item {
+        width: 100%;
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+
+        .left {
+          display: inline-block;
+          width: 120px;
+          height: 110px;
+          margin-right: 16px;
+        }
+
+        .right {
+          width: 100%;
+        }
+
+        .yyzy {
+          background: url('~@/assets/home/yyzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .sjzy {
+          background: url('~@/assets/home/sjzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .znsf {
+          background: url('~@/assets/home/znsf_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .tcfw {
+          background: url('~@/assets/home/tcfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .kfzj {
+          background: url('~@/assets/home/kfzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .ywzj {
+          background: url('~@/assets/home/ywzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .header {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin: 0 10px 0 0;
+
+          .header-right {
+            display: flex;
+            font-size: 14px;
+            color: #212121;
+
             span {
+              font-size: 14px;
+              color: #212121;
+            }
+
+            div {
+              margin-right: 24px;
+            }
+          }
+
+          .header-right:last-child {
+            div {
+              margin-right: 16px;
+            }
+          }
+
+          span {
+            font-size: 20px;
+            font-weight: 600;
+            // color: #0087ff;
+          }
+        }
+
+        .dec {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          // white-space: nowrap;
+          color: #0058e1;
+          display: flex;
+          margin-top: 10px;
+
+          div {
+            margin-right: 10px;
+            background: rgba(0, 88, 225, 0.1);
+            padding-left: 10px;
+            padding-right: 10px;
+          }
+
+          div:nth-child(3) {
+            max-width: 200px;
+            display: -webkit-box;
+            /*设置为弹性盒子*/
+            -webkit-line-clamp: 1;
+            /*最多显示3行*/
+            overflow: hidden;
+            /*超出隐藏*/
+            text-overflow: ellipsis;
+            /*超出显示为省略号*/
+            -webkit-box-orient: vertical;
+          }
+        }
+
+        .btn {
+          display: flex;
+          justify-content: space-between;
+          font-size: 14px;
+          margin: 5px 0;
+
+          // .left {
+          //   width: 600px;
+          //   display: flex;
+          //   justify-content: space-between;
+          //   flex-wrap: wrap;
+          //   & > div {
+          //     width: 300px;
+          //     & > span {
+          //       color: #0087ff;
+          //       font-weight: 600;
+          //     }
+          //   }
+          // }
+          .right {
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+            margin: 0 10px;
+            align-items: center;
+
+            .shopping {
+              span {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                margin-right: 10px;
+                margin-top: 5px;
+              }
+
+              .shopping-on {
+                background: url('~@/assets/newHome/shopping-on.png');
+                cursor: pointer;
+              }
+
+              .shopping-down {
+                background: url('~@/assets/newHome/shopping-down.png');
+              }
+            }
+
+            .pk-on {
               display: inline-block;
               height: 32px;
               width: 32px;
+              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-            }
-
-            .shopping-on {
-              background: url('~@/assets/newHome/shopping-on.png');
+              background: url('~@/assets/newHome/pk-on.png');
               cursor: pointer;
             }
 
-            .shopping-down {
-              background: url('~@/assets/newHome/shopping-down.png');
-            }
-          }
-
-          .pk-on {
-            display: inline-block;
-            height: 32px;
-            width: 32px;
-            margin-left: 10px;
-            margin-right: 10px;
-            margin-top: 5px;
-            background: url('~@/assets/newHome/pk-on.png');
-            cursor: pointer;
-          }
-
-          .sc {
-            // margin-top: 4px;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-
-            .sc-down {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-down.png');
-            }
-
-            .sc-on {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-on.png');
-            }
-          }
-
-          .ant-btn {
-            background: transparent;
-            background: #0058e1;
-            color: white;
-            width: 80px;
-            height: 32px;
-            font-weight: 600;
-            border-radius: 2px;
-            text-align: center;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-left: 10px;
-          }
-
-          .ant-btn:last-child {
-            background: #0058e1;
-            color: white;
-          }
-        }
-      }
-
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 10px;
-        align-items: center;
-
-        & > div {
-          display: flex;
-          align-items: center;
-
-          & > div {
-            margin: 0 10px;
-          }
-        }
-
-        .pingfen {
-          :deep(span) {
-            display: flex;
-            align-items: center;
-
-            :deep(ul) {
+            .sc {
+              // margin-top: 4px;
+              cursor: pointer;
               display: flex;
               align-items: center;
 
-              :deep(.ant-rate-star:not(:last-child)) {
-                margin-right: 4px;
+              .sc-down {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-down.png');
+              }
+
+              .sc-on {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-on.png');
+              }
+            }
+
+            .ant-btn {
+              background: transparent;
+              background: #0058e1;
+              color: white;
+              width: 80px;
+              height: 32px;
+              font-weight: 600;
+              border-radius: 2px;
+              text-align: center;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-left: 10px;
+            }
+
+            .ant-btn:last-child {
+              background: #0058e1;
+              color: white;
+            }
+          }
+        }
+
+        .bottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 10px;
+          align-items: center;
+
+          & > div {
+            display: flex;
+            align-items: center;
+
+            & > div {
+              margin: 0 10px;
+            }
+          }
+
+          .pingfen {
+            :deep(span) {
+              display: flex;
+              align-items: center;
+
+              :deep(ul) {
+                display: flex;
+                align-items: center;
+
+                :deep(.ant-rate-star:not(:last-child)) {
+                  margin-right: 4px;
+                }
               }
             }
           }
         }
       }
-    }
 
-    .item:nth-of-type(1) {
-      margin-top: 0;
+      .item:nth-of-type(1) {
+        margin-top: 0;
+      }
     }
   }
-}
 </style>

From c271f3d98816e37e7af1f5b6570174f37425b4a4 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 17:54:41 +0800
Subject: [PATCH 09/31] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js      | 8 ++++----
 front/src/views/home/infrastructurePage.vue | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 19e1dbdb..f572dafa 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,13 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-05 20:08:53
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-07 17:41:25
  * @Description: 数据资源参数配置
  */
-//const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
- const newLocation = 'xihaian'
+//  const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7060d2e3..4f62afb9 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -9,7 +9,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-          @click="tabClick(index, itemContent, itemContent)"
+          @click="tabClick(index, itemContent, item)"
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1
@@ -253,6 +253,7 @@
   let tableHeight = ref('600')
   //tab切换点击事件
   const tabClick = (indexFather, name) => {
+    console.log(clickList.value, indexFather, name)
     selectedRowKeys.value = []
     selectedList.value = []
     if (clickList.value[indexFather].content.indexOf(name) != -1) {

From 420a31531fdd60d9a8007e3328d071690c7688f1 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 7 Jul 2022 18:17:31 +0800
Subject: [PATCH 10/31] =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 4f62afb9..b88cabc5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -5,7 +5,9 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
+        <a-button @click="nullClick" v-if="item.title == '视频标签'">
+          清空
+        </a-button>
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
@@ -539,6 +541,19 @@
       }
       .tabBox {
         margin-bottom: 0.16rem;
+        :deep(.ant-btn:active) {
+          color: unset;
+          border-color: unset;
+        }
+        :deep(.ant-btn) {
+          margin-left: 10px;
+          border: 1px solid #666666;
+          color: #666666;
+          border-radius: 10px;
+        }
+        :deep(.ant-btn:hover) {
+          color: #40a9ff;
+        }
       }
       .tabBox:last-of-type {
         margin-bottom: 0;

From dfa6c6a67bf82630d0d80cb3ee946ec6b80ae31a Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Thu, 7 Jul 2022 18:22:54 +0800
Subject: [PATCH 11/31] =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html                       | 16 ++++----
 front/public/static/config/location.js        |  6 +--
 front/src/store/modules/user.js               | 40 +++++++------------
 front/src/utils/request.js                    |  4 ++
 front/src/vab/plugins/permissions.js          | 20 +++++++---
 front/src/views/home/infrastructurePage.vue   |  2 +-
 .../components/CapabilityConvergence.vue      |  2 +-
 7 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/front/public/index.html b/front/public/index.html
index 897e6d73..7530e93e 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
@@ -45,10 +45,10 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 19e1dbdb..7a90265f 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -2,12 +2,12 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-05 20:08:53
+ * @LastEditTime: 2022-07-07 17:30:10
  * @Description: 数据资源参数配置
  */
-//const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
- const newLocation = 'xihaian'
+// const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index f8dc9bb2..9679476e 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -113,31 +113,21 @@ const actions = {
    * @param {*} { commit, dispatch, state }
    * @returns
    */
-  async getUserInfo({ commit }) {
-    const { data } = await getUserInfo()
-    if (!data) {
-      message.error(`验证失败，请重新登录...`)
-      return false
-    }
-    // debugger
-    commit('setUsername', data.data.username)
-    commit('setRole', data.data.roleIdList.length)
-    commit('setUserId', data.data.id)
-    // TODO 获取用户信息，后续执行部分操作
-    // let { username, avatar, roles, ability } = data
-    // if (username && roles && Array.isArray(roles)) {
-    //   dispatch('acl/setRole', roles, {
-    //     root: true,
-    //   })
-    //   if (ability && ability.length > 0)
-    //     dispatch('acl/setAbility', ability, {
-    //       root: true,
-    //     })
-    //   commit('setUsername', username)
-    //   commit('setAvatar', avatar)
-    // } else {
-    //   message.error('用户信息接口异常')
-    // }
+  getUserInfo({ commit }) {
+    return new Promise((resolve, reject)=>{
+      getUserInfo().then( (res) =>{
+        console.log('res', res)
+        const data = res.data
+        if (!data) {
+          message.error(`验证失败，请重新登录...`)
+          reject()
+        }
+        commit('setUsername', data.data.username)
+        commit('setRole', data.data.roleIdList.length)
+        commit('setUserId', data.data.id)
+        resolve()
+      })
+    })
   },
 
   /**
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index 021c203b..581dbef8 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -114,10 +114,14 @@ instance.interceptors.response.use(
         location.reload()
       }, 1000)
     }
+    debugger;
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
     if (response.headers.token) {
       setAccessToken(response.headers.token)
+      debugger
+      // setAccessToken(response.headers.token)
+      //  store.dispatch('user/getUserInfo')
     } else {
       if (response.headers.redirect) {
         // window.location.href = response.headers.redirect
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index f417ba89..ac6117bc 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 09:54:19
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-07 18:15:38
  * @Description: 告诉大家这是什么
  */
 /**
@@ -20,6 +20,7 @@ import {
 } from '@/config'
 import { setAccessToken, getAccessToken } from '@/utils/accessToken'
 router.beforeEach(async (to, from, next) => {
+  // 初始化拦截
   // debugger
   // const SSOTOKEN = to.query.SSOToken
   // if (SSOTOKEN) {
@@ -29,11 +30,14 @@ router.beforeEach(async (to, from, next) => {
   // console.log('token', token)
   let hasToken = token || store.getters['user/accessToken']
   // debugger
+  // 未开启登录拦截状态
   if (!loginInterception) hasToken = true
   // console.log('hasToken存在巨大问题', hasToken)
+  debugger
   if (hasToken) {
-    setAccessToken(hasToken)
+    setAccessToken(token)
     await store.dispatch('user/getUserInfo')
+    debugger
     next()
   } else {
     let accessRoutes = []
@@ -44,11 +48,17 @@ router.beforeEach(async (to, from, next) => {
     if (routesWhiteList.indexOf(to.path) !== -1) {
       next()
     } else {
-      await store.dispatch('user/getUserInfo')
+      store.dispatch('user/getUserInfo').then((res)=>{
+        debugger
+        next()
+      })
       // if (recordRoute)
       //   next({ path: '/login', query: { redirect: to.path }, replace: true })
       // else next({ path: '/login', replace: true })
-      next()
+      // debugger
+      // setTimeout(()=>{
+      //   next()
+      // }, 500)
       // window.open('http://www.baidu.com', '_self')
     }
   }
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7060d2e3..626f905e 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -9,7 +9,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-          @click="tabClick(index, itemContent, itemContent)"
+          @click="tabClick(index, item.title)"
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 9b195a16..0a49b255 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -162,7 +162,7 @@
     } else {
       let type = paramsGetResources.type
       if (type == '基础设施') {
-        selectInfrastructureList().then((res) => {
+          selectInfrastructureList().then((res) => {
           console.log('基础设施==========>', res.data.data)
           for (const key in res.data.data) {
             jcList.value.push({

From 74187e4623dc9486908c1b1f8f9be3e8326ad025 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 7 Jul 2022 19:07:56 +0800
Subject: [PATCH 12/31] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 24 ++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7060d2e3..60c76190 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -9,7 +9,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-          @click="tabClick(index, itemContent, itemContent)"
+          @click="tabClick(index, itemContent)"
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1
@@ -115,8 +115,8 @@
 </template>
 <script setup>
   import VideoSurveillance from '@/views/home/videoSurveillance'
-  import { getCategoryTreePage } from '@/api/personalCenter'
-  import { dataType } from 'element-plus/es/components/table-v2/src/common'
+  // import { getCategoryTreePage } from '@/api/personalCenter'
+  // import { dataType } from 'element-plus/es/components/table-v2/src/common'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import { ref, reactive, onMounted } from 'vue'
@@ -243,7 +243,7 @@
       clickList.value.push(params)
     })
     mybus.off('tranferToList')
-    mybus.on('tranferToList', (data) => {
+    mybus.on('tranferToList', () => {
       console.log('获取到的列表数据')
     })
   }
@@ -338,7 +338,11 @@
     })
     console.log('选中的标签code', mapSearchParam.value)
     mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-    if (name == '视频资源') {
+    let fatherName = ref('视频资源')
+    if (name == '视频资源' || name == '云资源' || name == '感知资源') {
+      fatherName.value == name
+    }
+    if (fatherName.value == '视频资源') {
       getCamera()
     } else {
       dataSource.value = []
@@ -392,10 +396,10 @@
       message.error('请选择需要申请的数据')
     }
   }
-  // 添加至购物车
-  const addShopCar = () => {
-    console.log('添加至购物车')
-  }
+  // // 添加至购物车
+  // const addShopCar = () => {
+  //   console.log('添加至购物车')
+  // }
   const getCamera = () => {
     console.log('初始化调用')
     getCameraByParentId(mapSearchParam.value).then((res) => {
@@ -442,7 +446,7 @@
       key: 'channelId',
     },
   ])
-  const allClick = ref([])
+  // const allClick = ref([])
   const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
     console.log('hahhahah', record, selected, selectedRows, nativeEvent)
     if (selected) {

From 2ffb67b235889a91523eef93cf281c110b698cd3 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 7 Jul 2022 19:15:27 +0800
Subject: [PATCH 13/31] no message

---
 front/src/views/home/infrastructurePage.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 2d3ef2e8..b88cabc5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -11,11 +11,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-<<<<<<< HEAD
-          @click="tabClick(index, item.title)"
-=======
           @click="tabClick(index, itemContent, item)"
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1

From e40efaf30ed741e8c3a55386f3fec2dfb623e626 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 7 Jul 2022 20:00:03 +0800
Subject: [PATCH 14/31] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index b88cabc5..ab2478d5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -341,12 +341,22 @@
     })
     console.log('选中的标签code', mapSearchParam.value)
     mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-    if (name == '视频资源') {
+    let fatherName = ref('视频资源')
+    if (name == '视频资源' || name == '云资源' || name == '感知资源') {
+      fatherName.value == name
+    }
+    if (fatherName.value == '视频资源') {
       getCamera()
     } else {
       dataSource.value = []
       pagination.value.total = 0
     }
+    // if (name == '视频资源') {
+    //   getCamera()
+    // } else {
+    //   dataSource.value = []
+    //   pagination.value.total = 0
+    // }
   }
   // 清空
   const nullClick = () => {

From 4958384c9ae82a68fed644ce601cb6289fd1b4cc Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 7 Jul 2022 20:35:13 +0800
Subject: [PATCH 15/31] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Algorithm/AlgorithmTopDetails.vue         |  12 +-
 .../ApplicationDeploymentAndSecurity.vue      | 328 +++++++-------
 .../Application/ApplicationTopDetails.vue     |  12 +-
 .../Business/BusinessTopDetails.vue           | 419 +++++++++---------
 .../Developer/DeveloperTopDetails.vue         |  12 +-
 .../LayerService/LayerServiceTopDetails.vue   |  12 +-
 6 files changed, 423 insertions(+), 372 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index 06303258..24869e6f 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -18,11 +18,15 @@
         <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
             </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
           </p>
         </div>
         <!-- <span class="label">免费</span> -->
diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
index 135cff66..81ad5792 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@@ -2,17 +2,34 @@
 <template>
   <div class="application-deployment-and-security">
     <div class="title">
-      <DetalsTitle :title="dataFrom.title" :type="dataFrom.englishTitle"></DetalsTitle>
+      <DetalsTitle
+        :title="dataFrom.title"
+        :type="dataFrom.englishTitle"
+      ></DetalsTitle>
     </div>
     <div class="content">
-      <div v-for="(item, index) in dataFrom.content" :key="index" class="content-card">
+      <div
+        v-for="(item, index) in dataFrom.content"
+        :key="index"
+        class="content-card"
+      >
         <div class="card-title">{{ item.childrenTitle }}</div>
         <div class="card-content">
-          <div v-for="carditem in item.childrenContent" :key="carditem">
+          <div
+            v-for="carditem in item.childrenContent"
+            :key="carditem"
+            :class="
+              carditem.attrType == '访问地址' ? 'access-to-the-address' : ''
+            "
+          >
             <span>{{ carditem.attrType }}：</span>
             <a-tooltip>
               <template #title>{{ carditem.attrValue }}</template>
-              <span>{{ carditem.attrValue }}</span>
+              <span
+                @click="addressFunction(carditem.attrType, carditem.attrValue)"
+              >
+                {{ carditem.attrValue }}
+              </span>
             </a-tooltip>
           </div>
         </div>
@@ -22,176 +39,187 @@
 </template>
 
 <script setup>
-import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-import { ref, defineProps, watch } from 'vue'
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import { ref, defineProps, watch } from 'vue'
 
-let dataFrom = ref({
-  title: '部署与安全',
-  englishTitle: 'DEPLOY&SAFE',
-  content: [
-    {
-      childrenTitle: '部署',
-      childrenContent: [],
-    },
-    {
-      childrenTitle: '安全',
-      childrenContent: [],
-    },
-  ],
-})
-//数据初始化
-const props = defineProps({
-  dataList: { type: Object, default: null },
-})
-if (props.dataList.infoList) {
-  props.dataList.infoList.map((item) => {
-    if (
-      item.attrType === '部署区域' ||
-      item.attrType === '是否统一登录' ||
-      item.attrType === '部署位置'
-    ) {
-      dataFrom.value.content[0].childrenContent.push(item)
-    } else if (
-      item.attrType === '是否等保备案' ||
-      item.attrType === '等保定级'
-    ) {
-      dataFrom.value.content[1].childrenContent.push(item)
-    } else if (item.attrType === '访问地址') {
-      let obj = {
-        attrType: '访问地址',
-        attrValue: item.attrValue || '------',
-      }
-      dataFrom.value.content[0].childrenContent.push(obj)
-    }
+  let dataFrom = ref({
+    title: '部署与安全',
+    englishTitle: 'DEPLOY&SAFE',
+    content: [
+      {
+        childrenTitle: '部署',
+        childrenContent: [],
+      },
+      {
+        childrenTitle: '安全',
+        childrenContent: [],
+      },
+    ],
   })
-  if (dataFrom.value.content[1].childrenContent.length <= 0) {
-    let data = [
-      {
-        attrType: '是否等保备案',
-        attrValue: '------',
-      },
-      {
-        attrType: '等保定级',
-        attrValue: '------',
-      },
-    ]
-    data.map((itemContent) => {
-      dataFrom.value.content[1].childrenContent.push(itemContent)
-    })
-  }
-}
-watch(
-  () => props.dataList,
-  (val) => {
-    if (val) {
-      dataFrom.value.content[0].childrenContent = []
-      dataFrom.value.content[1].childrenContent = []
-      props.dataList.infoList.map((item) => {
-        if (
-          item.attrType === '部署区域' ||
-          item.attrType === '是否统一登录' ||
-          item.attrType === '部署位置'
-        ) {
-          dataFrom.value.content[0].childrenContent.push(item)
-        } else if (
-          item.attrType === '是否等保备案' ||
-          item.attrType === '等保定级'
-        ) {
-          dataFrom.value.content[1].childrenContent.push(item)
-        } else if (item.attrType === '访问地址') {
-          let obj = {
-            attrType: '访问地址',
-            attrValue: item.attrValue || '------',
-          }
-          dataFrom.value.content[0].childrenContent.push(obj)
+  //数据初始化
+  const props = defineProps({
+    dataList: { type: Object, default: null },
+  })
+  if (props.dataList.infoList) {
+    props.dataList.infoList.map((item) => {
+      if (
+        item.attrType === '部署区域' ||
+        item.attrType === '是否统一登录' ||
+        item.attrType === '部署位置'
+      ) {
+        dataFrom.value.content[0].childrenContent.push(item)
+      } else if (
+        item.attrType === '是否等保备案' ||
+        item.attrType === '等保定级'
+      ) {
+        dataFrom.value.content[1].childrenContent.push(item)
+      } else if (item.attrType === '访问地址') {
+        let obj = {
+          attrType: '访问地址',
+          attrValue: item.attrValue || '------',
         }
-      })
-      if (dataFrom.value.content[1].childrenContent.length <= 0) {
-        let data = [
-          {
-            attrType: '是否等保备案',
-            attrValue: '------',
-          },
-          {
-            attrType: '等保定级',
-            attrValue: '------',
-          },
-        ]
-        data.map((itemContent) => {
-          dataFrom.value.content[1].childrenContent.push(itemContent)
-        })
+        dataFrom.value.content[0].childrenContent.push(obj)
       }
-      // let obj = {
-      //   attrType: '访问地址',
-      //   attrValue: props.dataList.link || '------',
-      // }
-      // dataFrom.value.content[0].childrenContent.push(obj)
+    })
+    if (dataFrom.value.content[1].childrenContent.length <= 0) {
+      let data = [
+        {
+          attrType: '是否等保备案',
+          attrValue: '------',
+        },
+        {
+          attrType: '等保定级',
+          attrValue: '------',
+        },
+      ]
+      data.map((itemContent) => {
+        dataFrom.value.content[1].childrenContent.push(itemContent)
+      })
     }
   }
-)
+  //访问地址跳转方法
+  const addressFunction = (name, itemValue) => {
+    if (name == '访问地址') {
+      window.open(itemValue)
+    }
+  }
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        dataFrom.value.content[0].childrenContent = []
+        dataFrom.value.content[1].childrenContent = []
+        props.dataList.infoList.map((item) => {
+          if (
+            item.attrType === '部署区域' ||
+            item.attrType === '是否统一登录' ||
+            item.attrType === '部署位置'
+          ) {
+            dataFrom.value.content[0].childrenContent.push(item)
+          } else if (
+            item.attrType === '是否等保备案' ||
+            item.attrType === '等保定级'
+          ) {
+            dataFrom.value.content[1].childrenContent.push(item)
+          } else if (item.attrType === '访问地址') {
+            let obj = {
+              attrType: '访问地址',
+              attrValue: item.attrValue || '------',
+            }
+            dataFrom.value.content[0].childrenContent.push(obj)
+          }
+        })
+        if (dataFrom.value.content[1].childrenContent.length <= 0) {
+          let data = [
+            {
+              attrType: '是否等保备案',
+              attrValue: '------',
+            },
+            {
+              attrType: '等保定级',
+              attrValue: '------',
+            },
+          ]
+          data.map((itemContent) => {
+            dataFrom.value.content[1].childrenContent.push(itemContent)
+          })
+        }
+        // let obj = {
+        //   attrType: '访问地址',
+        //   attrValue: props.dataList.link || '------',
+        // }
+        // dataFrom.value.content[0].childrenContent.push(obj)
+      }
+    }
+  )
 </script>
 
 <style lang="less" scoped>
-.application-deployment-and-security {
-  padding: 0.8rem 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .title {
-    margin-bottom: 0.3rem;
-  }
-
-  .content {
+  .application-deployment-and-security {
+    padding: 0.8rem 0;
     display: flex;
-    width: 13rem;
-    justify-content: space-between;
+    flex-direction: column;
+    align-items: center;
 
-    .content-card {
-      height: 1.5rem;
-      width: 6.2rem;
-      border-radius: 0.2rem;
-      background: linear-gradient(to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
-      padding: 0 0.3rem;
+    .title {
+      margin-bottom: 0.3rem;
+    }
+
+    .content {
       display: flex;
-      flex-direction: column;
-      justify-content: center;
+      width: 13rem;
+      justify-content: space-between;
 
-      .card-title {
-        font-size: 0.26rem;
-        line-height: 0.26rem;
-        color: #212956;
-        margin-bottom: 0.2rem;
-      }
+      .content-card {
+        height: 1.5rem;
+        width: 6.2rem;
+        border-radius: 0.2rem;
+        background: linear-gradient(
+          to right,
+          rgba(113, 132, 252, 0.4),
+          rgba(148, 163, 252, 0.4)
+        );
+        padding: 0 0.3rem;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
 
-      .card-content {
-        div {
-          display: inline-block;
-          margin-right: 0.7rem;
-          color: rgba(33, 41, 86, 0.8);
-          font-size: 0.2rem;
-          line-height: 0.2rem;
-          max-width: 5.84rem;
-          overflow: hidden;
-          /*超出的隐藏*/
-          white-space: nowrap;
-          text-overflow: ellipsis;
+        .card-title {
+          font-size: 0.26rem;
+          line-height: 0.26rem;
+          color: #212956;
+          margin-bottom: 0.2rem;
+        }
 
-          /*超出的设置为省略号*/
-          span {
+        .card-content {
+          div {
             display: inline-block;
-            max-width: 4rem;
+            margin-right: 0.7rem;
+            color: rgba(33, 41, 86, 0.8);
+            font-size: 0.2rem;
+            line-height: 0.2rem;
+            max-width: 5.84rem;
             overflow: hidden;
             /*超出的隐藏*/
             white-space: nowrap;
             text-overflow: ellipsis;
+
             /*超出的设置为省略号*/
+            span {
+              display: inline-block;
+              max-width: 4rem;
+              overflow: hidden;
+              /*超出的隐藏*/
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              /*超出的设置为省略号*/
+            }
+          }
+          .access-to-the-address {
+            cursor: pointer;
           }
         }
       }
     }
   }
-}
 </style>
diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
index b63bb510..6a5816ae 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@@ -18,9 +18,15 @@
         <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
-            <span class="label">{{ props.dataList.type }}</span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
+            </span>
           </p>
         </div>
         <!-- <span class="label">免费</span> -->
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index 6a919c09..ca179210 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -18,11 +18,15 @@
         <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
             </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
           </p>
         </div>
         <!-- <span class="label">免费</span> -->
@@ -59,215 +63,216 @@
   </div>
 </template>
 <script setup>
-import { ShoppingCartOutlined } from '@ant-design/icons-vue'
-import { defineProps, ref, watch } from 'vue'
-import { scInsert } from '@/api/personalCenter'
-import { sgcInsert } from '@/api/home'
-import { useRouter } from 'vue-router'
-import mybus from '@/myplugins/mybus'
-import { message } from 'ant-design-vue'
-const props = defineProps({
-  dataList: { type: Object, default: null },
-})
-const router = useRouter()
-const businessArea = ref('')
-// // 加入申购车
-const addShoppingCart = () => {
-  console.log('加入申购车==================>', props.dataList)
-  sgcInsert({
-    delFlag: '0',
-    resourceId: props.dataList.id,
-    // userId: userId.value,
-  }).then((res) => {
-    console.log(res)
-    message.success('添加申购车成功！')
-    mybus.emit('getSgcNum')
+  import { ShoppingCartOutlined } from '@ant-design/icons-vue'
+  import { defineProps, ref, watch } from 'vue'
+  import { scInsert } from '@/api/personalCenter'
+  import { sgcInsert } from '@/api/home'
+  import { useRouter } from 'vue-router'
+  import mybus from '@/myplugins/mybus'
+  import { message } from 'ant-design-vue'
+  const props = defineProps({
+    dataList: { type: Object, default: null },
   })
-}
-// // 立即申请
-function toView() {
-  // window.open(newpage.href, '_blank')
-  console.log('一键申请===================>', props.dataList)
-  localStorage.setItem(
-    'applyList',
-    JSON.stringify([
-      {
-        arr: [
-          {
-            delFlag: props.dataList.delFlag,
-            description: props.dataList.description,
-            resourceId: props.dataList.id,
-            resourceName: props.dataList.name,
-            time: props.dataList.createDate,
-            type: props.dataList.type,
-            componentType: '业务组件',
-          },
-        ],
-        deptId: props.dataList.deptId,
-        deptName: props.dataList.deptName,
-      },
-    ])
-  )
-  router.push({
-    path: '/apply',
-  })
-}
-// 收藏
-const goTOCollection = () => {
-  console.log('收藏===================》', props.dataList)
-  scInsert([{ resourceId: props.dataList.id }]).then((res) => {
-    console.log(res)
-    message.success('收藏成功')
-  })
-}
-const componentType = ref('')
-if (props.dataList.infoList) {
-  businessArea.value = props.dataList.infoList.filter(
-    (val) => val.attrType === '应用领域'
-  )[0].attrValue
-  let obj = props.dataList.infoList.filter(
-    (val) => val.attrType === '组件类型'
-  )[0]
-  if (obj) {
-    componentType.value = obj.attrValue
+  const router = useRouter()
+  const businessArea = ref('')
+  // // 加入申购车
+  const addShoppingCart = () => {
+    console.log('加入申购车==================>', props.dataList)
+    sgcInsert({
+      delFlag: '0',
+      resourceId: props.dataList.id,
+      // userId: userId.value,
+    }).then((res) => {
+      console.log(res)
+      message.success('添加申购车成功！')
+      mybus.emit('getSgcNum')
+    })
   }
-}
-watch(
-  () => props.dataList,
-  (val) => {
-    if (val) {
-      businessArea.value = props.dataList.infoList.filter(
-        (val) => val.attrType === '应用领域'
-      )[0].attrValue
-      let obj = props.dataList.infoList.filter(
-        (val) => val.attrType === '组件类型'
-      )[0]
-      if (obj) {
-        componentType.value = obj.attrValue
-      }
+  // // 立即申请
+  function toView() {
+    // window.open(newpage.href, '_blank')
+    console.log('一键申请===================>', props.dataList)
+    localStorage.setItem(
+      'applyList',
+      JSON.stringify([
+        {
+          arr: [
+            {
+              delFlag: props.dataList.delFlag,
+              description: props.dataList.description,
+              resourceId: props.dataList.id,
+              resourceName: props.dataList.name,
+              time: props.dataList.createDate,
+              type: props.dataList.type,
+              componentType: '业务组件',
+            },
+          ],
+          deptId: props.dataList.deptId,
+          deptName: props.dataList.deptName,
+        },
+      ])
+    )
+    router.push({
+      path: '/apply',
+    })
+  }
+  // 收藏
+  const goTOCollection = () => {
+    console.log('收藏===================》', props.dataList)
+    scInsert([{ resourceId: props.dataList.id }]).then((res) => {
+      console.log(res)
+      message.success('收藏成功')
+    })
+  }
+  const componentType = ref('')
+  if (props.dataList.infoList) {
+    businessArea.value = props.dataList.infoList.filter(
+      (val) => val.attrType === '应用领域'
+    )[0].attrValue
+    let obj = props.dataList.infoList.filter(
+      (val) => val.attrType === '组件类型'
+    )[0]
+    if (obj) {
+      componentType.value = obj.attrValue
     }
   }
-)
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        businessArea.value = props.dataList.infoList.filter(
+          (val) => val.attrType === '应用领域'
+        )[0].attrValue
+        let obj = props.dataList.infoList.filter(
+          (val) => val.attrType === '组件类型'
+        )[0]
+        if (obj) {
+          componentType.value = obj.attrValue
+        }
+      }
+    }
+  )
 </script>
 <style lang="less" scoped>
-.algorithm-top-details {
-  height: 6rem;
-  padding: 1.8rem 0 0;
-  background: url('~@/assets/detailsAll/sf_top_bg.png') no-repeat;
-  background-size: 100%;
-  display: flex;
-  justify-content: center;
-
-  .left {
-    max-width: 7.2rem;
-    color: #fff;
-    margin-right: 0.8rem;
-
-    .top {
-      display: flex;
-      align-items: center;
-
-      span {
-        font-size: 0.14rem;
-      }
-
-      .name {
-        // max-width: 3.3rem;
-        // overflow: hidden;
-        // text-overflow: ellipsis;
-        // white-space: nowrap;
-        font-size: 0.4rem;
-        margin-right: 0.2rem;
-        max-width: 7rem;
-        text-overflow: -o-ellipsis-lastline;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 1;
-        -webkit-box-orient: vertical;
-      }
-
-      .label-content {
-        position: relative;
-      }
-
-      .lable-father {
-        position: absolute;
-        min-width: 3.5rem;
-        right: -3.5rem;
-        top: 0;
-      }
-
-      .label {
-        padding: 0.01rem 0.1rem;
-        margin-right: 0.1rem;
-        border-radius: 0.13rem;
-        background: rgba(255, 255, 255, 0.4);
-      }
-    }
-
-    .main {
-      margin-top: 0.2rem;
-      font-size: 0.18rem;
-      line-height: 0.34rem;
-
-      &>div:nth-of-type(1) {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-
-      &>div:nth-of-type(2) {
-        max-height: 1rem;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 3;
-        -webkit-box-orient: vertical;
-      }
-    }
-
-    .bottom {
-      margin-top: 0.4rem;
-      display: flex;
-
-      .ant-btn {
-        height: 0.5rem;
-        margin-right: 0.2rem;
-        background: #ffffff;
-        border-radius: 0.06rem;
-        font-size: 0.2rem;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-
-      .ant-btn-primary {
-        color: #1890ff;
-      }
-
-      .ant-btn:nth-of-type(1) {
-        width: 1.8rem;
-      }
-
-      .ant-btn:nth-of-type(2) {
-        width: 2.2rem;
-      }
-
-      .ant-btn:nth-of-type(3) {
-        width: 1.45rem;
-        background: #fff;
-        color: #526aff;
-      }
-    }
-  }
-
-  .right {
-    width: 5.8rem;
-    height: 4rem;
-    background: url('~@/assets/detailsAll/business/business_right_bg.png') no-repeat;
+  .algorithm-top-details {
+    height: 6rem;
+    padding: 1.8rem 0 0;
+    background: url('~@/assets/detailsAll/sf_top_bg.png') no-repeat;
     background-size: 100%;
-    margin-top: -0.4rem;
+    display: flex;
+    justify-content: center;
+
+    .left {
+      max-width: 7.2rem;
+      color: #fff;
+      margin-right: 0.8rem;
+
+      .top {
+        display: flex;
+        align-items: center;
+
+        span {
+          font-size: 0.14rem;
+        }
+
+        .name {
+          // max-width: 3.3rem;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // white-space: nowrap;
+          font-size: 0.4rem;
+          margin-right: 0.2rem;
+          max-width: 7rem;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+        }
+
+        .label-content {
+          position: relative;
+        }
+
+        .lable-father {
+          position: absolute;
+          min-width: 3.5rem;
+          right: -3.5rem;
+          top: 0;
+        }
+
+        .label {
+          padding: 0.01rem 0.1rem;
+          margin-right: 0.1rem;
+          border-radius: 0.13rem;
+          background: rgba(255, 255, 255, 0.4);
+        }
+      }
+
+      .main {
+        margin-top: 0.2rem;
+        font-size: 0.18rem;
+        line-height: 0.34rem;
+
+        & > div:nth-of-type(1) {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        & > div:nth-of-type(2) {
+          max-height: 1rem;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 3;
+          -webkit-box-orient: vertical;
+        }
+      }
+
+      .bottom {
+        margin-top: 0.4rem;
+        display: flex;
+
+        .ant-btn {
+          height: 0.5rem;
+          margin-right: 0.2rem;
+          background: #ffffff;
+          border-radius: 0.06rem;
+          font-size: 0.2rem;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .ant-btn-primary {
+          color: #1890ff;
+        }
+
+        .ant-btn:nth-of-type(1) {
+          width: 1.8rem;
+        }
+
+        .ant-btn:nth-of-type(2) {
+          width: 2.2rem;
+        }
+
+        .ant-btn:nth-of-type(3) {
+          width: 1.45rem;
+          background: #fff;
+          color: #526aff;
+        }
+      }
+    }
+
+    .right {
+      width: 5.8rem;
+      height: 4rem;
+      background: url('~@/assets/detailsAll/business/business_right_bg.png')
+        no-repeat;
+      background-size: 100%;
+      margin-top: -0.4rem;
+    }
   }
-}
 </style>
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
index 0655035e..fd75008e 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@@ -18,11 +18,15 @@
         <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
             </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
           </p>
         </div>
         <!-- <span class="label">免费</span> -->
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index 04c67bc2..336bc5ff 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -18,11 +18,15 @@
         <!-- <span class="name">{{ props.dataList.name }}</span> -->
         <div class="label-content">
           <p class="lable-father">
-            <span class="label">
-              {{ componentType || props.dataList.type }}
+            <span class="label" v-if="props.dataList.type">
+              {{ props.dataList.type }}
+            </span>
+            <span class="label" v-if="props.dataList.shareType">
+              {{ props.dataList.shareType }}
+            </span>
+            <span class="label" v-if="props.dataList.shareCondition">
+              {{ props.dataList.shareCondition }}
             </span>
-            <span class="label">{{ props.dataList.shareType }}</span>
-            <span class="label">{{ props.dataList.shareCondition }}</span>
           </p>
         </div>
         <!-- <span class="label">免费</span> -->

From d95a2eeb9fc3fa7e790851cf719bad9b0c48d8f5 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Thu, 7 Jul 2022 20:37:34 +0800
Subject: [PATCH 16/31] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js      | 11 +----------
 front/src/store/modules/user.js             |  5 ++++-
 front/src/vab/plugins/permissions.js        |  4 ++--
 front/src/views/home/infrastructurePage.vue |  4 ----
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 92fcaa3c..3886edbe 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,22 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
-<<<<<<< HEAD
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 17:30:10
-=======
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-07 17:41:25
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
+ * @LastEditTime: 2022-07-07 18:53:18
  * @Description: 数据资源参数配置
  */
 const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-<<<<<<< HEAD
-// const newLocation = 'xihaian'
-=======
 //  const newLocation = 'xihaian'
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
 
 // 数据资源数据
 const whoShow = {}
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index 9679476e..1be71031 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -125,7 +125,10 @@ const actions = {
         commit('setUsername', data.data.username)
         commit('setRole', data.data.roleIdList.length)
         commit('setUserId', data.data.id)
-        resolve()
+        setTimeout(()=>{
+          resolve()
+        },500)
+
       })
     })
   },
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index ac6117bc..a8f46286 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 18:15:38
+ * @LastEditTime: 2022-07-07 19:58:32
  * @Description: 告诉大家这是什么
  */
 /**
@@ -49,7 +49,7 @@ router.beforeEach(async (to, from, next) => {
       next()
     } else {
       store.dispatch('user/getUserInfo').then((res)=>{
-        debugger
+        console.log('马到成功！')
         next()
       })
       // if (recordRoute)
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 2d3ef2e8..b88cabc5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -11,11 +11,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-<<<<<<< HEAD
-          @click="tabClick(index, item.title)"
-=======
           @click="tabClick(index, itemContent, item)"
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1

From 2aa05ee7196df8d0425f4567aa806c89bb1bfa4f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 08:53:19 +0800
Subject: [PATCH 17/31] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html                | 18 +++++++++---------
 front/public/static/config/location.js | 11 +----------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/front/public/index.html b/front/public/index.html
index 7530e93e..20397385 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-05 20:44:19
+ * @LastEditTime: 2022-07-07 20:21:07
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
@@ -45,10 +45,10 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 92fcaa3c..c68d3d51 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,22 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
-<<<<<<< HEAD
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 17:30:10
-=======
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-07 17:41:25
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
+ * @LastEditTime: 2022-07-07 20:22:03
  * @Description: 数据资源参数配置
  */
 const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-<<<<<<< HEAD
-// const newLocation = 'xihaian'
-=======
 //  const newLocation = 'xihaian'
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
 
 // 数据资源数据
 const whoShow = {}

From db087b9869d37bafd7e9cc43a264daeaea9f483e Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 09:49:33 +0800
Subject: [PATCH 18/31] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=B0=E6=8C=82?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/putOnTheShelf/index.vue | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 back/src/views/modules/putOnTheShelf/index.vue

diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
new file mode 100644
index 00000000..dfae3554
--- /dev/null
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -0,0 +1,33 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-07-08 09:48:52
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-08 09:49:12
+ * @Description: 告诉大家这是什么
+-->
+<template>
+    <div>
+
+    </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+
+  },
+  props: {
+
+  },
+  data () {
+    return {
+
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+<style lang='scss' scoped>
+</style>

From de9e38e5bfcc8626662377e26c3d17270aea39a4 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 09:55:01 +0800
Subject: [PATCH 19/31] no message

---
 back/src/views/modules/putOnTheShelf/components/1.vue | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 back/src/views/modules/putOnTheShelf/components/1.vue

diff --git a/back/src/views/modules/putOnTheShelf/components/1.vue b/back/src/views/modules/putOnTheShelf/components/1.vue
new file mode 100644
index 00000000..e69de29b

From 08bb99011b3584efad9ee99c2593cca1832905d8 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 8 Jul 2022 10:42:00 +0800
Subject: [PATCH 20/31] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BC=96=E7=9B=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bscatalogue/ManagementPop.vue     | 489 +++++++++---------
 .../views/modules/bscatalogue/bscatalogue.vue | 289 ++++++-----
 2 files changed, 409 insertions(+), 369 deletions(-)

diff --git a/back/src/views/modules/bscatalogue/ManagementPop.vue b/back/src/views/modules/bscatalogue/ManagementPop.vue
index faab5067..dd55ee8e 100644
--- a/back/src/views/modules/bscatalogue/ManagementPop.vue
+++ b/back/src/views/modules/bscatalogue/ManagementPop.vue
@@ -6,130 +6,206 @@
  * @Description: 编目弹窗
 -->
 <template>
-    <div class="management-pop">
-        <div class="top">
-            <a-button series="primary" @click="showAdd()">
-              新增
-            </a-button>
+  <div class="management-pop">
+    <div class="top">
+      <a-button series="primary" @click="showAdd()"> 新增 </a-button>
+      <a-popconfirm
+        title="是否删除选中字段?"
+        okText="是"
+        cancelText="否"
+        @confirm="confirmDel"
+        @cancel="cancelDel"
+      >
+        <!-- <a-button series="primary">批量删除</a-button> -->
+      </a-popconfirm>
+    </div>
+    <a-table
+      :columns="columns"
+      :data-source="data"
+      :expanded-row-keys.sync="expandedRowKeys"
+      :pagination="false"
+      ref="aTable"
+      :key="showKey"
+      :scroll="{ x: 1200, y: 500 }"
+    >
+      <template
+        v-for="col in [
+          'name',
+          'isAttr',
+          'isLinkToDic',
+          'linkValue',
+          'isFilterCriteria',
+          'type',
+          'xh',
+          'operation'
+        ]"
+        :slot="col"
+        slot-scope="text, record, index"
+        class="text"
+      >
+        <div :key="col" style="display: inline-block" v-if="col === 'name'">
+          <a-input
+            v-if="record.editable"
+            style="margin: -5px 0"
+            :value="text"
+            @change="(e) => handleChange(e.target.value, record.key, col)"
+          />
+          <template v-else>
+            {{ text }}
+          </template>
+        </div>
+        <div
+          :key="col"
+          style="display: inline-block"
+          v-else-if="col === 'isAttr'"
+        >
+          <a-switch
+            v-if="record.editable && !record.children"
+            default-checked
+            @change="isAttrOnChange"
+            :checked="text"
+          />
+          <template v-else>
+            <a-switch default-checked :disabled="disabled" :checked="text" />
+          </template>
+        </div>
+        <div
+          :key="col"
+          style="display: inline-block"
+          v-else-if="col === 'isLinkToDic'"
+        >
+          <a-switch
+            v-if="record.editable && record.isAttr"
+            default-checked
+            @change="isLinkToDicOnChange"
+            :checked="text"
+          />
+          <template v-else>
+            <a-switch default-checked :disabled="disabled" :checked="text" />
+          </template>
+        </div>
+        <div
+          :key="col"
+          style="display: inline-block"
+          v-else-if="col === 'linkValue'"
+        >
+          <a-select
+            :defaultValue="text"
+            style="width: 150px"
+            @change="linkValueHandleChange"
+            :disabled="
+              record.editable && record.isLinkToDic ? !disabled : disabled
+            "
+          >
+            <a-select-option :value="val.id" v-for="val in zdList" :key="val">
+              {{ val.dictName }}
+            </a-select-option>
+          </a-select>
+        </div>
+        <div
+          :key="col"
+          style="display: inline-block"
+          v-else-if="col === 'isFilterCriteria'"
+        >
+          <a-switch
+            v-if="record.editable && record.linkValue"
+            default-checked
+            @change="isFilterCriteriaOnChange"
+            :checked="text"
+          />
+          <template v-else>
+            <a-switch default-checked :disabled="disabled" :checked="text" />
+          </template>
+        </div>
+        <div
+          :key="col"
+          style="display: inline-block"
+          v-else-if="col === 'type'"
+        >
+          <a-select
+            :defaultValue="text"
+            style="width: 150px"
+            @change="typeHandleChange"
+            :disabled="
+              record.editable && !record.children ? !disabled : disabled
+            "
+          >
+            <a-select-option
+              :value="val.dictValue"
+              v-for="val in fieldTypeList"
+              :key="val"
+            >
+              {{ val.dictLabel }}
+            </a-select-option>
+          </a-select>
+        </div>
+        <div :key="col" style="display: inline-block" v-else-if="col === 'xh'">
+          <a-input
+            v-if="record.editable"
+            style="margin: -5px 0"
+            :value="text"
+            @change="(e) => handleChange(e.target.value, record.key, col)"
+          />
+          <template v-else>
+            {{ text }}
+          </template>
+        </div>
+        <div
+          :key="col"
+          class="editable-row-operations"
+          v-else-if="col === 'operation'"
+        >
+          <span v-if="record.editable">
+            <a @click="() => save(record.key)">保存</a>
             <a-popconfirm
-              title="是否删除选中字段?"
+              title="是否取消修改?"
+              @confirm="() => cancel(record.key)"
               okText="是"
               cancelText="否"
-              @confirm="confirmDel"
+            >
+              <a>取消</a>
+            </a-popconfirm>
+          </span>
+          <span v-else>
+            <a
+              :disabled="editingKey !== ''"
+              @click="() => add(record.id, record.children)"
+              v-if="!record.isAttr && record.cengji <= 3"
+              >新增</a
+            >
+            <a :disabled="editingKey !== ''" @click="() => edit(record.key)"
+              >修改</a
+            >
+            <a-popconfirm
+              title="是否确定删除?"
+              okText="是"
+              cancelText="否"
+              @confirm="del(record)"
               @cancel="cancelDel"
             >
-            <!-- <a-button series="primary">批量删除</a-button> -->
-          </a-popconfirm>
+              <a :disabled="editingKey !== ''">删除</a>
+            </a-popconfirm>
+          </span>
         </div>
-        <a-table
-          :columns="columns"
-          :data-source="data"
-          :expanded-row-keys.sync="expandedRowKeys"
-          :pagination='false'
-          ref="aTable"
-          :key="showKey"
-          :scroll="{ x: 1200, y: 500 }"
-        >
-          <template
-            v-for="col in ['name', 'isAttr', 'isLinkToDic', 'linkValue', 'isFilterCriteria', 'type', 'xh', 'operation']"
-            :slot="col"
-            slot-scope="text, record, index"
-            class="text"
-          >
-            <div :key="col" style="display: inline-block;" v-if="col==='name'">
-              <a-input
-                v-if="record.editable"
-                style="margin: -5px 0"
-                :value="text"
-                @change="e => handleChange(e.target.value, record.key, col)"
-              />
-              <template v-else>
-                {{ text }}
-              </template>
-            </div>
-            <div :key="col" style="display: inline-block;" v-else-if="col==='isAttr'">
-              <a-switch v-if="record.editable && !record.children" default-checked @change="isAttrOnChange" :checked="text" />
-              <template v-else>
-                <a-switch default-checked :disabled='disabled' :checked="text" />
-              </template>
-            </div>
-            <div :key="col" style="display: inline-block;" v-else-if="col==='isLinkToDic'">
-              <a-switch v-if="record.editable && record.isAttr" default-checked @change="isLinkToDicOnChange" :checked="text" />
-              <template v-else>
-                <a-switch default-checked :disabled='disabled' :checked="text" />
-              </template>
-            </div>
-            <div :key="col" style="display: inline-block;" v-else-if="col==='linkValue'">
-              <a-select :defaultValue="text" style="width: 150px" @change="linkValueHandleChange" :disabled='(record.editable && record.isLinkToDic)?!disabled:disabled'>
-                <a-select-option :value="val.id" v-for="val in zdList" :key="val">
-                  {{val.dictName}}
-                </a-select-option>
-              </a-select>
-            </div>
-            <div :key="col" style="display: inline-block;" v-else-if="col==='isFilterCriteria'">
-              <a-switch v-if="record.editable && record.linkValue" default-checked @change="isFilterCriteriaOnChange" :checked="text" />
-              <template v-else>
-                <a-switch default-checked :disabled='disabled' :checked="text" />
-              </template>
-            </div>
-            <div :key="col" style="display: inline-block;" v-else-if="col==='type'">
-              <a-select :defaultValue="text" style="width: 150px" @change="typeHandleChange" :disabled='(record.editable && !record.children)?!disabled:disabled'>
-                <a-select-option :value="val.dictValue" v-for="val in fieldTypeList" :key="val">
-                  {{val.dictLabel}}
-                </a-select-option>
-              </a-select>
-            </div>
-            <div :key="col" style="display: inline-block;" v-else-if="col==='xh'">
-              <a-input
-                v-if="record.editable"
-                style="margin: -5px 0"
-                :value="text"
-                @change="e => handleChange(e.target.value, record.key, col)"
-              />
-              <template v-else>
-                {{ text }}
-              </template>
-            </div>
-            <div :key="col" class="editable-row-operations" v-else-if="col==='operation'">
-              <span v-if="record.editable">
-                <a @click="() => save(record.key)">保存</a>
-                <a-popconfirm title="是否取消修改?" @confirm="() => cancel(record.key)" okText='是' cancelText='否'>
-                  <a>取消</a>
-                </a-popconfirm>
-              </span>
-              <span v-else>
-                <a :disabled="editingKey !== ''" @click="() => add(record.id,record.children)" v-if="!record.isAttr&&record.cengji<=3">新增</a>
-                <a :disabled="editingKey !== ''" @click="() => edit(record.key)">修改</a>
-                <a-popconfirm
-                  title="是否确定删除?"
-                  okText="是"
-                  cancelText="否"
-                  @confirm="del(record)"
-                  @cancel="cancelDel"
-                >
-                  <a :disabled="editingKey !== ''">删除</a>
-                </a-popconfirm>
-              </span>
-            </div>
-          </template>
-        </a-table>
-        <a-modal
-          :visible="visible"
-          style="margin-top: 200px"
-          title="新增编目"
-          okText="新增"
-          cancelText="取消"
-          @ok="handleOk"
-          @cancel="handleCancel"
-        >
-          字段名：
-          <a-input
-            style="width: 80%"
-            placeholder="请输入字段名"
-            v-model="nameTxt"
-          />
-        </a-modal>
-    </div>
+      </template>
+    </a-table>
+    <a-modal
+      :visible="visible"
+      style="margin-top: 200px"
+      title="新增编目"
+      okText="新增"
+      cancelText="取消"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      字段名：
+      <a-input
+        style="width: 80%"
+        placeholder="请输入字段名"
+        v-model="nameTxt"
+      />
+    </a-modal>
+  </div>
 </template>
 <script>
 import Vue from 'vue'
@@ -184,9 +260,7 @@ const columns = [
 ]
 const data = []
 export default {
-  components: {
-
-  },
+  components: {},
   props: {
     showItem: {
       type: Object,
@@ -198,7 +272,7 @@ export default {
     }
   },
   data () {
-    this.cacheData = data.map(item => ({ ...item }))
+    this.cacheData = data.map((item) => ({ ...item }))
     return {
       time: true,
       showKey: 0,
@@ -217,19 +291,27 @@ export default {
       editingKey: '',
       rowSelection: {
         onChange: (selectedRowKeys, selectedRows) => {
-          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+          console.log(
+            `selectedRowKeys: ${selectedRowKeys}`,
+            'selectedRows: ',
+            selectedRows
+          )
           this.delList = []
           if (selectedRows) {
             selectedRows.forEach((val) => {
               this.delList.push(val.key)
             })
           }
-          console.log('delList================>', this.expandedRowKeys, this.delList)
+          console.log(
+            'delList================>',
+            this.expandedRowKeys,
+            this.delList
+          )
         },
         onSelect: (record, selected, selectedRows) => {
           console.log(record, selected, selectedRows)
           if (record.children) {
-            record.children.forEach(item => {
+            record.children.forEach((item) => {
               this.delList.push(item.key)
             })
           }
@@ -258,83 +340,13 @@ export default {
     },
     // 查询所有编目
     getCategoryTree () {
-      this.$http.get('/category/getCategoryTree').then(res => {
-        console.log(res.data.data, this.index)
+      this.$http.get('/category/getCategoryTree').then((res) => {
         this.data = []
-        if (res.data.data[this.index].children) {
-          res.data.data[this.index].children.forEach(val => {
+        if (this.showItem.children) {
+          this.showItem.children.forEach((val) => {
             this.initData(val, this.cengji)
-            // if (val.children) {
-            //   if (val.children.length === 0) {
-            //     delete val.children
-            //   } else {
-            //     val.children.forEach(item => {
-            //       item.key = item.id
-            //       item.cengji = '2'
-            //       console.log(item)
-            //       if (item.children && item.children.length === 0) {
-            //         delete item.children
-            //       } else if (item.children) {
-            //         item.children.forEach(child => {
-            //           child.key = child.id
-            //           child.cengji = '3'
-            //           if (child.children && child.children.length === 0) {
-            //             delete child.children
-            //           }
-            //           if (child.isAttr === 'true') {
-            //             child.isAttr = true
-            //           } else if (child.isAttr === 'false') {
-            //             child.isAttr = false
-            //           }
-            //           if (child.isFilterCriteria === 'true') {
-            //             child.isFilterCriteria = true
-            //           } else if (child.isFilterCriteria === 'false') {
-            //             child.isFilterCriteria = false
-            //           }
-            //           if (child.isLinkToDic === 'true') {
-            //             child.isLinkToDic = true
-            //           } else if (child.isLinkToDic === 'false') {
-            //             child.isLinkToDic = false
-            //           }
-            //         })
-            //       }
-            //       if (item.isAttr === 'true') {
-            //         item.isAttr = true
-            //       } else if (item.isAttr === 'false') {
-            //         item.isAttr = false
-            //       }
-            //       if (item.isFilterCriteria === 'true') {
-            //         item.isFilterCriteria = true
-            //       } else if (item.isFilterCriteria === 'false') {
-            //         item.isFilterCriteria = false
-            //       }
-            //       if (item.isLinkToDic === 'true') {
-            //         item.isLinkToDic = true
-            //       } else if (item.isLinkToDic === 'false') {
-            //         item.isLinkToDic = false
-            //       }
-            //     })
-            //   }
-            // }
-            // val.key = val.id
-            // val.cengji = '1'
-            // if (val.isAttr === 'true') {
-            //   val.isAttr = true
-            // } else if (val.isAttr === 'false') {
-            //   val.isAttr = false
-            // }
-            // if (val.isFilterCriteria === 'true') {
-            //   val.isFilterCriteria = true
-            // } else if (val.isFilterCriteria === 'false') {
-            //   val.isFilterCriteria = false
-            // }
-            // if (val.isLinkToDic === 'true') {
-            //   val.isLinkToDic = true
-            // } else if (val.isLinkToDic === 'false') {
-            //   val.isLinkToDic = false
-            // }
           })
-          this.data = res.data.data[this.index].children
+          this.data = this.showItem.children
           console.log('data======================>', this.data)
           this.flag = true
           this.showKey++
@@ -365,7 +377,7 @@ export default {
           delete data.children
         } else {
           cengji++
-          data.children.forEach(item => {
+          data.children.forEach((item) => {
             this.initData(item, cengji)
           })
         }
@@ -373,17 +385,21 @@ export default {
     },
     // 查询所有字典
     selectZd () {
-      this.$http.get('/sys/dict/type/page?limit=10000&page=1').then(res => {
+      this.$http.get('/sys/dict/type/page?limit=10000&page=1').then((res) => {
         this.zdList = res.data.data.list
         console.log(this.zdList)
       })
     },
     // 查询表单类型字典
     selectFieldType () {
-      this.$http.get('/sys/dict/data/page?limit=10000&page=1&dictTypeId=1531163741457014785').then(res => {
-        this.fieldTypeList = res.data.data.list
-        console.log(this.fieldTypeList)
-      })
+      this.$http
+        .get(
+          '/sys/dict/data/page?limit=10000&page=1&dictTypeId=1531163741457014785'
+        )
+        .then((res) => {
+          this.fieldTypeList = res.data.data.list
+          console.log(this.fieldTypeList)
+        })
     },
     // 新增弹窗显示
     showAdd () {
@@ -408,39 +424,42 @@ export default {
     // 新增编目
     handleOk () {
       if (this.nameTxt) {
-        this.$http.post('/category/insert', {
-          isAttr: true,
-          isFilterCriteria: false,
-          isLinkToDic: false,
-          linkValue: '',
-          name: this.nameTxt,
-          pid: this.pid,
-          rootCategory: this.rootCategory,
-          type: 'input',
-          xh: this.px || this.data.length + 1
-        }).then(res => {
-          console.log(res)
-          this.visible = false
-          this.nameTxt = ''
-          this.pid = this.showItem.id
-          this.init()
-        })
+        this.$http
+          .post('/category/insert', {
+            isAttr: true,
+            isFilterCriteria: false,
+            isLinkToDic: false,
+            linkValue: '',
+            name: this.nameTxt,
+            pid: this.pid,
+            rootCategory: this.rootCategory,
+            type: 'input',
+            xh: this.px || this.data.length + 1
+          })
+          .then((res) => {
+            console.log(res)
+            this.visible = false
+            this.nameTxt = ''
+            this.pid = this.showItem.id
+            this.init()
+          })
       }
     },
     // 批量删除
     confirmDel () {
-      this.$http.post('/category/deleteById', { ids: this.delList }).then(res => {
-        console.log(res)
-        this.init()
-      })
+      this.$http
+        .post('/category/deleteById', { ids: this.delList })
+        .then((res) => {
+          console.log(res)
+          this.init()
+        })
     },
     // 取消修改
-    cancelDel () {
-    },
+    cancelDel () {},
     handleChange (value, key, column) {
       const newData = [...this.data]
       this.editData = {}
-      newData.forEach(val => {
+      newData.forEach((val) => {
         this.handleChangeFor(val, key)
       })
       if (this.editData) {
@@ -454,7 +473,7 @@ export default {
         this.editData = val
       } else {
         if (val.children) {
-          val.children.forEach(item => {
+          val.children.forEach((item) => {
             this.handleChangeFor(item, key)
           })
         }
@@ -495,7 +514,7 @@ export default {
       }
     },
     editFor (data, key) {
-      data.forEach(val => {
+      data.forEach((val) => {
         if (val.key === key) {
           this.editData = val
         } else {
@@ -515,7 +534,7 @@ export default {
           })
         } else {
           this.flag = false
-          this.$http.post('/category/update', this.editData).then(res => {
+          this.$http.post('/category/update', this.editData).then((res) => {
             console.log(res)
             this.editingKey = ''
             this.init()
@@ -586,12 +605,12 @@ export default {
         //   }
         // })
       }
-      this.$http.post('/category/deleteById', { ids: arr }).then(res => {
+      this.$http.post('/category/deleteById', { ids: arr }).then((res) => {
         this.init()
       })
     },
     delFor (data, arr) {
-      data.forEach(val => {
+      data.forEach((val) => {
         arr.push(val.id)
         if (val.children) {
           this.delFor(val.children, arr)
@@ -601,7 +620,7 @@ export default {
   }
 }
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .top {
   display: flex;
   justify-content: flex-end;
diff --git a/back/src/views/modules/bscatalogue/bscatalogue.vue b/back/src/views/modules/bscatalogue/bscatalogue.vue
index 3c32b637..43f341da 100644
--- a/back/src/views/modules/bscatalogue/bscatalogue.vue
+++ b/back/src/views/modules/bscatalogue/bscatalogue.vue
@@ -24,7 +24,9 @@
         <div
           class="resource-detail-wrap"
           :style="{
-            backgroundImage: `url(${topicCardBgImg(slotProps.item.positionNum)})`,
+            backgroundImage: `url(${topicCardBgImg(
+              slotProps.item.positionNum
+            )})`
           }"
         >
           <!-- 企业标题 -->
@@ -36,11 +38,17 @@
             <input
               v-model="slotProps.item.name"
               class="edit-enterprise-input"
-            >
+            />
           </div>
           <!-- 专题资源列表 -->
           <div class="resource-detail-resource">
-            <div class="num" v-for="item2 in slotProps.item.children" :key="item2.id">{{ item2.name }}</div>
+            <div
+              class="num"
+              v-for="item2 in slotProps.item.children"
+              :key="item2.id"
+            >
+              {{ item2.name }}
+            </div>
             <!-- <span class="unit">个</span> -->
           </div>
           <!-- 删除资源按钮 -->
@@ -48,7 +56,9 @@
             <i
               v-if="isRemoveCard"
               class="resource-detail-remove"
-              @click.stop="removeEnterpriseCard(slotProps.item,slotProps.index)"
+              @click.stop="
+                removeEnterpriseCard(slotProps.item, slotProps.index)
+              "
             />
           </transition>
         </div>
@@ -61,7 +71,7 @@
       </div>
       <div>
         <span @click.stop="editTopicCard">{{
-          isRemoveCard ? "完成" : "编辑"
+          isRemoveCard ? '完成' : '编辑'
         }}</span>
       </div>
     </div>
@@ -75,7 +85,7 @@
         :style="{
           top: cardAddTop,
           left: cardAddLeft,
-          backgroundImage: `url(${addCardBgImg})`,
+          backgroundImage: `url(${addCardBgImg})`
         }"
       >
         <div v-if="!isAddCard">
@@ -88,7 +98,7 @@
               v-model="addEnterpriseName"
               class="add-enterprise-input"
               placeholder="请输入目录名称"
-            >
+            />
           </div>
           <div class="add-enterprise-button-wrap">
             <el-button
@@ -109,24 +119,26 @@
       </div>
     </transition>
     <!-- 卡片覆盖层-->
-    <div class="enterprise-card-cover" :style="{ zIndex: topicCoverZIndex||1000 }">
+    <div
+      class="enterprise-card-cover"
+      :style="{ zIndex: topicCoverZIndex || 1000 }"
+    >
       <div
         v-for="(item, index) in topicList"
         :key="index"
-        @click="test(item,index)"
-      >
-      </div>
+        @click="test(item, index)"
+      ></div>
     </div>
     <a-modal
       :visible="show"
       title="编目配置"
       @ok.stop="handleOk"
       @cancel.stop="handleCancel"
-      :footer='null'
+      :footer="null"
       :key="showKey"
       width="1200px"
     >
-      <ManagementPop :showItem="showItem" :index='index'></ManagementPop>
+      <ManagementPop :showItem="showItem" :index="index"></ManagementPop>
     </a-modal>
   </div>
 </template>
@@ -147,7 +159,8 @@ export default {
     ManagementPop
   },
   props: {
-    enterpriseTypeOption: { // 企业类型字典值
+    enterpriseTypeOption: {
+      // 企业类型字典值
       type: Array,
       default: () => {
         return []
@@ -169,8 +182,7 @@ export default {
       cardInsideWidth: 360, // 卡片的宽度
       cardOutsideHeight: 198, // 卡片组件的高度
       cardInsideHeight: 176, // 卡片的高度
-      topicList: [
-      ],
+      topicList: [],
       newGroupName: {
         // 修改后的企业新名称
         cur: []
@@ -271,44 +283,47 @@ export default {
     },
     // 初始化卡片列表
     async initTopicCardList () {
-      this.$http.get('/category/getCategoryTree').then(({ data: res }) => {
-        // 首先对后端返回的数据进行排序，这是为了方便进行卡片排序
-        this.oldIdList = res.data
-        res.data.sort((a, b) => a.sortIndex - b.sortIndex)
-        this.topicList = res.data
-        res.data.map((resource, index) => {
-          this.topicList[index].id = `card_${this.topicList[index].id}`
-          const indexson = index
-          this.$set(this.topicList[index], 'positionNum', indexson + 1)
-        })
-        console.log('this.topicList', res.data)
-        if (this.selectIndex !== -1) {
-          console.log('showItem=============>', res.data[this.selectIndex])
-          if (res.data[this.selectIndex].children) {
-            res.data[this.selectIndex].children.forEach(val => {
-              val.key = val.id
-              if (val.isAttr === 'true') {
-                val.isAttr = true
-              } else if (val.isAttr === 'false') {
-                val.isAttr = false
-              }
-              if (val.isFilterCriteria === 'true') {
-                val.isFilterCriteria = true
-              } else if (val.isFilterCriteria === 'false') {
-                val.isFilterCriteria = false
-              }
-              if (val.isLinkToDic === 'true') {
-                val.isLinkToDic = true
-              } else if (val.isLinkToDic === 'false') {
-                val.isLinkToDic = false
-              }
-            })
+      this.$http
+        .get('/category/getCategoryTree')
+        .then(({ data: res }) => {
+          // 首先对后端返回的数据进行排序，这是为了方便进行卡片排序
+          this.oldIdList = res.data
+          res.data.sort((a, b) => a.sortIndex - b.sortIndex)
+          this.topicList = res.data
+          res.data.map((resource, index) => {
+            this.topicList[index].id = `card_${this.topicList[index].id}`
+            const indexson = index
+            this.$set(this.topicList[index], 'positionNum', indexson + 1)
+          })
+          console.log('this.topicList', res.data)
+          if (this.selectIndex !== -1) {
+            console.log('showItem=============>', res.data[this.selectIndex])
+            if (res.data[this.selectIndex].children) {
+              res.data[this.selectIndex].children.forEach((val) => {
+                val.key = val.id
+                if (val.isAttr === 'true') {
+                  val.isAttr = true
+                } else if (val.isAttr === 'false') {
+                  val.isAttr = false
+                }
+                if (val.isFilterCriteria === 'true') {
+                  val.isFilterCriteria = true
+                } else if (val.isFilterCriteria === 'false') {
+                  val.isFilterCriteria = false
+                }
+                if (val.isLinkToDic === 'true') {
+                  val.isLinkToDic = true
+                } else if (val.isLinkToDic === 'false') {
+                  val.isLinkToDic = false
+                }
+              })
+            }
+            console.log('showItem=============>', res.data[this.selectIndex])
+            this.showItem = res.data[this.selectIndex]
           }
-          console.log('showItem=============>', res.data[this.selectIndex])
-          this.showItem = res.data[this.selectIndex]
-        }
-        this.cardNum = this.topicList.length
-      }).catch(() => {})
+          this.cardNum = this.topicList.length
+        })
+        .catch(() => {})
     },
     // 卡片开始拖拽前的方法
     startDrag () {},
@@ -348,40 +363,42 @@ export default {
         const params = {
           ids: letid
         }
-        this.$http.post('/category/deleteById', params).then(({ data: res }) => {
-          let removeIndex = 0
-          this.topicList.forEach((enterprise, index) => {
-            if (
-              enterprise.positionNum &&
+        this.$http
+          .post('/category/deleteById', params)
+          .then(({ data: res }) => {
+            let removeIndex = 0
+            this.topicList.forEach((enterprise, index) => {
+              if (
+                enterprise.positionNum &&
                 enterprise.positionNum > item.positionNum
-            ) {
-              enterprise.positionNum = enterprise.positionNum - 1
-            }
-            if (item.resourceGroupId === enterprise.resourceGroupId) {
-              enterprise.position = this.topicList.length
-              removeIndex = index
-            }
+              ) {
+                enterprise.positionNum = enterprise.positionNum - 1
+              }
+              if (item.resourceGroupId === enterprise.resourceGroupId) {
+                enterprise.position = this.topicList.length
+                removeIndex = index
+              }
+            })
+            this.topicList.splice(removeIndex, 1)
+            // 此处需要把删除的对象的id添加回来，否则缺失的id将导致卡片不能再拖动
+            this.topicList.push({ id: item.id })
+            this.cardNum -= 1
+            // 调整编辑框的企业名称顺序
+            this.resortEditGroupName()
+            // 隐藏已经删除的卡片 -> 变更为移除已经删除的卡片
+            this.$refs.cardDragger.$vnode.elm.childNodes.forEach((node) => {
+              if (node.id === item.id) {
+                node.style.display = 'none'
+                this.oldId = item.id
+              }
+            })
+            this.$message.success('删除企业成功！')
+            // 删除完退出编辑模式
+            this.initTopicCardList()
+            this.isRemoveCard = !this.isRemoveCard
+            this.isEditGroupName = !this.isEditGroupName
+            this.topicCoverZIndex = this.isEditGroupName ? -999 : 1000
           })
-          this.topicList.splice(removeIndex, 1)
-          // 此处需要把删除的对象的id添加回来，否则缺失的id将导致卡片不能再拖动
-          this.topicList.push({ id: item.id })
-          this.cardNum -= 1
-          // 调整编辑框的企业名称顺序
-          this.resortEditGroupName()
-          // 隐藏已经删除的卡片 -> 变更为移除已经删除的卡片
-          this.$refs.cardDragger.$vnode.elm.childNodes.forEach((node) => {
-            if (node.id === item.id) {
-              node.style.display = 'none'
-              this.oldId = item.id
-            }
-          })
-          this.$message.success('删除企业成功！')
-          // 删除完退出编辑模式
-          this.initTopicCardList()
-          this.isRemoveCard = !this.isRemoveCard
-          this.isEditGroupName = !this.isEditGroupName
-          this.topicCoverZIndex = this.isEditGroupName ? -999 : 1000
-        })
           .catch((e) => {
             console.log('删除企业失败！%o', e)
             this.$message.error('删除企业失败！')
@@ -395,9 +412,11 @@ export default {
         id: item.id.slice(5),
         name: item.name
       }
-      this.$http.post('/category/update', params).then(({ data: res }) => {
-        item.name = newGroupName
-      })
+      this.$http
+        .post('/category/update', params)
+        .then(({ data: res }) => {
+          item.name = newGroupName
+        })
         .catch((e) => {
           console.log('更新企业名称失败！%o', e)
           this.$message.warning('更新企业名称失败！')
@@ -437,35 +456,37 @@ export default {
         linkValue: '',
         xh: this.topicList.length + 1
       }
-      const response = this.$http.post('/category/insert', params).then(({ data: res }) => {
-        if (res.code !== 0) {
-          console.log('response.code', res)
-          this.$message.error('新增目录失败，请联系管理员！')
-        } else {
-          this.$message.success('新增目录成功！')
-          const enterprise = {
-            // id: `id${this.topicList.length + 1}`,
-            name: this.addEnterpriseName,
-            positionNum: this.cardNum + 1
+      const response = this.$http
+        .post('/category/insert', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            console.log('response.code', res)
+            this.$message.error('新增目录失败，请联系管理员！')
+          } else {
+            this.$message.success('新增目录成功！')
+            const enterprise = {
+              // id: `id${this.topicList.length + 1}`,
+              name: this.addEnterpriseName,
+              positionNum: this.cardNum + 1
+            }
+            this.topicList.push(enterprise)
+            this.cardNum += 1
+            this.newGroupName.cur.push(enterprise.name)
+            this.addEnterpriseName = ''
+            if (this.oldId !== -1) {
+              this.$refs.cardDragger.$vnode.elm.childNodes.forEach((node) => {
+                if (node.id === this.oldId) {
+                  node.style.display = 'flex'
+                }
+              })
+            }
+            // 创建完退出编辑模式
+            this.isRemoveCard = !this.isRemoveCard
+            this.isEditGroupName = !this.isEditGroupName
+            this.topicCoverZIndex = this.isEditGroupName ? -999 : 1000
+            this.initTopicCardList()
           }
-          this.topicList.push(enterprise)
-          this.cardNum += 1
-          this.newGroupName.cur.push(enterprise.name)
-          this.addEnterpriseName = ''
-          if (this.oldId !== -1) {
-            this.$refs.cardDragger.$vnode.elm.childNodes.forEach((node) => {
-              if (node.id === this.oldId) {
-                node.style.display = 'flex'
-              }
-            })
-          }
-          // 创建完退出编辑模式
-          this.isRemoveCard = !this.isRemoveCard
-          this.isEditGroupName = !this.isEditGroupName
-          this.topicCoverZIndex = this.isEditGroupName ? -999 : 1000
-          this.initTopicCardList()
-        }
-      })
+        })
       // const response = await resourceGroup({
       //   method: 'post',
       //   data: {
@@ -548,7 +569,7 @@ export default {
         height: 28px;
         margin-left: 14px;
         margin-top: 9px;
-        background-image: url("~@/assets/img/capabilityCatalogingManagement/edit-card.png");
+        background-image: url('~@/assets/img/capabilityCatalogingManagement/edit-card.png');
       }
     }
     div:nth-child(2) {
@@ -587,7 +608,7 @@ export default {
         left: 50%;
         margin-left: -45.5px;
         margin-top: -45.5px;
-        background-image: url("~@/assets/img/capabilityCatalogingManagement/add.png");
+        background-image: url('~@/assets/img/capabilityCatalogingManagement/add.png');
         cursor: pointer;
       }
       > span {
@@ -596,7 +617,7 @@ export default {
         padding-top: 5px;
         padding-left: 20px;
         font-size: 26px;
-        font-family: "Microsoft YaHei";
+        font-family: 'Microsoft YaHei';
       }
       .add-enterprise-input-wrap {
         // height: 50px;
@@ -634,7 +655,7 @@ export default {
           background: #0fa7f6;
           span {
             color: #ffffff;
-            font-family: "Microsoft YaHei";
+            font-family: 'Microsoft YaHei';
             font-size: 16px;
           }
         }
@@ -682,7 +703,7 @@ export default {
       text-align: center;
       color: #ffffff;
       font-size: 14px;
-      font-family: "Microsoft YaHei";
+      font-family: 'Microsoft YaHei';
     }
     span:nth-child(2) {
       display: inline-block;
@@ -691,7 +712,7 @@ export default {
       text-align: center;
       color: #ffffff;
       font-size: 14px;
-      font-family: "Microsoft YaHei";
+      font-family: 'Microsoft YaHei';
       border: 1px solid rgba(255, 255, 255, 0.5);
       padding-top: 4px;
       margin-top: 15px;
@@ -702,7 +723,7 @@ export default {
   .enterprise-card-tip-first:before,
   .enterprise-card-tip-first:after {
     position: absolute;
-    content: " ";
+    content: ' ';
     top: 32px;
     left: -16px;
     display: block;
@@ -730,7 +751,7 @@ export default {
       text-align: center;
       color: #ffffff;
       font-size: 14px;
-      font-family: "Microsoft YaHei";
+      font-family: 'Microsoft YaHei';
     }
     span:nth-child(2) {
       display: inline-block;
@@ -739,7 +760,7 @@ export default {
       text-align: center;
       color: #ffffff;
       font-size: 14px;
-      font-family: "Microsoft YaHei";
+      font-family: 'Microsoft YaHei';
       border: 1px solid rgba(255, 255, 255, 0.5);
       padding-top: 4px;
       margin-top: 15px;
@@ -750,7 +771,7 @@ export default {
   .enterprise-card-tip-third:before,
   .enterprise-card-tip-third:after {
     position: absolute;
-    content: " ";
+    content: ' ';
     top: 32px;
     left: 180px;
     display: block;
@@ -779,7 +800,7 @@ export default {
       text-align: center;
       color: #ffffff;
       font-size: 14px;
-      font-family: "Microsoft YaHei";
+      font-family: 'Microsoft YaHei';
     }
     span:nth-child(2) {
       display: inline-block;
@@ -788,7 +809,7 @@ export default {
       text-align: center;
       color: #ffffff;
       font-size: 14px;
-      font-family: "Microsoft YaHei";
+      font-family: 'Microsoft YaHei';
       border: 1px solid rgba(255, 255, 255, 0.5);
       padding-top: 4px;
       margin-top: 15px;
@@ -799,7 +820,7 @@ export default {
   .enterprise-card-tip-second:before,
   .enterprise-card-tip-second:after {
     position: absolute;
-    content: " ";
+    content: ' ';
     top: -15px;
     left: 78px;
     display: block;
@@ -814,7 +835,7 @@ export default {
     width: 100%;
     // height: 373px;
     height: 176px;
-    background-image: url("~@/assets/img/capabilityCatalogingManagement/small-card-orange.png");
+    background-image: url('~@/assets/img/capabilityCatalogingManagement/small-card-orange.png');
     .resource-detail-title {
       width: 100%;
       height: 40px;
@@ -826,7 +847,7 @@ export default {
       span {
         width: 100%;
         height: 100%;
-        font-family: "Microsoft YaHei";
+        font-family: 'Microsoft YaHei';
         font-size: 20px;
         display: inline-block;
         overflow: hidden;
@@ -845,7 +866,7 @@ export default {
         width: 100%;
         height: 30px;
         padding-left: 19px;
-        font-family: "Microsoft YaHei";
+        font-family: 'Microsoft YaHei';
         font-size: 20px;
         color: white;
         vertical-align: middle;
@@ -877,7 +898,7 @@ export default {
       position: absolute;
       width: 28px;
       height: 28px;
-      background-image: url("~@/assets/img/capabilityCatalogingManagement/remove.png");
+      background-image: url('~@/assets/img/capabilityCatalogingManagement/remove.png');
       top: 0;
       right: 0;
       cursor: pointer;
@@ -886,7 +907,7 @@ export default {
 }
 input::-webkit-input-placeholder {
   font-size: 14px;
-  font-family: "Microsoft YaHei";
+  font-family: 'Microsoft YaHei';
   color: #999999;
 }
 </style>

From 900b3ea26d26f6089a38bd7d42496b94d3c2f9a0 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 15:51:55 +0800
Subject: [PATCH 21/31] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8C=82=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html                        |   4 +-
 back/src/assets/img/putOnTheShelf/del.png     | Bin 0 -> 1252 bytes
 .../src/views/modules/ability/bsabilityai.vue |  93 +++++-
 .../views/modules/components/upload/index.vue | 138 ++++++++
 .../modules/putOnTheShelf/components/1.vue    |   0
 .../putOnTheShelf/components/special.vue      | 305 ++++++++++++++++++
 .../src/views/modules/putOnTheShelf/index.vue | 177 +++++++++-
 7 files changed, 706 insertions(+), 11 deletions(-)
 create mode 100644 back/src/assets/img/putOnTheShelf/del.png
 create mode 100644 back/src/views/modules/components/upload/index.vue
 delete mode 100644 back/src/views/modules/putOnTheShelf/components/1.vue
 create mode 100644 back/src/views/modules/putOnTheShelf/components/special.vue

diff --git a/back/public/index.html b/back/public/index.html
index 17d1b9da..fba74530 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-29 19:38:17
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-08 14:13:20
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
diff --git a/back/src/assets/img/putOnTheShelf/del.png b/back/src/assets/img/putOnTheShelf/del.png
new file mode 100644
index 0000000000000000000000000000000000000000..643446b2bcfb0714cba0ef72c01cd200197a9e3e
GIT binary patch
literal 1252
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRp!3HFQtmCqPlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#24<Dakcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4
zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL`
zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTc<hj*9RNP;kyKN>wn|Gt^BsFfdRsx715X
zOiD~nO43m<GB7gKH!#sRG|@FMurju^GBHtr0wthzMJZ`kK`w4k%YZyvrHqo20xNy}
z^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`
zlk!VTY?Xjch4>-20B&qvF*KZjA*NrESfFpHX8`gOOrftYex<p&aMi^nL8%D$Vl}up
zq_QAYKPa_0zqBYB7;|aLAgc<joQqNuOY)0C^7C_G!5EN{Uy@&(kzb%-WTa=Rpb?&#
zmy%yztO?fO>ucqiS6q^qmz?V9Vygr+LN7Bj#md0K+`z!h#M0H+(aq4%)!EU&#K6hf
z(#+Y}!qCyu#1W>~B|o_|H#M&WrZ)wl*Ab^)P-4g}0NU)5T9jFqn&MWJpQ`}&vsET;
zx0vHJ52`l>w_7Z5>eUB2MjsTjNHGl)0wy026P|E^9C*@C%>$<QB4ENUYqMCvz`z*h
z>EaktajR#_elKQ6fn)FUghg{&MKo)89CcZwKQfxMhPLc!lyLkYaKwS7mVx!)rAtms
zlk{3R7_I*=70L->kv=N%`T6V*x;&@n6+Srr?%dg$&6}&s6J?G!9`AY}@MVXY1Cw`N
z!l}u782TI~ue^+2vYzW*Y@?|G|E@2&8$JpDSoWUv%R$B+%kri6bRMugQB_v-@Z(zH
z?Dt9=m_8-&ziF^G;J&1g^q^t)FP7C0SY#T#1v6Ie%X*;r<MuKOFTc}aGXiTnb(?jk
zs(e;eFSBv$`=#%m`LZil;@tM1Yt{=dYRRo@l)pDA@qKK3!lVY<Es8I9PF3gpb9)kt
z)1)o)G!iNroWCBEicjzg<p{Z;Tk+Jf>uvGcWGCGT&wd>Icucco*)!R>$*l8s-u3O`
znX~V0?g^{o(v?@3c*7>XU$~%Y>&?$In3pej`H#QMku@b`!~3#ZfAo8DRSqy*^z>XN
T%vZY;RPK1X`njxgN@xNAR8zUw

literal 0
HcmV?d00001

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 4e4d4ee8..a1b9ea03 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -27,6 +27,13 @@
             >挂接</el-button
           >
         </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="showPutOnTheShelf()"
+            >上架</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:delete')"
@@ -126,6 +133,35 @@
       ></add-or-update>
       <relate-application v-if="relateApplicationVisible" ref="relateApplication" :nameArray="['未关联应用名称', '已关联应用名称']" :relateInfo="relateInfo" @isShowRelatePopup="handleIsShowRelatePopup"></relate-application>
     </div>
+    <el-dialog
+      title="选择组件类型"
+      :visible.sync="showPutOnTheShelfFlag"
+      :close-on-click-modal='false'
+      :close-on-press-escape='false'
+      :before-close='clear'
+      width="30%">
+      <el-radio v-model="radio" label="智能算法">智能算法</el-radio>
+      <el-radio v-model="radio" label="图层服务">图层服务</el-radio>
+      <el-radio v-model="radio" label="开发组件">开发组件</el-radio>
+      <el-radio v-model="radio" label="业务组件">业务组件</el-radio>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="clear">取 消</el-button>
+        <el-button type="primary" @click="showPutOnTheShelfVue">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      :title="'上架'+radio"
+      :visible.sync="showPutOnTheShelfFlag2"
+      :close-on-click-modal='false'
+      :close-on-press-escape='false'
+      :before-close='clear'
+      width="50%">
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList'></putOnTheShelf>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="clear">取 消</el-button>
+        <el-button type="primary" @click="submitData">确 定</el-button>
+      </span>
+    </el-dialog>
   </el-card>
 </template>
 
@@ -135,10 +171,28 @@ import AddOrUpdate from './bsabilityai-add-or-update'
 import dictionaries from '@/utils/dictionaries'
 import qs from 'qs'
 import RelateApplication from './bsabilityai-relate-application.vue'
+import putOnTheShelf from '@/views/modules/putOnTheShelf'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      insertList: [],
+      putOnTheShelfList: [],
+      radio: '',
+      showPutOnTheShelfFlag: false,
+      showPutOnTheShelfFlag2: false,
+      submitFrom: {
+        type: '组件服务',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          {
+            attrType: '组件类型',
+            attrValue: '',
+            delFlag: 0
+          }
+        ]
+      },
       mixinViewModuleOptions: {
         getDataListURL: '/resource/page',
         getDataListIsPage: true,
@@ -170,7 +224,8 @@ export default {
   watch: {},
   components: {
     AddOrUpdate,
-    RelateApplication
+    RelateApplication,
+    putOnTheShelf
   },
   created () {
     this.dataForm.name = ''
@@ -343,6 +398,40 @@ export default {
     // 是否展示关联应用弹窗
     handleIsShowRelatePopup (type) {
       this.relateApplicationVisible = type
+    },
+    // 新挂载
+    clear () {
+      this.showPutOnTheShelfFlag = false
+      this.showPutOnTheShelfFlag2 = false
+      this.radio = ''
+      this.submitFrom = {
+        type: '组件服务',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          {
+            attrType: '组件类型',
+            attrValue: '',
+            delFlag: 0
+          }
+        ]
+      }
+    },
+    showPutOnTheShelf () {
+      this.showPutOnTheShelfFlag = true
+      this.$http.get('/category/getCategoryTree').then(res => {
+        this.insertList = res.data.data.filter(item => item.name === '组件服务一')[0]
+      })
+    },
+    showPutOnTheShelfVue () {
+      this.showPutOnTheShelfFlag = false
+      this.showPutOnTheShelfFlag2 = true
+      this.submitFrom.infoList[0] = this.redio
+      this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
+      console.log('radio', this.radio)
+    },
+    submitData () {
+      console.log('表单数据=================>', this.submitFrom, this.putOnTheShelfList)
     }
   }
 }
@@ -351,7 +440,7 @@ export default {
 .el-tooltip__popper {
   max-width: 50%;
 }
-::v-deep .el-table .cell{
+::v-deep .el-table .cell {
   width: 200px;
 }
 </style>
diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue
new file mode 100644
index 00000000..2d65cf9e
--- /dev/null
+++ b/back/src/views/modules/components/upload/index.vue
@@ -0,0 +1,138 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-07-08 14:55:19
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-08 15:48:44
+ * @Description: 告诉大家这是什么
+-->
+<template>
+    <a-upload
+    v-model:file-list="fileList"
+    :action="`${apiURL}/upload`"
+    list-type="picture"
+    class="upload-list-inline"
+    :maxCount="maxCount"
+    :before-upload="beforeUpload"
+    @change="handleChange"
+    @preview="handlePreview"
+    @remove="handleRemove"
+  >
+    <a-button>
+      <upload-outlined></upload-outlined>
+      {{ btnName }}
+    </a-button>
+    <span
+      style="
+        display: inline-block;
+        margin-left: 10px;
+        color: #999999;
+        font-size: 14px;
+      "
+    >
+      {{ tip }}
+    </span>
+  </a-upload>
+</template>
+<script>
+import { message, Upload } from 'ant-design-vue'
+export default {
+  name: '',
+  components: {
+
+  },
+  props: {
+    btnName: String,
+    type: String,
+    tip: String,
+    maxCount: Number,
+    data: Array,
+    list: Array,
+    emitFlag: String,
+    busType: Number
+  },
+  data () {
+    return {
+      apiURL: window.SITE_CONFIG.apiURL,
+      fileList: JSON.parse(JSON.stringify(this.list))
+    }
+  },
+  methods: {
+    beforeUpload (file) {
+      console.log(file)
+      const isLt10M = file.size / 1024 / 1024 < 100
+      let flag
+      if (this.type === '图片') {
+        flag =
+        file.type === 'image/jpeg' ||
+        file.type === 'image/jpg' ||
+        file.type === 'image/png'
+      } else if (this.type === '视频') {
+        console.log(file.type === 'video/mp4')
+        flag =
+        file.type === 'audio/mpeg' ||
+        file.type === 'video/mp4' ||
+        file.type === 'video/mp3'
+      } else if (this.type === '文件') {
+        flag =
+        file.type === 'application/pdf' ||
+        file.type === 'application/msword' ||
+        file.type ===
+          'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+      }
+      console.log(flag)
+      if (!flag) {
+        message.error(`${file.name} 不是${this.type}类型`)
+      }
+      if (!isLt10M) {
+        message.error(`${file.name} 超出100M的大小`)
+      }
+      return flag || Upload.LIST_IGNORE
+    },
+    handlePreview (file) {
+      // console.log(file)
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(file.response.data))
+      )
+    },
+    handleChange (info) {
+      if (info.file.status !== 'uploading') {
+        console.log(info.file, info.fileList)
+      }
+      if (info.file.status === 'done') {
+        message.success(`${info.file.name}上传成功`)
+        this.data.note1 = info.file.response.data
+        console.log(this.data, this.fileList)
+        if (this.type === '图片') {
+          if (!this.emitFlag) {
+            // mybus.emit('chageImgList', fileList.value)
+          }
+        } else if (this.type === '文件') {
+          console.log('busType', this.busType)
+          if (this.busType == 2) {
+            console.log('busType', this.busType)
+            // mybus.emit('chageFileList2', fileList.value)
+          } else {
+            // mybus.emit('chageFileList', fileList.value)
+          }
+        } else if (this.type === '视频') {
+          // mybus.emit('chageVideoList', fileList.value)
+        }
+      } else if (info.file.status === 'error') {
+        message.error(`${info.file.name}上传失败`)
+      }
+    },
+    handleRemove (file) {
+      this.data.note1 = ''
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.ant-upload-list-item-image {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+</style>
diff --git a/back/src/views/modules/putOnTheShelf/components/1.vue b/back/src/views/modules/putOnTheShelf/components/1.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
new file mode 100644
index 00000000..d3409049
--- /dev/null
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -0,0 +1,305 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-07-08 09:54:50
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-08 15:15:02
+ * @Description: 多条数据特殊处理
+-->
+<template>
+    <div class="special">
+        <div class="top">{{configure.name}}</div>
+        <div class="bottom">
+          <div class="items" v-show="data.length > 0">
+            <div class="item" v-for="(val, index) in data" :key="'key1' + val.name + index">
+              <p>
+                <span>{{ configure.name }}-{{ index + 1 }}</span>
+                <span></span>
+              </p>
+              <p v-for="(attr,index2) in configure.list" :key="'key2' + attr.name + index2">
+                <span>{{ attr.name }}</span>
+                <span v-if="attr.type === 'image'">
+                  <!-- <a-image :width="85" :height="60" :src="val.img" /> -->
+                  <el-image
+                    style="width: 85px; height: 60px"
+                    :src="val.img"
+                    :preview-src-list="[val.img]">
+                  </el-image>
+                </span>
+                <span v-else>{{ val[attr.field] + (attr.company || '') }}</span>
+              </p>
+              <div class="del">
+                <i class="delImg" @click="del( index)"></i>
+                <div @click="del( index)">删除</div>
+              </div>
+            </div>
+          </div>
+          <div class="add">添加更多{{ configure.name }}</div>
+          <div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index">
+            <span>{{ val.name }}</span>
+            <a-input v-model:value="val.note1" :maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'"
+              v-if="val.type == 'input'"/>
+            <a-textarea v-model:value="val.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + val.name"
+              v-else-if="val.type == 'textArea'"/>
+            <a-input-number v-model:value="val.note1" :min="0" :max="9999" :step="0.01" string-mode
+              :placeholder="'请填写' + val.name" v-else-if="val.type == 'number'" />
+            <a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'" />
+            <upload :key="showKey" type="图片" btnName="上传图片" :maxCount="1" :data="val" :list="[]" tip="支持图片类型，大小不超过100M"
+              v-else-if="val.type == 'image'"></upload>
+              <!-- <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload> -->
+          </div>
+          <div class="submit">
+            <a-button type="primary" @click="add()">提交</a-button>
+          </div>
+        </div>
+    </div>
+</template>
+<script>
+// import upload from '@/views/modules/ability/upload.vue'
+import upload from '@/views/modules/components/upload'
+export default {
+  name: '',
+  components: {
+    upload
+  },
+  props: {
+    configure: Object
+  },
+  data () {
+    return {
+      data: [],
+      showKey: 0
+    }
+  },
+  methods: {
+    add () {
+      const list = this.configure.list
+      let flag = true
+      list.forEach((item) => {
+        console.log(item)
+        if (item.type !== 'number' && !item.note1.length > 0) {
+          flag = false
+        } else if (item.type === 'number' && !item.note1 > 0) {
+          flag = false
+        }
+      })
+      if (flag) {
+        const obj = {}
+        list.forEach((item) => {
+          obj[item.field] = item.note1
+        })
+        this.data.push(obj)
+        // console.log(data.value[title])
+        // mybus.emit('chageDataFrom', {
+        //   attrType: title,
+        //   attrValue: JSON.stringify(data.value[title]),
+        //   delFlag: 0
+        // })
+        list.forEach((item) => {
+          item.note1 = ''
+        })
+        this.showKey++
+      } else {
+        this.$message.warning('请填写完整')
+      }
+    } // del (title, index) {
+    //   data.value[title].splice(index, 1)
+    //   mybus.emit('chageDataFrom', {
+    //     attrType: title,
+    //     attrValue: JSON.stringify(data.value[title]),
+    //     delFlag: 0
+    //   })
+    // }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.top {
+  color: #333333;
+  font-size: 22px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 25px;
+
+  div:first-child,
+  div:last-child {
+    width: 245px;
+    height: 1px;
+    background: #f0f0f0;
+  }
+
+  div:nth-child(2) {
+    margin: 0 30px;
+  }
+}
+
+.bottom {
+  margin-top: 25px;
+
+  .items {
+    background: #fafafa;
+    padding: 10px;
+
+    p {
+      display: flex;
+      justify-content: space-between;
+
+      span:nth-of-type(1) {
+        width: 200px;
+      }
+
+      span:nth-of-type(2) {
+        width: 100%;
+        font-weight: 600;
+      }
+    }
+
+    p:nth-of-type(1) > span:nth-of-type(1) {
+      font-size: 18px;
+      font-weight: 600;
+    }
+
+    .del {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+
+      .delImg {
+        cursor: pointer;
+        display: inline-block;
+        width: 16px;
+        height: 18px;
+        background: url(~@/assets/img/putOnTheShelf/del.png) no-repeat;
+        margin-right: 5px;
+      }
+
+      div {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .add {
+    margin-top: 10px;
+    font-size: 16px;
+    color: #007efb;
+  }
+
+  .form {
+    margin-top: 20px;
+    display: flex;
+    align-items: center;
+
+    span:first-child {
+      width: 120px;
+    }
+
+    :deep(.ant-input-textarea) {
+      width: 570px;
+    }
+
+    :deep(.ant-radio-group) {
+      width: 570px;
+    }
+
+    :deep(.ant-input-number) {
+      width: 200px;
+    }
+
+    :deep(.ant-input) {
+      resize: none;
+      width: 570px;
+    }
+
+    .ant-btn {
+      width: 160px;
+      height: 32px;
+      text-align: center;
+      background: #edf4fc;
+      color: #0087ff;
+      border: 1px solid #bbd3ef;
+      border-radius: 6px;
+    }
+  }
+
+  .submit {
+    margin-top: 40px;
+    display: flex;
+    justify-content: flex-end;
+
+    .ant-btn {
+      width: 80px;
+      height: 28px;
+      text-align: center;
+      background: #d9ebff;
+      color: #0087ff;
+      border: 1px solid #0087ff;
+      border-radius: 6px;
+    }
+  }
+}
+::v-deep .el-image__preview {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+::v-deep .ant-modal {
+  width: 960px;
+}
+
+::v-deep .ant-transfer-list {
+  width: 39.5%;
+  height: 520px;
+}
+
+::v-deep .ant-transfer-operation {
+  flex-direction: row-reverse;
+  margin: 0 30px;
+}
+
+::v-deep .ant-btn {
+  // width: 56px;
+  // height: 40px;
+  border-radius: 4px;
+}
+
+::v-deep .ant-btn:first-child {
+  margin-left: 4px;
+}
+
+::v-deep .ant-modal-footer {
+  border: 0;
+}
+
+::v-deep .ant-modal-header {
+  border: 0;
+}
+
+::v-deep .ant-modal-title {
+  line-height: 24px;
+  font-size: 18px;
+  color: #303133;
+}
+
+::v-deep .ant-transfer-list-header {
+  background: #f5f7fa;
+}
+
+::v-deep .ant-transfer-list-header-selected {
+  display: flex;
+  width: 90%;
+  flex-direction: row-reverse;
+  justify-content: space-between;
+  align-items: center;
+}
+::v-deep .ant-input-number {
+  width: 200px;
+}
+::v-deep .ant-transfer-list-header-title {
+  font-size: 16px;
+  color: #303133;
+  font-weight: 400;
+  text-align: left;
+}
+</style>
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index dfae3554..50258260 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,32 +2,195 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 09:49:12
+ * @LastEditTime: 2022-07-08 15:50:06
  * @Description: 告诉大家这是什么
 -->
 <template>
-    <div>
-
+    <div class="put-on-the-shelf">
+      <div v-for="parent in putOnTheShelfList" :key='parent.id'>
+        <div v-for='child in parent.children' :key='child.id'>
+          <template v-if='judgmentType.filter(item => item.name==child.name).length === 0'>
+            <div class="top">{{child.name}}</div>
+            <div v-for="item in child.children" :key="item.id" class='item'>
+              <span>{{ item.name }}</span>
+              <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
+                tip="支持图片类型，大小不超过100M"></upload>
+              <upload :list="[]" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
+                :data="item" tip="支持文件类型，大小不超过100M"></upload>
+              <upload :list="[]" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :data="item" :busType="2"
+                tip="支持文件类型，大小不超过100M"></upload>
+              <upload :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :data="item"
+                tip="支持视频类型，大小不超过100M"></upload>
+            </div>
+          </template>
+          <template v-else>
+            <special :configure='judgmentType.filter(item => item.name==child.name)[0]'></special>
+          </template>
+        </div>
+      </div>
     </div>
 </template>
 <script>
+import special from './components/special'
+import upload from '@/views/modules/components/upload'
 export default {
   name: '',
   components: {
-
+    special,
+    upload
   },
   props: {
-
+    putOnTheShelfList: Array
   },
   data () {
     return {
-
+      judgmentType: [
+        {
+          name: '算法优势',
+          list: [
+            {
+              name: '算法优势名称',
+              field: 'name',
+              type: 'input',
+              note1: ''
+            },
+            {
+              name: '算法优势描述',
+              field: 'desc',
+              type: 'textArea',
+              note1: ''
+            }
+          ]
+        },
+        {
+          name: '应用场景',
+          list: [
+            {
+              name: '应用场景名称',
+              field: 'name',
+              type: 'input',
+              note1: ''
+            },
+            {
+              name: '应用场景描述',
+              field: 'desc',
+              type: 'textArea',
+              note1: ''
+            },
+            {
+              name: '应用场景图片',
+              field: 'img',
+              type: 'image',
+              note1: ''
+            }
+          ]
+        },
+        {
+          name: '计费标准信息',
+          list: [
+            {
+              name: '计费方式',
+              field: 'type',
+              type: 'radio',
+              options: ['一次性买断', '按调用次数', '按并发路数', '按年计费'],
+              note1: ''
+            },
+            {
+              name: '计费标准',
+              field: 'price',
+              type: 'number',
+              company: '元',
+              note1: ''
+            },
+            {
+              name: '计费标准描述',
+              field: 'desc',
+              type: 'textArea',
+              note1: ''
+            }
+          ]
+        },
+        {
+          name: '常见问题',
+          list: [
+            {
+              name: '问题',
+              field: 'question',
+              type: 'textArea',
+              note1: ''
+            },
+            {
+              name: '答复',
+              field: 'answer',
+              type: 'textArea',
+              note1: ''
+            }
+          ]
+        },
+        {
+          name: '功能介绍',
+          list: [
+            {
+              name: '功能名称',
+              field: 'name',
+              type: 'input',
+              note1: ''
+            },
+            {
+              name: '功能描述',
+              field: 'desc',
+              type: 'textArea',
+              note1: ''
+            },
+            {
+              name: '功能图片',
+              field: 'img',
+              type: 'image',
+              note1: ''
+            }
+          ]
+        }
+      ]
     }
   },
   methods: {
-
   }
 }
 </script>
 <style lang='scss' scoped>
+.put-on-the-shelf {
+  height: 500px;
+  padding: 0 50px;
+  overflow-y: scroll;
+}
+.put-on-the-shelf::-webkit-scrollbar {
+  width: 0;
+}
+
+.top {
+  color: #333333;
+  font-size: 22px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 25px;
+
+  div:first-child,
+  div:last-child {
+    width: 245px;
+    height: 1px;
+    background: #f0f0f0;
+  }
+
+  div:nth-child(2) {
+    margin: 0 30px;
+  }
+}
+.item {
+  display: flex;
+  align-items: center;
+  & > span:nth-of-type(1) {
+    width: 105px;
+  }
+}
 </style>

From 4344056f550df8bda20e21d53049b82420816945 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 8 Jul 2022 15:53:53 +0800
Subject: [PATCH 22/31] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=92=8C=E5=B7=B2=E5=8A=9E=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=86=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hasToDoTasks/AbilityResourceShelf.vue     | 142 +++++++++
 .../hasToDoTasks/AbilityResourcesRemoved.vue  | 142 +++++++++
 .../ApplicationForCompetencyRequirements.vue  | 142 +++++++++
 .../hasToDoTasks/CommentModeration.vue        | 142 +++++++++
 .../hasToDoTasks/CompetencyApplication.vue    | 142 +++++++++
 .../modules/myAgent/AbilityResourceShelf.vue  | 170 +++++++++++
 .../myAgent/AbilityResourcesRemoved.vue       | 170 +++++++++++
 .../ApplicationforCompetencyRequirements.vue  | 170 +++++++++++
 .../modules/myAgent/CommentModeration.vue     | 170 +++++++++++
 .../myAgent/demo/ability-resource-shelf.vue   | 273 ++++++++++++++++++
 10 files changed, 1663 insertions(+)
 create mode 100644 back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
 create mode 100644 back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
 create mode 100644 back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
 create mode 100644 back/src/views/modules/hasToDoTasks/CommentModeration.vue
 create mode 100644 back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
 create mode 100644 back/src/views/modules/myAgent/AbilityResourceShelf.vue
 create mode 100644 back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
 create mode 100644 back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue
 create mode 100644 back/src/views/modules/myAgent/CommentModeration.vue
 create mode 100644 back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
new file mode 100644
index 00000000..0da3a386
--- /dev/null
+++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
@@ -0,0 +1,142 @@
+<!-- 已办任务-能力资源上架 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processInstanceId"
+          :label="$t('running.id')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'resourcemountapply'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
new file mode 100644
index 00000000..3c0a1ed3
--- /dev/null
+++ b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
@@ -0,0 +1,142 @@
+<!-- 已办任务-能力资源下架 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processInstanceId"
+          :label="$t('running.id')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'resourcundercarriageapply'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
new file mode 100644
index 00000000..6f936524
--- /dev/null
+++ b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
@@ -0,0 +1,142 @@
+<!-- 已办任务-能力需求申请 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processInstanceId"
+          :label="$t('running.id')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'abilitydemandapply'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/hasToDoTasks/CommentModeration.vue b/back/src/views/modules/hasToDoTasks/CommentModeration.vue
new file mode 100644
index 00000000..2de57bdc
--- /dev/null
+++ b/back/src/views/modules/hasToDoTasks/CommentModeration.vue
@@ -0,0 +1,142 @@
+<!-- 已办任务-评论审核 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processInstanceId"
+          :label="$t('running.id')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'comment_review'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
new file mode 100644
index 00000000..1cf2d2b5
--- /dev/null
+++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
@@ -0,0 +1,142 @@
+<!-- 已办任务-能力申请 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processInstanceId"
+          :label="$t('running.id')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'abilityprocess_v2'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/myAgent/AbilityResourceShelf.vue b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
new file mode 100644
index 00000000..39410b15
--- /dev/null
+++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "能力资源上架"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="processInstanceId" :label="$t('running.id')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'resourcemountapply'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
new file mode 100644
index 00000000..1a1154ed
--- /dev/null
+++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "能力资源下架"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="processInstanceId" :label="$t('running.id')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'resourcundercarriageapply'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue
new file mode 100644
index 00000000..245903a5
--- /dev/null
+++ b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue
@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "能力需求申请"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="processInstanceId" :label="$t('running.id')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'abilitydemandapply'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/myAgent/CommentModeration.vue b/back/src/views/modules/myAgent/CommentModeration.vue
new file mode 100644
index 00000000..d592773a
--- /dev/null
+++ b/back/src/views/modules/myAgent/CommentModeration.vue
@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "评论审核"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="processInstanceId" :label="$t('running.id')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'comment_review'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
new file mode 100644
index 00000000..5681064c
--- /dev/null
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -0,0 +1,273 @@
+<template>
+  <div class="wrapper">
+    <div>
+      <el-form
+        :model="dataForm"
+        ref="dataForm"
+        @keyup.enter.native="dataFormSubmitHandle()"
+        :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
+      >
+        <div v-if="shifoushizujian">
+          <el-form-item label="应用名称">
+            <el-input
+              v-model="dataForm.name"
+              :disabled="fieldDisabled"
+              placeholder="应用名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="应用描述">
+            <el-tooltip
+              effect="dark"
+              :content="dataForm.description"
+              placement="top"
+              popper-class="kuandukuandukuandu"
+            >
+              <el-input
+                v-model="dataForm.description"
+                :disabled="fieldDisabled"
+                placeholder="应用描述"
+              ></el-input>
+            </el-tooltip>
+          </el-form-item>
+          <el-form-item label="部门联系人">
+            <el-input
+              v-model="dataForm.deptContacts"
+              :disabled="fieldDisabled"
+              placeholder="部门联系人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享类型">
+            <el-input
+              v-model="dataForm.shareType"
+              :disabled="fieldDisabled"
+              placeholder="共享类型"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享方式">
+            <el-input
+              v-model="dataForm.shareMode"
+              :disabled="fieldDisabled"
+              placeholder="共享方式"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享条件">
+            <el-input
+              v-model="dataForm.shareCondition"
+              :disabled="fieldDisabled"
+              placeholder="共享方条件"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="访问地址">
+            <el-input
+              v-model="dataForm.link"
+              :disabled="fieldDisabled"
+              placeholder="访问地址"
+            ></el-input>
+          </el-form-item>
+        </div>
+        <div v-if="!shifoushizujian">
+          <el-form-item label="组件名称" v-if="algorithmShow">
+            <el-input
+              v-model="dataForm.name"
+              :disabled="fieldDisabled"
+              placeholder="组件名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="算法名称" v-if="nameNotShow">
+            <el-input
+              v-model="dataForm.name"
+              :disabled="fieldDisabled"
+              placeholder="算法名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="应用描述" v-if="algorithmShow">
+            <el-input
+              v-model="dataForm.description"
+              :disabled="fieldDisabled"
+              placeholder="应用描述"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="算法描述" v-if="nameNotShow">
+            <el-input
+              v-model="dataForm.description"
+              :disabled="fieldDisabled"
+              placeholder="算法描述"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="部门联系人" v-if="algorithmShow">
+            <el-input
+              v-model="dataForm.deptContacts"
+              :disabled="fieldDisabled"
+              placeholder="部门联系人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享类型">
+            <el-input
+              v-model="dataForm.shareType"
+              :disabled="fieldDisabled"
+              placeholder="共享类型"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="共享方式"
+            v-if="coverageNotShow && algorithmShow"
+          >
+            <el-input
+              v-model="dataForm.shareMode"
+              :disabled="fieldDisabled"
+              placeholder="共享方式"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享条件">
+            <el-input
+              v-model="dataForm.shareCondition"
+              :disabled="fieldDisabled"
+              placeholder="共享方条件"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="服务接口" v-if="coverageNotShow">
+            <el-input
+              v-model="dataForm.apiUrl"
+              :disabled="fieldDisabled"
+              placeholder="服务接口"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="接口请求方式" v-if="coverageNotShow">
+            <el-input
+              v-model="dataForm.apiMethodType"
+              :disabled="fieldDisabled"
+              placeholder="接口请求方式"
+            ></el-input>
+          </el-form-item>
+        </div>
+        <el-form-item
+          v-for="item in dataForm.infoList"
+          :key="item.index"
+          :label="item.attrType"
+          :disabled="fieldDisabled"
+        >
+          <el-input
+            v-model="item.attrValue"
+            :placeholder="item.attrType"
+            :disabled="fieldDisabled"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="dataForm.enclosure"
+          label="申请附件"
+          prop="enclosure"
+        >
+          <el-button @click="downloadFile(dataForm.enclosure, '申请附件')"
+            >附件下载</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <!--  流程综合组件   -->
+    <ren-process-multiple
+      v-if="processVisible"
+      updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
+      saveFormUrl="/processForm/tabilityapplication"
+      dataFormName="dataForm"
+      ref="renProcessMultiple"
+    ></ren-process-multiple>
+  </div>
+</template>
+
+<script>
+import processModule from '@/mixins/process-module'
+export default {
+  // 注入公共方法
+  mixins: [processModule],
+  components: {},
+  props: {
+    // fromList: {
+    //   // type: Array,
+    //   // default: () => {
+    //   //   return []
+    //   // }
+    // }
+  },
+  data () {
+    return {
+      // processVisible: true,
+      visible: false,
+      // 表单属性是否可编辑
+      fieldDisabled: false,
+      dataForm: [],
+      id: '',
+      shifoushizujian: true,
+      coverageNotShow: true,
+      nameNotShow: false,
+      algorithmShow: true
+    }
+  },
+  watch: {},
+  computed: {},
+  methods: {
+    init () {
+      this.visible = true
+      // this.getInfo(this.$router.currentRoute.params.params.params.resourceDTO.id)
+      // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
+      // this.id=this.$router.currentRoute
+      this.$nextTick(() => {
+        this.$refs.dataForm.resetFields()
+        // if (this.dataForm.id) {
+        // 如业务KEY已存在，不允许编辑
+        this.fieldDisabled = true
+        // this.id = this.$router.currentRoute.businessKey
+        this.getInfo(this.$router.currentRoute.params.businessKey)
+        console.log('id', this.$router.currentRoute.params.businessKey)
+        // }
+      })
+    },
+    getInfo (id) {
+      this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = res.data.resourceDTO
+        if (this.dataForm.type != '应用资源') {
+          this.shifoushizujian = false
+          this.dataForm.infoList.forEach((val) => {
+            if (val.attrValue === '图层服务') {
+              this.coverageNotShow = false
+            } else if (val.attrValue === '智能算法') {
+              this.nameNotShow = true
+              this.algorithmShow = false
+              console.log(this.nameNotShow, 'wowowo')
+            }
+          })
+        } else {
+          this.shifoushizujian = true
+        }
+        console.log('this.dataForm', this.dataForm)
+      })
+    }
+  },
+  created () {
+    // this.dataForm = this.$router.currentRoute.params.id
+    this.init()
+    console.log('fromList', this.$router.currentRoute.params.businessKey)
+    // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
+    var callbacks = {
+      startProcessSuccessCallback: this.closeCurrentTab,
+      startProcessErrorCallback: this.startProcessErrorCallback,
+      taskHandleSuccessCallback: this.closeCurrentTab,
+      taskHandleErrorCallback: this.taskHandleErrorCallback,
+      formSaveSuccessCallback: null,
+      formSaveErrorCallback: null
+    }
+    // 初始化综合组件
+    this.initProcessMultiple(callbacks)
+  },
+  mounted () {}
+}
+</script>
+<style lang="scss">
+.kuandukuandukuandu {
+  max-width: 1500px;
+}
+.wrapper {
+}
+</style>

From dd6e24919043792c69cfac7baeff7308e9c1c55e Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 8 Jul 2022 16:39:09 +0800
Subject: [PATCH 23/31] bug487

---
 .../detailsAll/components/Algorithm/AlgorithmUsageMode.vue    | 2 +-
 .../detailsAll/components/Business/BusinessUsageMode.vue      | 4 ++--
 .../components/LayerService/LayerServiceUsageMode.vue         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
index 380272aa..40ec5db8 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@@ -196,7 +196,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传技术文档')
+      message.error('暂未上传技术文档')
     }
   }
 </script>
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
index e1e19e28..06a2f533 100644
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@@ -216,7 +216,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传技术文档')
+      message.error('暂未上传技术文档')
     }
   }
   function technicalNew() {
@@ -241,7 +241,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传使用手册')
+      message.error('暂未上传使用手册')
     }
   }
 </script>
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index 401fb247..f6f7b1c8 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -224,7 +224,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传技术文档')
+      message.error('暂未上传接口文档')
     }
   }
   function technicalNew() {
@@ -248,7 +248,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂上传使用手册')
+      message.error('暂未上传使用手册')
     }
   }
 </script>

From 0c7715e1c14d223ad606256d17948a3fe55a0447 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 17:05:55 +0800
Subject: [PATCH 24/31] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8C=82=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue |   8 +-
 .../views/modules/components/upload/index.vue | 136 ++++++------------
 .../putOnTheShelf/components/special.vue      |  35 ++---
 .../src/views/modules/putOnTheShelf/index.vue |  17 ++-
 4 files changed, 81 insertions(+), 115 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index a1b9ea03..661f116b 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -156,7 +156,7 @@
       :close-on-press-escape='false'
       :before-close='clear'
       width="50%">
-      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList'></putOnTheShelf>
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList'></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
         <el-button type="primary" @click="submitData">确 定</el-button>
@@ -236,6 +236,10 @@ export default {
     this.fullScreen()
   },
   methods: {
+    changeInfoList (obj) {
+      this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
+      this.submitFrom.infoList.push(obj)
+    },
     reset () {
       this.$http
         .get(
@@ -426,7 +430,7 @@ export default {
     showPutOnTheShelfVue () {
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = true
-      this.submitFrom.infoList[0] = this.redio
+      this.submitFrom.infoList[0].attrValue = this.radio
       this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
       console.log('radio', this.radio)
     },
diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue
index 2d65cf9e..caa3cca5 100644
--- a/back/src/views/modules/components/upload/index.vue
+++ b/back/src/views/modules/components/upload/index.vue
@@ -2,45 +2,33 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 14:55:19
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 15:48:44
+ * @LastEditTime: 2022-07-08 17:03:42
  * @Description: 告诉大家这是什么
 -->
 <template>
-    <a-upload
-    v-model:file-list="fileList"
-    :action="`${apiURL}/upload`"
-    list-type="picture"
-    class="upload-list-inline"
-    :maxCount="maxCount"
-    :before-upload="beforeUpload"
-    @change="handleChange"
-    @preview="handlePreview"
-    @remove="handleRemove"
-  >
-    <a-button>
-      <upload-outlined></upload-outlined>
-      {{ btnName }}
-    </a-button>
-    <span
-      style="
-        display: inline-block;
-        margin-left: 10px;
-        color: #999999;
-        font-size: 14px;
-      "
-    >
-      {{ tip }}
-    </span>
-  </a-upload>
+  <el-upload
+    ref='my-upload'
+    :action="apiURL"
+    :accept='accept'
+    :on-change='handleChange'
+    :on-preview="handlePreview"
+    :on-remove="handleRemove"
+    :limit="maxCount"
+    :file-list="fileList">
+    <el-button size="small" type="primary">上传{{type}}</el-button>
+    <div slot="tip" class="el-upload__tip">{{tip}}</div>
+  </el-upload>
 </template>
 <script>
-import { message, Upload } from 'ant-design-vue'
+import Cookies from 'js-cookie'
 export default {
   name: '',
   components: {
 
   },
   props: {
+    title: String,
+    accept: String,
     btnName: String,
     type: String,
     tip: String,
@@ -52,87 +40,57 @@ export default {
   },
   data () {
     return {
-      apiURL: window.SITE_CONFIG.apiURL,
+      apiURL: window.SITE_CONFIG.apiURL + '/upload?token=' + Cookies.get('ucsToken'),
       fileList: JSON.parse(JSON.stringify(this.list))
     }
   },
   methods: {
-    beforeUpload (file) {
+    handleExceed (file) {
       console.log(file)
-      const isLt10M = file.size / 1024 / 1024 < 100
-      let flag
-      if (this.type === '图片') {
-        flag =
-        file.type === 'image/jpeg' ||
-        file.type === 'image/jpg' ||
-        file.type === 'image/png'
-      } else if (this.type === '视频') {
-        console.log(file.type === 'video/mp4')
-        flag =
-        file.type === 'audio/mpeg' ||
-        file.type === 'video/mp4' ||
-        file.type === 'video/mp3'
-      } else if (this.type === '文件') {
-        flag =
-        file.type === 'application/pdf' ||
-        file.type === 'application/msword' ||
-        file.type ===
-          'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-      }
-      console.log(flag)
-      if (!flag) {
-        message.error(`${file.name} 不是${this.type}类型`)
-      }
-      if (!isLt10M) {
-        message.error(`${file.name} 超出100M的大小`)
-      }
-      return flag || Upload.LIST_IGNORE
+    },
+    handError (err, file, fileList) {
+      console.log(err, file, fileList)
     },
     handlePreview (file) {
-      // console.log(file)
+      console.log(file)
       window.open(
         window.SITE_CONFIG.previewUrl +
         'hisense_office/onlinePreview?url=' +
         btoa(encodeURI(file.response.data))
       )
     },
-    handleChange (info) {
-      if (info.file.status !== 'uploading') {
-        console.log(info.file, info.fileList)
-      }
-      if (info.file.status === 'done') {
-        message.success(`${info.file.name}上传成功`)
-        this.data.note1 = info.file.response.data
-        console.log(this.data, this.fileList)
-        if (this.type === '图片') {
-          if (!this.emitFlag) {
-            // mybus.emit('chageImgList', fileList.value)
-          }
-        } else if (this.type === '文件') {
-          console.log('busType', this.busType)
-          if (this.busType == 2) {
-            console.log('busType', this.busType)
-            // mybus.emit('chageFileList2', fileList.value)
-          } else {
-            // mybus.emit('chageFileList', fileList.value)
-          }
-        } else if (this.type === '视频') {
-          // mybus.emit('chageVideoList', fileList.value)
+    handleChange (file, fileList) {
+      console.log(file, fileList)
+      if (file.status === 'success') {
+        if (file.response.msg === 'success') {
+          this.$message({
+            message: file.name + '上传成功',
+            type: 'success'
+          })
+          // this.data.note1 = file.response.data
+          this.$emit('changeInfoList', {
+            attrType: this.title,
+            attrValue: file.response.data,
+            delFlag: 0
+          })
+        } else {
+          this.$message.error(file.name + '上传失败')
+          this.$refs['my-upload'].clearFiles()
         }
-      } else if (info.file.status === 'error') {
-        message.error(`${info.file.name}上传失败`)
+      } else if (file.status === 'error') {
+        this.$message.error(file.name + '上传失败')
+        this.$refs['my-upload'].clearFiles()
       }
     },
     handleRemove (file) {
-      this.data.note1 = ''
+      this.$emit('changeInfoList', {
+        attrType: this.title,
+        attrValue: '',
+        delFlag: 0
+      })
     }
   }
 }
 </script>
 <style lang='scss' scoped>
-.ant-upload-list-item-image {
-  width: 100%;
-  height: 100%;
-  object-fit: contain;
-}
 </style>
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index d3409049..4e8bc1eb 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 15:15:02
+ * @LastEditTime: 2022-07-08 15:57:38
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -29,7 +29,7 @@
               </p>
               <div class="del">
                 <i class="delImg" @click="del( index)"></i>
-                <div @click="del( index)">删除</div>
+                <div @click="del(configure.name, index)">删除</div>
               </div>
             </div>
           </div>
@@ -48,7 +48,7 @@
               <!-- <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload> -->
           </div>
           <div class="submit">
-            <a-button type="primary" @click="add()">提交</a-button>
+            <a-button type="primary" @click="add(configure.name)">提交</a-button>
           </div>
         </div>
     </div>
@@ -71,7 +71,7 @@ export default {
     }
   },
   methods: {
-    add () {
+    add (title) {
       const list = this.configure.list
       let flag = true
       list.forEach((item) => {
@@ -89,11 +89,11 @@ export default {
         })
         this.data.push(obj)
         // console.log(data.value[title])
-        // mybus.emit('chageDataFrom', {
-        //   attrType: title,
-        //   attrValue: JSON.stringify(data.value[title]),
-        //   delFlag: 0
-        // })
+        this.$emit('changeInfoList', {
+          attrType: title,
+          attrValue: JSON.stringify(this.data),
+          delFlag: 0
+        })
         list.forEach((item) => {
           item.note1 = ''
         })
@@ -101,14 +101,15 @@ export default {
       } else {
         this.$message.warning('请填写完整')
       }
-    } // del (title, index) {
-    //   data.value[title].splice(index, 1)
-    //   mybus.emit('chageDataFrom', {
-    //     attrType: title,
-    //     attrValue: JSON.stringify(data.value[title]),
-    //     delFlag: 0
-    //   })
-    // }
+    },
+    del (title, index) {
+      this.data.splice(index, 1)
+      this.$emit('changeInfoList', {
+        attrType: title,
+        attrValue: JSON.stringify(this.data),
+        delFlag: 0
+      })
+    }
   }
 }
 </script>
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 50258260..ba64eb8a 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 15:50:06
+ * @LastEditTime: 2022-07-08 17:03:12
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -13,18 +13,18 @@
             <div class="top">{{child.name}}</div>
             <div v-for="item in child.children" :key="item.id" class='item'>
               <span>{{ item.name }}</span>
-              <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.jpg,.png' :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :dataList="item"
                 tip="支持图片类型，大小不超过100M"></upload>
-              <upload :list="[]" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
-                :data="item" tip="支持文件类型，大小不超过100M"></upload>
-              <upload :list="[]" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :data="item" :busType="2"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="[]" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
+                :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="[]" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :dataList="item" :busType="2"
                 tip="支持文件类型，大小不超过100M"></upload>
-              <upload :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :data="item"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
             </div>
           </template>
           <template v-else>
-            <special :configure='judgmentType.filter(item => item.name==child.name)[0]'></special>
+            <special :configure='judgmentType.filter(item => item.name==child.name)[0]' @changeInfoList='changeInfoList'></special>
           </template>
         </div>
       </div>
@@ -154,6 +154,9 @@ export default {
     }
   },
   methods: {
+    changeInfoList (obj) {
+      this.$emit('changeInfoList', obj)
+    }
   }
 }
 </script>

From cb46ccbcf92f116fb1b808100e2758a1cfadd409 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 17:25:35 +0800
Subject: [PATCH 25/31] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/components/upload/index.vue         | 2 +-
 .../src/views/modules/putOnTheShelf/components/special.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue
index caa3cca5..0f2de5a3 100644
--- a/back/src/views/modules/components/upload/index.vue
+++ b/back/src/views/modules/components/upload/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 14:55:19
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 17:03:42
+ * @LastEditTime: 2022-07-08 17:23:58
  * @Description: 告诉大家这是什么
 -->
 <template>
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index 4e8bc1eb..b8fc5c23 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 15:57:38
+ * @LastEditTime: 2022-07-08 17:24:29
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -303,4 +303,9 @@ export default {
   font-weight: 400;
   text-align: left;
 }
+textarea {
+  height: 100px;
+  resize: none;
+  font-size: 14px;
+}
 </style>

From c018a112713f8965be21820382abd50363b0c982 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 8 Jul 2022 17:25:37 +0800
Subject: [PATCH 26/31] bug492

---
 front/src/views/home/DetailsPageconetent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 2bb136a0..ac267498 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1026,7 +1026,7 @@
             }
             tecHnosphere = router.currentRoute.value.query.tecHnosphere
             appLiCation = router.currentRoute.value.query.appLiCation
-            if (val.typeList && val.typeList.length > 6) {
+            if (val.typeList && val.typeList.length > 8) {
               val.showShrink = true
               val.shrinkFlag = true
             }

From 42eb1257b145a16df424e1e39bf6a5e4771f5fe7 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 17:27:27 +0800
Subject: [PATCH 27/31] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/putOnTheShelf/components/special.vue | 4 ++--
 back/src/views/modules/putOnTheShelf/index.vue              | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index b8fc5c23..35c138ab 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 17:24:29
+ * @LastEditTime: 2022-07-08 17:26:24
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -136,7 +136,7 @@ export default {
 
 .bottom {
   margin-top: 25px;
-
+  margin-bottom: 25px;
   .items {
     background: #fafafa;
     padding: 10px;
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index ba64eb8a..67d0d450 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 17:03:12
+ * @LastEditTime: 2022-07-08 17:26:50
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -192,6 +192,7 @@ export default {
 .item {
   display: flex;
   align-items: center;
+  margin: 25px 0;
   & > span:nth-of-type(1) {
     width: 105px;
   }

From 2447b7abfa7c03333b23df84f8d18e86e4287e2a Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 8 Jul 2022 17:51:41 +0800
Subject: [PATCH 28/31] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/components/upload/index.vue | 2 +-
 back/src/views/modules/putOnTheShelf/index.vue     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue
index 0f2de5a3..22561ec1 100644
--- a/back/src/views/modules/components/upload/index.vue
+++ b/back/src/views/modules/components/upload/index.vue
@@ -15,7 +15,7 @@
     :on-remove="handleRemove"
     :limit="maxCount"
     :file-list="fileList">
-    <el-button size="small" type="primary">上传{{type}}</el-button>
+    <el-button>上传{{type}}</el-button>
     <div slot="tip" class="el-upload__tip">{{tip}}</div>
   </el-upload>
 </template>
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 67d0d450..b7c4fada 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 17:26:50
+ * @LastEditTime: 2022-07-08 17:48:27
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -21,6 +21,7 @@
                 tip="支持文件类型，大小不超过100M"></upload>
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
+              <el-button v-else-if="item.type == 'richText'" @click="goToRichText">打开编辑器</el-button>
             </div>
           </template>
           <template v-else>
@@ -156,6 +157,9 @@ export default {
   methods: {
     changeInfoList (obj) {
       this.$emit('changeInfoList', obj)
+    },
+    goToRichText () {
+
     }
   }
 }

From 678367a6bf8a809f8e4584faeca398387d299f6e Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 8 Jul 2022 18:33:17 +0800
Subject: [PATCH 29/31] =?UTF-8?q?=E7=BC=96=E7=9B=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/bscatalogue/ManagementPop.vue  | 11 ++++++++---
 back/src/views/modules/bscatalogue/bscatalogue.vue    |  1 +
 .../capabilityCloud/components/ComponentServices.vue  |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/back/src/views/modules/bscatalogue/ManagementPop.vue b/back/src/views/modules/bscatalogue/ManagementPop.vue
index dd55ee8e..dfbbfdf2 100644
--- a/back/src/views/modules/bscatalogue/ManagementPop.vue
+++ b/back/src/views/modules/bscatalogue/ManagementPop.vue
@@ -341,12 +341,17 @@ export default {
     // 查询所有编目
     getCategoryTree () {
       this.$http.get('/category/getCategoryTree').then((res) => {
+        res.data.data.map((item, indexFather) => {
+          if (item.id === this.showItem.id) {
+            this.index = indexFather
+          }
+        })
         this.data = []
-        if (this.showItem.children) {
-          this.showItem.children.forEach((val) => {
+        if (res.data.data[this.index].children) {
+          res.data.data[this.index].children.forEach((val) => {
             this.initData(val, this.cengji)
           })
-          this.data = this.showItem.children
+          this.data = res.data.data[this.index].children
           console.log('data======================>', this.data)
           this.flag = true
           this.showKey++
diff --git a/back/src/views/modules/bscatalogue/bscatalogue.vue b/back/src/views/modules/bscatalogue/bscatalogue.vue
index 43f341da..a3d8593d 100644
--- a/back/src/views/modules/bscatalogue/bscatalogue.vue
+++ b/back/src/views/modules/bscatalogue/bscatalogue.vue
@@ -174,6 +174,7 @@ export default {
       index: -1,
       pid: '',
       showKey: 0,
+      showItem: {},
       oldId: -1,
       isShowEdit: true,
       oldIdList: [],
diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue
index bf6082cf..97986fe1 100644
--- a/front/src/views/capabilityCloud/components/ComponentServices.vue
+++ b/front/src/views/capabilityCloud/components/ComponentServices.vue
@@ -271,7 +271,7 @@
       },
       grid: {
         top: '10%',
-        left: '3%',
+        left: '10%',
         right: '10%',
         bottom: '0%',
         containLabel: true,

From a839c90a1edfece03bc96a22adaee323ca3bcf1a Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Fri, 8 Jul 2022 19:02:20 +0800
Subject: [PATCH 30/31] =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html              |  16 +-
 front/src/store/modules/user.js      | 347 ++++++++++++++-------------
 front/src/utils/request.js           |  92 +++----
 front/src/vab/plugins/permissions.js | 108 ++++-----
 4 files changed, 273 insertions(+), 290 deletions(-)

diff --git a/front/public/index.html b/front/public/index.html
index 20397385..fc53acb7 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
@@ -45,10 +45,10 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index 1be71031..e37acb80 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -2,175 +2,182 @@
  * @author chuzhixin 1204505056@qq.com
  * @description 登录、获取用户信息、退出登录、清除accessToken逻辑，不建议修改
  */
-import { getUserInfo, login, logout } from '@/api/user'
-import {
-  getAccessToken,
-  removeAccessToken,
-  setAccessToken,
-} from '@/utils/accessToken'
-import { title, tokenName } from '@/config'
-import { message, notification } from 'ant-design-vue'
+ import { getUserInfo, login, logout } from '@/api/user'
+ import {
+   getAccessToken,
+   removeAccessToken,
+   setAccessToken,
+ } from '@/utils/accessToken'
+ import { title, tokenName } from '@/config'
+ import { message, notification } from 'ant-design-vue'
 
-const state = () => ({
-  accessToken: getAccessToken(),
-  username: '',
-  userId: '',
-  avatar: '',
-  role: 0, // 用户管理员权限
-})
-const getters = {
-  accessToken: (state) => state.accessToken,
-  username: (state) => state.username,
-  avatar: (state) => state.avatar,
-  role: (state) => state.role,
-  userId: (state) => state.userId,
-}
-const mutations = {
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 设置accessToken
-   * @param {*} state
-   * @param {*} accessToken
-   */
-  setAccessToken(state, accessToken) {
-    state.accessToken = accessToken
-    setAccessToken(accessToken)
-  },
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 设置用户名
-   * @param {*} state
-   * @param {*} username
-   */
-  setUsername(state, username) {
-    state.username = username
-  },
-  // 设置角色
-  setRole(state, role) {
-    state.role = role
-  },
-  // 设置用户userId
-  setUserId(state, id) {
-    state.userId = id
-  },
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 设置头像
-   * @param {*} state
-   * @param {*} avatar
-   */
-  setAvatar(state, avatar) {
-    state.avatar = avatar
-  },
-}
-const actions = {
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 登录拦截放行时，设置虚拟角色
-   * @param {*} { commit, dispatch }
-   */
-  setVirtualRoles({ commit, dispatch }) {
-    dispatch('acl/setFull', true, {
-      root: true,
-    })
-    commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif')
-    commit('setUsername', 'admin(未开启登录拦截)')
-  },
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 登录
-   * @param {*} { commit }
-   * @param {*} userInfo
-   */
-  async login({ commit }, userInfo) {
-    const { data } = await login(userInfo)
-    // debugger
-    const accessToken = data.data[tokenName]
-    if (accessToken) {
-      commit('setAccessToken', accessToken)
-      const hour = new Date().getHours()
-      const thisTime =
-        hour < 8
-          ? '早上好'
-          : hour <= 11
-          ? '上午好'
-          : hour <= 13
-          ? '中午好'
-          : hour < 18
-          ? '下午好'
-          : '晚上好'
-      notification.open({
-        message: `欢迎登录${title}`,
-        description: `${thisTime}！`,
-      })
-    } else {
-      message.error(`登录接口异常，未正确返回${tokenName}...`)
-    }
-  },
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 获取用户信息接口 这个接口非常非常重要，如果没有明确底层前逻辑禁止修改此方法，错误的修改可能造成整个框架无法正常使用
-   * @param {*} { commit, dispatch, state }
-   * @returns
-   */
-  getUserInfo({ commit }) {
-    return new Promise((resolve, reject)=>{
-      getUserInfo().then( (res) =>{
-        console.log('res', res)
-        const data = res.data
-        if (!data) {
-          message.error(`验证失败，请重新登录...`)
-          reject()
-        }
-        commit('setUsername', data.data.username)
-        commit('setRole', data.data.roleIdList.length)
-        commit('setUserId', data.data.id)
-        setTimeout(()=>{
-          resolve()
-        },500)
+ const state = () => ({
+   accessToken: getAccessToken(),
+   username: '',
+   userId: '',
+   avatar: '',
+   role: 0, // 用户管理员权限
+ })
+ const getters = {
+   accessToken: (state) => state.accessToken,
+   username: (state) => state.username,
+   avatar: (state) => state.avatar,
+   role: (state) => state.role,
+   userId: (state) => state.userId,
+ }
+ const mutations = {
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 设置accessToken
+    * @param {*} state
+    * @param {*} accessToken
+    */
+   setAccessToken(state, accessToken) {
+     state.accessToken = accessToken
+     setAccessToken(accessToken)
+   },
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 设置用户名
+    * @param {*} state
+    * @param {*} username
+    */
+   setUsername(state, username) {
+     state.username = username
+   },
+   // 设置角色
+   setRole(state, role) {
+     state.role = role
+   },
+   // 设置用户userId
+   setUserId(state, id) {
+     state.userId = id
+   },
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 设置头像
+    * @param {*} state
+    * @param {*} avatar
+    */
+   setAvatar(state, avatar) {
+     state.avatar = avatar
+   },
+ }
+ const actions = {
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 登录拦截放行时，设置虚拟角色
+    * @param {*} { commit, dispatch }
+    */
+   setVirtualRoles({ commit, dispatch }) {
+     dispatch('acl/setFull', true, {
+       root: true,
+     })
+     commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif')
+     commit('setUsername', 'admin(未开启登录拦截)')
+   },
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 登录
+    * @param {*} { commit }
+    * @param {*} userInfo
+    */
+   async login({ commit }, userInfo) {
+     const { data } = await login(userInfo)
+     // debugger
+     const accessToken = data.data[tokenName]
+     if (accessToken) {
+       commit('setAccessToken', accessToken)
+       const hour = new Date().getHours()
+       const thisTime =
+         hour < 8
+           ? '早上好'
+           : hour <= 11
+           ? '上午好'
+           : hour <= 13
+           ? '中午好'
+           : hour < 18
+           ? '下午好'
+           : '晚上好'
+       notification.open({
+         message: `欢迎登录${title}`,
+         description: `${thisTime}！`,
+       })
+     } else {
+       message.error(`登录接口异常，未正确返回${tokenName}...`)
+     }
+   },
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 获取用户信息接口 这个接口非常非常重要，如果没有明确底层前逻辑禁止修改此方法，错误的修改可能造成整个框架无法正常使用
+    * @param {*} { commit, dispatch, state }
+    * @returns
+    */
+   async getUserInfo({ commit }) {
+     const { data } = await getUserInfo()
+     if (!data) {
+       message.error(`验证失败，请重新登录...`)
+       return false
+     }
+     // debugger
+     commit('setUsername', data.data.username)
+     commit('setRole', data.data.roleIdList.length)
+     commit('setUserId', data.data.id)
+     // TODO 获取用户信息，后续执行部分操作
+     // let { username, avatar, roles, ability } = data
+     // if (username && roles && Array.isArray(roles)) {
+     //   dispatch('acl/setRole', roles, {
+     //     root: true,
+     //   })
+     //   if (ability && ability.length > 0)
+     //     dispatch('acl/setAbility', ability, {
+     //       root: true,
+     //     })
+     //   commit('setUsername', username)
+     //   commit('setAvatar', avatar)
+     // } else {
+     //   message.error('用户信息接口异常')
+     // }
+   },
 
-      })
-    })
-  },
-
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 退出登录
-   * @param {*} { dispatch }
-   */
-  async logout({ dispatch }) {
-    await logout(state.accessToken)
-    await dispatch('resetAll')
-  },
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 重置accessToken、roles、ability、router等
-   * @param {*} { commit, dispatch }
-   */
-  async resetAll({ dispatch }) {
-    await dispatch('setAccessToken', '')
-    await dispatch('acl/setFull', false, {
-      root: true,
-    })
-    await dispatch('acl/setRole', [], {
-      root: true,
-    })
-    await dispatch('acl/setAbility', [], {
-      root: true,
-    })
-    removeAccessToken()
-  },
-  /**
-   * @author chuzhixin 1204505056@qq.com
-   * @description 设置token
-   */
-  setAccessToken({ commit }, accessToken) {
-    commit('setAccessToken', accessToken)
-  },
-}
-export default {
-  state,
-  getters,
-  mutations,
-  actions,
-}
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 退出登录
+    * @param {*} { dispatch }
+    */
+   async logout({ dispatch }) {
+     await logout(state.accessToken)
+     await dispatch('resetAll')
+   },
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 重置accessToken、roles、ability、router等
+    * @param {*} { commit, dispatch }
+    */
+   async resetAll({ dispatch }) {
+     await dispatch('setAccessToken', '')
+     await dispatch('acl/setFull', false, {
+       root: true,
+     })
+     await dispatch('acl/setRole', [], {
+       root: true,
+     })
+     await dispatch('acl/setAbility', [], {
+       root: true,
+     })
+     removeAccessToken()
+   },
+   /**
+    * @author chuzhixin 1204505056@qq.com
+    * @description 设置token
+    */
+   setAccessToken({ commit }, accessToken) {
+     commit('setAccessToken', accessToken)
+   },
+ }
+ export default {
+   state,
+   getters,
+   mutations,
+   actions,
+ }
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index 581dbef8..f4fe2a90 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -12,7 +12,7 @@ import qs from 'qs'
 import router from '@/router'
 // import { isArray } from '@/utils/validate'
 import { message } from 'ant-design-vue'
-import { setAccessToken } from '@/utils/accessToken'
+import { getAccessToken, setAccessToken } from '@/utils/accessToken'
 
 let loadingInstance
 
@@ -22,15 +22,24 @@ let loadingInstance
  * @param {*} code
  * @param {*} msg
  */
-const handleCode = (code, msg, redirect) => {
+const handleCode = (code, msg, res) => {
+  debugger
   switch (code) {
     case 401:
       // message.error(msg || '登录失效')
+
       store.dispatch('user/resetAll').catch(() => {})
-      // // location.reload()
-      if (redirect) {
-        window.location.href = redirect
+      if (res.token) {
+        console.log('存在token信息', res.token)
+      setAccessToken(res.token)
+      const token = getAccessToken()
+      console.log('验证token信息', token)
       }
+
+      // // location.reload()
+      // if (redirect) {
+      //   window.location.href = res.redirect
+      // }
       break
     case 403:
       router.push({ path: '/401' }).catch(() => {})
@@ -87,10 +96,21 @@ instance.interceptors.request.use(
  */
 instance.interceptors.response.use(
   (response) => {
-    // console.log('接口返回', response)
-    // console.log('接口返回headers', response.headers)
-    // console.log('接口返回REDIRECT', response.headers.redirect)
-
+    console.log('接口返回', response)
+    console.log('接口返回headers', response.headers)
+    console.log('接口返回REDIRECT', response.headers.redirect)
+    response['Access-Control-Expose-Headers'] = 'redirect'
+    const { code, message } = response.data
+    if (response.headers.token) {
+      setAccessToken(response.headers.token)
+    } else {
+      if (response.headers.redirect) {
+        // window.location.href = response.headers.redirect
+        window.location.replace(response.headers.redirect)
+        return
+        // location.reload()
+      }
+    }
     if (response.headers.redirect === '/#/login') {
       var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
       if (keys) {
@@ -109,29 +129,12 @@ instance.interceptors.response.use(
             new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
         }
       }
-      // console.log('已清除')
+      console.log('已清除')
       setTimeout(() => {
         location.reload()
       }, 1000)
     }
-    debugger;
-    response['Access-Control-Expose-Headers'] = 'redirect'
-    const { code, message } = response.data
-    if (response.headers.token) {
-      setAccessToken(response.headers.token)
-      debugger
-      // setAccessToken(response.headers.token)
-      //  store.dispatch('user/getUserInfo')
-    } else {
-      if (response.headers.redirect) {
-        // window.location.href = response.headers.redirect
-        window.location.replace(response.headers.redirect)
-        return
-        // location.reload()
-      }
-    }
-
-    handleCode(code, message, response.headers.redirect)
+    handleCode(code, message, response.headers)
     if (loadingInstance) loadingInstance.close()
     // const { data, config } = response
     // const { code, msg } = data
@@ -151,38 +154,15 @@ instance.interceptors.response.use(
     // }
   },
   (error) => {
-    // console.log('接口error', error)
+    console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
     const { response, message } = error
     if (error.response && error.response.data) {
-      // console.log('接口返回', response)
-      // console.log('接口返回headers', response.headers)
-      // console.log('接口返回REDIRECT1111', response.headers.redirect)
-      if (response.headers.redirect === '/#/login') {
-        var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
-        if (keys) {
-          for (var i = keys.length; i--; ) {
-            document.cookie =
-              keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
-            document.cookie =
-              keys[i] +
-              '=0;path=/;domain=' +
-              document.domain +
-              ';expires=' +
-              new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com
-            document.cookie =
-              keys[i] +
-              '=0;path=/;domain=kevis.com;expires=' +
-              new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
-          }
-        }
-        // console.log('已清除')
-        setTimeout(() => {
-          location.reload()
-        }, 1000)
-      }
+      console.log('接口返回', response)
+      console.log('接口返回headers', response.headers)
+      console.log('接口返回REDIRECT', response.headers.redirect)
       if (response.headers.redirect) {
-        window.location.href = response.headers.redirect
+        window.location.replace(response.headers.redirect)
         return Promise.reject(error)
       }
       const { status, data } = response
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index a8f46286..8e495192 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -2,67 +2,63 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 19:58:32
+ * @LastEditTime: 2022-07-08 18:55:28
  * @Description: 告诉大家这是什么
  */
 /**
  * @author chuzhixin 1204505056@qq.com
  * @description 路由守卫，目前两种模式：all模式与intelligence模式
  */
-import router from '@/router'
-import store from '@/store'
-import getPageTitle from '@/utils/pageTitle'
-import {
-  // authentication,
-  loginInterception,
-  // recordRoute,
-  routesWhiteList,
-} from '@/config'
-import { setAccessToken, getAccessToken } from '@/utils/accessToken'
-router.beforeEach(async (to, from, next) => {
-  // 初始化拦截
-  // debugger
-  // const SSOTOKEN = to.query.SSOToken
-  // if (SSOTOKEN) {
-  //   setAccessToken(SSOTOKEN)
-  // }
-  const token = getAccessToken()
-  // console.log('token', token)
-  let hasToken = token || store.getters['user/accessToken']
-  // debugger
-  // 未开启登录拦截状态
-  if (!loginInterception) hasToken = true
-  // console.log('hasToken存在巨大问题', hasToken)
-  debugger
-  if (hasToken) {
-    setAccessToken(token)
-    await store.dispatch('user/getUserInfo')
-    debugger
-    next()
-  } else {
-    let accessRoutes = []
-    accessRoutes = await store.dispatch('routes/setRoutes')
-    accessRoutes.forEach((item) => {
-      router.addRoute(item)
-    })
-    if (routesWhiteList.indexOf(to.path) !== -1) {
-      next()
-    } else {
-      store.dispatch('user/getUserInfo').then((res)=>{
-        console.log('马到成功！')
-        next()
+ import router from '@/router'
+ import store from '@/store'
+ import getPageTitle from '@/utils/pageTitle'
+ import { getUserInfo } from '@/api/user'
+ import {
+   // authentication,
+   loginInterception,
+   // recordRoute,
+   routesWhiteList,
+ } from '@/config'
+ import { setAccessToken, getAccessToken } from '@/utils/accessToken'
+ router.beforeEach(async (to, from, next) => {
+   // debugger
+   // const SSOTOKEN = to.query.SSOToken
+   // if (SSOTOKEN) {
+   //   setAccessToken(SSOTOKEN)
+   // }
+   const token = getAccessToken()
+   console.log('token', token)
+   let hasToken = token || store.getters['user/accessToken']
+   // debugger
+   if (!loginInterception) hasToken = true
+   console.log('hasToken存在巨大问题', hasToken)
+   if (hasToken) {
+     setAccessToken(hasToken)
+     await store.dispatch('user/getUserInfo')
+     next()
+   } else {
+     let accessRoutes = []
+     accessRoutes = await store.dispatch('routes/setRoutes')
+     accessRoutes.forEach((item) => {
+       router.addRoute(item)
+     })
+     if (routesWhiteList.indexOf(to.path) !== -1) {
+       next()
+     } else {
+      getUserInfo().then(res=>{
+        console.log(res)
+        router.replace('/home')
       })
-      // if (recordRoute)
-      //   next({ path: '/login', query: { redirect: to.path }, replace: true })
-      // else next({ path: '/login', replace: true })
-      // debugger
-      // setTimeout(()=>{
+      //  await store.dispatch('user/getUserInfo')
       //   next()
-      // }, 500)
-      // window.open('http://www.baidu.com', '_self')
-    }
-  }
-})
-router.afterEach((to) => {
-  document.title = getPageTitle(to.meta.title)
-})
+       // if (recordRoute)
+       //   next({ path: '/login', query: { redirect: to.path }, replace: true })
+       // else next({ path: '/login', replace: true })
+      //  next()
+       // window.open('http://www.baidu.com', '_self')
+     }
+   }
+ })
+ router.afterEach((to) => {
+   document.title = getPageTitle(to.meta.title)
+ })

From c00872b8d70b37ed498d51da30105f715e6ed9a2 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 8 Jul 2022 19:52:59 +0800
Subject: [PATCH 31/31] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/inputSelectCheckbox.vue        | 177 ++++++++++++++++++
 .../src/views/modules/putOnTheShelf/index.vue |  13 +-
 2 files changed, 188 insertions(+), 2 deletions(-)
 create mode 100644 back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue

diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
new file mode 100644
index 00000000..1c72aebe
--- /dev/null
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -0,0 +1,177 @@
+<!--
+ *传参示例
+ html:
+ <input-select-checkbox
+ :type="typeSon"
+ :name="nameSon"
+:value="valueSon"
+:options="optionSon">
+</input-select-checkbox>
+js:
+  this.typeSon = 'select'//类型
+  this.nameSon = '算法描述'//名称
+  this.valueSon = '这是一个描述'//内容
+  this.optionSon = ['1', '2', '3']//选项
+-->
+<template>
+    <div id="inputSelectCheckbox">
+      <!-- input框 -->
+      <a-input v-if="type == 'input'" v-model:value="value" :placeholder="'请输入' + name" />
+      <!-- 下拉框 -->
+       <el-select
+        v-else-if="type === 'select'"
+        style="width: 240px"
+        v-model="value"
+        :placeholder="'请选择' + name">
+        <el-option
+          :value="itemSelect.dictLabel"
+          v-for="(itemSelect, indexSelect) in options"
+          :key="indexSelect">
+        {{ itemSelect.dictLabel }}
+        </el-option>
+      </el-select>
+      <!-- 多选 -->
+      <div
+        v-else-if="type === 'checkBox'"
+      >
+        <el-checkbox-group v-model="valueCheckBox">
+        <el-checkbox-button v-for="val in options" :label="val.dictLabel" :key="val.dictLabel">{{val.dictLabel}}</el-checkbox-button>
+      </el-checkbox-group>
+      </div>
+      <!-- 不可点的input框 -->
+      <el-input
+        v-else-if="type === 'disabled'"
+        v-model="value"
+        :placeholder="'请输入' + name"
+        :disabled="true"
+      />
+      <!-- 单选 -->
+       <el-radio-group v-model="value" v-else-if="type == 'radio'">
+        <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
+      </el-radio-group>
+      <!-- <a-radio-group
+
+          v-model:value="value"
+          :options="item.options.dictLabel"
+        /> -->
+      <!-- 描述框 -->
+      <!-- <a-textarea  v-model:value="value" :showCount="true"
+               /> -->
+    <a-textarea v-else-if="type == 'textArea'" v-model:value="value" :showCount="true" :maxlength="200" :placeholder="'请填写' + name"
+            />
+      <!-- <el-input  type="textarea" :maxlength="200" v-model="value" :placeholder="'请输入' + item.name" ></el-input> -->
+    </div>
+</template>
+<script>
+export default {
+  name: 'inputSelectCheckbox',
+  components: {
+
+  },
+  props: {
+    type: String,
+    data: Array,
+    name: String,
+    value: String,
+    options: {
+      type: Array,
+      default: null
+    }
+  },
+  data () {
+    return {
+      // 多选放数据的数组
+      valueCheckBox: [],
+      // 单选数据
+      regionSelect: '',
+      showKey: 0
+    }
+  },
+  methods: {
+    selectOptions () {
+      if (this.data.isLinkToDic === 'true' && this.data.linkValue) {
+        this.$http
+          .get(`/sys/dict/data/page?page=1&limit=20&dictTypeId=${this.data.linkValue}&deFlage=0`).then(({ data: res }) => {
+            console.log(res, 'res')
+            const dataList = []
+            res.data.list.forEach((element) => {
+              dataList.push(element)
+              console.log(dataList, 'this.options')
+            })
+            this.options = dataList
+            console.log(this.options)
+          })
+          .catch(() => {})
+      }
+    }
+  },
+  mounted () {
+    this.selectOptions()
+  }
+}
+</script>
+<style lang='scss' scoped>
+#inputSelectCheckbox {
+  margin-top: 20px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
+  span:first-child {
+    display: block;
+    width: 120px;
+  }
+  ::v-deep .el-select {
+    .el-input__inner {
+      resize: none;
+      width: 240px;
+    }
+  }
+  ::v-deep .ant-input {
+    // width: 570px;
+  }
+  ::v-deep .el-input__inner {
+    resize: none;
+    // width: 570px;
+  }
+  ::v-deep .el-textarea {
+    width: 570px;
+  }
+  ::v-deep .el-textarea__inner {
+    width: 570px;
+    height: 76px;
+    min-height: 32px;
+    resize: none;
+  }
+  ::v-deep .el-input__count {
+    bottom: -20px;
+    right: 5px;
+  }
+  ::v-deep .el-checkbox-group {
+    width: 570px;
+    display: grid;
+    margin-top: -5px;
+    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+  }
+  ::v-deep .el-checkbox-button__inner {
+    cursor: pointer;
+    font-size: 14px;
+    width: 90px;
+    height: 26px;
+    border-radius: 13px;
+    color: #333333;
+    background: #f5f5f5;
+    border: 1px #cccccc solid;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 10px;
+    font-weight: 500;
+  }
+  ::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner {
+    background: #0087ff;
+    color: #fff;
+    box-shadow: unset;
+  }
+}
+</style>
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 50258260..2212f1f9 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -12,7 +12,7 @@
           <template v-if='judgmentType.filter(item => item.name==child.name).length === 0'>
             <div class="top">{{child.name}}</div>
             <div v-for="item in child.children" :key="item.id" class='item'>
-              <span>{{ item.name }}</span>
+              <span v-if="item.name != '来源应用'">{{ item.name }}</span>
               <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
                 tip="支持图片类型，大小不超过100M"></upload>
               <upload :list="[]" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
@@ -21,6 +21,13 @@
                 tip="支持文件类型，大小不超过100M"></upload>
               <upload :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :data="item"
                 tip="支持视频类型，大小不超过100M"></upload>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :value="item.note1" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name" :value="item.note1"></input-select-checkbox>
             </div>
           </template>
           <template v-else>
@@ -31,13 +38,15 @@
     </div>
 </template>
 <script>
+import inputSelectCheckbox from './components/inputSelectCheckbox'
 import special from './components/special'
 import upload from '@/views/modules/components/upload'
 export default {
   name: '',
   components: {
     special,
-    upload
+    upload,
+    inputSelectCheckbox
   },
   props: {
     putOnTheShelfList: Array