From ea097ca1115c7d25666aeee03b396de7e606476b Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Tue, 30 Jun 2026 17:41:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8LOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Rescue/Command/components/Cesium/index.js | 1 - .../Command/components/Cesium/useCesiumMap.js | 1 - .../CommandFeedbackRecords/index.js | 138 +++++++++--------- .../Command/components/MarkOptions/index.js | 3 +- .../NonContingencyInstructions/index.js | 5 +- .../EmergencyRescue/Rescue/Command/index.less | 28 ++++ .../FirefightingEquipment/List/index.js | 2 +- 7 files changed, 104 insertions(+), 74 deletions(-) diff --git a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js index dd75f10..0e3e29b 100644 --- a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js +++ b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js @@ -88,7 +88,6 @@ const MarkModal = (props) => { const info = props.info || {}; const id = info.id; const type = props.type; - console.log(info); return ( { mapInstanceRef.current.cesiumWidget.screenSpaceEventHandler.removeInputAction(window.Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK); mapInstanceRef.current.cesiumWidget.screenSpaceEventHandler.removeInputAction(window.Cesium.ScreenSpaceEventType.LEFT_CLICK); const screenSpaceEventHandler = new window.Cesium.ScreenSpaceEventHandler(mapInstanceRef.current.scene.canvas); - console.log(screenSpaceEventHandler); screenSpaceEventHandler.setInputAction((movement) => { const pick = mapInstanceRef.current.scene.pick(movement.position); if (window.Cesium.defined(pick) && pick.id?.id && pick.id?.monitorItems) { diff --git a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/CommandFeedbackRecords/index.js b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/CommandFeedbackRecords/index.js index c1b05d3..a7d545d 100644 --- a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/CommandFeedbackRecords/index.js +++ b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/CommandFeedbackRecords/index.js @@ -1,12 +1,14 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import VirtualList from "@rc-component/virtual-list"; import { useInterval } from "ahooks"; import { Image, Space } from "antd"; import { useEffect, useState } from "react"; -import { getFileUrl } from "zy-react-library/utils"; +import { getFileUrl, getLabelName } from "zy-react-library/utils"; +import { COMMAND_STATUS_ENUM } from "~/enumerate/constant"; import { NS_RESUE } from "~/enumerate/namespace"; import circle from "../../images/circle.png"; +const LIST_HEIGHT = 364; + function CommandFeedbackRecords(props) { const [list, setList] = useState([]); @@ -36,74 +38,80 @@ function CommandFeedbackRecords(props) {
{list.length > 0 ? ( - - {item => ( -
-
-
-
-
- 指令编号： - {item.commandNumber} -
-
- 发送时间： - {item.sendTime} -
-
- 指令类型： - {item.commandType} -
-
- 指令内容： - {item.commandContent} -
-
-
- {item.rescueInstructionExecutorFeedbackCOList.map((feedback, feedbackIndex) => ( -
-
-
-
- 指令反馈 - {String(item.rescueInstructionExecutorFeedbackCOList.length - feedbackIndex).padStart(2, "0")} -
-
- 反馈时间： - {feedback.feedbackTime} -
-
- 指令执行状态： - {feedback.commandStatus} -
-
- 反馈内容： - {feedback.feedbackContent} -
-
- 现场图片： -
- +
+ {list.map((item) => { + const feedbackList = item.rescueInstructionExecutorFeedbackCOList || []; - {(feedback.feedbackImageUrl ? feedback.feedbackImageUrl.split(",") : []).map((img, imgIndex) => ( - feedback - ))} - -
+ return ( +
+
+
+
+
+ 指令编号： + {item.commandNumber}
+
+ 发送时间： + {item.sendTime} +
+
+ 指令类型： + {item.commandType} +
+
+ 指令内容： + {item.commandContent} +
+ {feedbackList.map((feedback, feedbackIndex) => ( +
+ +
+
+ 指令反馈 + {String(feedbackList.length - feedbackIndex).padStart(2, "0")} +
+
+ 反馈时间： + {feedback.feedbackTime} +
+
+ 指令执行状态： + + { getLabelName({ + list: COMMAND_STATUS_ENUM, + status: feedback.commandStatus, + }) } + +
+
+ 反馈内容： + {feedback.feedbackContent} +
+
+ 现场图片： +
+ + + {(feedback.feedbackImageUrl ? feedback.feedbackImageUrl.split(",").filter(Boolean) : []).map(img => ( + feedback + ))} + +
+
+
+
+ ))}
+
- ))} -
- )} - + +
+ ); + })} +
) - :
暂无数据
} + :
暂无数据
}
); diff --git a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/MarkOptions/index.js b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/MarkOptions/index.js index 26d5d1b..3187976 100644 --- a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/MarkOptions/index.js +++ b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/MarkOptions/index.js @@ -180,7 +180,6 @@ function MarkOptions(props) { }; const onClickLast = async (parentIndex, item, index) => { - console.log(parentIndex, item,index); setList(produce((draft) => { draft[parentIndex].children[index].checked = !draft[parentIndex].children[index].checked; })); @@ -190,7 +189,7 @@ function MarkOptions(props) { return; } const { data } = await item.action(); - console.log(data); + props.addMarkPoint(data, { mapType: item.type, mapIcon: item.icon, diff --git a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/NonContingencyInstructions/index.js b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/NonContingencyInstructions/index.js index 1ec61ec..f445189 100644 --- a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/NonContingencyInstructions/index.js +++ b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/NonContingencyInstructions/index.js @@ -36,7 +36,6 @@ function NonContingencyInstructions(props) { usePagination: false, useStorageQueryCriteria: false, }); - useEffect(() => { props.planId && enterprisePlanOrganizationPersonnelGetData(); }, [props.planId]); @@ -185,9 +184,7 @@ function NonContingencyInstructions(props) { const SendCommandModalComponent = (props) => { const [form] = FormBuilder.useForm(); - useEffect(() => { - console.log(props); - }, []); + const onSubmit = async (values) => { const planInfo = props.planInfo || {}; const administrativePosition = getAdministrativePosition(props.info); diff --git a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/index.less b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/index.less index f996040..96b80d0 100644 --- a/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/index.less +++ b/src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/index.less @@ -59,6 +59,34 @@ .container { padding-left: 20px; + .records-list { + overflow-x: hidden; + overflow-y: auto; + padding-right: 6px; + scrollbar-gutter: stable; + scrollbar-color: #7FAEED transparent; + scrollbar-width: thin; + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + border-radius: 6px; + background-color: #7FAEED; + } + + &::-webkit-scrollbar-track { + background-color: transparent; + } + } + + .empty-records { + display: flex; + align-items: center; + justify-content: center; + } + .timeline-item { position: relative; padding-left: 20px; diff --git a/src/pages/Container/Enterprise/EmergencyResource/FirefightingEquipment/List/index.js b/src/pages/Container/Enterprise/EmergencyResource/FirefightingEquipment/List/index.js index 9f2b995..52c5665 100644 --- a/src/pages/Container/Enterprise/EmergencyResource/FirefightingEquipment/List/index.js +++ b/src/pages/Container/Enterprise/EmergencyResource/FirefightingEquipment/List/index.js @@ -19,7 +19,7 @@ function List(props) { form, params: { corpinfoId: query.corpinfoId }, }); - console.log(query); + const getFireArea = async () => { const { data } = await props["fireAreaListAll"]({ corpinfoId: query.corpinfoId }); setFireArea(data);