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

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

@@ -156,7 +156,7 @@
       :close-on-press-escape='false'
       :before-close='clear'
       width="50%">
-      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList'></putOnTheShelf>
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList'></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
         <el-button type="primary" @click="submitData">确 定</el-button>
@@ -236,6 +236,10 @@ export default {
     this.fullScreen()
   },
   methods: {
+    changeInfoList (obj) {
+      this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
+      this.submitFrom.infoList.push(obj)
+    },
     reset () {
       this.$http
         .get(
@@ -426,7 +430,7 @@ export default {
     showPutOnTheShelfVue () {
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = true
-      this.submitFrom.infoList[0] = this.redio
+      this.submitFrom.infoList[0].attrValue = this.radio
       this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
       console.log('radio', this.radio)
     },

back/src/views/modules/bscatalogue/ManagementPop.vue

@@ -341,12 +341,17 @@ export default {
     // 查询所有编目
     getCategoryTree () {
       this.$http.get('/category/getCategoryTree').then((res) => {
+        res.data.data.map((item, indexFather) => {
+          if (item.id === this.showItem.id) {
+            this.index = indexFather
+          }
+        })
         this.data = []
-        if (this.showItem.children) {
+        if (res.data.data[this.index].children) {
-          this.showItem.children.forEach((val) => {
+          res.data.data[this.index].children.forEach((val) => {
             this.initData(val, this.cengji)
           })
-          this.data = this.showItem.children
+          this.data = res.data.data[this.index].children
           console.log('data======================>', this.data)
           this.flag = true
           this.showKey++

back/src/views/modules/bscatalogue/bscatalogue.vue

@@ -174,6 +174,7 @@ export default {
       index: -1,
       pid: '',
       showKey: 0,
+      showItem: {},
       oldId: -1,
       isShowEdit: true,
       oldIdList: [],

back/src/views/modules/components/upload/index.vue

@@ -2,45 +2,33 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 14:55:19
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 15:48:44
+ * @LastEditTime: 2022-07-08 17:23:58
  * @Description: 告诉大家这是什么
 -->
 <template>
-    <a-upload
+  <el-upload
-    v-model:file-list="fileList"
+    ref='my-upload'
-    :action="`${apiURL}/upload`"
+    :action="apiURL"
-    list-type="picture"
+    :accept='accept'
-    class="upload-list-inline"
+    :on-change='handleChange'
-    :maxCount="maxCount"
+    :on-preview="handlePreview"
-    :before-upload="beforeUpload"
+    :on-remove="handleRemove"
-    @change="handleChange"
+    :limit="maxCount"
-    @preview="handlePreview"
+    :file-list="fileList">
-    @remove="handleRemove"
+    <el-button>上传{{type}}</el-button>
-  >
+    <div slot="tip" class="el-upload__tip">{{tip}}</div>
-    <a-button>
+  </el-upload>
-      <upload-outlined></upload-outlined>
-      {{ btnName }}
-    </a-button>
-    <span
-      style="
-        display: inline-block;
-        margin-left: 10px;
-        color: #999999;
-        font-size: 14px;
-      "
-    >
-      {{ tip }}
-    </span>
-  </a-upload>
 </template>
 <script>
-import { message, Upload } from 'ant-design-vue'
+import Cookies from 'js-cookie'
 export default {
   name: '',
   components: {
 
   },
   props: {
+    title: String,
+    accept: String,
     btnName: String,
     type: String,
     tip: String,
@@ -52,87 +40,57 @@ export default {
   },
   data () {
     return {
-      apiURL: window.SITE_CONFIG.apiURL,
+      apiURL: window.SITE_CONFIG.apiURL + '/upload?token=' + Cookies.get('ucsToken'),
       fileList: JSON.parse(JSON.stringify(this.list))
     }
   },
   methods: {
-    beforeUpload (file) {
+    handleExceed (file) {
       console.log(file)
-      const isLt10M = file.size / 1024 / 1024 < 100
+    },
-      let flag
+    handError (err, file, fileList) {
-      if (this.type === '图片') {
+      console.log(err, file, fileList)
-        flag =
-        file.type === 'image/jpeg' ||
-        file.type === 'image/jpg' ||
-        file.type === 'image/png'
-      } else if (this.type === '视频') {
-        console.log(file.type === 'video/mp4')
-        flag =
-        file.type === 'audio/mpeg' ||
-        file.type === 'video/mp4' ||
-        file.type === 'video/mp3'
-      } else if (this.type === '文件') {
-        flag =
-        file.type === 'application/pdf' ||
-        file.type === 'application/msword' ||
-        file.type ===
-          'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-      }
-      console.log(flag)
-      if (!flag) {
-        message.error(`${file.name} 不是${this.type}类型`)
-      }
-      if (!isLt10M) {
-        message.error(`${file.name} 超出100M的大小`)
-      }
-      return flag || Upload.LIST_IGNORE
     },
     handlePreview (file) {
-      // console.log(file)
+      console.log(file)
       window.open(
         window.SITE_CONFIG.previewUrl +
         'hisense_office/onlinePreview?url=' +
         btoa(encodeURI(file.response.data))
       )
     },
-    handleChange (info) {
+    handleChange (file, fileList) {
-      if (info.file.status !== 'uploading') {
+      console.log(file, fileList)
-        console.log(info.file, info.fileList)
+      if (file.status === 'success') {
-      }
+        if (file.response.msg === 'success') {
-      if (info.file.status === 'done') {
+          this.$message({
-        message.success(`${info.file.name}上传成功`)
+            message: file.name + '上传成功',
-        this.data.note1 = info.file.response.data
+            type: 'success'
-        console.log(this.data, this.fileList)
+          })
-        if (this.type === '图片') {
+          // this.data.note1 = file.response.data
-          if (!this.emitFlag) {
+          this.$emit('changeInfoList', {
-            // mybus.emit('chageImgList', fileList.value)
+            attrType: this.title,
-          }
+            attrValue: file.response.data,
-        } else if (this.type === '文件') {
+            delFlag: 0
-          console.log('busType', this.busType)
+          })
-          if (this.busType == 2) {
+        } else {
-            console.log('busType', this.busType)
+          this.$message.error(file.name + '上传失败')
-            // mybus.emit('chageFileList2', fileList.value)
+          this.$refs['my-upload'].clearFiles()
-          } else {
-            // mybus.emit('chageFileList', fileList.value)
-          }
-        } else if (this.type === '视频') {
-          // mybus.emit('chageVideoList', fileList.value)
         }
-      } else if (info.file.status === 'error') {
+      } else if (file.status === 'error') {
-        message.error(`${info.file.name}上传失败`)
+        this.$message.error(file.name + '上传失败')
+        this.$refs['my-upload'].clearFiles()
       }
     },
     handleRemove (file) {
-      this.data.note1 = ''
+      this.$emit('changeInfoList', {
+        attrType: this.title,
+        attrValue: '',
+        delFlag: 0
+      })
     }
   }
 }
 </script>
 <style lang='scss' scoped>
-.ant-upload-list-item-image {
-  width: 100%;
-  height: 100%;
-  object-fit: contain;
-}
 </style>

back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue

@@ -0,0 +1,142 @@
+<!-- 已办任务-能力资源上架 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'resourcemountapply'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>

back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue

@@ -0,0 +1,142 @@
+<!-- 已办任务-能力资源下架 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'resourcundercarriageapply'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>

back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue

@@ -0,0 +1,142 @@
+<!-- 已办任务-能力需求申请 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'abilitydemandapply'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>

back/src/views/modules/hasToDoTasks/CommentModeration.vue

@@ -0,0 +1,142 @@
+<!-- 已办任务-评论审核 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'comment_review'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,142 @@
+<!-- 已办任务-能力申请 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.processDefinitionId"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="startUserName"
+          :label="$t('process.user')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column :label="$t('process.system')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row && scope.row.resourceName||scope.row.params && scope.row.params.undercarriageReason}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="resourceName"
+          :label="$t('process.system')"
+          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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="processDefinitionVersion"
+          :label="$t('process.processDefinitionVersion')"
+          header-align="center"
+          align="center"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          :label="$t('process.startTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTime"
+          :label="$t('process.endTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListIsPage: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        processDefinitionId: '',
+        processDefinitionKey: 'abilityprocess_v2'
+      }
+    }
+  },
+  components: {},
+  methods: {
+    showDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "能力资源上架"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'resourcemountapply'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "能力资源下架"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'resourcundercarriageapply'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "能力需求申请"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'abilitydemandapply'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,170 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-27 11:27:22
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:31:26
+ * @Description: "评论审核"
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-activiti__process">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.taskName"
+            :placeholder="$t('process.name')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{
+            $t('query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column label="申请人" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.user) ||
+              (scope.row.params && scope.row.params.applyUserName) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName) ||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('process.system')"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.system) ||
+              (scope.row.params && scope.row.params.demandSubject) ||
+              (scope.row.params &&
+                scope.row.params.resourceDTO &&
+                scope.row.params.resourceDTO.name) ||
+              (scope.row.params && scope.row.params.undercarriageReason) ||
+              (scope.row.params && scope.row.params.comment)
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <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
+          prop="processDefinitionName"
+          :label="$t('process.processDefinitionName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="taskName"
+          :label="$t('process.taskName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          prop="createTime"
+          :label="$t('process.createTime')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :processInstanceId="processInstanceId"
+              @click="taskHandle(scope.row)"
+              >{{ $t('manage') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="taskDetail(scope.row)"
+              >{{ $t('process.viewFlowImage') }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
+export default {
+  mixins: [mixinViewModule, processModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/act/task/myToDoTaskPage',
+        getDataListIsPage: true,
+        activatedIsNeed: true,
+        deleteIsBatch: true,
+        deleteIsBatchKey: 'deploymentId'
+      },
+      dataForm: {
+        taskName: '',
+        taskId: '',
+        processDefinitionKey: 'comment_review'
+      },
+      processInstanceId: ''
+    }
+  },
+  components: {},
+  methods: {
+    // 处理
+    taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.businessKeyError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardHandleUrl)
+    },
+    taskDetail (row) {
+      if (!row.businessKey) {
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardTaskDetail)
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,273 @@
+<template>
+  <div class="wrapper">
+    <div>
+      <el-form
+        :model="dataForm"
+        ref="dataForm"
+        @keyup.enter.native="dataFormSubmitHandle()"
+        :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
+      >
+        <div v-if="shifoushizujian">
+          <el-form-item label="应用名称">
+            <el-input
+              v-model="dataForm.name"
+              :disabled="fieldDisabled"
+              placeholder="应用名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="应用描述">
+            <el-tooltip
+              effect="dark"
+              :content="dataForm.description"
+              placement="top"
+              popper-class="kuandukuandukuandu"
+            >
+              <el-input
+                v-model="dataForm.description"
+                :disabled="fieldDisabled"
+                placeholder="应用描述"
+              ></el-input>
+            </el-tooltip>
+          </el-form-item>
+          <el-form-item label="部门联系人">
+            <el-input
+              v-model="dataForm.deptContacts"
+              :disabled="fieldDisabled"
+              placeholder="部门联系人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享类型">
+            <el-input
+              v-model="dataForm.shareType"
+              :disabled="fieldDisabled"
+              placeholder="共享类型"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享方式">
+            <el-input
+              v-model="dataForm.shareMode"
+              :disabled="fieldDisabled"
+              placeholder="共享方式"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享条件">
+            <el-input
+              v-model="dataForm.shareCondition"
+              :disabled="fieldDisabled"
+              placeholder="共享方条件"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="访问地址">
+            <el-input
+              v-model="dataForm.link"
+              :disabled="fieldDisabled"
+              placeholder="访问地址"
+            ></el-input>
+          </el-form-item>
+        </div>
+        <div v-if="!shifoushizujian">
+          <el-form-item label="组件名称" v-if="algorithmShow">
+            <el-input
+              v-model="dataForm.name"
+              :disabled="fieldDisabled"
+              placeholder="组件名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="算法名称" v-if="nameNotShow">
+            <el-input
+              v-model="dataForm.name"
+              :disabled="fieldDisabled"
+              placeholder="算法名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="应用描述" v-if="algorithmShow">
+            <el-input
+              v-model="dataForm.description"
+              :disabled="fieldDisabled"
+              placeholder="应用描述"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="算法描述" v-if="nameNotShow">
+            <el-input
+              v-model="dataForm.description"
+              :disabled="fieldDisabled"
+              placeholder="算法描述"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="部门联系人" v-if="algorithmShow">
+            <el-input
+              v-model="dataForm.deptContacts"
+              :disabled="fieldDisabled"
+              placeholder="部门联系人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享类型">
+            <el-input
+              v-model="dataForm.shareType"
+              :disabled="fieldDisabled"
+              placeholder="共享类型"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="共享方式"
+            v-if="coverageNotShow && algorithmShow"
+          >
+            <el-input
+              v-model="dataForm.shareMode"
+              :disabled="fieldDisabled"
+              placeholder="共享方式"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="共享条件">
+            <el-input
+              v-model="dataForm.shareCondition"
+              :disabled="fieldDisabled"
+              placeholder="共享方条件"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="服务接口" v-if="coverageNotShow">
+            <el-input
+              v-model="dataForm.apiUrl"
+              :disabled="fieldDisabled"
+              placeholder="服务接口"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="接口请求方式" v-if="coverageNotShow">
+            <el-input
+              v-model="dataForm.apiMethodType"
+              :disabled="fieldDisabled"
+              placeholder="接口请求方式"
+            ></el-input>
+          </el-form-item>
+        </div>
+        <el-form-item
+          v-for="item in dataForm.infoList"
+          :key="item.index"
+          :label="item.attrType"
+          :disabled="fieldDisabled"
+        >
+          <el-input
+            v-model="item.attrValue"
+            :placeholder="item.attrType"
+            :disabled="fieldDisabled"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="dataForm.enclosure"
+          label="申请附件"
+          prop="enclosure"
+        >
+          <el-button @click="downloadFile(dataForm.enclosure, '申请附件')"
+            >附件下载</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <!--  流程综合组件   -->
+    <ren-process-multiple
+      v-if="processVisible"
+      updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
+      saveFormUrl="/processForm/tabilityapplication"
+      dataFormName="dataForm"
+      ref="renProcessMultiple"
+    ></ren-process-multiple>
+  </div>
+</template>
+
+<script>
+import processModule from '@/mixins/process-module'
+export default {
+  // 注入公共方法
+  mixins: [processModule],
+  components: {},
+  props: {
+    // fromList: {
+    //   // type: Array,
+    //   // default: () => {
+    //   //   return []
+    //   // }
+    // }
+  },
+  data () {
+    return {
+      // processVisible: true,
+      visible: false,
+      // 表单属性是否可编辑
+      fieldDisabled: false,
+      dataForm: [],
+      id: '',
+      shifoushizujian: true,
+      coverageNotShow: true,
+      nameNotShow: false,
+      algorithmShow: true
+    }
+  },
+  watch: {},
+  computed: {},
+  methods: {
+    init () {
+      this.visible = true
+      // this.getInfo(this.$router.currentRoute.params.params.params.resourceDTO.id)
+      // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
+      // this.id=this.$router.currentRoute
+      this.$nextTick(() => {
+        this.$refs.dataForm.resetFields()
+        // if (this.dataForm.id) {
+        // 如业务KEY已存在，不允许编辑
+        this.fieldDisabled = true
+        // this.id = this.$router.currentRoute.businessKey
+        this.getInfo(this.$router.currentRoute.params.businessKey)
+        console.log('id', this.$router.currentRoute.params.businessKey)
+        // }
+      })
+    },
+    getInfo (id) {
+      this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = res.data.resourceDTO
+        if (this.dataForm.type != '应用资源') {
+          this.shifoushizujian = false
+          this.dataForm.infoList.forEach((val) => {
+            if (val.attrValue === '图层服务') {
+              this.coverageNotShow = false
+            } else if (val.attrValue === '智能算法') {
+              this.nameNotShow = true
+              this.algorithmShow = false
+              console.log(this.nameNotShow, 'wowowo')
+            }
+          })
+        } else {
+          this.shifoushizujian = true
+        }
+        console.log('this.dataForm', this.dataForm)
+      })
+    }
+  },
+  created () {
+    // this.dataForm = this.$router.currentRoute.params.id
+    this.init()
+    console.log('fromList', this.$router.currentRoute.params.businessKey)
+    // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
+    var callbacks = {
+      startProcessSuccessCallback: this.closeCurrentTab,
+      startProcessErrorCallback: this.startProcessErrorCallback,
+      taskHandleSuccessCallback: this.closeCurrentTab,
+      taskHandleErrorCallback: this.taskHandleErrorCallback,
+      formSaveSuccessCallback: null,
+      formSaveErrorCallback: null
+    }
+    // 初始化综合组件
+    this.initProcessMultiple(callbacks)
+  },
+  mounted () {}
+}
+</script>
+<style lang="scss">
+.kuandukuandukuandu {
+  max-width: 1500px;
+}
+.wrapper {
+}
+</style>

back/src/views/modules/putOnTheShelf/components/special.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 15:15:02
+ * @LastEditTime: 2022-07-08 17:26:24
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -29,7 +29,7 @@
               </p>
               <div class="del">
                 <i class="delImg" @click="del( index)"></i>
-                <div @click="del( index)">删除</div>
+                <div @click="del(configure.name, index)">删除</div>
               </div>
             </div>
           </div>
@@ -48,7 +48,7 @@
               <!-- <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload> -->
           </div>
           <div class="submit">
-            <a-button type="primary" @click="add()">提交</a-button>
+            <a-button type="primary" @click="add(configure.name)">提交</a-button>
           </div>
         </div>
     </div>
@@ -71,7 +71,7 @@ export default {
     }
   },
   methods: {
-    add () {
+    add (title) {
       const list = this.configure.list
       let flag = true
       list.forEach((item) => {
@@ -89,11 +89,11 @@ export default {
         })
         this.data.push(obj)
         // console.log(data.value[title])
-        // mybus.emit('chageDataFrom', {
+        this.$emit('changeInfoList', {
-        //   attrType: title,
+          attrType: title,
-        //   attrValue: JSON.stringify(data.value[title]),
+          attrValue: JSON.stringify(this.data),
-        //   delFlag: 0
+          delFlag: 0
-        // })
+        })
         list.forEach((item) => {
           item.note1 = ''
         })
@@ -101,14 +101,15 @@ export default {
       } else {
         this.$message.warning('请填写完整')
       }
-    } // del (title, index) {
+    },
-    //   data.value[title].splice(index, 1)
+    del (title, index) {
-    //   mybus.emit('chageDataFrom', {
+      this.data.splice(index, 1)
-    //     attrType: title,
+      this.$emit('changeInfoList', {
-    //     attrValue: JSON.stringify(data.value[title]),
+        attrType: title,
-    //     delFlag: 0
+        attrValue: JSON.stringify(this.data),
-    //   })
+        delFlag: 0
-    // }
+      })
+    }
   }
 }
 </script>
@@ -135,7 +136,7 @@ export default {
 
 .bottom {
   margin-top: 25px;
-
+  margin-bottom: 25px;
   .items {
     background: #fafafa;
     padding: 10px;
@@ -302,4 +303,9 @@ export default {
   font-weight: 400;
   text-align: left;
 }
+textarea {
+  height: 100px;
+  resize: none;
+  font-size: 14px;
+}
 </style>

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 15:50:06
+ * @LastEditTime: 2022-07-08 17:48:27
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -15,11 +15,11 @@
               <span v-if="item.name != '来源应用'">{{ item.name }}</span>
               <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
                 tip="支持图片类型，大小不超过100M"></upload>
-              <upload :list="[]" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="[]" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
-                :data="item" tip="支持文件类型，大小不超过100M"></upload>
+                :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
-              <upload :list="[]" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :data="item" :busType="2"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="[]" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :dataList="item" :busType="2"
                 tip="支持文件类型，大小不超过100M"></upload>
-              <upload :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :data="item"
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="[]" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name"></input-select-checkbox>
@@ -31,7 +31,7 @@
             </div>
           </template>
           <template v-else>
-            <special :configure='judgmentType.filter(item => item.name==child.name)[0]'></special>
+            <special :configure='judgmentType.filter(item => item.name==child.name)[0]' @changeInfoList='changeInfoList'></special>
           </template>
         </div>
       </div>
@@ -163,6 +163,12 @@ export default {
     }
   },
   methods: {
+    changeInfoList (obj) {
+      this.$emit('changeInfoList', obj)
+    },
+    goToRichText () {
+
+    }
   }
 }
 </script>
@@ -198,6 +204,7 @@ export default {
 .item {
   display: flex;
   align-items: center;
+  margin: 25px 0;
   & > span:nth-of-type(1) {
     width: 105px;
   }

front/public/index.html

@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
@@ -45,10 +45,10 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';

front/src/store/modules/user.js

@@ -2,175 +2,182 @@
  * @author chuzhixin 1204505056@qq.com
  * @description 登录、获取用户信息、退出登录、清除accessToken逻辑，不建议修改
  */
-import { getUserInfo, login, logout } from '@/api/user'
+ import { getUserInfo, login, logout } from '@/api/user'
-import {
+ import {
-  getAccessToken,
+   getAccessToken,
-  removeAccessToken,
+   removeAccessToken,
-  setAccessToken,
+   setAccessToken,
-} from '@/utils/accessToken'
+ } from '@/utils/accessToken'
-import { title, tokenName } from '@/config'
+ import { title, tokenName } from '@/config'
-import { message, notification } from 'ant-design-vue'
+ import { message, notification } from 'ant-design-vue'
 
-const state = () => ({
+ const state = () => ({
-  accessToken: getAccessToken(),
+   accessToken: getAccessToken(),
-  username: '',
+   username: '',
-  userId: '',
+   userId: '',
-  avatar: '',
+   avatar: '',
-  role: 0, // 用户管理员权限
+   role: 0, // 用户管理员权限
-})
+ })
-const getters = {
+ const getters = {
-  accessToken: (state) => state.accessToken,
+   accessToken: (state) => state.accessToken,
-  username: (state) => state.username,
+   username: (state) => state.username,
-  avatar: (state) => state.avatar,
+   avatar: (state) => state.avatar,
-  role: (state) => state.role,
+   role: (state) => state.role,
-  userId: (state) => state.userId,
+   userId: (state) => state.userId,
-}
+ }
-const mutations = {
+ const mutations = {
-  /**
+   /**
-   * @author chuzhixin 1204505056@qq.com
+    * @author chuzhixin 1204505056@qq.com
-   * @description 设置accessToken
+    * @description 设置accessToken
-   * @param {*} state
+    * @param {*} state
-   * @param {*} accessToken
+    * @param {*} accessToken
-   */
+    */
-  setAccessToken(state, accessToken) {
+   setAccessToken(state, accessToken) {
-    state.accessToken = accessToken
+     state.accessToken = accessToken
-    setAccessToken(accessToken)
+     setAccessToken(accessToken)
-  },
+   },
-  /**
+   /**
-   * @author chuzhixin 1204505056@qq.com
+    * @author chuzhixin 1204505056@qq.com
-   * @description 设置用户名
+    * @description 设置用户名
-   * @param {*} state
+    * @param {*} state
-   * @param {*} username
+    * @param {*} username
-   */
+    */
-  setUsername(state, username) {
+   setUsername(state, username) {
-    state.username = username
+     state.username = username
-  },
+   },
-  // 设置角色
+   // 设置角色
-  setRole(state, role) {
+   setRole(state, role) {
-    state.role = role
+     state.role = role
-  },
+   },
-  // 设置用户userId
+   // 设置用户userId
-  setUserId(state, id) {
+   setUserId(state, id) {
-    state.userId = id
+     state.userId = id
-  },
+   },
-  /**
+   /**
-   * @author chuzhixin 1204505056@qq.com
+    * @author chuzhixin 1204505056@qq.com
-   * @description 设置头像
+    * @description 设置头像
-   * @param {*} state
+    * @param {*} state
-   * @param {*} avatar
+    * @param {*} avatar
-   */
+    */
-  setAvatar(state, avatar) {
+   setAvatar(state, avatar) {
-    state.avatar = avatar
+     state.avatar = avatar
-  },
+   },
-}
+ }
-const actions = {
+ const actions = {
-  /**
+   /**
-   * @author chuzhixin 1204505056@qq.com
+    * @author chuzhixin 1204505056@qq.com
-   * @description 登录拦截放行时，设置虚拟角色
+    * @description 登录拦截放行时，设置虚拟角色
-   * @param {*} { commit, dispatch }
+    * @param {*} { commit, dispatch }
-   */
+    */
-  setVirtualRoles({ commit, dispatch }) {
+   setVirtualRoles({ commit, dispatch }) {
-    dispatch('acl/setFull', true, {
+     dispatch('acl/setFull', true, {
-      root: true,
+       root: true,
-    })
+     })
-    commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif')
+     commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif')
-    commit('setUsername', 'admin(未开启登录拦截)')
+     commit('setUsername', 'admin(未开启登录拦截)')
-  },
+   },
-  /**
+   /**
-   * @author chuzhixin 1204505056@qq.com
+    * @author chuzhixin 1204505056@qq.com
-   * @description 登录
+    * @description 登录
-   * @param {*} { commit }
+    * @param {*} { commit }
-   * @param {*} userInfo
+    * @param {*} userInfo
-   */
+    */
-  async login({ commit }, userInfo) {
+   async login({ commit }, userInfo) {
-    const { data } = await login(userInfo)
+     const { data } = await login(userInfo)
-    // debugger
+     // debugger
-    const accessToken = data.data[tokenName]
+     const accessToken = data.data[tokenName]
-    if (accessToken) {
+     if (accessToken) {
-      commit('setAccessToken', accessToken)
+       commit('setAccessToken', accessToken)
-      const hour = new Date().getHours()
+       const hour = new Date().getHours()
-      const thisTime =
+       const thisTime =
-        hour < 8
+         hour < 8
-          ? '早上好'
+           ? '早上好'
-          : hour <= 11
+           : hour <= 11
-          ? '上午好'
+           ? '上午好'
-          : hour <= 13
+           : hour <= 13
-          ? '中午好'
+           ? '中午好'
-          : hour < 18
+           : hour < 18
-          ? '下午好'
+           ? '下午好'
-          : '晚上好'
+           : '晚上好'
-      notification.open({
+       notification.open({
-        message: `欢迎登录${title}`,
+         message: `欢迎登录${title}`,
-        description: `${thisTime}！`,
+         description: `${thisTime}！`,
-      })
+       })
-    } else {
+     } else {
-      message.error(`登录接口异常，未正确返回${tokenName}...`)
+       message.error(`登录接口异常，未正确返回${tokenName}...`)
-    }
+     }
-  },
+   },
-  /**
+   /**
-   * @author chuzhixin 1204505056@qq.com
+    * @author chuzhixin 1204505056@qq.com
-   * @description 获取用户信息接口 这个接口非常非常重要，如果没有明确底层前逻辑禁止修改此方法，错误的修改可能造成整个框架无法正常使用
+    * @description 获取用户信息接口 这个接口非常非常重要，如果没有明确底层前逻辑禁止修改此方法，错误的修改可能造成整个框架无法正常使用
-   * @param {*} { commit, dispatch, state }
+    * @param {*} { commit, dispatch, state }
-   * @returns
+    * @returns
-   */
+    */
-  getUserInfo({ commit }) {
+   async getUserInfo({ commit }) {
-    return new Promise((resolve, reject)=>{
+     const { data } = await getUserInfo()
-      getUserInfo().then( (res) =>{
+     if (!data) {
-        console.log('res', res)
+       message.error(`验证失败，请重新登录...`)
-        const data = res.data
+       return false
-        if (!data) {
+     }
-          message.error(`验证失败，请重新登录...`)
+     // debugger
-          reject()
+     commit('setUsername', data.data.username)
-        }
+     commit('setRole', data.data.roleIdList.length)
-        commit('setUsername', data.data.username)
+     commit('setUserId', data.data.id)
-        commit('setRole', data.data.roleIdList.length)
+     // TODO 获取用户信息，后续执行部分操作
-        commit('setUserId', data.data.id)
+     // let { username, avatar, roles, ability } = data
-        setTimeout(()=>{
+     // if (username && roles && Array.isArray(roles)) {
-          resolve()
+     //   dispatch('acl/setRole', roles, {
-        },500)
+     //     root: true,
+     //   })
+     //   if (ability && ability.length > 0)
+     //     dispatch('acl/setAbility', ability, {
+     //       root: true,
+     //     })
+     //   commit('setUsername', username)
+     //   commit('setAvatar', avatar)
+     // } else {
+     //   message.error('用户信息接口异常')
+     // }
+   },
 
-      })
+   /**
-    })
+    * @author chuzhixin 1204505056@qq.com
-  },
+    * @description 退出登录
-
+    * @param {*} { dispatch }
-  /**
+    */
-   * @author chuzhixin 1204505056@qq.com
+   async logout({ dispatch }) {
-   * @description 退出登录
+     await logout(state.accessToken)
-   * @param {*} { dispatch }
+     await dispatch('resetAll')
-   */
+   },
-  async logout({ dispatch }) {
+   /**
-    await logout(state.accessToken)
+    * @author chuzhixin 1204505056@qq.com
-    await dispatch('resetAll')
+    * @description 重置accessToken、roles、ability、router等
-  },
+    * @param {*} { commit, dispatch }
-  /**
+    */
-   * @author chuzhixin 1204505056@qq.com
+   async resetAll({ dispatch }) {
-   * @description 重置accessToken、roles、ability、router等
+     await dispatch('setAccessToken', '')
-   * @param {*} { commit, dispatch }
+     await dispatch('acl/setFull', false, {
-   */
+       root: true,
-  async resetAll({ dispatch }) {
+     })
-    await dispatch('setAccessToken', '')
+     await dispatch('acl/setRole', [], {
-    await dispatch('acl/setFull', false, {
+       root: true,
-      root: true,
+     })
-    })
+     await dispatch('acl/setAbility', [], {
-    await dispatch('acl/setRole', [], {
+       root: true,
-      root: true,
+     })
-    })
+     removeAccessToken()
-    await dispatch('acl/setAbility', [], {
+   },
-      root: true,
+   /**
-    })
+    * @author chuzhixin 1204505056@qq.com
-    removeAccessToken()
+    * @description 设置token
-  },
+    */
-  /**
+   setAccessToken({ commit }, accessToken) {
-   * @author chuzhixin 1204505056@qq.com
+     commit('setAccessToken', accessToken)
-   * @description 设置token
+   },
-   */
+ }
-  setAccessToken({ commit }, accessToken) {
+ export default {
-    commit('setAccessToken', accessToken)
+   state,
-  },
+   getters,
-}
+   mutations,
-export default {
+   actions,
-  state,
+ }
-  getters,
-  mutations,
-  actions,
-}

front/src/utils/request.js

@@ -12,7 +12,7 @@ import qs from 'qs'
 import router from '@/router'
 // import { isArray } from '@/utils/validate'
 import { message } from 'ant-design-vue'
-import { setAccessToken } from '@/utils/accessToken'
+import { getAccessToken, setAccessToken } from '@/utils/accessToken'
 
 let loadingInstance
 
@@ -22,15 +22,24 @@ let loadingInstance
  * @param {*} code
  * @param {*} msg
  */
-const handleCode = (code, msg, redirect) => {
+const handleCode = (code, msg, res) => {
+  debugger
   switch (code) {
     case 401:
       // message.error(msg || '登录失效')
+
       store.dispatch('user/resetAll').catch(() => {})
-      // // location.reload()
+      if (res.token) {
-      if (redirect) {
+        console.log('存在token信息', res.token)
-        window.location.href = redirect
+      setAccessToken(res.token)
+      const token = getAccessToken()
+      console.log('验证token信息', token)
       }
+
+      // // location.reload()
+      // if (redirect) {
+      //   window.location.href = res.redirect
+      // }
       break
     case 403:
       router.push({ path: '/401' }).catch(() => {})
@@ -87,10 +96,21 @@ instance.interceptors.request.use(
  */
 instance.interceptors.response.use(
   (response) => {
-    // console.log('接口返回', response)
+    console.log('接口返回', response)
-    // console.log('接口返回headers', response.headers)
+    console.log('接口返回headers', response.headers)
-    // console.log('接口返回REDIRECT', response.headers.redirect)
+    console.log('接口返回REDIRECT', response.headers.redirect)
-
+    response['Access-Control-Expose-Headers'] = 'redirect'
+    const { code, message } = response.data
+    if (response.headers.token) {
+      setAccessToken(response.headers.token)
+    } else {
+      if (response.headers.redirect) {
+        // window.location.href = response.headers.redirect
+        window.location.replace(response.headers.redirect)
+        return
+        // location.reload()
+      }
+    }
     if (response.headers.redirect === '/#/login') {
       var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
       if (keys) {
@@ -109,29 +129,12 @@ instance.interceptors.response.use(
             new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
         }
       }
-      // console.log('已清除')
+      console.log('已清除')
       setTimeout(() => {
         location.reload()
       }, 1000)
     }
-    debugger;
+    handleCode(code, message, response.headers)
-    response['Access-Control-Expose-Headers'] = 'redirect'
-    const { code, message } = response.data
-    if (response.headers.token) {
-      setAccessToken(response.headers.token)
-      debugger
-      // setAccessToken(response.headers.token)
-      //  store.dispatch('user/getUserInfo')
-    } else {
-      if (response.headers.redirect) {
-        // window.location.href = response.headers.redirect
-        window.location.replace(response.headers.redirect)
-        return
-        // location.reload()
-      }
-    }
-
-    handleCode(code, message, response.headers.redirect)
     if (loadingInstance) loadingInstance.close()
     // const { data, config } = response
     // const { code, msg } = data
@@ -151,38 +154,15 @@ instance.interceptors.response.use(
     // }
   },
   (error) => {
-    // console.log('接口error', error)
+    console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
     const { response, message } = error
     if (error.response && error.response.data) {
-      // console.log('接口返回', response)
+      console.log('接口返回', response)
-      // console.log('接口返回headers', response.headers)
+      console.log('接口返回headers', response.headers)
-      // console.log('接口返回REDIRECT1111', response.headers.redirect)
+      console.log('接口返回REDIRECT', response.headers.redirect)
-      if (response.headers.redirect === '/#/login') {
-        var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
-        if (keys) {
-          for (var i = keys.length; i--; ) {
-            document.cookie =
-              keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
-            document.cookie =
-              keys[i] +
-              '=0;path=/;domain=' +
-              document.domain +
-              ';expires=' +
-              new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com
-            document.cookie =
-              keys[i] +
-              '=0;path=/;domain=kevis.com;expires=' +
-              new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
-          }
-        }
-        // console.log('已清除')
-        setTimeout(() => {
-          location.reload()
-        }, 1000)
-      }
       if (response.headers.redirect) {
-        window.location.href = response.headers.redirect
+        window.location.replace(response.headers.redirect)
         return Promise.reject(error)
       }
       const { status, data } = response

front/src/vab/plugins/permissions.js

@@ -2,67 +2,63 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 19:58:32
+ * @LastEditTime: 2022-07-08 18:55:28
  * @Description: 告诉大家这是什么
  */
 /**
  * @author chuzhixin 1204505056@qq.com
  * @description 路由守卫，目前两种模式：all模式与intelligence模式
  */
-import router from '@/router'
+ import router from '@/router'
-import store from '@/store'
+ import store from '@/store'
-import getPageTitle from '@/utils/pageTitle'
+ import getPageTitle from '@/utils/pageTitle'
-import {
+ import { getUserInfo } from '@/api/user'
-  // authentication,
+ import {
-  loginInterception,
+   // authentication,
-  // recordRoute,
+   loginInterception,
-  routesWhiteList,
+   // recordRoute,
-} from '@/config'
+   routesWhiteList,
-import { setAccessToken, getAccessToken } from '@/utils/accessToken'
+ } from '@/config'
-router.beforeEach(async (to, from, next) => {
+ import { setAccessToken, getAccessToken } from '@/utils/accessToken'
-  // 初始化拦截
+ router.beforeEach(async (to, from, next) => {
-  // debugger
+   // debugger
-  // const SSOTOKEN = to.query.SSOToken
+   // const SSOTOKEN = to.query.SSOToken
-  // if (SSOTOKEN) {
+   // if (SSOTOKEN) {
-  //   setAccessToken(SSOTOKEN)
+   //   setAccessToken(SSOTOKEN)
-  // }
+   // }
-  const token = getAccessToken()
+   const token = getAccessToken()
-  // console.log('token', token)
+   console.log('token', token)
-  let hasToken = token || store.getters['user/accessToken']
+   let hasToken = token || store.getters['user/accessToken']
-  // debugger
+   // debugger
-  // 未开启登录拦截状态
+   if (!loginInterception) hasToken = true
-  if (!loginInterception) hasToken = true
+   console.log('hasToken存在巨大问题', hasToken)
-  // console.log('hasToken存在巨大问题', hasToken)
+   if (hasToken) {
-  debugger
+     setAccessToken(hasToken)
-  if (hasToken) {
+     await store.dispatch('user/getUserInfo')
-    setAccessToken(token)
+     next()
-    await store.dispatch('user/getUserInfo')
+   } else {
-    debugger
+     let accessRoutes = []
-    next()
+     accessRoutes = await store.dispatch('routes/setRoutes')
-  } else {
+     accessRoutes.forEach((item) => {
-    let accessRoutes = []
+       router.addRoute(item)
-    accessRoutes = await store.dispatch('routes/setRoutes')
+     })
-    accessRoutes.forEach((item) => {
+     if (routesWhiteList.indexOf(to.path) !== -1) {
-      router.addRoute(item)
+       next()
-    })
+     } else {
-    if (routesWhiteList.indexOf(to.path) !== -1) {
+      getUserInfo().then(res=>{
-      next()
+        console.log(res)
-    } else {
+        router.replace('/home')
-      store.dispatch('user/getUserInfo').then((res)=>{
-        console.log('马到成功！')
-        next()
       })
-      // if (recordRoute)
+      //  await store.dispatch('user/getUserInfo')
-      //   next({ path: '/login', query: { redirect: to.path }, replace: true })
-      // else next({ path: '/login', replace: true })
-      // debugger
-      // setTimeout(()=>{
       //   next()
-      // }, 500)
+       // if (recordRoute)
-      // window.open('http://www.baidu.com', '_self')
+       //   next({ path: '/login', query: { redirect: to.path }, replace: true })
-    }
+       // else next({ path: '/login', replace: true })
-  }
+      //  next()
-})
+       // window.open('http://www.baidu.com', '_self')
-router.afterEach((to) => {
+     }
-  document.title = getPageTitle(to.meta.title)
+   }
-})
+ })
+ router.afterEach((to) => {
+   document.title = getPageTitle(to.meta.title)
+ })

front/src/views/capabilityCloud/components/ComponentServices.vue

@@ -271,7 +271,7 @@
       },
       grid: {
         top: '10%',
-        left: '3%',
+        left: '10%',
         right: '10%',
         bottom: '0%',
         containLabel: true,

front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue

@@ -196,7 +196,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传技术文档')
+      message.error('暂未上传技术文档')
     }
   }
 </script>

front/src/views/detailsAll/components/Business/BusinessUsageMode.vue

@@ -216,7 +216,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传技术文档')
+      message.error('暂未上传技术文档')
     }
   }
   function technicalNew() {
@@ -241,7 +241,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传使用手册')
+      message.error('暂未上传使用手册')
     }
   }
 </script>

front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue

@@ -224,7 +224,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂无上传技术文档')
+      message.error('暂未上传接口文档')
     }
   }
   function technicalNew() {
@@ -248,7 +248,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂上传使用手册')
+      message.error('暂未上传使用手册')
     }
   }
 </script>

front/src/views/home/DetailsPageconetent.vue

@@ -1026,7 +1026,7 @@
             }
             tecHnosphere = router.currentRoute.value.query.tecHnosphere
             appLiCation = router.currentRoute.value.query.appLiCation
-            if (val.typeList && val.typeList.length > 6) {
+            if (val.typeList && val.typeList.length > 8) {
               val.showShrink = true
               val.shrinkFlag = true
             }