删除无用LOG
parent
24a262286e
commit
ea097ca111
|
|
@ -88,7 +88,6 @@ const MarkModal = (props) => {
|
|||
const info = props.info || {};
|
||||
const id = info.id;
|
||||
const type = props.type;
|
||||
console.log(info);
|
||||
return (
|
||||
<Modal
|
||||
title={props.title}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ export const useCesiumMap = (mackClickEvent) => {
|
|||
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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
|||
<div className="container">
|
||||
{list.length > 0
|
||||
? (
|
||||
<VirtualList
|
||||
data={list}
|
||||
height={364}
|
||||
itemHeight={110}
|
||||
itemKey="id"
|
||||
>
|
||||
{item => (
|
||||
<div key={item.id}>
|
||||
<div className="timeline-item">
|
||||
<div className="timeline-dot" />
|
||||
<div className="parent">
|
||||
<div style={{ color: "#FF0000" }}>
|
||||
<span>指令编号:</span>
|
||||
<span>{item.commandNumber}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">发送时间:</span>
|
||||
<span>{item.sendTime}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">指令类型:</span>
|
||||
<span>{item.commandType}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">指令内容:</span>
|
||||
<span>{item.commandContent}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{item.rescueInstructionExecutorFeedbackCOList.map((feedback, feedbackIndex) => (
|
||||
<div key={feedback.id} className="timeline-item">
|
||||
<div className="timeline-dot" />
|
||||
<div className="child">
|
||||
<div style={{ color: "#5EA629" }}>
|
||||
<span>指令反馈</span>
|
||||
<span>{String(item.rescueInstructionExecutorFeedbackCOList.length - feedbackIndex).padStart(2, "0")}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">反馈时间:</span>
|
||||
<span>{feedback.feedbackTime}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">指令执行状态:</span>
|
||||
<span>{feedback.commandStatus}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">反馈内容:</span>
|
||||
<span>{feedback.feedbackContent}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">现场图片:</span>
|
||||
<div>
|
||||
<Space wrap={true}>
|
||||
<div className="records-list" style={{ height: LIST_HEIGHT }}>
|
||||
{list.map((item) => {
|
||||
const feedbackList = item.rescueInstructionExecutorFeedbackCOList || [];
|
||||
|
||||
{(feedback.feedbackImageUrl ? feedback.feedbackImageUrl.split(",") : []).map((img, imgIndex) => (
|
||||
<Image key={imgIndex} src={getFileUrl() + img} alt="feedback" width={60} height={60} />
|
||||
))}
|
||||
</Space>
|
||||
</div>
|
||||
return (
|
||||
<div key={item.id}>
|
||||
<div className="timeline-item">
|
||||
<div className="timeline-dot" />
|
||||
<div className="parent">
|
||||
<div style={{ color: "#FF0000" }}>
|
||||
<span>指令编号:</span>
|
||||
<span>{item.commandNumber}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">发送时间:</span>
|
||||
<span>{item.sendTime}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">指令类型:</span>
|
||||
<span>{item.commandType}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">指令内容:</span>
|
||||
<span>{item.commandContent}</span>
|
||||
</div>
|
||||
{feedbackList.map((feedback, feedbackIndex) => (
|
||||
<div key={feedback.id}>
|
||||
|
||||
<div className="child">
|
||||
<div style={{ color: "#5EA629" }}>
|
||||
<span>指令反馈</span>
|
||||
<span>{String(feedbackList.length - feedbackIndex).padStart(2, "0")}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">反馈时间:</span>
|
||||
<span>{feedback.feedbackTime}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">指令执行状态:</span>
|
||||
<span>
|
||||
{ getLabelName({
|
||||
list: COMMAND_STATUS_ENUM,
|
||||
status: feedback.commandStatus,
|
||||
}) }
|
||||
</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">反馈内容:</span>
|
||||
<span>{feedback.feedbackContent}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span className="label">现场图片:</span>
|
||||
<div>
|
||||
<Space wrap={true}>
|
||||
|
||||
{(feedback.feedbackImageUrl ? feedback.feedbackImageUrl.split(",").filter(Boolean) : []).map(img => (
|
||||
<Image key={img} src={getFileUrl() + img} alt="feedback" width={60} height={60} />
|
||||
))}
|
||||
</Space>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</VirtualList>
|
||||
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)
|
||||
: <div style={{ height: 364, display: "flex", alignItems: "center", justifyContent: "center" }}>暂无数据</div>}
|
||||
: <div className="empty-records" style={{ height: LIST_HEIGHT }}>暂无数据</div>}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue