From c665a07be5dd601d9971775fda69a26a9c4f6105 Mon Sep 17 00:00:00 2001
From: zjl <zjl@163.com>
Date: Wed, 16 Oct 2024 12:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=8E=B0=E7=9A=84BU?=
 =?UTF-8?q?G?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/ad/edit.vue               |  2 +-
 src/views/content/article/edit.vue          |  2 +-
 src/views/content/layoutItem/columns.ts     | 26 ++++++++++-----------
 src/views/logger/emailLog/edit.vue          |  2 +-
 src/views/logger/fileLog/edit.vue           |  2 +-
 src/views/logger/smsLog/edit.vue            |  2 +-
 src/views/monitor/job/log/edit.vue          |  2 +-
 src/views/system/logger/loginLog/columns.ts |  2 +-
 src/views/system/logger/loginLog/edit.vue   |  2 +-
 src/views/system/logger/operLog/columns.ts  |  2 +-
 src/views/system/logger/operLog/edit.vue    | 18 +++++++++++---
 src/views/system/tenant/columns.ts          |  2 +-
 12 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/views/content/ad/edit.vue b/src/views/content/ad/edit.vue
index 15502cd..d745639 100644
--- a/src/views/content/ad/edit.vue
+++ b/src/views/content/ad/edit.vue
@@ -10,7 +10,7 @@
     <el-form style="display: flex" ref="formRef" :model="formData" label-width="80px">
       <div style="width: 880px; flex: none" :style="{ height: fwbHeight + 'px' }">
         <el-form-item label-width="0px" prop="content">
-          <Editor ref="editorRef" :height="fwbHeight" name="content" />
+          <Editor ref="editorRef" :height="fwbHeight" name="ad" />
         </el-form-item>
       </div>
       <div style="flex: 1; margin-left: 10px">
diff --git a/src/views/content/article/edit.vue b/src/views/content/article/edit.vue
index f80bcb4..269bc9e 100644
--- a/src/views/content/article/edit.vue
+++ b/src/views/content/article/edit.vue
@@ -10,7 +10,7 @@
     <el-form style="display: flex" ref="formRef" :model="formData" label-width="80px">
       <div style="width: 880px; flex: none" :style="{ height: fwbHeight + 'px' }">
         <el-form-item label-width="0px" prop="content">
-          <Editor ref="editorRef" :height="fwbHeight" name="content" />
+          <Editor ref="editorRef" :height="fwbHeight" name="article" />
         </el-form-item>
       </div>
       <div style="flex: 1; margin-left: 10px">
diff --git a/src/views/content/layoutItem/columns.ts b/src/views/content/layoutItem/columns.ts
index 2cf2842..bc24c27 100644
--- a/src/views/content/layoutItem/columns.ts
+++ b/src/views/content/layoutItem/columns.ts
@@ -26,19 +26,19 @@ export const columns = [
     label: '推荐ID',
     prop: 'typeId',
   },
-  {
-    label: '推荐图片',
-    prop: 'image',
-    render(record) {
-      return h(ElAvatar, {
-        size: 48,
-        src: record.row.image,
-        shape: 'square',
-        fit: 'fill',
-      });
-    },
-    width: 120,
-  },
+  // {
+  //   label: '推荐图片',
+  //   prop: 'image',
+  //   render(record) {
+  //     return h(ElAvatar, {
+  //       size: 48,
+  //       src: record.row.image,
+  //       shape: 'square',
+  //       fit: 'fill',
+  //     });
+  //   },
+  //   width: 120,
+  // },
   {
     label: '推荐标题',
     prop: 'typeTitle',
diff --git a/src/views/logger/emailLog/edit.vue b/src/views/logger/emailLog/edit.vue
index 954f1c1..3c1aac6 100644
--- a/src/views/logger/emailLog/edit.vue
+++ b/src/views/logger/emailLog/edit.vue
@@ -18,7 +18,7 @@
       <el-descriptions-item label="接收人类型:">{{
         getReviceType(formData.receiveType)
       }}</el-descriptions-item>
-      <el-descriptions-item label="请求耗时:">{{ formData.consumeTime }}s</el-descriptions-item>
+      <el-descriptions-item label="请求耗时:">{{ formData.consumeTime }}ms</el-descriptions-item>
       <el-descriptions-item label="业务类型:">{{
         formData.bizType ? (formData.bizType == 1 ? '订单' : '其他') : ''
       }}</el-descriptions-item>
diff --git a/src/views/logger/fileLog/edit.vue b/src/views/logger/fileLog/edit.vue
index 73583c5..957501c 100644
--- a/src/views/logger/fileLog/edit.vue
+++ b/src/views/logger/fileLog/edit.vue
@@ -16,7 +16,7 @@
         formData.fileType
       }}</el-descriptions-item>
       <el-descriptions-item label="文件大小:">{{ formData.fileSize }}B</el-descriptions-item>
-      <el-descriptions-item label="请求耗时:">{{ formData.consumeTime }}s</el-descriptions-item>
+      <el-descriptions-item label="请求耗时:">{{ formData.consumeTime }}ms</el-descriptions-item>
       <el-descriptions-item label="业务类型:">{{
         formData.bizType ? (formData.bizType == 1 ? '订单' : '其他') : ''
       }}</el-descriptions-item>
diff --git a/src/views/logger/smsLog/edit.vue b/src/views/logger/smsLog/edit.vue
index 930376d..5f1f463 100644
--- a/src/views/logger/smsLog/edit.vue
+++ b/src/views/logger/smsLog/edit.vue
@@ -21,7 +21,7 @@
       <el-descriptions-item label="接收人类型:">{{
         getReviceType(formData.receiveType)
       }}</el-descriptions-item>
-      <el-descriptions-item label="请求耗时:">{{ formData.consumeTime }}s</el-descriptions-item>
+      <el-descriptions-item label="请求耗时:">{{ formData.consumeTime }}ms</el-descriptions-item>
       <el-descriptions-item label="业务类型:">{{
         formData.bizType ? (formData.bizType == 1 ? '订单' : '其他') : ''
       }}</el-descriptions-item>
diff --git a/src/views/monitor/job/log/edit.vue b/src/views/monitor/job/log/edit.vue
index 5514fed..b778314 100644
--- a/src/views/monitor/job/log/edit.vue
+++ b/src/views/monitor/job/log/edit.vue
@@ -36,7 +36,7 @@
       <el-descriptions-item label="执行时间">
         {{ formData.createTime }}
       </el-descriptions-item>
-      <el-descriptions-item label="执行耗时"> {{ formData.consumeTime }}s </el-descriptions-item>
+      <el-descriptions-item label="执行耗时"> {{ formData.consumeTime }}ms </el-descriptions-item>
       <el-descriptions-item label="执行异常信息" :span="3">
         {{ formData.exceptionInfo }}
       </el-descriptions-item>
diff --git a/src/views/system/logger/loginLog/columns.ts b/src/views/system/logger/loginLog/columns.ts
index f59e3d2..28afe01 100644
--- a/src/views/system/logger/loginLog/columns.ts
+++ b/src/views/system/logger/loginLog/columns.ts
@@ -15,7 +15,7 @@ export const columns = [
     prop: 'username',
   },
   {
-    label: '请求ip',
+    label: '请求IP',
     prop: 'ip',
   },
   {
diff --git a/src/views/system/logger/loginLog/edit.vue b/src/views/system/logger/loginLog/edit.vue
index 70a4f93..f84ae32 100644
--- a/src/views/system/logger/loginLog/edit.vue
+++ b/src/views/system/logger/loginLog/edit.vue
@@ -19,7 +19,7 @@
       <el-descriptions-item label="操作浏览器">
         {{ formData.browser }}
       </el-descriptions-item>
-      <el-descriptions-item label="请求耗时"> {{ formData.consumeTime }}s </el-descriptions-item>
+      <el-descriptions-item label="请求耗时"> {{ formData.consumeTime }}ms </el-descriptions-item>
       <el-descriptions-item label="请求地区">
         {{ formData.location }}
       </el-descriptions-item>
diff --git a/src/views/system/logger/operLog/columns.ts b/src/views/system/logger/operLog/columns.ts
index 8195457..bf01666 100644
--- a/src/views/system/logger/operLog/columns.ts
+++ b/src/views/system/logger/operLog/columns.ts
@@ -19,7 +19,7 @@ export const columns = [
     prop: 'createUser',
   },
   {
-    label: '请求ip',
+    label: '请求IP',
     prop: 'ip',
   },
   {
diff --git a/src/views/system/logger/operLog/edit.vue b/src/views/system/logger/operLog/edit.vue
index fae423b..28be97a 100644
--- a/src/views/system/logger/operLog/edit.vue
+++ b/src/views/system/logger/operLog/edit.vue
@@ -13,19 +13,31 @@
       <el-descriptions-item label="操作用户" label-class-name="des-width">
         {{ formData.createUser }}
       </el-descriptions-item>
-      <el-descriptions-item label="IP地址">
+      <el-descriptions-item label="请求IP">
         {{ formData.ip }}
       </el-descriptions-item>
       <el-descriptions-item label="操作系统">
         {{ formData.os }}
       </el-descriptions-item>
-      <el-descriptions-item label="操作浏览器">
+      <el-descriptions-item label="浏览器">
         {{ formData.browser }}
       </el-descriptions-item>
-      <el-descriptions-item label="请求耗时"> {{ formData.consumeTime }}s </el-descriptions-item>
+      <el-descriptions-item label="操作类型">
+        {{ formData.typeText }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作来源">
+        {{ formData.sourceText }}
+      </el-descriptions-item>
       <el-descriptions-item label="请求方式">
         {{ formData.requestMethod }}
       </el-descriptions-item>
+      <el-descriptions-item label="请求URL">
+        {{ formData.url }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求耗时"> {{ formData.consumeTime }}ms </el-descriptions-item>
+      <el-descriptions-item label="请求地区">
+        {{ formData.location }}
+      </el-descriptions-item>
       <el-descriptions-item label="请求状态">
         <el-tag :type="formData.status ? 'danger' : 'success'">{{
           formData.status ? '异常' : '正常'
diff --git a/src/views/system/tenant/columns.ts b/src/views/system/tenant/columns.ts
index 1752d64..fa5d7a1 100644
--- a/src/views/system/tenant/columns.ts
+++ b/src/views/system/tenant/columns.ts
@@ -35,7 +35,7 @@ export const columns = [
   {
     label: '统一社会信用代码',
     prop: 'license',
-    width: 160,
+    width: 200,
   },
   {
     label: '租户限额',