From 4c16c39243367ef5764cf7d39c84c79decdb77fb Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Mon, 24 Jun 2024 19:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts              |  2 +-
 src/views/system/log/operate/index.vue | 42 +++++++++++++++++++-------
 src/views/tenant/operate/index.vue     | 24 ++++++---------
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 2548d2c5..9f2f4596 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1808,7 +1808,7 @@ export default {
           requestMe:'Request Method',
           host:'Request Host',
           operStatus:'Status',
-          operDate:'Time',
+          operDate:'Time Stamp',
           useTime:'Time Lap',
           logInfo:'Operation Log Information',
           delSure:'Are you sure to delete the data item with access number [{ids}]?',
diff --git a/src/views/system/log/operate/index.vue b/src/views/system/log/operate/index.vue
index 3158f9e2..3fa7fd50 100644
--- a/src/views/system/log/operate/index.vue
+++ b/src/views/system/log/operate/index.vue
@@ -39,6 +39,8 @@ let queryParams = reactive({
   title: '',
   /**操作人员 */
   operName: '',
+  /**租户名称 */
+  tenantName: '',
   /**业务类型 */
   businessType: undefined,
   /**操作状态 */
@@ -58,6 +60,7 @@ function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     title: '',
     operName: '',
+    tenantName: '',
     businessType: undefined,
     status: undefined,
     beginTime: '',
@@ -121,6 +124,11 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 120,
   },
+  {
+    title: t('views.neUser.sub.tenantName'),
+    dataIndex: 'tenantName',
+    align: 'left',
+  },
   // {
   //   title: t('views.system.log.operate.requestMe'),
   //   dataIndex: 'requestMethod',
@@ -140,16 +148,6 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 150,
   },
-  {
-    title: t('views.system.log.operate.operDate'),
-    dataIndex: 'operTime',
-    align: 'center',
-    width: 150,
-    customRender(opt) {
-      if (+opt.value <= 0) return '';
-      return parseDateToStr(+opt.value);
-    },
-  },
   {
     title: t('views.system.log.operate.useTime'),
     dataIndex: 'costTime',
@@ -160,6 +158,17 @@ let tableColumns: ColumnsType = [
       return `${opt.value} ms`;
     },
   },
+  {
+    title: t('views.system.log.operate.operDate'),
+    dataIndex: 'operTime',
+    align: 'center',
+    width: 150,
+    customRender(opt) {
+      if (+opt.value <= 0) return '';
+      return parseDateToStr(+opt.value);
+    },
+  },
+
   {
     title: t('common.operate'),
     key: 'operId',
@@ -415,7 +424,7 @@ onMounted(() => {
             <a-form-item
               :label="t('views.system.log.operate.operUser')"
               name="operName"
-            > 
+            >
               <a-input
                 v-model:value="queryParams.operName"
                 allow-clear
@@ -448,6 +457,17 @@ onMounted(() => {
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="8" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.neUser.sub.tenantName')"
+              name="tenantName "
+            >
+              <a-input
+                v-model:value="queryParams.tenantName"
+                allow-clear
+              ></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
               :label="t('views.system.log.operate.operTime')"
diff --git a/src/views/tenant/operate/index.vue b/src/views/tenant/operate/index.vue
index 3158f9e2..aa4aec16 100644
--- a/src/views/tenant/operate/index.vue
+++ b/src/views/tenant/operate/index.vue
@@ -140,16 +140,6 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 150,
   },
-  {
-    title: t('views.system.log.operate.operDate'),
-    dataIndex: 'operTime',
-    align: 'center',
-    width: 150,
-    customRender(opt) {
-      if (+opt.value <= 0) return '';
-      return parseDateToStr(+opt.value);
-    },
-  },
   {
     title: t('views.system.log.operate.useTime'),
     dataIndex: 'costTime',
@@ -161,9 +151,14 @@ let tableColumns: ColumnsType = [
     },
   },
   {
-    title: t('common.operate'),
-    key: 'operId',
-    align: 'left',
+    title: t('views.system.log.operate.operDate'),
+    dataIndex: 'operTime',
+    align: 'center',
+    width: 150,
+    customRender(opt) {
+      if (+opt.value <= 0) return '';
+      return parseDateToStr(+opt.value);
+    },
   },
 ];
 
@@ -415,7 +410,7 @@ onMounted(() => {
             <a-form-item
               :label="t('views.system.log.operate.operUser')"
               name="operName"
-            > 
+            >
               <a-input
                 v-model:value="queryParams.operName"
                 allow-clear
@@ -508,7 +503,6 @@ onMounted(() => {
           <a-button
             type="dashed"
             @click.prevent="fnExportList()"
-            v-perms:has="['system:log:operate:export']"
           >
             <template #icon><ExportOutlined /></template>
             {{ t('common.export') }}