Compare commits

..

No commits in common. "4ce1b9bea7207cf2e41c9de9a52911308afdba5a" and "3492bcff3c50c136ded9ec7e62f613df5c75d4ab" have entirely different histories.

3 changed files with 16 additions and 30 deletions

View File

@ -3,7 +3,6 @@ import { Descriptions, Modal } from 'antd';
import {CloseOutlined} from '@ant-design/icons'; import {CloseOutlined} from '@ant-design/icons';
import { httpget2 } from '../../../../utils/request'; import { httpget2 } from '../../../../utils/request';
import apiurl from '../../../../service/apiurl'; import apiurl from '../../../../service/apiurl';
import ModalForm from '../../../rcgl/xcxj/xjwtcl/form';
import moment from "moment" import moment from "moment"
function Wxq({ id, data, dispatch }) { function Wxq({ id, data, dispatch }) {
@ -40,7 +39,7 @@ function Wxq({ id, data, dispatch }) {
</div> </div>
</div> </div>
<div className='homeModal2_content'> <div className='homeModal2_content'>
<ModalForm/> daichuli
</div> </div>
</div> </div>
</> </>

View File

@ -1,4 +1,4 @@
import { useEffect, useState, useRef } from "react" import { useEffect, useState } from "react"
import { Button, Modal, message, Table } from 'antd'; import { Button, Modal, message, Table } from 'antd';
import {useDispatch, useSelector} from "react-redux"; import {useDispatch, useSelector} from "react-redux";
@ -9,18 +9,16 @@ import VectorLayer from "ol/layer/Vector";
import Style from "ol/style/Style"; import Style from "ol/style/Style";
import StrokeStyle from "ol/style/Stroke"; import StrokeStyle from "ol/style/Stroke";
import { Vector as VectorSource } from "ol/source"; import { Vector as VectorSource } from "ol/source";
import { httppost2 } from "../../../utils/request"; import { httppost2 } from "../../../utils/request";
import apiurl from "../../../service/apiurl"; import apiurl from "../../../service/apiurl";
import { geometryCenter } from "../../../utils/tools"; import { geometryCenter } from "../../../utils/tools";
import BasicCrudModal from "../../../components/crud/BasicCrudModal"
import ModalForm from "../../rcgl/xcxj/xjwtcl/form"
import moment from "moment"; import moment from "moment";
const Page = ({mySetTms}) => { const Page = ({mySetTms}) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const refModal = useRef();
let mapObj = useSelector(s => s.map.map) let mapObj = useSelector(s => s.map.map)
const [ dataObj, setDataObj ] = useState({}) const [ dataObj, setDataObj ] = useState({})
const [ data, setData ] = useState([]) const [ data, setData ] = useState([])
@ -36,8 +34,8 @@ const Page = ({mySetTms}) => {
]; ];
const columns2 = [ const columns2 = [
{ title: '上报时间', key: 'finishTime', dataIndex: 'finishTime',align: "center", ellipsis: true }, { title: '上报时间', key: 'handleTime', dataIndex: 'handleTime',align: "center", ellipsis: true },
{ title: '巡检问题描述', key: 'itemDesc', dataIndex: 'itemDesc',align: "center" }, { title: '巡检问题描述', key: 'problemDesc', dataIndex: 'problemDesc',align: "center" },
]; ];
useEffect(()=>{ useEffect(()=>{
@ -119,11 +117,11 @@ const Page = ({mySetTms}) => {
<div className="xunchaxunjian"> <div className="xunchaxunjian">
<div className="bodyBox"> <div className="bodyBox">
<div className="bodyBoxItem"> <div className="bodyBoxItem">
<div className="num" style={{color:'#04D919'}}>{data2.length||0}</div> <div className="num" style={{color:'#04D919'}}>{data3||0}</div>
<div className="content">本月巡查</div> <div className="content">本月巡查</div>
</div> </div>
<div className="bodyBoxItem"> <div className="bodyBoxItem">
<div className="num" style={{color:'#04D919'}}>{data3||0}</div> <div className="num" style={{color:'#04D919'}}>{data2?.length||0}</div>
<div className="content">本年巡查</div> <div className="content">本年巡查</div>
<div></div> <div></div>
</div> </div>
@ -187,28 +185,19 @@ const Page = ({mySetTms}) => {
onRow={ onRow={
(data)=>({ (data)=>({
onClick:()=>{ onClick:()=>{
refModal.current.showView(data);
// dispatch.map.setLayerVisible({"HdswLayer":true}); // dispatch.map.setLayerVisible({"HdswLayer":true});
// dispatch.runtime.setFeaturePop({ dispatch.runtime.setFeaturePop({
// id: data.stnm, id: data.stnm,
// data: data, data: data,
// type: 'daichuli', type: 'daichuli',
// lgtd: data.lgtd, lgtd: data.lgtd,
// lttd: data.lttd, lttd: data.lttd,
// }) })
} }
}) })
} }
/> />
</div> </div>
<BasicCrudModal
width={1000}
ref={refModal}
title=""
component={ModalForm}
title1="详情"
/>
</div> </div>
) )
} }

View File

@ -3,7 +3,6 @@ import { Table, Modal, message } from 'antd';
import {CloseOutlined} from "@ant-design/icons"; import {CloseOutlined} from "@ant-design/icons";
import usePageTable from '../../../../components/crud/usePageTable2' import usePageTable from '../../../../components/crud/usePageTable2'
import { createCrudService } from '../../../../components/crud/_'; import { createCrudService } from '../../../../components/crud/_';
import AiWarn from "../../../../views/spjk/aiWarn"
import { httppost2 } from "../../../../utils/request"; import { httppost2 } from "../../../../utils/request";
import apiurl from "../../../../service/apiurl"; import apiurl from "../../../../service/apiurl";
@ -22,9 +21,8 @@ const Page = () => {
}, []) }, [])
return ( return (
<div className="ant-card-body" style={{padding:"0 10px",height:'600px',overflowY:'auto'}}> <div className="ant-card-body" style={{padding:"0 10px"}}>
<AiWarn/> <div>时间{moment().format('YYYY-MM-DD HH:mm:ss')} {moment().format('YYYY-MM-DD HH:mm:ss')}</div>
{/* <div>时间:{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}</div> */}
</div> </div>
) )
} }