diff --git a/src/views/Home/homePanelsLayoutPage/index.js b/src/views/Home/homePanelsLayoutPage/index.js
index 4a70dc488..1998c6f35 100644
--- a/src/views/Home/homePanelsLayoutPage/index.js
+++ b/src/views/Home/homePanelsLayoutPage/index.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState,useRef } from 'react'
+import React, { useEffect, useState, useRef } from 'react'
import { useLocation } from 'react-router'
import { useDispatch, useSelector } from 'react-redux'
import { Collapse, DatePicker, Input, Modal, message } from 'antd';
@@ -152,13 +152,19 @@ const HomePage = ({ showPanels }) => {
Modal.destroyAll(); // 先销毁可能存在的其他Modal
const modal = Modal.confirm({
- title: `${record.name}详情`,
+ title:
,
width: 1000,
content: (
-
+ <>
+
+
+ >
+
),
icon: null,
okButtonProps: { style: { display: 'none' } },
@@ -616,12 +622,18 @@ const HomePage = ({ showPanels }) => {
// 清空搜索输入框
setSearchVal('')
dispatch.runtime.closeFeaturePopAll()
+ mapObj && mapObj.getLayers().getArray().forEach(layer => {
+ if (layer.values_.name && (layer.values_.name.indexOf('ZHZS_WXQ') > -1||layer.values_.name.indexOf('ZHZS_YQ') > -1)) {
+ mapObj.removeLayer(layer);
+ }
+ });
+ dispatch.runtime.setHome()
if (a === undefined) {
setCheckedObj({ key: '12', label: '雨情', labelRight: '统计', icon: 'yuqing' })
setShowTable(false)
} else if (a === '1') {
setShowTable(true)
- dispatch.runtime.setHome()
+ // dispatch.runtime.setHome()
setCheckedObj({ key: '11', label: '预警', labelRight: '预警', icon: 'yujing' })
} else if (a === '2') {
setShowTable(true)
@@ -663,6 +675,12 @@ const HomePage = ({ showPanels }) => {
setSearchVal('')
setCheckedObj(item)
setShowTable(true)
+ mapObj && mapObj.getLayers().getArray().forEach(layer => {
+ if (layer.values_.name && (layer.values_.name.indexOf('ZHZS_WXQ') > -1 ||layer.values_.name.indexOf('ZHZS_YQ') > -1)) {
+ mapObj.removeLayer(layer);
+ }
+ });
+ dispatch.runtime.setHome()
}}>
{item.label}
diff --git a/src/views/sz/ddfa/form.js b/src/views/sz/ddfa/form.js
index 2314912fc..010b1abee 100644
--- a/src/views/sz/ddfa/form.js
+++ b/src/views/sz/ddfa/form.js
@@ -75,7 +75,7 @@ useEffect(() => {
name="type"
rules={[{ required: true }]}
>
-
+
@@ -95,7 +95,7 @@ useEffect(() => {
name="status"
rules={[{ required: true }]}
>
-
+
diff --git a/src/views/sz/ywgz/form.js b/src/views/sz/ywgz/form.js
index 1461a9d5c..e6eec7525 100644
--- a/src/views/sz/ywgz/form.js
+++ b/src/views/sz/ywgz/form.js
@@ -75,7 +75,7 @@ useEffect(() => {
name="type"
rules={[{ required: true }]}
>
-
+
@@ -95,7 +95,7 @@ useEffect(() => {
name="status"
rules={[{ required: true }]}
>
-
+