修改已知的bug
This commit is contained in:
parent
aa46380dae
commit
6a5f411aac
|
@ -1,4 +1,4 @@
|
||||||
NODE_ENV=development
|
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_CAS_BASE_URL=http://cas.example.org:8443/cas
|
||||||
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
|
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
|
|
@ -71,7 +71,7 @@
|
||||||
import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
|
import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
|
||||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
||||||
import JEllipsis from "@/components/jeecg/JEllipsis";
|
import JEllipsis from "@/components/jeecg/JEllipsis";
|
||||||
import {deleteAction, postAction} from '@/api/manage'
|
import {deleteAction, postAction,getAction} from '@/api/manage'
|
||||||
export default {
|
export default {
|
||||||
name: "waterDocuments",
|
name: "waterDocuments",
|
||||||
mixins:[JeecgListMixin],
|
mixins:[JeecgListMixin],
|
||||||
|
|
|
@ -74,7 +74,7 @@
|
||||||
import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
|
import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
|
||||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
||||||
import JEllipsis from "@/components/jeecg/JEllipsis";
|
import JEllipsis from "@/components/jeecg/JEllipsis";
|
||||||
import {deleteAction, postAction} from '@/api/manage'
|
import {deleteAction, postAction,getAction} from '@/api/manage'
|
||||||
export default {
|
export default {
|
||||||
name: "waterDocuments",
|
name: "waterDocuments",
|
||||||
mixins:[JeecgListMixin],
|
mixins:[JeecgListMixin],
|
||||||
|
|
|
@ -46,6 +46,10 @@
|
||||||
<!-- <span slot="createTime" slot-scope="text, record">
|
<!-- <span slot="createTime" slot-scope="text, record">
|
||||||
{{ moment(text).format('YYYY-MM-DD') }}
|
{{ moment(text).format('YYYY-MM-DD') }}
|
||||||
</span> -->
|
</span> -->
|
||||||
|
<template slot="duplicationType" slot-scope="text">
|
||||||
|
<span v-if="text == 1" >完全去重</span>
|
||||||
|
<span v-if="text == 2">关键列去重</span>
|
||||||
|
</template>
|
||||||
<span slot="action" slot-scope="text, record">
|
<span slot="action" slot-scope="text, record">
|
||||||
<a @click="handleEdit(record)">配置</a>
|
<a @click="handleEdit(record)">配置</a>
|
||||||
<a-divider type="vertical" v-if="record.id" />
|
<a-divider type="vertical" v-if="record.id" />
|
||||||
|
@ -117,6 +121,7 @@ export default {
|
||||||
title: '去重类型',
|
title: '去重类型',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'duplicationType',
|
dataIndex: 'duplicationType',
|
||||||
|
scopedSlots: { customRender: 'duplicationType' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '创建时间',
|
title: '创建时间',
|
||||||
|
|
|
@ -91,14 +91,6 @@
|
||||||
return {
|
return {
|
||||||
description: '数据库恢复',
|
description: '数据库恢复',
|
||||||
dataSource: [
|
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:"",
|
schemaName:"",
|
||||||
allSchemaName:[],
|
allSchemaName:[],
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="4" :sm="8">
|
||||||
<a-form-item label="登录地址">
|
<a-form-item label="登录地址">
|
||||||
<a-input placeholder="请输入" v-model="queryParam.keyWord"></a-input>
|
<a-input placeholder="请输入" v-model="queryParam.ipInfo"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="4" :sm="8">
|
||||||
|
@ -14,11 +14,6 @@
|
||||||
<a-input placeholder="请输入" v-model="queryParam.keyWord"></a-input>
|
<a-input placeholder="请输入" v-model="queryParam.keyWord"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="4" :sm="8">
|
|
||||||
<a-form-item label="登录状态">
|
|
||||||
<a-input placeholder="请输入" v-model="queryParam.keyWord"></a-input>
|
|
||||||
</a-form-item>
|
|
||||||
</a-col>
|
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="4" :sm="8">
|
||||||
<a-form-item label="开始日期">
|
<a-form-item label="开始日期">
|
||||||
<a-date-picker v-model="queryParam.startTime" />
|
<a-date-picker v-model="queryParam.startTime" />
|
||||||
|
@ -46,13 +41,6 @@
|
||||||
<div style="height:calc(100vh - 316px);background: #e6e9f1;overflow:hidden;padding: 15px;">
|
<div style="height:calc(100vh - 316px);background: #e6e9f1;overflow:hidden;padding: 15px;">
|
||||||
<a-table ref="table" size="middle" rowKey="id" :columns="columns" :dataSource="dataSource"
|
<a-table ref="table" size="middle" rowKey="id" :columns="columns" :dataSource="dataSource"
|
||||||
:pagination="ipagination" :loading="loading" @change="handleTableChange">
|
:pagination="ipagination" :loading="loading" @change="handleTableChange">
|
||||||
|
|
||||||
<div v-show="queryParam.logType == 2" slot="expandedRowRender" slot-scope="record" style="margin: 0">
|
|
||||||
<div style="margin-bottom: 5px"><a-badge status="success" style="vertical-align: middle;" /><span
|
|
||||||
style="vertical-align: middle;">请求方法:{{ record.method }}</span></div>
|
|
||||||
<div><a-badge status="processing" style="vertical-align: middle;" /><span
|
|
||||||
style="vertical-align: middle;">请求参数:{{ record.requestParam }}</span></div>
|
|
||||||
</div>
|
|
||||||
<!-- 字符串超长截取省略号显示-->
|
<!-- 字符串超长截取省略号显示-->
|
||||||
<span slot="logContent" slot-scope="text, record">
|
<span slot="logContent" slot-scope="text, record">
|
||||||
<j-ellipsis :value="text" :length="40" />
|
<j-ellipsis :value="text" :length="40" />
|
||||||
|
@ -101,38 +89,27 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '登录名称',
|
title: '登录用户',
|
||||||
align: "left",
|
align: "left",
|
||||||
dataIndex: 'logContent',
|
dataIndex: 'userid',
|
||||||
scopedSlots: { customRender: 'logContent' },
|
scopedSlots: { customRender: 'logContent' },
|
||||||
sorter: true
|
sorter: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '登录地址',
|
title: '用户名称',
|
||||||
dataIndex: 'userid',
|
|
||||||
align: "center",
|
|
||||||
sorter: true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '浏览器',
|
|
||||||
dataIndex: 'username',
|
dataIndex: 'username',
|
||||||
align: "center",
|
align: "center",
|
||||||
sorter: true
|
sorter: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作系统',
|
title: '登录地址',
|
||||||
dataIndex: 'ip',
|
dataIndex: 'ip',
|
||||||
align: "center",
|
align: "center",
|
||||||
sorter: true
|
sorter: true
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '登录状态',
|
|
||||||
dataIndex: 'logType_dictText',
|
|
||||||
align: "center",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: '操作信息',
|
title: '操作信息',
|
||||||
dataIndex: 'costTime',
|
dataIndex: 'logContent',
|
||||||
align: "center",
|
align: "center",
|
||||||
sorter: true
|
sorter: true
|
||||||
},
|
},
|
||||||
|
@ -187,7 +164,12 @@ export default {
|
||||||
searchReset() {
|
searchReset() {
|
||||||
var that = this;
|
var that = this;
|
||||||
var logType = that.queryParam.logType;
|
var logType = that.queryParam.logType;
|
||||||
that.queryParam = {}; //清空查询区域参数
|
that.queryParam = {
|
||||||
|
ipInfo: '',
|
||||||
|
createTimeRange: [],
|
||||||
|
logType: '1',
|
||||||
|
keyWord: '',
|
||||||
|
}; //清空查询区域参数
|
||||||
that.queryParam.logType = logType;
|
that.queryParam.logType = logType;
|
||||||
that.loadData(this.ipagination.current);
|
that.loadData(this.ipagination.current);
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue
Block a user