diff --git a/.env.development b/.env.development index 0a6098f..5aef017 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://rcproject.natapp1.cc/jeecg-boot +VUE_APP_API_BASE_URL=http://pbl.natapp1.cc/jeecg-boot VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/src/views/datalink/Marines.vue b/src/views/datalink/Marines.vue index 5fe85b2..3f63a0c 100644 --- a/src/views/datalink/Marines.vue +++ b/src/views/datalink/Marines.vue @@ -71,7 +71,7 @@ import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import JEllipsis from "@/components/jeecg/JEllipsis"; - import {deleteAction, postAction} from '@/api/manage' + import {deleteAction, postAction,getAction} from '@/api/manage' export default { name: "waterDocuments", mixins:[JeecgListMixin], diff --git a/src/views/datalink/carrierBased.vue b/src/views/datalink/carrierBased.vue index 3e0c722..555c5ac 100644 --- a/src/views/datalink/carrierBased.vue +++ b/src/views/datalink/carrierBased.vue @@ -74,7 +74,7 @@ import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import JEllipsis from "@/components/jeecg/JEllipsis"; - import {deleteAction, postAction} from '@/api/manage' + import {deleteAction, postAction,getAction} from '@/api/manage' export default { name: "waterDocuments", mixins:[JeecgListMixin], diff --git a/src/views/datawashing/deEmphasisRules/index.vue b/src/views/datawashing/deEmphasisRules/index.vue index bfac946..12d57bd 100644 --- a/src/views/datawashing/deEmphasisRules/index.vue +++ b/src/views/datawashing/deEmphasisRules/index.vue @@ -46,6 +46,10 @@ + 配置 @@ -117,6 +121,7 @@ export default { title: '去重类型', align: "center", dataIndex: 'duplicationType', + scopedSlots: { customRender: 'duplicationType' }, }, { title: '创建时间', diff --git a/src/views/securityAndBackup/recovery.vue b/src/views/securityAndBackup/recovery.vue index ba891cf..27c0e27 100644 --- a/src/views/securityAndBackup/recovery.vue +++ b/src/views/securityAndBackup/recovery.vue @@ -91,14 +91,6 @@ return { description: '数据库恢复', dataSource: [ - { - id:"1", - name:"第一次备份", - createTime:"2024-03-06 10:30:26", - startTime:"2024-03-06 10:30:26", - startTime:"2024-03-06 15:30:26", - Status:0 - } ], schemaName:"", allSchemaName:[], diff --git a/src/views/system/LogList.vue b/src/views/system/LogList.vue index 9d74d2e..7536b5f 100644 --- a/src/views/system/LogList.vue +++ b/src/views/system/LogList.vue @@ -6,7 +6,7 @@ - + @@ -14,11 +14,6 @@ - - - - - @@ -46,13 +41,6 @@
- -
-
请求方法:{{ record.method }}
-
请求参数:{{ record.requestParam }}
-
@@ -101,38 +89,27 @@ export default { } }, { - title: '登录名称', + title: '登录用户', align: "left", - dataIndex: 'logContent', + dataIndex: 'userid', scopedSlots: { customRender: 'logContent' }, sorter: true }, { - title: '登录地址', - dataIndex: 'userid', - align: "center", - sorter: true - }, - { - title: '浏览器', + title: '用户名称', dataIndex: 'username', align: "center", sorter: true }, { - title: '操作系统', + title: '登录地址', dataIndex: 'ip', align: "center", sorter: true }, - { - title: '登录状态', - dataIndex: 'logType_dictText', - align: "center", - }, { title: '操作信息', - dataIndex: 'costTime', + dataIndex: 'logContent', align: "center", sorter: true }, @@ -187,7 +164,12 @@ export default { searchReset() { var that = this; var logType = that.queryParam.logType; - that.queryParam = {}; //清空查询区域参数 + that.queryParam = { + ipInfo: '', + createTimeRange: [], + logType: '1', + keyWord: '', + }; //清空查询区域参数 that.queryParam.logType = logType; that.loadData(this.ipagination.current); },