From 7cd2aa9ba3e603395d38fe2595fb5062724967a8 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Sun, 24 Oct 2021 20:23:24 +0800
Subject: [PATCH] =?UTF-8?q?CN-208=20operation=20log=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table/settings/OperationLogTable.vue      | 31 ++++++++++++++++---
 src/mixins/dataList.js                        |  4 ++-
 src/utils/constants.js                        |  6 ++++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/components/table/settings/OperationLogTable.vue b/src/components/table/settings/OperationLogTable.vue
index cb2919de..b0cd5165 100644
--- a/src/components/table/settings/OperationLogTable.vue
+++ b/src/components/table/settings/OperationLogTable.vue
@@ -4,6 +4,7 @@
     ref="dataTable"
     :data="tableData"
     :height="height"
+    tooltip-effect="light"
     border
     class="no-operation"
     @header-dragend="dragend"
@@ -27,17 +28,32 @@
       :sort-orders="['ascending', 'descending']"
       :width="`${item.width}`"
       class="data-column"
+      :show-overflow-tooltip="['params', 'response'].indexOf(item.prop) > -1"
     >
       <template #header>
         <span class="data-column__span">{{item.label}}</span>
         <div class="col-resize-area"></div>
       </template>
       <template  #default="scope">
-        <span v-if="item.prop === 'time'">
-                {{scope.row[item.prop]}} ms
+        <span v-if="item.prop === 'duration'">
+                {{scope.row[item.prop]}}ms
               </span>
+        <span v-else-if="item.prop === 'state'">
+          <template v-if="scope.row[item.prop]==operationLogStateMapping.success">
+            {{$t('operationLog.state.success')}}
+          </template>
+          <template v-else-if="scope.row[item.prop]==operationLogStateMapping.fail">
+            {{$t('operationLog.state.fail')}}
+          </template>
+          <template v-else>
+            {{scope.row[item.prop]}}
+          </template>
+        </span>
         <span v-else-if="item.prop === 'username'">{{formatUsername(scope.row)}}</span>
         <span v-else-if="item.prop === 'ctime'">{{utcTimeToSysTime(scope.row[item.prop])}}</span>
+        <template v-else-if="item.prop === 'params' || item.prop === 'response'">
+          <span>{{scope.row[item.prop]}}</span>
+        </template>
         <span v-else>{{scope.row[item.prop]}}</span>
       </template>
     </el-table-column>
@@ -46,11 +62,14 @@
 
 <script>
 import table from '@/mixins/table'
+import { operationLogStateMapping } from '@/utils/constants'
+
 export default {
   name: 'roleTable',
   mixins: [table],
   data () {
     return {
+      operationLogStateMapping: operationLogStateMapping,
       tableTitle: [
         {
           label: this.$t('config.operationlog.id'),
@@ -99,18 +118,20 @@ export default {
         },
         {
           label: this.$t('config.operationlog.time'),
-          prop: 'time',
+          prop: 'duration',
           show: false
         },
         {
           label: this.$t('config.operationlog.params'),
           prop: 'params',
-          show: false
+          show: false,
+          width: 150
         },
         {
           label: this.$t('config.operationlog.response'),
           prop: 'response',
-          show: false
+          show: false,
+          width: 150
         }
       ]
     }
diff --git a/src/mixins/dataList.js b/src/mixins/dataList.js
index b9581603..1a424a64 100644
--- a/src/mixins/dataList.js
+++ b/src/mixins/dataList.js
@@ -179,7 +179,9 @@ export default {
     let localStorageTableTitle = localStorage.getItem('cn-tableTitle-' + localStorage.getItem('cn-username') + '-' + this.tableId)
     localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : this.$refs.dataTable.tableTitle
     this.tools.customTableTitle = this.$refs.dataTable.tableTitle.map((item, index) => { // 修复切换中英文的问题
-      item.show = localStorageTableTitle[index].show
+      if(localStorageTableTitle[index]){
+        item.show = localStorageTableTitle[index].show
+      }
       return item
     })
     if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 8fed670c..014c3b1b 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -39,6 +39,12 @@ export const panelTypeAndRouteMapping = {
   appEntityDetail: 6
 }
 
+/* operationLog state 执行状态属性 值与名称之间的映射 */
+export const operationLogStateMapping = {
+  success: 1,
+  fail: 0
+}
+
 export const position = {
   tableHeight: {
     normal: 'calc(100% - 48px)' // 常规高度，特例在下方定义