From aa9b96a9c100ca4d6f040c9025bcd8eaf8964f41 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Wed, 21 Aug 2024 12:56:07 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orion-visor-ui/src/api/system/menu.ts         |  2 +-
 orion-visor-ui/src/api/user/auth.ts           |  4 ++--
 .../components/dict-value-table.vue           | 18 +++++++++++------
 .../components/operator-log-simple-table.vue  | 20 +++++++++++++++++--
 .../components/operator-log-table.vue         | 20 +++++++++++++++++--
 .../user/operator-log/types/table.columns.ts  |  1 -
 6 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/orion-visor-ui/src/api/system/menu.ts b/orion-visor-ui/src/api/system/menu.ts
index 2c841391..cbd32818 100644
--- a/orion-visor-ui/src/api/system/menu.ts
+++ b/orion-visor-ui/src/api/system/menu.ts
@@ -93,5 +93,5 @@ export function deleteMenu(id: number) {
  * 刷新缓存
  */
 export function refreshCache() {
-  return axios.put('/infra/permission/refresh-cache');
+  return axios.put('/infra/user-permission/refresh-cache');
 }
diff --git a/orion-visor-ui/src/api/user/auth.ts b/orion-visor-ui/src/api/user/auth.ts
index f41560ce..0c50310f 100644
--- a/orion-visor-ui/src/api/user/auth.ts
+++ b/orion-visor-ui/src/api/user/auth.ts
@@ -50,12 +50,12 @@ export function logout() {
  * 获取用户信息
  */
 export function getUserPermission() {
-  return axios.get<UserPermissionResponse>('/infra/permission/user');
+  return axios.get<UserPermissionResponse>('/infra/user-permission/user');
 }
 
 /**
  * 获取菜单列表
  */
 export function getMenuList() {
-  return axios.get<Array<MenuQueryResponse>>('/infra/permission/menu');
+  return axios.get<Array<MenuQueryResponse>>('/infra/user-permission/menu');
 }
diff --git a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
index edcf5555..f8aeb146 100644
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -83,15 +83,21 @@
       <template #keyName="{record}">
         {{ record.keyName }}<span style="margin: 0 4px;">-</span>{{ record.keyDescription }}
       </template>
-      <!-- 值 -->
+      <!-- 配置值 -->
       <template #value="{ record }">
-        <span class="copy-left" title="复制" @click="copy(record.value)">
-          <icon-copy />
-        </span>
-        <a-tooltip position="tl" :content="record.value">
-          <span>{{ record.value }}</span>
+        <a-tooltip position="tl"
+                   :content="record.value"
+                   @click="copy(record.value, true)">
+          <span class="text-copy">{{ record.value }}</span>
         </a-tooltip>
       </template>
+      <!-- 额外参数 -->
+      <template #extra="{ record }">
+        <span class="text-copy"
+              @click="copy(record.extra, true)">
+          {{ record.extra }}
+        </span>
+      </template>
       <!-- 操作 -->
       <template #handle="{ record }">
         <div class="table-handle-wrapper">
diff --git a/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue b/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue
index 74150a7a..f48a67e9 100644
--- a/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue
+++ b/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue
@@ -29,8 +29,20 @@
     </template>
     <!-- 操作日志 -->
     <template #originLogInfo="{ record }">
-      <icon-copy class="copy-left" @click="copy(record.originLogInfo, true)" />
-      <span v-html="replaceHtmlTag(record.logInfo)" />
+      <!-- 操作日志 -->
+      <a-tooltip position="tl"
+                 :content="record.originLogInfo">
+        <span v-html="replaceHtmlTag(record.logInfo)"
+              class="text-copy"
+              @click="copy(record.originLogInfo, true)" />
+      </a-tooltip>
+      <!-- 错误消息 -->
+      <br v-if="record.errorMessage">
+      <span v-if="record.errorMessage"
+            class="table-cell-sub-value text-copy error-message"
+            @click="copy(record.errorMessage, true)">
+        {{ record.errorMessage }}
+      </span>
     </template>
     <!-- 留痕地址 -->
     <template #address="{ record }">
@@ -170,4 +182,8 @@
 </script>
 
 <style lang="less" scoped>
+  .error-message {
+    color: rgb(var(--red-6));
+    font-size: 12px;
+  }
 </style>
diff --git a/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue b/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
index 5e2040f2..83a46aad 100644
--- a/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
+++ b/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
@@ -77,8 +77,20 @@
       </template>
       <!-- 操作日志 -->
       <template #originLogInfo="{ record }">
-        <icon-copy class="copy-left" @click="copy(record.originLogInfo, true)" />
-        <span v-html="replaceHtmlTag(record.logInfo)" />
+        <!-- 操作日志 -->
+        <a-tooltip position="tl"
+                   :content="record.originLogInfo">
+          <span v-html="replaceHtmlTag(record.logInfo)"
+                class="text-copy"
+                @click="copy(record.originLogInfo, true)" />
+        </a-tooltip>
+        <!-- 错误消息 -->
+        <br v-if="record.errorMessage">
+        <span v-if="record.errorMessage"
+              class="table-cell-sub-value text-copy error-message"
+              @click="copy(record.errorMessage, true)">
+          {{ record.errorMessage }}
+        </span>
       </template>
       <!-- 留痕地址 -->
       <template #address="{ record }">
@@ -226,4 +238,8 @@
 </script>
 
 <style lang="less" scoped>
+  .error-message {
+    color: rgb(var(--red-6));
+    font-size: 12px;
+  }
 </style>
diff --git a/orion-visor-ui/src/views/user/operator-log/types/table.columns.ts b/orion-visor-ui/src/views/user/operator-log/types/table.columns.ts
index 0db442a4..2c3c1a1e 100644
--- a/orion-visor-ui/src/views/user/operator-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/user/operator-log/types/table.columns.ts
@@ -33,7 +33,6 @@ const columns = [
     minWidth: 238,
     align: 'left',
     ellipsis: true,
-    tooltip: true,
   }, {
     title: '留痕地址',
     dataIndex: 'address',