From 64c318c6ca9c87206a32306f2e00a9c43400cfe8 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Wed, 11 Jun 2025 15:03:25 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B0=B4=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/skyb.png | Bin 0 -> 28832 bytes src/models/map/index.js | 366 ++-- src/models/shyjview/index.js | 4 +- .../XcxqDlg/TaskInspectionDetail/index.js | 239 +++ .../XcxqDlg/TaskInspectionDetail/index.less | 140 ++ .../XcxqDlg/TaskInspectionDetail/view.js | 46 + src/views/Home/InfoDlg/XcxqDlg/index.js | 9 +- .../XunchaDlg/TaskInspectionDetail/index.js | 239 +++ .../XunchaDlg/TaskInspectionDetail/index.less | 140 ++ .../XunchaDlg/TaskInspectionDetail/view.js | 46 + src/views/Home/InfoDlg/XunchaDlg/detail.js | 34 +- src/views/Home/InfoDlg/XunchaDlg/view.js | 7 +- .../Home/MapCtrl/mapstyle/xunchalayer.js | 1467 ++++++++--------- src/views/Home/panels/Byjc/index.js | 6 +- src/views/Home/panels/Diaodujg/tableYj.js | 2 +- src/views/Home/panels/Shuikugh/index.js | 6 +- src/views/Home/panels/Skyb/index.js | 42 +- src/views/Home/panels/Xcwtkb/index.js | 41 +- src/views/Home/panels/Xczl/index.js | 41 +- 19 files changed, 1832 insertions(+), 1043 deletions(-) create mode 100644 public/assets/skyb.png create mode 100644 src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/index.js create mode 100644 src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/index.less create mode 100644 src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/view.js create mode 100644 src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.js create mode 100644 src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.less create mode 100644 src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/view.js diff --git a/public/assets/skyb.png b/public/assets/skyb.png new file mode 100644 index 0000000000000000000000000000000000000000..1299d5b8757c3b77a25cf2ba0e1e96bb16246a9b GIT binary patch literal 28832 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 { + const [form] = Form.useForm(); + const [activeTab, setActiveTab] = useState('dam'); + const [visible, setVisible] = useState(false) + + // 表单初始值 + const initialValues = { + taskTitle: '06-02浮桥河日常巡查', + taskType: '日常巡查', + taskContent: '20250602每日巡检任务', + startTime: moment('2025-06-02 00:00:00'), + endTime: moment('2025-06-08 23:59:59'), + receiveTime: moment('2025-06-02 09:07:31'), + completeTime: moment('2025-06-02 09:08:05'), + inspector: '姜兴军', + taskStatus: '已完成' + }; + + // 巡查类别数据 + const categories = [ + { key: 'dam', label: '大坝', count: 0 }, + { key: 'spillway', label: '溢洪道', count: 0 }, + { key: 'waterPipe', label: '输水管', count: 0 }, + { key: 'facilities', label: '管理设施', count: 0 }, + { key: 'valve', label: '阀门与启闭机', count: 0 }, + { key: 'others', label: '其他情况', count: 0 } + ]; + + const detailModal = (row) => { + setVisible(true) + } + // 表格列定义 + const columns = [ + { + title: '序号', + dataIndex: 'index', + key: 'index', + width: 80 + }, + { + title: '巡查项', + dataIndex: 'item', + key: 'item' + }, + { + title: '巡查状态', + dataIndex: 'status', + key: 'status', + render: (status) => ( + {status} + ) + }, + { + title: '问题描述', + dataIndex: 'description', + key: 'description' + }, + { + title: '巡查图片', + dataIndex: 'images', + key: 'images' + }, + { + title: '巡查视频', + dataIndex: 'videos', + key: 'videos' + }, + { + title: '是否处理', + dataIndex: 'handled', + key: 'handled' + }, + { + title: '处理人', + dataIndex: 'handler', + key: 'handler' + }, + { + title: '操作', + key: 'action', + render: (v,r) => ( + detailModal(r)}>详情 + ) + } + ]; + + // 表格数据 + const tableData = [ + { + key: '1', + index: 1, + item: '上游坝', + status: '正常', + handler: '姜兴军' + }, + { + key: '2', + index: 2, + item: '下游坝', + status: '正常', + handler: '姜兴军' + } + ]; + + const handleTabChange = (key) => { + setActiveTab(key); + // 这里可以根据选中的tab加载对应的数据 + }; + + return ( +
+ {/* 任务基本信息 */} + 基本信息}> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + {/* 巡查信息 */} + 巡查信息}> +
+ {categories.map(category => ( +
handleTabChange(category.key)} + > + {category.label} + ({category.count}) +
+ ))} +
+
+ + (异常项：0，正常项：13) + +
+ + + setVisible(false)} + > + + ); +}; + +export default TaskInspectionDetail; \ No newline at end of file diff --git a/src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/index.less b/src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/index.less new file mode 100644 index 0000000..b9e19f5 --- /dev/null +++ b/src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/index.less @@ -0,0 +1,140 @@ +.task-inspection-detail { + padding: 5px; + background-color: transparent; + min-height: 100vh; + + .info-card { + margin-bottom: 24px; + background-color: transparent; + border: none; + + .ant-card-body { + color: #fff; + } + + .ant-form-item-label > label { + color: rgba(255, 255, 255, 0.85); + } + + .ant-input, + .ant-picker { + background-color: rgba(255, 255, 255, 0.04); + border-color: rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.85); + + &:hover, + &:focus { + border-color: #1890ff; + } + } + + .ant-picker { + .ant-picker-input > input { + color: rgba(255, 255, 255, 0.85); + } + + .ant-picker-suffix, + .ant-picker-separator { + color: rgba(255, 255, 255, 0.45); + } + + .ant-picker-clear { + background: #1a1a27; + color: rgba(255, 255, 255, 0.45); + } + } + + .ant-input-textarea { + .ant-input { + min-height: 80px; + } + } + + .ant-picker-suffix { + color: rgba(255, 255, 255, 0.45); + } + } + + + + .inspection-card { + background-color: transparent; + border: none; + + .category-tabs { + display: flex; + margin-bottom: 16px; + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + padding-bottom: 16px; + + .category-tab { + padding: 8px 16px; + cursor: pointer; + position: relative; + transition: all 0.3s; + + &:hover { + color: #1890ff; + } + + &.active { + color: #1890ff; + + &::after { + content: ''; + position: absolute; + bottom: -16px; + left: 0; + width: 100%; + height: 2px; + background-color: #1890ff; + } + } + + .category-label { + color: rgba(255, 255, 255, 0.85); + } + + .category-count { + margin-left: 4px; + color: rgba(255, 255, 255, 0.45); + } + + &:hover .category-label, + &.active .category-label { + color: #1890ff; + } + } + } + + .table-info { + margin-bottom: 16px; + + .total-info { + color: rgba(255, 255, 255, 0.65); + } + } + + .inspection-table { + .ant-table { + background-color: transparent; + color: #fff; + + .ant-table-thead > tr > th { + background-color: rgba(255, 255, 255, 0.04); + color: rgba(255, 255, 255, 0.85); + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + } + + .ant-table-tbody > tr > td { + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.65); + } + + .ant-table-tbody > tr:hover > td { + background-color: rgba(255, 255, 255, 0.08); + } + } + } + } +} \ No newline at end of file diff --git a/src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/view.js b/src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/view.js new file mode 100644 index 0000000..02116eb --- /dev/null +++ b/src/views/Home/InfoDlg/XcxqDlg/TaskInspectionDetail/view.js @@ -0,0 +1,46 @@ +import React from 'react'; +import DpTab from '../../../../../layouts/mui/DpTab'; +import Dialog from '@material-ui/core/Dialog'; +import DialogContent from '@material-ui/core/DialogContent'; +import DpPaperComponent from '../../../../../layouts/mui/DpPaperCompanent'; +import DpTabs from '../../../../../layouts/mui/DpTabs'; +import DpAppBar from '../../../../../layouts/mui/DpAppBar'; +import DpBackgroundDrop from '../../../../../layouts/mui/DpBackdrop'; +import DpCloseButton from '../../../../../layouts/mui/DpCloseButton'; +import { Grid } from '@material-ui/core'; +import DescriptionItem from '../../../components/DescrptionItem' +function HDStDlg({ record, onClose,open }) { + const [value, setValue] = React.useState(0); + + return ( + +
+ + + setValue(v)}> + + + + +
+ {/* */} + + + + + +
+ +
+ + ) +} + +export default React.memo(HDStDlg); diff --git a/src/views/Home/InfoDlg/XcxqDlg/index.js b/src/views/Home/InfoDlg/XcxqDlg/index.js index acb2f82..0cf6adb 100644 --- a/src/views/Home/InfoDlg/XcxqDlg/index.js +++ b/src/views/Home/InfoDlg/XcxqDlg/index.js @@ -7,7 +7,7 @@ import DpTabs from '../../../../layouts/mui/DpTabs'; import DpAppBar from '../../../../layouts/mui/DpAppBar'; import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop'; import DpCloseButton from '../../../../layouts/mui/DpCloseButton'; - +import TaskInspectionDetail from './TaskInspectionDetail' function HDStDlg({ record, onClose }) { const [value, setValue] = React.useState(0); @@ -21,15 +21,16 @@ function HDStDlg({ record, onClose }) { BackdropComponent={DpBackgroundDrop} >
- + setValue(v)}> -
- +
+ {/* */} +
diff --git a/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.js b/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.js new file mode 100644 index 0000000..6ead672 --- /dev/null +++ b/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.js @@ -0,0 +1,239 @@ +import React, { useState } from 'react'; +import { Card, Row, Col, Table, Tag, Form, Input, DatePicker, Tabs } from 'antd'; +import './index.less'; +import moment from 'moment'; +import ModalView from './view' +const TaskInspectionDetail = () => { + const [form] = Form.useForm(); + const [activeTab, setActiveTab] = useState('dam'); + const [visible, setVisible] = useState(false) + + // 表单初始值 + const initialValues = { + taskTitle: '06-02浮桥河日常巡查', + taskType: '日常巡查', + taskContent: '20250602每日巡检任务', + startTime: moment('2025-06-02 00:00:00'), + endTime: moment('2025-06-08 23:59:59'), + receiveTime: moment('2025-06-02 09:07:31'), + completeTime: moment('2025-06-02 09:08:05'), + inspector: '姜兴军', + taskStatus: '已完成' + }; + + // 巡查类别数据 + const categories = [ + { key: 'dam', label: '大坝', count: 0 }, + { key: 'spillway', label: '溢洪道', count: 0 }, + { key: 'waterPipe', label: '输水管', count: 0 }, + { key: 'facilities', label: '管理设施', count: 0 }, + { key: 'valve', label: '阀门与启闭机', count: 0 }, + { key: 'others', label: '其他情况', count: 0 } + ]; + + const detailModal = (row) => { + setVisible(true) + } + // 表格列定义 + const columns = [ + { + title: '序号', + dataIndex: 'index', + key: 'index', + width: 80 + }, + { + title: '巡查项', + dataIndex: 'item', + key: 'item' + }, + { + title: '巡查状态', + dataIndex: 'status', + key: 'status', + render: (status) => ( + {status} + ) + }, + { + title: '问题描述', + dataIndex: 'description', + key: 'description' + }, + { + title: '巡查图片', + dataIndex: 'images', + key: 'images' + }, + { + title: '巡查视频', + dataIndex: 'videos', + key: 'videos' + }, + { + title: '是否处理', + dataIndex: 'handled', + key: 'handled' + }, + { + title: '处理人', + dataIndex: 'handler', + key: 'handler' + }, + { + title: '操作', + key: 'action', + render: (v,r) => ( + detailModal(r)}>详情 + ) + } + ]; + + // 表格数据 + const tableData = [ + { + key: '1', + index: 1, + item: '上游坝', + status: '正常', + handler: '姜兴军' + }, + { + key: '2', + index: 2, + item: '下游坝', + status: '正常', + handler: '姜兴军' + } + ]; + + const handleTabChange = (key) => { + setActiveTab(key); + // 这里可以根据选中的tab加载对应的数据 + }; + + return ( +
+ {/* 任务基本信息 */} + 基本信息}> +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {/* 巡查信息 */} + 巡查信息}> +
+ {categories.map(category => ( +
handleTabChange(category.key)} + > + {category.label} + ({category.count}) +
+ ))} +
+
+ + (异常项：0，正常项：13) + +
+
+ + setVisible(false)} + > + + ); +}; + +export default TaskInspectionDetail; \ No newline at end of file diff --git a/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.less b/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.less new file mode 100644 index 0000000..b9e19f5 --- /dev/null +++ b/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/index.less @@ -0,0 +1,140 @@ +.task-inspection-detail { + padding: 5px; + background-color: transparent; + min-height: 100vh; + + .info-card { + margin-bottom: 24px; + background-color: transparent; + border: none; + + .ant-card-body { + color: #fff; + } + + .ant-form-item-label > label { + color: rgba(255, 255, 255, 0.85); + } + + .ant-input, + .ant-picker { + background-color: rgba(255, 255, 255, 0.04); + border-color: rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.85); + + &:hover, + &:focus { + border-color: #1890ff; + } + } + + .ant-picker { + .ant-picker-input > input { + color: rgba(255, 255, 255, 0.85); + } + + .ant-picker-suffix, + .ant-picker-separator { + color: rgba(255, 255, 255, 0.45); + } + + .ant-picker-clear { + background: #1a1a27; + color: rgba(255, 255, 255, 0.45); + } + } + + .ant-input-textarea { + .ant-input { + min-height: 80px; + } + } + + .ant-picker-suffix { + color: rgba(255, 255, 255, 0.45); + } + } + + + + .inspection-card { + background-color: transparent; + border: none; + + .category-tabs { + display: flex; + margin-bottom: 16px; + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + padding-bottom: 16px; + + .category-tab { + padding: 8px 16px; + cursor: pointer; + position: relative; + transition: all 0.3s; + + &:hover { + color: #1890ff; + } + + &.active { + color: #1890ff; + + &::after { + content: ''; + position: absolute; + bottom: -16px; + left: 0; + width: 100%; + height: 2px; + background-color: #1890ff; + } + } + + .category-label { + color: rgba(255, 255, 255, 0.85); + } + + .category-count { + margin-left: 4px; + color: rgba(255, 255, 255, 0.45); + } + + &:hover .category-label, + &.active .category-label { + color: #1890ff; + } + } + } + + .table-info { + margin-bottom: 16px; + + .total-info { + color: rgba(255, 255, 255, 0.65); + } + } + + .inspection-table { + .ant-table { + background-color: transparent; + color: #fff; + + .ant-table-thead > tr > th { + background-color: rgba(255, 255, 255, 0.04); + color: rgba(255, 255, 255, 0.85); + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + } + + .ant-table-tbody > tr > td { + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.65); + } + + .ant-table-tbody > tr:hover > td { + background-color: rgba(255, 255, 255, 0.08); + } + } + } + } +} \ No newline at end of file diff --git a/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/view.js b/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/view.js new file mode 100644 index 0000000..02116eb --- /dev/null +++ b/src/views/Home/InfoDlg/XunchaDlg/TaskInspectionDetail/view.js @@ -0,0 +1,46 @@ +import React from 'react'; +import DpTab from '../../../../../layouts/mui/DpTab'; +import Dialog from '@material-ui/core/Dialog'; +import DialogContent from '@material-ui/core/DialogContent'; +import DpPaperComponent from '../../../../../layouts/mui/DpPaperCompanent'; +import DpTabs from '../../../../../layouts/mui/DpTabs'; +import DpAppBar from '../../../../../layouts/mui/DpAppBar'; +import DpBackgroundDrop from '../../../../../layouts/mui/DpBackdrop'; +import DpCloseButton from '../../../../../layouts/mui/DpCloseButton'; +import { Grid } from '@material-ui/core'; +import DescriptionItem from '../../../components/DescrptionItem' +function HDStDlg({ record, onClose,open }) { + const [value, setValue] = React.useState(0); + + return ( + +
+ + + setValue(v)}> + + + + +
+ {/* */} + + + + + +
+ +
+ + ) +} + +export default React.memo(HDStDlg); diff --git a/src/views/Home/InfoDlg/XunchaDlg/detail.js b/src/views/Home/InfoDlg/XunchaDlg/detail.js index 64ada2e..1b3f9c3 100644 --- a/src/views/Home/InfoDlg/XunchaDlg/detail.js +++ b/src/views/Home/InfoDlg/XunchaDlg/detail.js @@ -138,7 +138,7 @@ const TaskList = () => { city: '黄冈市', district: '麻城市', location: '', - taskType: '06-02明山水库日常巡查', + taskType: '06-02浮桥河水库日常巡查', taskContent: '20250602每日巡检', status: '未完成', person: '姜兴军', @@ -170,7 +170,7 @@ const TaskList = () => { city: '黄冈市', district: '麻城市', location: '', - taskType: '06-02永丰水库特别检查', + taskType: '06-02浮桥河水库特别检查', taskContent: '20250602每日巡检', status: '未完成', person: '白斌', @@ -186,7 +186,7 @@ const TaskList = () => { city: '黄冈市', district: '麻城市', location: '', - taskType: '06-02永红水库日常巡查', + taskType: '06-02浮桥河水库日常巡查', taskContent: '20250602每日巡检', status: '未完成', person: '于静', @@ -201,7 +201,7 @@ const TaskList = () => { city: '黄冈市', district: '麻城市', location: '', - taskType: '06-02四新水库日常巡查', + taskType: '06-02浮桥河水库日常巡查', taskContent: '20250602每日巡检', status: '未完成', person: '何义红', @@ -213,9 +213,12 @@ const TaskList = () => { creator: '' }, ]; - const flyTo = () => { + const flyTo = (row) => { // dispatch?.runtime.setInfoDlg({ layerId: 'ChaoshiDetailLayer', properties: {} }) - setVisible(true) + if (row.sequence == 1) { + setVisible(true) + + } } const [params, setParams] = useState({ tm: [] }) @@ -227,20 +230,7 @@ const TaskList = () => { tm: e, }) }; - useEffect(() => { - let options = ""; - options = { - etm: moment().add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm"), - stm: moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm"), - tm: [ - moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }), - moment().add(1, 'hour').set({ minute: 0, second: 0 }), - ], - } - - setParams(options) - - }, []) + return ( @@ -304,7 +294,7 @@ const TaskList = () => { showTime={{ format: 'HH:mm', }} - value={params.tm} + value={[moment('2025-06-02 00:00'),moment('2025-06-02 23:00')]} getPopupContainer={trigger => trigger.parentElement} /> @@ -357,7 +347,7 @@ const TaskList = () => { {row.problems} {row.processed} - + flyTo(row)}> 查看 diff --git a/src/views/Home/InfoDlg/XunchaDlg/view.js b/src/views/Home/InfoDlg/XunchaDlg/view.js index 5f0bf4c..05afc7b 100644 --- a/src/views/Home/InfoDlg/XunchaDlg/view.js +++ b/src/views/Home/InfoDlg/XunchaDlg/view.js @@ -7,7 +7,7 @@ import DpTabs from '../../../../layouts/mui/DpTabs'; import DpAppBar from '../../../../layouts/mui/DpAppBar'; import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop'; import DpCloseButton from '../../../../layouts/mui/DpCloseButton'; - +import TaskInspectionDetail from './TaskInspectionDetail' function HDStDlg({ record, onClose,open }) { const [value, setValue] = React.useState(0); @@ -28,8 +28,9 @@ function HDStDlg({ record, onClose,open }) { -
- +
+ + {/* */}
diff --git a/src/views/Home/MapCtrl/mapstyle/xunchalayer.js b/src/views/Home/MapCtrl/mapstyle/xunchalayer.js index 15158d7..6ce0cbf 100644 --- a/src/views/Home/MapCtrl/mapstyle/xunchalayer.js +++ b/src/views/Home/MapCtrl/mapstyle/xunchalayer.js @@ -44,60 +44,17 @@ const ShapeStyle = { }; const page1 = [ - { - "stcd": "716113701", - "type": "sk", - "hasRz": true, - "stnm": "永红水库", - "adcd": "421181105000", - "wscd": null, - "importancy": 0, - "lgtd": 115.120278, - "lttd": 31.183611, - "elev": 0, - "damel": 131.99, - "dsflz": 130.56, - "fsltdz": 129.9, - "ddz": 113.5, - "zcxsw": 129.9, - "drpTm": "2025-04-11T06:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 130.15, - "w": 0.444, - "a_fsltdz": -10.75, - "rzTm": "2025-04-11T06:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716113701", - "tm": "2023-11-16T11:19:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/1116/716113701/20231116191900.jpg" - }, - { - "stcd": "716113701", - "tm": "2023-11-16T09:05:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/1116/716113702/20231116170500.jpg" - } - ] - }, { "stcd": "61614200", "type": "sk", "hasRz": true, "stnm": "浮桥河水库", + "stnm": "06-02浮桥河水库日常巡查", "adcd": "421181100000", "wscd": null, "importancy": 0, - "lgtd": 114.875, - "lttd": 31.166667, + "lgtd": 114.88169, + "lttd": 31.171967, "elev": 0, "damel": 71.33, "dsflz": 68.04, @@ -121,714 +78,714 @@ const page1 = [ "rzState": 1, "aRz": -4.18 }, - { - "stcd": "61613010", - "type": "sk", - "hasRz": true, - "stnm": "06-02明山水库日常巡查", - "adcd": "421181103000", - "wscd": null, - "importancy": 0, - "lgtd": 115.066667, - "lttd": 31.016667, - "elev": 0, - "damel": 98.7, - "dsflz": 96.07, - "fsltdz": 93, - "ddz": 78.02, - "zcxsw": 93, - "drpTm": "2025-06-03T02:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 12.5, - "drpState": 1, - "rz": 84.43, - "w": 49.5, - "a_fsltdz": -8.569999999999993, - "rzTm": "2025-06-03T02:00:00.000Z", - "rzWarning": 0, - "rzState": 1, - "aRz": -8.57 - }, - { - "stcd": "716112601", - "type": "sk", - "hasRz": true, - "stnm": "永丰水库", - "adcd": "421181003000", - "wscd": null, - "importancy": 0, - "lgtd": 115.057222, - "lttd": 31.110833, - "elev": 0, - "damel": 79.57, - "dsflz": 77.82, - "fsltdz": 76.96, - "ddz": 64.96, - "zcxsw": 76.96, - "drpTm": "2025-04-11T06:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 71.88, - "w": 1.178, - "a_fsltdz": -5.079999999999998, - "rzTm": "2025-04-11T06:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716112601", - "tm": "2025-04-11T06:02:20.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2025/0411/716112601/20250411140220.jpg" - }, - { - "stcd": "716112601", - "tm": "2025-04-11T06:04:01.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2025/0411/716112602/20250411140401.jpg" - } - ], - "aRz": -5.08 - }, - { - "stcd": "716115401", - "type": "sk", - "hasRz": true, - "stnm": "长冲水库", - "adcd": "421181110000", - "wscd": null, - "importancy": 0, - "lgtd": 115.061389, - "lttd": 31.408611, - "elev": 0, - "damel": 21.6, - "dsflz": 20.15, - "fsltdz": 130.8, - "ddz": 0, - "zcxsw": 130.8, - "drpTm": "2024-05-17T08:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 126.41, - "w": 0.374, - "a_fsltdz": -4.390000000000015, - "rzTm": "2024-05-17T06:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716115401", - "tm": "2024-05-17T08:05:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2024/0517/716115401/20240517160500.jpg" - }, - { - "stcd": "716115401", - "tm": "2024-05-17T08:20:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2024/0517/716115402/20240517162000.jpg" - } - ], - "aRz": -4.39 - }, - { - "stcd": "716115301", - "type": "sk", - "hasRz": true, - "stnm": "葡萄冲水库", - "adcd": "421181110000", - "wscd": null, - "importancy": 0, - "lgtd": 115.051389, - "lttd": 31.423333, - "elev": 0, - "damel": 15.8, - "dsflz": 14.73, - "fsltdz": 14.3, - "ddz": 9.48, - "zcxsw": 14.3, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 213.75, - "w": 0.04, - "a_fsltdz": 199.45, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 1, - "rzState": 2, - "pic": [ - { - "stcd": "716115301", - "tm": "2023-03-12T08:02:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115301/20230312160200.jpg" - }, - { - "stcd": "716115301", - "tm": "2023-03-12T07:11:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115302/20230312151100.jpg" - } - ], - "aRz": 199.45 - }, - { - "stcd": "716115701", - "type": "sk", - "hasRz": true, - "stnm": "二五冲水库", - "adcd": "421181110000", - "wscd": null, - "importancy": 0, - "lgtd": 115.087222, - "lttd": 31.378333, - "elev": 0, - "damel": 11.2, - "dsflz": 10.07, - "fsltdz": 108.55, - "ddz": 1.5, - "zcxsw": 108.55, - "drpTm": "2025-03-22T08:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 99.65, - "w": 0.038, - "a_fsltdz": -8.899999999999991, - "rzTm": "2025-03-22T08:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716115701", - "tm": "2025-03-06T23:01:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2025/0307/716115701/20250307070100.jpg" - }, - { - "stcd": "716115701", - "tm": "2024-10-18T06:28:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2024/1018/716115702/20241018142800.jpg" - } - ], - "aRz": -8.9 - }, - { - "stcd": "716115501", - "type": "sk", - "hasRz": true, - "stnm": "石鼓庙水库", - "adcd": "421181110000", - "wscd": null, - "importancy": 0, - "lgtd": 114.049444, - "lttd": 31.392222, - "elev": 0, - "damel": 106.15, - "dsflz": 104.92, - "fsltdz": 102.45, - "ddz": 6.7, - "zcxsw": 102.45, - "drpTm": "2024-11-17T04:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 95.86, - "w": 0.073, - "a_fsltdz": -6.590000000000003, - "rzTm": "2024-08-21T01:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716115501", - "tm": "2023-03-12T07:04:32.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115501/20230312150432.jpg" - }, - { - "stcd": "716115501", - "tm": "2023-03-12T07:08:39.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115502/20230312150839.jpg" - } - ], - "aRz": -6.59 - }, - { - "stcd": "716115601", - "type": "sk", - "hasRz": true, - "stnm": "滚冲水库", - "adcd": "421181110000", - "wscd": null, - "importancy": 0, - "lgtd": 115.027778, - "lttd": 31.386944, - "elev": 0, - "damel": 129.72, - "dsflz": 129.17, - "fsltdz": 128.3, - "ddz": 123, - "zcxsw": 128.3, - "drpTm": "2025-04-11T04:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 123.03, - "w": 0.02, - "a_fsltdz": -5.27000000000001, - "rzTm": "2025-04-11T04:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716115601", - "tm": "2023-03-12T07:03:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115601/20230312150300.jpg" - }, - { - "stcd": "716115601", - "tm": "2023-03-12T07:11:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115602/20230312151100.jpg" - } - ], - "aRz": -5.27 - }, - { - "stcd": "716108601", - "type": "sk", - "hasRz": true, - "stnm": "吴家垸水库", - "adcd": "421181110000", - "wscd": null, - "importancy": 0, - "lgtd": 115.029167, - "lttd": 31.427222, - "elev": 0, - "damel": 15.7, - "dsflz": 13.85, - "fsltdz": 173.9, - "ddz": 4.6, - "zcxsw": 173.9, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 169.14, - "w": 0.11, - "a_fsltdz": -4.760000000000019, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716108601", - "tm": "2023-03-12T08:01:41.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716108601/20230312160141.jpg" - }, - { - "stcd": "716108601", - "tm": "2023-03-12T07:04:17.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716108602/20230312150417.jpg" - } - ], - "aRz": -4.76 - }, - { - "stcd": "716113401", - "type": "sk", - "hasRz": true, - "stnm": "鲇鱼坝水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 114.731667, - "lttd": 31.019444, - "elev": 0, - "damel": 55.73, - "dsflz": 52.9, - "fsltdz": 50.63, - "ddz": 42.83, - "zcxsw": 50.63, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 48.05, - "w": 2.584, - "a_fsltdz": -2.5800000000000054, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716113401", - "tm": "2023-03-12T07:07:01.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716113401/20230312150701.jpg" - }, - { - "stcd": "716113401", - "tm": "2023-03-12T07:15:09.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716113402/20230312151509.jpg" - } - ], - "aRz": -2.58 - }, - { - "stcd": "716126501", - "type": "sk", - "hasRz": true, - "stnm": "破堰水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 114.696111, - "lttd": 31.025556, - "elev": 0, - "damel": 18.48, - "dsflz": 15.23, - "fsltdz": 74.2, - "ddz": 6.3, - "zcxsw": 74.2, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 64.47, - "w": 0.265, - "a_fsltdz": -9.730000000000004, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716126501", - "tm": "2023-03-12T07:04:21.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126501/20230312150421.jpg" - }, - { - "stcd": "716126501", - "tm": "2023-03-12T07:10:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126502/20230312151000.jpg" - } - ], - "aRz": -9.73 - }, - { - "stcd": "716107371", - "type": "sk", - "hasRz": true, - "stnm": "群英水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 114.726944, - "lttd": 31.054444, - "elev": 0, - "damel": 7.4, - "dsflz": 6.02, - "fsltdz": 65.6, - "ddz": 4.1, - "zcxsw": 65.6, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 68.66, - "w": 0, - "a_fsltdz": 3.0600000000000023, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 1, - "rzState": 2, - "pic": [ - { - "stcd": "716107371", - "tm": "2023-03-12T07:23:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107371/20230312152300.jpg" - }, - { - "stcd": "716107371", - "tm": "2023-03-12T07:16:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107372/20230312151600.jpg" - } - ], - "aRz": 3.06 - }, - { - "stcd": "716126301", - "type": "sk", - "hasRz": true, - "stnm": "淮海水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 114.694722, - "lttd": 31.053333, - "elev": 0, - "damel": 11.2, - "dsflz": 9.97, - "fsltdz": 9.6, - "ddz": 6.3, - "zcxsw": 9.6, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 64.96, - "w": 0.129, - "a_fsltdz": 55.35999999999999, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 1, - "rzState": 2, - "pic": [ - { - "stcd": "716126301", - "tm": "2023-03-12T07:04:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126301/20230312150400.jpg" - }, - { - "stcd": "716126301", - "tm": "2023-03-12T07:10:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126302/20230312151000.jpg" - } - ], - "aRz": 55.36 - }, - { - "stcd": "716108501", - "type": "sk", - "hasRz": true, - "stnm": "东风水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 115.232222, - "lttd": 30.970556, - "elev": 0, - "damel": 81.7, - "dsflz": 80.22, - "fsltdz": 79, - "ddz": 76.2, - "zcxsw": 79, - "drpTm": "2025-03-22T08:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 78.22, - "w": 0.203, - "a_fsltdz": -0.7800000000000011, - "rzTm": "2025-03-22T08:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716108501", - "tm": "2024-09-08T02:44:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2024/0908/716108501/20240908104400.jpg" - }, - { - "stcd": "716108501", - "tm": "2024-08-26T09:20:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2024/0826/716108502/20240826172000.jpg" - } - ], - "aRz": -0.78 - }, - { - "stcd": "716126601", - "type": "sk", - "hasRz": true, - "stnm": "毛屋湾水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 114.693889, - "lttd": 31.019722, - "elev": 0, - "damel": 10, - "dsflz": 9.8, - "fsltdz": 66.57, - "ddz": 5, - "zcxsw": 66.57, - "drpTm": "2024-12-30T06:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 65.41, - "w": 0.039, - "a_fsltdz": -1.1599999999999966, - "rzTm": "2024-05-15T06:00:00.000Z", - "rzWarning": 0, - "rzState": 2, - "pic": [ - { - "stcd": "716126601", - "tm": "2024-03-11T02:02:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2024/0311/716126601/20240311100200.jpg" - }, - { - "stcd": "716126601", - "tm": "2024-05-15T06:07:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2024/0515/716126602/20240515140700.jpg" - } - ], - "aRz": -1.16 - }, - { - "stcd": "7CS000081", - "type": "sk", - "hasRz": true, - "stnm": "陡山洪水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 114.724722, - "lttd": 31.007222, - "elev": 0, - "damel": 56.7, - "dsflz": 55.6, - "fsltdz": 5.8, - "ddz": 49.71, - "zcxsw": 5.8, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 51.26, - "w": 0.034, - "a_fsltdz": 45.46, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 1, - "rzState": 2, - "pic": [ - { - "stcd": "7CS000081", - "tm": "2023-03-12T08:01:48.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/7CS000081/20230312160148.jpg" - }, - { - "stcd": "7CS000081", - "tm": "2023-03-12T07:05:33.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/7CS000082/20230312150533.jpg" - } - ], - "aRz": 45.46 - }, - { - "stcd": "716107391", - "type": "sk", - "hasRz": true, - "stnm": "高岗水库", - "adcd": "421181102000", - "wscd": null, - "importancy": 0, - "lgtd": 114.731389, - "lttd": 31.042222, - "elev": 0, - "damel": 41.7, - "dsflz": 41.6, - "fsltdz": 40, - "ddz": 35.56, - "zcxsw": 40, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 51.42, - "w": 0.044, - "a_fsltdz": 11.420000000000002, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 1, - "rzState": 2, - "pic": [ - { - "stcd": "716107391", - "tm": "2023-03-12T07:03:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107391/20230312150300.jpg" - }, - { - "stcd": "716107391", - "tm": "2023-03-12T07:10:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107392/20230312151000.jpg" - } - ], - "aRz": 11.42 - }, +// { +// "stcd": "61613010", +// "type": "sk", +// "hasRz": true, +// "stnm": "06-02明山水库日常巡查", +// "adcd": "421181103000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.066667, +// "lttd": 31.016667, +// "elev": 0, +// "damel": 98.7, +// "dsflz": 96.07, +// "fsltdz": 93, +// "ddz": 78.02, +// "zcxsw": 93, +// "drpTm": "2025-06-03T02:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 12.5, +// "drpState": 1, +// "rz": 84.43, +// "w": 49.5, +// "a_fsltdz": -8.569999999999993, +// "rzTm": "2025-06-03T02:00:00.000Z", +// "rzWarning": 0, +// "rzState": 1, +// "aRz": -8.57 +// }, +// { +// "stcd": "716112601", +// "type": "sk", +// "hasRz": true, +// "stnm": "永丰水库", +// "adcd": "421181003000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.057222, +// "lttd": 31.110833, +// "elev": 0, +// "damel": 79.57, +// "dsflz": 77.82, +// "fsltdz": 76.96, +// "ddz": 64.96, +// "zcxsw": 76.96, +// "drpTm": "2025-04-11T06:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 71.88, +// "w": 1.178, +// "a_fsltdz": -5.079999999999998, +// "rzTm": "2025-04-11T06:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716112601", +// "tm": "2025-04-11T06:02:20.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2025/0411/716112601/20250411140220.jpg" +// }, +// { +// "stcd": "716112601", +// "tm": "2025-04-11T06:04:01.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2025/0411/716112602/20250411140401.jpg" +// } +// ], +// "aRz": -5.08 +// }, +// { +// "stcd": "716115401", +// "type": "sk", +// "hasRz": true, +// "stnm": "长冲水库", +// "adcd": "421181110000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.061389, +// "lttd": 31.408611, +// "elev": 0, +// "damel": 21.6, +// "dsflz": 20.15, +// "fsltdz": 130.8, +// "ddz": 0, +// "zcxsw": 130.8, +// "drpTm": "2024-05-17T08:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 126.41, +// "w": 0.374, +// "a_fsltdz": -4.390000000000015, +// "rzTm": "2024-05-17T06:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716115401", +// "tm": "2024-05-17T08:05:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2024/0517/716115401/20240517160500.jpg" +// }, +// { +// "stcd": "716115401", +// "tm": "2024-05-17T08:20:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2024/0517/716115402/20240517162000.jpg" +// } +// ], +// "aRz": -4.39 +// }, +// { +// "stcd": "716115301", +// "type": "sk", +// "hasRz": true, +// "stnm": "葡萄冲水库", +// "adcd": "421181110000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.051389, +// "lttd": 31.423333, +// "elev": 0, +// "damel": 15.8, +// "dsflz": 14.73, +// "fsltdz": 14.3, +// "ddz": 9.48, +// "zcxsw": 14.3, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 213.75, +// "w": 0.04, +// "a_fsltdz": 199.45, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 1, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716115301", +// "tm": "2023-03-12T08:02:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115301/20230312160200.jpg" +// }, +// { +// "stcd": "716115301", +// "tm": "2023-03-12T07:11:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115302/20230312151100.jpg" +// } +// ], +// "aRz": 199.45 +// }, +// { +// "stcd": "716115701", +// "type": "sk", +// "hasRz": true, +// "stnm": "二五冲水库", +// "adcd": "421181110000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.087222, +// "lttd": 31.378333, +// "elev": 0, +// "damel": 11.2, +// "dsflz": 10.07, +// "fsltdz": 108.55, +// "ddz": 1.5, +// "zcxsw": 108.55, +// "drpTm": "2025-03-22T08:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 99.65, +// "w": 0.038, +// "a_fsltdz": -8.899999999999991, +// "rzTm": "2025-03-22T08:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716115701", +// "tm": "2025-03-06T23:01:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2025/0307/716115701/20250307070100.jpg" +// }, +// { +// "stcd": "716115701", +// "tm": "2024-10-18T06:28:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2024/1018/716115702/20241018142800.jpg" +// } +// ], +// "aRz": -8.9 +// }, +// { +// "stcd": "716115501", +// "type": "sk", +// "hasRz": true, +// "stnm": "石鼓庙水库", +// "adcd": "421181110000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.049444, +// "lttd": 31.392222, +// "elev": 0, +// "damel": 106.15, +// "dsflz": 104.92, +// "fsltdz": 102.45, +// "ddz": 6.7, +// "zcxsw": 102.45, +// "drpTm": "2024-11-17T04:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 95.86, +// "w": 0.073, +// "a_fsltdz": -6.590000000000003, +// "rzTm": "2024-08-21T01:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716115501", +// "tm": "2023-03-12T07:04:32.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115501/20230312150432.jpg" +// }, +// { +// "stcd": "716115501", +// "tm": "2023-03-12T07:08:39.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115502/20230312150839.jpg" +// } +// ], +// "aRz": -6.59 +// }, +// { +// "stcd": "716115601", +// "type": "sk", +// "hasRz": true, +// "stnm": "滚冲水库", +// "adcd": "421181110000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.027778, +// "lttd": 31.386944, +// "elev": 0, +// "damel": 129.72, +// "dsflz": 129.17, +// "fsltdz": 128.3, +// "ddz": 123, +// "zcxsw": 128.3, +// "drpTm": "2025-04-11T04:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 123.03, +// "w": 0.02, +// "a_fsltdz": -5.27000000000001, +// "rzTm": "2025-04-11T04:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716115601", +// "tm": "2023-03-12T07:03:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115601/20230312150300.jpg" +// }, +// { +// "stcd": "716115601", +// "tm": "2023-03-12T07:11:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115602/20230312151100.jpg" +// } +// ], +// "aRz": -5.27 +// }, +// { +// "stcd": "716108601", +// "type": "sk", +// "hasRz": true, +// "stnm": "吴家垸水库", +// "adcd": "421181110000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.029167, +// "lttd": 31.427222, +// "elev": 0, +// "damel": 15.7, +// "dsflz": 13.85, +// "fsltdz": 173.9, +// "ddz": 4.6, +// "zcxsw": 173.9, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 169.14, +// "w": 0.11, +// "a_fsltdz": -4.760000000000019, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716108601", +// "tm": "2023-03-12T08:01:41.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716108601/20230312160141.jpg" +// }, +// { +// "stcd": "716108601", +// "tm": "2023-03-12T07:04:17.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716108602/20230312150417.jpg" +// } +// ], +// "aRz": -4.76 +// }, +// { +// "stcd": "716113401", +// "type": "sk", +// "hasRz": true, +// "stnm": "鲇鱼坝水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.731667, +// "lttd": 31.019444, +// "elev": 0, +// "damel": 55.73, +// "dsflz": 52.9, +// "fsltdz": 50.63, +// "ddz": 42.83, +// "zcxsw": 50.63, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 48.05, +// "w": 2.584, +// "a_fsltdz": -2.5800000000000054, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716113401", +// "tm": "2023-03-12T07:07:01.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716113401/20230312150701.jpg" +// }, +// { +// "stcd": "716113401", +// "tm": "2023-03-12T07:15:09.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716113402/20230312151509.jpg" +// } +// ], +// "aRz": -2.58 +// }, +// { +// "stcd": "716126501", +// "type": "sk", +// "hasRz": true, +// "stnm": "破堰水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.696111, +// "lttd": 31.025556, +// "elev": 0, +// "damel": 18.48, +// "dsflz": 15.23, +// "fsltdz": 74.2, +// "ddz": 6.3, +// "zcxsw": 74.2, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 64.47, +// "w": 0.265, +// "a_fsltdz": -9.730000000000004, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716126501", +// "tm": "2023-03-12T07:04:21.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126501/20230312150421.jpg" +// }, +// { +// "stcd": "716126501", +// "tm": "2023-03-12T07:10:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126502/20230312151000.jpg" +// } +// ], +// "aRz": -9.73 +// }, +// { +// "stcd": "716107371", +// "type": "sk", +// "hasRz": true, +// "stnm": "群英水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.726944, +// "lttd": 31.054444, +// "elev": 0, +// "damel": 7.4, +// "dsflz": 6.02, +// "fsltdz": 65.6, +// "ddz": 4.1, +// "zcxsw": 65.6, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 68.66, +// "w": 0, +// "a_fsltdz": 3.0600000000000023, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 1, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716107371", +// "tm": "2023-03-12T07:23:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107371/20230312152300.jpg" +// }, +// { +// "stcd": "716107371", +// "tm": "2023-03-12T07:16:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107372/20230312151600.jpg" +// } +// ], +// "aRz": 3.06 +// }, +// { +// "stcd": "716126301", +// "type": "sk", +// "hasRz": true, +// "stnm": "淮海水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.694722, +// "lttd": 31.053333, +// "elev": 0, +// "damel": 11.2, +// "dsflz": 9.97, +// "fsltdz": 9.6, +// "ddz": 6.3, +// "zcxsw": 9.6, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 64.96, +// "w": 0.129, +// "a_fsltdz": 55.35999999999999, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 1, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716126301", +// "tm": "2023-03-12T07:04:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126301/20230312150400.jpg" +// }, +// { +// "stcd": "716126301", +// "tm": "2023-03-12T07:10:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716126302/20230312151000.jpg" +// } +// ], +// "aRz": 55.36 +// }, +// { +// "stcd": "716108501", +// "type": "sk", +// "hasRz": true, +// "stnm": "东风水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 115.232222, +// "lttd": 30.970556, +// "elev": 0, +// "damel": 81.7, +// "dsflz": 80.22, +// "fsltdz": 79, +// "ddz": 76.2, +// "zcxsw": 79, +// "drpTm": "2025-03-22T08:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 78.22, +// "w": 0.203, +// "a_fsltdz": -0.7800000000000011, +// "rzTm": "2025-03-22T08:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716108501", +// "tm": "2024-09-08T02:44:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2024/0908/716108501/20240908104400.jpg" +// }, +// { +// "stcd": "716108501", +// "tm": "2024-08-26T09:20:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2024/0826/716108502/20240826172000.jpg" +// } +// ], +// "aRz": -0.78 +// }, +// { +// "stcd": "716126601", +// "type": "sk", +// "hasRz": true, +// "stnm": "毛屋湾水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.693889, +// "lttd": 31.019722, +// "elev": 0, +// "damel": 10, +// "dsflz": 9.8, +// "fsltdz": 66.57, +// "ddz": 5, +// "zcxsw": 66.57, +// "drpTm": "2024-12-30T06:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 65.41, +// "w": 0.039, +// "a_fsltdz": -1.1599999999999966, +// "rzTm": "2024-05-15T06:00:00.000Z", +// "rzWarning": 0, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716126601", +// "tm": "2024-03-11T02:02:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2024/0311/716126601/20240311100200.jpg" +// }, +// { +// "stcd": "716126601", +// "tm": "2024-05-15T06:07:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2024/0515/716126602/20240515140700.jpg" +// } +// ], +// "aRz": -1.16 +// }, +// { +// "stcd": "7CS000081", +// "type": "sk", +// "hasRz": true, +// "stnm": "陡山洪水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.724722, +// "lttd": 31.007222, +// "elev": 0, +// "damel": 56.7, +// "dsflz": 55.6, +// "fsltdz": 5.8, +// "ddz": 49.71, +// "zcxsw": 5.8, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 51.26, +// "w": 0.034, +// "a_fsltdz": 45.46, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 1, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "7CS000081", +// "tm": "2023-03-12T08:01:48.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/7CS000081/20230312160148.jpg" +// }, +// { +// "stcd": "7CS000081", +// "tm": "2023-03-12T07:05:33.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/7CS000082/20230312150533.jpg" +// } +// ], +// "aRz": 45.46 +// }, +// { +// "stcd": "716107391", +// "type": "sk", +// "hasRz": true, +// "stnm": "高岗水库", +// "adcd": "421181102000", +// "wscd": null, +// "importancy": 0, +// "lgtd": 114.731389, +// "lttd": 31.042222, +// "elev": 0, +// "damel": 41.7, +// "dsflz": 41.6, +// "fsltdz": 40, +// "ddz": 35.56, +// "zcxsw": 40, +// "drpTm": "2025-04-11T05:00:00.000Z", +// "today": 0, +// "h1": 0, +// "h3": 0, +// "h6": 0, +// "h12": 0, +// "h24": 0, +// "h48": 0, +// "drpState": 2, +// "rz": 51.42, +// "w": 0.044, +// "a_fsltdz": 11.420000000000002, +// "rzTm": "2025-04-11T05:00:00.000Z", +// "rzWarning": 1, +// "rzState": 2, +// "pic": [ +// { +// "stcd": "716107391", +// "tm": "2023-03-12T07:03:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107391/20230312150300.jpg" +// }, +// { +// "stcd": "716107391", +// "tm": "2023-03-12T07:10:00.000Z", +// "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716107392/20230312151000.jpg" +// } +// ], +// "aRz": 11.42 +// }, ] export default class XunchaLayer extends BaseLayer { @@ -860,7 +817,7 @@ export default class XunchaLayer extends BaseLayer { // await PicStPromise.get(); [...page1].map((item)=>{ const obj = {...item} - obj.lgtd = item.lgtd + 0.0019 + obj.lgtd = item.lgtd obj.lttd = item.lttd return obj }) diff --git a/src/views/Home/panels/Byjc/index.js b/src/views/Home/panels/Byjc/index.js index b3fd0a5..cd87264 100644 --- a/src/views/Home/panels/Byjc/index.js +++ b/src/views/Home/panels/Byjc/index.js @@ -1366,7 +1366,7 @@ useEffect(() => { } -
+ {/*
-
+
*/} ) } diff --git a/src/views/Home/panels/Diaodujg/tableYj.js b/src/views/Home/panels/Diaodujg/tableYj.js index 4034f0a..8be40df 100644 --- a/src/views/Home/panels/Diaodujg/tableYj.js +++ b/src/views/Home/panels/Diaodujg/tableYj.js @@ -12,7 +12,7 @@ import { } from '@material-ui/core'; const reservoirData = [ { - name: '明山水库', + name: '浮桥河水库', maxInflow: { value: 12.32, time: '03-23 14:32' diff --git a/src/views/Home/panels/Shuikugh/index.js b/src/views/Home/panels/Shuikugh/index.js index 1e48d65..8aac71a 100644 --- a/src/views/Home/panels/Shuikugh/index.js +++ b/src/views/Home/panels/Shuikugh/index.js @@ -77,7 +77,7 @@ function HDReal({ style }) { { "guid": "42118120003", "code": "", - "name": "明山水库", + "name": "浮桥河水库", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", @@ -92,7 +92,7 @@ function HDReal({ style }) { { "guid": "42118120003", "code": "", - "name": "永红水库", + "name": "浮桥河水库", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", @@ -107,7 +107,7 @@ function HDReal({ style }) { { "guid": "42118120003", "code": "", - "name": "永丰水库", + "name": "浮桥河水库", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", diff --git a/src/views/Home/panels/Skyb/index.js b/src/views/Home/panels/Skyb/index.js index cd03696..9162bb5 100644 --- a/src/views/Home/panels/Skyb/index.js +++ b/src/views/Home/panels/Skyb/index.js @@ -14,26 +14,26 @@ function DrpReal({ style }) { style={style} title="水库预报" color="green" - extra={ - <> - {/* */} -
- -
- - } + // extra={ + // <> + // {/* */} + //
+ // + //
+ // + // } > -
+ {/*
水库雨量预报
@@ -45,7 +45,9 @@ function DrpReal({ style }) { style={{ width: '100%',height:200 }} />
-
+
*/} + + ) } diff --git a/src/views/Home/panels/Xcwtkb/index.js b/src/views/Home/panels/Xcwtkb/index.js index fe0c248..3dc2976 100644 --- a/src/views/Home/panels/Xcwtkb/index.js +++ b/src/views/Home/panels/Xcwtkb/index.js @@ -1701,14 +1701,14 @@ const data4 = [ const data = [ { "guid": "42118120003", - "code": "", - "name": "明山水库-日常管理", + "code": "1", + "name": "浮桥河水库-日常管理", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", "place": "湖北省-黄冈市-麻城市-白果镇", - "lgtd": "115.066667", - "lttd": "31.016667", + "lgtd": "114.88169", + "lttd": "31.171967", 'username': '余静', taskType: '混凝土护坡开裂', tm: '2025-06-02 00:10:00', @@ -1717,7 +1717,7 @@ const data = [ { "guid": "42118120003", "code": "", - "name": "永红水库-日常管理", + "name": "浮桥河水库-日常管理", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", @@ -1732,7 +1732,7 @@ const data = [ { "guid": "42118120003", "code": "", - "name": "永丰水库-汛前检查", + "name": "浮桥河水库-汛前检查", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", @@ -1750,22 +1750,24 @@ const data = [ function DrpReal({ style }) { const [tab, setTab] = useState('1') const dispatch = useDispatch(); - const [dimension, setDimension] = useState('ft'); + const [dimension, setDimension] = useState('浮桥河水库'); const onChange = (event) => { const value = event.target.value; setDimension(value); } const jumpTo = (record) => { const { lgtd, lttd } = record; - const lgtdNum = Number(lgtd) + 0.0019; - const lttdNum = Number(lttd) - if (lgtdNum && lttdNum) { - dispatch.runtime.setCameraTarget({ - center: [lgtdNum, lttdNum + config.poiPositionOffsetY.hd], - zoom: config.poiPositionZoom.hd, - pitch: config.poiPitch, - }); - } + const lgtdNum = Number(lgtd); + const lttdNum = Number(lttd) + if (record.code == 1) { + if (lgtdNum && lttdNum) { + dispatch.runtime.setCameraTarget({ + center: [lgtdNum, lttdNum], + zoom: 17, + pitch: config.poiPitch, + }); + } + } } return (
-
+ {/*
-
+
*/} ) } diff --git a/src/views/Home/panels/Xczl/index.js b/src/views/Home/panels/Xczl/index.js index ed8c086..7a49d5f 100644 --- a/src/views/Home/panels/Xczl/index.js +++ b/src/views/Home/panels/Xczl/index.js @@ -16,31 +16,16 @@ import XcCard from './xcCard' import config from '../../../../config'; const data = [ - { - "guid": "42118120003", - "code": "", - "name": "明山水库-日常管理", - "resRegCode": "42000020030-A4", - "adName": "白果镇", - "engScal": "大（2）型", - "place": "湖北省-黄冈市-麻城市-白果镇", - "lgtd": "115.066667", - "lttd": "31.016667", - 'username': '余静', - taskType: '特别巡查', - tm: '2025-06-02 00:10:00', - status: '未完成' - }, { "guid": "42118120003", - "code": "", + "code": "1", "name": "浮桥河水库-汛前检查", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", "place": "湖北省-黄冈市-麻城市-白果镇", - "lgtd": "114.875", - "lttd": "31.166667", + "lgtd": "114.88169", + "lttd": "31.171967", 'username': '熊杰', taskType: '日常巡查', tm: '2025-06-02 00:08:00', @@ -65,7 +50,7 @@ const data = [ { "guid": "42118120003", "code": "", - "name": "永红水库-日常管理", + "name": "浮桥河水库-日常管理", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", @@ -80,7 +65,7 @@ const data = [ { "guid": "42118120003", "code": "", - "name": "永丰水库-汛前检查", + "name": "浮桥河水库-汛前检查", "resRegCode": "42000020030-A4", "adName": "白果镇", "engScal": "大（2）型", @@ -102,14 +87,16 @@ function DrpReal({ style }) { } const jumpTo = (record) => { const { lgtd, lttd } = record; - const lgtdNum = Number(lgtd) + 0.0019; + const lgtdNum = Number(lgtd); const lttdNum = Number(lttd) - if (lgtdNum && lttdNum) { - dispatch.runtime.setCameraTarget({ - center: [lgtdNum, lttdNum + config.poiPositionOffsetY.hd], - zoom: config.poiPositionZoom.hd, - pitch: config.poiPitch, - }); + if (record.code == 1) { + if (lgtdNum && lttdNum) { + dispatch.runtime.setCameraTarget({ + center: [lgtdNum, lttdNum], + zoom: 17, + pitch: config.poiPitch, + }); + } } } return (