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

2022-08-09 10:35:01 +08:00 · 2022-08-09 10:35:01 +08:00 · a9e3582db2
parent 141378eaee ca4c907d8a
commit a9e3582db2
9 changed files with 211 additions and 55 deletions
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@ -1,51 +1,106 @@
 <template>
  <div class="dept-box" :class="dataInfo.noMarginleft ? 'no-margin-left' : ''">
-        <div class="left-box"
-            :style="{ 'background': dataInfo.bgColor, 'border-right': `1px solid ${dataInfo.borderColor}` }">
+    <div
+      class="left-box"
+      :style="{
+        background: dataInfo.bgColor,
+        'border-right': `1px solid ${dataInfo.borderColor}`
+      }"
+    >
      <div class="content">
        <img class="img" :src="dataInfo.imgSrc" />
        <div class="title">{{ title }}</div>
        <div class="flex-row-bottom">
-                    <span class="num" :style="{ 'color': dataInfo.textColor }">{{ formatNum(dataInfo.num) }}</span>
-                    <span class="unit" :style="{ 'color': dataInfo.textColor }">{{ dataInfo.unit || '个' }}</span>
+          <span class="num" :style="{ color: dataInfo.textColor }">{{
+            formatNum(dataInfo.num)
+          }}</span>
+          <span class="unit" :style="{ color: dataInfo.textColor }">{{
+            dataInfo.unit || '个'
+          }}</span>
        </div>
      </div>
    </div>
    <div class="list-box" v-if="dataInfo.list.length > 0">
      <div v-for="(item, i) in dataInfo.list" :key="i">
        <!-- 待办 -->
-                <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
-                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
-                    placement="top">
-                    <div class="list-item ellipsis">
+        <el-tooltip
+          effect="dark"
+          v-if="dataInfo.type === 'todo'"
+          :content="
+            (item.userDeptName || '--') +
+            '提交“' +
+            (item.applyTitle || '--') +
+            '”' +
+            (item.processDefinitionName || '--') +
+            (item.processDefinitionName !== '能力申请' &&
+            item.processDefinitionName !== '能力需求申请'
+              ? '申请'
+              : '')
+          "
+          placement="top"
+        >
+          <div
+            class="list-item ellipsis"
+            @click="workbenchFunction(item, item.processDefinitionName, '待办')"
+          >
            <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
-                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
+            {{
+              (item.userDeptName || '--') +
+              '提交“' +
+              (item.applyTitle || '--') +
+              '”' +
+              (item.processDefinitionName || '--') +
+              (item.processDefinitionName !== '能力申请' &&
+              item.processDefinitionName !== '能力需求申请'
+                ? '申请'
+                : '')
+            }}
          </div>
        </el-tooltip>
        <!-- 已办 -->
-                <el-tooltip effect="dark" v-else
-                    :content="(item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
-                    placement="top">
-                    <div class="list-item ellipsis">
-                        {{ (item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
+        <el-tooltip
+          effect="dark"
+          v-else
+          :content="
+            (item.startUserDeptName || '--') +
+            '提交的' +
+            (item.processDefinitionName || '--') +
+            (item.processDefinitionName !== '能力申请' &&
+            item.processDefinitionName !== '能力需求申请'
+              ? '申请'
+              : '')
+          "
+          placement="top"
+        >
+          <div
+            class="list-item ellipsis"
+            @click="workbenchFunction(item, item.processDefinitionName, '已办')"
+          >
+            {{
+              (item.startUserDeptName || '--') +
+              '提交的' +
+              (item.processDefinitionName || '--') +
+              (item.processDefinitionName !== '能力申请' &&
+              item.processDefinitionName !== '能力需求申请'
+                ? '申请'
+                : '')
+            }}
          </div>
        </el-tooltip>
      </div>
-            <div class="more" @click="goPage(dataInfo.url)">
-                查看更多 >
-            </div>
-        </div>
-        <div class="list-box flex-row-center no-data" v-else>
-            暂无数据
+      <div class="more" @click="goPage(dataInfo.url)">查看更多 ></div>
    </div>
+    <div class="list-box flex-row-center no-data" v-else>暂无数据</div>
  </div>
 </template>
 <script>
+import bus from '@/views/bus.js'
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
 export default {
+  mixins: [mixinViewModule, processModule],
  data () {
-    return {
-
-    }
+    return {}
  },
  props: {
    dataInfo: {
@ -58,6 +113,17 @@ export default {
    }
  },
  methods: {
+    // 点击部门待办数据打开弹窗
+    workbenchFunction (item, name, nameSwitch) {
+      const data = item
+      data.taskName = name
+      data.activityId = data.startUserId
+      if (nameSwitch === '待办') {
+        this.getProcDefRouteSet(item, this.forwardHandleUrl)
+      } else {
+        this.getProcDefRouteSet(item, this.forwardDetail)
+      }
+    },
    formatNum (num) {
      return num || num === 0 ? num : '--'
    },
@ -155,6 +221,7 @@ export default {
  border-bottom: 1px dashed #c6c6c6;
  font-size: 16px;
  color: #212121;
+  cursor: pointer;
 }

 .more {
--- a/front/public/index.html
+++ b/front/public/index.html
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-06 10:42:44
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-08-09 09:24:43
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -48,18 +48,18 @@
    // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
    // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 西海岸版本
-    window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
-    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://10.134.135.9:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+    // 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://localhost:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
-    // window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
-    // window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+    window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
+    window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
+    window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 穿透版本
    // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
    // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@ -64,6 +64,15 @@ export const constantRoutes = [
      icon: 'error-warning-line',
    },
  },
+  {
+    path: '/capacitySquare',
+    name: 'capacitySquare',
+    component: () => import('@/views/capacitySquare'),
+    meta: {
+      title: '能力广场',
+      icon: 'error-warning-line',
+    },
+  },
  {
    path: '/mapTest',
    name: 'mapTest',
--- a/front/src/views/capacitySquare/components/algorithm.vue
+++ b/front/src/views/capacitySquare/components/algorithm.vue
--- a/front/src/views/capacitySquare/components/application.vue
+++ b/front/src/views/capacitySquare/components/application.vue
@ -0,0 +1,12 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-08-09 09:31:25
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-08-09 09:38:03
+ * @Description: 应用资源
+-->
+<template>
+  <div>应用资源</div>
+</template>
+<script setup></script>
+<style lang="less" scoped></style>
--- a/front/src/views/capacitySquare/components/layer.vue
+++ b/front/src/views/capacitySquare/components/layer.vue
--- a/front/src/views/capacitySquare/index.vue
+++ b/front/src/views/capacitySquare/index.vue
@ -0,0 +1,23 @@
+<template>
+  <home-header></home-header>
+  <div class="box">
+    <algorithm v-if="show === 'algorithm'"></algorithm>
+    <layer v-else-if="show === 'layer'"></layer>
+    <application v-else-if="show === 'application'"></application>
+  </div>
+  <home-footer></home-footer>
+</template>
+<script setup>
+  import { ref } from 'vue'
+  import HomeHeader from '@/views/home/components/header'
+  import HomeFooter from '@/views/newHome/components/Footer'
+  import algorithm from './components/algorithm.vue'
+  import layer from './components/layer.vue'
+  import application from './components/application.vue'
+  const show = ref('application')
+</script>
+<style lang="less" scoped>
+  .box {
+    padding-top: 0.64rem;
+  }
+</style>
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -163,6 +163,43 @@
                  p-id="3065"
                ></path>
              </svg>
+              <svg
+                t="1652322568870"
+                class="icon"
+                viewBox="0 0 3072 1024"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                p-id="3062"
+                width="40"
+                height="40"
+                v-if="item.applyState == '审核中'"
+                style="margin-left: 10px; min-width: 40px"
+              >
+                <path
+                  d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
+                  fill="#d81e06"
+                  p-id="3063"
+                ></path>
+                <path
+                  d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
+                  fill="#d81e06"
+                  p-id="3064"
+                ></path>
+              </svg>
+              <span
+                v-if="item.applyState == '审核中'"
+                style="
+                  font-size: 12px;
+                  -webkit-transform: scale(0.75);
+                  color: #d81e06;
+                  position: relative;
+                  left: -35px;
+                  top: -0.6px;
+                  font-weight: 500;
+                "
+              >
+                审核中
+              </span>
            </span>
            <div class="header-right">
              <div
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@ -162,6 +162,7 @@
                  :action="upLoadUrl"
                  :headers="headers"
                  @change="handleChange"
+                  :maxCount="1"
                >
                  <a-button
                    style="
@ -181,7 +182,7 @@
                    文件上传
                  </a-button>
                  <span style="font-size: 14px; color: #999">
-                    支持doc、docx、jpg、png、jpeg、pdf、xlxs、ppt类型文件
+                    支持doc、docx、jpg、png、jpeg、pdf、xlxs、ppt类型文件(仅限一个)
                  </span>
                </a-upload>
              </a-form-item>
@ -346,6 +347,13 @@
      const fileList = ref([])
      const subimtFlag = ref(true)
      const processStartHandle = () => {
+        if (formName.detailsField.length > 0) {
+          let detailsField = ''
+          formName.detailsField.map((item) => {
+            detailsField += item + ';'
+          })
+          formName.detailsField = detailsField
+        }
        if (id.value) {
          updateDemandForm(formName).then((upres) => {
            if (upres.data.code == 0) {