Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

# Conflicts: # back/src/views/modules/ability/bsabilityai.vue
2022-12-29 16:33:21 +08:00 · 2022-12-29 16:33:21 +08:00 · abc52acd9b
parent 7286ced04e 1e4d145fe0
commit abc52acd9b
6 changed files with 134 additions and 41 deletions
--- 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>
--- 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,32 @@ 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':
+          bus.$emit('competencyApplicationInit')
+          break
+        case 'myAgent-AbilityResourceShelf':
+          bus.$emit('abilityResourceShelfInit')
+          break
+        case 'myAgent-ApplicationforCompetencyRequirements':
+          bus.$emit('applicationforRequirementsInit')
+          break
+        case 'myAgent-AbilityResourcesRemoved':
+          bus.$emit('AbilityResourcesRemovedInit')
+          break
+        case 'myAgent-CommentModeration':
+          bus.$emit('commentInit')
+          break
+        case 'activiti-RoomExamineAdmin':
+          bus.$emit('roomExamineAdminInit')
+          break
+      }
+    }

    // 未读通知数
    this.getUnReadCount()
--- 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: '',
@ -441,7 +441,12 @@ export default {
      }
    },
    showDetail (val) {
+<<<<<<< HEAD
      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
+=======
+      console.log(val)
+      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
+>>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
      // this.addOrUpdateHandle(id)
      // this.addOrUpdateVisible = true
      // this.disabled = false
@ -626,7 +631,12 @@ export default {
    },
    // 新上架
    clear () {
+<<<<<<< HEAD
      this.$router.push(this.routePath)
+=======
+      // this.$router.push(this.routePath)
+      console.log('清空----------------------------------------')
+>>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
      this.notFilled = []
      this.showPutOnTheShelfFlag = false
      this.showPutOnTheShelfFlag2 = false
@ -656,7 +666,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
--- 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: '',
@ -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(() => {
@ -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]
--- 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()
  },
--- 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;