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

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

@@ -71,7 +71,7 @@
 
         <!--操作按钮查询-->
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <!--操作按钮重置-->
         <el-form-item>

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

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

@@ -9,7 +9,7 @@
     >
       <div class="content">
         <img class="img" :src="dataInfo.imgSrc" />
-        <div class="title">{{ title }}</div>
+        <div class="title">{{ '我的'+title }}</div>
         <div class="flex-row-bottom">
           <span class="num" :style="{ color: dataInfo.textColor }">{{
             formatNum(dataInfo.num)
@@ -90,7 +90,7 @@
       </div>
       <div class="more" @click="goPage(dataInfo.url)">查看更多 ></div>
     </div>
-    <div class="list-box flex-row-center no-data" v-else>暂无数据</div>
+    <div class="list-box flex-row-center no-data" v-else>暂无{{title}}任务</div>
   </div>
 </template>
 <script>

back/src/views/modules/workBench/workBench.vue

@@ -3,8 +3,8 @@
         <!-- 上 -->
         <div class="flex-row-start top">
             <div class="flex-row-start dept-left">
-                <dept-todo-view title="部门待办" v-loading="loadingToDo" :dataInfo="toToData"></dept-todo-view>
+                <dept-todo-view title="待办" v-loading="loadingToDo" :dataInfo="toToData"></dept-todo-view>
-                <dept-todo-view title="部门已办" v-loading="loadingHasToDo" :dataInfo="hasToDodoData"
+                <dept-todo-view title="已办" v-loading="loadingHasToDo" :dataInfo="hasToDodoData"
                     style="margin-left: 0"></dept-todo-view>
             </div>
             <div class="flex-row-start dept-chart-box">
@@ -56,7 +56,7 @@ export default {
         list: [],
         type: 'todo',
         // url: 'activiti-my-todo-task',
-        url: 'myAgent-CompetencyApplication',
+        url: 'myAgent-CompetencyApplication'
       },
       // 部门已办
       hasToDodoData: {
@@ -69,7 +69,7 @@ export default {
         num: 0,
         list: [],
         // url: 'activiti-my-join-task',
-        url: 'hasToDoTasks-CompetencyApplication',
+        url: 'hasToDoTasks-CompetencyApplication'
       },
       // 部门申请
       resourceData: [],
@@ -103,43 +103,53 @@ export default {
     // 待办
     getToDo () {
       this.loadingToDo = true
-      const data = {
+      // const data = {
-        limit: 5,
+      //   limit: 5,
-        page: 1
+      //   page: 1
-      }
+      // }
-      Apis.getToDoTask(data, res => {
+      this.$http.get('/act/task/myToDoTaskPage?page=1&limit=5').then(res => {
         this.loadingToDo = false
-        if (res.data.code !== 0) {
+        this.toToData.list = res.data.data.list || []
-          return this.$message.error(res.data.msg)
-        }
-        console.log('res----待办-------->', res.data)
-        this.toToData.list = res.data.data.records || []
         this.toToData.num = res.data.data.total || 0
-      }, err => {
-        this.$message.error(err)
-        this.loadingToDo = false
       })
+      // Apis.getToDoTask(data, res => {
+      //   this.loadingToDo = false
+      //   if (res.data.code !== 0) {
+      //     return this.$message.error(res.data.msg)
+      //   }
+      //   console.log('res----待办-------->', res.data)
+      //   this.toToData.list = res.data.data.records || []
+      //   this.toToData.num = res.data.data.total || 0
+      // }, err => {
+      //   this.$message.error(err)
+      //   this.loadingToDo = false
+      // })
     },
     // 已办
     getHasToDo () {
-      const data = {
+      // const data = {
-        limit: 5,
+      //   limit: 5,
-        page: 1
+      //   page: 1
-      }
+      // }
       this.loadingHasToDo = true
-      Apis.getHasToDoTask(data, res => {
+      this.$http.get('/act/his/getMyHandledInstancePage?page=1&limit=5').then(res => {
         this.loadingHasToDo = false
-        if (res.data.code !== 0) {
+        this.hasToDodoData.list = res.data.data.list || []
-          return this.$message.error(res.data.msg)
-        }
-        console.log('res----已办-------->', res.data)
-        this.hasToDodoData.list = res.data.data.records || []
         this.hasToDodoData.num = res.data.data.total || 0
-      }, err => {
-        this.$message.error(err)
-        this.loadingHasToDo = false
-        console.log('err-----已办------->', err)
       })
+      // Apis.getHasToDoTask(data, res => {
+      //   this.loadingHasToDo = false
+      //   if (res.data.code !== 0) {
+      //     return this.$message.error(res.data.msg)
+      //   }
+      //   console.log('res----已办-------->', res.data)
+      //   this.hasToDodoData.list = res.data.data.records || []
+      //   this.hasToDodoData.num = res.data.data.total || 0
+      // }, err => {
+      //   this.$message.error(err)
+      //   this.loadingHasToDo = false
+      //   console.log('err-----已办------->', err)
+      // })
     },
     // 部门上架
     getShelvesTotal () {

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

@@ -79,6 +79,7 @@ const params = {
 
 // 切换领域
 const changeAreaFunction = (val) => {
+  params.pageNum = 1;
   typeName2.value = val
   params.area = typeName2.value == '全部' ? '' : typeName2.value;
   selectFlag2.value = false
@@ -105,7 +106,8 @@ const algorithmCardPhoto = (item) => {
   if(item.pic && typeof item.pic == 'string') {
     _arr = JSON.parse(item.pic)
   }
-  let _img = _arr[0] && _arr[0].img || ''
+  let _img = _arr[0] && _arr[0].img || imgSrc.value;
+  console.log('_img------------>', _img);
   return _img
 }
 //跳转详情页
@@ -160,7 +162,13 @@ const changeDeptType = (str) => {
         break
     }
     params.pageNum = 1;
+    if(deptType.value !== null && deptType.value !== undefined) {
       params.deptType = deptType.value;
+    }else {
+      if(Object.keys(params).includes('deptType')) {
+        delete params.deptType
+      }
+    }
   }
   selectFlag.value = false
   getData(str)
@@ -169,7 +177,7 @@ const changeDeptType = (str) => {
 const getData = (str) => {
   getGisByArea(params).then((res) => {
     const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9) {
+    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
       algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
     }
     dataList.value = resData.list || []

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">
+      <div
-        <a-image :src="item.pic" :width="525" :height="275" :fallback="imgSrc"
+        v-for="(item, index) in dataList"
-          :preview="false"></a-image>
+        :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,17 +83,16 @@ const params = {
     pageNum: 1,
     type: '图层服务',
     area: typeName2.value == '全部' ? '' : typeName2.value,
-  pageSize: 9 // 固定9
+    pageSize: 9, // 固定9
   }
-
   // 切换领域
   const changeAreaFunction = (val) => {
+    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)
@@ -96,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) {
@@ -125,30 +133,42 @@ const changeDeptType = (str) => {
           typeName.value = '企 业'
           break
       }
-    params.pageNum = 1;
+      params.pageNum = 1
-    params.deptType = deptType.value;
+      if (deptType.value !== null && deptType.value !== undefined) {
+        params.deptType = deptType.value
+      } else {
+        if (Object.keys(params).includes('deptType')) {
+          delete params.deptType
+        }
+      }
     }
     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) {
+      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
@@ -182,7 +202,6 @@ onBeforeUnmount(() => {
     algorithmclassDom.removeEventListener('scroll', layerFunction, true)
   })
 </script>
-
 <style lang="less" scoped>
   .algorithm {
     .select {
@@ -191,7 +210,6 @@ onBeforeUnmount(() => {
       font-size: 0.2rem;
       font-family: webfont;
       position: relative;
-
       .top {
         cursor: pointer;
         width: 3.61rem;
@@ -202,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;
@@ -222,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;
@@ -230,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;
@@ -241,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;
@@ -257,7 +271,6 @@ onBeforeUnmount(() => {
       overflow: auto;
       margin-left: 1.15rem;
       margin-right: 0.15rem;
-
       .algorithm-card {
         height: 2.75rem;
         width: 5.23rem;
@@ -266,7 +279,6 @@ onBeforeUnmount(() => {
         margin-bottom: 0.4rem;
         margin-right: 0.65rem;
         position: relative;
-
         :deep(.ant-image) {
           img {
             margin-top: 0.15rem;
@@ -275,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;
@@ -293,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;
@@ -306,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/home/infrastructurePage.vue

@@ -513,7 +513,7 @@
               <!-- 离线 -->
               <a v-if="record.status != 1" class="disabled-text">预览</a>
               <a-tooltip v-else placement="top">
-                <template #title>请申请后在我的申请中预览视频!</template>
+                <template #title>请申请后在我的申请中观看视频!</template>
                 <a
                   @click="
                     openVideo(
@@ -591,7 +591,7 @@
         <template #title>
           <span>视频预览</span>
           <span style="color: #ff4d4f; margin-left: 10px">
-            {{ `(请申请后在我的申请中预览视频)` }}
+            {{ `(请申请后在我的申请中观看视频)` }}
           </span>
         </template>
         <template #footer></template>
@@ -2263,14 +2263,14 @@
     if (index) {
       itemData = selectedList.value[index]
     }
-    let msg = '请申请后在我的申请中预览视频!'
+    let msg = '请申请后在我的申请中观看视频!'
     if (
       (itemData && itemData.status != 1) ||
       (rowClickData.value && rowClickData.value.status != 1)
     ) {
       msg = '当前视频离线不可预览!'
     } else {
-      msg = '请申请后在我的申请中预览视频!'
+      msg = '请申请后在我的申请中观看视频!'
     }
     message.warning(msg)
   }

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"
+          <div
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
+            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"
+          <div
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
+            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"
+          <div
-            :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
+            class="name"
-            {{ item.name + '-' + item.num + '项' }}
+            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' : ''"
+          <div
-            @click="selectOne3(item.name)">
+            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' : ''"
+          <div
-            @click="openHref(item)">
+            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

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

@@ -9,83 +9,38 @@
         <div class="form-container">
           <div v-if="applySuccess">
             <div class="title">申请人信息</div>
-            <a-form
+            <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
-              ref="formRef"
+              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
-              :model="formName"
-              name="basic"
-              :label-col="{ style: { width: '106px' } }"
-              :wrapper-col="{ style: { width: '230px' } }"
-              labelAlign="left"
-              autocomplete="off"
-            >
               <div class="base-info">
-                <a-form-item
+                <a-form-item label="申请人" name="applyUserName" :rules="[{ required: true, message: '请输入申请人' }]">
-                  label="申请人"
+                  <a-input placeholder="请输入申请人" v-model:value="formName.applyUserName" />
-                  name="applyUserName"
-                  :rules="[{ required: true, message: '请输入申请人' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请人"
-                    v-model:value="formName.applyUserName"
-                  />
                 </a-form-item>
 
-                <a-form-item
+                <a-form-item style="margin: 0 22px" label="申请人电话" name="applyUserPhone" :rules="[
-                  style="margin: 0 22px"
-                  label="申请人电话"
-                  name="applyUserPhone"
-                  :rules="[
                   {
                     required: true,
                     pattern: /^1[3456789]\d{9}$/,
                     message: '请输入正确的电话号码',
                   },
-                  ]"
+                ]">
-                >
+                  <a-input placeholder="请输入申请人电话" v-model:value="formName.applyUserPhone" />
-                  <a-input
-                    placeholder="请输入申请人电话"
-                    v-model:value="formName.applyUserPhone"
-                  />
                 </a-form-item>
 
-                <a-form-item
+                <a-form-item label="申请单位" name="applyUserDeptName" :rules="[{ required: true, message: '请输入申请单位' }]">
-                  label="申请单位"
+                  <a-input placeholder="请输入申请单位" v-model:value="formName.applyUserDeptName" />
-                  name="applyUserDeptName"
-                  :rules="[{ required: true, message: '请输入申请单位' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请单位"
-                    v-model:value="formName.applyUserDeptName"
-                  />
                 </a-form-item>
               </div>
 
               <div class="title">需求信息</div>
 
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求标题" name="demandSubject"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请输入需求标题' }]">
-                label="需求标题"
+                <a-input style="width: 350px" v-model:value="formName.demandSubject" />
-                name="demandSubject"
-                :rules="[{ required: true, message: '请输入需求标题' }]"
-              >
-                <a-input
-                  style="width: 350px"
-                  v-model:value="formName.demandSubject"
-                />
               </a-form-item>
 
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求类型" name="detailsType"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请选择需求类型' }]">
-                label="需求类型"
+                <a-select ref="select" v-model:value="formName.detailsType" @focus="focus" style="width: 200px">
-                name="detailsType"
-                :rules="[{ required: true, message: '请选择需求类型' }]"
-              >
-                <a-select
-                  ref="select"
-                  v-model:value="formName.detailsType"
-                  @focus="focus"
-                  style="width: 200px"
-                >
                   <a-select-option value="基础设施">基础设施</a-select-option>
                   <a-select-option value="数据资源">数据资源</a-select-option>
                   <a-select-option value="组件服务">组件服务</a-select-option>
@@ -94,50 +49,24 @@
                 </a-select>
               </a-form-item>
 
-              <a-form-item
+              <a-form-item label="应用领域" v-if="formName.detailsType === '应用资源' ||
-                label="应用领域"
+              formName.detailsType === '组件服务'" name="detailsField" style="width: 6.93rem" :rules="[
-                name="detailsField"
-                style="width: 6.93rem"
-                :rules="[
     {
-                    required:
+      required: true,
-                      formName.detailsType === '应用资源' ||
-                      formName.detailsType === '组件服务'
-                        ? true
-                        : false,
       message: '请选择应用领域',
     },
-                ]"
+  ]">
-              >
+                <a-select v-model:value="formName.detailsField" :options="applicationSceneOpthion" mode="tags"
-                <a-select
+                  :size="size" placeholder="请选择应用领域" :filterOption="false" :searchValue="false" style="width: 5.87rem">
-                  :disabled="
+                </a-select>
-                    formName.detailsType === '应用资源' ||
-                    formName.detailsType === '组件服务'
-                      ? false
-                      : true
-                  "
-                  v-model:value="formName.detailsField"
-                  :options="applicationSceneOpthion"
-                  mode="tags"
-                  :size="size"
-                  placeholder="请选择应用领域"
-                  :filterOption="false"
-                  :searchValue="false"
-                  style="width: 5.87rem"
-                ></a-select>
               </a-form-item>
               <!-- <a-form-item label="应用领域" name="detailsField" style="width: 350px"
                 :rules="[{ required: true, message: '请输入应用领域' }]">
                 <a-input placeholder="请输入应用领域" v-model:value="formName.detailsField" />
               </a-form-item> -->
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求描述" name="demandDetails"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请输入需求描述' }]">
-                label="需求描述"
+                <a-textarea style="
-                name="demandDetails"
-                :rules="[{ required: true, message: '请输入需求描述' }]"
-              >
-                <a-textarea
-                  style="
                     width: 500px;
                     height: 150px;
                     font-size: 16px;
@@ -147,25 +76,12 @@
                     border-radius: 6px;
                     padding: 10px;
                     resize: none;
-                  "
+                  " v-model:value="formName.demandDetails" />
-                  v-model:value="formName.demandDetails"
-                />
               </a-form-item>
-              <a-form-item
+              <a-form-item style="color: #666; font-size: 16px" label="附件上传" name="applyDoc">
-                style="color: #666; font-size: 16px"
+                <a-upload v-model:file-list="fileList" name="file" :action="upLoadUrl" :headers="headers"
-                label="附件上传"
+                  @change="handleChange" :maxCount="1">
-                name="applyDoc"
+                  <a-button style="
-              >
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  :action="upLoadUrl"
-                  :headers="headers"
-                  @change="handleChange"
-                  :maxCount="1"
-                >
-                  <a-button
-                    style="
                       width: 100px;
                       height: 30px;
                       margin-right: 10px;
@@ -176,8 +92,7 @@
                       border: 1px solid #bbd3ef;
                       padding: 0;
                       text-align: center;
-                    "
+                    ">
-                  >
                     <upload-outlined></upload-outlined>
                     文件上传
                   </a-button>
@@ -188,8 +103,7 @@
               </a-form-item>
 
               <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-                <a-button
+                <a-button style="
-                  style="
                     width: 80px;
                     height: 38px;
                     margin-right: 20px;
@@ -200,15 +114,10 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
+                  " type="primary" html-type="cancle" @click="signOut">
-                  type="primary"
-                  html-type="cancle"
-                  @click="signOut"
-                >
                   退出申请
                 </a-button>
-                <a-button
+                <a-button style="
-                  style="
                     width: 80px;
                     height: 38px;
                     background: #0087ff;
@@ -218,11 +127,7 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
+                  " type="primary" html-type="submit" @click="processStartHandle()">
-                  type="primary"
-                  html-type="submit"
-                  @click="processStartHandle()"
-                >
                   提交申请
                 </a-button>
               </a-form-item>
@@ -345,19 +250,21 @@
     }
 
     const fileList = ref([])
-      const subimtFlag = ref(true)
     const processStartHandle = () => {
+      let detailsField = '';
       if (formName.detailsField.length > 0) {
-          let detailsField = ''
         formName.detailsField.map((item) => {
           detailsField += item + ';'
         })
-          formName.detailsField = detailsField
       }
+      // copy传参
+      let _postData = JSON.parse(JSON.stringify(formName))
+      _postData.detailsField = detailsField;
+
       if (id.value) {
-          updateDemandForm(formName).then((upres) => {
+        updateDemandForm(_postData).then((upres) => {
           if (upres.data.code == 0) {
-              relaunch({ data: formName, taskId: taskId.value }).then((res) => {
+            relaunch({ data: _postData, taskId: taskId.value }).then((res) => {
               console.log('驳回================>', res)
               if (res.data.code == 0) {
                 message.success('重新发起流程成功！')
@@ -373,22 +280,18 @@
           }
         })
       } else {
-          if (subimtFlag.value) {
+        formRef.value.validate().then((valid) => {
-            subimtFlag.value = false
+          const detString = String(_postData.detailsField)
-            formRef.value.validate().then(() => {
+          _postData.detailsField = detString
-              const detString = String(formName.detailsField)
+          console.log(detString, _postData.detailsField, 'detString')
-              formName.detailsField = detString
+          demandApply(_postData).then((res) => {
-              console.log(detString, formName.detailsField, 'detString')
-              demandApply(formName).then((res) => {
             applySuccess.value = false
             message.success('操作成功！')
             console.log('能力申请================>', res)
-                subimtFlag.value = true
           })
         })
       }
     }
-      }
 
     return {
       formRef,