合并

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -36,6 +36,7 @@
     <div class="agreeOr" v-if="taskId">
       <h3>审批</h3>
       <div>
+        <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
@@ -61,6 +62,7 @@
         > -->
       </div>
     </div>
+    <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
     <ren-process-detail></ren-process-detail>
     <el-dialog
@@ -84,6 +86,7 @@
 </template>
 
 <script>
+import RenTaskEntrust from '@/components/ren-process-running/src/ren-task-entrust'
 import bus from '@/views/bus.js'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
@@ -93,7 +96,8 @@ export default {
   // 注入公共方法
   // mixins: [processModule],
   components: {
-    ResourcesAndServices
+    ResourcesAndServices,
+    RenTaskEntrust
   },
   props: {
     // fromList: {
@@ -105,6 +109,9 @@ export default {
   },
   data () {
     return {
+      taskEntrustFlag: false,
+      taskEntrustFlag2: false,
+      renTaskEntrustVisible: false,
       dialogVisible: false,
       dialogType: '',
       input: '',
@@ -132,6 +139,35 @@ export default {
     console.log('params=================>', this.$route, this.$route.params)
     this.taskId = this.$route.params.taskId
     this.dataForm.taskId = this.$route.params.taskId
+    this.$http.get('/sys/user/info').then(({ data: res }) => {
+      res.data.roleIdList.map(val => {
+        this.$http.get('/sys/role/' + val).then(role => {
+          if (role.data.data.name === '流程管理员') {
+            this.taskEntrustFlag = true
+            this.$http
+              .get(
+                '/act/task/getTaskVariables?taskId=' + this.$route.params.taskId + '&variableName=allowEntrust'
+              ).then(entrust => {
+                console.log('11111111111111', entrust, this.dataForm)
+                if (entrust.data.data.allowEntrust === true) {
+                  this.taskEntrustFlag2 = true
+                  if (this.taskEntrustFlag && this.taskEntrustFlag2) {
+                    this.$alert('当前审核部门为' + this.dataForm.deptName + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', {
+                      confirmButtonText: '确定',
+                      callback: action => {
+                        // this.$message({
+                        //   type: 'info',
+                        //   message: `action: ${action}`
+                        // })
+                      }
+                    })
+                  }
+                }
+              })
+          }
+        })
+      })
+    })
     this.init()
     console.log('fromList', this.$router.currentRoute.params.businessKey)
     // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
@@ -154,6 +190,15 @@ export default {
   },
   computed: {},
   methods: {
+
+    entrustTask () {
+      this.renTaskEntrustVisible = true
+      this.$nextTick(() => {
+        this.$refs.renTaskEntrust.dataForm.taskId = this.dataForm.taskId
+        this.$refs.renTaskEntrust.callbacks = this.callbacks
+        this.$refs.renTaskEntrust.init()
+      })
+    },
     getInfo (id) {
       this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
         this.dataForm = res.data.resourceDTO

front/src/views/capacitySquare/components/layer.vue

@@ -22,17 +22,29 @@
         </div>
         <div class="bottom" v-show="selectFlag2">
           <span class="light"></span>
-          <div v-for="val in dictList" :key="val" @click="changeAreaFunction(val)">
+          <div
+            v-for="val in dictList"
+            :key="val"
+            @click="changeAreaFunction(val)"
+          >
             {{ val }}
           </div>
         </div>
       </div>
     </div>
     <div class="algorithm-class">
-      <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
-        <a-image :src="item.pic || imgSrc" :width="525" :height="275" :fallback="imgSrc"
-          :preview="false"></a-image>
-
+      <div
+        v-for="(item, index) in dataList"
+        :key="`algorithm-${index}`"
+        class="algorithm-card"
+      >
+        <a-image
+          :src="item.pic || imgSrc"
+          :width="525"
+          :height="275"
+          :fallback="imgSrc"
+          :preview="false"
+        ></a-image>
         <a-tooltip>
           <template #title>{{ item.name }}</template>
           <div class="algorithm-card-title" @click="detailFunction(item.id)">
@@ -48,7 +60,6 @@
   import { getCategoryTreePage } from '@/api/personalCenter'
   import { getGisByArea } from '@/api/home'
   import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
-
   const deptType = ref(null)
   const typeName = ref('全市')
   const typeName2 = ref('全部')
@@ -72,18 +83,16 @@ const params = {
     pageNum: 1,
     type: '图层服务',
     area: typeName2.value == '全部' ? '' : typeName2.value,
-  pageSize: 9 // 固定9
+    pageSize: 9, // 固定9
   }
-
   // 切换领域
   const changeAreaFunction = (val) => {
-  params.pageNum = 1;
+    params.pageNum = 1
     typeName2.value = val
-  params.area = typeName2.value == '全部' ? '' : typeName2.value;
+    params.area = typeName2.value == '全部' ? '' : typeName2.value
     selectFlag2.value = false
     pageWithAttrsFunction()
   }
-
   let algorithmclassDom = null
   const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo2.jpg'))
   const dataLength = ref(true)
@@ -97,12 +106,10 @@ const pageWithAttrsFunction = () => {
     })
   }
   pageWithAttrsFunction()
-
   //跳转详情页
   const detailFunction = (id) => {
     window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
   }
-
   const changeDeptType = (str) => {
     if (str) {
       if (algorithmclassDom) {
@@ -126,9 +133,9 @@ const changeDeptType = (str) => {
           typeName.value = '企 业'
           break
       }
-    params.pageNum = 1;
+      params.pageNum = 1
       if (deptType.value !== null && deptType.value !== undefined) {
-      params.deptType = deptType.value;
+        params.deptType = deptType.value
       } else {
         if (Object.keys(params).includes('deptType')) {
           delete params.deptType
@@ -138,24 +145,30 @@ const changeDeptType = (str) => {
     selectFlag.value = false
     getData(str)
   }
-
   const getData = (str) => {
     getGisByArea(params).then((res) => {
       const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
+      if (
+        resData.list.length > 0 &&
+        resData.list.length < 9 &&
+        algorithmclassDom
+      ) {
         algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
       }
       dataList.value = resData.list || []
       nextTick(() => {
         algorithmclassDom = document.querySelector('.algorithm-box')
         if (str && algorithmclassDom) {
-        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+          algorithmclassDom.removeEventListener(
+            'scroll',
+            algorithmFunction,
+            true
+          )
           algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
         }
       })
     })
   }
-
   const layerFunction = (e) => {
     var scrollTop = e.currentTarget.scrollTop
     var windowHeight = e.currentTarget.clientHeight
@@ -189,7 +202,6 @@ onBeforeUnmount(() => {
     algorithmclassDom.removeEventListener('scroll', layerFunction, true)
   })
 </script>
-
 <style lang="less" scoped>
   .algorithm {
     .select {
@@ -198,7 +210,6 @@ onBeforeUnmount(() => {
       font-size: 0.2rem;
       font-family: webfont;
       position: relative;
-
       .top {
         cursor: pointer;
         width: 3.61rem;
@@ -209,18 +220,17 @@ onBeforeUnmount(() => {
         background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
         background-size: 100%;
         position: relative;
-
         .light {
           width: 0.56rem;
           height: 3px;
           position: absolute;
           top: 0.4rem;
           left: 1.52rem;
-        background: url('~@/assets/capacitySquare/select-light1.png') no-repeat;
+          background: url('~@/assets/capacitySquare/select-light1.png')
+            no-repeat;
           background-size: 100%;
         }
       }
-
       .bottom {
         cursor: pointer;
         position: absolute;
@@ -229,7 +239,6 @@ onBeforeUnmount(() => {
         z-index: 1000;
         background: rgba(57, 134, 239, 0.68);
         border: 1px solid #aed5ff;
-
         .light {
           display: inline-block;
           width: 2.39rem;
@@ -237,10 +246,10 @@ onBeforeUnmount(() => {
           position: absolute;
           top: -0.08rem;
           left: -0.3rem;
-        background: url('~@/assets/capacitySquare/select-light2.png') no-repeat;
+          background: url('~@/assets/capacitySquare/select-light2.png')
+            no-repeat;
           background-size: 100%;
         }
-
         & > div {
           width: 1.8rem;
           height: 0.4rem;
@@ -248,13 +257,11 @@ onBeforeUnmount(() => {
           text-align: center;
           border-top: 1px solid #aed5ff;
         }
-
         & > div:nth-of-type(1) {
           border: none;
         }
       }
     }
-
     .algorithm-class {
       // margin-top: 0.6rem;
       margin-bottom: 0.18rem;
@@ -264,7 +271,6 @@ onBeforeUnmount(() => {
       overflow: auto;
       margin-left: 1.15rem;
       margin-right: 0.15rem;
-
       .algorithm-card {
         height: 2.75rem;
         width: 5.23rem;
@@ -273,7 +279,6 @@ onBeforeUnmount(() => {
         margin-bottom: 0.4rem;
         margin-right: 0.65rem;
         position: relative;
-
         :deep(.ant-image) {
           img {
             margin-top: 0.15rem;
@@ -282,14 +287,13 @@ onBeforeUnmount(() => {
             margin-left: 0.1rem;
           }
         }
-
         .algorithm-card-photo {
           height: 100%;
           width: 100%;
-        background: url('~@/assets/capacitySquare/algorithm-photo.jpg') no-repeat;
+          background: url('~@/assets/capacitySquare/algorithm-photo.jpg')
+            no-repeat;
           background-size: 100%;
         }
-
         .algorithm-card-title {
           position: absolute;
           height: 0.6rem;
@@ -300,12 +304,12 @@ onBeforeUnmount(() => {
           font-family: alibaba;
           bottom: 0.15rem;
           padding-left: 0.22rem;
-        background: url('~@/assets/capacitySquare/algorithm-title-bg.png') no-repeat;
+          background: url('~@/assets/capacitySquare/algorithm-title-bg.png')
+            no-repeat;
           background-size: 100%;
           display: flex;
           flex-direction: column;
           justify-content: center;
-
           span {
             line-height: 0.24rem;
             overflow: hidden;
@@ -313,24 +317,20 @@ onBeforeUnmount(() => {
             white-space: nowrap;
             cursor: pointer;
           }
-
           span:last-child {
             font-size: 0.14rem;
           }
         }
       }
     }
-
     .algorithm-class::-webkit-scrollbar-track-piece {
       background: #a5bcdb;
       border-radius: 0.08rem;
     }
-
     .algorithm-class::-webkit-scrollbar-thumb {
       height: 3.2rem;
       background: linear-gradient(to bottom, #47d7f5, #3dc6e3);
     }
-
     .algorithm-class::-webkit-scrollbar {
       height: 8.8rem;
       width: 0.08rem;

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -8,40 +8,74 @@
       <div class="bottom">
         <div class="item">
           <div class="zj">组件服务</div>
-          <div class="name" v-for="(item, index) in zjList.slice(0, 5)" :key="item.name"
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in zjList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne1(item.name)"
+          >
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
         <div class="item">
           <div class="yy">应用资源</div>
-          <div class="name" v-for="(item, index) in yyList.slice(0, 5)" :key="item.name"
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in yyList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne11(item.name)"
+          >
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="jc">基础设施</div>
-          <div class="name" v-for="(item, index) in jcList.slice(0, 5)" :key="item.name"
-            :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
-            {{ item.name + '-' + item.num + '项' }}
+          <div
+            class="name"
+            v-for="(item, index) in jcList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 2 ? 'name-last' : ''"
+            @click="selectOne2(item.name)"
+          >
+            {{
+              item.name +
+              '-' +
+              item.num +
+              (item.name == '会客厅'
+                ? '间'
+                : item.name == '视频会议'
+                ? '个'
+                : '项')
+            }}
           </div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
-          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne3(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in sjList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="zs">知识库</div>
-          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
-            @click="openHref(item)">
+          <div
+            class="name"
+            v-for="(item, index) in zsList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@@ -56,7 +90,7 @@ import {
     getDataResource,
     selectInfrastructureList,
     selectCollectComponentList,
-  selectCollectResourceList
+    selectCollectResourceList,
   } from '@/api/home.js'
   import { ref, reactive } from 'vue'
   import { useRouter } from 'vue-router'
@@ -137,7 +171,7 @@ const getAppResources = (type, obj) => {
       if (type == '基础设施') {
         jcList.value = []
         selectInfrastructureList().then((res) => {
-        console.log('基础设施------res------>', res);
+          console.log('基础设施------res------>', res)
           for (const key in res.data.data) {
             if (whoShow1.value.itShowXiHaiAn) {
               if (key === '视频资源') {
@@ -146,8 +180,7 @@ const getAppResources = (type, obj) => {
                   num: res.data.data[key],
                 })
               }
-          } 
-          else  {  
+            } else {
               jcList.value.push({
                 name: key,
                 num: res.data.data[key],
@@ -184,25 +217,23 @@ const getAppResources = (type, obj) => {
               })
           }
         })
-    }
-    else if (type == '组件服务') {
+      } else if (type == '组件服务') {
         zjList.value = []
         selectCollectComponentList().then((res) => {
-        console.log('组件服务----res-------->', res);
+          console.log('组件服务----res-------->', res)
           for (const key in res.data.data) {
-          console.log('key------------>', key);
+            console.log('key------------>', key)
             zjList.value.push({
               name: key,
               num: res.data.data[key],
             })
           }
-        console.log('zjList------------>', zjList);
+          console.log('zjList------------>', zjList)
         })
-    }
-    else if (type == '应用资源') {
+      } else if (type == '应用资源') {
         yyList.value = []
         selectCollectResourceList().then((res) => {
-        console.log('应用资源---res--------->', res);
+          console.log('应用资源---res--------->', res)
           for (const key in res.data.data) {
             yyList.value.push({
               name: key,
@@ -210,8 +241,7 @@ const getAppResources = (type, obj) => {
             })
           }
         })
-    }
-    else {
+      } else {
         pageWithAttrs(paramsGetResources).then((res) => {
           console.log('object个数======>', type)
           obj.value = res.data.data.records