Merge branch 'hi-ucs-dev' into release

back/src/mixins/process-module.js

@@ -47,20 +47,31 @@ export default {
       }
     },
     // 获取流程定义的表单路由配置信息
-    getProcDefRouteSet (data, callback) {
+    getProcDefRouteSet (data, callback, str) {
-      this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => {
+      if (data.resourceName && !data.processDefinitionId) {
-        if (res.code !== 0) {
+        switch (str) {
-          return this.$message.error(res.msg)
+          case '待办':
+            this.$router.push({ name: 'activiti-RoomExamineAdmin' })
+            break
+          case '已办':
+            this.$router.push({ name: 'activiti-RoomExamineAdminDone' })
+            break
         }
-        if (!res.data || !res.data.bizRoute) {
+      } else {
-          return this.$message.error(this.$t('process.routeError'))
+        this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => {
-        }
+          if (res.code !== 0) {
-        var param = {
+            return this.$message.error(res.msg)
-          ...data,
+          }
-          ...res.data
+          if (!res.data || !res.data.bizRoute) {
-        }
+            return this.$message.error(this.$t('process.routeError'))
-        callback(param)
+          }
-      }).catch(() => { })
+          var param = {
+            ...data,
+            ...res.data
+          }
+          callback(param)
+        }).catch(() => { })
+      }
     },
     getProcDefBizRouteAndProcessInstance (params, callback) {
       this.$http.get('/act/process/getProcDefBizRouteAndProcessInstance', {

back/src/views/modules/ability/bsabilityai.vue

@@ -300,7 +300,9 @@ export default {
         infoList: [],
         delFlag: 0,
         type: '组件服务',
-        name: ''
+        name: '',
+        deptIds: [],
+        region: true
       },
       // qp: false,
       // 关联应用弹窗
@@ -326,7 +328,7 @@ export default {
     this.dataForm.name = ''
     this.dataForm.type = '组件服务'
     this.$http.get('/sys/user/info').then(res => {
-      console.log('res', res.data.data)
+      console.log('res', res.data.data, !res.data.data.superAdmin, this.$store.state.user.roleIdList)
       this.superAdmin = res.data.data.superAdmin
     })
   },
@@ -391,7 +393,9 @@ export default {
             infoList: [],
             delFlag: 0,
             type: '组件服务',
-            name: ''
+            name: '',
+            deptIds: [],
+            region: true
           }
         )
         .then(({ data: res }) => {
@@ -546,7 +550,9 @@ export default {
               infoList: [],
               delFlag: 0,
               type: '组件服务',
-              name: names
+              name: names,
+              deptIds: [],
+              region: true
             }
           )
           .then(({ data: res }) => {

back/src/views/modules/ability/bsabilityservice.vue

@@ -260,7 +260,8 @@ export default {
         creator: '',
         selectType: 0,
         delFlag: 0,
-        type: '应用资源'
+        type: '应用资源',
+        region: true
       },
       qp: false,
       relateApplicationResourceVisible: false,
@@ -319,7 +320,8 @@ export default {
               delFlag: 0,
               creator: '',
               type: '应用资源',
-              name: ''
+              name: '',
+              region: true
             })
         )
         .then(({ data: res }) => {
@@ -405,7 +407,8 @@ export default {
                 creator: '',
                 selectType: 0,
                 delFlag: 0,
-                name: names
+                name: names,
+                region: true
               })
           )
           .then(({ data: res }) => {

back/src/views/modules/myAgent/CompetencyApplication.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: Light
- * @LastEditTime: 2022-12-06 10:18:28
+ * @LastEditTime: 2022-12-15 10:28:03
  * @Description: 能力申请
 -->
 <template>
@@ -83,11 +83,22 @@
         <!-- <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
+          label="当前审核人"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.assigneeName + (scope.row.synergism ? '('+scope.row.auditTeamName+')':'')
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
           prop="processDefinitionName"
           :label="$t('process.processDefinitionName')"
           header-align="center"
           align="center"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="taskName"
           :label="$t('process.taskName')"

back/src/views/modules/workBench/components/dept-todo-view.vue

@@ -129,9 +129,9 @@ export default {
       data.taskName = name
       data.activityId = data.startUserId
       if (nameSwitch === '待办') {
-        this.getProcDefRouteSet(item, this.forwardHandleUrl)
+        this.getProcDefRouteSet(item, this.forwardHandleUrl, '待办')
       } else {
-        this.getProcDefRouteSet(item, this.forwardDetail)
+        this.getProcDefRouteSet(item, this.forwardDetail, '已办')
       }
     },
     formatNum (num) {

front/src/views/demandCenter/demandDetails.vue

@@ -159,7 +159,9 @@
                   text-align: center;
                   cursor: pointer;
                 "
-                @click="downloadFile(formName.enclosure, '申请附件')"
+                @click="
+                  downloadFile(formName.enclosure, formName.enclosureName)
+                "
               >
                 下载
               </button>
@@ -362,6 +364,7 @@
     xhr.responseType = 'blob'
     xhr.send()
     xhr.onload = function () {
+      console.log('下载', path, this.status, navigator)
       if (this.status === 200 || this.status === 304) {
         // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
         if ('msSaveOrOpenBlob' in navigator) {
@@ -379,6 +382,8 @@
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
+      } else {
+        message.warning('下载失败')
       }
     }
   }

front/src/views/home/components/CanAssignCase.vue

@@ -58,6 +58,7 @@ function toView(item) {
     path: '/integrationServicesDetails',
     query: {
       id: item.id,
+      type:'典型赋能场景'
     },
   })
 }

front/src/views/home/components/header.vue

@@ -557,6 +557,7 @@
       justify-content: center;
 
       .img {
+        cursor: pointer;
         width: 0.3rem;
         height: 0.3rem;
         border-radius: 0.1rem;

front/src/views/home/components/searchResultList.vue

@@ -627,6 +627,7 @@
             path: '/integrationServicesDetails',
             query: {
               id: item.id,
+              type:'打包模式'
             },
           })
         } else {

front/src/views/home/detailBack.vue

@@ -17,66 +17,79 @@
 </template>
 
 <script setup>
-  import { reactive, ref, watch, defineProps } from 'vue'
+import { reactive, ref, watch, defineProps } from 'vue'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
+import { useStore } from 'vuex'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  const router = useRouter()
+const router = useRouter()
-  const oldValue1 = ref('')
+const oldValue1 = ref('')
-  const props = defineProps({
+const props = defineProps({
-    textColor: { type: String, default: '' },
+  textColor: { type: String, default: '' },
-  })
+  returnType: { type: String, default: '' },
-
+})
-  const previousPage = () => {
+const returnType = props.returnType
+const previousPage = () => {
+  if (returnType =='典型赋能场景'|| returnType =='打包模式') {
+    router.push({
+      path: '/integrationServices',
+      query: {
+        returnType: returnType,
+            },
+    })
+  } else {
     if (window.history.state.back) {
       window.history.go(-1)
     } else {
+      debugger
       router.push({
         path: '/integrationServices',
       })
     }
   }
+}
 
-  const detailName = ref('应用资源1')
+const detailName = ref('应用资源1')
 
-  const goToDetailsPageconetent = () => {
+const goToDetailsPageconetent = () => {
-    let pathData = {
+  let pathData = {
-      path: '/DetailsPageconetent',
+    path: '/DetailsPageconetent',
-    }
-    mybus.emit('changeMenuStyle', pathData)
   }
+  mybus.emit('changeMenuStyle', pathData)
+}
 </script>
 
 <style scoped lang="less">
-  .detail-back {
+.detail-back {
-    position: absolute;
+  position: absolute;
-    top: 1rem;
+  top: 1rem;
-    left: 100px;
+  left: 100px;
-    font-size: 0.18rem;
+  font-size: 0.18rem;
-    color: #fff;
+  color: #fff;
+  cursor: pointer;
+  width: 50px;
+  height: 50px;
+  background-image: url('~@/assets/detailsAll/back.png');
+  background-size: 100% 100%;
+}
+
+.nav-box {
+  position: absolute;
+  top: 0.6rem;
+  left: 100px;
+  font-size: 0.18rem;
+  color: #fff;
+  height: 30px;
+  line-height: 30px;
+  width: 100%;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  background: rgba(244, 245, 248, 0.8);
+  padding-left: 145px;
+  padding-top: 5px;
+
+  .bread-crumb-span {
     cursor: pointer;
-    width: 50px;
-    height: 50px;
-    background-image: url('~@/assets/detailsAll/back.png');
-    background-size: 100% 100%;
-  }
-  .nav-box {
-    position: absolute;
-    top: 0.6rem;
-    left: 100px;
-    font-size: 0.18rem;
-    color: #fff;
-    height: 30px;
-    line-height: 30px;
-    width: 100%;
-    font-size: 14px;
-    display: flex;
-    align-items: center;
-    background: rgba(244, 245, 248, 0.8);
-    padding-left: 145px;
-    padding-top: 5px;
-    .bread-crumb-span {
-      cursor: pointer;
-    }
   }
+}
 </style>

front/src/views/home/integrationServices.vue

@@ -121,6 +121,7 @@
       const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
       const router = useRouter()
       const select = router.currentRoute.value.query.select
+      const returnType = router.currentRoute.value.query.returnType
       const searchValue = ref('')
       const Cardsname = ref(select)
       const resourceList = reactive({ data: [] })
@@ -290,11 +291,22 @@
       }
 
       onMounted(() => {
-        if (storageSearchInfo) {
+        if(returnType=='典型赋能场景'){
+          changeCards(0)
+        }else if(returnType=='打包模式'){
+          changeCards(1)
+        }else{
+            if (storageSearchInfo) {
           handleSetSearchData()
         } else {
           getIntegrationList()
         }
+        }
+        // if (storageSearchInfo) {
+        //   handleSetSearchData()
+        // } else {
+        //   getIntegrationList()
+        // }
       })
 
       return {
@@ -312,6 +324,7 @@
         loading,
         titleName,
         changeCards,
+        returnType,
         number,
         loadingData,
         onShowSizeChange,
@@ -366,7 +379,7 @@
       height: 17px;
      background: url('~@/assets/home/searchInner.png');
       position: absolute;
-      top: 139px;
+      top: 119px;
     left: 500px;
       }
     }

front/src/views/home/integrationServicesDetails.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
     <home-header></home-header>
-    <detail-back v-show="!hiddenBackFlag"></detail-back>
+    <detail-back v-show="!hiddenBackFlag" :returnType="returnType"></detail-back>
     <!-- 头部基本信息 -->
     <application-top-details
       :dataList="detailInfoObj"
@@ -190,6 +190,7 @@
   const infrastructureCount = ref(0)
   const componentCount = ref(0)
   const id = router.currentRoute.value.query.id
+  const returnType = router.currentRoute.value.query.type
   const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0

front/src/views/personalCenter/components/AbilityApplication.vue

@@ -536,6 +536,8 @@
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
+      } else {
+        message.warning('下载失败')
       }
     }
   }

front/src/views/personalCenter/components/ApplyDetails.vue

@@ -157,6 +157,8 @@
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
+      } else {
+        message.warning('下载失败')
       }
     }
   }

front/src/views/personalCenter/components/Collection.vue

@@ -368,6 +368,7 @@
       })
       window.open(detailPage.href, '_blank')
     } else if (delFlag === undefined) {
+
       // 融合服务
       // mybus.emit('tabsChange', { flag: item.resourceId })
       mybus.emit('tabsChange', { flag: id })