From c76f55d9edab8e198da30d54a3e2fb45971cb9ab Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 28 Dec 2022 17:13:31 +0800
Subject: [PATCH 1/5] =?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

---
 back/src/views/modules/ability/bsabilityai.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index a5fe82e1..3941f793 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -444,7 +444,7 @@ export default {
     },
     showDetail (val) {
       console.log(val)
-      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
+      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
       // this.addOrUpdateHandle(id)
       // this.addOrUpdateVisible = true
       // this.disabled = false

From 91a295c5572dc06f8d0c8782a18c2a4cf82641b3 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 28 Dec 2022 17:30:53 +0800
Subject: [PATCH 2/5] =?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

---
 back/src/views/modules/ability/bsabilityservice.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index f5e420a1..dc13a1f2 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -359,7 +359,7 @@ export default {
         })
     },
     showDetail (val) {
-      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
+      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
       // this.addOrUpdateVisible = true
       // this.disabled = false
       // this.$nextTick(() => {

From 6734eafbdd77a3522a6128fe2f0f11d26eba1e44 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 29 Dec 2022 09:40:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?UCS=E5=90=8E=E5=8F=B0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E3=80=81=E7=BB=84=E4=BB=B6=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4----=E9=9C=80=E6=B1=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E5=90=8E=E5=8F=B0=E8=83=BD=E5=8A=9B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=8C=82=E6=8E=A5=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue |  6 +-
 .../modules/ability/bsabilityservice.vue      |  6 +-
 .../src/views/modules/putOnTheShelf/index.vue | 84 +++++++++++++++++--
 3 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 3941f793..daf9fc7a 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -271,7 +271,7 @@ export default {
       radio: '',
       showPutOnTheShelfFlag: false,
       showPutOnTheShelfFlag2: false,
-      routePath: '',
+      // routePath: '',
       submitFrom: {
         type: '组件服务',
         deptId: '',
@@ -630,7 +630,7 @@ export default {
     },
     // 新上架
     clear () {
-      this.$router.push(this.routePath)
+      // this.$router.push(this.routePath)
       console.log('清空----------------------------------------')
       this.notFilled = []
       this.showPutOnTheShelfFlag = false
@@ -661,7 +661,7 @@ export default {
       })
     },
     showPutOnTheShelfVue () {
-      this.routePath = this.$route.path
+      // this.routePath = this.$route.path
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = true
       this.submitFrom.infoList[0].attrValue = this.radio
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index dc13a1f2..11f43505 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -271,7 +271,7 @@ export default {
       insertList: [],
       putOnTheShelfList: [],
       showPutOnTheShelfFlag2: false,
-      routePath: '',
+      // routePath: '',
       submitFrom: {
         type: '应用资源',
         deptId: '',
@@ -595,7 +595,7 @@ export default {
     },
     // 新上架
     clear () {
-      this.$router.push(this.routePath)
+      // this.$router.push(this.routePath)
       this.notFilled = []
       this.showPutOnTheShelfFlag2 = false
       this.insertList = []
@@ -617,7 +617,7 @@ export default {
     },
     // 上架
     showPutOnTheShelf () {
-      this.routePath = this.$route.path
+      // this.routePath = this.$route.path
       this.showPutOnTheShelfFlag2 = true
       this.$http.get('/category/getCategoryTree').then(res => {
         this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 254ce7f9..6f40602a 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,18 +2,27 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: Light
- * @LastEditTime: 2022-12-20 09:50:01
+ * @LastEditTime: 2022-12-29 09:34:56
  * @Description: 告诉大家这是什么
 -->
 <template>
     <div class="put-on-the-shelf">
       <div class="left">
-        <a-anchor>
-          <a-anchor-link v-for="parent in putOnTheShelfList" :key="parent.id+'left'" :href="'#'+parent.name" :title="parent.name" />
-        </a-anchor>
+        <div class="item" v-for="(parent,index) in putOnTheShelfList" :key="parent.id+'left'">
+          <div class="main" @click="selectItem(parent.name)" :class="selectName===parent.name?'select':''">
+            <div class="circular-box">
+              <div class="circular"></div>
+            </div>
+            <div class="name">{{ parent.name }}</div>
+          </div>
+          <div class="bottom" v-if="index !== putOnTheShelfList.length-1"></div>
+        </div>
+        <!-- <a-anchor @change="handlerAnchor" :affix="true" :get-current-anchor="'#'+putOnTheShelfList[0].name">
+          <a-anchor-link v-for="parent in putOnTheShelfList" :key="parent.id+'left'" :href="'#'+parent.name" :title="parent.name"/>
+        </a-anchor> -->
       </div>
-      <div class="right">
-        <div v-for="parent in putOnTheShelfList" :key='parent.id' :id="parent.name">
+      <div class="right" id="putOnTheShelf">
+        <div v-for="parent in showList" :key='parent.id' :id="parent.name">
           <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>
@@ -87,6 +96,8 @@ export default {
   },
   data () {
     return {
+      selectName: '',
+      showList: [],
       changeField: [],
       judgmentType: [
         {
@@ -200,6 +211,20 @@ export default {
   },
   mounted () {
     this.defaultContent()
+    // this.showList = this.putOnTheShelfList[0]
+  },
+  watch: {
+    putOnTheShelfList: {
+      handler (newVal, oldVal) {
+        if (this.showList.length === 0 && newVal.length > 0) {
+          this.showList = [this.putOnTheShelfList[0]]
+          this.selectName = this.showList[0].name
+          console.log('初始化', this.$router, this.$route)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
   },
   methods: {
     // 提交
@@ -241,7 +266,16 @@ export default {
     },
     showType (data) {
       this.showTypeName = data
-      console.log(data, this.showTypeName, '传过来的showType')
+    },
+    selectItem (str) {
+      if (str) {
+        this.selectName = str
+        this.showList = this.putOnTheShelfList.filter(val => val.name === str)
+        this.$nextTick(() => {
+          console.log(document.querySelector('#putOnTheShelf'))
+          document.querySelector('#putOnTheShelf').scrollTop = 0
+        })
+      }
     }
   }
 }
@@ -253,6 +287,41 @@ export default {
   padding: 0 50px;
   .left {
     margin-right: 50px;
+    .main{
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      .circular-box{
+        width: 18px;
+        height: 18px;
+        border-radius: 9px;
+        border: 1px rgba($color: #0058e1, $alpha: 0) solid;
+        margin-right: 20px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .circular{
+          width: 10px;
+          height: 10px;
+          border-radius: 6px;
+          border: 1px #0058e1 solid;
+        }
+      }
+    }
+    .select{
+
+      .circular-box{
+        border: 1px #0058e1 solid;
+        .circular{
+          background: #0058e1;
+        }
+      }
+    }
+    .bottom{
+      height: 46px;
+      border-left: #0058e1 1px solid;
+      margin: -4px 0 -4px 9px;
+    }
   }
   .right {
     height: 500px;
@@ -267,6 +336,7 @@ export default {
 // }
 
 .top {
+  width: 800px;
   color: #333333;
   font-size: 22px;
   display: flex;

From 09edc0fb05d672bb0d546045340236541c087eeb Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 29 Dec 2022 11:03:38 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8-=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E6=89=93=E5=BC=80=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E6=8F=90=E4=B8=80=E4=B8=AA=E6=B5=81=E7=A8=8B=E3=80=81?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=80=E4=B8=AA=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E5=AD=97=E6=9C=89=E8=AF=AF=EF=BC=8C=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=88=B7=E6=96=B0=EF=BC=8C=E5=88=87=E6=8D=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=B9=9F=E4=B8=8D=E8=83=BD=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html                        |  7 ++-
 back/src/views/main-navbar.vue                | 60 +++++++++++--------
 .../modules/activiti/RoomExamineAdmin.vue     |  8 +++
 3 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/back/public/index.html b/back/public/index.html
index 6dfeafc1..8d7d520c 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-08-25 14:51:36
+ * @LastEditors: Light
+ * @LastEditTime: 2022-12-29 09:59:52
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -39,7 +39,8 @@
       window.SITE_CONFIG['previewUrl'] = _global.config.previewUrl;
       window.SITE_CONFIG['apiURL'] = _global.config.apiURL;
       // WebSocket地址
-      window.SITE_CONFIG['socketURL'] =_global.config.socketURL;
+      // window.SITE_CONFIG['socketURL'] =_global.config.socketURL;
+      window.SITE_CONFIG['websocketURL'] = _global.config.websocketURL
     </script>
 </head>
 <body>
diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index 0df84d2c..bd089054 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -105,8 +105,9 @@ import { messages } from '@/i18n'
 import screenfull from 'screenfull'
 import UpdatePassword from './main-navbar-update-password'
 import { clearLoginInfo } from '@/utils'
-// import Cookies from 'js-cookie'
-// var socket = null
+import Cookies from 'js-cookie'
+import bus from '@/views/bus.js'
+var socket = null
 export default {
   inject: ['refresh'],
   data () {
@@ -120,29 +121,38 @@ export default {
     UpdatePassword
   },
   created () {
-    // var vue = this
-    // socket = new WebSocket(`${window.SITE_CONFIG['socketURL']}?token=${Cookies.get('token')}`)
-    // socket.onopen = function () {}
-    // socket.onerror = function () {
-    //   vue.$notify.error({
-    //     title: vue.$t('notice.disconnect'),
-    //     message: vue.$t('notice.disconnectMessage')
-    //   })
-    // }
-    // socket.onmessage = function (evt) {
-    //   const result = JSON.parse(evt.data)
-
-    //   // 如果是有新文本通知，则提示有新通知
-    //   if (result.type === 0) {
-    //     vue.messageTip = true
-    //     vue.$notify({
-    //       title: vue.$t('notice.new'),
-    //       message: result.msg,
-    //       type: 'info',
-    //       duration: 5000
-    //     })
-    //   }
-    // }
+    const that = this
+    socket = new WebSocket(`${window.SITE_CONFIG.websocketURL}?token=${Cookies.get('ucsToken')}`)
+    socket.onopen = function () {}
+    socket.onerror = function () {}
+    socket.onmessage = function (res) {
+      switch (that.$route.name) {
+        case 'myAgent-CompetencyApplication':
+          console.log('websocket,11')
+          bus.$emit('competencyApplicationInit')
+          break
+        case 'myAgent-AbilityResourceShelf':
+          console.log('websocket,22')
+          bus.$emit('abilityResourceShelfInit')
+          break
+        case 'myAgent-ApplicationforCompetencyRequirements':
+          console.log('websocket,33')
+          bus.$emit('applicationforRequirementsInit')
+          break
+        case 'myAgent-AbilityResourcesRemoved':
+          console.log('websocket,44')
+          bus.$emit('AbilityResourcesRemovedInit')
+          break
+        case 'myAgent-CommentModeration':
+          console.log('websocket,55')
+          bus.$emit('commentInit')
+          break
+        case 'activiti-RoomExamineAdmin':
+          console.log('websocket,66')
+          bus.$emit('roomExamineAdminInit')
+          break
+      }
+    }
 
     // 未读通知数
     this.getUnReadCount()
diff --git a/back/src/views/modules/activiti/RoomExamineAdmin.vue b/back/src/views/modules/activiti/RoomExamineAdmin.vue
index 214018a1..78fdadb9 100644
--- a/back/src/views/modules/activiti/RoomExamineAdmin.vue
+++ b/back/src/views/modules/activiti/RoomExamineAdmin.vue
@@ -215,6 +215,7 @@
   </el-card>
 </template>
 <script>
+import bus from '@/views/bus.js'
 import Cookies from 'js-cookie'
 export default {
   data () {
@@ -248,6 +249,13 @@ export default {
       roomNameA: ''
     }
   },
+  created () {
+    bus.$off('roomExamineAdminInit')
+    bus.$on('roomExamineAdminInit', () => {
+      this.getSerach()
+      bus.$emit('updateTaskNum')
+    })
+  },
   mounted () {
     this.getSerach()
   },

From 1e4d145fe03902c4ae099d8c968b93c472595a68 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 29 Dec 2022 15:11:43 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-navbar.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index bd089054..5538c710 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -128,27 +128,21 @@ export default {
     socket.onmessage = function (res) {
       switch (that.$route.name) {
         case 'myAgent-CompetencyApplication':
-          console.log('websocket,11')
           bus.$emit('competencyApplicationInit')
           break
         case 'myAgent-AbilityResourceShelf':
-          console.log('websocket,22')
           bus.$emit('abilityResourceShelfInit')
           break
         case 'myAgent-ApplicationforCompetencyRequirements':
-          console.log('websocket,33')
           bus.$emit('applicationforRequirementsInit')
           break
         case 'myAgent-AbilityResourcesRemoved':
-          console.log('websocket,44')
           bus.$emit('AbilityResourcesRemovedInit')
           break
         case 'myAgent-CommentModeration':
-          console.log('websocket,55')
           bus.$emit('commentInit')
           break
         case 'activiti-RoomExamineAdmin':
-          console.log('websocket,66')
           bus.$emit('roomExamineAdminInit')
           break
       }