From 2e276c26c68cf4ee879c990ed0afd3e28a3888ae Mon Sep 17 00:00:00 2001
From: shizhongming <zhongming4762@hotmail.com>
Date: Fri, 16 Feb 2024 15:17:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E6=A8=A1=E5=9D=97-?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF):=20=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/SysExceptionListView.api.ts     |  9 +++
 .../exception/SysExceptionListView.config.ts  |  5 +-
 .../views/exception/SysExceptionListView.vue  | 55 ++++++++++++++++++-
 .../system/views/exception/lang/en_US.ts      | 11 +++-
 .../system/views/exception/lang/zh_CN.ts      | 13 ++++-
 .../views/userGroup/UserGroupListView.vue     |  1 +
 6 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/src/modules/system/views/exception/SysExceptionListView.api.ts b/src/modules/system/views/exception/SysExceptionListView.api.ts
index 935cfab83..2e277e9bc 100644
--- a/src/modules/system/views/exception/SysExceptionListView.api.ts
+++ b/src/modules/system/views/exception/SysExceptionListView.api.ts
@@ -3,6 +3,7 @@ import { ApiServiceEnum, defHttp } from '@/utils/http/axios';
 enum Api {
   list = 'sys/exception/list',
   getById = 'sys/exception/getById',
+  markResolved = 'sys/exception/markResolved',
 }
 
 export const listApi = (params) => {
@@ -20,3 +21,11 @@ export const getById = (id) => {
     data: id,
   });
 };
+
+export const markResolvedApi = (data) => {
+  return defHttp.post({
+    service: ApiServiceEnum.SMART_SYSTEM,
+    url: Api.markResolved,
+    data,
+  });
+};
diff --git a/src/modules/system/views/exception/SysExceptionListView.config.ts b/src/modules/system/views/exception/SysExceptionListView.config.ts
index 969feb231..ce0ec2b6c 100644
--- a/src/modules/system/views/exception/SysExceptionListView.config.ts
+++ b/src/modules/system/views/exception/SysExceptionListView.config.ts
@@ -37,7 +37,7 @@ export const getTableColumns = (): SmartColumn[] => {
       width: 200,
     },
     {
-      field: 'operateBy',
+      field: 'operationBy',
       title: '{system.views.exception.title.operateUser}',
       width: 120,
     },
@@ -76,6 +76,9 @@ export const getTableColumns = (): SmartColumn[] => {
       field: 'resolvedUserId',
       title: '{system.views.exception.title.resolvedUserId}',
       width: 120,
+      formatter({ row }) {
+        return row.resolvedUser?.fullName;
+      },
     },
     {
       field: 'resolvedTime',
diff --git a/src/modules/system/views/exception/SysExceptionListView.vue b/src/modules/system/views/exception/SysExceptionListView.vue
index 247cef71c..f8f7075ab 100644
--- a/src/modules/system/views/exception/SysExceptionListView.vue
+++ b/src/modules/system/views/exception/SysExceptionListView.vue
@@ -9,7 +9,7 @@
   </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="tsx" setup>
   import {
     useSmartTable,
     SmartTable,
@@ -19,10 +19,13 @@
   import { useModal } from '@/components/Modal';
   import { useI18n } from '@/hooks/web/useI18n';
   import { useSizeSetting } from '@/hooks/setting/UseSizeSetting';
+  import { Textarea } from 'ant-design-vue';
 
   import { getSearchFormSchemas, getTableColumns } from './SysExceptionListView.config';
-  import { listApi } from './SysExceptionListView.api';
+  import { listApi, markResolvedApi } from './SysExceptionListView.api';
   import ExceptionDetailModal from './components/ExceptionDetailModal.vue';
+  import { createConfirm, successMessage, warnMessage } from '@/utils/message/SystemNotice';
+  import { ref, unref } from 'vue';
 
   const { t } = useI18n();
   const { getTableSize } = useSizeSetting();
@@ -40,7 +43,42 @@
 
   const [registerModal, { openModal }] = useModal();
 
-  const [registerTable] = useSmartTable({
+  const resolvedMessageRef = ref('');
+  /**
+   * 标记已处理
+   */
+  const handlerMarkResolved = () => {
+    const selectRows = getCheckboxRecords();
+    console.log(selectRows);
+    if (selectRows.length === 0) {
+      warnMessage(t('system.views.exception.message.noSelect'));
+      return false;
+    }
+    resolvedMessageRef.value = '';
+    createConfirm({
+      iconType: 'warning',
+      title: t('system.views.exception.button.markResolved'),
+      content: () => {
+        return (
+          <Textarea
+            rows={4}
+            v-model={[resolvedMessageRef.value, 'value']}
+            placeholder={t('system.views.exception.validate.resolvedMessage')}
+          />
+        );
+      },
+      onOk: async () => {
+        await markResolvedApi({
+          resolvedMessage: unref(resolvedMessageRef),
+          exceptionIdList: selectRows.map((item) => item.id),
+        });
+        successMessage(t('system.views.exception.message.resolvedSuccess'));
+        query();
+      },
+    });
+  };
+
+  const [registerTable, { getCheckboxRecords, query }] = useSmartTable({
     id: 'smart-system-tool-exception',
     customConfig: { storage: true },
     border: true,
@@ -63,6 +101,17 @@
       refresh: true,
       zoom: true,
       column: { columnOrder: true },
+      buttons: [
+        {
+          name: t('system.views.exception.button.markResolved'),
+          customRender: 'ant',
+          props: {
+            type: 'primary',
+            preIcon: 'ant-design:check-outlined',
+            onClick: handlerMarkResolved,
+          },
+        },
+      ],
     },
     sortConfig: {
       remote: true,
diff --git a/src/modules/system/views/exception/lang/en_US.ts b/src/modules/system/views/exception/lang/en_US.ts
index 727a9fc28..a12d707cb 100644
--- a/src/modules/system/views/exception/lang/en_US.ts
+++ b/src/modules/system/views/exception/lang/en_US.ts
@@ -21,12 +21,21 @@ export default {
       showStackTrace: 'Show stackTrace',
       stackTrace: 'Stack trace',
     },
-    validate: {},
+    validate: {
+      resolvedMessage: 'Please enter processing information',
+    },
     rules: {},
     search: {
       exceptionMessage: 'Please select the error message',
       requestIp: 'Please select the request IP',
       serverIp: 'Please select the server IP',
     },
+    button: {
+      markResolved: 'Processed',
+    },
+    message: {
+      noSelect: 'Please select record',
+      resolvedSuccess: 'Mark success',
+    },
   },
 };
diff --git a/src/modules/system/views/exception/lang/zh_CN.ts b/src/modules/system/views/exception/lang/zh_CN.ts
index 38bda3aeb..87dbd2c3e 100644
--- a/src/modules/system/views/exception/lang/zh_CN.ts
+++ b/src/modules/system/views/exception/lang/zh_CN.ts
@@ -16,17 +16,26 @@ export default {
       feedbackTime: '反馈时间',
       resolved: '是否已处理',
       resolvedMessage: '处理信息',
-      resolvedUserId: '处理人员ID',
+      resolvedUserId: '处理人员',
       resolvedTime: '处理时间',
       showStackTrace: '查看堆栈信息',
       stackTrace: '堆栈信息',
     },
-    validate: {},
+    validate: {
+      resolvedMessage: '请输入处理信息',
+    },
     rules: {},
     search: {
       exceptionMessage: '请输入异常信息',
       requestIp: '请输入请求IP',
       serverIp: '请输入服务器IP',
     },
+    button: {
+      markResolved: '标记已处理',
+    },
+    message: {
+      noSelect: '请选择记录',
+      resolvedSuccess: '标记成功',
+    },
   },
 };
diff --git a/src/modules/system/views/userGroup/UserGroupListView.vue b/src/modules/system/views/userGroup/UserGroupListView.vue
index 197a37404..2b3749b93 100644
--- a/src/modules/system/views/userGroup/UserGroupListView.vue
+++ b/src/modules/system/views/userGroup/UserGroupListView.vue
@@ -85,6 +85,7 @@
       actionColOptions: {
         span: undefined,
       },
+      compact: true,
     },
     addEditConfig: {
       formConfig: {