部分问题修复

master
LiuJiaNan 2026-04-14 10:50:21 +08:00
parent ba7801a494
commit e0c85d9be4
8 changed files with 17 additions and 36 deletions

View File

@ -71,6 +71,7 @@ function List(props) {
return ( return (
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}> <Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
<Search <Search
labelCol={{ span: 4 }}
options={[ options={[
{ name: "title", label: "标题" }, { name: "title", label: "标题" },
]} ]}

View File

@ -70,6 +70,7 @@ function List(props) {
return ( return (
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}> <Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
<Search <Search
labelCol={{ span: 4 }}
options={[ options={[
{ name: "title", label: "名称" }, { name: "title", label: "名称" },
]} ]}

View File

@ -17,6 +17,10 @@ function List(props) {
const { tableProps, getData } = useTable(props["eventReportList"], { const { tableProps, getData } = useTable(props["eventReportList"], {
form, form,
transform: formData => ({
occurrenceStartTime: formData.occurrenceTime?.[0],
occurrenceEndTime: formData.occurrenceTime?.[1],
}),
params: { corpinfoId: query.corpinfoId }, params: { corpinfoId: query.corpinfoId },
}); });
@ -40,7 +44,7 @@ function List(props) {
options={[ options={[
{ name: "likeAccessMode", label: "接入方式", render: (<DictionarySelect dictValue="eventReportMethod" />) }, { name: "likeAccessMode", label: "接入方式", render: (<DictionarySelect dictValue="eventReportMethod" />) },
{ name: "eventType", label: "事件类型" }, { name: "eventType", label: "事件类型" },
{ name: "times", label: "发生时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, { name: "occurrenceTime", label: "发生时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
]} ]}
form={form} form={form}
onFinish={getData} onFinish={getData}

View File

@ -62,6 +62,7 @@ function List(props) {
return ( return (
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}> <Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
<Search <Search
labelCol={{ span: 8 }}
options={[ options={[
{ name: "likeDrillName", label: "应急演练方案名称" }, { name: "likeDrillName", label: "应急演练方案名称" },
{ name: "drillTime", label: "演练时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, { name: "drillTime", label: "演练时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },

View File

@ -15,9 +15,6 @@ function GradeResponse(props) {
const { tableProps, getData } = useTable(props["enterprisePlanLevelResponseList"], { const { tableProps, getData } = useTable(props["enterprisePlanLevelResponseList"], {
params: { likePlanId: props.planId }, params: { likePlanId: props.planId },
useStorageQueryCriteria: false, useStorageQueryCriteria: false,
onSuccess: () => {
props.mode !== "view" && props.setResponseLevelRefresh(true);
},
}); });
const onDelete = (id) => { const onDelete = (id) => {

View File

@ -42,7 +42,6 @@ function OrganizationStructure(props) {
const getTreeList = async () => { const getTreeList = async () => {
const { data } = await props["enterprisePlanLevelOrganizationListTree"]({ planId: props.planId }); const { data } = await props["enterprisePlanLevelOrganizationListTree"]({ planId: props.planId });
setTreeList(data); setTreeList(data);
props.mode !== "view" && props.setExecutingAgencyRefresh(true);
}; };
useEffect(() => { useEffect(() => {

View File

@ -22,30 +22,25 @@ function PlanInstructions(props) {
}); });
const getResponseLevelList = async () => { const getResponseLevelList = async () => {
if (!props.responseLevelRefresh) if (props.mode === "view")
return; return;
const { data } = await props["enterprisePlanLevelResponseListAll"]({ planId: props.planId }); const { data } = await props["enterprisePlanLevelResponseListAll"]({ planId: props.planId });
setResponseLevelList(data); setResponseLevelList(data);
props.setResponseLevelRefresh(false);
}; };
const getTreeList = async () => { const getTreeList = async () => {
if (!props.executingAgencyRefresh) if (props.mode === "view")
return; return;
const { data } = await props["enterprisePlanLevelOrganizationListTree"]({ planId: props.planId }); const { data } = await props["enterprisePlanLevelOrganizationListTree"]({ planId: props.planId });
setExecutingAgencyListTree(data); setExecutingAgencyListTree(data);
props.setExecutingAgencyRefresh(false);
}; };
useEffect(() => { useEffect(() => {
getTreeList(); getTreeList();
}, [props.executingAgencyRefresh]);
useEffect(() => {
getResponseLevelList(); getResponseLevelList();
}, [props.responseLevelRefresh]); }, []);
const onSubmit = async (values) => { const onSubmit = async (values) => {
const { success } = await props[!isEditCommandIdRef.current ? "enterprisePlanCommandSettingAdd" : "enterprisePlanCommandSettingUpdate"]({ const { success } = await props[!isEditCommandIdRef.current ? "enterprisePlanCommandSettingAdd" : "enterprisePlanCommandSettingUpdate"]({

View File

@ -26,8 +26,6 @@ function Add(props) {
{ navigateMode: "replace" }, { navigateMode: "replace" },
); );
const [responseLevelRefresh, setResponseLevelRefresh] = useState(true);
const [executingAgencyRefresh, setExecutingAgencyRefresh] = useState(true);
const [reviewPersonModalVisible, setReviewPersonModalVisible] = useState(false); const [reviewPersonModalVisible, setReviewPersonModalVisible] = useState(false);
const [basicInfo, setBasicInfo] = useState({}); const [basicInfo, setBasicInfo] = useState({});
@ -100,6 +98,7 @@ function Add(props) {
<Tabs <Tabs
activeKey={urlState.currentStep} activeKey={urlState.currentStep}
onChange={key => setUrlState({ currentStep: key })} onChange={key => setUrlState({ currentStep: key })}
destroyOnHidden
items={[ items={[
{ {
key: "basicInfo", key: "basicInfo",
@ -116,23 +115,13 @@ function Add(props) {
{ {
key: "gradeResponse", key: "gradeResponse",
label: "分级响应", label: "分级响应",
children: ( children: (<GradeResponse planId={urlState.planId} />),
<GradeResponse
planId={urlState.planId}
setResponseLevelRefresh={setResponseLevelRefresh}
/>
),
disabled: subordinateTabDisabled, disabled: subordinateTabDisabled,
}, },
{ {
key: "organizationStructure", key: "organizationStructure",
label: "组织结构", label: "组织结构",
children: ( children: (<OrganizationStructure planId={urlState.planId} />),
<OrganizationStructure
planId={urlState.planId}
setExecutingAgencyRefresh={setExecutingAgencyRefresh}
/>
),
disabled: subordinateTabDisabled, disabled: subordinateTabDisabled,
}, },
{ {
@ -140,20 +129,14 @@ function Add(props) {
label: "预案资源", label: "预案资源",
children: (<PlanResources planId={urlState.planId} />), children: (<PlanResources planId={urlState.planId} />),
disabled: subordinateTabDisabled, disabled: subordinateTabDisabled,
destroyOnHidden: true,
}, },
{ {
key: "planInstructions", key: "planInstructions",
label: "预案指令", label: "预案指令",
children: ( children: (<PlanInstructions planId={urlState.planId} />),
<PlanInstructions
planId={urlState.planId}
setResponseLevelRefresh={setResponseLevelRefresh}
setExecutingAgencyRefresh={setExecutingAgencyRefresh}
responseLevelRefresh={responseLevelRefresh}
executingAgencyRefresh={executingAgencyRefresh}
/>
),
disabled: subordinateTabDisabled, disabled: subordinateTabDisabled,
destroyOnHidden: true,
}, },
{ {
key: "planText", key: "planText",