Merge branch 'hi-ucs-dev' into release

# Conflicts:
#	back/src/views/modules/myAgent/demo/competency-application.vue

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

@@ -27,7 +27,7 @@
         <el-form-item>
           <span>日期：</span>
           <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <!--审核状态-->
@@ -43,7 +43,8 @@
 
         <!--部门-->
         <el-form-item>
-          <span>部门名称：</span>
+          <span v-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
+          <span v-else>申请部门：</span>
           <el-select
             v-model="abilityDepartment"
             placeholder="请选择部门"
@@ -51,18 +52,23 @@
             clearable
           >
             <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
+            <el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value" v-bind="item"></el-option>
           </el-select>
         </el-form-item>
 
         <!--类型-->
         <el-form-item>
           <span>类型：</span>
-          <el-select v-model="abilityType" placeholder="请选择类型" clearable>
+          <el-select v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>
             <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
             </el-option>
           </el-select>
+          <el-select v-else v-model="abilityType" placeholder="请选择类型" clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
+            </el-option>
+          </el-select>
         </el-form-item>
 
         <!--操作按钮查询-->
@@ -129,9 +135,9 @@
               </el-table-column>
               <el-table-column prop="tcfw" label="图层服务" min-width="100%">
               </el-table-column>
-              <el-table-column prop="kfzj" label="通用开发组件" min-width="100%">
+              <el-table-column prop="kfzj" label="开发组件" min-width="100%">
               </el-table-column>
-              <el-table-column prop="ywzj" label="业务能力组件" min-width="100%">
+              <el-table-column prop="ywzj" label="业务组件" min-width="100%">
               </el-table-column>
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
@@ -148,14 +154,14 @@
               </el-table-column>
               <el-table-column prop="tcfw" label="图层服务" min-width="100%">
               </el-table-column>
-              <el-table-column prop="kfzj" label="通用开发组件" min-width="100%">
+              <el-table-column prop="kfzj" label="开发组件" min-width="100%">
               </el-table-column>
-              <el-table-column prop="ywzj" label="业务能力组件" min-width="100%">
+              <el-table-column prop="ywzj" label="业务组件" min-width="100%">
               </el-table-column>
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2'>
+            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
             </el-table-column>
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
@@ -342,11 +348,19 @@ export default {
       typeOptions: [
         { name: '智能算法', value: 1 },
         { name: '图层服务', value: 2 },
-        { name: '通用开发组件', value: 3 },
+        { name: '开发组件', value: 3 },
-        { name: '页面开发组件', value: 4 },
+        { name: '业务组件', value: 4 },
         { name: '应用资源', value: 5 },
         { name: '会议室', value: 6 }
       ], // 类型备选列表
+      typeOptions1: [//能力上架隐藏会议室
+        { name: '智能算法', value: 1 },
+        { name: '图层服务', value: 2 },
+        { name: '开发组件', value: 3 },
+        { name: '业务组件', value: 4 },
+        { name: '应用资源', value: 5 },
+
+      ], // 类型备选列表
       detailFlag: false, // 明细返回按钮显示标志位
       startDate: '', // 开始时间
       endDate: '' // 结束时间
@@ -462,6 +476,7 @@ export default {
       this.$http
         .get('/census/center/selectDeptDetailTypeCountList/', {
           params: {
+            type: this.abilityType,
             page: page || 1,
             limit: 5,
             approveStatus: this.status,
@@ -527,6 +542,7 @@ export default {
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList', {
           params: {
+            type: this.abilityType,
             page: page || 1,
             limit: this.pageSize,
             approveStatus: this.status,
@@ -702,6 +718,7 @@ export default {
             limit: 5,
             // page: page || 1,
             approveStatus: '',
+            type: '',
             deptId: '',
             params: '',
             startDate: ''
@@ -881,8 +898,8 @@ export default {
     // 点击查询按钮查询数据
     getDataList () {
       if (this.value1 && this.value1.length > 0) {
-        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss')
+        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
-        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
+        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
       } else {
         this.startDate = ''
         this.endDate = ''

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: Light
- * @LastEditTime: 2022-10-20 16:16:16
+ * @LastEditTime: 2022-10-21 16:11:46
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -94,7 +94,7 @@
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <!-- 委托 -->
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag'>{{ $t('process.entrustTask') }}</el-button>
+        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
@@ -132,6 +132,7 @@ export default {
   data () {
     return {
       taskEntrustFlag: false,
+      taskEntrustFlag2: false,
       dialogVisible: false,
       renTaskEntrustVisible: false,
       dialogType: '',
@@ -268,6 +269,25 @@ export default {
               this.dataForm,
               'elas============================'
             )
+            this.$http
+              .get(
+            `/act/task/getTaskVariables?${params}&variableName=allowEntrust`
+              ).then(entrust => {
+                if (entrust.data.data.allowEntrust === true) {
+                  this.taskEntrustFlag2 = true
+                  if (this.taskEntrustFlag && this.taskEntrustFlag2) {
+                    this.$alert('当前审核部门为' + res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', {
+                      confirmButtonText: '确定',
+                      callback: action => {
+                        // this.$message({
+                        //   type: 'info',
+                        //   message: `action: ${action}`
+                        // })
+                      }
+                    })
+                  }
+                }
+              })
             if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
               res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
               res.data.tAbilityApplicationDTOList[0].applicationScene.map(

front/src/utils/request.js

@@ -161,14 +161,14 @@ instance.interceptors.response.use(
     console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
 
-    const { response, message } = error
+    const { response, myMessage } = error
     if (error.response) {
       console.log('接口返回', response)
       console.log('接口返回headers', response.headers)
       console.log('接口返回REDIRECT', response.headers.redirect)
       const { status, data } = response
 
-      handleCode(status, data.msg || message, response.headers.redirect)
+      handleCode(status, data.msg || myMessage, response.headers.redirect)
       if (response.headers.token) {
         setAccessToken(response.headers.token)
       }
@@ -179,18 +179,18 @@ instance.interceptors.response.use(
 
       return Promise.reject(error)
     } else {
-      let { message } = error
+      // let { message } = error
-      if (message === 'Network Error') {
+      if (error.message === 'Network Error') {
-        message = '后端接口连接异常'
+        error.message = '后端接口连接异常'
       }
-      if (message.includes('timeout')) {
+      if (error.message.includes('timeout')) {
-        message = '后端接口请求超时'
+        error.message = '后端接口请求超时'
       }
-      if (message.includes('Request failed with status code')) {
+      if (error.message.includes('Request failed with status code')) {
-        const code = message.substr(message.length - 3)
+        const code = error.message.substr(error.message.length - 3)
-        message = '后端接口' + code + '异常'
+        error.message = '后端接口' + code + '异常'
       }
-      message.error(message || `后端接口未知异常`)
+      message.error(error.message || `后端接口未知异常`)
       return Promise.reject(error)
     }
   }

front/src/views/abilityStatistics/components/AbilityRanking.vue

@@ -69,7 +69,7 @@
               <div class="content-index">{{ index + 1 }}</div>
               <div class="content-neirong">{{ item.resourceName }}</div>
               <div class="content-fangwenliang" v-if="taboldName === '好评榜'">
-                平均分：{{ item.score }}
+                评分：{{ item.score }}
               </div>
               <div
                 class="content-fangwenliang"

front/src/views/home/AbilityToApplyFor.vue

@@ -126,7 +126,13 @@
     title="已申请摄像头列表"
     @ok="videoVisible = false"
   >
-  <a-select placeholder="请选择归属部门"  v-model:value="deptName" :getPopupContainer="(triggerNode) => triggerNode.parentNode" show-search  option-filter-prop="children" :filterOption="filterOption" @change="deptIdChangeFunction">
+  <a-select placeholder="请选择归属部门" 
+                  style="width: 200px" 
+                  v-model:value="deptName" 
+                   :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
+                     show-search 
+                     :filterOption="true"  
+                     @change="deptIdChangeFunction">
                     <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
                       {{ item.name }}
                     </a-select-option>
@@ -204,6 +210,7 @@
   const showItem = (id, type, delFlag, note1) => {
     if (type == '基础设施') {
       let arr = JSON.parse(note1);
+      //console.log('arrarr====',arr);
       xVideoList.value = []
       arr.map((val) => {
         xVideoList.value.push({
@@ -244,10 +251,6 @@
         })
     } 
       getDeptAllData(); 
-    //select搜索过滤
-    const filterOption = (input, option) => {
-    return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  }
 </script>
 
 <style scoped lang="less">

front/src/views/home/apply.vue

@@ -88,6 +88,9 @@
                     v-else
                     placeholder="请选择归属部门"
                     v-model:value="formName.unit"
+                    :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
+                    show-search 
+                     :filterOption="true" 
                     @change="deptIdChangeFunction"
                   >
                     <a-select-option

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

@@ -232,35 +232,53 @@ const tabTypeObj = {
 
 // 会议室后台
 const goPage = (item) => {
-  let typeText = typeObj[item.type];
+  if (item.jumpUrl && item.type !== 12) {
-  if (typeText) {
+    let typeText = typeObj[item.type];
+    console.log('item------------>', item);
     console.log('typeText类型------------>', typeText);
-    // 是后台，跳转到后台相关页面
+    // "http://192.168.124.236:9796/#/personalCenter?tabTypeName=能力申请"
-    if (typeText.indexOf('后台') !== -1) {
+    let _url = item.jumpUrl && item.jumpUrl.split('#')
-      let _applyState = item.applyState
+    let openType = '_self';
-      let _page = pageObj[typeText][_applyState]
+    // 如果是跳转到后台管理，重新打开页面
-      window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`)
+    if (typeText && typeText.indexOf('后台') !== -1) {
-    } else if (typeText.indexOf('前台') !== -1) {
+      openType = '_blank'
-      if (typeText == '会议室前台') {
+    } else {
-        router.push({
+      if (_url[1] && _url[1].indexOf('personalCenter') !== -1) {
-          path: '/DetailsPageconetent',
-          query: {
-            select: '基础设施',
-            formPage: 'noticePage'
-          },
-        })
-      } else {
         window.sessionStorage.setItem('type', JSON.stringify('apply'))
-        router.push({
-          path: '/personalCenter',
-          query: {
-            tabTypeName: tabTypeObj[typeText] || '能力申请',
-          }
-        })
       }
-
     }
+    window.open(item.jumpUrl, openType)
+    
   }
+  return;
+  // if (typeText) {
+  //   console.log('typeText类型------------>', typeText);
+  //   // 是后台，跳转到后台相关页面
+  //   if (typeText.indexOf('后台') !== -1) {
+  //     let _applyState = item.applyState
+  //     let _page = pageObj[typeText][_applyState]
+  //     window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`)
+  //   } else if (typeText.indexOf('前台') !== -1) {
+  //     if (typeText == '会议室前台') {
+  //       router.push({
+  //         path: '/DetailsPageconetent',
+  //         query: {
+  //           select: '基础设施',
+  //           formPage: 'noticePage'
+  //         },
+  //       })
+  //     } else {
+  //       window.sessionStorage.setItem('type', JSON.stringify('apply'))
+  //       router.push({
+  //         path: '/personalCenter',
+  //         query: {
+  //           tabTypeName: tabTypeObj[typeText] || '能力申请',
+  //         }
+  //       })
+  //     }
+
+  //   }
+  // }
 }
 
 // 更改消息状态