diff --git a/src/views/Home/MapCtrl/Pops/DaiChuLi.js b/src/views/Home/MapCtrl/Pops/DaiChuLi.js
index 64fbeabc7..b3a6125eb 100644
--- a/src/views/Home/MapCtrl/Pops/DaiChuLi.js
+++ b/src/views/Home/MapCtrl/Pops/DaiChuLi.js
@@ -3,6 +3,7 @@ import { Descriptions, Modal } from 'antd';
import {CloseOutlined} from '@ant-design/icons';
import { httpget2 } from '../../../../utils/request';
import apiurl from '../../../../service/apiurl';
+import ModalForm from '../../../rcgl/xcxj/xjwtcl/form';
import moment from "moment"
function Wxq({ id, data, dispatch }) {
@@ -39,7 +40,7 @@ function Wxq({ id, data, dispatch }) {
- daichuli
+
>
diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js
index 7f8d7c2da..463084206 100644
--- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js
+++ b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react"
+import { useEffect, useState, useRef } from "react"
import { Button, Modal, message, Table } from 'antd';
import {useDispatch, useSelector} from "react-redux";
@@ -9,16 +9,18 @@ import VectorLayer from "ol/layer/Vector";
import Style from "ol/style/Style";
import StrokeStyle from "ol/style/Stroke";
import { Vector as VectorSource } from "ol/source";
-
import { httppost2 } from "../../../utils/request";
import apiurl from "../../../service/apiurl";
import { geometryCenter } from "../../../utils/tools";
+import BasicCrudModal from "../../../components/crud/BasicCrudModal"
+import ModalForm from "../../rcgl/xcxj/xjwtcl/form"
import moment from "moment";
const Page = ({mySetTms}) => {
const dispatch = useDispatch();
+ const refModal = useRef();
let mapObj = useSelector(s => s.map.map)
const [ dataObj, setDataObj ] = useState({})
const [ data, setData ] = useState([])
@@ -34,8 +36,8 @@ const Page = ({mySetTms}) => {
];
const columns2 = [
- { title: '上报时间', key: 'handleTime', dataIndex: 'handleTime',align: "center", ellipsis: true },
- { title: '巡检问题描述', key: 'problemDesc', dataIndex: 'problemDesc',align: "center" },
+ { title: '上报时间', key: 'finishTime', dataIndex: 'finishTime',align: "center", ellipsis: true },
+ { title: '巡检问题描述', key: 'itemDesc', dataIndex: 'itemDesc',align: "center" },
];
useEffect(()=>{
@@ -185,19 +187,28 @@ const Page = ({mySetTms}) => {
onRow={
(data)=>({
onClick:()=>{
+ refModal.current.showView(data);
// dispatch.map.setLayerVisible({"HdswLayer":true});
- dispatch.runtime.setFeaturePop({
- id: data.stnm,
- data: data,
- type: 'daichuli',
- lgtd: data.lgtd,
- lttd: data.lttd,
- })
+ // dispatch.runtime.setFeaturePop({
+ // id: data.stnm,
+ // data: data,
+ // type: 'daichuli',
+ // lgtd: data.lgtd,
+ // lttd: data.lttd,
+ // })
}
})
}
/>
+
+
)
}