From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/debugtable/index.jsx | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/debugtable/index.jsx b/src/tabviews/debugtable/index.jsx
index b6833f5..155332e 100644
--- a/src/tabviews/debugtable/index.jsx
+++ b/src/tabviews/debugtable/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import { is, fromJS } from 'immutable'
-import { notification, Table} from 'antd'
-import { RedoOutlined } from '@ant-design/icons'
+import { notification, Table, Button} from 'antd'
import Api from '@/api'
import MKEmitter from '@/utils/events.js'
@@ -12,7 +11,7 @@
class DebugTable extends Component {
state = {
columns: [
- {align: 'left', dataIndex: 'Sort', sorter: false, title: 'Sort', width: 120},
+ {align: 'left', dataIndex: 'Sort', sorter: false, title: 'Sort', width: 60},
{align: 'left', dataIndex: 'CDefine1', sorter: false, title: '鏂囨湰1', width: 120},
{align: 'left', dataIndex: 'CDefine2', sorter: false, title: '鏂囨湰2', width: 120},
{align: 'left', dataIndex: 'CDefine3', sorter: false, title: '鏂囨湰3', width: 120},
@@ -20,28 +19,32 @@
{align: 'left', dataIndex: 'CDefine5', sorter: false, title: '鏂囨湰5', width: 120},
{align: 'left', dataIndex: 'CDefine6', sorter: false, title: '鏂囨湰6', width: 120},
{align: 'left', dataIndex: 'CDefine7', sorter: false, title: '鏂囨湰7', width: 120},
+ {align: 'left', dataIndex: 'createdate', sorter: false, title: 'createDate', width: 120},
],
data: [],
loading: false,
setting: {
interType: 'system',
execute: true,
- dataresource: '(select * from s_debug_value_log where createuserid=@userid@) tb'
- },
- arr_field: 'ID,Sort,CDefine1,CDefine2,CDefine3,CDefine4,CDefine5,CDefine6,CDefine7'
+ laypage: true,
+ dataresource: '(select * from s_debug_value_log where createuserid=@userid@) tb',
+ arr_field: 'ID,Sort,CDefine1,CDefine2,CDefine3,CDefine4,CDefine5,CDefine6,CDefine7,createdate'
+ }
}
/**
* @description 瀛愯〃鏁版嵁鍔犺浇
*/
async loadmaindata () {
- const { setting, arr_field } = this.state
+ const { setting } = this.state
this.setState({
loading: true
})
- let param = UtilsDM.getQueryDataParams(setting, arr_field, [], 'sort', 1, 9999, '')
+ let param = UtilsDM.getQueryDataParams(setting, [], 'sort', 1, 50, '')
+
+ delete param.s_version_up
let result = await Api.genericInterface(param)
@@ -107,7 +110,7 @@
return (
<div className="debugtable">
- <RedoOutlined className="mk-debug-reload" onClick={() => this.loadmaindata()}/>
+ <Button className="mk-debug-reload" onClick={() => this.loadmaindata()}>鍒锋柊</Button>
<Table size="middle" columns={columns} dataSource={data} pagination={false} loading={loading} scroll={{ x: '100%', y: false }}/>
</div>
)
--
Gitblit v1.8.0