diff --git a/src/pages/Register/RegisterManage/DeviceSearch/index.tsx b/src/pages/Register/RegisterManage/DeviceSearch/index.tsx index 581a46b..4b84022 100644 --- a/src/pages/Register/RegisterManage/DeviceSearch/index.tsx +++ b/src/pages/Register/RegisterManage/DeviceSearch/index.tsx @@ -16,6 +16,9 @@ export default function Page() { const [pageSize, setpageSize] = useState(10); const [total, setTotal] = useState(0); const [params, setParams] = useState(null); + const [byDate, setByDate] = useState(false); + const [startDate, setStartDate] = useState(""); + const [endDate, setEndDate] = useState(""); let mr30 = { marginRight: 30 } @@ -33,9 +36,7 @@ export default function Page() { ip: '', deviceType: '', homeNetwork: '', - connFlag: '', - startDate: '', - endDate: '', + connFlag: '' }) } @@ -55,7 +56,17 @@ export default function Page() { useEffect(() => { getList() }, [pageNumber]); const getList = () => { - deviceHardDeviceHardSelect({ pageNumber, pageSize, ...params }).then((res) => { + let date = {}; + if (byDate) { + if (startDate.length > 0 && endDate.length > 0) { + date = {startDate, endDate} + }else { + message.info('请选择开始时间和结束时间') + return + } + } + + deviceHardDeviceHardSelect({ pageNumber, pageSize, ...params, ...date }).then((res) => { if (res?.result == "success") { setTotal(res.data[0].total); setTableData(res.data[0].list); @@ -149,26 +160,34 @@ export default function Page() {
{ }}>按注册日期} + text={ + { + setByDate(e.target.checked) + }}> + 按注册日期 + + } >
{ - setParams({ ...params, startDate: b }) + setStartDate(b); }} />
{ - setParams({ ...params, endDate: b }) + setEndDate(b) }} />
diff --git a/src/pages/SF/ConfigManage/ParamSingleInstallConfig/index.tsx b/src/pages/SF/ConfigManage/ParamSingleInstallConfig/index.tsx index 73b0ff1..ecc2398 100644 --- a/src/pages/SF/ConfigManage/ParamSingleInstallConfig/index.tsx +++ b/src/pages/SF/ConfigManage/ParamSingleInstallConfig/index.tsx @@ -33,13 +33,6 @@ export default function Page() { useEffect(() => { getList1(); setSelectedRowKeys1([]) }, [pageNumber1]); useEffect(() => { getList2(); }, [pageNumber2]); - - let serial = { - title: '序号', key: 'index', align: 'center', width: 80, - render: (a: any, b: any, c: any) => { - return {c + 1}; - }, - } const columns: any = [ { title: '序号', key: 'index', align: 'center', width: 80, @@ -67,15 +60,20 @@ export default function Page() { ] const columns2: any = [ - serial, - { title: '参数中文名称', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '对应算法标识', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '参数简称', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '算法模式简称', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '设备名称', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '管理实体标识', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '设备型号', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '协同管理标志', dataIndex: 'name', key: 'name', align: 'center' } + { + title: '序号', key: 'index', align: 'center', width: 80, + render: (a: any, b: any, c: any) => { + return {(pageNumber2 - 1) * pageSize2 + c + 1}; + }, + }, + { title: '参数中文名称', align: 'center', render: (val: any) => { return val.upholdArgsInfo.argsCnName} }, + { title: '对应算法标识', align: 'center', render: (val: any) => { return val.upholdArgsInfo.algorithmId} }, + { title: '参数简称', align: 'center', render: (val: any) => { return val.upholdArgsInfo.argsShortName} }, + { title: '算法模式简称', align: 'center', render: (val: any) => { return val.upholdArgsInfo.modelShortName} }, + { title: '设备名称', align: 'center', render: (val: any) => { return val.deviceHard.deviceName} }, + { title: '管理实体标识', align: 'center', render: (val: any) => { return val.deviceHard.deviceEntityId} }, + { title: '设备型号', align: 'center', render: (val: any) => { return val.deviceHard.deviceType} }, + { title: '协同管理标识', dataIndex: 'name', key: 'name', align: 'center' } ] const getList = () => { @@ -131,6 +129,7 @@ export default function Page() { deviceName: device[0]?.deviceName, deviceEntityId: device[0]?.deviceEntityId, deviceType: device[0]?.deviceType, + cooperateManagerNumber: Math.floor(Math.random()) } algorithmArgsConfigEditOrAdd(params).then((res) => { if (res?.result == "success") { diff --git a/src/pages/SF/ConfigManage/SFSingleInstallConfig/index.tsx b/src/pages/SF/ConfigManage/SFSingleInstallConfig/index.tsx index 88d2616..d0f546c 100644 --- a/src/pages/SF/ConfigManage/SFSingleInstallConfig/index.tsx +++ b/src/pages/SF/ConfigManage/SFSingleInstallConfig/index.tsx @@ -61,11 +61,11 @@ export default function Page() { return {(pageNumber2 - 1) * pageSize2 + c + 1}; }, }, - { title: '算法名称', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '算法标识', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '设备名称', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '管理实体标识', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '设备型号', dataIndex: 'name', key: 'name', align: 'center' }, + { title: '算法名称', align: 'center', render: (val: any) => { return val.upholdAlgorithmInfo.algorithmModelShortName} }, + { title: '算法标识', align: 'center', render: (val: any) => { return val.upholdAlgorithmInfo.algorithmName} }, + { title: '设备名称', align: 'center', render: (val: any) => { return val.deviceHard.deviceName} }, + { title: '管理实体标识', align: 'center', render: (val: any) => { return val.deviceHard.deviceEntityId} }, + { title: '设备型号', align: 'center', render: (val: any) => { return val.deviceHard.deviceType} }, { title: '协同管理标识', dataIndex: 'name', key: 'name', align: 'center' } ] @@ -115,13 +115,14 @@ export default function Page() { let device: any = tableData1.filter((val: any) => val?.id == selectedRowKeys1); let params = { - argsId: algorithm[0]?.id, + algorithmId:algorithm[0]?.id, deviceId: device[0]?.id, algorithmModelShortName: algorithm[0]?.algorithmModelShortName, algorithmName: algorithm[0]?.algorithmName, deviceName: device[0]?.deviceName, deviceEntityId: device[0]?.deviceEntityId, deviceType: device[0]?.deviceType, + cooperateManagerNumber: Math.floor(Math.random()) } algorithmConfigEditOrAdd(params).then((res) => { if (res?.result == "success") {