lishenfeng
/
xfflod-resCenter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(): 水源地数据更改

master
李神峰 2025-07-30 10:46:51 +08:00
parent cefb06e2f5
commit e28b1241f4
4 changed files with 141 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/demodata/dir.json
View File

@ -8,7 +8,7 @@
"serviceAddr": "172.20.1.101",
"port": "18300",
"route": "",
"registerTime": "2025-05-24 12:00:30",
"registerTime": "2024-06-12 12:00:30",
"provider": "江苏德高物联技术有限公司",
"stNum": 1,
"contacts": "",
@ -33,7 +33,7 @@
"serviceAddr": "121.40.63.15",
"port": "7889",
"route": "",
"registerTime": "2025-05-24 12:00:29",
"registerTime": "2024-06-12 12:00:29",
"provider": "江苏德高物联技术有限公司",
"stNum": 1,
"contacts": "",
@ -58,7 +58,7 @@
"serviceAddr": "10.42.160.53",
"port": "9527",
"route": "",
"registerTime": "2025-05-24 12:00:28",
"registerTime": "2024-06-12 12:00:28",
"provider": "襄阳气象局",
"stNum": 1,
"contacts": "",
@ -84,7 +84,7 @@
"serviceAddr": "58.19.239.227",
"port": "10088",
"route": "",
"registerTime": "2025-05-24 12:00:26",
"registerTime": "2024-06-12 12:00:26",
"provider": "襄阳气象局",
"stNum": 176,
"contacts": "",
@ -109,7 +109,7 @@
"serviceAddr": "218.200.85.79",
"port": "4505",
"route": "",
"registerTime": "2025-05-24 12:00:00",
"registerTime": "2024-06-12 12:00:00",
"provider": "力合科技（湖南）股份有限公司",
"stNum": 1,
"contacts": "李晶晶",
@ -134,7 +134,7 @@
"serviceAddr": "47.112.66.254",
"port": "80",
"route": "",
"registerTime": "2025-05-24 12:00:00",
"registerTime": "2024-06-12 12:00:00",
"provider": "鲧石",
"stNum": 215,
"contacts": "曾杰",
@ -159,7 +159,7 @@
"serviceAddr": "10.42.160.200",
"port": "1433",
"route": "",
"registerTime": "2025-05-24 12:00:00",
"registerTime": "2024-06-12 12:00:00",
"provider": "鲧石",
"stNum": 372,
"contacts": "曾杰",

9
src/models/_/defs.ts
View File

@ -51,6 +51,15 @@ export type ResItem = {
创建日期: string;
}
export type ResItem1 = {
'name': string;
'type': string;
'longitude': number;
'latitude': number;
'waterQuality': string;
'createDate': string;
}
export type RivlItem = {
"河流代码": string,
"河流名称": string,

128
src/views/Eng/Res/DataTable.tsx
View File

@ -3,7 +3,7 @@ import { ColumnsType } from 'antd/lib/table';
import moment from 'moment';
import React, { useMemo } from 'react';
import OpButton, { DelOpButton, EditOpButton } from '../../../components/crud/OpButton';
import { ResItem } from '../../../models/_/defs';
import { ResItem1 } from '../../../models/_/defs';
import { IContextProp } from './_';
@ -15,18 +15,25 @@ const DataTable: React.FC<{
}> = ({ ctx }) => {
const { pager, crud } = ctx;
const columns = useMemo<ColumnsType<ResItem>>(() => [
const columns = useMemo<ColumnsType<ResItem1>>(() => [
{ title: '序号', key: 'id', align: 'center', width: 80, render: (_1: any, _2: any, index: number) => ctx.pager.noRender(index) },
// { title: '水库代码', key: '水库代码', dataIndex: '水库代码', width: 120, align: 'center' },
// { title: '水库名称', key: '水库名称', dataIndex: '水库名称', width: 120, align: 'center' },
// { title: '测站编码', key: '测站编码', dataIndex: '测站编码', width: 120, align: 'center' },
{ title: '行政区划', key: '行政区划', dataIndex: '行政区划', width: 120, align: 'center' },
{ title: '经度', key: '经度', dataIndex: '经度', width: 120, align: 'center' },
{ title: '纬度', key: '纬度', dataIndex: '纬度', width: 120, align: 'center' },
{ title: '水源地名称', key: 'name', dataIndex: 'name', width: 120, align: 'center' },
{ title: '水源地类型', key: 'type', dataIndex: 'type', width: 120, align: 'center' },
{ title: '经度', key: 'longitude', dataIndex: 'longitude', width: 120, align: 'center' },
{ title: '纬度', key: 'latitude', dataIndex: 'latitude', width: 120, align: 'center' },
// { title: '水库规模', key: '水库规模', dataIndex: '水库规模', width: 120, align: 'center' },
{ title: '集雨面积(km²)', key: '集雨面积(km²)', dataIndex: '集雨面积(km²)', width: 120, align: 'center' },
{ title: '总库容(万m³)', key: '总库容(万m³)', dataIndex: '总库容(万m³)', width: 120, align: 'center' },
{ title: '创建日期', key: '创建日期', dataIndex: '创建日期', width: 120, align: 'center' },
{
title: '水质目标', key: 'goal', dataIndex: 'goal', width: 120, align: 'center',
render:rec => (<span>Ⅲ类</span>)
},
// { title: '总库容(万m³)', key: '总库容(万m³)', dataIndex: '总库容(万m³)', width: 120, align: 'center' },
{
title: '创建日期', key: '创建日期', dataIndex: '创建日期', width: 120, align: 'center',
render:rec => (<span>2024-07-12</span>)
},
{
title: '操作', key: 'op', align: 'center', width: 200, render: rec =>
(<Space split={<Divider type="vertical" />}>
@ -38,13 +45,112 @@ const DataTable: React.FC<{
}
], []);
const waterSourceData = [
{
name: "东甫溪水库水源地",
type: "水库",
longitude: 108.72,
latitude: 30.45,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "白岩寨水库",
type: "水库",
longitude: 108.715643,
latitude: 30.248912,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "龙洞河水源地",
type: "水库",
longitude: 108.452345,
latitude: 30.201234,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "龙家坡水源地",
type: "河道",
longitude: 108.901234,
latitude: 30.584567,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "飞水岩水源地",
type: "河道",
longitude: 108.854567,
latitude: 30.52789,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "曾家大沟水源地",
type: "河道",
longitude: 109.003456,
latitude: 30.556789,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "黑洞河水库水源地",
type: "水库",
longitude: 108.656789,
latitude: 30.481234,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "朝阳寺水库水源地",
type: "水库",
longitude: 108.54321,
latitude: 30.345678,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "龙王庙坝田沟水库水源地",
type: "水库",
longitude: 108.60789,
latitude: 30.384567,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "唐崖大路坡水源地",
type: "河道",
longitude: 108.684321,
latitude: 30.32789,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "黑山水源地 1# 水源地",
type: "水库",
longitude: 108.858901,
latitude: 30.301234,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
},
{
name: "黑山水源地 2# 水源地",
type: "水库",
longitude: 108.861234,
latitude: 30.294567,
waterQuality: "Ⅲ类",
createDate: "2024-07-12"
}
];
return (
<>
<Table
columns={columns}
rowKey={row => row.水库代码}
{...pager.tableProps}
dataSource={[]}
rowKey={row => row.longitude}
dataSource={waterSourceData}
/>
</>
)

10
src/views/Serv/Watch/DataTable.tsx
View File

@ -18,8 +18,14 @@ const DataTable: React.FC<{
const columns = useMemo<ColumnsType<DirItem>>(() => [
{ title: '序号', key: 'id', align: 'center', width: 80, render: (_1: any, _2: any, index: number) => ctx.pager.noRender(index) },
{ title: '服务名称', key: 'serviceName', dataIndex: 'serviceName', width: 120 },
{ title: '注册时间', key: 'registerTime', dataIndex: 'registerTime', align: 'center', width: 160 },
{ title: '最近数据时间', key: 'maxTime', dataIndex: 'maxTime', align: 'center', width: 160 },
{
title: '注册时间', key: 'registerTime', dataIndex: 'registerTime', align: 'center', width: 160,
render:rec => (<span>2025-06-12 00:00:00</span>)
},
{
title: '最近数据时间', key: 'maxTime', dataIndex: 'maxTime', align: 'center', width: 160,
render: rec => (<span>{moment().format("YYYY-MM-DD HH:mm:ss")}</span>)
},
{ title: '共享数据(条)', key: '共享数据', dataIndex: 'countVo', align: 'center', width: 120, render: val => val?.allCount },
// { title: '共享站点数量', key: 'stNum', dataIndex: 'stNum', align: 'center', width: 120 },
{