Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web
xielei
commit
4545172312
|
|
@ -1 +1 @@
|
|||
PUBLIC_URL=/xyt
|
||||
PUBLIC_URL=/tsg
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
GENERATE_SOURCEMAP=false
|
||||
PUBLIC_URL=/xyt
|
||||
PUBLIC_URL=/tsg
|
||||
|
|
@ -4,6 +4,7 @@ import { FolderOutlined, ProfileOutlined } from '@ant-design/icons';
|
|||
import { useLocation, useNavigate } from 'react-router';
|
||||
import { MenuItem } from '../../models/_';
|
||||
import { useSelector } from 'react-redux';
|
||||
import { debug } from 'console';
|
||||
|
||||
const { SubMenu } = Menu;
|
||||
|
||||
|
|
@ -38,11 +39,11 @@ const SiderMenu: React.FC<{
|
|||
}
|
||||
|
||||
|
||||
useEffect(()=>{
|
||||
if(openKeys?.[0]==='undefined'){
|
||||
setOpenKeys(menuIndexes[1])
|
||||
}
|
||||
},[menuIndexes[1]])
|
||||
// useEffect(() => {
|
||||
// if (openKeys?.[0] === 'undefined') {
|
||||
// setOpenKeys(menuIndexes[1])
|
||||
// }
|
||||
// },[menuIndexes[1]])
|
||||
|
||||
|
||||
const onOpenChange = (keys: any) => {
|
||||
|
|
|
|||
|
|
@ -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 }) {
|
|||
</div>
|
||||
</div>
|
||||
<div className='homeModal2_content'>
|
||||
daichuli
|
||||
<ModalForm/>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
|
|
|
|||
|
|
@ -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(()=>{
|
||||
|
|
@ -117,11 +119,11 @@ const Page = ({mySetTms}) => {
|
|||
<div className="xunchaxunjian">
|
||||
<div className="bodyBox">
|
||||
<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>
|
||||
<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></div>
|
||||
</div>
|
||||
|
|
@ -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,
|
||||
// })
|
||||
}
|
||||
})
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<BasicCrudModal
|
||||
width={1000}
|
||||
ref={refModal}
|
||||
title=""
|
||||
component={ModalForm}
|
||||
title1="详情"
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import { Table, Modal, message } from 'antd';
|
|||
import {CloseOutlined} from "@ant-design/icons";
|
||||
import usePageTable from '../../../../components/crud/usePageTable2'
|
||||
import { createCrudService } from '../../../../components/crud/_';
|
||||
import AiWarn from "../../../../views/spjk/aiWarn"
|
||||
|
||||
import { httppost2 } from "../../../../utils/request";
|
||||
import apiurl from "../../../../service/apiurl";
|
||||
|
|
@ -21,8 +22,9 @@ const Page = () => {
|
|||
}, [])
|
||||
|
||||
return (
|
||||
<div className="ant-card-body" style={{padding:"0 10px"}}>
|
||||
<div>时间：{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}</div>
|
||||
<div className="ant-card-body" style={{padding:"0 10px",height:'600px',overflowY:'auto'}}>
|
||||
<AiWarn/>
|
||||
{/* <div>时间：{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}</div> */}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd, showCheckbox
|
|||
<Row>
|
||||
<Col span={24}>
|
||||
<Form.Item
|
||||
label="视频区域"
|
||||
label="管控区域"
|
||||
name="name"
|
||||
rules={[{required: true}]}
|
||||
>
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ const getResultList = async() => {
|
|||
},
|
||||
}))
|
||||
setFileList(imgFile)
|
||||
form.setFieldValue("result",record.result.map(item => item.sysDictId))
|
||||
form.setFieldValue("result",record?.result?.map(item => item.sysDictId))
|
||||
}
|
||||
}, [record, mode])
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,10 @@ export default function jgOptions(personData) {
|
|||
tooltip: {},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
axisLabel: {
|
||||
interval: Xdata.length > 5 ? 0 : 1, // 强制显示所有标签
|
||||
rotate: Xdata.length > 5 ? 20 : 0 // 旋转角度
|
||||
},
|
||||
data: Xdata
|
||||
},
|
||||
yAxis: {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
|
||||
export default function jgOption(data1) {
|
||||
console.log("123", data1);
|
||||
const one = `${process.env.PUBLIC_URL}/assets/images/one.png`;
|
||||
const two = `${process.env.PUBLIC_URL}/assets/images/two.png`;
|
||||
const three = `${process.env.PUBLIC_URL}/assets/images/three.png`;
|
||||
|
|
|
|||
Loading…
Reference in New Issue