- {key}
+ {key == '白蚁告警' ? key + "(" + tms[0]?.slice(0,16) + "至" + tms[1]?.slice(0,16) + ')':key }
setOpen(false)} style={{color:"#333"}}/>
@@ -111,7 +121,8 @@ const Page = ({mySetTms}) => {
{ key==='位移告警'?setOpen(false)}/>:null }
{ key==='渗压告警'?setOpen(false)}/>:null }
{ key==='渗流告警'?setOpen(false)}/>:null }
- { key==='AI告警'?setOpen(false)}/>:null }
+
+
+ )
+}
+
+export default Page
diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
index f04eaf5c5..2c2f4b815 100644
--- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
+++ b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
@@ -115,6 +115,12 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
[85, data[alltype[3]]]
]
: []
+ const filteredArray = line.filter(subArray => {
+ return subArray.every(item => item !== null && item !== undefined);
+ });
+ console.log("line",line);
+
+
return {
toolbox: {
show: true,
@@ -377,7 +383,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
lineStyle: {
color: '#5487FF',
},
- data: line
+ data: filteredArray
},
]
};
diff --git a/src/views/gcaqjc/gcaqyj/yhyj/index.js b/src/views/gcaqjc/gcaqyj/yhyj/index.js
index c8ac6d487..7caafc747 100644
--- a/src/views/gcaqjc/gcaqyj/yhyj/index.js
+++ b/src/views/gcaqjc/gcaqyj/yhyj/index.js
@@ -57,7 +57,8 @@ const Page = () => {
{record.valueTwo || ''}
},
- { title: '校验规则描述', key: 'ruleDesc', dataIndex: 'ruleDesc', width: 250, ellipsis: true,align:"center", },
+ { title: '校验规则描述', key: 'ruleDesc', dataIndex: 'ruleDesc', width: 250, ellipsis: true, align: "center", },
+ { title: '处理建议', key: 'resolveSuggest', dataIndex: 'resolveSuggest', width: 200, ellipsis: true, align:"center" },
];
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js b/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
index 8416a0b13..1ed629d96 100644
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
+++ b/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
@@ -1,92 +1,92 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal,Radio } from 'antd';
+import React, { useEffect, useState, useMemo } from 'react';
+import { Form, Button, Input, Row, Col, DatePicker, Upload, message, Image, Modal, Radio } from 'antd';
import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
import apiurl from '../../../../service/apiurl';
import NormalSelect from '../../../../components/Form/NormalSelect';
import { httppost2 } from '../../../../utils/request';
import moment from 'moment';
-const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
+const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
const optionsType = [
{
label: "渗压监测",
- value:1
+ value: 1
},
{
label: "渗流监测",
- value:2
+ value: 2
},
{
- label:"位移监测",
- value:3
+ label: "位移监测",
+ value: 3
},
]
const optionsLevel = [
{
label: "黄色告警",
- value:1
+ value: 1
},
{
label: "红色告警",
- value:2
+ value: 2
},
]
const conditionOneType = [
{
label: ">",
- value:">"
+ value: ">"
},
{
label: "<",
- value:"<"
+ value: "<"
},
{
label: "=",
- value:"="
+ value: "="
},
{
label: ">=",
- value:">="
+ value: ">="
},
{
label: "<=",
- value:"<="
+ value: "<="
},
{
label: "!=",
- value:"!="
+ value: "!="
},
]
-
+
const condition = [
{
label: "且",
- value:1
+ value: 1
},
{
label: "或",
- value:2
+ value: 2
},
]
const wyOptions = [
{
label: "X方向",
- value:"x"
+ value: "x"
},
{
label: "Y方向",
- value:"y"
+ value: "y"
},
{
label: "H方向",
- value:"h"
+ value: "h"
},
]
- console.log("record",record);
+ console.log("record", record);
const [form] = Form.useForm();
const [staCodeList, setStaCodeList] = useState([])//渗压
const [Condition, setCondition] = useState("")
@@ -94,16 +94,16 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
const [slStacodeList, setSlStacodeList] = useState([])//渗流
const onFinish = (values) => {
values.valueOne = values.valueOne ? Number(values.valueOne) : ''
- values.valueTwo = values.valueTwo ? Number(values.valueTwo) : ''
+ values.valueTwo = values.valueTwo ? Number(values.valueTwo) : ''
if (mode === 'edit') {
values.id = record.id;
values.createTime = record.createTime
- onEdit(apiurl.gcaqjc.gcaqyj.yjgzpz.edit,values)
+ onEdit(apiurl.gcaqjc.gcaqyj.yjgzpz.edit, values)
}
if (mode === 'save') {
- onSave(apiurl.gcaqjc.gcaqyj.yjgzpz.save,values)
+ onSave(apiurl.gcaqjc.gcaqyj.yjgzpz.save, values)
}
-
+
}
const [codeList, setCodeList] = useState([])//位移
@@ -111,7 +111,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
const getwYCode = async () => {
try {
const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.list)
- setCodeList(res.data.map(s=>({stationCode:s.cd,label:s.cdNm,value:s.cd})));//
+ setCodeList(res.data.map(s => ({ stationCode: s.cd, label: s.cdNm, value: s.cd })));//
} catch (error) {
console.log(error);
}
@@ -120,23 +120,23 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
const getSlCode = async () => {
try {
const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.slList)
- setSlStacodeList(res.data.map(s=>({stationCode:s.dvcd,label:s.dvcd,value:s.dvcd})));
+ setSlStacodeList(res.data.map(s => ({ stationCode: s.dvcd, label: s.dvcd, value: s.dvcd })));
} catch (error) {
console.log(error);
}
}
- const getStationCode = async () => {
- try {
- const res = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.list)
- setStaCodeList(res.data.map(s=>({stationCode:s.dvcd,label:s.dvcd,value:s.dvcd})));
- } catch (error) {
- console.log(error);
+ const getStationCode = async () => {
+ try {
+ const res = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.list)
+ setStaCodeList(res.data.map(s => ({ stationCode: s.dvcd, label: s.dvcd, value: s.dvcd })));
+ } catch (error) {
+ console.log(error);
+ }
}
-}
-
- useEffect(()=>{
- if (mode !== "save" ) {
- // getFileInfo(record)
+
+ useEffect(() => {
+ if (mode !== "save") {
+ // getFileInfo(record)
setCondition(record?.condition)
setTypes(record.type)
}
@@ -149,10 +149,10 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
}, [])
useEffect(() => {
if (mode == "save") {
- form.setFieldValue("status", 1)
+ form.setFieldValue("status", 1)
}
}, [mode])
-
+
return (
<>
);
diff --git a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js b/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
index 434c92f0a..d6bc6bdc6 100644
--- a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
+++ b/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
@@ -11,7 +11,7 @@ export default function dtOption(doubleData) {
const textColor = '#666'
return {
title: {
- text: `${doubleData?.stationCode}测压管水位过程线`,
+ text: `${doubleData?.cd}测压管水位过程线`,
bottom: "5%",
left: "40%",
textStyle: {
@@ -26,7 +26,7 @@ const textColor = '#666'
show: true,
excludeComponents: ['toolbox'],
pixelRatio: 2,
- name:`${doubleData?.stationCode}测压管水位过程线`
+ name:`${doubleData?.cd}测压管水位过程线`
}
},
right: "20%",
@@ -144,7 +144,7 @@ const textColor = '#666'
series: [
{
- name: doubleData?.stationCode,
+ name: doubleData?.cd,
type: 'line',
yAxisIndex: 0,
symbol: 'circle',
diff --git a/src/views/rcgl/byfz/bypc/index.js b/src/views/rcgl/byfz/bypc/index.js
index 396b37fa6..5f84f6abb 100644
--- a/src/views/rcgl/byfz/bypc/index.js
+++ b/src/views/rcgl/byfz/bypc/index.js
@@ -1,51 +1,65 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image,Tag } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
+import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image, Tag } from 'antd';
+import { FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons';
+import { useSelector, useDispatch } from 'react-redux';
import ToolBar from './toolbar';
import ModalForm from './form';
import apiurl from '../../../../service/apiurl';
import usePageTable from '../../../../components/crud/usePageTable2';
import { createCrudService } from '../../../../components/crud/_';
-import { httppost2 } from '../../../../utils/request';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
+import { httppost2, httpget2 } from '../../../../utils/request';
+import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
+import PointHistory from './pointHistory';
+import PrecessForm from './precessForm'
import './index.less';
import moment from 'moment';
+// 引入OpenLayers相关依赖
+import Map from 'ol/Map';
+import View from 'ol/View';
+import TileLayer from 'ol/layer/Tile';
+import XYZSource from 'ol/source/XYZ';
+import * as proj from 'ol/proj';
+import Feature from 'ol/Feature';
+import Point from 'ol/geom/Point';
+import { Vector as VectorLayer } from 'ol/layer';
+import { Vector as VectorSource } from 'ol/source';
+import { Circle as CircleStyle, Fill, Stroke, Style, Text } from 'ol/style';
+import Overlay from 'ol/Overlay';
const url = "http://223.75.53.141:9100/gs-tsg"
const Page = () => {
const role = useSelector(state => state.auth.role);
const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
- const viewBtn = role?.rule?.find(item => item.menuName == "查看")|| true;
+ const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true;
const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
const initData = {
obDate: moment().format('YYYY-MM-DD')
}
-
- const [stats, setStats] = useState({
- total: 400,
- withMosquito: 14,
- withoutMosquito: 382,
- noData: 4
- });
- const surveyType = {
- 1: "日常检查排查",
- 2: "定期普查",
- 3:"专项调查"
- }
- const surveyWay = {
- 1: "人工排查法",
- 2: "引诱法",
- 3: "仪器探测法",
- 4:"其他"
- }
- const isHarm = {
- 0: "无危害",
- 1: "有危害",
- }
+ // 添加地图相关的状态和引用
+ const mapContainerRef = useRef(null);
+ const [map, setMap] = useState(null);
+ const [vectorLayer, setVectorLayer] = useState(null);
+ const [selectedFeature, setSelectedFeature] = useState(null);
+ const [popupOverlay, setPopupOverlay] = useState(null);
+ const popupRef = useRef(null);
+ // 在组件顶部的状态声明中添加一个新的状态
+ const [highlightLayer, setHighlightLayer] = useState(null);
+ // 点位弹框
+ const [modalVisible, setModalVisible] = useState(false)
+ const [detailPoint, setDetailPoint] = useState({})
+
+
+ // 白蚁处理弹框
+ const [precessVisible, setPrecessVisible] = useState(false)
+ const [mode, setMode] = useState('save')
+
+ const dispatch = useDispatch();
+
+
const refModal = useRef();
- const [searchVal, setSearchVal] = useState({...initData})
+ const [searchVal, setSearchVal] = useState({ ...initData })
const [count, setCount] = useState({})
+ const [allCdList, setAllCdList] = useState([])
// const columns = [
// { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
// {title: '填报日期', key: 'reportDate', dataIndex: 'reportDate', width: 140,},
@@ -56,7 +70,7 @@ const Page = () => {
// {
// title: '普查方式', key: 'surveyWay', dataIndex: 'surveyWay', width: 200,
// render: (value) => {value ? surveyWay[value] : ''}
-
+
// },
// {
// title: '危害情况', key: 'isHarm', dataIndex: 'isHarm', width: 200,
@@ -83,43 +97,63 @@ const Page = () => {
dataIndex: 'obDate',
key: 'obDate',
width: 180,
- align:'center'
+ align: 'center'
},
{
title: '测点编号',
dataIndex: 'order',
key: 'order',
width: 120,
- align:'center'
+ align: 'center'
},
{
title: '有无白蚁',
dataIndex: 'status',
- align:'center',
+ align: 'center',
key: 'status',
width: 100,
- render:(text, record) => {
+ render: (text, record) => {
// 如果 isHarm 为 null 或 undefined，显示无
if (text == null) {
- return
-
-
-
-
- {count.totalPoint}
- 个
+
+
+
+
-
+
+
-
+
+
-
-
+
- 总监测点数
-
+ {count.totalPoint}
+ 个
+
+ 总监测点数
-
-
-
- {count.hasAnt}
- 个
-
- 有白蚁
-
-
-
-
- {count.notAnt}
- 个
-
- 无白蚁
-
-
-
-
-
- {count.noData}
- 个
-
- 离线
-
+
+
+
+ {count.hasAnt}
+ 个
+
+ 有白蚁
+
+
+
+
+ {count.notAnt}
+ 个
+
+ 无白蚁
+
+
+
+
+
+ {count.noData}
+ 个
+
+ 离线
+
-
+ />
+
+
+ ({
+ onClick: (event) => handleRowClick(record,event), // 添加行点击事件
+ style: { cursor: 'pointer' } // 添加鼠标指针样式
+ })}
+ />
+
-
+
+ {/* 添加测点详情Modal */}
+
+
+ 
+
+
+
+ },
+ {
+ title: '巡查状态', key: 'isNormal', dataIndex: 'isNormal', width: 100, align: "center",
+ render: (value) => {value}
+
+
+
+ {value === null ? '' :
+ 
+ }
+
+ },
+ { title: '巡查问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 300, ellipsis: true },
+ {
+ title: '巡查图片', key: 'inspectPics', dataIndex: 'inspectPics', width: 100, align: "center",
+ render: (value) =>
+ }
+ {value ? reviewPic(value)}> {value.length} : ''}
+
+ },
+ {
+ title: '巡查视频', key: 'inspectVideos', dataIndex: 'inspectVideos', width: 100, align: "center",
+ render: (value) => {value ? reviewVideo(value)}> {value.length} : ''}
+
+ },
+ {
+ title: '是否处理', key: 'isHandle', dataIndex: 'isHandle', width: 100, align: "center",
+ render: (value) => {value ? "是" : "否"}
+ },
+ { title: '处理人', key: 'handleUserName', dataIndex: 'handleUserName', width: 150 },
+ {
+ title: '操作', key: 'operator', dataIndex: 'operator', width: 150,
+ render: (value, row) => handleDetail(row)}>处理详情
+ },
+
+ ]
+ const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
+
+ const renderItems = (items) => {
+ const result = items.map(o => ({
+ key: o.pointId,
+ label: o.name + `(${o.children.filter(r => r.isNormal == 0).length})`,
+ children:
+
+ {mode == 'view' &&
+ setVideoOpen(false)}
+ >
+
+
+
+ setHandleDetailsOpen(false)}
+ >
+ <>
+
+
+
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/rcgl/byfz/bypc/toolbar.js b/src/views/rcgl/byfz/bypc/toolbar.js
index bee981df4..e2c052468 100644
--- a/src/views/rcgl/byfz/bypc/toolbar.js
+++ b/src/views/rcgl/byfz/bypc/toolbar.js
@@ -34,13 +34,13 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role, initData }) => {
+ 基本信息
+
+ }
+
+
+ setImgVisible(vis),
+ }}
+ >
+ {
+ imgList.length > 0 ? imgList.map(item => (
+
+
+
+
+
+
+