From 42b7ec11291c71a97f4d323494b489f05abd3949 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 26 Oct 2022 14:35:32 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/ren-process-detail.vue                |   6 +-
 .../components/abilityDetails.vue             | 140 +++++++++---------
 .../components/frequency-top5-view.vue        |   8 +-
 3 files changed, 79 insertions(+), 75 deletions(-)

diff --git a/back/src/components/ren-process-detail/src/ren-process-detail.vue b/back/src/components/ren-process-detail/src/ren-process-detail.vue
index 89bc0d45..e7a04977 100644
--- a/back/src/components/ren-process-detail/src/ren-process-detail.vue
+++ b/back/src/components/ren-process-detail/src/ren-process-detail.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 16:30:04
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-16 15:07:44
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-26 11:05:07
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -31,7 +31,7 @@
         <!-- 审核意见 -->
         <el-table-column prop="comment" :label="$t('process.comment')" header-align="center" align="center"></el-table-column>
         <!-- 任务时长（秒） -->
-        <el-table-column prop="durationInSeconds" :label="$t('task.durationInSeconds')" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="duration" :label="$t('task.durationInSeconds')" header-align="center" align="center" width="180"></el-table-column>
       </el-table>
       <el-pagination
         v-if="dataForm.pid === '0'"
diff --git a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
index 9a72879f..0f72bccc 100644
--- a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
+++ b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    width="70%"
     :destroy-on-close="true"
     :close-on-click-modal="false"
     @close="closeModal"
@@ -96,7 +97,7 @@
             </template>
           </template>
         </a-table> -->
-        <el-table 
+        <el-table
       :data="dataSource.data[0][1]"
       style="width: 100%">
       <el-table-column
@@ -104,6 +105,11 @@
         label="任务名称"
         width="180">
       </el-table-column>
+      <el-table-column
+        prop="assigneeDeptName"
+        label="处理人部门"
+        width="200">
+      </el-table-column>
       <el-table-column
         prop="assigneeName"
         label="处理人"
@@ -136,132 +142,131 @@
      </div> -->
   </el-dialog>
 </template>
-  
+
 <script>
 export default {
   props: {
     detailType: {
       type: String,
-      default: "",
+      default: ''
     },
     detailsVisible: {
       type: Boolean,
-      default: false,
+      default: false
     },
     detailParamss: {
       type: Object,
-      default: {},
-    },
+      default: {}
+    }
   },
   watch: {
     detailsVisible: {
-      handler(newVal) {
-        this.detailsVisibleCopy = newVal;
+      handler (newVal) {
+        this.detailsVisibleCopy = newVal
       },
-      immediate: true,
+      immediate: true
     },
     detailParamss: {
-      handler(newVal) {
-        this.detailParams = newVal;
-        this.getDetail(newVal);
+      handler (newVal) {
+        this.detailParams = newVal
+        this.getDetail(newVal)
       },
-      immediate: true,
-    },
+      immediate: true
+    }
   },
-  data() {
+  data () {
     return {
       detailsVisibleCopy: false,
       columns: [
         {
-          title: "任务名称",
-          dataIndex: "activityName",
-          key: "activityName",
+          title: '任务名称',
+          dataIndex: 'activityName',
+          key: 'activityName'
         },
         {
-          title: "处理人",
-          dataIndex: "assigneeName",
-          key: "assigneeName",
+          title: '处理人',
+          dataIndex: 'assigneeName',
+          key: 'assigneeName'
         },
         {
-          title: "任务开始时间",
-          dataIndex: "startTime",
-          key: "startTime",
+          title: '任务开始时间',
+          dataIndex: 'startTime',
+          key: 'startTime'
         },
         {
-          title: "任务结束时间",
-          dataIndex: "endTime",
-          key: "endTime",
+          title: '任务结束时间',
+          dataIndex: 'endTime',
+          key: 'endTime'
         },
         {
-          title: "审核意见",
-          dataIndex: "comment",
-          key: "comment",
+          title: '审核意见',
+          dataIndex: 'comment',
+          key: 'comment'
         },
         {
-          title: "任务时长/秒",
-          dataIndex: "durationInSeconds",
-          key: "durationInSeconds",
-        },
+          title: '任务时长/秒',
+          dataIndex: 'durationInSeconds',
+          key: 'durationInSeconds'
+        }
       ],
       dataSource: [{ data: [] }],
-      showArr: [],
-    };
+      showArr: []
+    }
   },
   computed: {},
   components: {},
   methods: {
-    getDetail(newVal) {
-
+    getDetail (newVal) {
       if (newVal.resourceApplication) {
-        this.dataSource.data = [];
-        if (this.detailType == "能力上架") {
-          let arr = [];
+        this.dataSource.data = []
+        if (this.detailType == '能力上架') {
+          const arr = []
           newVal.resourceApplication.forEach((item) => {
-            arr.push(item);
-          });
+            arr.push(item)
+          })
           this.dataSource.data.push([
             newVal.resourceApplication.processInstanceId,
-            arr,
-          ]);
+            arr
+          ])
         } else {
           for (const key in newVal.resourceApplication) {
             if (newVal.resourceApplication[key].length > 0) {
               newVal.resourceApplication[key].map((item) => {
                 this.dataSource.data.push([
                   item.instanceId,
-                  item.taskHandleDetailInfo,
-                ]);
-              });
+                  item.taskHandleDetailInfo
+                ])
+              })
             }
           }
         }
 
-        this.showArr.value = [];
+        this.showArr.value = []
         for (const key in newVal.resourceApplication) {
           if (newVal.resourceApplication[key].length > 0) {
-            let obj = { name: "", instanceId: "", list: [], list2: [] };
-            obj.name = key;
+            const obj = { name: '', instanceId: '', list: [], list2: [] }
+            obj.name = key
             newVal.resourceApplication[key].map((item) => {
-              obj.instanceId = item.instanceId;
-              obj.backToFirst = item.backToFirst;
-              obj.ended = item.ended;
-              obj.approveStatus = item.approveStatus;
+              obj.instanceId = item.instanceId
+              obj.backToFirst = item.backToFirst
+              obj.ended = item.ended
+              obj.approveStatus = item.approveStatus
               if (item.resources.length > 0) {
                 item.resources.map((val) => {
-                  obj.list.push(val);
-                });
+                  obj.list.push(val)
+                })
               } else {
                 item.camera.map((val) => {
-                  obj.list2.push(val);
-                });
+                  obj.list2.push(val)
+                })
               }
-            });
+            })
 
-            this.showArr.push(obj);
+            this.showArr.push(obj)
           }
         }
       }
-      console.log("this.dataSource.data[0]========",this.dataSource.data[0][1])
+      console.log('this.dataSource.data[0]========', this.dataSource.data[0][1])
     },
     //   init () {
     //     this.visible = true
@@ -269,11 +274,11 @@ export default {
     //       this.$refs['dataForm'].resetFields()
     //     })
     //   },
-    closeModal() {
-      this.$emit("closeModal");
-    },
-  },
-};
+    closeModal () {
+      this.$emit('closeModal')
+    }
+  }
+}
 </script>
 <style scoped>
 .title {
@@ -457,4 +462,3 @@ export default {
   }
 }
 </style>
-  
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/components/frequency-top5-view.vue b/back/src/views/modules/workBench/components/frequency-top5-view.vue
index b691ec4a..246708b7 100644
--- a/back/src/views/modules/workBench/components/frequency-top5-view.vue
+++ b/back/src/views/modules/workBench/components/frequency-top5-view.vue
@@ -4,19 +4,19 @@
         <div v-if="!noData" v-loading="loading">
             <div class="no-box">
                 <div class="no no2">
-                    <el-tooltip effect="dark" :content="no2Obj.name" placement="top">
+                    <el-tooltip effect="dark" :content="no2Obj.name" placement="top" v-if="no2Obj.name">
                         <div class="name ellipsis" :style="{ color: colorObj[2] }">{{ no2Obj.name || '--' }}</div>
                     </el-tooltip>
                     <div class="count">{{ formatCount(no2Obj.count) }}</div>
                 </div>
                 <div class="no no1">
-                    <el-tooltip effect="dark" :content="no1Obj.name" placement="top">
+                    <el-tooltip effect="dark" :content="no1Obj.name" placement="top" v-if="no1Obj.name">
                         <div class="name ellipsis" :style="{ color: colorObj[1] }">{{ no1Obj.name || '--' }}</div>
                     </el-tooltip>
                     <div class="count">{{ formatCount(no1Obj.count) }}</div>
                 </div>
                 <div class="no no3">
-                    <el-tooltip effect="dark" :content="no3Obj.name" placement="top">
+                    <el-tooltip effect="dark" :content="no3Obj.name" placement="top" v-if="no3Obj.name">
                         <div class="name ellipsis" :style="{ color: colorObj[3] }">{{ no3Obj.name || '--' }}</div>
                     </el-tooltip>
 
@@ -26,7 +26,7 @@
             <div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i">
                 <div class="left">
                     <div class="row-index">{{ i + 4 }}</div>
-                    <el-tooltip effect="dark" :content="data.name" placement="top">
+                    <el-tooltip effect="dark" :content="data.name" placement="top" v-if="data.name">
                         <div class="name-text ellipsis">{{ data.name || '--' }}</div>
                     </el-tooltip>
                 </div>