Skip to content

Commit 8f8edc9

Browse files
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
2 parents 6772568 + 283a9d0 commit 8f8edc9

File tree

22 files changed

+122
-525
lines changed

22 files changed

+122
-525
lines changed

src/api/infra/apiAccessLog/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ export interface ApiAccessLogVO {
88
applicationName: string
99
requestMethod: string
1010
requestParams: string
11+
responseBody: string
1112
requestUrl: string
1213
userIp: string
1314
userAgent: string
15+
operateModule: string
16+
operateName: string
17+
operateType: number
1418
beginTime: Date
15-
endTIme: Date
19+
endTime: Date
1620
duration: number
1721
resultCode: number
1822
resultMsg: string

src/api/report/ureport/index.ts

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/api/system/operatelog/index.ts

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,6 @@ import request from '@/config/axios'
22

33
export type OperateLogVO = {
44
id: number
5-
userNickname: string
6-
traceId: string
7-
userId: number
8-
module: string
9-
name: string
10-
type: number
11-
content: string
12-
exts: Map<String, Object>
13-
requestMethod: string
14-
requestUrl: string
15-
userIp: string
16-
userAgent: string
17-
javaMethod: string
18-
javaMethodArgs: string
19-
startTime: Date
20-
duration: number
21-
resultCode: number
22-
resultMsg: string
23-
resultData: string
24-
}
25-
26-
export type OperateLogV2VO = {
27-
id: number
28-
userNickname: string
295
traceId: string
306
userType: number
317
userId: number
@@ -42,18 +18,13 @@ export type OperateLogV2VO = {
4218
creator: string
4319
creatorName: string
4420
createTime: Date
45-
// 数据扩展,渲染时使用
46-
title: string // 操作标题(如果为空则取 name 值)
47-
colSize: number // 变更记录行数
48-
contentStrList: string[]
49-
tagsContentList: string[]
5021
}
5122

5223
// 查询操作日志列表
5324
export const getOperateLogPage = (params: PageParam) => {
5425
return request.get({ url: '/system/operate-log/page', params })
5526
}
5627
// 导出操作日志
57-
export const exportOperateLog = (params) => {
28+
export const exportOperateLog = (params: any) => {
5829
return request.download({ url: '/system/operate-log/export', params })
5930
}

src/components/OperateLogV2/src/OperateLogV2.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
</template>
2424

2525
<script lang="ts" setup>
26-
import { OperateLogV2VO } from '@/api/system/operatelog'
26+
import { OperateLogVO } from '@/api/system/operatelog'
2727
import { formatDate } from '@/utils/formatTime'
2828
import { DICT_TYPE, getDictLabel, getDictObj } from '@/utils/dict'
2929
import { ElTag } from 'element-plus'
3030
3131
defineOptions({ name: 'OperateLogV2' })
3232
3333
interface Props {
34-
logList: OperateLogV2VO[] // 操作日志列表
34+
logList: OperateLogVO[] // 操作日志列表
3535
}
3636
3737
withDefaults(defineProps<Props>(), {

src/utils/dict.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ export enum DICT_TYPE {
112112
SYSTEM_ROLE_TYPE = 'system_role_type',
113113
SYSTEM_DATA_SCOPE = 'system_data_scope',
114114
SYSTEM_NOTICE_TYPE = 'system_notice_type',
115-
SYSTEM_OPERATE_TYPE = 'system_operate_type',
116115
SYSTEM_LOGIN_TYPE = 'system_login_type',
117116
SYSTEM_LOGIN_RESULT = 'system_login_result',
118117
SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code',
@@ -135,6 +134,7 @@ export enum DICT_TYPE {
135134
INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
136135
INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
137136
INFRA_FILE_STORAGE = 'infra_file_storage',
137+
INFRA_OPERATE_TYPE = 'infra_operate_type',
138138

139139
// ========== BPM 模块 ==========
140140
BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',

src/views/crm/business/detail/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import BusinessDetailsHeader from './BusinessDetailsHeader.vue'
6464
import BusinessDetailsInfo from './BusinessDetailsInfo.vue'
6565
import PermissionList from '@/views/crm/permission/components/PermissionList.vue' // 团队成员列表(权限)
6666
import { BizTypeEnum } from '@/api/crm/permission'
67-
import { OperateLogV2VO } from '@/api/system/operatelog'
67+
import { OperateLogVO } from '@/api/system/operatelog'
6868
import { getOperateLogPage } from '@/api/crm/operateLog'
6969
import BusinessForm from '@/views/crm/business/BusinessForm.vue'
7070
import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
@@ -113,7 +113,7 @@ const transfer = () => {
113113
}
114114
115115
/** 获取操作日志 */
116-
const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
116+
const logList = ref<OperateLogVO[]>([]) // 操作日志列表
117117
const getOperateLog = async (contactId: number) => {
118118
if (!contactId) {
119119
return

src/views/crm/clue/detail/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import PermissionList from '@/views/crm/permission/components/PermissionList.vue
5757
import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
5858
import FollowUpList from '@/views/crm/followup/index.vue'
5959
import { BizTypeEnum } from '@/api/crm/permission'
60-
import type { OperateLogV2VO } from '@/api/system/operatelog'
60+
import type { OperateLogVO } from '@/api/system/operatelog'
6161
import { getOperateLogPage } from '@/api/crm/operateLog'
6262
6363
defineOptions({ name: 'CrmClueDetail' })
@@ -103,7 +103,7 @@ const handleTransform = async () => {
103103
}
104104
105105
/** 获取操作日志 */
106-
const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
106+
const logList = ref<OperateLogVO[]>([]) // 操作日志列表
107107
const getOperateLog = async () => {
108108
const data = await getOperateLogPage({
109109
bizType: BizTypeEnum.CRM_CLUE,

src/views/crm/contact/detail/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import ContactDetailsInfo from '@/views/crm/contact/detail/ContactDetailsInfo.vu
4949
import BusinessList from '@/views/crm/business/components/BusinessList.vue' // 商机列表
5050
import PermissionList from '@/views/crm/permission/components/PermissionList.vue' // 团队成员列表(权限)
5151
import { BizTypeEnum } from '@/api/crm/permission'
52-
import { OperateLogV2VO } from '@/api/system/operatelog'
52+
import { OperateLogVO } from '@/api/system/operatelog'
5353
import { getOperateLogPage } from '@/api/crm/operateLog'
5454
import ContactForm from '@/views/crm/contact/ContactForm.vue'
5555
import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
@@ -88,7 +88,7 @@ const transfer = () => {
8888
}
8989
9090
/** 获取操作日志 */
91-
const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
91+
const logList = ref<OperateLogVO[]>([]) // 操作日志列表
9292
const getOperateLog = async (contactId: number) => {
9393
if (!contactId) {
9494
return

src/views/crm/contract/detail/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</template>
5353
<script lang="ts" setup>
5454
import { useTagsViewStore } from '@/store/modules/tagsView'
55-
import { OperateLogV2VO } from '@/api/system/operatelog'
55+
import { OperateLogVO } from '@/api/system/operatelog'
5656
import * as ContractApi from '@/api/crm/contract'
5757
import ContractDetailsInfo from './ContractDetailsInfo.vue'
5858
import ContractDetailsHeader from './ContractDetailsHeader.vue'
@@ -94,7 +94,7 @@ const getContractData = async () => {
9494
}
9595
9696
/** 获取操作日志 */
97-
const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
97+
const logList = ref<OperateLogVO[]>([]) // 操作日志列表
9898
const getOperateLog = async (contractId: number) => {
9999
if (!contractId) {
100100
return

src/views/crm/customer/detail/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ import PermissionList from '@/views/crm/permission/components/PermissionList.vue
9393
import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
9494
import FollowUpList from '@/views/crm/followup/index.vue'
9595
import { BizTypeEnum } from '@/api/crm/permission'
96-
import type { OperateLogV2VO } from '@/api/system/operatelog'
96+
import type { OperateLogVO } from '@/api/system/operatelog'
9797
import { getOperateLogPage } from '@/api/crm/operateLog'
9898
import CustomerDistributeForm from '@/views/crm/customer/pool/CustomerDistributeForm.vue'
9999
@@ -185,7 +185,7 @@ const handlePutPool = async () => {
185185
}
186186
187187
/** 获取操作日志 */
188-
const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
188+
const logList = ref<OperateLogVO[]>([]) // 操作日志列表
189189
const getOperateLog = async () => {
190190
if (!customerId.value) {
191191
return

0 commit comments

Comments
 (0)