From 173772aa72a6c70e1cb1317c4721792a8cdcbaa9 Mon Sep 17 00:00:00 2001 From: qzc Date: Mon, 30 Sep 2024 10:27:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/MapCtrl/Pops/DaiChuLi.js | 3 +- .../item_xunchaxunjian.js | 33 ++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) 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, + // }) } }) } /> + + ) } From 79aceb1e013a78f8020ce5124db6e3721fefd2cb Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Mon, 30 Sep 2024 13:13:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix():=20=E8=80=83=E6=A0=B8=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DashboardLayout/SiderMenu.tsx | 11 ++++++----- src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx | 2 +- src/views/rcgl/aqgl/fxgkqd/form.js | 2 +- src/views/rcgl/jdkh/khtj/jgOptions.js | 4 ++++ src/views/sz/zzjgck/jgoption.js | 1 - 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/DashboardLayout/SiderMenu.tsx b/src/components/DashboardLayout/SiderMenu.tsx index 5ce8bae6c..f8ed96d01 100644 --- a/src/components/DashboardLayout/SiderMenu.tsx +++ b/src/components/DashboardLayout/SiderMenu.tsx @@ -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) => { diff --git a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx b/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx index 61ea8f068..1f14ce04a 100644 --- a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx +++ b/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx @@ -293,7 +293,7 @@ const AdcdTreeSelector: React.FC = ({ onSelectFun, setAdcd, showCheckbox diff --git a/src/views/rcgl/aqgl/fxgkqd/form.js b/src/views/rcgl/aqgl/fxgkqd/form.js index 3689537f8..83784df46 100644 --- a/src/views/rcgl/aqgl/fxgkqd/form.js +++ b/src/views/rcgl/aqgl/fxgkqd/form.js @@ -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]) diff --git a/src/views/rcgl/jdkh/khtj/jgOptions.js b/src/views/rcgl/jdkh/khtj/jgOptions.js index 7f364dc5f..da724e820 100644 --- a/src/views/rcgl/jdkh/khtj/jgOptions.js +++ b/src/views/rcgl/jdkh/khtj/jgOptions.js @@ -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: { diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js index c1ed7bb51..7ef1d8e97 100644 --- a/src/views/sz/zzjgck/jgoption.js +++ b/src/views/sz/zzjgck/jgoption.js @@ -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`; From ef4be1433cc18b21947defe99422899c659b5925 Mon Sep 17 00:00:00 2001 From: qzc Date: Mon, 30 Sep 2024 13:16:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js | 4 ++-- src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js index 463084206..f1de3079d 100644 --- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js +++ b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js @@ -119,11 +119,11 @@ const Page = ({mySetTms}) => {
-
{data3||0}
+
{data2.length||0}
本月巡查
-
{data2?.length||0}
+
{data3||0}
本年巡查
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js b/src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js index bcc65e013..d49af082f 100644 --- a/src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js +++ b/src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js @@ -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 ( -
-
时间：{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}
+
+ + {/*
时间：{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}
*/}
) } From bb849641af289b51ab939187475c25c6e9389a2d Mon Sep 17 00:00:00 2001 From: qzc Date: Mon, 30 Sep 2024 13:17:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B7=9F=E8=B7=AF=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index d42970bb4..23a1bf7e2 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -PUBLIC_URL=/xyt \ No newline at end of file +PUBLIC_URL=/tsg \ No newline at end of file diff --git a/.env.production b/.env.production index acd735cc2..6dcc99b9f 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,2 @@ GENERATE_SOURCEMAP=false -PUBLIC_URL=/xyt \ No newline at end of file +PUBLIC_URL=/tsg \ No newline at end of file