fix

src/views/message/message-record/email-record.tsx

@@ -5,6 +5,7 @@ import Pagination from '@components/pagination'
 import {getSelectDataFromObj} from '@/utils/objectUtil'
 import {clientType, messageSenderFunctionModule} from '@/utils/constant'
 import {sysMessagePage} from "@views/message/api";
+import TheTooltip from "@components/TheTooltip";
 
 export default defineComponent({
   name: 'email-record',
@@ -87,23 +88,22 @@ export default defineComponent({
         },
         {
           title: '发送平台',
-          key: 'sendTime'
+          key: 'senderName'
         },
         {
           title: '收件人地址',
-          key: 'username'
+          key: 'receiver'
         },
         {
           title: '标题',
-          key: 'username'
-        },
-        {
-          title: '正文',
           key: 'title'
         },
         {
-          title: '附件',
-          key: 'title'
+          title: '正文',
+          key: 'content',
+          render: (row: any) => {
+            return <TheTooltip showContentWidth={300} content={row.content}/>
+          }
         },
         {
           title: '触发条件',

src/views/message/message-record/push-record.tsx

@@ -5,7 +5,7 @@ import Pagination from '@components/pagination'
 import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
 import {clientType, messageSenderFunctionModule} from '@/utils/constant'
 import {getTimes} from "@/utils/dateUtil";
-import {sysMessageConfigPage} from "@views/message/api";
+import {sysMessageConfigPage, sysMessagePage} from "@views/message/api";
 
 export default defineComponent({
   name: 'push-record',
@@ -63,7 +63,7 @@ export default defineComponent({
     const getList = async () => {
       try {
         state.loading = true
-        const {data} = await sysMessageConfigPage({
+        const {data} = await sysMessagePage({
           ...state.pagination,
           title: state.searchForm.title,
           clientId: state.searchForm.clientId,
@@ -91,7 +91,7 @@ export default defineComponent({
         },
         {
           title: '发送平台',
-          key: 'sender'
+          key: 'senderName'
         },
         {
           title: '姓名',
@@ -114,7 +114,14 @@ export default defineComponent({
         },
         {
           title: '功能模块',
-          key: 'messageType'
+          key: 'group',
+          render: (row: any) => {
+            return (
+                <div>
+                  {getMapValueByKey(row.group, new Map(Object.entries(messageSenderFunctionModule)))}
+                </div>
+            )
+          }
         },
         {
           title: '触发条件',

src/views/message/message-record/wechat-record.tsx

@@ -6,7 +6,7 @@ import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
 import {clientType, messageSenderFunctionModule, musicSheetSourceType} from '@/utils/constant'
 import TheTooltip from "@components/TheTooltip";
 import {getOwnerName} from "@views/music-library/musicUtil";
-import {sysMessageConfigPage} from "@views/message/api";
+import {sysMessageConfigPage, sysMessagePage} from "@views/message/api";
 
 export default defineComponent({
   name: 'wechat-record',
@@ -64,7 +64,7 @@ export default defineComponent({
     const getList = async () => {
       try {
         state.loading = true
-        const {data} = await sysMessageConfigPage({
+        const {data} = await sysMessagePage({
           ...state.pagination,
           ...state.searchForm,
           appKey: props.appKey,
@@ -88,12 +88,16 @@ export default defineComponent({
           key: 'sendTime'
         },
         {
+          title: '发送平台',
+          key: 'senderName'
+        },
+        {
           title: '姓名',
           key: 'username'
         },
         {
           title: 'openID',
-          key: 'openId'
+          key: 'receiver'
         },
         {
           title: '消息名称',
@@ -134,7 +138,14 @@ export default defineComponent({
         },
         {
           title: '功能模块',
-          key: 'messageType'
+          key: 'group',
+          render: (row: any) => {
+            return (
+                <div>
+                  {getMapValueByKey(row.group, new Map(Object.entries(messageSenderFunctionModule)))}
+                </div>
+            )
+          }
         },
         {
           title: '触发条件',
@@ -177,25 +188,25 @@ export default defineComponent({
                     clearable
                 ></NSelect>
               </NFormItem>
-              <NFormItem label="状态" path="status">
-                <NSelect
-                    v-model:value={state.searchForm.status}
-                    placeholder="请选择状态"
-                    options={
-                      [
-                        {
-                          label: '启用',
-                          value: true
-                        },
-                        {
-                          label: '停用',
-                          value: false
-                        }
-                      ] as any
-                    }
-                    clearable
-                />
-              </NFormItem>
+              {/*<NFormItem label="状态" path="status">*/}
+              {/*  <NSelect*/}
+              {/*      v-model:value={state.searchForm.status}*/}
+              {/*      placeholder="请选择状态"*/}
+              {/*      options={*/}
+              {/*        [*/}
+              {/*          {*/}
+              {/*            label: '启用',*/}
+              {/*            value: true*/}
+              {/*          },*/}
+              {/*          {*/}
+              {/*            label: '停用',*/}
+              {/*            value: false*/}
+              {/*          }*/}
+              {/*        ] as any*/}
+              {/*      }*/}
+              {/*      clearable*/}
+              {/*  />*/}
+              {/*</NFormItem>*/}
               <NFormItem>
                 <NSpace>
                   <NButton type="primary" onClick={onSearch}>