工作台：工作动态跳转

back/src/views/modules/workBench/components/bottom-view.vue

@@ -8,12 +8,13 @@
           <div class="wrapper">
             <div class="content">
               <div class="left">{{ item.createDate }}</div>
-              <el-tooltip effect="dark" :content="item.title" placement="top">
+              <el-tooltip popper-class="testTooltip" effect="dark" :content="item.title" placement="top">
                 <div class="right ellipsis">{{ item.title || '--' }}</div>
               </el-tooltip>
             </div>
           </div>
         </div>
+        <div class="more" @click="jumpTo">查看更多 ></div>
       </div>
 
     </div>
@@ -34,7 +35,7 @@ export default {
   components: {
     contentTitle
   },
-  data () {
+  data() {
     return {
       title: { dynamic: '部门发布动态', recommend: '部门推荐能力' },
       list: [],
@@ -76,13 +77,13 @@ export default {
       loadingTable: false
     }
   },
-  mounted () {
+  mounted() {
     this.getResourceByDept()
     this.getApplyByDept()
   },
   methods: {
     // 发布动态
-    getResourceByDept () {
+    getResourceByDept() {
       const data = {
         limit: 5,
         page: 1
@@ -108,7 +109,7 @@ export default {
       )
     },
     // 部门推荐能力
-    getApplyByDept () {
+    getApplyByDept() {
       const data = {
         limit: 5,
         page: 1
@@ -130,7 +131,12 @@ export default {
           console.log('err', err)
         }
       )
-    }
+    },
+    jumpTo() {
+      this.$router.push({
+        path: 'activiti-my-work-dynamics'
+      });
+    },
   }
 }
 </script>
@@ -153,7 +159,8 @@ export default {
     background: #fff;
     width: 800px;
     height: 335px;
-    padding: 0px 0 20px 10px;
+    padding: 0px 0 0 10px;
+    box-sizing: border-box;
   }
 }
 
@@ -171,7 +178,7 @@ export default {
   margin-bottom: 7px;
 
   .wrapper {
-    height: 50px;
+    height: 45px;
     width: 770px;
     display: flex;
     flex-direction: row;
@@ -199,7 +206,7 @@ export default {
       }
 
       .right {
-        font-size: 18px;
+        font-size: 16px;
         color: #464645;
         width: 600px;
       }
@@ -207,6 +214,16 @@ export default {
   }
 }
 
+.more {
+  cursor: pointer;
+  text-align: right;
+  padding-top: 4px;
+  display: inline-block;
+  width: 100%;
+  color: #2b2b2b;
+  font-size: 14px;
+}
+
 .recommendView {
   cursor: pointer;
   width: 770px;
@@ -220,3 +237,8 @@ export default {
   background-color: #f4f5f8;
 }
 </style>
+<style lang="scss">
+.testTooltip {
+  width: 670px !important;
+}
+</style>

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

@@ -12,16 +12,26 @@
             </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" :content="item[dataInfo.nameStr]" placement="top">
+                <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
+                    :content="`${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}`"
+                    placement="top">
                     <div class="list-item ellipsis">
-                        {{ item[dataInfo.nameStr] || '--' }}
+                        {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }}
+                    </div>
+                </el-tooltip>
+                <!-- 已办 -->
+                <el-tooltip effect="dark" v-else
+                    :content="`${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) : ''}`"
+                    placement="top">
+                    <div class="list-item ellipsis">
+                        {{ `${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) :
+                                ''}`
+                        }}
                     </div>
                 </el-tooltip>
             </div>
-
             <div class="more" @click="goPage(dataInfo.url)">
                 查看更多 >
             </div>

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

@@ -9,13 +9,13 @@
             </div>
             <div class="flex-row-start dept-chart-box">
                 <dept-chart-view id="shelves" title="部门上架" v-loading="loadingResource" :dataList="resourceData"
-                    :colorArray="resourceColor">
+                    ref="resourceChart" :colorArray="resourceColor">
                 </dept-chart-view>
-                <dept-chart-view id="apply" title="部门申请" v-loading="loadingApply" :dataList="applyData"
+                <dept-chart-view id="apply" title="部门申请" v-loading="loadingApply" :dataList="applyData" ref="applyChart"
                     :colorArray="applyColor">
                 </dept-chart-view>
                 <dept-chart-view id="demand" title="部门需求" v-loading="loadingRequire" :dataList="requireData"
-                    :colorArray="requireColor">
+                    ref="requireChart" :colorArray="requireColor">
                 </dept-chart-view>
             </div>
         </div>
@@ -54,7 +54,7 @@ export default {
                 textColor: '#f86f01',
                 num: 0,
                 list: [],
-                nameStr: 'taskName',
+                type: 'todo',
                 url: 'activiti-my-todo-task'
             },
             // 部门已办
@@ -67,7 +67,6 @@ export default {
                 textColor: '#21b107',
                 num: 0,
                 list: [],
-                nameStr: 'processDefinitionName',
                 url: 'activiti-my-join-task'
             },
             // 部门申请
@@ -134,6 +133,7 @@ export default {
                 console.log('res----已办-------->', res.data);
                 this.hasToDodoData.list = res.data.data.records || []
                 this.hasToDodoData.num = res.data.data.total || 0
+
             }, err => {
                 this.$message.error(err)
                 this.loadingHasToDo = false;
@@ -150,6 +150,9 @@ export default {
                 }
                 console.log('res----部门上架-------->', res.data);
                 this.resourceData = this.formatList(res.data.data.total || [])
+                this.$nextTick(() => {
+                    this.$refs.resourceChart.initChart(this.resourceData)
+                })
             }, err => {
                 this.$message.error(err)
                 this.loadingResource = false;
@@ -165,6 +168,10 @@ export default {
                 }
                 console.log('res----部门申请-------->', res.data);
                 this.applyData = this.formatList(res.data.data.total || [])
+                this.$nextTick(() => {
+                    console.log('this.applyData------------>', this.applyData);
+                    this.$refs.applyChart.initChart(this.applyData)
+                })
             }, err => {
                 this.$message.error(err)
                 this.loadingApply = false;
@@ -190,6 +197,9 @@ export default {
                 }
                 console.log('res----部门需求-------->', res.data);
                 this.requireData = this.formatList(res.data.data.total || [], 'flag')
+                this.$nextTick(() => {
+                    this.$refs.requireChart.initChart(this.requireData)
+                })
 
             }, err => {
                 this.$message.error(err)