diff --git a/.yarnrc b/.yarnrc
new file mode 100644
index 0000000..35cf1c5
--- /dev/null
+++ b/.yarnrc
@@ -0,0 +1,7 @@
+registry "https://registry.npm.taobao.org"
+sass_binary_site "https://npm.taobao.org/mirrors/node-sass/"
+phantomjs_cdnurl "http://cnpmjs.org/downloads"
+electron_mirror "https://npm.taobao.org/mirrors/electron/"
+sqlite3_binary_host_mirror "https://foxgis.oss-cn-shanghai.aliyuncs.com/"
+profiler_binary_host_mirror "https://npm.taobao.org/mirrors/node-inspector/"
+chromedriver_cdnurl "https://cdn.npm.taobao.org/dist/chromedriver"
diff --git a/public/index.html b/public/index.html
index 9ba9628..5e9bb96 100644
--- a/public/index.html
+++ b/public/index.html
@@ -29,7 +29,7 @@
   <script type="text/javascript" src="%PUBLIC_URL%/popmotion.xl.min.js"></script>
   <script type="text/javascript" src="%PUBLIC_URL%/imouplayer.js"></script>
   <script src="%PUBLIC_URL%/h5Player/h5player.min.js"></script>
-  <title>檀树岗水库现代化运行管理矩阵平台</title>
+  <title>盐卡引水闸信息化系统</title>
 
   <style>
     .lf{
diff --git a/src/components/DashboardLayout/TopMenu.tsx b/src/components/DashboardLayout/TopMenu.tsx
index 11b94db..b563aeb 100644
--- a/src/components/DashboardLayout/TopMenu.tsx
+++ b/src/components/DashboardLayout/TopMenu.tsx
@@ -62,7 +62,6 @@ const TopMenu: React.FC<{
   const menuClicked = (id: any) => {
     const menuItem:any = menu.find(m => m.id == id);
     if (menuItem.title === "雨水工灾情") {
-      getReadStatus()
      }
     const url = getMenuUrl(menuItem);
 
@@ -70,21 +69,7 @@ const TopMenu: React.FC<{
       navigate(url);
     }
   }
-  /**
- * @description 由于进入雨水工灾情 初始化进入是这个页面 发请求来获取未读和已读状态
- * 
- */
-  const getReadStatus = () => {
-    createCrudService(apiurl.ssyq.status).delGet().then((res) => {
-      if (res.code === 200) {
-        dispatch.runtime.setIsReadObject(res.data)
-      }
-    })
-  }
-
-useEffect(() => {
-  getReadStatus()
-}, [])
+ 
   return (
 
     <div className='app-top-menu'>
diff --git a/src/components/DashboardLayout/index.tsx b/src/components/DashboardLayout/index.tsx
index b331273..2d31354 100644
--- a/src/components/DashboardLayout/index.tsx
+++ b/src/components/DashboardLayout/index.tsx
@@ -90,7 +90,7 @@ const DashboardLayout: React.FC = () => {
       navigate('/login')
     }else{
       dispatch.auth.loadMenu();
-      document.title = "檀树岗水库现代化运行管理矩阵平台";
+      document.title = "盐卡引水闸信息化系统";
     }
   },[])
 
@@ -150,7 +150,7 @@ const DashboardLayout: React.FC = () => {
         {/*<span className="app-title">{TITLE}{SUBTITLE}</span>*/}
         <span className="app-title lf">
           <img src={`${process.env.PUBLIC_URL}/assets/shuili.png`} alt=""/>
-          <span>檀树岗水库现代化运行管理矩阵平台</span>
+          <span>盐卡引水闸信息化系统</span>
         </span>
         <div className="topMenu lf">
           <TopMenu menu={menu} menuIndexes={menuIndexes} />
diff --git a/src/components/summarizeRain/DataTable.tsx b/src/components/summarizeRain/DataTable.tsx
deleted file mode 100644
index 8a19628..0000000
--- a/src/components/summarizeRain/DataTable.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import React, { useState, useMemo } from 'react';
-import { Descriptions, Button, Card, Space, Table, Modal, Divider } from 'antd';
-import { ColumnsType } from 'antd/lib/table';
-import {CrudContext} from "../crud/useCrud";
-import { SearchOption } from "../../service/def";
-import moment from 'moment';
-import ToolBar from './ToolBar';
-import { adnmCun, adnmZhen } from '../../models/_/adcd';
-import appconsts from '../../service/appconsts'
-
-type IProps = {
-  pagerCtx: any;
-  crudCtx: CrudContext;
-  params: any;
-  reportStatisticsData: any;
-  rainfallLevelDistributionData: any;
-}
-
-const myType:any= {
-  SH: '山洪',
-  SW: '水文',
-  QX: '气象',
-  SK: '水库',
-}
-
-
-const DataTable: React.FC<IProps> = ({ pagerCtx, crudCtx, params, reportStatisticsData, rainfallLevelDistributionData }) => {
-
-  const columns = useMemo<ColumnsType<any>>(() => [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width:60, align:"center", fixed:"left", render: (text:any, rec:any, index:any) => index + 1 },
-    { title: '测站编码', key: 'stcd', dataIndex: 'stcd', align: 'center', width: 90 },
-    { title: '测站名称', key: 'stnm', dataIndex: 'stnm', align: 'center', width: 110, ellipsis: true },
-    { title: '时间', key: 'tm', dataIndex: 'tm', align: 'center', width: 90, render: (text:any) => text?moment(text).format('MM-DD HH:mm'):"-"},
-    { title: '测站所属区划', key: 'adcd', dataIndex: 'adcd', align: 'center', width: 120, ellipsis: true, render: (text:any, rec:any,) => <>{adnmZhen(rec.adcd)}</> },
-    { title: '数据来源', key: 'source', dataIndex: 'source', align: 'center', width: 100, ellipsis: true, render: (text:any, rec:any) => <>{myType[text]}</> },
-
-    { title: '今日降雨', key: 'today', dataIndex: 'today', align: 'center', width: 100,
-      sorter: (a, b) => a.today - b.today, },
-    { title: '1小时降雨', key: 'h1', dataIndex: 'h1', align: 'center', width: 100,
-      sorter: (a, b) => a.h1 - b.h1, },
-    { title: '3小时降雨', key: 'h3', dataIndex: 'h3', align: 'center', width: 100,
-      sorter: (a, b) => a.h3 - b.h3, },
-    { title: '6小时降雨', key: 'h6', dataIndex: 'h6', align: 'center', width: 100,
-      sorter: (a, b) => a.h6 - b.h6,  },
-    { title: '12小时降雨', key: 'h12', dataIndex: 'h12', align: 'center', width: 110,
-      sorter: (a, b) => a.h12 - b.h12, },
-    { title: '24小时降雨', key: 'h24', dataIndex: 'h24', align: 'center', width: 110,
-      sorter: (a, b) => a.h24 - b.h24, },
-    { title: '48小时降雨', key: 'h48', dataIndex: 'h48', align: 'center', width: 110,
-      sorter: (a, b) => a.h24 - b.h24, },
-    /*{ title: '昨日降雨', key: 'yesterday', dataIndex: 'yesterday', align: 'center', width: 100,
-      sorter: (a, b) => a.yesterday - b.yesterday, },*/
-  ], [crudCtx]);
-
-  const [doReportedParams, setDoReportedParams] = useState(0);
-  const [doRainParams, setDoRainParams] = useState(0);
-
-  const doSearch = (params: any) => {
-    const searchParams: SearchOption = {
-      search: {
-        ...params,
-        doRain:doRainParams,
-        doReported:doReportedParams
-      }
-    };
-    pagerCtx.search(searchParams);
-  };
-
-  const doReported = (type:any) => {
-    if(doReportedParams === type){
-      setDoReportedParams(0);
-    }else{
-      setDoReportedParams(type);
-    }
-  };
-
-  const doRain = (type:any) => {
-    if(doRainParams === type){
-      setDoRainParams(0);
-    }else{
-      setDoRainParams(type);
-    }
-  };
-
-  return (
-    <>
-      <div style={{padding:"15px", background:"#FBFBFB", border:"1px solid #F0F0F0"}}>
-        <Space wrap>
-          <ToolBar
-            params={{ ...params.search }}
-            search={doSearch}
-            doReportedParams={doReportedParams}
-            doRainParams={doRainParams}
-          />
-        </Space>
-      </div>
-
-      <div style={{marginTop:"15px"}} className="clearFloat descriptionsBox">
-        <div className="lf" style={{width:"34%"}}>
-          <div className="lf" style={{lineHeight:"24px", fontWeight:"bold"}}>雨量站来报：</div>
-          <div className="lf" style={{width:"80%"}}>
-            <div className="lf"
-                 style={{cursor:"pointer",borderBottom:doReportedParams===0?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doReported(0)}
-            >
-              <span>全部</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>{reportStatisticsData.total}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",margin:"0 50px",borderBottom:doReportedParams===1?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doReported(1)}
-            >
-              <span>已来报</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>{reportStatisticsData.reported}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",borderBottom:doReportedParams===2?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doReported(2)}
-            >
-              <span>未来报站数</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#FF2525"}}>{reportStatisticsData.unReport}</span>
-            </div>
-          </div>
-        </div>
-        <div className="lf" style={{width:"66%"}}>
-          <div className="lf" style={{lineHeight:"24px", fontWeight:"bold"}}>降雨量等级分布：</div>
-          <div className="lf" style={{width:"70%"}}>
-            <div className="lf"
-                 style={{cursor:"pointer",marginRight:"40px",borderBottom:doRainParams===1?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doRain(1)}
-            >
-              <span>无雨</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#A9A9A9"}}>{rainfallLevelDistributionData.noRain}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",marginRight:"40px",borderBottom:doRainParams===2?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doRain(2)}
-            >
-              <span>小雨</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#A5F38D"}}>{rainfallLevelDistributionData.lightRain}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",marginRight:"40px",borderBottom:doRainParams===3?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doRain(3)}
-            >
-              <span>中雨</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#43B83E"}}>{rainfallLevelDistributionData.moderateRain}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",marginRight:"40px",borderBottom:doRainParams===4?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doRain(4)}
-            >
-              <span>大雨</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#73B5F9"}}>{rainfallLevelDistributionData.heavyRain}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",marginRight:"40px",borderBottom:doRainParams===5?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doRain(5)}
-            >
-              <span>暴雨</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#1D02FA"}}>{rainfallLevelDistributionData.rainstorm}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",marginRight:"40px",borderBottom:doRainParams===6?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doRain(6)}
-            >
-              <span>大暴雨</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#FD00F9"}}>{rainfallLevelDistributionData.heavyRainstorm}</span>
-            </div>
-            <div className="lf"
-                 style={{cursor:"pointer",borderBottom:doRainParams===7?"2px solid #0893FF":"2px solid #fff"}}
-                 onClick={()=>doRain(7)}
-            >
-              <span>特大暴雨</span>&nbsp;&nbsp;
-              <span style={{fontWeight:"bold",fontSize:"15px", color:"#861361"}}>{rainfallLevelDistributionData.extremelyHeavyRainstorm}</span>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div style={{marginTop:"15px"}}>
-        <Table rowKey={rec => rec.source + rec.stcd} columns={columns} {...pagerCtx.tableProps}
-               scroll={{ y: "calc(100vh - 320px)" }}
-        />
-      </div>
-    </>
-  )
-};
-
-export default DataTable
diff --git a/src/components/summarizeRain/ToolBar.tsx b/src/components/summarizeRain/ToolBar.tsx
deleted file mode 100644
index 2f4bc49..0000000
--- a/src/components/summarizeRain/ToolBar.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import moment from 'moment';
-import { Form, Input, Button, DatePicker, Select } from 'antd';
-import { SearchOutlined, RedoOutlined, UploadOutlined } from '@ant-design/icons';
-import {getWaterList} from "../../service/forecastModule/waterSituation";
-
-const { Option } = Select;
-
-const { RangePicker } = DatePicker;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  doReportedParams: any;
-  doRainParams: any;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, doReportedParams, doRainParams }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  const [waterList, setWaterList] = useState([])
-  const getData= async ()=>{
-    let data = await getWaterList();
-    setWaterList(data)
-  }
-
-  useEffect(() => {
-    getData()
-  }, []);
-
-  const onSearchClick = (doReportedParams?:any, doRainParams?:any) => {
-    const { tm, ...rec } = form.getFieldsValue();
-
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD HH:mm:ss');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD HH:mm:ss');
-      }
-    }
-
-    if(doReportedParams>=0){
-      rec.doReported = doReportedParams;
-    }
-    if(doRainParams>=0){
-      rec.doRain = doRainParams;
-    }
-
-    var reg = /[\u4e00-\u9fa5]/g;
-
-    if(reg.test(rec.txt)){
-      rec.stnm = rec.txt;
-    }else{
-      rec.stcd = rec.txt;
-    }
-
-    search(rec);
-  };
-
-  useEffect(() => {
-    if(doReportedParams>=0 || doRainParams>=0){
-      onSearchClick(doReportedParams,doRainParams);
-    }
-  }, [doReportedParams, doRainParams]);
-
-  const reset = () => {
-    form.resetFields();
-    onSearchClick();
-  };
-
-  return record ? (
-    <Form layout="inline" form={form} initialValues={record}>
-      <Form.Item label="内容" name="txt">
-        <Input style={{ width: 205 }} allowClear placeholder="请输入河流/站名/站码查询" onChange={onSearchClick}/>
-      </Form.Item>
-      <Form.Item label="按流域" name="wscd">
-        <Select style={{ width: 120 }} allowClear>
-          {
-            // @ts-ignore
-            waterList.map(o => <Select.Option key={o.wscd} value={o.wscd}>{o.wsnm}</Select.Option>)
-          }
-        </Select>
-      </Form.Item>
-      <Form.Item label="数据来源" name="source">
-        <Select style={{ width: 145 }} allowClear onChange={onSearchClick}>
-          <Option value="SH">山洪</Option>
-          <Option value="SW">水文</Option>
-          <Option value="QX">气象</Option>
-          <Option value="SK">水库</Option>
-        </Select>
-      </Form.Item>
-      <Form.Item label="日期" name="tm">
-        <RangePicker allowClear format="YYYY-MM-DD HH:mm" style={{ width: 310 }} onChange={onSearchClick}/>
-      </Form.Item>
-      <Form.Item>
-        <Button type="primary" icon={<SearchOutlined />} onClick={onSearchClick}>查询</Button>
-      </Form.Item>
-      <Form.Item>
-        <Button icon={<RedoOutlined />} onClick={reset}>重置</Button>
-      </Form.Item>
-      {/*<Form.Item>
-        <Button icon={<UploadOutlined />} >导出</Button>
-      </Form.Item>*/}
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/components/summarizeRain/index.less b/src/components/summarizeRain/index.less
deleted file mode 100644
index fa85d9e..0000000
--- a/src/components/summarizeRain/index.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.descriptionsBox{
-  .ant-descriptions-item{
-    padding-bottom:0;
-  }
-}
\ No newline at end of file
diff --git a/src/components/summarizeRain/index.tsx b/src/components/summarizeRain/index.tsx
deleted file mode 100644
index ddd29f8..0000000
--- a/src/components/summarizeRain/index.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from 'moment';
-import {Card} from "antd";
-import useCrud from '../../components/crud/useCrud';
-import usePageTable from '../../components/crud/usePageTable';
-import { SearchOption } from '../../service/def';
-import "./index.less"
-import DataTable from './DataTable';
-import { page } from "../../service/forecastModule/rainfall";
-
-const OutStoreOrderPage: React.FC = () => {
-  // 页面初始默认查询参数
-  const options = {
-    search: {
-      stm: moment().subtract(1, 'month').format("YYYY-MM-DD HH:mm:ss"),
-      etm: moment().format("YYYY-MM-DD HH:mm:ss"),
-    },
-  };
-
-  const crud = useCrud();
-
-  const [reportStatisticsData, setReportStatisticsData] = useState({});
-  const [rainfallLevelDistributionData, setRainfallLevelDistributionData] = useState({});
-
-  const pager = usePageTable<any>(async (params?: SearchOption) => {
-    let data:any = await page(params);
-
-    if(Object.keys(data).length>0){
-      setReportStatisticsData(data.reportStatistics?data.reportStatistics:{});
-      setRainfallLevelDistributionData(data.rainfallLevelDistribution?data.rainfallLevelDistribution:{});
-
-      return { list: data?.page?.records, totalRow: data?.page?.total }
-    }else{
-      return { list: [], totalRow: 0 };
-    }
-  }, options);
-
-  return (
-    <div className="content-root">
-      <DataTable
-        crudCtx={crud}
-        pagerCtx={pager}
-        params={options}
-        reportStatisticsData={reportStatisticsData}
-        rainfallLevelDistributionData={rainfallLevelDistributionData}
-      />
-    </div>
-  )
-};
-
-export default OutStoreOrderPage;
diff --git a/src/components/summarizeReservoirWaterRegime/DataTable.tsx b/src/components/summarizeReservoirWaterRegime/DataTable.tsx
deleted file mode 100644
index a4b3814..0000000
--- a/src/components/summarizeReservoirWaterRegime/DataTable.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, {useCallback, useMemo, useState} from 'react';
-import { useDispatch } from 'react-redux';
-import { Descriptions, Button, Card, Space, Table, Modal, Divider } from 'antd';
-import { DeleteOutlined, PlusOutlined, EditOutlined, ExclamationCircleOutlined, ProfileOutlined } from '@ant-design/icons';
-import { ColumnsType } from 'antd/lib/table';
-import {CrudContext} from "../crud/useCrud";
-import { SearchOption } from "../../service/def";
-
-import ToolBar from './ToolBar';
-import moment from "moment";
-
-
-type IProps = {
-  pagerCtx: any;
-  crudCtx: CrudContext;
-}
-
-
-const myType:any= {
-  SH: '山洪',
-  SW: '水文',
-  QX: '气象',
-  SK: '水库',
-}
-
-const DataTable: React.FC<IProps> = ({ pagerCtx, crudCtx  }) => {
-
-  const columns = useMemo<ColumnsType<any>>(() => [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width:60, align:"center", fixed:"left", render: (text:any, rec:any, index:any) => index + 1 },
-    { title: '测站编码', key: 'stcd', dataIndex: 'stcd', align: 'center', fixed:"left",width: 140 },
-    { title: '测站名称', key: 'stnm', dataIndex: 'stnm', align: 'center', fixed:"left",width: 140, ellipsis: true },
-    {
-      title: '上报时间', key: 'tm', dataIndex: 'tm', align: 'center', width: 120, render: (text: any,row:any) =>
-        <span style={{color:row.state ? "red" : "#fff"}}>{text ? moment(text).format('MM-DD HH:mm') : "-"}</span>
-    },
-    { title: '所属政区', key: 'adnm', dataIndex: 'adnm', align: 'center', width: 150},
-    { title: '站址', key: 'stlc', dataIndex: 'stlc', align: 'center', width: 150},
-    { title: '数据来源', key: 'source', dataIndex: 'source', align: 'center', width: 120, render: (text:any, rec:any) => <>{myType[text]}</> },
-    { title: '水位(m)', key: 'rz', dataIndex: 'rz', align: 'center', width: 120,sorter: (a, b) => a.z - b.z,},
-    { title: '汛限水位(m)', key: 'flLowLimLev', dataIndex: 'flLowLimLev', align: 'center', width: 150, },
-    { title: '防洪高水位(m)', key: 'uppLevFlco', dataIndex: 'uppLevFlco', align: 'center', width: 150, },
-    { title: '设计洪水位(m)', key: 'desFloodLev', dataIndex: 'desFloodLev', align: 'center', width: 150, },
-    { title: '校核洪水位(m)', key: 'calFloodLev', dataIndex: 'calFloodLev', align: 'center', width: 150, },
-    {
-      title: '历史最高水位(m)', children: [
-        {title: '实测(m)', key: 'htrz', dataIndex: 'htrz', align: 'center', width: 120,},
-        {title: '出现时间', key: 'htrztm', dataIndex: 'htrztm', align: 'center', width: 120,},
-        {title: '调查(m)', key: 'invrz', dataIndex: 'invrz', align: 'center', width: 120,},
-        {title: '出现时间', key: 'invrztm', dataIndex: 'invrztm', align: 'center', width: 120,},
-      ]
-    },
-  ], [crudCtx]);
-
-  const width = useMemo(() => columns.reduce((total: number, cur) => total + (cur.width as number), 0), [columns]);
-
-  return (
-    <>
-      <div style={{marginTop:"15px"}}>
-        <Table rowKey="id" columns={columns} {...pagerCtx.tableProps} scroll={{ x: width, y: "calc( 100vh - 400px )" }}/>
-      </div>
-    </>
-  )
-};
-
-export default DataTable
diff --git a/src/components/summarizeReservoirWaterRegime/ToolBar.tsx b/src/components/summarizeReservoirWaterRegime/ToolBar.tsx
deleted file mode 100644
index 708f428..0000000
--- a/src/components/summarizeReservoirWaterRegime/ToolBar.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import moment from 'moment';
-import { Form, Input, Button, DatePicker, Select } from 'antd';
-import { SearchOutlined, RedoOutlined, UploadOutlined } from '@ant-design/icons';
-import {getWaterList} from "../../service/forecastModule/waterSituation";
-const { Option } = Select;
-
-const { RangePicker } = DatePicker;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  doReportedParams: any;
-  doRainParams: any;
-}
-
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, doReportedParams, doRainParams }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-  const [waterList, setWaterList] = useState([])
-  const getData= async ()=>{
-    let data = await getWaterList();
-    setWaterList(data)
-  }
-
-  useEffect(() => {
-    getData()
-  }, []);
-
-  const onSearchClick = (doReportedParams?:any, doRainParams?:any) => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD HH:mm:ss');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD HH:mm:ss');
-      }
-    }
-
-    if(doReportedParams>=0){
-      rec.doReported = doReportedParams;
-    }
-    if(doRainParams>=0){
-      rec.doRain = doRainParams;
-    }
-
-    var reg = /[\u4e00-\u9fa5]/g;
-
-    if(reg.test(rec.txt)){
-      rec.stnm = rec.txt;
-    }else{
-      rec.stcd = rec.txt;
-    }
-
-    search(rec);
-  };
-  console.log(waterList);
-
-  useEffect(() => {
-    if(doReportedParams>=0 || doRainParams>=0){
-      onSearchClick(doReportedParams,doRainParams);
-    }
-  }, [doReportedParams, doRainParams]);
-
-  const reset = () => {
-    form.resetFields();
-    onSearchClick();
-  };
-
-  return record ? (
-    <Form layout="inline" form={form} initialValues={record}>
-      <Form.Item label="内容" name="txt">
-        <Input style={{ width: 205 }} allowClear placeholder="请输入河流/站名/站码查询" onChange={onSearchClick}/>
-      </Form.Item>
-      <Form.Item label="按流域" name="wscd">
-        <Select style={{ width: 120 }} allowClear>
-          {
-            // @ts-ignore
-            waterList.map(o => <Select.Option key={o.wscd} value={o.wscd}>{o.wsnm}</Select.Option>)
-          }
-        </Select>
-      </Form.Item>
-      <Form.Item label="数据来源" name="source">
-        <Select style={{ width: 120 }} allowClear onChange={onSearchClick}>
-          <Option value="SH">山洪</Option>
-          <Option value="SW">水文</Option>
-          <Option value="QX">气象</Option>
-          <Option value="SK">水库</Option>
-        </Select>
-      </Form.Item>
-      <Form.Item label="日期" name="tm">
-        <RangePicker allowClear format="YYYY-MM-DD HH:mm" style={{ width: 310 }} onChange={onSearchClick}/>
-      </Form.Item>
-      <Form.Item>
-        <Button type="primary" icon={<SearchOutlined />} onClick={onSearchClick}>查询</Button>
-      </Form.Item>
-      <Form.Item>
-        <Button icon={<RedoOutlined />} onClick={reset}>重置</Button>
-      </Form.Item>
-      {/*<Form.Item>
-        <Button icon={<UploadOutlined />} >导出</Button>
-      </Form.Item>*/}
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/components/summarizeReservoirWaterRegime/index.less b/src/components/summarizeReservoirWaterRegime/index.less
deleted file mode 100644
index fa85d9e..0000000
--- a/src/components/summarizeReservoirWaterRegime/index.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.descriptionsBox{
-  .ant-descriptions-item{
-    padding-bottom:0;
-  }
-}
\ No newline at end of file
diff --git a/src/components/summarizeReservoirWaterRegime/index.tsx b/src/components/summarizeReservoirWaterRegime/index.tsx
deleted file mode 100644
index 11fbcb1..0000000
--- a/src/components/summarizeReservoirWaterRegime/index.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from 'moment';
-
-import useCrud from '../../components/crud/useCrud';
-import usePageTable from '../../components/crud/usePageTableZdk1';
-import { SearchOption } from '../../service/def';
-import "./index.less"
-import DataTable from './DataTable';
-import { reservoirsummaryInfo } from "../../service/sssq";
-import { createCrudService } from '../../components/crud/_';
-import apiurl from '../../service/apiurl';
-
-const OutStoreOrderPage: React.FC = () => {
-  const crud = useCrud();
-  // const pager = usePageTable<any>(async (params?: SearchOption) => {
-  //   let data:any = await reservoirsummaryInfo(params);
-  //   return { list: data.records, totalRow: data.total }
-  // });
-  const data = usePageTable(createCrudService(apiurl.sssq.reservoirsummaryInfo).find_noCode1);
-
-
-  return (
-    <div className="content-root">
-      <DataTable
-        crudCtx={crud}
-        pagerCtx={data}
-      />
-    </div>
-  )
-};
-
-export default OutStoreOrderPage;
diff --git a/src/components/summarizeRiverWaterRegime/DataTable.tsx b/src/components/summarizeRiverWaterRegime/DataTable.tsx
deleted file mode 100644
index 8096570..0000000
--- a/src/components/summarizeRiverWaterRegime/DataTable.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, {useCallback, useMemo, useState} from 'react';
-import { Descriptions, Button, Card, Space, Table, Modal, Divider } from 'antd';
-import { ColumnsType } from 'antd/lib/table';
-import {CrudContext} from "../crud/useCrud";
-import moment from "moment";
-
-
-
-type IProps = {
-  pagerCtx: any;
-  crudCtx: CrudContext;
-}
-
-const myType:any= {
-  SH: '山洪',
-  SW: '水文',
-  QX: '气象',
-  SK: '水库',
-};
-
-
-const DataTable: React.FC<IProps> = ({ pagerCtx, crudCtx }) => {
-  const columns = useMemo<ColumnsType<any>>(() => [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width:60, align:"center", render: (text:any, rec:any, index:any) => index + 1 },
-    { title: '测站编码', key: 'stcd', dataIndex: 'stcd', align: 'center',width: 140 },
-    { title: '测站名称', key: 'stnm', dataIndex: 'stnm', align: 'center',width: 140, ellipsis: true },
-    {
-      title: '上报时间', key: 'tm', dataIndex: 'tm', align: 'center', width: 90, render:
-      (text: any,row:any) =>
-        <span style={{color:row.state ? "red" :"#000"}}>{text ? moment(text).format('MM-DD HH:mm') : "-"}</span>
-    },
-    { title: '所属政区', key: 'adnm', dataIndex: 'adnm', align: 'center', width: 150, ellipsis: true },
-    { title: '站址', key: 'stlc', dataIndex: 'stlc', align: 'center', width: 150, ellipsis: true},
-    { title: '数据来源', key: 'source', dataIndex: 'source', align: 'center', width: 90, render: (text:any, rec:any) => <>{myType[text]}</> },
-    { title: '水位(m)', key: 'z', dataIndex: 'z', align: 'center', width: 100,sorter: (a, b) => a.z - b.z,},
-    { title: '流量(m³/s)', key: 'q', dataIndex: 'q', align: 'center', width: 110, },
-    { title: '警戒水位(m)', key: 'wrz', dataIndex: 'wrz', align: 'center', width: 110, },
-    { title: '危险水位(m)', key: 'grz', dataIndex: 'grz', align: 'center', width: 120, },
-    {
-      title: '历史最高水位(m)', children: [
-        {title: '实测(m)', key: 'htrz', dataIndex: 'htrz', align: 'center', width: 120,},
-        {title: '出现时间', key: 'htrztm', dataIndex: 'htrztm', align: 'center', width: 120,},
-        {title: '调查(m)', key: 'invrz', dataIndex: 'invrz', align: 'center', width: 120,},
-        {title: '出现时间', key: 'invrztm', dataIndex: 'invrztm', align: 'center', width: 120,},
-      ]
-    },
-
-  ], [crudCtx]);
-
-
-  return (
-    <>
-      <div style={{marginTop:"15px"}}>
-        <Table rowKey="id" columns={columns} {...pagerCtx.tableProps}  scroll={{ x: "100%", y: "calc( 100vh - 400px )"  }}/>
-      </div>
-    </>
-  )
-};
-
-export default DataTable
diff --git a/src/components/summarizeRiverWaterRegime/ToolBar.tsx b/src/components/summarizeRiverWaterRegime/ToolBar.tsx
deleted file mode 100644
index 9c4cd04..0000000
--- a/src/components/summarizeRiverWaterRegime/ToolBar.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import moment from 'moment';
-import { Form, Input, Button, DatePicker, Select } from 'antd';
-import { SearchOutlined, RedoOutlined, UploadOutlined } from '@ant-design/icons';
-import {getWaterList} from "../../service/forecastModule/waterSituation";
-
-const { Option } = Select;
-
-const { RangePicker } = DatePicker;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  doReportedParams: any;
-  doRainParams: any;
-}
-
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, doReportedParams, doRainParams }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-  const [waterList, setWaterList] = useState([])
-  const getData= async ()=>{
-    let data = await getWaterList();
-    setWaterList(data)
-  }
-
-  useEffect(() => {
-    getData()
-  }, []);
-
-  const onSearchClick = (doReportedParams?:any, doRainParams?:any) => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD HH:mm:ss');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD HH:mm:ss');
-      }
-    }
-
-    if(doReportedParams>=0){
-      rec.doReported = doReportedParams;
-    }
-    if(doRainParams>=0){
-      rec.doRain = doRainParams;
-    }
-
-    var reg = /[\u4e00-\u9fa5]/g;
-
-    if(reg.test(rec.txt)){
-      rec.rvnm = rec.txt;
-    }else{
-      rec.stcd = rec.txt;
-    }
-
-    search(rec);
-  };
-
-  useEffect(() => {
-    if(doReportedParams>=0 || doRainParams>=0){
-      onSearchClick(doReportedParams,doRainParams);
-    }
-  }, [doReportedParams, doRainParams]);
-
-  const reset = () => {
-    form.resetFields();
-    onSearchClick();
-  };
-
-  return record ? (
-    <Form layout="inline" form={form} initialValues={record}>
-      <Form.Item label="内容" name="txt">
-        <Input style={{ width: 205 }} allowClear placeholder="请输入河流/站名/站码查询" onChange={onSearchClick}/>
-      </Form.Item>
-      <Form.Item label="按流域" name="wscd">
-        <Select style={{ width: 120 }} allowClear>
-          {
-            // @ts-ignore
-            waterList.map(o => <Select.Option key={o.wscd} value={o.wscd}>{o.wsnm}</Select.Option>)
-          }
-        </Select>
-      </Form.Item>
-      <Form.Item label="按来源" name="source">
-        <Select style={{ width: 110 }} allowClear onChange={onSearchClick}>
-          <Option value="SH">山洪</Option>
-          <Option value="SW">水文</Option>
-        </Select>
-      </Form.Item>
-      <Form.Item label="日期" name="tm">
-        <RangePicker allowClear format="YYYY-MM-DD HH:mm" style={{ width: 310 }} onChange={onSearchClick}/>
-      </Form.Item>
-      <Form.Item>
-        <Button type="primary" icon={<SearchOutlined />} onClick={onSearchClick}>查询</Button>
-      </Form.Item>
-      <Form.Item>
-        <Button icon={<RedoOutlined />} onClick={reset}>重置</Button>
-      </Form.Item>
-      {/*<Form.Item>
-        <Button icon={<UploadOutlined />} >导出</Button>
-      </Form.Item>*/}
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/components/summarizeRiverWaterRegime/index.less b/src/components/summarizeRiverWaterRegime/index.less
deleted file mode 100644
index fa85d9e..0000000
--- a/src/components/summarizeRiverWaterRegime/index.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.descriptionsBox{
-  .ant-descriptions-item{
-    padding-bottom:0;
-  }
-}
\ No newline at end of file
diff --git a/src/components/summarizeRiverWaterRegime/index.tsx b/src/components/summarizeRiverWaterRegime/index.tsx
deleted file mode 100644
index cb2b11b..0000000
--- a/src/components/summarizeRiverWaterRegime/index.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React, {useState} from 'react';
-import useCrud from '../../components/crud/useCrud';
-import usePageTable from '../../components/crud/usePageTableZdk1';
-import { SearchOption } from '../../service/def';
-import "./index.less"
-import DataTable from './DataTable';
-import { summaryInfo } from "../../service/sssq";
-import { createCrudService } from '../../components/crud/_';
-import apiurl from '../../service/apiurl';
-
-const OutStoreOrderPage: React.FC = () => {
-// 页面初始默认查询参数
-
-  const crud = useCrud();
-  // const pager = usePageTable<any>(async (params?: SearchOption) => {
-  //   let data:any = await summaryInfo(params);
-  //   return { list: data.records, totalRow: data.total }
-  // });
-  const data = usePageTable(createCrudService(apiurl.sssq.summaryInfo).find_noCode1);
-
-  return (
-    <div className="content-root">
-      <DataTable
-        crudCtx={crud}
-        pagerCtx={data}
-      />
-    </div>
-  )
-};
-
-export default OutStoreOrderPage;
diff --git a/src/models/auth/_.ts b/src/models/auth/_.ts
index 83b61e5..385e417 100644
--- a/src/models/auth/_.ts
+++ b/src/models/auth/_.ts
@@ -192,402 +192,67 @@ export async function loadMenu(): Promise<MenuItem[]> {
 
   const id = idgen()
   return [
-    { id: id(), title: '水库一张图', path: '/mgr/home', icon: 'yzt' },
+    { id: id(), title: '首页', path: '/mgr/home', icon: 'yzt' },
     {
-      id: id(), title: '四全', redirect: '/mgr/sq/qfg/zcdjxx', icon: 'sz',
+      id: id(), title: '监测数据', path: '/mgr/jcsj/jcsj', icon: 'sz',
       children: [
         {
-          id: id(), title: '全覆盖', redirect: '/mgr/sq/qfg/zcdjxx',
+          id: id(), title: '监测数据', path: '/mgr/jcsj/jcsj',
+        },
+        {
+          id: id(), title: '报警管理', redirect: '/mgr/jcsj/bjgl/bjjl',
           children: [
-            { id: id(), title: '注册登记信息', path: '/mgr/sq/qfg/zcdjxx' },
+            { id: id(), title: '报警记录', path: '/mgr/jcsj/bjgl/bjjl' },
+            { id: id(), title: '报警规则配置', path: '/mgr/jcsj/bjgl/bjgzpz' },
           ]
         },
-        {
-          id: id(), title: '全要素', redirect: '/mgr/sq/qys/kqys',
-          children: [
-            { id: id(), title: '库区要素', path: '/mgr/sq/qys/kqys' },
-            { id: id(), title: '工程要素', path: '/mgr/sq/qys/gcys' },
-            { id: id(), title: '下游要素', path: '/mgr/sq/qys/xyys' },
-
-          ]
-        },
-        { id: id(), title: '全天候', redirect: '/mgr/sq/qth/sksq',
-          children: [
-            { id: id(), title: '水库水情', path: '/mgr/sq/qth/sksq'},
-            { id: id(), title: '河道水情', path: '/mgr/sq/qth/hdsq'},
-            { id: id(), title: '实时雨情', path: '/mgr/sq/qth/ssyq'},
-            { id: id(), title: '大坝安全监测', path: '/mgr/sq/qth/dbaqjc'},
-            { id: id(), title: '视频监控', path: '/mgr/sq/qth/spjk'},
-          ]
-        },
-        { id: id(), title: '全周期', redirect: '/mgr/sq/qzq/gcdsj',
-          children: [
-            { id: id(), title: '工程大事记', path: '/mgr/sq/qzq/gcdsj'},
-            { id: id(), title: '全周期档案', path: '/mgr/sq/qys/qzqda'},
-          ]
-        },
-       
-      ]
-    },
-    {
-      id: id(), title: '四制', redirect: '/mgr/sz/gltx/zzjgck', icon: 'sz',
-      children: [
-        {
-          id: id(), title: '管理体系', redirect: '/mgr/sz/gltx/zzjgck',
-          children: [
-            {
-              id: id(), title: '组织机构查看', path: '/mgr/sz/gltx/zzjgck',
-            },
-            {
-              id: id(), title: '责任人管理', path: '/mgr/sz/gltx/zrrgl',
-            }
-          ]
-        },
-        {
-          id: id(), title: '培训管理', redirect: '/mgr/sz/pxgl/pxjhgl',
-          children: [
-            {
-              id: id(), title: '培训计划管理', path: '/mgr/sz/pxgl/pxjhgl',
-            },
-            {
-              id: id(), title: '培训记录管理', path: '/mgr/sz/pxgl/pxjlgl',
-            },
-          ]
-        },
-      
-     
-        {
-          id: id(), title: '水政执法', redirect: '/mgr/sz/szzf/ajdj',
-          children: [
-            {
-              id: id(), title: '案件登记', path: '/mgr/sz/szzf/ajdj',
-            },
-            {
-              id: id(), title: '案件统计', path: '/mgr/sz/szzf/ajtj',
-            },
-            {
-              id: id(), title: '处理依据', path: '/mgr/sz/szzf/clyj',
-            }
-          ]
-        },
-        {
-          id: id(), title: '监督考核', redirect: '/mgr/sz/jdkh/khtj',
-          children: [
-            {
-              id: id(), title: '考核统计', path: '/mgr/sz/jdkh/khtj',
-            },
-            {
-              id: id(), title: '考核任务管理', path: '/mgr/sz/jdkh/khrwgl',
-            },
-            {
-              id: id(), title: '考核问题整改', path: '/mgr/sz/jdkh/khwtzg',
-            },
-            {
-              id: id(), title: '考核指标管理', path: '/mgr/sz/jdkh/khzbgl',
-            },
-            {
-              id: id(), title: '考核模板管理', path: '/mgr/sz/jdkh/khmbgl',
-            }
-          ]
-        },
-        { id: id(), title: '制度管理', path: '/mgr/sz/zdgl' },
-        { id: id(), title: '法律法规', path: '/mgr/sz/flfg' },
-        
-
-      ]
-    },
-    {
-      id: id(), title: '四预', redirect: '/mgr/sy/fhxzfx', icon: 'sz',
-      children: [
-        { id: id(), title: '防洪形势', path: '/mgr/sy/fhxzfx' },
-        { id: id(), title: '天气预报', path: '/mgr/sy/tqyb' },
-        {
-          id: id(), title: '洪水预报', redirect: '/mgr/sy/hsyb/hyybjs',
-          children: [
-            { id: id(), title: '洪水预报计算', path: '/mgr/sy/hsyb/hyybjs' },
-            { id: id(), title: '预报方案管理', path: '/mgr/sy/hsyb/ybfagl' },
-            { id: id(), title: '参数管理', path: '/mgr/sy/hsyb/csgl' },
-          ]
-        },
-        { id: id(), title: '防汛预案', path: '/mgr/sy/fxya' },
-        { id: id(), title: '调度规程', path: '/mgr/sy/ddgc' },
-        {
-          id: id(),
-          title: '抢险物料',
-          path: '/mgr/sy/qxwl',
-        },
-        {
-          id: id(),
-          title: '抢险队伍',
-          path: '/mgr/sy/qxdw',
-        },
-      ],
-    },
-    {
-      id: id(), title: '四管', redirect: '/mgr/sg/xcxj/xcrw', icon: 'sz',
-      children: [
-        {
-          id: id(), title: '巡查巡检', redirect: '/mgr/sg/xcxj/xcrw',
-          children: [
-            { id: id(), title: '巡检任务', path: '/mgr/sg/xcxj/xcrw' },
-            { id: id(), title: '巡检问题处理', path: '/mgr/sg/xcxj/xjwtcl' },
-            { id: id(), title: '巡检项配置', path: '/mgr/sg/xcxj/xjxpz' },
-          ]
-        },
-        {
-          id: id(), title: '安全管理', redirect: '/mgr/sg/aqgl/fxgkqd',
-          children: [
-            { id: id(), title: '风险管控清单', path: '/mgr/sg/aqgl/fxgkqd' },
-            { id: id(), title: '安全隐患排查', path: '/mgr/sg/aqgl/aqyhpc' },
-            { id: id(), title: '安全检查管理', path: '/mgr/sg/aqgl/aqjcgl' },
-            { id: id(), title: '安全事故登记', path: '/mgr/sg/aqgl/aqsgdj' },
-            { id: id(), title: '安全鉴定台帐', path: '/mgr/sg/aqgl/aqjdtz' },
-            { id: id(), title: '除险加固台帐', path: '/mgr/sg/aqgl/cxjgtz' },
-          ]
-        },
-        {
-          id: id(), title: '白蚁防治', redirect: '/mgr/sg/byfz/bypc',
-          children: [
-            { id: id(), title: '白蚁普查', path: '/mgr/sg/byfz/bypc' },
-            { id: id(), title: '防治宣传', path: '/mgr/sg/byfz/byxc' },
-          ]
-        },
-        {
-          id: id(), title: '闸门监控', path: '/mgr/sg/zmjk',
-        },
-        {
-          id: id(), title: '维修养护', path: '/mgr/sg/wxyh',
-        },
-        {
-          id: id(), title: '库容管理', path: '/mgr/sg/krgl',
-        },
-        {
-          id: id(), title: '值班管理', redirect: '/mgr/sg/zbgl/zbb',
-          children: [
-            { id: id(), title: '值班表', path: '/mgr/sg/zbgl/zbb' },
-            { id: id(), title: '值班日志', path: '/mgr/sg/zbgl/zbrz' },
-          ]
-        },
-        {
-          id: id(), title: '报表管理', redirect: '/mgr/sg/btbb/sdjyrbb',
-          children: [
-            { id: id(), title: '时段降雨日报表', path: '/mgr/sg/btbb/sdjyrbb' },
-            { id: id(), title: '日降雨量年报表', path: '/mgr/sg/btbb/rjylnbb' },
-            { id: id(), title: '时段水位日报表', path: '/mgr/sg/btbb/sdswbb' },
-            { id: id(), title: '日均水位年报表', path: '/mgr/sg/btbb/rjswbb' },
-          ]
-        },
-        {
-          id: id(), title: '告警管理', redirect: '/mgr/sg/gjgl/aigj',
-          children: [
-            { id: id(), title: 'AI告警', path: '/mgr/sg/gjgl/aigj' },
-            { id: id(), title: '广播预警', path: '/mgr/sg/gjgl/gbyj' },
-          ]
-        },
-      ],
-    },
-    {
-      id: id(), title: '工程安全监测', redirect: '/mgr/gcaqjc/gcaqyj/bzt', icon: 'xtgl',
-      children: [
-        {
-          id: id(), title: '布置图', path: '/mgr/gcaqjc/gcaqyj/bzt',
-        },
-        {
-          id: id(), title: '工程安全分析', redirect: '/mgr/gcaqjc/gcaqfx/jrx',
-          children: [
-            { id: id(), title: '浸润线', path: '/mgr/gcaqjc/gcaqfx/jrx' },
-          ]
-        },
-        {
-          id: id(), title: '工程安全预警', redirect: '/mgr/gcaqjc/gcaqyj/yhyj',
-          children: [
-            { id: id(), title: '隐患预警', path: '/mgr/gcaqjc/gcaqyj/yhyj' },
-            { id: id(), title: '预警规则配置', path: '/mgr/gcaqjc/gcaqyj/yjgzpz' },
-          ]
-        },
-        {
-          id: id(), title: '数据统计查询', redirect: '/mgr/gcaqjc/sjtjcx/czcx',
-          children: [
-            { id: id(), title: '测值查询', path: '/mgr/gcaqjc/sjtjcx/czcx' },
-            { id: id(), title: '渗压监测', path: '/mgr/gcaqjc/sjtjcx/syjx' },
-            { id: id(), title: '渗流监测  ', path: '/mgr/gcaqjc/sjtjcx/sljx' },
-            { id: id(), title: '位移监测  ', path: '/mgr/gcaqjc/sjtjcx/wyjx' },
-            { id: id(), title: '年度渗压统计表', path: '/mgr/gcaqjc/sjtjcx/ndsytjb' },
-            { id: id(), title: '年度渗流统计表', path: '/mgr/gcaqjc/sjtjcx/ndsltjb' },
-          ]
-        },
-      ],
-    },
-    {
-      id: id(), title: '水资源调度', redirect: '/mgr/szydd/gsnlfx', icon: 'aqjc',
-      children: [
-        {
-          id: id(), title: '供水能力分析', path: '/mgr/szydd/gsnlfx',
-        },
-        {
-          id: id(), title: '调度记录', path: '/mgr/szydd/diaodu',
-        },
-        {
-          id: id(), title: '供水统计分析', path: '/mgr/szydd/gstjfx',
-        },
-        {
-          id: id(), title: '典型年降雨资料', path: '/mgr/szydd/dxnjyzl',
-        },
       ]
     },
-
-
-    // { id: id(), title: '基本情况', path: '/mgr/home', icon: 'jbqk' },
-    // {
-    //   id: id(),
-    //   title: '防汛调度',
-    //   redirect: '/mgr/fxzb/fhxs',
-    //   icon: 'fxzb',
-    //   children: [
-    //     { id: id(), title: '防洪形势', path: '/mgr/fxzb/fhxs'},
-    //     { id: id(), title: '天气预报', path: '/mgr/fxzb/tqyb'},
-    //     {
-    //       id: id(), title: '洪水预报', redirect: '/mgr/fxzb/hsyb/hyybjs',
-    //       children: [
-    //         { id: id(), title: '洪水预报计算', path: '/mgr/fxzb/hsyb/hyybjs' },
-    //         { id: id(), title: '预报方案管理', path: '/mgr/fxzb/hsyb/ybfagl' },
-    //         { id: id(), title: '参数管理', path: '/mgr/fxzb/hsyb/csgl' },
-    //       ]
-    //     },
-    //     { id: id(), title: '调度规程', path: '/mgr/fxzb/ddgc'},
-    //     { id: id(), title: '防汛预案', path: '/mgr/fxzb/fxya'},
-    //     {
-    //       id: id(),
-    //       title: '抢险物料',
-    //       path: '/mgr/fxzb/qxwl',
-    //     },
-    //     {
-    //       id: id(),
-    //       title: '抢险队伍',
-    //       path: '/mgr/fxzb/qxdw',
-    //     },
-    //   ],
-    // },
-    // {
-    //   id: id(),
-    //   title: '工程安全监测',
-    //   redirect: '/mgr/gcaqjc/gcaqyj/bzt',
-    //   icon: 'fxzb',
-    //   children: [
-    //     { id: id(), title: '布置图', path: '/mgr/gcaqjc/gcaqyj/bzt' },
-    //     {
-    //       id: id(), title: '工程安全预警', redirect: '/mgr/gcaqjc/gcaqyj/yhyj',
-    //       children: [
-    //         { id: id(), title: '隐患预警', path: '/mgr/gcaqjc/gcaqyj/yhyj' },
-    //         { id: id(), title: '预警规则配置', path: '/mgr/gcaqjc/gcaqyj/yjgzpz' },
-
-    //       ]
-    //     },
-    //     {
-    //       id: id(), title: '工程安全分析', redirect: '/mgr/gcaqjc/gcaqfx/jrx',
-    //       children: [
-    //         { id: id(), title: '浸润线', path: '/mgr/gcaqjc/gcaqfx/jrx' },
-
-    //       ]
-    //     },
-    //     {
-    //       id: id(), title: '数据统计查询', redirect: '/mgr/gcaqjc/sjtjcx/sljx',
-    //       children: [
-    //         { id: id(), title: '测值查询', path: '/mgr/gcaqjc/sjtjcx/czcx' },
-    //         { id: id(), title: '渗压监测', path: '/mgr/gcaqjc/sjtjcx/syjx' },
-    //         { id: id(), title: '渗流监测', path: '/mgr/gcaqjc/sjtjcx/sljx' },
-    //         { id: id(), title: '位移监测', path: '/mgr/gcaqjc/sjtjcx/wyjx' },
-    //         { id: id(), title: '年度渗压统计表', path: '/mgr/gcaqjc/sjtjcx/ndsytjb' },
-    //         { id: id(), title: '年度渗流统计表', path: '/mgr/gcaqjc/sjtjcx/ndsltjb' },
-    //         { id: id(), title: '年度位移统计表', path: '/mgr/gcaqjc/sjtjcx/ndwytjb' },
-
-    //       ]
-    //     },
-
-    //   ],
-    // },
-    // {
-    //   id: id(),
-    //   title: '日常管理',
-    //   redirect: '/mgr/rcgl/gcdsj',
-    //   icon: 'fxzb',
-    //   children: [
-    //     {
-    //       id: id(),
-    //       title: '工程大事件',
-    //       path: '/mgr/rcgl/gcdsj',
-    //     },
-    //     {
-    //       id: id(), title: '值班管理', redirect: '/mgr/rcgl/zbgl/zbb',
-    //       children: [
-    //         { id: id(), title: '值班表', path: '/mgr/rcgl/zbgl/zbb' },
-    //         { id: id(), title: '值班日志', path: '/mgr/rcgl/zbgl/zbrz' },
-
-    //       ]
-    //     },
-    //     {
-    //       id: id(),
-    //       title: '水质整编',
-    //       path: '/mgr/rcgl/szzb',
-    //     },
-    //     {
-    //       id: id(),
-    //       title: '生态流量监控',
-    //       path: '/mgr/rcgl/stlljc',
-    //     },
-    //   ],
-    // },   {
-    //   id: id(),
-    //   title: '供水兴利',
-    //   redirect: '/mgr/gsxl/zfzl',
-    //   icon: 'fxzb',
-    //   children: [
-    //     {
-    //       id: id(),
-    //       title: '闸阀总览',
-    //       path: '/mgr/gsxl/zfzl',
-    //     },
-    //     {
-    //       id: id(),
-    //       title: '闸阀监控',
-    //       path: '/mgr/gsxl/zfjk',
-    //     },
-    //     {
-    //       id: id(),
-    //       title: '供水统计分析',
-    //       path: '/mgr/gsxl/gstjfx',
-    //     },
-    //     {
-    //       id: id(),
-    //       title: '典型年降雨资料',
-    //       path: '/mgr/gsxl/dxnjyzl',
-    //     },
-    //   ],
-    // },
-    // {
-    //   id: id(),
-    //   title: '视频监控',
-    //   redirect: '/mgr/spjk/spjk',
-    //   icon: 'spjk',
-    //   children: [
-    //     {
-    //       id: id(),
-    //       title: '视频监控',
-    //       path: '/mgr/spjk/spjk',
-    //     },
-    //     {
-    //       id: id(),
-    //       title: 'AI告警',
-    //       path: '/mgr/spjk/aiWarn',
-    //     },
-    //   ],
-    // }, 
-    // {
-    //   id: id(),
-    //   title: '数字孪生大屏',
-    //   path: '/',
-    //   icon: 'spjk'
-    // }, 
+    { id: id(), title: '安全监测', path: '/mgr/aqjc', icon: 'sz' },
+    {
+      id: id(), title: '设备维护', path: '/mgr/sbwh/wxyhgl/wxfabz', icon: 'sz',
+      children: [
+        {
+          id: id(), title: '维修养护管理', redirect: '/mgr/sbwh/wxyhgl/wxfabz',
+          children: [
+            { id: id(), title: '维护方案编制', path: '/mgr/sbwh/wxyhgl/wxfabz' },
+            { id: id(), title: '实施过程记录', path: '/mgr/sbwh/wxyhgl/ssgcjl' },
+            { id: id(), title: '维护项目验收', path: '/mgr/sbwh/wxyhgl/whxmys' },
+          ]
+        },
+        {
+          id: id(), title: '设备物资管理', redirect: '/mgr/sbwh/sbwzgl/cgtzgl',
+          children: [
+            { id: id(), title: '采购台账管理', path: '/mgr/sbwh/sbwzgl/cgtzgl' },
+            { id: id(), title: '库存核算管理', path: '/mgr/jcsj/bjgl/kchsgl' },
+            { id: id(), title: '备品备件管理', path: '/mgr/jcsj/bjgl/bpbjgl' },
+            { id: id(), title: '综合分析考核', path: '/mgr/jcsj/bjgl/zhfxkh' },
+          ]
+        },
+      ]
+    },
+    {
+      id: id(), title: '工程运行', path: '/mgr/gcyx/xxcx/jbqk', icon: 'sz',
+      children: [
+        {
+          id: id(), title: '信息查询', redirect: '/mgr/gcyx/xxcx/jbqk',
+          children: [
+            { id: id(), title: '基本情况', path: '/mgr/gcyx/xxcx/jbqk' },
+            { id: id(), title: '运行情况', path: '/mgr/gcyx/xxcx/yxqk' },
+            { id: id(), title: '统计报表', path: '/mgr/gcyx/xxcx/tjbb' },
+            { id: id(), title: '操作日志', path: '/mgr/gcyx/xxcx/czrz' },
+          ]
+        },
+      ]
+    },
+    {
+      id: id(), title: '系统管理', path: '/mgr/xtgl/yhxx', icon: 'sz',
+      children: [
+        {
+          id: id(), title: '用户信息', path: '/mgr/xtgl/yhxx',
+        },
+      ]
+    },
   ]
 }
 
diff --git a/src/service/apiurl.js b/src/service/apiurl.js
index f2c793b..d40bd91 100644
--- a/src/service/apiurl.js
+++ b/src/service/apiurl.js
@@ -1,58 +1,8 @@
 import { config } from '../config'
-import Zfzl from '../views/gxsl/zfzl'
 
-const pubapi_old = 'https://owrsvr.cloudowr.cn/svr'
-const pubapi = 'https://owrsvr.cloudowr.cn/pubapi'
-const zdkapi = 'https://slt-sh.chutianyun.gov.cn:8002' //中电科的市级平台
 const service_fxdd = '/gunshiApp/tsg'
 const service_xyt = '/gunshiApp/tsg'//登陆先用小玉潭
-const service_shzh = '/shzh'
 const apiurl = {
-
-  krline: {
-    list: service_fxdd + "/stZvarlB/list",
-    save: service_fxdd + "/stZvarlB/insert",
-    update: service_fxdd + "/stZvarlB/update",
-    delete: service_fxdd + "/stZvarlB/del"
-  },
-  gbyj: {
-    list: service_fxdd + "/broadcastStation/list", //广播站
-    page: service_fxdd + "/broadcastWarn/page",
-    mblist: service_fxdd + "/broadcastTemplate/list",
-    bb: service_fxdd + "/broadcastWarn/insert",
-    mbsave: service_fxdd + "/broadcastTemplate/insert",
-    mbDel:service_fxdd + "/broadcastTemplate/del"
-  },
-  zrrgl: {
-    page: service_fxdd + "/resPerson/page",
-    edit: service_fxdd + "/resPerson/update",
-    delete: service_fxdd + "/resPerson/del",
-    save:service_fxdd + "/resPerson/insert",
-  },
-  pxjh: {
-    page: service_fxdd + "/personnelPlan/page",
-    edit: service_fxdd + "/personnelPlan/update",
-    delete: service_fxdd + "/personnelPlan/del",
-    save: service_fxdd + "/personnelPlan/insert",
-    import: service_fxdd + '/personnelPlan/template',
-    export:service_fxdd + "/personnelPlan/download"
-  },
-  pxjl: {
-    page: service_fxdd + "/personnelPlanLog/page",
-    edit: service_fxdd + "/personnelPlanLog/update",
-    delete: service_fxdd + "/personnelPlanLog/del",
-    save: service_fxdd + "/personnelPlanLog/insert",
-    sta: service_fxdd + "/personnelPlanLog/statistics",
-    list: service_fxdd + "/personnelPlan/list",
-    getFile:service_fxdd + "/personnelPlanLog/get"
-  },
-  fxya: {
-    page: service_fxdd + "/resPlanB/list",
-    update: service_fxdd + "/resPlanB/update",
-    save: service_fxdd + "/resPlanB/insert",
-    delete:service_fxdd + "/resPlanB/del",
-    getFile:service_fxdd + "/resPlanB/file/get"
-  },
   setMenu: service_fxdd + '/visitMenuLog/insert',
   setPassword: service_fxdd + '/user/updateSecretKey',
   xytlogin: {
@@ -62,1096 +12,7 @@ const apiurl = {
     role: service_xyt + '/system/menu/list'
   },
 
-  //闸门监控
-  zmjk: {
-    getList : service_xyt + '/attGateB/list',
-    getInformation: service_xyt + '/attGateB/data',
-    getDamData: service_xyt + '/gatePore/listByStcd',
-    getVideo: service_xyt + '/gateValveCctvRel/list'
-  },
 
-  //  基本情况
-  home: {
-    yq: service_fxdd + '/real/rain/list',//'/stStbprpB/rainfallStationDetails/rainfallList',//雨情
-    sk: service_fxdd + '/stStbprpB/reservoirStationDetails/realTimeWaterLevelList',//水库
-    skjbxx: service_fxdd+ '/attResBase/list',//水库基本信息
-    db: service_fxdd + '/attDamBase/list',//大坝基本信息
-    yhd: service_fxdd + '/attSpillwayBase/list',//溢洪道
-    gs: service_fxdd + '/stStbprpB/trafficSiteDetails/realTimeTrafficList',//供水
-    getGs: service_fxdd + '/stWaterRReal/getByStcd/',//获取流量站详情
-    getGsList: service_fxdd + '/stWaterRReal/list',//获取供水首页右侧面板数据
-    sl: service_fxdd + '/osmoticPressR/list/value?type=2',//'/osmoticFlowDevice/getDetailsAndMonitoringDataList',//渗流
-    sy: service_fxdd + '/osmoticPressR/list/value?type=1',//'/osmoticPressDevice/getDetailsAndMonitoringDataList',//渗压
-    syslList: service_fxdd + '/osmoticPressR/detail/value',//渗压、渗流详情数据
-    wy: service_fxdd + '/osmoticShiftR/list/value',//'/osmoticShiftDevice/getDetailsAndMonitoringDataList',//位移
-    wyList: service_fxdd + '/osmoticShiftR/detail/value',//渗压、渗流详情数据
-    dmList: service_fxdd + '/attDamProfile/tree',//断面
-    jcsb: service_fxdd + '/stStbprpB/status/list',//监测设备状态
-    szList: service_fxdd + '/osmoticWaterR/getLastData',//监测设备状态
-    video: service_fxdd + '/attCctvBase/list',//视频点
-    wxq: service_fxdd + '/iaCDanad/getDetailsAndAddvcdDataList',//危险区
-    azd: service_fxdd + '/shpPlacement/getDetailsAndAddvcdDataList',//安置点
-    getqsydw: service_fxdd + '/iaCBsnssinfo/getDetailsAndAddvcdDataList',//企事业单位list
-    getyhjmh: service_fxdd + '/iaCFlrvvlg/getDetailsAndAddvcdDataList',//沿河居民户list
-
-
-    wxqdetail: service_fxdd + '/iaCDanad/detail',
-    anzhidian: service_fxdd + '/shpPlacement/getDetailsAndAddvcdDataList',//安置点
-    qsydw: service_fxdd + '/iaCBsnssinfo/getDetailsAndAddvcdDataList', //企事业单位
-    yhjmh: service_fxdd + '/iaCFlrvvlg/getDetailsAndAddvcdDataList', //企事业单位
-    export: service_fxdd + '/stWaterR/exportWaterRDataExcel',//供水导出
-    gsPage: service_fxdd + "/stWaterR/list",//供水分页
-
-    yj_qxyj: service_fxdd + "/stQxWarnR/home/warn",//首页气象预警
-
-    xcxj_dcl: service_fxdd + "/inspect/detail/handle/list",//巡查巡检-待处理问题
-    xcxj_by: service_fxdd + "/inspect/task/month",//巡查巡检-本月巡查记录
-    xcxj_bn: service_fxdd + "/inspect/task/year",//巡查巡检-本年巡查记录
-    xcxj_gj: service_fxdd + "/inspectTaskTrack/list",//巡查巡检-巡查轨迹
-
-  },
-  //防汛调度-小玉潭
-  fxdd_xyt: {
-    //防洪形势
-    fhxs:{
-      getSk: service_fxdd + "/reservoir/water/rz",
-    },
-    //天气预报
-    tqyb:{
-      get24h: service_fxdd + "/weather/fore",
-      get2h: service_fxdd + "/weather/short/fore",
-    },
-    //洪水预报
-    hsyb:{
-      //洪水预报计算
-      hsybjs:{
-        //自动滚动预报
-        zdgdyb:{
-          save: service_fxdd + "/forecastTask/insert",
-          edit: service_fxdd + "/forecastTask/update",
-          page: service_fxdd + "/forecastTask/page",
-          del: service_fxdd + "/forecastTask/del/", 
-        },
-        //人工交互预报
-        rgjhyb:{
-          list: service_fxdd + "/forecastResults/getHumanForecastResult", 
-          save: service_fxdd + "/forecastProject/saveHumanForecastResults",
-        }
-      },
-      //预报方案管理
-      ybfagl:{
-        page: service_fxdd + "/forecastProject/page",
-        getData: service_fxdd + "/forecastProject/getForecastProjectResults",
-        del: service_fxdd + "/forecastProject/del/"
-      },
-      //预报参数管理
-      ybcsgl:{
-        page: service_fxdd + "/forecastUseparam/page",
-        edit: service_fxdd + "/forecastUseparam/update",
-        base: service_fxdd
-      },
-    }
-
-  },
-
-
-  //防汛调度
-  fxdd_xf: {
-    //防洪形势
-    fhxs:{
-      getSk: service_fxdd + "/reservoir/water/rz",
-    },
-    tqyb:{
-      get24h: service_fxdd + "/weather/fore",
-      get2h: service_fxdd + "/weather/short/fore",
-    },
-    hsyb:{
-      ycfagl:{
-        save: service_fxdd + "/forecastPlan/insert",
-        edit: service_fxdd + "/forecastPlan/update",
-        page: service_fxdd + "/forecastPlan/page",
-      }
-    }
-
-  },
-
-  // 防汛准备
-  fxzb1: {
-    ddgc: {
-      page:service_fxdd + "/resPlanB/list"
-    }
-  },
-  //  工程安全监测
-  gcaqjc: {
-    // 工程安全预警
-    gcaqyj: {
-      yhyj: {
-        page: service_fxdd + '/osmoticWarnR/page',
-        total:service_fxdd + '/osmoticWarnR/stat'
-      },
-      yjgzpz: {
-        page: service_fxdd + '/osmoticWarnRule/page',
-        save: service_fxdd + '/osmoticWarnRule/insert',
-        edit: service_fxdd + "/osmoticWarnRule/update",
-        delete: service_fxdd + "/osmoticWarnRule/del",
-        list:service_fxdd + "/osmoticPressDevice/list"
-      }
-    },
-    // 数据统计查询
-    sjtjcx: {
-      sycx: {
-        page: service_fxdd + '/osmoticPressR/page',
-        list:service_fxdd + "/attDamProfile/list"
-      },
-      slcx: {
-        page:service_fxdd + '/osmoticFlowR/page'
-      },
-      wycx: {
-        page: service_fxdd + '/osmoticShiftR/page',
-        list: service_fxdd + "/osmoticShiftDevice/list",
-        slList:service_fxdd + "/osmoticFlowDevice/list"
-      },
-      czcx: {
-        tree: service_fxdd + '/attDamProfile/tree',
-        list: service_fxdd + "/osmoticPressR/query/value",
-        list1: service_fxdd + "/osmoticPressR/query/chart"
-      },
-      ndsytjb: {
-        page: service_fxdd + '/osmoticPressR/year/stat',
-        export: service_fxdd + '/osmoticPressR/year/stat/export',
-        list1: service_fxdd + '/osmoticPressR/year/stat/value'
-      },
-      ndsltjb: {
-        list: service_fxdd + "/osmoticFlowDevice/list",
-      },
-      ndwytjb: {
-        list: service_fxdd + "/osmoticShiftDevice/list",
-        page: service_fxdd + "/osmoticShiftR/year/stat",
-        export: service_fxdd + "/osmoticShiftR/year/stat/export",
-        list1:service_fxdd + "/osmoticShiftR/year/stat/value"
-      }
-    },
-    // 工程安全分析
-    gcaqfx: {
-      jrx: {
-        page:service_fxdd + "/osmoticPressR/infiltra/line",
-        export: service_fxdd + "/osmoticPressR/export"
-      }
-    }
-  },
-  // 日常管理
-  rcgl: {
-    jdkh: {
-      khtj: {
-        level: service_fxdd + "/assessTask/level/stat",
-        zg: service_fxdd + "/assessTeamRating/rectify/stat",
-        person:service_fxdd + "/assessTask/result/stat"
-      },
-      khwtzg: {
-        page: service_fxdd + "/assessTeamRating/list/page",
-        finish:service_fxdd + "/assessTeamRating/rectify"
-      },
-      khrwgl: {
-        taskPage: service_fxdd + "/assessTask/list/page",//任务清单
-        todoPage: service_fxdd + "/assessTask/myTodo/page", //待办
-        myDonePage: service_fxdd + "/assessTask/myDone/page", //已办
-        save: service_fxdd + "/assessTask/insert",
-        edit:service_fxdd + "/assessTask/update",
-        delete:service_fxdd +"/assessTask/del",
-        detail: service_fxdd + "/assessTask/detail",
-        templateList: service_fxdd + "/assessTemplate/listByType",
-        start: service_fxdd + "/assessTask/start", //启动评分
-        savePf: service_fxdd + "/assessTeamRating/saveScore",//保存评分
-        confirmpf:service_fxdd + "/assessTeamRating/score",//完成评分
-        pfDetail: service_fxdd + "/assessTeamRating/do/detail", //暂存评分后 获取考核分数
-        qdView: service_fxdd + "/assessTeamRating/scoreDetail",//清单查看详情
-        result: service_fxdd + "/assessTask/result",//考核结果
-        export: service_fxdd + "/assessTask/result/export",//考核结果导出
-        pass: service_fxdd + "/assessTask/pass",//审核通过
-        refuse: service_fxdd + '/assessTask/reject',//驳回评分
-        pause: service_fxdd + '/assessTask/cancel',//作废评分
-      },
-      khzbgl: {
-        page: service_fxdd + "/assessIndicator/page",
-        save: service_fxdd + "/assessIndicator/insert",
-        edit: service_fxdd + "/assessIndicator/update",
-        delete: service_fxdd + "/assessIndicator/del",
-        tree: service_fxdd + "/assessCategory/list",
-        saveTree: service_fxdd + "/assessCategory/insert",
-        editTree: service_fxdd + "/assessCategory/update",
-        deleteTree: service_fxdd + "/assessCategory/del",
-      },
-      khmbgl: {
-        page: service_fxdd + "/assessTemplate/page",
-        save: service_fxdd + "/assessTemplate/insert",
-        edit: service_fxdd + "/assessTemplate/update",
-        delete: service_fxdd + "/assessTemplate/del",
-        choose: service_fxdd + "/assessIndicator/choose",
-        info: service_fxdd + "/assessTemplate/queryIndicators",
-        detail: service_fxdd + "/assessTemplate/detail",
-        stop:service_fxdd + "/assessTemplate/startStop"
-      }
-    },
-    btbb: {
-      sdjyrbb: {
-        page: service_fxdd + "/statistics/sdJyRb",
-        export:service_fxdd + "/statistics/sdJyRb/export"
-      },
-      rjylnbb: {
-        page: service_fxdd + "/statistics/rjyNb",
-        export: service_fxdd + "/statistics/rjyNb/export",
-        sta:service_fxdd + "/statistics/rjyNb/stat"
-      },
-      rjswnbb: {
-        page: service_fxdd + "/statistics/rjswNb",
-        export: service_fxdd + "/statistics/rjswNb/export",
-        sta:service_fxdd + "/statistics/rjswNb/stat"
-      },
-      sdswrbb: {
-        page: service_fxdd + "/statistics/sdSwRb",
-        export:service_fxdd + "/statistics/sdSwRb/export"
-      }
-    },
-    xcxj: {
-      xjrw: {
-        page: service_fxdd + "/inspect/task/page",
-        save: service_fxdd + "/inspect/task/insert",
-        edit: service_fxdd + "/inspect/task/update",
-        delete: service_fxdd + "/inspect/task/del",
-        list: service_fxdd + "/inspect/point/listWithItem",
-        detail: service_fxdd + '/inspect/detail/getByTaskId',
-        info: service_fxdd + '/inspect/detail/info'
-      },
-      xjwtcl: {
-        page: service_fxdd + "/inspect/detail/page",
-      },
-      xjxpz: {
-        page: service_fxdd + "/inspectItem/page",
-        save: service_fxdd + "/inspectItem/insert",
-        edit: service_fxdd + "/inspectItem/update",
-        delete: service_fxdd + "/inspectItem/del",
-        tree: service_fxdd + "/inspect/point/list",
-        saveTree: service_fxdd + "/inspect/point/insert",
-        editTree: service_fxdd + "/inspect/point/update",
-        deleteTree: service_fxdd + "/inspect/point/del",
-      }
-    },
-    byfz: {
-      bypc: {
-        page: service_fxdd + "/termite/survey/page",
-        save: service_fxdd + "/termite/survey/insert",
-        edit: service_fxdd + "/termite/survey/update",
-        delete: service_fxdd + "/termite/survey/del",
-        detail: service_fxdd + "/termite/survey/detail",
-        dictionary:service_fxdd + "/sysDictB/listByCd"
-      },
-      fzxc: {
-        page: service_fxdd + "/termite/adver/file/page",
-        list: service_fxdd + "/termite/adver/list",
-        delete: service_fxdd + "/termite/adver/file/delete",
-        picList: service_fxdd + "/termite/pic/list",
-        picDelete: service_fxdd + "/termite/pic/del",
-        picSave:service_fxdd + "/termite/pic/insert"
-      }
-    },
-    wxyh: {
-      page: service_fxdd + "/maintain/service/page",
-      save: service_fxdd + "/maintain/service/insert",
-      edit: service_fxdd + "/maintain/service/update",
-      delete: service_fxdd + "/maintain/service/del",
-    },
-    aqgl: {
-      fxgkqd: {
-        page: service_fxdd + "/risk/info/page",
-        save: service_fxdd + "/risk/info/insert",
-        edit: service_fxdd + "/risk/info/update",
-        delete: service_fxdd + "/risk/info/del",
-        tree: service_fxdd + "/risk/menu/tree",
-        saveTree: service_fxdd + "/risk/menu/insert",
-        editTree: service_fxdd + "/risk/menu/update",
-        deleteTree: service_fxdd + "/risk/menu/del",
-        dictionary:service_fxdd + "/sysDictB/listByCd"
-      },
-      aqyhpc: {
-        page: service_fxdd + "/safety/hazard/invest/page",
-        save: service_fxdd + "/safety/hazard/invest/insert",
-        edit: service_fxdd + "/safety/hazard/invest/update",
-        delete: service_fxdd + "/safety/hazard/invest/del"
-      },
-      aqjcgl: {
-        page: service_fxdd + "/safety/check/page",
-        save: service_fxdd + "/safety/check/insert",
-        edit: service_fxdd + "/safety/check/update",
-        delete: service_fxdd + "/safety/check/del"
-      },
-      aqsgdj: {
-        page: service_fxdd + "/safety/accident/reg/page",
-        save: service_fxdd + "/safety/accident/reg/insert",
-        edit: service_fxdd + "/safety/accident/reg/update",
-        delete: service_fxdd + "/safety/accident/reg/del"
-      },
-      aqjdtz: {
-        page: service_fxdd + "/safety/identify/page",
-        save: service_fxdd + "/safety/identify/insert",
-        edit: service_fxdd + "/safety/identify/update",
-        delete: service_fxdd + "/safety/identify/del"
-      },
-      cxjgtz: {
-        page: service_fxdd + "/safety/reinforcement/page",
-        save: service_fxdd + "/safety/reinforcement/insert",
-        edit: service_fxdd + "/safety/reinforcement/update",
-        delete: service_fxdd + "/safety/reinforcement/del"
-      },
-    },
-    zbgl: {
-      zbb: {
-        import: service_fxdd + "/rota/importTemplate",
-        deptlist: service_fxdd + "/system/dept/list",
-        userList: service_fxdd + "/system/user/list",
-        export:service_fxdd + "/rota/importData"
-      },
-      zbrz: {
-        page: service_fxdd + "/rota/log/page",
-        save: service_fxdd + "/rota/log/insert",
-        edit: service_fxdd + "/rota/log/update",
-        delete: service_fxdd + "/rota/log/del",
-        rotaUser: service_fxdd + "/rota/date/list"
-      }
-    },
-    gcdsj: {
-      page: service_fxdd + "/projectEvents/page",
-      edit: service_fxdd + '/projectEvents/update',
-      save: service_fxdd + "/projectEvents/insert",
-      delete:service_fxdd + "/projectEvents/del"
-    },
-    szzb: {
-      list: service_fxdd + "/attWaterItem/list",
-      page: service_fxdd + "/osmoticWaterR/page",
-      export: service_fxdd + "/osmoticWaterR/exportOsmoticWaterRDataExcel",
-    },
-    stlljk: {
-      page: service_fxdd + "/stWaterR/ecologyFlowPage",
-      list: service_fxdd + "/stWaterR/ecologyFlowList",
-      months: service_fxdd + "/stWaterR/getResMonthEcoFlow",
-    }
-  },
-  // 供水兴利
-  gsxl: {
-    gsWater:service_fxdd + "/gateValveReal/predict/water",
-    dxnjyzl: {
-      page: service_fxdd + '/tyYearRainfall/page',
-      edit: service_fxdd + '/tyYearRainfall/update',
-      save: service_fxdd + "/tyYearRainfall/insert",
-      delete:service_fxdd + "/tyYearRainfall/del"
-    },
-    zfzl: {
-      list: service_fxdd + "/gateValveReal/list",
-      krlist: service_fxdd + "/reservoir/water/data",
-      info: service_fxdd + "/attGateValve/detail",
-      kgpage: service_fxdd + "/gateValveR/page",
-      export: service_fxdd + '/gateValveR/export',
-      videoList: service_fxdd + "/gateValveCctvRel/list",
-      videosrc: service_fxdd + "/attCctvBase/preview/",
-      tjzf: service_fxdd + "/gateValveReal/control",
-      input: service_fxdd + "/stWaterRReal/list",
-      export1: service_fxdd + "/gateValveReal/log/export", //操作日志导出
-      logpage: service_fxdd + "/gateValveReal/log/page", //操作日志分页
-      gsStatic: service_fxdd + "/stWaterR/stat",
-      similar: service_fxdd + "/tyYearRainfall/list",
-      kyTime: service_fxdd + "/gateValveReal/supply/time", //预计可供用时间
-      realQ:service_fxdd + "/gateValveReal/realQ" //获取实时流量
-    },
-    gstjfx: {
-      gspage: service_fxdd + "/stWaterRReorganize/page",
-      gsexport: service_fxdd + "/stWaterRReorganize/exportWaterRReorganizeDataExcel",
-      gschartList: service_fxdd + "/stWaterRReorganize/list",
-      tjlist: service_fxdd + "/stWaterRReorganize/getYearStatisticAnalysis",
-      tjexport:service_fxdd + "/stWaterRReorganize/exportYearStatisticAnalysisExcel"
-    }
-  },
-  // 视频监控
-  spjk1: {
-    aiWarn: {
-      page: service_fxdd + "/stImgWarnR/page",
-      list: service_fxdd + "/attCctvBase/list",
-      controler:service_fxdd + "/attCctvBase/control"
-    }
-  },
-  sdz: {
-    zrrByCode:service_fxdd + '/hEHystSafePerson/hystCode',
-    gctp:service_fxdd + '/attHystBase/projectImgList',
-    sjzl:service_fxdd + '/attHystBase/desFileList',
-    delGctp:service_fxdd + '/hEHystProjectImg/delete',
-    filedNameById:service_fxdd + '/hEHystProjectImg/file/get/'
-  },
-  login: {
-    login: service_fxdd + '/doLogin',
-    info: service_fxdd + '/getLoginInfo'
-  },
-  spjk: {
-    treeList: service_fxdd + '/cctvBMenu/list',
-    treeListById: service_fxdd + '/xfCctvB/listByMenuId/',
-    srcData: service_fxdd + '/attCctvBase/preview/',
-    videoBystcd: service_fxdd + '/stbprp/cctv/listByStcd/',
-    videoList:service_fxdd + '/attCctvBase/list',
-    ysyToken:service_fxdd + '/ysy/getAccessToken'
-  },
-  //基本情况
-  jbqk: {
-    // 防汛抗旱工作会
-    shjj: {
-      list: service_fxdd + '/basicInfo/adinfo/adList',
-      info: service_fxdd + '/basicInfo/adinfo/statistics',
-      cList: service_fxdd + '/basicInfo/adinfo/villageList',
-      coutxzc: service_fxdd + '/basicInfo/adinfo/villageList',
-      //查村
-      countslgc: service_fxdd + '/basicInfo/adinfo/vGroup/waterEngin',
-      countjctx: service_fxdd + '/basicInfo/adinfo/vGroup/monitorSys',
-      countzddx: service_fxdd + '/basicInfo/adinfo/vGroup/importObject',
-      conutInfo: service_fxdd + '/basicInfo/adinfo/vGroup/Info',
-
-      //查镇
-      countslgc1:
-        service_fxdd +
-        '/basicInfo/rainAdministrativeDivision/queryWaterEngineering/adcd',
-      countjctx1:
-        service_fxdd +
-        '/basicInfo/rainAdministrativeDivision/queryMonitoringSystem/adcd',
-      countzddx1:
-        service_fxdd +
-        '/basicInfo/rainAdministrativeDivision/queryImportantObject/adcd',
-      conutInfo1:
-        service_fxdd +
-        '/basicInfo/rainAdministrativeDivision/queryIaCAdinfo/adcd',
-
-      countzrr:
-        service_fxdd +
-        '/basicInfo/rainAdministrativeDivision/queryXfAdcdSafePerson/adcd',
-      conutDeteil:
-        service_fxdd +
-        '/basicInfo/rainAdministrativeDivision/queryAllIaCCount/adcd'
-    },
-    //河流水系
-    hlsx: {
-      list: service_fxdd + '/river/system/gradesList'
-    },
-    //气象水文
-    qxsw: {
-      qxtd: {
-        qhtd: service_fxdd + '/hydroMet/weatherAllSummary',
-        jysdfb: service_fxdd + '/hydroMet/weatherRainSummary',
-        byjzhb: service_fxdd + '/hydroMet/weatherRainStatistics/sheng',
-        byjzxf: service_fxdd + '/hydroMet/weatherRainStatistics/xian',
-        bypl: service_fxdd + '/hydroMet/weatherRainFrequency'
-      }
-    },
-    slgc: {
-      sk: {
-        list: service_fxdd + '/webi/resList',
-        count: service_fxdd + '/webi/resStatistics'
-      },
-      sdz: {
-        count: service_fxdd + '/webi/hystStatistics',
-        list: service_fxdd + '/webi/hystList'
-      },
-      ysgc: {
-        count: service_fxdd + '/webi/wadiStatistics',
-        list: service_fxdd + '/webi/wadiList'
-      },
-      tyb: {
-        count: service_fxdd + '/webi/daminfoStatistics',
-        list: service_fxdd + '/webi/aminfoList'
-      }
-    },
-    yfzhd: {
-      count: service_fxdd + '/attWaterlogged/count',
-      list: service_fxdd + '/attWaterlogged/list',
-      tableList: service_fxdd + '/attWaterlogged/statistics/list'
-    },
-    dzzhd: {
-      count: service_fxdd + '/attGeoHazzard/count',
-      list: service_fxdd + '/attGeoHazzard/list',
-      tableList: service_fxdd + '/attGeoHazzard/statistics/list'
-    },
-    dxzhsj: {
-      list: service_fxdd + '/typical/iaCHsfwater'
-    }
-  },
-  //防汛调度--------
-  fxdd: {
-    dqxsfx: {
-      list: service_fxdd + '/analysis/rainfallAnalysis'
-    },
-    warnSH: {
-      list: service_fxdd + '/current/situation/flood/warn'
-    },
-    warnSK: {
-      list: service_fxdd + '/current/situation/res/warn'
-    }
-  },
-
-  //站点数据
-  station: {
-    // 雨量站
-    rainfallStation: {
-      list: service_fxdd + '/stStbprp/list'
-    },
-    //河道水位站
-    gaugingStation: {
-      list: service_fxdd + '/river/water/list'
-    },
-    //水库
-    reservoirStation: {
-      list: service_fxdd + '/webi/resList'
-    },
-    //水电站
-    hydropowerStation: {
-      list: service_fxdd + '/webi/hystList'
-    },
-    //塘(堰)坝
-    TangYanBa: {
-      list: service_fxdd + '/webi/aminfoList'
-    },
-    //易发灾害点
-    YiFaZaiHaiDian: {
-      list: service_fxdd + '/attWaterlogged/list'
-    },
-    //地质灾害点
-    DiZhiZaiHaiDian: {
-      list: service_fxdd + '/attGeoHazzard/list'
-    },
-    //典型灾害事件
-    DianXingZaiHaiShiJian: {
-      list: service_fxdd + '/typical/iaCHsfwater'
-    },
-    //河流
-    Hl: {
-      list: service_fxdd + '/river/system/gradesList'
-    }
-  },
-
-  //防汛准备
-  fxzb: {
-    fkList: service_fxdd + '/xfEmerDispatchR/getFeedbackById',
-    //行政区划树
-    adcdTree: {
-      //政区树
-      zqTree: service_fxdd + '/real/rain/adnmList',
-      txTree: service_fxdd + '/department/tree'
-    },
-    //工程树
-    gcTree: {
-      // tree: service_fxdd + '/orgGC/eStation'
-      tree: service_fxdd + '/trees/reshystWithXfRsvSafePersonB'
-    },
-
-    //思想发动
-    sxfd: {
-      // 防汛抗旱工作会
-      fxkhgzh: {
-        page: service_fxdd + '/xfIdeoFcB/pageByAdcdYear',
-        save: service_fxdd + '/xfIdeoFcB/insert',
-        edit: service_fxdd + '/xfIdeoFcB/update',
-        del: service_fxdd + '/xfIdeoFcB/deleteById/',
-        getFile: service_fxdd + '/xfIdeoFcB/file/get',
-        deleteFile: service_fxdd + '/xfIdeoFcB/file/delete'
-      },
-      // 防办主任会
-      fbzrh: {
-        page: service_fxdd + '/xfIdeoHmB/pageByAdcdYear',
-        save: service_fxdd + '/xfIdeoHmB/insert',
-        edit: service_fxdd + '/xfIdeoHmB/update',
-        del: service_fxdd + '/xfIdeoHmB/deleteById/',
-        deleteFile: service_fxdd + '/xfIdeoHmB/file/delete',
-        getFile: service_fxdd + '/xfIdeoHmB/file/get'
-      },
-      // 防汛培训班
-      fxpxb: {
-        page: service_fxdd + '/xfIdeoTcB/pageByAdcd',
-        save: service_fxdd + '/xfIdeoTcB/insert',
-        edit: service_fxdd + '/xfIdeoTcB/update',
-        del: service_fxdd + '/xfIdeoTcB/deleteById',
-        getFile: service_fxdd + '/xfIdeoTcB/file/get',
-        deleteFile: service_fxdd + '/xfIdeoTcB/file/delete'
-      },
-      // 防汛图件
-      fxtj: {
-        page: service_fxdd + '/xfIdeoImgB/page',
-        save: service_fxdd + '/xfIdeoImgB/insert',
-        edit: service_fxdd + '/xfIdeoImgB/update',
-        del: service_fxdd + '/xfIdeoImgB/deleteById/'
-      }
-    },
-    //组织机构
-    zzjg: {
-      //工程
-      gc: {
-        page: service_fxdd + '/orgGC/safePerson',
-        save: service_fxdd + '/orgGC/insertRsv',
-        // edit: service_fxdd+'/xfIdeoImgB/update',
-        // del: service_fxdd+'/xfIdeoImgB/deleteById/',
-      },
-      zq: {
-        tree:service_fxdd + '/trees/adcdWithBzOrganizationFile',
-        page: service_fxdd + '/bzOrganizationFile/getByAdcd',
-        save: service_fxdd + '/bzOrganizationFile/insert',
-        delete: service_fxdd + '/bzOrganizationFile/deleteById'
-      }
-    },
-
-    // 工程整修
-    gczx: {
-      // 已投运工程
-      ytygc: {
-        tree:service_fxdd + '/trees/adcdWithBzProjectManipulationRecord1',
-        page: service_fxdd + '/bzProjectManipulationRecord/page', //查询
-        save: service_fxdd + '/bzProjectManipulationRecord/save', //保存
-        edit: service_fxdd + '/bzProjectManipulationRecord/updateById', //编辑
-        delete: service_fxdd + '/bzProjectManipulationRecord/deleteById', //删除
-        deleteFile: service_fxdd + '/bzProjectManipulationRecord/deleteAttach', //删除附件
-        getFile: service_fxdd + '/bzProjectManipulationRecord/file/get' //获取file文件
-      },
-      zjgc: {
-        list: service_fxdd + '/project/progress/listWithManipulationCount'
-      }
-    },
-    // 预案修编
-    yaxb: {
-      adcdTree:service_fxdd + "/trees/adcdWithBzPredictionScheme1",
-      tree:service_fxdd + '/trees/adcdWithBzPredictionScheme2',
-      page: service_fxdd + '/bzPredictionScheme/pageByRelatedObjectId', //查询
-      save: service_fxdd + '/bzPredictionScheme/save', //保存
-      delete: service_fxdd + '/bzPredictionScheme/deleteById', //删除
-      view: service_fxdd + '/bzPredictionScheme/file/get', // 查看
-      hsddPage: service_fxdd + '/bzPredictionScheme/pageByTitle',
-      deleteFile: service_fxdd + '/bzPredictionScheme/deleteAttach', //附件删除
-      edit: service_fxdd + '/bzPredictionScheme/updateById', //编辑
-      getFile: service_fxdd + '/bzPredictionScheme/file/get',
-      zjgcya: {
-        list: service_fxdd + '/project/progress/listWithSchemeCount'
-      }
-    },
-    // 监测站网
-    jczw: {
-      yqz: {
-        list: service_fxdd + '/monitoringStations/rainStationCount' //新增
-      },
-      sqz: {
-        list: service_fxdd + '/monitoringStations/hydrologicalStationCount' //新增
-      }
-    },
-
-    // 通讯录
-    txl: {
-      page: service_fxdd + '/addressbook/page/query', //新增
-      edit: service_fxdd + '/addressbook/update', //修改
-      save: service_fxdd + '/addressbook/insert', //保存,
-      delete: service_fxdd + '/addressbook/deleteById' //删除,
-    },
-    zbb: {
-      ryTree: service_fxdd + '/org/userTree', //人员树
-      page: service_fxdd + '/rota/query', //查询
-      edit: service_fxdd + '/rota/edit/info' //新增或编辑值班表
-    },
-    // 抢险物料
-    qswl: {
-      zq: {
-        zqTree: service_fxdd + '/rescue/goods/adcd',
-        page: service_fxdd + '/rescue/goods/page/query',
-        getStore: service_fxdd + '/warehouse/list',
-        storePage: service_fxdd + '/warehouse/page/query',
-        storeSave: service_fxdd + '/warehouse/insert',
-        storeEdit: service_fxdd + '/warehouse/update',
-        storeDelete: service_fxdd + '/warehouse/deleteById',
-        save: service_fxdd + '/rescue/goods/insert',
-        edit: service_fxdd + '/rescue/goods/update',
-        delete: service_fxdd + '/rescue/goods/deleteById',
-        getFile: service_fxdd + '/rescue/goods/detail',
-        similarSave: service_fxdd + '/rescue/goods/add/copy',
-        gcTree: service_fxdd + '/rescue/goods/project'
-      }
-    },
-    // 抢修队伍
-    qsdw: {
-      zq: {
-        zqTree: service_fxdd + '/rescue/team/adcd',
-        page: service_fxdd + '/rescue/team/page/query',
-        save: service_fxdd + '/rescue/team/insert',
-        edit: service_fxdd + '/rescue/team/update',
-        delete: service_fxdd + '/rescue/team/deleteById',
-        getFile: service_fxdd + '/rescue/team/detail',
-        gcTree: service_fxdd + '/rescue/team/project'
-      }
-    }
-  },
-
-  // 雨水工灾情
-  ysgzq: {
-    ssgq: {
-      page: service_fxdd + '/xfProjectRun/queryPage', //运行情况查询
-      allRead: service_fxdd + '/xfProjectRun/all/read', //全部标记为已读
-      getFile: service_fxdd + '/xfProjectRun/detail' //获取文件
-    },
-    gcxq: {
-      page: service_fxdd + '/xfProjectIncident/queryPage', //工程险情查询
-      allRead: service_fxdd + '/xfProjectIncident/all/read', //全部标记为已读
-      getFile: service_fxdd + '/xfProjectIncident/detail' //获取文件
-    },
-    sszq: {
-      page: service_fxdd + '/iaCHsfwater/queryPage', //实时灾情查询
-      allRead: service_fxdd + '/iaCHsfwater/all/read', //全部标记为已读
-      getFile: service_fxdd + '/iaCHsfwater/detail' //获取文件
-    },
-    dbaq: {
-      pressList: service_fxdd + '/dws/pressList', // 渗压日统计
-      alarmPage: service_fxdd + '/dws/alarmPage', // 报警分页
-      rainList: service_fxdd + '/dws/rainList', // 雨量日统计
-      dwsUnion: service_fxdd + '/dws/union', // 雨量水位渗压位移合并查询
-      dwsWaterList: service_fxdd + '/dws/waterList', // 水位日统计
-      dwsWyList: service_fxdd + '/dws/wyList',
-      attResBasePage: service_fxdd + '/attResBase/page', //水库基本信息
-      hEResPage: service_fxdd + '/hERes/resBase/resCode',
-      hERespageRes: service_fxdd + '/hERes/pageRes'
-    }
-  },
-
-  //防汛调度--------
-  hsyb: {
-    skhs: {
-      page: service_fxdd + '/bzFldPred/page'
-    }
-  },
-  ddjc: {
-    yjxy: {
-      page: service_fxdd + '/xfEmerRespR/page',
-      save: service_fxdd + '/xfEmerRespR/start',
-      stop: service_fxdd + '/xfEmerRespR/stop',
-      getFile: service_fxdd + '/xfEmerRespR/file/get'
-    },
-    ddjz: {
-      page: service_fxdd + '/xfEmerDispatchR/page',
-      save: service_fxdd + '/xfEmerDispatchR/start',
-      edit: service_fxdd + '/xfEmerDispatchR/updateById',
-      change: service_fxdd + '/xfEmerDispatchR/changeStatus',
-      unitList: service_fxdd + '/xfEmerDispatchR/getOrgList',
-    }
-  },
-  shyj2: {
-    log: service_fxdd + '/warn/getWarnStatusLog', //预警状态
-    yjpz: service_fxdd + '/warn/getWarnConf', //预警配置
-    message: service_fxdd + '/warn/getWarnMsg' //预警配置
-  },
-
-  upgramurl: {
-    login: {
-      authOld: '/shzh/' + config.address + '/sys/users/login'
-    }
-  },
-
-  pubapi_old,
-  pubapi,
-
-  yjhis: {
-    weather: 'http://223.75.53.124:8005/res/grblayerset',
-    radar: 'http://223.75.53.124:8005/res/radarlayer',
-  },
-
-
-  
-  //气象
-  meteorology: {
-    //气象云图
-    // getImgNames: 'service2/shzh/met/zyqxfw/api/radar/sateCloud/getImgNames',
-    getImgNames: service_shzh+'/service2/shzh/met/zyqxfw/api/radar/sateCloud/getImgNames',
-    //雷达图
-    // getImgNamesRadar: 'service2/shzh/met/zyqxfw/api/radar/getImgNames', 
-    getImgNamesRadar: service_shzh+'/service2/shzh/met/zyqxfw/api/radar/getImgNames', 
-    //图文预报
-  },
-
-  //首页模糊查询
-
-  // 雨水工灾情
-  //
-  //实时雨情
-  ssyq: {
-    maxDrp:service_fxdd + "/attResBase/maxRain",
-    status: service_fxdd + '/xfProjectRun/has/read',
-    basNameList: service_fxdd + '/real/rain/basNameList', //流域选择
-    adnmList: service_fxdd + '/real/rain/adnmList', //行政选择
-    list: service_fxdd + '/real/rain/list', //实时雨情-降雨信息
-    count: service_fxdd + '/real/rain/count', //实时雨情-站点统计
-    level: service_fxdd + '/real/rain/level', //实时雨情-量级统计
-    res: service_fxdd + '/real/rain/area/res', //实时雨情-量级统计
-    adcd: service_fxdd + '/real/rain/area/adcd', //实时雨情-区域降雨
-    bas: service_fxdd + '/real/rain/area/bas', //实时雨情-流域降雨
-    freq: service_fxdd + '/real/rain/freq', //实时雨情-频率统计
-    imglist:service_fxdd + '/reservoir/water/real/img',
-
-    //  详情监测数据
-    StcdAndStartTimeAndEndTime:
-      service_fxdd +
-      '/attResBase/rainBasinDivision/queryStStbprpPerDay/StcdAndStartTimeAndEndTime', //实时雨情-弹框详情-监测数据-天
-    StcdAndStartTimeAndEndTimeHour:
-      service_fxdd +
-      '/attResBase/rainBasinDivision/queryStStbprpPerHour/StcdAndStartTimeAndEndTime', //实时雨情-弹框详情-监测数据-小时
-    queryStStbprpPerDayChart:
-      service_fxdd +
-      '/attResBase/rainBasinDivision/queryStStbprpPerDayChart/StcdAndStartTimeAndEndTime', //实时雨情-弹框详情-监测数据-天-图表
-    queryStStbprpPerHourChart:
-      service_fxdd +
-      '/attResBase/rainBasinDivision/queryStStbprpPerHourChart/StcdAndStartTimeAndEndTime', //实时雨情-弹框详情-监测数据-小时-图表
-    queryStPptnDetails:
-      service_fxdd + '/attResBase/rainBasinDivision/queryStPptnDetails/stcd', //实时雨情-弹框详情-测站编码查详细雨量
-    queryNearbyRainStations:
-      service_fxdd + '/attResBase/rainBasinDivision/queryNearbyRainStations' //实时雨情-弹框详情-周边雨情
-  },
-
-  //实时水情
-  sssq: {
-    selectList:service_fxdd + "/real/rain/list",
-    list: service_fxdd + '/river/water/list', //实时水情-河道水情列表
-    warn: service_fxdd + '/current/situation/rv/warn', //实时水情-河道水情统计
-    summaryInfo: service_fxdd + '/river/water/summaryInfo', //实时水情-河道水情汇总
-    reservoirlist: service_fxdd + '/reservoir/water/list', //实时水情-水库水情列表
-    reswarn: service_fxdd + '/current/situation/res/warn', //实时水情-水库水情统计
-    reservoirsummaryInfo: service_fxdd + '/reservoir/water/summaryInfo', //实时水情-水库水情汇总
-    //河道弹框详情
-    monitor: service_fxdd + '/river/water/monitor/data', //监测数据
-    detail: service_fxdd + '/reservoir/water/detail', //监测数据-下方表格
-    zqrl: service_fxdd + '/river/water/zqrl', //水位流量关系
-    channel: service_fxdd + '/reservoir/water/image/channel', //图像监测-视角
-    imageinfo: service_fxdd + '/reservoir/water/image/info', //图像监测-列表
-
-    // 水库弹框详情
-    reservoirmonitor: service_fxdd + '/reservoir/water/monitor/data', //图像监测-列表
-    reservoirmonitor1: service_fxdd + '/reservoir/water/data/page', //图像监测-列表
-
-    // 水库基础信息
-    attResBase: service_fxdd + '/attResBase/attResBase', //基本信息
-    zvarl: service_fxdd + '/reservoir/water/zvarl', //库容曲线
-    person: service_fxdd + '/reservoir/water/safe/person', //责任体系
-    dam: service_fxdd + '/reservoir/water/dam', //挡水建筑物
-    drainage: service_fxdd + '/reservoir/water/drainage', //泄水建筑物
-    transport: service_fxdd + '/reservoir/water/transport', //输水建筑物
-    construction: service_fxdd + '/reservoir/water/construction', //建设信息
-    projectimg: service_fxdd + '/reservoir/water/project/img', //工程图片
-    plan: service_fxdd + '/reservoir/water/plan', //防汛预案
-    file: service_fxdd + '/reservoir/water/des/file', //设计报告
-
-    fileget: service_fxdd + '/xfIdeoFcB/file/get/' //根据id查文件
-  },
-  //当前形势分析
-  dqxsfx: {
-    shwarn: service_fxdd + '/current/situation/flood/warn',
-    skwarn: service_fxdd + '/current/situation/res/warn',
-    hdwarn: service_fxdd + '/current/situation/rv/warn'
-  },
-  // 天气预报
-  tqyb: {
-    sevenDays: service_fxdd + '/weather/sevenDays', // 7天
-    weatherRes: service_fxdd + '/weather/res', // 24 小时水库
-    weatherLevel: service_fxdd + '/weather/level', // 24小时量级统计
-    weatherasin: service_fxdd + '/weather/basin', // 24小时流域统计
-    weatherArea: service_fxdd + '/weather/area', // 24小时区域统计
-    short: service_fxdd + '/weather/short/level ' // 短临预报量级统计
-  },
-
-
-
-  //檀树岗
-  // 全要素
-  dataResourcesCenter: {
-    projectAndWater: {
-      shuikuBasicinfo: {
-        detail: service_fxdd + "/attResBase/list",
-        update: service_fxdd + "/attResBase/update",
-        getFile:service_fxdd + "/attResBase/file/get"
-      },
-      kr: {
-        list: service_fxdd + "/stZvarlB/list",
-        save: service_fxdd + "/stZvarlB/insert",
-        update: service_fxdd + "/stZvarlB/update",
-        delete: service_fxdd + "/stZvarlB/del"
-      },
-      xl: {
-        list: service_fxdd + "/stZqrlB/list",
-        save: service_fxdd + "/stZqrlB/insert",
-        update: service_fxdd + "/stZqrlB/update",
-        delete: service_fxdd + "/stZqrlB/del"
-      },
-      mangerUnit: {
-        list: service_fxdd + "/resMangUnit/list",
-        update:service_fxdd + "/resMangUnit/update"
-      },
-      zrtx: {
-        list: service_fxdd + "/resSafePersonB/list",
-        save: service_fxdd + "/resSafePersonB/insert",
-        update: service_fxdd + "/resSafePersonB/update",
-        delete:service_fxdd + "/resSafePersonB/del"
-      },
-      monthLl: {
-        page: service_fxdd + "/resMonthEcoFlow/list",
-        update:service_fxdd + "/resMonthEcoFlow/updates"
-      },
-      fxya: {
-        page: service_fxdd + "/resPlanB/list",
-        update: service_fxdd + "/resPlanB/update",
-        save: service_fxdd + "/resPlanB/insert",
-        delete:service_fxdd + "/resPlanB/del",
-        getFile:service_fxdd + "/resPlanB/file/get"
-      },
-      sjtz: {
-        list: service_fxdd + "/attResBase/fileList",
-        upload: service_fxdd + "/attResBase/updateFile",
-        delete: service_fxdd + "/attResBase/del",
-      },
-      projectPic: {
-        list: service_fxdd + "/resProjectImg/list",
-        save: service_fxdd + "/resProjectImg/insert",
-        delete:service_fxdd + "/resProjectImg/del"
-      },
-      yhd: {
-        page: service_fxdd + '/attSpillwayBase/page',
-        save:service_fxdd + '/attSpillwayBase/insert',
-        update: service_fxdd + '/attSpillwayBase/update',
-        delete:service_fxdd + "/attSpillwayBase/del"
-      },
-      db: {
-        page: service_fxdd + '/attDamBase/page',
-        save:service_fxdd + '/attDamBase/insert',
-        update: service_fxdd + '/attDamBase/update',
-        delete: service_fxdd + "/attDamBase/del",
-        getFile:service_fxdd + "/attDamBase/get"
-      },
-      zf: {
-        page: service_fxdd + '/attGateValve/page',
-        save:service_fxdd + '/attGateValve/insert',
-        update: service_fxdd + '/attGateValve/update',
-        delete: service_fxdd + "/attGateValve/del",
-        getFile:service_fxdd + "/attGateValve/get"
-
-      },
-      lsy: {
-        page: service_fxdd + '/attMeaWeir/page',
-        save:service_fxdd + '/attMeaWeir/insert',
-        update: service_fxdd + '/attMeaWeir/update',
-        delete: service_fxdd + "/attMeaWeir/del",
-        list:service_fxdd+"/stAddvcdD/tree"
-      }
-    },
-    basicData: {
-      jczd: {
-        page: service_fxdd + "/stStbprpB/page",
-        save: service_fxdd + "/stStbprpB/insert",
-        update: service_fxdd + "/stStbprpB/update",
-        delete: service_fxdd + "/stStbprpB/del"
-      },
-      dmgl: {
-        page: service_fxdd + "/attDamProfile/page",
-        update: service_fxdd + "/attDamProfile/update",
-        save: service_fxdd + "/attDamProfile/insert",
-        delete: service_fxdd + "/attDamProfile/del",
-        getFile: service_fxdd + "/attDamProfile/file/get"
-      },
-      sysbgl: {
-        page: service_fxdd + "/osmoticPressDevice/page",
-        update: service_fxdd + "/osmoticPressDevice/update",
-        save: service_fxdd + "/osmoticPressDevice/insert",
-        delete: service_fxdd + "/osmoticPressDevice/del",
-        list:service_fxdd + "/osmoticPressDevice/list"
-      },
-      slsbgl: {
-        page: service_fxdd + "/osmoticFlowDevice/page",
-        update: service_fxdd + "/osmoticFlowDevice/update",
-        save: service_fxdd + "/osmoticFlowDevice/insert",
-        delete: service_fxdd + "/osmoticFlowDevice/del",
-        list:service_fxdd + "/osmoticFlowDevice/list"
-      },
-      sjzd: {
-        page: service_fxdd + "/sysDictB/page",
-        update: service_fxdd + "/sysDictB/update",
-        save: service_fxdd + "/sysDictB/insert",
-        delete: service_fxdd + "/sysDictB/del",
-      },
-      spjbxx: {
-        page: service_fxdd + "/attCctvBase/page",
-        update: service_fxdd + "/attCctvBase/update",
-        save: service_fxdd + "/attCctvBase/insert",
-        delete: service_fxdd + "/attCctvBase/del",
-        tree: service_fxdd + "/cctvBMenu/tree",
-        saveTree: service_fxdd + "/cctvBMenu/insert",
-        editTree: service_fxdd + "/cctvBMenu/update",
-        deleteTree: service_fxdd + "/cctvBMenu/del"
-      }
-    },
-    dygxb: {
-      zfysxt: {
-        page: service_fxdd + "/gateValveCctvRel/page",
-        save: service_fxdd + "/gateValveCctvRel/insert",
-        update: service_fxdd + "/gateValveCctvRel/update",
-        delete: service_fxdd + "/gateValveCctvRel/del",
-        zflist: service_fxdd + "/attGateValve/list",
-        splist:service_fxdd + "/attCctvBase/list"
-      }
-    }
-  },
-
-  // 全周期
-  gcdsj:{
-    qzqda:{
-      list:service_fxdd + '/projectEvents/doc/page',
-      export: service_fxdd + '/projectEvents/export'
-    }
-  },
-  szzf:{
-    ajdj:{
-      list:service_fxdd + '/szCase/page',
-      add:service_fxdd + '/szCase/insert',
-      edit:service_fxdd + '/szCase/update',
-      del:service_fxdd + '/szCase/del/',
-      upload:service_fxdd + '/szCase/file/upload/singleSimple',
-      download:service_fxdd + '/szCase/file/download/',
-      detail:service_fxdd + '/szCase/get/'
-    },
-    ajtj:{
-      // 统计类型 0:案件来源,1:案件类型,2:执行类型
-      info:service_fxdd + '/szCase/statistics/',
-      //趋势
-      qs:service_fxdd + '/szCase/statisticsNum/'
-    },
-    clyj:{
-      tree:service_fxdd + '/szTreatmentBasis/get/tree',
-      edit:service_fxdd + '/szTreatmentBasis/update',
-      add:service_fxdd + '/szTreatmentBasis/insert',
-      del:service_fxdd + '/szTreatmentBasis/del/',
-      detail:service_fxdd + '/szTreatmentBasis/get/'
-    }
-  },
-  flfg:{
-    edit:service_fxdd + '/SzRuleByLaw/update',
-      add:service_fxdd + '/SzRuleByLaw/insert',
-      del:service_fxdd + '/SzRuleByLaw/del/',
-      upload:service_fxdd + '/SzRuleByLaw/file/upload/singleSimple',
-      download:service_fxdd + '/SzRuleByLaw/file/download/',
-      list:service_fxdd + '/SzRuleByLaw/page'
-  },
-  zdgl:{
-    edit:service_fxdd + '/SzRegulatoryFramework/update',
-      add:service_fxdd + '/SzRegulatoryFramework/insert',
-      del:service_fxdd + '/SzRegulatoryFramework/del/',
-      upload:service_fxdd + '/SzRegulatoryFramework/file/upload/singleSimple',
-      download:service_fxdd + '/SzRegulatoryFramework/file/download/',
-      list:service_fxdd + '/SzRegulatoryFramework/page'
-  },
-
-  ddjl:{
-    page: service_fxdd + '/dispatchRecord/page',
-    save: service_fxdd + '/dispatchRecord/insert',
-    edit: service_fxdd + '/dispatchRecord/update',
-    del: service_fxdd + '/dispatchRecord/del',
-    export: service_fxdd + '/dispatchRecord/export',
-  }
 
 }
 
diff --git a/src/service/sssq.js b/src/service/sssq.js
deleted file mode 100644
index 0213234..0000000
--- a/src/service/sssq.js
+++ /dev/null
@@ -1,261 +0,0 @@
-import {httppost, httpget, httpget2,httpget3} from "../utils/request";
-import {message} from 'antd';
-import apiurl from './apiurl';
-import moment from 'moment'
-
-
-//实时水情-河道水情列表
-export async function list(params) {
-
-  const {data, code, msg} = await httppost(apiurl.sssq.list, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时水情-水库水情列表
-export async function reservoirlist(params) {
-
-  const {data, code, msg} = await httppost(apiurl.sssq.reservoirlist, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  // const list = data?.filter(o => o.lgtd && o.lttd)
-
-  return data;
-}
-
-
-//实时水情-河道水情汇总
-export async function summaryInfo(params) {
-
-  const {data, code, msg} = await httppost(apiurl.sssq.summaryInfo, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时水情-河道水情统计
-export async function warn(params) {
-
-  const {data, code, msg} = await httppost(apiurl.sssq.warn, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时水情-水库水情汇总
-export async function reservoirsummaryInfo(params) {
-
-  const {data, code, msg} = await httppost(apiurl.sssq.reservoirsummaryInfo, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时水情-水库水情统计
-export async function reswarn(params) {
-
-  const {data, code, msg} = await httppost(apiurl.sssq.reswarn, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//详情-监测数据
-export async function monitor(params) {
-  params.stm =  moment(params.stm).format("YYYY-MM-DD HH:mm:ss") 
-  params.etm =  moment(params.etm).format("YYYY-MM-DD HH:mm:ss") 
-  const {data, code, msg} = await httppost(apiurl.sssq.monitor, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//详情-监测数据-下方表格
-export async function getDetail(params) {
-  const {data, code, msg} = await httpget(apiurl.sssq.detail, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//详情-水位流量关系
-export async function zqrl(stcd) {
-  const {data, code, msg} = await httpget(apiurl.sssq.zqrl, {stcd}) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-//详情-图像监测视角
-export async function channel(params) {
-  const {data, code, msg} = await httpget2(apiurl.sssq.channel, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//详情-图像监测
-export async function imageinfo(params) {
-  params.pageSo = {
-    pageSize: params.pageSize,
-    pageNumber: params.pageNumber,
-  }
-  const {data, code, msg} = await httppost(apiurl.sssq.imageinfo, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//详情-图像监测
-export async function reservoirmonitor(params) {
-  params.stm = moment(params.stm).format("YYYY-MM-DD HH:mm:ss")
-  params.etm = moment(params.etm).format("YYYY-MM-DD HH:mm:ss")
-  const {data, code, msg} = await httppost(apiurl.sssq.reservoirmonitor, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//基本信息
-export async function attResBase(params) {
-  const {data, code, msg} = await httpget2(apiurl.sssq.attResBase, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-//库容曲线
-export async function zvarl(params) {
-  const {data, code, msg} = await httpget2(apiurl.sssq.zvarl, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//责任体系
-export async function person(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.person, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//挡水建筑物
-export async function dam(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.dam, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-//泄水建筑物
-export async function drainage(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.drainage, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//输水建筑物
-export async function transport(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.transport, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//建设信息
-export async function construction(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.construction, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//工程图片
-export async function projectimg(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.projectimg, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-//防汛预案
-export async function plan(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.plan, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-//设计报告
-export async function file(params) {
-  const {data, code, msg} = await httppost(apiurl.sssq.file, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-//根据id查文件
-export async function fileget(params) {
-  const {data, code, msg} = await httpget3(apiurl.sssq.fileget, params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-
-
-
-
-
diff --git a/src/service/ssyq.js b/src/service/ssyq.js
deleted file mode 100644
index d3b88f6..0000000
--- a/src/service/ssyq.js
+++ /dev/null
@@ -1,185 +0,0 @@
-import { httppost,httppost1, httppost2, httpget } from "../utils/request";
-import { message } from 'antd';
-import apiurl from './apiurl';
-import moment from 'moment'
-
-
-//流域选择
-export async function basNameList() {
-
-  const { data, code, msg } = await httpget(apiurl.ssyq.basNameList) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//行政选择
-export async function adnmList() {
-
-  const { data, code, msg } = await httpget(apiurl.ssyq.adnmList) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-//实时雨情-列表
-export async function list(params) {
-
-  const { data, code, msg } = await httppost(apiurl.ssyq.list,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-站点统计
-export async function count(params) {
-
-  const { data, code, msg } = await httppost(apiurl.ssyq.count,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-站点统计
-export async function level(params) {
-
-  const { data, code, msg } = await httppost(apiurl.ssyq.level,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-库区降雨
-export async function res(params) {
-
-  const { data, code, msg } = await httppost(apiurl.ssyq.res,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-区域降雨
-export async function adcd(params) {
-
-  const { data, code, msg } = await httppost(apiurl.ssyq.adcd,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-流域降雨
-export async function bas(params) {
-
-  const { data, code, msg } = await httppost(apiurl.ssyq.bas,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-频率统计
-export async function freq(params) {
-  let Myparams={
-    timeType:1,
-    ...params
-  }
-  const { data, code, msg } = await httppost(apiurl.ssyq.freq,Myparams) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-弹框详情-监测数据-天
-export async function StcdAndStartTimeAndEndTime(params) {
-  params.startTime=moment(params.startTime).format("YYYY-MM-DD HH:mm:ss")
-  params.endTime=moment(params.endTime).format("YYYY-MM-DD HH:mm:ss")
-  const { data, code, msg } = await httppost(apiurl.ssyq.StcdAndStartTimeAndEndTime,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-弹框详情-监测数据-小时
-export async function StcdAndStartTimeAndEndTimeHour(params) {
-  params.startTime=moment(params.startTime).format("YYYY-MM-DD HH:mm:ss")
-  params.endTime=moment(params.endTime).format("YYYY-MM-DD HH:mm:ss")
-  const { data, code, msg } = await httppost(apiurl.ssyq.StcdAndStartTimeAndEndTimeHour,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-export async function maxDrpUrl(params) {
-  params.startTime=moment(params.startTime).format("YYYY-MM-DD HH:mm:ss")
-  params.endTime=moment(params.endTime).format("YYYY-MM-DD HH:mm:ss")
-  const { data, code, msg } = await httppost(apiurl.ssyq.maxDrp,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-弹框详情-测站编码查详细雨量
-export async function queryStPptnDetails(stcd) {
-  const { data, code, msg } = await httpget(apiurl.ssyq.queryStPptnDetails,{stcd}) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-//实时雨情-弹框详情-周边雨情
-export async function queryNearbyRainStations(params) {
-  const { data, code, msg } = await httppost(apiurl.ssyq.queryNearbyRainStations,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-//实时雨情-弹框详情-监测数据-天-图表
-export async function queryStStbprpPerDayChart(params) {
-  const { data, code, msg } = await httppost(apiurl.ssyq.queryStStbprpPerDayChart,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
-
-
-//实时雨情-弹框详情-监测数据-小时-图表
-export async function queryStStbprpPerHourChart(params) {
-  const { data, code, msg } = await httppost(apiurl.ssyq.queryStStbprpPerHourChart,params) || {};
-
-  if (code !== 200) {
-    message.error(msg || '请求失败');
-  }
-  return data;
-}
\ No newline at end of file
diff --git a/src/views/AppRouters.tsx b/src/views/AppRouters.tsx
index 2ed693c..733d685 100644
--- a/src/views/AppRouters.tsx
+++ b/src/views/AppRouters.tsx
@@ -5,119 +5,11 @@ import DashboardLayout from '../components/DashboardLayout'
 import { Dispatch } from '../models/store'
 import LoginPage from './Login/index1'
 
-import Sszq from './ysgzq/sszq'
-import Yxqk from './ysgzq/ssgq/yxqk'
-import Gcxq from './ysgzq/ssgq/gcxq'
-import Dbaq from './ysgzq/ssgq/dbaq'
-import Skhs from './fxdd/hsyb/skhs'
-import Hdhs from './fxdd/hsyb/hdhs'
-import Yjxy from './fxdd/ddjc/yjxy'
-
-import Ddzl from './fxdd/ddjc/ddzl'
-
-
-import Ddgc from "./fxzb/ddgc"
-import Fxya from './fxzb/fxya'
-import Hsybjs from './fxzb/hsybjs'
-import Ybfagl from './fxzb/ybfagl'
-import Csgl from './fxzb/csgl'
-
-import Qxdw_Gc from './fxzb/qxdw/gc/index.js'
-import Qxwl_Gc from './fxzb/qxwl/gc'
-// 工程安全监测
-import Bzt from './gcaqjc/bzt'
-import Yhyj from "./gcaqjc/gcaqyj/yhyj"
-import Yjgzpz from "./gcaqjc/gcaqyj/yjgzpz"
-import Sljc from "./gcaqjc/sjtjcx/sljc"
-import Syjc from "./gcaqjc/sjtjcx/syjc"
-import Wyjc from "./gcaqjc/sjtjcx/wyjc"
-import Czcx from "./gcaqjc/sjtjcx/czcx"
-import Ndsytjb from "./gcaqjc/sjtjcx/ndsytjb"
-import Ndsltjb from "./gcaqjc/sjtjcx/ndsltjb"
-import Ndwytjb from "./gcaqjc/sjtjcx/ndwytjb"
-import Jrx from "./gcaqjc/gcaqfx/jrx"
-
-// 日常管理
-import Rjswnbb from "./rcgl/btbb/rjswnbb"
-import Rjylnbb from "./rcgl/btbb/rjynbb"
-import Sdswrbb from "./rcgl/btbb/sdswrbb"
-import Sdjyrbb from "./rcgl/btbb/sdjyrbb"
-import Xjrw from "./rcgl/xcxj/xjrw"
-import Xjwtcl from "./rcgl/xcxj/xjwtcl"
-import Xjxpz from "./rcgl/xcxj/xjxpz"
-import Fzxc from "./rcgl/byfz/fzxc"
-import Bypc from "./rcgl/byfz/bypc"
-
-import Zmjk from "./rcgl/zmjk"
-import Wxyh from "./rcgl/wxyh"
-import Szzb from "./rcgl/szzb"
-import Stlljc from "./rcgl/stlljc"
-import Aqyhpc from "./rcgl/aqgl/aqyhpc"
-import Aqjcgl from "./rcgl/aqgl/aqjcgl"
-import Aqsgdj from "./rcgl/aqgl/aqsgdj"
-import Aqjdtz from "./rcgl/aqgl/aqjdtz"
-import Cxjgtz from "./rcgl/aqgl/cxjgtz"
-import Fxgkqd from "./rcgl/aqgl/fxgkqd"
-import Khzbgl from "./rcgl/jdkh/khzbgl"
-import Khmbgl from "./rcgl/jdkh/khmbgl"
-import Khtj from "./rcgl/jdkh/khtj"
-import Khwtzg from "./rcgl/jdkh/khwtzg"
-import Khrwgl from "./rcgl/jdkh/khrwgl"
-
-// 值班管理
-import Zbb from "./zbgl/zbb"
-import Zbrz from "./zbgl/zbrz"
-// import Gcdsj from "./rcgl/gcdsj"
-
-import VideoList from './video'
-
-// 供水兴利
-import Dxnjyzl from "./gxsl/dxnjyzl"
-import Zfzl from "./gxsl/zfzl"
-import Zfjk from './gxsl/zfjk'
-import Gstjfx from "./gxsl/gstjfx"
-// 视频监控
-import Spjk from "./video"
-import AiWarn from "./spjk/aiWarn"
-// 广播预警
-import Gbyj from "./gbyj/index"
-
-
-// 四全
-import Zcdjxx from './sq/qfg/zcdjxx'
-import Kqys from './sq/qys/kqys/index.js'
-import Xyys from './sq/qys/xyys/index.js'
-import Gcys from './sq/qys/gcys/index.js'
-import Gcdsj from './sq/qzq/gcdsj'
-import Sksq from './sq/qth/sksq'
-import Hdsq from './sq/qth/hdsq'
-import Ssyq from './sq/qth/ssyq'
-import Qzqda from './sq/qzq/qzqda'
-// import Zcdjxx from './sq/qys/'
-// import Zcdjxx from './sq/qfg/zcdjxx'
-// import Zcdjxx from './sq/qfg/zcdjxx'
-// import Zcdjxx from './sq/qfg/zcdjxx'
-
-// 四制 - 组织机构查看
-import Zzjgck from './sz/zzjgck'
-import Zrrgl from './sz/zrrgl'
-import Pxjhgl from './sz/pxjhgl'
-import Pxjlgl from './sz/pxjlgl'
-import Flfg from './sz/flfg'
-import Zdgl from './sz/zdgl'
-import Ajdj from './sz/szzf/ajdj'
-import Ajtj from './sz/szzf/ajtj'
-import Clyj from './sz/szzf/clyj'
-
-import Krgl from './KrLine'
-import Gsnlfx from './gxsl/gsnlfx'
-import Ddjl from './szydd/ddjl'
 
 
 
 const HomePage = lazy(() => import('./Home'))
 
-const IframePage = lazy(() => import('./Iframe'))
 
 const AppRouters: React.FC = () => {
   const dispatch = useDispatch<Dispatch>()
@@ -131,151 +23,14 @@ const AppRouters: React.FC = () => {
 
   let element = useRoutes([
     { path: '/', element: <LoginPage /> },
-    // { path: '/', element: <DashboardLayout /> },
-
-    // { id: id(), title: '洪水预报计算', path: '/mgr/fxzb/hsyb/hyybjs' },
-    // { id: id(), title: '预报方案管理', path: '/mgr/fxzb/hsyb/ybfagl' },
-    // { id: id(), title: '参数管理', path: '/mgr/fxzb/hsyb/csgl' },
-
-
     {
       path: '/mgr',
       element: <DashboardLayout />,
       children: [
         { path: 'home', element: <HomePage /> },
 
-        //四预
-        { path: 'sy/fhxzfx', element: <HomePage /> },
-        { path: 'sy/tqyb', element: <HomePage /> },
-
-        //四预-洪水预报
-        { path: 'sy/hsyb/hyybjs', element: <Hsybjs /> },
-        { path: 'sy/hsyb/ybfagl', element: <Ybfagl /> },
-        { path: 'sy/hsyb/csgl', element: <Csgl /> },
-
-        // 调度规程
-        { path: 'sy/ddgc', element: <Ddgc /> },
-
-        // 防汛预案
-        { path: 'sy/fxya', element: <Fxya /> },
-
-        // 抢险物料
-        { path: 'sy/qxwl', element: <Qxwl_Gc /> },
-
-        // 抢险队伍
-        { path: 'sy/qxdw', element: <Qxdw_Gc /> },
 
         
-        // 工程安全监测
-        { path: 'sq/qth/dbaqjc', element: <Bzt isHome={false}/> },
-        { path: 'sq/qth/sksq', element: <Sksq /> },
-        { path: 'sq/qth/hdsq', element: <Hdsq /> },
-        { path: 'sq/qth/ssyq', element: <Ssyq /> },
-
-        // 预警
-        { path: 'gcaqjc/gcaqyj/bzt', element: <Bzt isHome={false}/> },
-        { path: 'gcaqjc/gcaqyj/yhyj', element: <Yhyj /> },
-        { path: 'gcaqjc/gcaqyj/yjgzpz', element: <Yjgzpz /> },
-
-        //统计 
-        { path: 'gcaqjc/sjtjcx/syjx', element: <Syjc /> },
-        { path: 'gcaqjc/sjtjcx/sljx', element: <Sljc /> },
-        { path: 'gcaqjc/sjtjcx/wyjx', element: <Wyjc /> },
-        { path: 'gcaqjc/sjtjcx/czcx', element: <Czcx /> },
-        { path: 'gcaqjc/sjtjcx/ndsytjb', element: <Ndsytjb /> },
-        { path: 'gcaqjc/sjtjcx/ndsltjb', element: <Ndsltjb /> },
-        { path: 'gcaqjc/sjtjcx/ndwytjb', element: <Ndwytjb /> },
-
-        // 工程安全分析
-        { path: 'gcaqjc/gcaqfx/jrx', element: <Jrx /> },
-        
-        // 日常管理-水质整编
-        { path: 'sg/btbb/rjswbb', element: <Rjswnbb /> },
-        { path: 'sg/btbb/rjylnbb', element: <Rjylnbb /> },
-        { path: 'sg/btbb/sdswbb', element: <Sdswrbb /> },
-        { path: 'sg/btbb/sdjyrbb', element: <Sdjyrbb /> },
-        { path: 'sg/xcxj/xcrw', element: <Xjrw /> },
-        { path: 'sg/xcxj/xjwtcl', element: <Xjwtcl /> },
-        { path: 'sg/xcxj/xjxpz', element: <Xjxpz/> },
-        { path: 'sg/byfz/byxc', element: <Fzxc /> },
-        { path: 'sg/byfz/bypc', element: <Bypc /> },
-        { path: 'sg/zmjk', element: <Zmjk /> },
-        { path: 'sg/wxyh', element: <Wxyh /> },
-        { path: 'sg/aqgl/aqjcgl', element: <Aqjcgl /> },
-        { path: 'sg/aqgl/fxgkqd', element: <Fxgkqd /> },
-        { path: 'sg/aqgl/cxjgtz', element: <Cxjgtz /> },
-        { path: 'sg/aqgl/aqjdtz', element: <Aqjdtz /> },
-        { path: 'sg/aqgl/aqyhpc', element: <Aqyhpc /> },
-        { path: 'sg/aqgl/aqsgdj', element: <Aqsgdj /> },
-        { path: 'sg/gcdsj', element: <Gcdsj /> },
-        { path: 'sg/szzb', element: <Szzb /> },
-        { path: 'sg/krgl', element: <Krgl /> },
-        { path: 'rcgl/stlljc', element: <Stlljc /> },
-        { path: 'sg/zbgl/zbb', element: <Zbb /> },
-        { path: 'sg/zbgl/zbrz', element: <Zbrz /> },
-        // 日常管理-监督考核
-        { path: 'sz/jdkh/khtj', element: <Khtj /> },
-        { path: 'sz/jdkh/khzbgl', element: <Khzbgl /> },
-        { path: 'sz/jdkh/khmbgl', element: <Khmbgl /> },
-        { path: 'sz/jdkh/khwtzg', element: <Khwtzg /> },
-        { path: 'sz/jdkh/khrwgl', element: <Khrwgl /> },
-
-
-        // 供水兴利
-        { path: 'gsxl/zfzl', element: <Zfzl /> },
-        { path: 'gsxl/zfjk', element: <Zfjk /> },
-
-        { path: 'szydd/diaodu', element: <Ddjl/> },
-        { path: 'szydd/gsnlfx', element: <Gsnlfx /> },
-        { path: 'szydd/gstjfx', element: <Gstjfx /> },
-        { path: 'szydd/dxnjyzl', element: <Dxnjyzl /> },
-
-        { path: 'fxzb/jczw/yqz', element: <HomePage /> },
-        { path: 'fxzb/jczw/sqz', element: <HomePage /> },
-        // 视频监控
-        { path: 'sq/qth/spjk', element: <Spjk /> },
-        { path: 'sg/gjgl/aigj', element: <AiWarn /> },
-        { path: 'sg/gjgl/gbyj', element: <Gbyj /> },
-
-        // { path: 'fxzb/zbb', element: <Zbb /> },
-        // { path: 'fxzb/txl', element: <Txl /> },
-
-
-        { path: 'ysgzq/ssyq', element: <HomePage /> },
-        { path: 'ysgzq/sssq', element: <HomePage /> },
-        { path: 'ysgzq/sszq', element: <Sszq /> },
-        { path: 'ysgzq/ssgq/yxqk', element: <Yxqk /> },
-        { path: 'ysgzq/ssgq/gcxq', element: <Gcxq /> },
-        { path: 'ysgzq/ssgq/dbaq', element: <Dbaq /> },
-        { path: 'fxdd/dqxsfx', element: <HomePage /> },
-        { path: 'fxdd/tqyb', element: <HomePage /> },
-        { path: 'fxdd/hsyb/skhs', element: <Skhs /> },
-        { path: 'fxdd/hsyb/hdhs', element: <Hdhs /> },
-        { path: 'fxdd/ddjc/yjxy', element: <Yjxy /> },
-        { path: 'fxdd/ddjc/ddzl', element: <Ddzl /> },
-        { path: 'videoSurveillance', element: <VideoList /> },
-
-        // 四全
-        // 注册登记信息
-        { path: 'sq/qfg/zcdjxx', element: <Zcdjxx /> },
-        //库区要素
-        { path: 'sq/qys/kqys', element: <Kqys /> },
-        { path: 'sq/qys/xyys', element: <Xyys /> },
-        { path: 'sq/qys/gcys', element: <Gcys /> },
-        { path: 'sq/qzq/gcdsj', element: <Gcdsj /> },
-        { path: 'sq/qys/qzqda', element: <Qzqda /> },
-
-        // 四制-组织机构查看
-        { path: 'sz/gltx/zzjgck', element: <Zzjgck /> },
-        { path: 'sz/gltx/zrrgl', element: <Zrrgl /> },
-        { path: 'sz/pxgl/pxjhgl', element: <Pxjhgl /> },
-        { path: 'sz/pxgl/pxjlgl', element: <Pxjlgl /> },
-        { path: 'sz/flfg', element: <Flfg /> },
-        { path: 'sz/zdgl', element: <Zdgl /> },       
-        { path: 'sz/szzf/ajdj', element: <Ajdj /> },       
-        { path: 'sz/szzf/ajtj', element: <Ajtj /> },       
-        { path: 'sz/szzf/clyj', element: <Clyj /> },       
-
       ],
     },
     { path: '/login', element: <LoginPage /> },
diff --git a/src/views/Home/InfoPops/PicStPop/index.js b/src/views/Home/InfoPops/PicStPop/index.js
deleted file mode 100644
index da38e8b..0000000
--- a/src/views/Home/InfoPops/PicStPop/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react'
-import {config} from '../../../../config';
-import { getRealPic } from '../../../../models/_/real';
-import useRequest from '../../../../utils/useRequest';
-
-
-function PicStPop({ record, dispatch }) {
-
-  const { data, loading } = useRequest(() => getRealPic(record));
-
-  return (
-    <>
-      <div className="boxhead"></div>
-      <div className="featuretip-title">
-        <div className="name">{record.stnm}{data?.tm ? `(${data.tm})` : ''}</div>
-      </div>
-      <div >
-        {
-          loading ? (
-            <span>载入中</span>
-          ) : (
-            data?.img ? (
-              <img alt="img" src={'data:image/jpeg;base64,' + data.img} />
-            ) : (
-              <span>无图片</span>
-            )
-          )
-        }
-      </div>
-      <div className="boxfoot"></div>
-    </>
-  )
-}
-
-export default React.memo(PicStPop);
diff --git a/src/views/Home/InfoPops/index.js b/src/views/Home/InfoPops/index.js
deleted file mode 100644
index 0294633..0000000
--- a/src/views/Home/InfoPops/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import PicStPop from './PicStPop';
-
-export const InfoPopNames = {
-  PicStPop: 'PicStPop',
-};
-
-export const InfoPops = ({ type, properties, dispatch }) => {
-  if (type === InfoPopNames.PicStPop) {
-    return <PicStPop record={properties} dispatch={dispatch} />
-  }
-
-  return null;
-}
diff --git a/src/views/Home/Introduction/dcpj/img/dcpj-js.jpg b/src/views/Home/Introduction/dcpj/img/dcpj-js.jpg
deleted file mode 100644
index 2b5662d..0000000
Binary files a/src/views/Home/Introduction/dcpj/img/dcpj-js.jpg and /dev/null differ
diff --git a/src/views/Home/Introduction/dcpj/img/dcpj-wf.jpg b/src/views/Home/Introduction/dcpj/img/dcpj-wf.jpg
deleted file mode 100644
index 0606877..0000000
Binary files a/src/views/Home/Introduction/dcpj/img/dcpj-wf.jpg and /dev/null differ
diff --git a/src/views/Home/Introduction/dcpj/index.less b/src/views/Home/Introduction/dcpj/index.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/Home/Introduction/dcpj/index.tsx b/src/views/Home/Introduction/dcpj/index.tsx
deleted file mode 100644
index 79e3b20..0000000
--- a/src/views/Home/Introduction/dcpj/index.tsx
+++ /dev/null
@@ -1,346 +0,0 @@
-import React, {useMemo, useState} from 'react';
-import {Descriptions, Table, Tabs} from 'antd';
-import staticData from '../../../staticData';
-import "./index.less"
-import useCrud from '../../../../components/crud/useCrud';
-import {ColumnsType} from "antd/lib/table";
-import { CRUD_NAMES } from '../../../../components/crud/useCrud';
-import usePageTable from '../../../../components/crud/usePageTable';
-const { TabPane } = Tabs;
-
-type IProps = {
-
-}
-const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-
-localStorage.getItem('address')
-console.log(localStorage.getItem('address'))
-
-
-const BasePage: React.FC<IProps> = ({  }) => {
-const crud = useCrud();
-
-// @ts-ignore
-
-  const pager = usePageTable(async (params?: SearchOption) =>
-  {
-    return {
-      list: systemSwitchType?[
-        {
-          "cultiArea": 132,
-          "hasChildren": true,
-          "landArea": 4.53,
-          "adcd": "420529203001000",
-          "lttd": 30.213941,
-          "remark": null,
-          "list": null,
-          "house": 358,
-          "cutoffDate": 1465994645000,
-          "population": 1323,
-          "adnm": "采花社区",
-          "prevtpnm": "非防治区",
-          "household": 358,
-          "lgtd": 110.449803,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 226,
-          "hasChildren": false,
-          "landArea": 3.51,
-          "adcd": "420529203001106",
-          "lttd": 30.214687,
-          "remark": null,
-          "list": null,
-          "house": 116,
-          "cutoffDate": 1465994690000,
-          "population": 406,
-          "adnm": "中街",
-          "prevtpnm": "重点防治区",
-          "household": 116,
-          "lgtd": 110.450705,
-          "prevtp": "2"
-      },
-      {
-          "cultiArea": 413,
-          "hasChildren": false,
-          "landArea": 3.51,
-          "adcd": "420529203001107",
-          "lttd": 30.216293,
-          "remark": null,
-          "list": null,
-          "house": 89,
-          "cutoffDate": 1465994684000,
-          "population": 315,
-          "adnm": "下街",
-          "prevtpnm": "重点防治区",
-          "household": 89,
-          "lgtd": 110.450165,
-          "prevtp": "2"
-      },
-      {
-          "cultiArea": 467,
-          "hasChildren": false,
-          "landArea": 3.51,
-          "adcd": "420529203001108",
-          "lttd": 30.205698,
-          "remark": null,
-          "list": null,
-          "house": 153,
-          "cutoffDate": 1465994678000,
-          "population": 602,
-          "adnm": "上街",
-          "prevtpnm": "重点防治区",
-          "household": 153,
-          "lgtd": 110.445732,
-          "prevtp": "2"
-      },
-      {
-          "cultiArea": 2270,
-          "hasChildren": true,
-          "landArea": 13.7,
-          "adcd": "420529203201000",
-          "lttd": 30.217673,
-          "remark": null,
-          "list": null,
-          "house": 231,
-          "cutoffDate": 1465997223000,
-          "population": 750,
-          "adnm": "长茂司村",
-          "prevtpnm": "非防治区",
-          "household": 231,
-          "lgtd": 110.452802,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 754,
-          "hasChildren": false,
-          "landArea": 6.53,
-          "adcd": "420529203201100",
-          "lttd": 30.225834,
-          "remark": null,
-          "list": null,
-          "house": 101,
-          "cutoffDate": 1465997333000,
-          "population": 350,
-          "adnm": "三组（胡家台）",
-          "prevtpnm": "重点防治区",
-          "household": 101,
-          "lgtd": 110.452846,
-          "prevtp": "2"
-      },
-      {
-          "cultiArea": 759,
-          "hasChildren": false,
-          "landArea": 6.61,
-          "adcd": "420529203201101",
-          "lttd": 30.218348,
-          "remark": null,
-          "list": null,
-          "house": 30,
-          "cutoffDate": 1465997246000,
-          "population": 100,
-          "adnm": "二组（茶丘）",
-          "prevtpnm": "重点防治区",
-          "household": 30,
-          "lgtd": 110.45266,
-          "prevtp": "2"
-      },
-      {
-          "cultiArea": 757,
-          "hasChildren": false,
-          "landArea": 6.57,
-          "adcd": "420529203201102",
-          "lttd": 30.208181,
-          "remark": null,
-          "list": null,
-          "house": 100,
-          "cutoffDate": 1465997417000,
-          "population": 300,
-          "adnm": "一组（长茂司）",
-          "prevtpnm": "一般防治区",
-          "household": 100,
-          "lgtd": 110.451124,
-          "prevtp": "1"
-      },
-      ]:[
-        {
-          "cultiArea": 95638.15,
-          "hasChildren": true,
-          "landArea": 372.84,
-          "adcd": "422822100000000",
-          "lttd": 30.60279,
-          "remark": null,
-          "list": null,
-          "house": 21576,
-          "cutoffDate": null,
-          "population": 132402,
-          "adnm": "业州镇",
-          "prevtpnm": "非防治区",
-          "household": 21576,
-          "lgtd": 109.716677,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 82890,
-          "hasChildren": true,
-          "landArea": 259.8,
-          "adcd": "422822101000000",
-          "lttd": 30.661992,
-          "remark": null,
-          "list": null,
-          "house": 18084,
-          "cutoffDate": null,
-          "population": 53304,
-          "adnm": "高坪镇",
-          "prevtpnm": "非防治区",
-          "household": 18084,
-          "lgtd": 110.076703,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 28323.15,
-          "hasChildren": true,
-          "landArea": 85.13,
-          "adcd": "422822102000000",
-          "lttd": 30.550984,
-          "remark": null,
-          "list": null,
-          "house": 6638,
-          "cutoffDate": null,
-          "population": 20457,
-          "adnm": "红岩寺镇",
-          "prevtpnm": "非防治区",
-          "household": 6638,
-          "lgtd": 109.902764,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 51970.95,
-          "hasChildren": true,
-          "landArea": 160.39,
-          "adcd": "422822103000000",
-          "lttd": 30.350414,
-          "remark": null,
-          "list": null,
-          "house": 10133,
-          "cutoffDate": null,
-          "population": 40479,
-          "adnm": "景阳镇",
-          "prevtpnm": "非防治区",
-          "household": 10133,
-          "lgtd": 109.969684,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 87455.4,
-          "hasChildren": true,
-          "landArea": 372.86,
-          "adcd": "422822104000000",
-          "lttd": 30.240167,
-          "remark": null,
-          "list": null,
-          "house": 16273,
-          "cutoffDate": null,
-          "population": 55773,
-          "adnm": "官店镇",
-          "prevtpnm": "非防治区",
-          "household": 16273,
-          "lgtd": 110.041068,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 101027.85,
-          "hasChildren": true,
-          "landArea": 405.67,
-          "adcd": "422822105000000",
-          "lttd": 30.446302,
-          "remark": null,
-          "list": null,
-          "house": 15289,
-          "cutoffDate": null,
-          "population": 56934,
-          "adnm": "花坪镇",
-          "prevtpnm": "非防治区",
-          "household": 15289,
-          "lgtd": 109.997533,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 99281.4,
-          "hasChildren": true,
-          "landArea": 398.14,
-          "adcd": "422822200000000",
-          "lttd": 30.687276,
-          "remark": null,
-          "list": null,
-          "house": 20362,
-          "cutoffDate": null,
-          "population": 53361,
-          "adnm": "长梁乡",
-          "prevtpnm": "非防治区",
-          "household": 20362,
-          "lgtd": 109.754904,
-          "prevtp": "0"
-      },
-      {
-          "cultiArea": 35711.4,
-          "hasChildren": true,
-          "landArea": 210.7,
-          "adcd": "422822201000000",
-          "lttd": 30.800129,
-          "remark": null,
-          "list": null,
-          "house": 6406,
-          "cutoffDate": null,
-          "population": 23303,
-          "adnm": "茅田乡",
-          "prevtpnm": "非防治区",
-          "household": 6406,
-          "lgtd": 109.880439,
-          "prevtp": "0"
-      },
-     
-      ],
-      totalRow: 6
-    };
-  }
-);
-
-  return (
-    <div className="introductionTable">
-
-
-{/* 切换页面 */}
-
-{
-        localStorage.getItem('address') === 'jianshi'  && (
-          <div className="bigTable">
- <Descriptions column={{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 2 }}  >
-   <Descriptions.Item label="行政区总人口(万人)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>51</span></Descriptions.Item>
-   <Descriptions.Item label="行政区总面积(km²)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>2666</span></Descriptions.Item>
-   <Descriptions.Item label="耕地面积(亩)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>705340</span></Descriptions.Item>
-   <Descriptions.Item label="乡镇总数(个)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>10</span></Descriptions.Item>
- </Descriptions>
-</div>
-        )
-        }
-
-{
-        localStorage.getItem('address') === 'wufeng'  && (
-          <div className="bigTable">
- <Descriptions column={{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 2 }}  >
-   <Descriptions.Item label="行政区总人口(万人)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>20.7</span></Descriptions.Item>
-   <Descriptions.Item label="行政区总面积(km²)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>2372</span></Descriptions.Item>
-   <Descriptions.Item label="耕地面积(亩)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>29</span></Descriptions.Item>
-   <Descriptions.Item label="乡镇总数(个)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>8</span></Descriptions.Item>
- </Descriptions>
-</div>
-        )
-        }
-
-
-    </div>
-  )
-};
-
-export default BasePage
diff --git a/src/views/Home/Introduction/dcpjDetails/DataTable.tsx b/src/views/Home/Introduction/dcpjDetails/DataTable.tsx
deleted file mode 100644
index 95ebd86..0000000
--- a/src/views/Home/Introduction/dcpjDetails/DataTable.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import {
-    EditOutlined, DeleteOutlined
-  } from '@ant-design/icons';
-  import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Divider, Popconfirm,Breadcrumb, Row} from 'antd';
-  import { ColumnsType } from 'antd/lib/table';
-  import React, {useCallback, useEffect, useMemo, useState} from 'react';
-  import { CrudContext } from '../../../../components/crud/useCrud';
-  import { SearchOption } from "../../../../service/def";
-//   import ToolBar from './ToolBar';
-  import moment from "moment";
-//   import Dialog from './Dialog'
-  import { Pagination } from 'antd';
-  
-  let MyImg= require ('../../../../assets/icons/搜索.png')
-  
-  
-  const { Option } = Select;
-  const handleChange = (value: string) => {
-    console.log(`selected ${value}`);
-  };
-  
-  type IProps = {
-    pagerCtx: any;
-    crudCtx: CrudContext;
-  }
-  
-
-  
-  
-  const DataTable: React.FC<IProps> = ({ pagerCtx, crudCtx }) => {
-  
-    const columns1: ColumnsType<any> = [
-      {
-        title: '',
-        width: 140,
-        dataIndex: 'adnm',
-        key: 'name',
-        fixed: 'left',
-        // className:'tablecolor',
-      },
-      {
-        title: '',
-        width: 150,
-        dataIndex: 'adcd',
-        key: 'age',
-        
-      },
-      {
-        title: '',
-        dataIndex: 'landArea',
-        key: '1',
-        width: 150,
-      },
-      {
-        title: '',
-        dataIndex: 'prevtpnm',
-        key: '2',
-        width: 150,
-      },
-     
-    ];
-  
-    const width1 = useMemo(() => columns1.reduce((total: number, cur) => total + (cur.width as number), 0), [columns1]);
-  
-
-    
-
-    // 初始接收默认查询参数
-    const options1 = {
-      search: {
-        deptNames: null,
-        stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-        etm:  moment().format("YYYY-MM-DD"),
-      }};
-  
-    const doSearch = (params:any) => {
-      const searchParams: SearchOption = {
-        search: {
-          ...params
-        }
-      };
-      pagerCtx.search(searchParams);
-    };
-  
-    return (
-      <>
-      <div className='gap-tabel1'>
-    
-       
-        {/*<div className="card-h-margin" />*/}
-        <Card className='nonebox2'>
-          <Table rowKey="id" columns={columns1} {...pagerCtx.tableProps} scroll={{ x: 20, y: 300 }} pagination={false}/>
-        </Card>
-
-     
-      </div>
-     
-      </>
-    )
-  };
-  
-  export default DataTable
-  
\ No newline at end of file
diff --git a/src/views/Home/Introduction/dcpjDetails/DataTable2.tsx b/src/views/Home/Introduction/dcpjDetails/DataTable2.tsx
deleted file mode 100644
index bd61882..0000000
--- a/src/views/Home/Introduction/dcpjDetails/DataTable2.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import {
-    EditOutlined, DeleteOutlined
-  } from '@ant-design/icons';
-  import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Divider, Popconfirm,Breadcrumb, Row} from 'antd';
-  import { ColumnsType } from 'antd/lib/table';
-  import React, {useCallback, useEffect, useMemo, useState} from 'react';
-  import { CrudContext } from '../../../../components/crud/useCrud';
-  import { SearchOption } from "../../../../service/def";
-//   import ToolBar from './ToolBar';
-  import moment from "moment";
-//   import Dialog from './Dialog'
-  import { Pagination } from 'antd';
-  
-  let MyImg= require ('../../../../assets/icons/搜索.png')
-  
-  
-  const { Option } = Select;
-  const handleChange = (value: string) => {
-    console.log(`selected ${value}`);
-  };
-  
-  type IProps = {
-    pagerCtx: any;
-    crudCtx: CrudContext;
-  }
-  
-
-  
-  
-  const DataTable: React.FC<IProps> = ({ pagerCtx, crudCtx }) => {
-  
-    const columns1: ColumnsType<any> = [
-      {
-        title: ' ',
-        width: 140,
-        dataIndex: 'adnm',
-        key: 'name',
-        fixed: 'left',
-        // className:'tablecolor',
-      },
-      {
-        title: ' 	',
-        width: 150,
-        dataIndex: 'adcd',
-        key: 'age',
-        
-      },
-      {
-        title: ' ',
-        dataIndex: 'landArea',
-        key: '1',
-        width: 150,
-      },
-      {
-        title: ' ',
-        dataIndex: 'prevtpnm',
-        key: '2',
-        width: 150,
-      },
-     
-    ];
-  
-    const width = useMemo(() => columns1.reduce((total: number, cur) => total + (cur.width as number), 0), [columns1]);
-  
-  
-   
- 
-
-    // 初始接收默认查询参数
-    const options1 = {
-      search: {
-        deptNames: null,
-        stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-        etm:  moment().format("YYYY-MM-DD"),
-      }};
-  
-    const doSearch = (params:any) => {
-      const searchParams: SearchOption = {
-        search: {
-          ...params
-        }
-      };
-      pagerCtx.search(searchParams);
-    };
-    
-    return (
-      <>
-      <div className='gap-tabel1'>
-    
-       
-        {/*<div className="card-h-margin" />*/}
-        <Card className='nonebox2'>
-          <Table rowKey="id" columns={columns1} {...pagerCtx.tableProps} scroll={{ x: 20, y: 300 }} pagination={false}/>
-        </Card>
-
-    
-      </div>
-     
-      </>
-    )
-  };
-  
-  export default DataTable
-  
\ No newline at end of file
diff --git a/src/views/Home/Introduction/dcpjDetails/index.less b/src/views/Home/Introduction/dcpjDetails/index.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/Home/Introduction/dcpjDetails/index.tsx b/src/views/Home/Introduction/dcpjDetails/index.tsx
deleted file mode 100644
index cc4d3bc..0000000
--- a/src/views/Home/Introduction/dcpjDetails/index.tsx
+++ /dev/null
@@ -1,641 +0,0 @@
-import React, {useMemo, useState} from 'react';
-import {Card, Checkbox, Select, Space, Table, Tabs} from 'antd';
-
-import {ColumnsType} from "antd/lib/table";
-import moment from "moment";
-import {SearchOption} from "../../../../service/def";
-import JsDcpjImg from "../dcpj/img/dcpj-js.jpg";
-import WfDcpjImg from "../dcpj/img/dcpj-wf.jpg";
-
-import DataTable from './DataTable';
-import DataTable2 from './DataTable2';
-
-import TableC from "./tableC";
-import TableHz from "./tableHz";
-import useCrud from '../../../../components/crud/useCrud';
-import usePageTable from '../../../../components/crud/usePageTable';
-const { TabPane } = Tabs;
-
-type IProps = {
-
-}
-
-const BasePage: React.FC<IProps> = ({  }) => {
-
-  const columns = useMemo<ColumnsType<any>>(() => [
-    { title: '序号', key: 'inx', width:70, dataIndex: 'inx', align:"center", fixed:"left", render: (text, rec, index) => index + 1 },
-    { title: '行政区划码', key: 'name', width:100, dataIndex: 'name', align:"center", fixed:"left", },
-    { title: '行政区名称', key: 'yjyl', width:100, dataIndex: 'yjyl', align:"center", fixed:"left", },
-    { title: '防治区面积(万km2)', key: 'yjyzls', width:140, dataIndex: 'yjyzls' , align:"center", fixed:"left", },
-    { title: '年鉴行政村数(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '上报乡镇数量(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '上报总村数(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '上报行政村数(个) ', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '上报自然村数(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '防治区总村数(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '一般防治区行政村数(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '一般防治区自然村数(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '重点防治区行政村数(个)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '重点防治区自然村数(个)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '非防治区村数(个) ', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '危险区数(个)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '企事业单位(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '历史山洪灾害记录数(条)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '需治理山洪沟数(条)', key: 'yjyzls', width:140, dataIndex: 'yjyzls' , align:"center"},
-    { title: '自动监测站数量(座)', key: 'yjyzls', width:140, dataIndex: 'yjyzls' , align:"center"},
-    { title: '简易雨量站(座)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '简易水位站(座)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '无线预警广播站(座) ', key: 'yjyzls', width:140, dataIndex: 'yjyzls' , align:"center"},
-    { title: '桥梁数(座)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '路涵数(座)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '塘堰坝数(座)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '断面测量组数(组)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '多媒体文件数', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '空间标绘对象数', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '分析评价村数(个)', key: 'yjyzls', width:120, dataIndex: 'yjyzls' , align:"center"},
-    { title: '设计暴雨成果总记录数(条)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '设计洪水成果总记录数(条)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '控制断面水位流量人口关系数(个)', key: 'yjyzls', width:140, dataIndex: 'yjyzls' , align:"center"},
-    { title: '防洪现状评价村数(个)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '临界雨量成果村数(个)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '预警指标雨量成果村数(个)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '预警指标水位成果村数(个)', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-    { title: '危险区划分示意图数', key: 'yjyzls', width:100, dataIndex: 'yjyzls' , align:"center"},
-  ], []);
-  const crud = useCrud();
-
-  const data:any = [];
-  const [selectVal, setSelectVal] = useState("0");
-
-  const handleChange = (value: string) => {
-    setSelectVal(value);
-  };
-
-
-  // 切换数据
-  const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-
-// @ts-ignore
-
-const pager = usePageTable(async (params?: SearchOption) =>
-{
-  return {
-    list: systemSwitchType?[
-      {
-       
-        "landArea": "行政区总人口（万人）",
-        "adcd": "20.7",
-       
-        "adnm": "行政区总面积（km²）",
-        "prevtpnm": "2372",
-       
-    },
-      {
-       
-        "landArea": "乡镇总数(个)",
-        "adcd": "29",
-       
-        "adnm": "耕地面积(亩)",
-        "prevtpnm": "8",
-       
-    },{
-       
-      "landArea": "自然村总数(个)",
-      "adcd": "108",
-     
-      "adnm": "行政村总数(个)",
-      "prevtpnm": "338",
-     
-  },{
-    "adnm": "防治区面积（km²）",
-    "adcd": "",
-    "landArea": "防治区总人口（万人）",
-   
-    "prevtpnm": "9.9",
-   
-},{
-       
-  "adnm": "受山洪威胁人口（人）",
-  "adcd": "7747",
-  "landArea": "受山洪威胁自然村数（个）",
- 
-  "prevtpnm": "",
- 
- 
-},{
-       
-  "adnm": "受山洪威胁行政村数（个）",
-    "adcd": "15",
-    "landArea": "受山洪威胁自然村数（个）",
-   
-    "prevtpnm": "164",
-   
-},
-{
-       
-  "adnm": "受山洪威胁严重的沿河村落数（个）",
-    "adcd": "10",
-    "landArea": "受山洪威胁的企事业单位数（个）",
-   
-    "prevtpnm": "177",
-   
-},{
-       
-  "adnm": "危险区数（个）",
-    "adcd": "294",
-    "landArea": "小流域数量（个）",
-   
-    "prevtpnm": "209",
-   
-},{
-       
-  "adnm": "自动监测站（座）",
-    "adcd": "32",
-    "landArea": "简易雨量站（座）",
-   
-    "prevtpnm": "62",
-   
-},{
-       
-  "adnm": "简易水位站（座）",
-    "adcd": "7",
-    "landArea": "无线预警广播站（座）",
-   
-    "prevtpnm": "118",
-   
-},
-{
-       
-  "adnm": "桥梁（座）",
-    "adcd": "397",
-    "landArea": "路涵（座）",
-   
-    "prevtpnm": "89",
-   
-},{
-       
-  "adnm": "塘（堰）坝（座）",
-    "adcd": "22",
-   
-   
-}
-   
-    ]:[
-      {
-       
-        "landArea": "行政区总面积（km²）",
-        "adcd": "51",
-       
-        "adnm": "行政区总人口（万人）",
-        "prevtpnm": "2666",
-       
-    },
-      {
-       
-        "landArea": "乡镇总数(个)",
-        "adcd": "705340",
-       
-        "adnm": "耕地面积(亩)",
-        "prevtpnm": "10",
-       
-    },{
-       
-      "landArea": "自然村总数(个)",
-      "adcd": "410",
-     
-      "adnm": "行政村总数(个)",
-      "prevtpnm": "851",
-     
-  },{
-    "adnm": "防治区面积（km²）",
-    "adcd": "0",
-    "landArea": "防治区总人口（万人）",
-   
-    "prevtpnm": "8.5",
-   
-},{
-       
-  "adnm": "受山洪威胁人口（人）",
-  "adcd": "58336",
-  "landArea": "受山洪威胁自然村数（个）",
- 
-  "prevtpnm": "",
- 
- 
-},{
-       
-  "adnm": "受山洪威胁行政村数（个）",
-    "adcd": "68",
-    "landArea": "受山洪威胁自然村数（个）",
-   
-    "prevtpnm": "2",
-   
-},
-{
-       
-  "adnm": "受山洪威胁严重的沿河村落数（个）",
-    "adcd": "1",
-    "landArea": "受山洪威胁的企事业单位数（个）",
-   
-    "prevtpnm": "109",
-   
-},{
-       
-  "adnm": "危险区数（个）",
-    "adcd": "427",
-    "landArea": "小流域数量（个）",
-   
-    "prevtpnm": "213",
-   
-},{
-       
-  "adnm": "自动监测站（座）",
-    "adcd": "28",
-    "landArea": "简易雨量站（座）",
-   
-    "prevtpnm": "193",
-   
-},{
-       
-  "adnm": "简易水位站（座）",
-    "adcd": "17",
-    "landArea": "无线预警广播站（座）",
-   
-    "prevtpnm": "162",
-   
-},
-{
-       
-  "adnm": "桥梁（座）",
-    "adcd": "	248",
-    "landArea": "路涵（座）",
-   
-    "prevtpnm": "149",
-   
-},{
-       
-  "adnm": "塘（堰）坝（座）",
-    "adcd": "6",
-   
-   
-}
-       
-    ],
-    totalRow: 6
-  };
-}
-);
-// @ts-ignore
-
-const pager2 = usePageTable(async (params?: SearchOption) =>
-{
-  return {
-    list: systemSwitchType?[
-      {
-        "adnm": "行政区划代码",
-       
-        "adcd": "420529	",
-        "landArea": "行政区划名称",
-       
-        "prevtpnm": "五峰土家族自治县	",
-       
-    },
-      {
-        "adnm": "土地面积（km²）",
-       
-        "adcd": "2372",
-        "landArea": "乡(镇)个数（个）",
-       
-        "prevtpnm": "8	",
-       
-    },
-    {
-       
-      "adnm": "年末总户数（户）",
-      "adcd": "71017",
-     
-      "landArea": "乡村户数（户）",
-      "prevtpnm": "57084",
-     
-  },
-  {
-       
-    "adnm": "年末总人口（人）",
-    "adcd": "20.67",
-   
-    "landArea": "乡村人口（人）",
-    "prevtpnm": "18.26",
-   
-},
-{
-       
-  "adnm": "年末单位从业人员数（人）",
-  "adcd": "83000",
- 
-  "landArea": "乡村从业人员数（人）",
-  "prevtpnm": "115700",
- 
-}, {
-       
-  "adnm": "农林牧渔业从业人员数（人）",
-  "adcd": "8000",
- 
-  "landArea": "农业机械总动力（万千瓦特）",
-  "prevtpnm": "19.69",
- 
-}, {
-       
-  "adnm": "固定电话用户（户）",
-  "adcd": "164900",
- 
-  "landArea": "第一产业增加值（万元）",
-  "prevtpnm": "10218",
- 
-},
-{
-       
-  "adnm": "第二产业增加值（万元）",
-  "adcd": "29100",
- 
-  "landArea": "地方财政一般预算收入（万元）",
-  "prevtpnm": "10218",
- 
-},{
-       
-  "adnm": "地方财政一般预算支出（万元）",
-  "adcd": "262200	",
- 
-  "landArea": "城乡居民储蓄存款余额（万元）",
-  "prevtpnm": "600000",
- 
-},{
-       
-  "adnm": "年末金融机构各项贷款余额（万元）",
-  "adcd": "189000	",
- 
-  "landArea": "粮食总产量（吨）",
-  "prevtpnm": "84400",
- 
-},{
-       
-  "adnm": "棉花产量（吨）",
-  "adcd": "0",
- 
-  "landArea": "油料产量（吨）",
-  "prevtpnm": "5373",
- 
-},{
-       
-  "adnm": "肉类总产量（吨）",
-  "adcd": "32319",
- 
-  "landArea": "规模以上工业企业个数（个）",
-  "prevtpnm": "179",
- 
-},
-{
-       
-  "adnm": "规模以上工业总产值(现价)（万元）",
-  "adcd": "463900	",
- 
-  "landArea": "固定资产投资(不含农户)（万元）",
-  "prevtpnm": "524200",
- 
-},{
-       
-  "adnm": "普通中学在校学生数（人）",
-  "adcd": "5510",
- 
-  "landArea": "小学在校学生数（人）",
-  "prevtpnm": "7512",
- 
-},{
-       
-  "adnm": "医院、卫生院床位数（床）",
-  "adcd": "777",
- 
-  "landArea": "各种社会福利收养性单位数（人）",
-  "prevtpnm": "8",
- 
-},{
-       
-  "adnm": "各种社会福利收养性单位床位数（床）",
-  "adcd": "900",
- 
-  "landArea": "规模以上工业企业个数（个）",
-  "prevtpnm": "179",
- 
-},
-   
-    ]:[
-      {
-        "adnm": "行政区划代码",
-       
-        "adcd": "422822",
-        "landArea": "行政区划名称",
-       
-        "prevtpnm": "建始县",
-       
-    },
-      {
-        "adnm": "土地面积（km²）",
-       
-        "adcd": "2666",
-        "landArea": "乡(镇)个数（个）",
-       
-        "prevtpnm": "10	",
-       
-    },
-    {
-       
-      "adnm": "年末总户数（户）",
-      "adcd": "130519",
-     
-      "landArea": "乡村户数（户）",
-      "prevtpnm": "87324",
-     
-  },
-  {
-       
-    "adnm": "年末总人口（人）",
-    "adcd": "51",
-   
-    "landArea": "乡村人口（人）",
-    "prevtpnm": "27.32",
-   
-},
-{
-       
-  "adnm": "年末单位从业人员数（人）",
-  "adcd": "65700",
- 
-  "landArea": "乡村从业人员数（人）",
-  "prevtpnm": "230000",
- 
-}, {
-       
-  "adnm": "农林牧渔业从业人员数（人）",
-  "adcd": "130200",
- 
-  "landArea": "农业机械总动力（万千瓦特）",
-  "prevtpnm": "29.14",
- 
-}, {
-       
-  "adnm": "固定电话用户（户）",
-  "adcd": "14627",
- 
-  "landArea": "第一产业增加值（万元）",
-  "prevtpnm": "166600",
- 
-},
-{
-       
-  "adnm": "第二产业增加值（万元）",
-  "adcd": "211000",
- 
-  "landArea": "地方财政一般预算收入（万元）",
-  "prevtpnm": "	127408",
- 
-},{
-       
-  "adnm": "地方财政一般预算支出（万元）",
-  "adcd": "269872	",
- 
-  "landArea": "城乡居民储蓄存款余额（万元）",
-  "prevtpnm": "542152",
- 
-},{
-       
-  "adnm": "年末金融机构各项贷款余额（万元）",
-  "adcd": "	444404	",
- 
-  "landArea": "粮食总产量（吨）",
-  "prevtpnm": "234000",
- 
-},{
-       
-  "adnm": "棉花产量（吨）",
-  "adcd": "0",
- 
-  "landArea": "油料产量（吨）",
-  "prevtpnm": "1.59",
- 
-},{
-       
-  "adnm": "肉类总产量（吨）",
-  "adcd": "70100",
- 
-  "landArea": "规模以上工业企业个数（个）",
-  "prevtpnm": "68",
- 
-},
-{
-       
-  "adnm": "规模以上工业总产值(现价)（万元）",
-  "adcd": "480324",
- 
-  "landArea": "固定资产投资(不含农户)（万元）",
-  "prevtpnm": "584489",
- 
-},{
-       
-  "adnm": "普通中学在校学生数（人）",
-  "adcd": "19245",
- 
-  "landArea": "小学在校学生数（人）",
-  "prevtpnm": "28086",
- 
-},{
-       
-  "adnm": "医院、卫生院床位数（床）",
-  "adcd": "2881",
- 
-  "landArea": "各种社会福利收养性单位数（人）",
-  "prevtpnm": "13",
- 
-},{
-       
-  "adnm": "各种社会福利收养性单位床位数（床）",
-  "adcd": "1527",
- 
- 
-},
-   
-    ],
-    totalRow: 6
-  };
-}
-);
-
-localStorage.getItem('address')
-console.log(localStorage.getItem('address'))
-
-  return (
-
-    <div className="introductionTable">
-      <Space size="large" wrap>
-        {/* <Select
-          value={selectVal}
-          style={{ width: 260 }}
-          onChange={handleChange}
-          options={[
-            {
-              label: '综合',
-              options: [
-                { label: 'B01-调查评价成果总体统计表', value: '0' },
-              ],
-            },
-            {
-              label: '现场调查成果',
-              options: [{ label: 'C02-行政区划总体情况表', value: '1' }],
-            },
-            {
-              label: '汇总表',
-              options: [{ label: '防治区基本情况调查成果汇总表', value: '2' }],
-            },
-          ]}
-        /> */}
-      </Space>
-    
-      <div style={{marginTop:"16px"}}   >
-      {
-          localStorage.getItem('address')
-          === 'wufeng'  && ( <p>五峰土家族自治县（420529）——调查评价成果汇总表</p>)
-        }
-        {
-          localStorage.getItem('address')
-          === 'jianshi'  && ( <p>建始县（422822）——调查评价成果汇总表</p>)
-        }
-       
-      <DataTable   crudCtx={crud} pagerCtx={pager} />
-      <p style={{margin:"20px 0"}}>县级社会经济情况表</p>
-      <DataTable2   crudCtx={crud} pagerCtx={pager2} />
-        <div style={{textAlign:"center"}}>
-
-{/* 
-          {
-            selectVal === "0"?
-            
-            <img src={systemSwitchType?JsDcpjImg:JsDcpjImg} alt="" width="80%"/>
-            
-            :null
-          } */}
-
-
-          {/* {
-            selectVal === "1"?<TableC />:null
-          }
-          {
-            selectVal === "2"?<TableHz />:null
-          } */}
-
-
-        </div>
-      </div>
-
-    </div>
-  )
-};
-
-export default BasePage
diff --git a/src/views/Home/Introduction/dcpjDetails/tableC.tsx b/src/views/Home/Introduction/dcpjDetails/tableC.tsx
deleted file mode 100644
index a67e0bd..0000000
--- a/src/views/Home/Introduction/dcpjDetails/tableC.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, {useMemo, useState} from 'react';
-import {Checkbox, Select, Space, Table, Tabs} from 'antd';
-
-import {ColumnsType} from "antd/lib/table";
-import moment from "moment";
-import {SearchOption} from "../../../../service/def";
-import staticData from '../../../../views/staticData';
-
-const { TabPane } = Tabs;
-
-type IProps = {
-
-}
-
-const BasePage: React.FC<IProps> = ({  }) => {
-
-  const columns = useMemo<ColumnsType<any>>(() => [
-    { title: '序号', key: 'inx', width:70, dataIndex: 'inx', align:"center", fixed:"left", render: (text, rec, index) => index + 1 },
-    { title: '行政区划代码', key: 'ADCD', width:100, dataIndex: 'ADCD', align:"center", fixed:"left", },
-    { title: '乡镇名称', key: 'ZHEN', width:100, dataIndex: 'ZHEN', align:"center", fixed:"left", },
-    { title: '行政区划名称', key: 'ADNM', width:100, dataIndex: 'ADNM', align:"center", fixed:"left", },
-    { title: '总人口(人)', key: 'PCOUNT', width:140, dataIndex: 'PCOUNT' , align:"center", fixed:"left", },
-    { title: '总户数(户)', key: 'HTCOUNT', width:120, dataIndex: 'HTCOUNT' , align:"center"},
-    { title: '土地面积(km2)', key: 'LDAREA', width:120, dataIndex: 'LDAREA' , align:"center"},
-    { title: '耕地面积(亩)', key: 'PLAREA', width:120, dataIndex: 'PLAREA' , align:"center"},
-    { title: '防治区类型', key: 'formateFangzhiquType', width:120, dataIndex: 'formateFangzhiquType' , align:"center"},
-  ], []);
-
-  const data:any = staticData.dcpjTableC;
-
-  return (
-    <div className="introductionTable">
-      <div style={{marginTop:"16px"}}>
-        <Table
-          rowKey="key"
-          size="small"
-          columns={columns}
-          // @ts-ignore
-          dataSource={data}
-          scroll={{ y: 180 }}
-          pagination={false}
-        />
-      </div>
-    </div>
-  )
-};
-
-export default BasePage
diff --git a/src/views/Home/Introduction/dcpjDetails/tableHz.tsx b/src/views/Home/Introduction/dcpjDetails/tableHz.tsx
deleted file mode 100644
index bf2d447..0000000
--- a/src/views/Home/Introduction/dcpjDetails/tableHz.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React, {useMemo, useState} from 'react';
-import {Checkbox, Select, Space, Table, Tabs} from 'antd';
-
-import {ColumnsType} from "antd/lib/table";
-import moment from "moment";
-import {SearchOption} from "../../../../service/def";
-import staticData from '../../../../views/staticData';
-
-const { TabPane } = Tabs;
-
-type IProps = {
-
-}
-
-const BasePage: React.FC<IProps> = ({  }) => {
-
-  const columns = useMemo<ColumnsType<any>>(() => [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '行政区划代码', key: 'ADCD', width:100, dataIndex: 'ADCD', align:"center", fixed:"left", },
-    { title: '乡镇名称', key: 'ZHEN', width:100, dataIndex: 'ZHEN', align:"center", fixed:"left", ellipsis: true},
-    { title: '行政区划名称', key: 'ADNM', width:100, dataIndex: 'ADNM', align:"center", fixed:"left", ellipsis: true},
-    { title: '总人口(人)', key: 'PCOUNT', width:140, dataIndex: 'PCOUNT' , align:"center", fixed:"left", },
-    { title: '土地面积(km2)', key: 'LDAREA', width:120, dataIndex: 'LDAREA' , align:"center"},
-    { title: '耕地面积(亩)', key: 'PLAREA', width:120, dataIndex: 'PLAREA' , align:"center"},
-    { title: '总户数(户)', key: 'HTCOUNT', width:120, dataIndex: 'HTCOUNT' , align:"center"},
-    { title: 'Ⅰ类经济户数(户)', key: 'ECOUNT1', width:120, dataIndex: 'ECOUNT1' , align:"center"},
-    { title: 'Ⅱ类经济户数(户)', key: 'ECOUNT2', width:120, dataIndex: 'ECOUNT1' , align:"center"},
-    { title: 'Ⅲ类经济户数(户)', key: 'ECOUNT3', width:120, dataIndex: 'ECOUNT1' , align:"center"},
-  ], []);
-
-  const data:any = staticData.dcpjTableHzb;
-
-  return (
-    <div className="introductionTable">
-      <div style={{marginTop:"16px"}}>
-        <Table
-          rowKey="key"
-          size="small"
-          columns={columns}
-          // @ts-ignore
-          dataSource={data}
-          scroll={{ y: 180 }}
-          pagination={false}
-        />
-      </div>
-    </div>
-  )
-};
-
-export default BasePage
diff --git a/src/views/Home/Introduction/fxyhdc/img/table0.jpg b/src/views/Home/Introduction/fxyhdc/img/table0.jpg
deleted file mode 100644
index f4e114e..0000000
Binary files a/src/views/Home/Introduction/fxyhdc/img/table0.jpg and /dev/null differ
diff --git a/src/views/Home/Introduction/fxyhdc/img/table1.jpg b/src/views/Home/Introduction/fxyhdc/img/table1.jpg
deleted file mode 100644
index 7ac062c..0000000
Binary files a/src/views/Home/Introduction/fxyhdc/img/table1.jpg and /dev/null differ
diff --git a/src/views/Home/Introduction/fxyhdc/img/table2.jpg b/src/views/Home/Introduction/fxyhdc/img/table2.jpg
deleted file mode 100644
index b862b47..0000000
Binary files a/src/views/Home/Introduction/fxyhdc/img/table2.jpg and /dev/null differ
diff --git a/src/views/Home/Introduction/fxyhdc/img/table3.jpg b/src/views/Home/Introduction/fxyhdc/img/table3.jpg
deleted file mode 100644
index 5f45fcb..0000000
Binary files a/src/views/Home/Introduction/fxyhdc/img/table3.jpg and /dev/null differ
diff --git a/src/views/Home/Introduction/fxyhdc/index.less b/src/views/Home/Introduction/fxyhdc/index.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/Home/Introduction/fxyhdc/index.tsx b/src/views/Home/Introduction/fxyhdc/index.tsx
deleted file mode 100644
index a488585..0000000
--- a/src/views/Home/Introduction/fxyhdc/index.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, {useMemo, useState} from 'react';
-import {Checkbox, Modal, Table, Tabs} from 'antd';
-
-import "./index.less"
-import {config} from "../../../../config";
-
-import {ColumnsType} from "antd/lib/table";
-import Table0 from "../fxyhdc/img/table0.jpg";
-import Table1 from "../fxyhdc/img/table1.jpg";
-import Table2 from "../fxyhdc/img/table2.jpg";
-import Table3 from "../fxyhdc/img/table3.jpg";
-import { useLocation } from "react-router-dom";
-
-
-const { TabPane } = Tabs;
-
-type IProps = {
-  setVisible:any
-  setPdf:any
-}
-
-const BasePage: React.FC<IProps> = ({ setVisible,setPdf }) => {
-  const location = useLocation();
-  const [fxyhdcVisible, setFxyhdcVisible] = useState(false);
-  const [fxyhdcTitle, setFxyhdcTitle] = useState("");
-  //console.log(22222,location)
-
-
-  const handleCancelFxyhdc = () => {
-    setFxyhdcVisible(false);
-  }
-
-  const openTable = (val:any) => {
-    // setFxyhdcVisible(true);
-    if(val===0){
-      // setFxyhdcTitle("山洪灾害风险隐患保护对象名录表");
-      setVisible(true)
-      setPdf(`${process.env.PUBLIC_URL}/data/html/${localStorage.getItem('address')}/山洪灾害风险隐患保护对象名录表.html`)
-    }else if(val===1){
-      // setFxyhdcTitle("沟滩占地情况调查成果表");
-      setVisible(true)
-      setPdf(`${process.env.PUBLIC_URL}/data/html/${localStorage.getItem('address')}/沟滩占地情况调查成果表.html`)
-    }else if(val===2){
-      // setFxyhdcTitle("（雨量）外洪顶托城集镇及村落调查分析成果表");
-      setVisible(true)
-      setPdf(`${process.env.PUBLIC_URL}/data/html/${localStorage.getItem('address')}/外洪顶托城集镇及村落调查分析成果表.html`)
-    }else if(val===3){
-      // setFxyhdcTitle("跨沟道路、桥涵调查成果表");
-      setVisible(true)
-      setPdf(`${process.env.PUBLIC_URL}/data/html/${localStorage.getItem('address')}/跨沟道路、桥涵调查成果表.html`)
-    }else if(val===4){
-      setVisible(true)
-      setPdf(`${process.env.PUBLIC_URL}/data/html/${localStorage.getItem('address')}/水位-保护对象关系表.html`)
-    }else if(val===5){
-      setVisible(true)
-      setPdf(`${process.env.PUBLIC_URL}/data/html/${localStorage.getItem('address')}/保护对象名录.html`)
-    }else if(val===6){
-      setVisible(true)
-      setPdf(`${process.env.PUBLIC_URL}/data/html/${localStorage.getItem('address')}/隐患点名录.html`)
-    }
-  }
-
-  return (
-    <div className="introductionTable">
-      <div onClick={()=>openTable(0)} style={{cursor:"pointer", color:"#0893FF", marginBottom:"10px"}}>1、山洪灾害风险隐患保护对象名录表</div>
-      <div onClick={()=>openTable(1)} style={{cursor:"pointer", color:"#0893FF", marginBottom:"10px"}}>2、沟滩占地情况调查成果表</div>
-      <div onClick={()=>openTable(2)} style={{cursor:"pointer", color:"#0893FF", marginBottom:"10px"}}>3、（雨量）外洪顶托城集镇及村落调查分析成果表</div>
-      <div onClick={()=>openTable(3)} style={{cursor:"pointer", color:"#0893FF", marginBottom:"10px"}}>4、跨沟道路、桥涵调查成果表</div>
-      <div onClick={()=>openTable(4)} style={{cursor:"pointer", color:"#0893FF", marginBottom:"10px"}}>5、水位-保护对象关系表</div>
-      <div onClick={()=>openTable(5)} style={{cursor:"pointer", color:"#0893FF", marginBottom:"10px"}}>6、保护对象名录</div>
-      <div onClick={()=>openTable(6)} style={{cursor:"pointer", color:"#0893FF", marginBottom:"10px"}}>7、隐患点名录</div>
-
-
-      {/*风险隐患调查的弹窗*/}
-      <Modal
-        visible={fxyhdcVisible}
-        title={fxyhdcTitle}
-        footer={null}
-        onCancel={handleCancelFxyhdc}
-        width="94vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        {
-          fxyhdcTitle === "山洪灾害风险隐患保护对象名录表"?<img src={Table0} alt="" width="100%"/>:null
-        }
-        {
-          fxyhdcTitle === "沟滩占地情况调查成果表"?<img src={Table1} alt="" width="100%"/>:null
-        }
-        {
-          fxyhdcTitle === "（雨量）外洪顶托城集镇及村落调查分析成果表"?<img src={Table2} alt="" width="100%"/>:null
-        }
-        {
-          fxyhdcTitle === "跨沟道路、桥涵调查成果表"?<img src={Table3} alt="" width="100%"/>:null
-        }
-      </Modal>
-    </div>
-  )
-};
-
-export default BasePage
diff --git a/src/views/Home/Introduction/index.less b/src/views/Home/Introduction/index.less
deleted file mode 100644
index f8d4d36..0000000
--- a/src/views/Home/Introduction/index.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.bigTable{
-  th{
-    padding:5px 10px !important;
-    line-height: 16px;
-    font-size: 13px;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/Introduction/index.tsx b/src/views/Home/Introduction/index.tsx
deleted file mode 100644
index c35e30f..0000000
--- a/src/views/Home/Introduction/index.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { Tabs, Modal, Collapse } from 'antd'
-import React, { useState } from 'react'
-import { CaretRightOutlined, ExpandOutlined } from '@ant-design/icons';
-import DcpjPage from "../../Home/Introduction/dcpj"
-import FxyhdcPage from "../../Home/Introduction/fxyhdc"
-import staticData from '../../staticData';
-import DcpjDetailsPage from "../../Home/Introduction/dcpjDetails"
-import "./index.less"
-import {config} from "../../../config";
-import useCrud from '../../../components/crud/useCrud';
-const { Panel } = Collapse;
-
-const Introduction = () => {
-  const [activeKey, setActiveKey] = useState("1");
-
-  const [detailsVisible, setDetailsVisible] = useState(false);
-  const [detailsVisible2, setDetailsVisible2] = useState(false);
-
-  const [dcpjVisible, setDcpjVisible] = useState(false);
-  const crud = useCrud();
-
-
-  const handleCancel = () => {
-    setDetailsVisible(false);
-  }
-
-  const handleCancelDcpj = () => {
-    setDcpjVisible(false);
-  }
-
-
-
-  const [previewPdf, setPreviewPdf] = useState("");
-  //console.log(previewPdf)
-  const genExtra = () => (
-    <ExpandOutlined title="调查评价详情"
-      onClick={(event) => {
-        event.stopPropagation();
-        setDcpjVisible(true);
-      }}
-    />
-  );
-
-  const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-
-  return (
-    <div style={{ width: '98%', height:"calc( 100vh - 60px )", marginLeft: '2%', overflow:"hidden auto",  }}>
-      <Tabs defaultActiveKey={activeKey}>
-        <Tabs.TabPane tab={systemSwitchType?"五峰县基本情况":"建始县基本情况"} key="1">
-          <div style={{textIndent:"28px", textAlign:"justify", paddingRight:"12px"}}>
-            <span>{staticData.qkjsData.jbqk}&nbsp;&nbsp;</span>
-            <span onClick={()=>{setDetailsVisible(true);setPreviewPdf(`${process.env.PUBLIC_URL}/data/pdf/${localStorage.getItem('address')}/简介.pdf`);}} style={{fontSize:"12px", cursor:"pointer", color:"#0068F4"}}>展开详情</span>
-          </div>
-
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="试点流域基本情况" key="2">
-          <div style={{textIndent:"28px", textAlign:"justify", paddingRight:"12px"}}>
-            {staticData.qkjsData.sdly}&nbsp;&nbsp;
-            <span onClick={()=>{setDetailsVisible(true);setPreviewPdf(`${process.env.PUBLIC_URL}/data/pdf/${localStorage.getItem('address')}/试点流域基本情况.pdf`);}} style={{fontSize:"12px", cursor:"pointer", color:"#0068F4"}}>展开详情</span>
-          </div>
-        </Tabs.TabPane>
-      </Tabs>
-
-      <div style={{margin:"20px 12px 0 0"}}>
-        <Collapse
-          collapsible="header"
-          defaultActiveKey={['1','2']}
-          expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
-        >
-          <Panel header="调查评价" key="1" extra={genExtra()} >
-            
-         
-            <DcpjPage /> 
-           
-          </Panel>
-          <Panel header="风险隐患调查" key="2" >
-            <FxyhdcPage setVisible={(e:any)=>{setDetailsVisible2(e)}} setPdf={(e:any)=>{setPreviewPdf(e)}}/>
-          </Panel>
-        </Collapse>
-      </div>
-
-      {/*展开详情的弹窗*/}
-      <Modal
-        visible={detailsVisible}
-        title="详情"
-        footer={null}
-        onCancel={handleCancel}
-        width="94vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        <div style={{height:"87vh"}}>
-          <iframe
-            src={previewPdf}
-            width="100%"
-            height="100%"
-            frameBorder={0}//边框设置
-            scrolling="no"//滚动设置
-          ></iframe>
-        </div>
-      </Modal>
-
-      {/*展开详情的弹窗2*/}
-      <Modal
-        visible={detailsVisible2}
-        title="详情"
-        footer={null}
-        onCancel={()=>{setDetailsVisible2(false)}}
-        width="94vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        <div style={{height:"87vh"}}>
-          <iframe
-            src={previewPdf}
-            width="100%"
-            height="100%"
-            frameBorder={0}//边框设置
-            // scrolling="no"//滚动设置
-          ></iframe>
-        </div>
-      </Modal>
-
-      {/*调查评价的弹窗*/}
-      <Modal
-        visible={dcpjVisible}
-        title="调查评价详情"
-        footer={null}
-        onCancel={handleCancelDcpj}
-        width="90vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        <DcpjDetailsPage />
-      </Modal>
-
-
-    </div>
-  )
-}
-
-export default Introduction
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/CoordsText.js b/src/views/Home/MapCtrl/CoordsText.js
deleted file mode 100644
index 4fbc3db..0000000
--- a/src/views/Home/MapCtrl/CoordsText.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react'
-import { useSelector } from 'react-redux'
-
-function CoordsText() {
-  const coordsText = useSelector(s => s.runtime.coordsText);
-  return (
-    <div className="coords_txt">{coordsText}</div>
-  )
-}
-
-export default CoordsText
diff --git a/src/views/Home/MapCtrl/FeatureTip.js b/src/views/Home/MapCtrl/FeatureTip.js
deleted file mode 100644
index f3a64a2..0000000
--- a/src/views/Home/MapCtrl/FeatureTip.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react'
-import { useSelector } from 'react-redux'
-
-function FeatureTip() {
-  const featureTip = useSelector(s => s.runtime.featureTip);
-  if (!featureTip) {
-    return null;
-  }
-  return (
-    <div style={{ display: 'block', left: featureTip.left, top: featureTip.top }} className="tip_container">
-      <div style={{ borderTopColor: 'white' }} />
-      <div className="tip_txt">{featureTip.text}</div>
-    </div>
-  )
-}
-
-export default FeatureTip
diff --git a/src/views/Home/MapCtrl/M2D/Map2D.js b/src/views/Home/MapCtrl/M2D/Map2D.js
deleted file mode 100644
index 9603a9f..0000000
--- a/src/views/Home/MapCtrl/M2D/Map2D.js
+++ /dev/null
@@ -1,240 +0,0 @@
-import * as proj from 'ol/proj';
-import Mask from "ol-ext/filter/Mask.js";
-import Map from 'ol/Map';
-import View from 'ol/View';
-import { Fill, Stroke, Style } from "ol/style.js";
-import TileLayer from 'ol/layer/Tile';
-import XYZSource from 'ol/source/XYZ';
-import { GeoJSON } from 'ol/format'
-
-import BaseMap from '../basemap';
-import LayerMgr2D from './layermgr2d';
-import Point from 'ol/geom/Point';
-
-import { getWktData } from "../../../../models/_/base";
-
-/**
- * OL 封装
- */
-export default class Map2D extends BaseMap {
-  constructor({ divid, dispatch }) {
-    super();
-
-    this.dispatch = dispatch;
-    this.divid = divid; // div element id
-    this._map = null; // openlayers map obj
-    this.layerMgr = null;
-    this.PROJ2GG = proj.getTransform('EPSG:900913', 'EPSG:4326');
-    this.GG2PROJ = proj.getTransform('EPSG:4326', 'EPSG:900913');
-  }
-
-  /**
-   * 初始化地图、图层
-   */
-  init() {
-    console.log("++++++++++初始化地图、图层++++++++++");
-    // const extent = [114.65, 30.85 , 115.48, 31.60]; //视图中心位置
-    const extent = [114.746, 31.479 , 114.776, 31.509]; //视图中心位置
-    console.log("@@@@ map init 38++++", extent);
-
-    // const fitE = [extent[0] + ew, extent[1] + eh, extent[2] - ew, extent[3] - eh];
-
-    const map = new Map({
-      moveTolerance: 2,
-      controls: [],
-      view: new View({
-        minZoom: 5.5,//8.6,
-        maxZoom: 20,
-        //zoomFactor: 1.5
-      }),
-      target: this.divid,
-    });
-
-    map.getView().fit(this.GG2PROJ(extent), { nearest: true });
-    //console.log("53 mapZoom+++++",map.getView().getZoom());
-    //console.log("51",localStorage.getItem('mapZoom'));
-    localStorage.setItem('mapZoom', map.getView().getZoom());
-
-    let tile = new TileLayer({
-      source: new XYZSource({
-        tilePixelRatio: 1,
-        //url: 'http://mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali',
-        // url: 'http://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=efc861f25f96dc6e5f884f0403ebfefd',
-        //url: `http://res3dstatic{0-7}.cloudowr.cn/${localStorage.getItem('address')}/dom2/{z}/{x}/{y}.png`,
-        url: "https://t{0-7}.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=efc861f25f96dc6e5f884f0403ebfefd",
-      }),
-      maxZoom: 20,
-      //zIndex:10,
-      //opacity: 0.4
-    });
-
-    // 设置图层名
-    tile.set('name', 'SatelliteImage');//卫星影像
-
-    getWktData().then((wkt) => {
-      var mask2 = new Mask({
-        feature: new GeoJSON().readFeature(wkt[0], {
-          dataProjection: 'EPSG:4326', // json的坐标系
-          featureProjection: 'EPSG:3857', // 当前地图使用的坐标系
-        }),
-        wrapX: true,
-        inner: false,
-        fill: new Fill({
-          // color: "rgb(236, 242, 249)",
-          color: "rgb(236, 242, 249, 0.2)",
-        }),
-        //fill: new Fill({ color: 'rgba(220,240,253,0.6)' }),
-      });
-      tile.addFilter(mask2);
-    });
-
-    map.addLayer(tile);
-    //map.getLayers().insertAt(2, tile);
-
-    // 隐藏图层
-    tile.setVisible(false);
-
-    this.layerMgr = new LayerMgr2D(map);
-
-    map.on('singleclick', (evt) => {
-      const feature = map.forEachFeatureAtPixel(evt.pixel, o => o);
-      if (feature) {
-        const props = feature.getProperties();
-        //console.log("singleclick",props);
-
-        if (props && props.layerName) {
-          const layer = this.layerMgr.getLayer(props.layerName);
-          if (layer && layer.onFeatureClicked) {
-            layer.onFeatureClicked(feature, this.dispatch);
-          }
-        }
-      } else {
-        this.layerMgr.onClick(evt.coordinate);
-      }
-    });
-
-    map.on('pointermove', (evt) => {
-      // 显示鼠标经纬度
-      if (evt.coordinate) {
-        const ll = this.PROJ2GG(evt.coordinate);
-        if (ll) {
-          const strtxt = `${ll[0].toFixed(6)}, ${ll[1].toFixed(6)}`;
-          //console.log("120 显示鼠标经纬度",strtxt);
-          this.dispatch.runtime.setCoordsText(strtxt);
-          //document.getElementById(`${this.divid}_coord`).innerHTML = strtxt;
-        }
-      }
-      if (evt.dragging || !evt.pixel) {
-        map.getTargetElement().style.cursor = '';
-        this.dispatch.runtime.setFeatureTip(null);
-        return;
-      }
-      const feature = map.forEachFeatureAtPixel(
-        map.getEventPixel(evt.originalEvent), o => o);
-      let featureTip = null;
-      if (feature) {
-        const props = feature.getProperties();
-        if (props && props.layerName) {
-          const layer = this.layerMgr.getLayer(props.layerName);
-          if (layer && layer.getFeatureTip) {
-            featureTip = layer.getFeatureTip(feature);
-          }
-        }
-      }
-      this.dispatch.runtime.setFeatureTip({
-        pixel: evt.pixel,
-        featureTip,
-      });
-    });
-
-    map.on('pointermove', (e) => {
-      let pixel = map.getEventPixel(e.originalEvent)
-      let feature = map.forEachFeatureAtPixel(pixel, (feature) => {
-        return feature
-      })
-
-      /*if(feature == undefined || feature.getGeometry().getType() !='Point'){// 线、面要素不做鼠标移入样式修改
-        map.getTargetElement().style.cursor = 'auto'
-      }else{
-        map.getTargetElement().style.cursor = 'pointer'
-      }*/
-      if (feature && (feature.getGeometry().getType() === 'Point' || feature.getGeometry().getType() === 'LineString')) {
-        //console.log(feature.getGeometry().getType());
-        map.getTargetElement().style.cursor = 'pointer'
-      }
-    });
-
-    map.on('postrender', () => {
-      this.dispatch.runtime.tickViewChanged();
-    });
-
-    map.on('moveend', () => {
-      var view = map.getView();
-      var resolution = view.getResolution();
-
-      if (resolution <120){
-        map && map.getLayers().getArray().forEach((layer)=> {
-          // if( (layer.values_.name) && ((layer.values_.name).indexOf("HL2Layer")>-1) ){
-          if( (layer.values_.name) && ((layer.values_.name).indexOf("highroadLayer")>-1) ){
-            layer.setVisible(true)
-          }
-        })
-      }else{
-        map && map.getLayers().getArray().forEach((layer)=> {
-          // if( (layer.values_.name) && ((layer.values_.name).indexOf("HL2Layer")>-1) ){
-          if( (layer.values_.name) && ((layer.values_.name).indexOf("highroadLayer")>-1) ){
-            layer.setVisible(false)
-          }
-        })
-      }
-
-
-    });
-
-    this._map = map;
-    setTimeout(() => {
-      map.updateSize();
-    }, 100);
-  }
-
-  coordinateToPixel(lgtd, lttd) {
-    let coords = this.GG2PROJ([lgtd, lttd]);
-    return this._map?.getPixelFromCoordinate(coords);
-  }
-
-  /**
-   * 组件卸载时，需要销毁map对象
-   */
-  destroy() {
-    console.log('##############destroy##############')
-    this.layerMgr.destroy();
-    if (this._map) {
-      this._map.setTarget(null);
-      this._map = null;
-    }
-  }
-
-  /**
-   * get layer obj
-   */
-  getLayer(name) {
-    return this.layerMgr.getLayer(name);
-  }
-
-  zoomTo(cameraTarget) {
-    //console.log("148",cameraTarget);
-
-    if (cameraTarget.center) {
-      this._map.getView().fit(new Point(this.GG2PROJ(cameraTarget.center)), {
-        duration: 800,
-        maxZoom: cameraTarget.zoom
-      });
-    } else if (cameraTarget.bound) {
-      this._map.getView().fit(this.GG2PROJ([cameraTarget.bound[0][0], cameraTarget.bound[0][1], cameraTarget.bound[1][0], cameraTarget.bound[1][1]]), {
-        duration: 800,
-        maxZoom: cameraTarget.zoom
-      });
-    }
-  }
-
-}
diff --git a/src/views/Home/MapCtrl/M2D/layermgr2d.js b/src/views/Home/MapCtrl/M2D/layermgr2d.js
deleted file mode 100644
index 924c8d7..0000000
--- a/src/views/Home/MapCtrl/M2D/layermgr2d.js
+++ /dev/null
@@ -1,194 +0,0 @@
-import { useDispatch, useSelector } from "react-redux";
-
-import LayerMgr from "../layermgr";
-import BouaLayer2D from "./layers/BouaLayer2D";
-import BouaInLayer2D from "./layers/BouaInLayer2D";
-import BouaOutLayer2D from "./layers/BouaOutLayer2D";
-
-import AdcdBorderInLayer2D from "./layers/AdcdBorderInLayer2D"
-
-import BouaOutsideLayer2D from "./layers/BouaOutsideLayer2D";
-import OfflineMap2D from "./layers/OfflineMap2D";
-import SatelliteImage2D from "./layers/SatelliteImage2D";
-
-import RainLayer2D from "./layers/RainLayer2D";
-import RainLayer2DRadar from "./layers/RainLayer2D-radar";
-import RainLayer2DRh from "./layers/RainLayer2D-rh";
-
-import HLLayer2D from "./layers/HLLayer2D";
-import HLLayer2D2 from "./layers/HLLayer2D2";
-import HL2Layer2D from "./layers/HL2Layer2D";
-import XLYLayer2D from "./layers/XLYLayer2D";
-import AdcdBorderLayer2D from './layers/AdcdBorderLayer2D'
-import YsgcLayer2D from './layers/YsgcLayer2D'
-import highroadLayer2D from './layers/highroadLayer2D'
-
-import Contourlayer from "./layers/contourlayer";
-import ContourlayerLoop from "./layers/contourlayerLoop";
-
-import WxqLayer2D from "./layers/WxqLayer2D";
-
-export default class LayerMgr2D extends LayerMgr {
-  constructor(map) {
-    super();
-    this.map = map;
-  }
-
-  /**
-   * 添加图层
-   * @param {@BaseLayer}
-   */
-  addLayer(layer) {
-    let ollayers = [];
-    if (layer.getRawLayers) {
-      ollayers = layer.getRawLayers();
-    }
-
-    for (const ollayer of ollayers) {
-      /*ollayer.getSource().clear();
-      this.map.removeLayer(ollayer);*/
-      //console.log("39++++ ollayer",ollayer);
-
-      this.map.addLayer(ollayer);
-
-    }
-
-    this.layers.push(layer);
-
-    if (layer.onAdd) {
-      layer.onAdd(this.map);
-    }
-
-    return layer;
-  }
-
-  addLayerC(layer, cLayerData) {
-    //console.log("58 cLayerData",cLayerData);
-
-    this.layers = [];
-    this.layers.push(layer);
-
-    if (layer.onAdd) {
-      layer.onAdd(this.map, cLayerData);
-    }
-    //console.log("layer 74++++++++++++",layer);
-
-    return layer;
-  }
-
-  onClick(coordinate) {
-    for (let i = this.layers.length - 1; i >= 0; i -= 1) {
-      const curlayer = this.layers[i];
-      if (typeof curlayer.onClick === 'function') {
-        const passdown = curlayer.onClick({
-          map: this.map,
-          coordinate,
-        });
-        if (!passdown) {
-          break;
-        }
-      }
-    }
-  }
-
-  destroy() {
-    for (const layer of this.layers) {
-      let ollayers = [];
-      if (layer.getRawLayers) {
-        ollayers = layer.getRawLayers();
-      }
-      for (const ollayer of ollayers) {
-        this.map.removeLayer(ollayer);
-      }
-    }
-    this.layers = null;
-  }
-
-  addAppLayers(dispatch, visible, setting, otherParams) {
-    visible = visible || {};
-
-    dispatch.map.setMap(this.map);
-
-    dispatch.map.setClickLoopBtn(false); 
-
-    //离线地图
-    this.addLayer(new OfflineMap2D({ visible: visible[OfflineMap2D.LayerName], setting, dispatch }));
-    //卫星影像
-    this.addLayer(new SatelliteImage2D({ visible: visible[SatelliteImage2D.LayerName], setting, dispatch }));
-    //乡镇边界
-    this.addLayer(new AdcdBorderInLayer2D({ visible: visible[AdcdBorderInLayer2D.LayerName], setting, dispatch }));
-    //县外的边界
-    // this.addLayer(new BouaOutsideLayer2D({ visible: visible[BouaOutsideLayer2D.LayerName], setting, dispatch }));
-
-
-    //河流
-    this.addLayer(new HLLayer2D2({ visible: visible[HLLayer2D2.LayerName], setting, dispatch }));//河流线-卫星图
-    this.addLayer(new HLLayer2D({ visible: visible[HLLayer2D.LayerName], setting, dispatch }));//河流线-矢量图
-    this.addLayer(new HL2Layer2D({ visible: visible[HL2Layer2D.LayerName], setting, dispatch }));//河流面
-
-
-    //省级公路
-    this.addLayer(new highroadLayer2D({ visible: visible[highroadLayer2D.LayerName], setting, dispatch }));
-    //咸丰边界
-    this.addLayer(new BouaLayer2D({ visible: visible[BouaLayer2D.LayerName], setting, dispatch }));
-    // this.addLayer(new BouaInLayer2D({ visible: visible[BouaInLayer2D.LayerName], setting, dispatch }));
-    // this.addLayer(new BouaOutLayer2D({ visible: visible[BouaOutLayer2D.LayerName], setting, dispatch }));
-
-
-    //RainLayer2DRadar 测雨雷达
-    // this.addLayer(new RainLayer2DRadar({ visible: visible[RainLayer2DRadar.LayerName], setting, dispatch }));
-    //RainLayer2DRh 融合雨量
-    // this.addLayer(new RainLayer2DRh({ visible: visible[RainLayer2DRh.LayerName], setting, dispatch }));
-
-
-
-    // this.addLayer(new XLYLayer2D({ visible: visible[XLYLayer2D.LayerName], setting, dispatch }));
-
-    //行政区划边界
-    // ['422826102','422826100','422826201','422826104','422826203','422826204','422826200','422826101','422826103','422826202','422826400'].map((i)=>{
-    //   this.addLayer(new AdcdBorderLayer2D({ visible: visible["AdcdBorderLayer_"+i], setting, dispatch },i));
-    // })
-    //引水工程
-    // this.addLayer(new YsgcLayer2D({ visible: visible[YsgcLayer2D.LayerName], setting, dispatch }));
-
-
-
-
-
-
-
-    //danad:危险区  placement:安置点  transfer:转移路线  flrvvlg:沿河居民户  bsnssinfo:企事业单位
-    //bridge:桥梁  culvert:路涵  sluice:水闸  daminfo:塘(堰)坝   dike:堤防 wbrinfo:无线预警广播
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_danadLayer"], setting, dispatch },"danad"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_placementLayer"], setting, dispatch },"placement"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_transferLayer"], setting, dispatch },"transfer"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_flrvvlgLayer"], setting, dispatch },"flrvvlg"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_bsnssinfoLayer"], setting, dispatch },"bsnssinfo"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_bridgeLayer"], setting, dispatch },"bridge"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_culvertLayer"], setting, dispatch },"culvert"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_sluiceLayer"], setting, dispatch },"sluice"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_daminfoLayer"], setting, dispatch },"daminfo"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_dikeLayer"], setting, dispatch },"dike"));
-    // this.addLayer(new WxqLayer2D({ visible: visible["Dcpj_wbrinfoLayer"], setting, dispatch },"wbrinfo"));
-
-    this._addAppMarkerLayers(dispatch, visible, setting, otherParams);
-  }
-
-  addAppLayersC(dispatch, visible, setting) {
-    visible = visible || {};
-
-    this.addLayerC(new Contourlayer({ visible: visible[Contourlayer.LayerName], setting, dispatch }),setting.contour);
-  }
-
-  addAppLayersCLoop(dispatch, visible, setting) {
-    visible = visible || {};
-
-    //console.log("layermgr2d ContourlayerLoop 142",setting.contour)
-
-    if(this.map){
-      this.addLayerC(new ContourlayerLoop({ visible: visible[ContourlayerLoop.LayerName], setting, dispatch }, this.map),setting.contour);
-
-      dispatch.map.setMap(this.map);
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/AdcdBorderInLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/AdcdBorderInLayer2D.js
deleted file mode 100644
index 4e60541..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/AdcdBorderInLayer2D.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import FillStyle from "ol/style/Fill";
-import {config} from "../../../../../config";
-
-//咸丰下乡镇边界
-export default class AdcdBorderInLayer2D extends POILayer2D {
-  static LayerName = 'AdcdBorderInLayer'
-
-  constructor(props, type) {
-    super(props);
-
-    this._style1 = {};
-    this._style2 = {};
-    this._type = type;
-
-  }
-
-  getLayerName() {
-    return 'AdcdBorderInLayer'
-  }
-
-  async dataPromise() {
-    const XLYData2 = await fetch(`${process.env.PUBLIC_URL}/data/geojson/macheng/adcdBorder.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({ ...o.properties, geometry: o.geometry, type: 'ly2' })))
-      .catch(() => []);
-
-    this._style2 = new Style({
-        stroke: new StrokeStyle({
-            color: 'rgba(0,0,0,0.1)',
-            width: 1,
-            lineDash: [5,5],
-        }),
-        zIndex: zindex2d.sx,
-    })
-
-
-    return [...XLYData2];
-  }
-
-  styleFunc = ({ props }) => {
-
-    if (!this.isVisible()) {
-      return null;
-    }
-    return this._style2
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/AdcdBorderLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/AdcdBorderLayer2D.js
deleted file mode 100644
index 81299cf..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/AdcdBorderLayer2D.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import FillStyle from "ol/style/Fill";
-import {config} from "../../../../../config";
-
-export default class AdcdBorderLayer2D extends POILayer2D {
-  static LayerName = 'AdcdBorderLayer_'+this._type;
-
-  constructor(props, type) {
-    super(props);
-
-    this._style1 = {};
-    this._style2 = {};
-    this._type = type;
-
-  }
-
-  getLayerName() {
-    return 'AdcdBorderLayer_'+this._type;
-  }
-
-  async dataPromise() {
-    const XLYData2 = await fetch(`${process.env.PUBLIC_URL}/data/geojson/xianfeng/adcdBorder.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({ ...o.properties, geometry: o.geometry, type: 'ly2' })))
-      .catch(() => []);
-
-    const list = [];
-    ['422826102','422826100','422826201','422826104','422826203','422826204','422826200','422826101','422826103','422826202','422826400'].map((i)=>{
-      if(this._type === i){
-        XLYData2.map(o => {
-          if(o.CODE == i){
-            this._style2 = new Style({
-              stroke: new StrokeStyle({
-                color: 'rgba(122,227,200, 1)',
-                width: 2,
-              }),
-              fill: new FillStyle({
-                color: 'rgba(44,169,138,0.5)',
-              }),
-              zIndex: zindex2d.sx,
-            })
-            list.push(o)
-          }
-        });
-      }
-    })
-
-    return [...list];
-  }
-
-  styleFunc = ({ props }) => {
-
-    if (!this.isVisible()) {
-      return null;
-    }
-    return this._style2
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/BouaInLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/BouaInLayer2D.js
deleted file mode 100644
index 9e35760..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/BouaInLayer2D.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import {config} from "../../../../../config";
-
-export default class BouaInLayer2D extends POILayer2D {
-  static LayerName = 'BouaInLayer';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      stroke: new StrokeStyle({
-        color: 'rgb(161,166,211)',
-        width: 7,
-      }),
-      zIndex: zindex2d.sx,
-    });
-    this._style2 = new Style({
-      stroke: new StrokeStyle({
-        color: 'rgb(137,137,137)',
-        width: 1.5,
-        lineDash: [15,5,3,5],
-      }),
-      zIndex: zindex2d.sx,
-    });
-  }
-
-  getLayerName() {
-    return BouaInLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const hlData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/xianfeng/boua_In.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features
-        // .filter(o => o.geometry.coordinates.length > 1)
-        .map(({ properties, geometry }) => ({
-          ...properties,
-          geometry,
-          name: properties.name || properties.Name,
-          pname: properties.projName,
-          id: properties.FID,
-        })))
-      .catch(() => []);
-    return hlData;
-  }
-
-  styleFunc = () => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    return [
-      this._style1,
-      this._style2]
-      ;
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/BouaLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/BouaLayer2D.js
deleted file mode 100644
index 575957b..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/BouaLayer2D.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-
-export default class BouaLayer2D extends POILayer2D {
-  static LayerName = 'BouaLayer';
-
-  constructor(props) {
-    super({ ...props, rowKey: 'code' });
-
-    this._style0 = new Style({
-      zIndex: zindex2d.boua1,
-      stroke: new StrokeStyle({
-        color: 'rgba(22,227,200, 0.5)',
-        width: 3,
-      }),
-    });
-
-    this._style1 = new Style({
-      zIndex: zindex2d.boua2,
-      stroke: new StrokeStyle({
-        color: 'rgb(91,123,188,0.4)',//'rgba(122,227,200, 0.1)',
-        lineDash: [15,10,5,10],
-        width: 3,
-        opacity:0.5,
-      }),
-    });
-    this._style1Highlight = new Style({
-      zIndex: zindex2d.bouahighlight,
-      stroke: new StrokeStyle({
-        color: 'rgb(255, 0, 0,1)',
-        width: 2.5,
-      }),
-    });
-
-    this._styleLabel = {};
-
-    this.highlights = this.getHighlightMap();
-  }
-
-  getLayerName() {
-    return BouaLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const address = localStorage.getItem('address');
-    const a1 = await fetch(`${process.env.PUBLIC_URL}/data/geojson/macheng/县界.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({
-        ...o.properties,
-        geometry: o.geometry,
-        type: 'boua',
-        ADCD: `${o.properties.ADCD}000000000`.substr(0, 15)
-      })))
-      .catch(() => []);
-    //console.log("a1++++",a1);
-
-    return [...a1];
-  }
-
-  styleFunc = ({ props }) => {
-    if (this.highlights[props.code]) {
-      return this._style1Highlight;
-    }
-    if (!this.isVisible()) {
-      return null;
-    }
-    if (props.type === 'label') {
-      return this._styleLabel[props.code];
-    }
-    if (props.type === 'xj') {
-      return this._style0;
-    }else {
-      return this._style1;
-    }
-  }
-
-  setSetting(setting) {
-    if (setting?.highlight?.BouaLayer !== this._setting?.highlight?.BouaLayer) {
-      this.highlights = this.getHighlightMap(setting?.highlight);
-      this.redrawLayer();
-    }
-
-    this._setting = setting;
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/BouaOutLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/BouaOutLayer2D.js
deleted file mode 100644
index 5e3f213..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/BouaOutLayer2D.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import {config} from "../../../../../config";
-
-export default class BouaOutLayer2D extends POILayer2D {
-  static LayerName = 'BouaOutLayer';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      stroke: new StrokeStyle({
-        color: 'rgb(161,166,211)',
-        width: 7,
-      }),
-      zIndex: zindex2d.sx,
-    });
-    this._style2 = new Style({
-      stroke: new StrokeStyle({
-        color: 'rgb(78,78,78)',
-        width: 1.5,
-        lineDash: [15,5,3,5],
-      }),
-      zIndex: zindex2d.sx,
-    });
-  }
-
-  getLayerName() {
-    return BouaOutLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const hlData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/xianfeng/boua_Out.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features
-        // .filter(o => o.geometry.coordinates.length > 1)
-        .map(({ properties, geometry }) => ({
-          ...properties,
-          geometry,
-          name: properties.name || properties.Name,
-          pname: properties.projName,
-          id: properties.FID,
-        })))
-      .catch(() => []);
-    return hlData;
-  }
-
-  styleFunc = () => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    return [this._style1,this._style2];
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/BouaOutsideLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/BouaOutsideLayer2D.js
deleted file mode 100644
index 94ca11a..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/BouaOutsideLayer2D.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-
-export default class BouaOutsideLayer2D extends POILayer2D {
-  static LayerName = 'BouaOutsideLayer';
-
-  constructor(props) {
-    super({ ...props, rowKey: 'code' });
-
-    this._style0 = new Style({
-      zIndex: zindex2d.boua1,
-      stroke: new StrokeStyle({
-        color: 'rgba(22,227,200, 0.5)',
-        width: 3,
-      }),
-    });
-
-    this._style1 = new Style({
-      zIndex: zindex2d.boua2,
-      stroke: new StrokeStyle({
-        color: '#bfbfbf',
-        width: 1,
-      }),
-    });
-    this._style1Highlight = new Style({
-      zIndex: zindex2d.bouahighlight,
-      stroke: new StrokeStyle({
-        color: 'rgb(255, 0, 0)',
-        width: 2.5,
-      }),
-    });
-
-    this._styleLabel = {};
-
-    this.highlights = this.getHighlightMap();
-  }
-
-  getLayerName() {
-    return BouaOutsideLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const a1 = await fetch(`${process.env.PUBLIC_URL}/data/geojson/xianfeng/bouaOther.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({
-        ...o.properties,
-        geometry: o.geometry,
-        type: 'boua',
-        ADCD: `${o.properties.ADCD}000000000`.substr(0, 15)
-      })))
-      .catch(() => []);
-
-    //console.log("a1++++",a1);
-
-    return [...a1];
-  }
-
-  styleFunc = ({ props }) => {
-    if (this.highlights[props.code]) {
-      return this._style1Highlight;
-    }
-    if (!this.isVisible()) {
-      return null;
-    }
-    return this._style1;
-  }
-
-  setSetting(setting) {
-    if (setting?.highlight?.BouaOutsideLayer !== this._setting?.highlight?.BouaOutsideLayer) {
-      this.highlights = this.getHighlightMap(setting?.highlight);
-      this.redrawLayer();
-    }
-
-    this._setting = setting;
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/HL2Layer2D.js b/src/views/Home/MapCtrl/M2D/layers/HL2Layer2D.js
deleted file mode 100644
index e8ec922..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/HL2Layer2D.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import FillStyle from "ol/style/Fill";
-import { Text } from 'ol/style';
-import { Fill } from "ol/style.js";
-import Stroke from "ol/style/Stroke";
-import {config} from "../../../../../config";
-
-export default class HL2Layer2D extends POILayer2D {
-  static LayerName = 'HL2Layer';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      stroke: new StrokeStyle({
-        color: '#0070ff',
-        width: 2,
-      }),
-      zIndex: zindex2d.sx,
-    });
-
-    this._style2 = new Style({
-      // stroke: new StrokeStyle({
-      //   color: 'rgba(122,227,200, 1)',
-      //   width: 2,
-      // }),
-      fill: new FillStyle({
-        color: '#bfdafc',//'rgba(0,161,233)',
-      }),
-      zIndex: zindex2d.sx,
-    })
-  }
-
-  getLayerName() {
-    return HL2Layer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const hlData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/macheng/hl2.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features
-        // .filter(o => o.geometry.type === 'LineString' && o.geometry.coordinates.length > 1)
-        .map(({ properties, geometry }) => ({
-          ...properties,
-          geometry,
-          name: properties.name || properties.Name,
-          pname: properties.projName,
-          id: properties.FID, 
-        })))
-      .catch(() => []);
-    return hlData;
-  }
-
-  styleFunc = (e) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    return this._style2;
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/HLLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/HLLayer2D.js
deleted file mode 100644
index f8209a2..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/HLLayer2D.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { Text } from 'ol/style';
-import { Fill } from "ol/style.js";
-import { zindex2d } from "../../zindex";
-import {config} from "../../../../../config";
-
-export default class HLLayer2D extends POILayer2D {
-  static LayerName = 'HLLayer';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      stroke: new StrokeStyle({
-        color: '#0070ff',
-        width: 3,
-      }),
-      // text: new Text(({
-      //   // 位置
-      //   textAlign: 'center',
-      //   // 基准线
-      //   textBaseline: 'middle',
-      //   // 文字样式 
-      //   font: 'bold 12px 微软雅黑',
-      //   // 文本内容
-      //   text: '我是河流',
-      //   // 文字颜色
-      //   fill: new Fill({ color: 'red' }),
-      //   // 文字背景
-      //   // stroke: new Stroke({ color: '#ffcc33', width: 10 })
-      // })),
-      zIndex: zindex2d.sx,
-    });
-    this._style2 = new Style({
-
-    })
-
-  }
-  getStyle(RVNM,LEVEL){
-
-    const myLevel = {
-      '1':2,
-      '2':1.6,
-      '3':1.1,
-      '4':0.89,
-      '5':0.6,
-      '6':0.4,
-      '7':0.3,
-      // '8':0.2,
-      // '9':0.1,
-      // '10':0.1,
-      // '11':0.1,
-      // '12':0.1,
-      // '13':0.1,
-      '8':0.3,
-      '9':0.3,
-      '10':0.3,
-      '11':0.3,
-      '12':0.3,
-      '13':0.3,
-    }[LEVEL]
-
-    return new Style({
-      stroke: new StrokeStyle({
-        color: '#bfdafc',//'rgba(0,161,233)',
-        width: (myLevel||0.3)*2,
-      }),
-      // text: new Text(({
-      //   // 位置
-      //   textAlign: 'center',
-      //   // 基准线
-      //   textBaseline: 'middle',
-      //   // 文字样式
-      //   font: 'bold 10px 微软雅黑',
-      //   // 文本内容
-      //   text: `${RVNM||''}`,
-      //   // 文字颜色
-      //   fill: new Fill({ color: 'rgba(0,0,0,0.2)' }),
-      //   // 文字背景
-      //   // stroke: new Stroke({ color: '#ffcc33', width: 10 })
-      // })),
-      zIndex: zindex2d.sx,
-    });
-  }
-
-  getLayerName() {
-    return HLLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const hlData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/macheng/hl.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features
-        // .filter(o => o.geometry.coordinates.length > 1)
-        .map(({ properties, geometry }) => ({
-          ...properties,
-          geometry,
-          name: properties.name || properties.Name,
-          pname: properties.projName,
-          id: properties.FID,
-        }))
-        )
-      .catch(() => []);
-    return hlData;
-  }
-
-  styleFunc = (e) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    const RVNM = e.props.RVNM
-    const LEVEL = e.props.LEVEL || e.props.LEVLE
-    return this.getStyle(RVNM,LEVEL);
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/HLLayer2D2.js b/src/views/Home/MapCtrl/M2D/layers/HLLayer2D2.js
deleted file mode 100644
index e57b13b..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/HLLayer2D2.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { Text } from 'ol/style';
-import { Fill } from "ol/style.js";
-import { zindex2d } from "../../zindex";
-import {config} from "../../../../../config";
-
-export default class HLLayer2D2 extends POILayer2D {
-  static LayerName = 'HLLayer2';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      stroke: new StrokeStyle({
-        color: '#0070ff',
-        width: 3,
-      }),
-      // text: new Text(({
-      //   // 位置
-      //   textAlign: 'center',
-      //   // 基准线
-      //   textBaseline: 'middle',
-      //   // 文字样式 
-      //   font: 'bold 12px 微软雅黑',
-      //   // 文本内容
-      //   text: '我是河流',
-      //   // 文字颜色
-      //   fill: new Fill({ color: 'red' }),
-      //   // 文字背景
-      //   // stroke: new Stroke({ color: '#ffcc33', width: 10 })
-      // })),
-      zIndex: zindex2d.sx,
-    });
-    this._style2 = new Style({
-      
-    })
-
-  }
-  getStyle(RVNM,LEVEL){
-
-    const myLevel = {
-      '1':2,
-      '2':1.6,
-      '3':1.1,
-      '4':0.89,
-      '5':0.6,
-      '6':0.4,
-      '7':0.3,
-      '8':0.2,
-      '9':0.1,
-      '10':0.1,
-      '11':0.1,
-      '12':0.1,
-      '13':0.1,
-    }[LEVEL]
-
-    return new Style({
-      stroke: new StrokeStyle({
-        color: 'rgba(0,161,233)',
-        width: (myLevel||0.1),
-      }),
-      // text: new Text(({
-      //   // 位置
-      //   textAlign: 'center',
-      //   // 基准线
-      //   textBaseline: 'middle',
-      //   // 文字样式
-      //   font: 'bold 10px 微软雅黑',
-      //   // 文本内容
-      //   text: `${RVNM||''}`,
-      //   // 文字颜色
-      //   fill: new Fill({ color: 'rgba(0,0,0,0.2)' }),
-      //   // 文字背景
-      //   // stroke: new Stroke({ color: '#ffcc33', width: 10 })
-      // })),
-      zIndex: zindex2d.sx,
-    });
-  }
-
-  getLayerName() {
-    return HLLayer2D2.LayerName;
-  }
-
-  async dataPromise() {
-    const hlData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/macheng/hl.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features
-        // .filter(o => o.geometry.coordinates.length > 1)
-        .map(({ properties, geometry }) => ({
-          ...properties,
-          geometry,
-          name: properties.name || properties.Name,
-          pname: properties.projName,
-          id: properties.FID,
-        }))
-        )
-      .catch(() => []);
-    return hlData;
-  }
-
-  styleFunc = (e) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    const RVNM = e.props.RVNM
-    const LEVEL = e.props.LEVEL
-    return this.getStyle(RVNM,LEVEL);
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/OfflineMap2D.js b/src/views/Home/MapCtrl/M2D/layers/OfflineMap2D.js
deleted file mode 100644
index c3232ff..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/OfflineMap2D.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-
-export default class OfflineMap2D extends POILayer2D {
-  static LayerName = 'OfflineMap';
-
-  constructor(props) {
-    super({ ...props, rowKey: 'code' });
-
-    this.highlights = this.getHighlightMap();
-  }
-
-  getLayerName() {
-    return OfflineMap2D.LayerName;
-  }
-
-  async dataPromise() {
-
-    return [];
-  }
-
-  styleFunc = ({ props }) => {
-    return null;
-  }
-
-  setSetting(setting) {
-
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/POILayer2D.js b/src/views/Home/MapCtrl/M2D/layers/POILayer2D.js
deleted file mode 100644
index d1a1972..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/POILayer2D.js
+++ /dev/null
@@ -1,460 +0,0 @@
-import BaseLayer2D from "./baselayer2d";
-import * as proj from 'ol/proj';
-import Point from 'ol/geom/Point';
-import Feature from 'ol/Feature';
-import VectorSource from 'ol/source/Vector';
-import VectorLayer from 'ol/layer/Vector';
-import GeoJSONFormat from 'ol/format/GeoJSON';
-import { zindex2d } from "../../zindex";
-import Style from "ol/style/Style";
-import FillStyle from "ol/style/Fill";
-import TileLayer from 'ol/layer/Tile';
-import WMTS, { optionsFromCapabilities } from 'ol/source/WMTS';
-import WMTSCapabilities from 'ol/format/WMTSCapabilities';
-import { getWktData } from "../../../../../models/_/base";
-
-import TileImage from 'ol/source/TileImage';
-import Tile from 'ol/layer/Tile';
-import XYZSource from 'ol/source/XYZ';
-
-import polylabel from "polylabel";
-import TextStyle from "ol/style/Text";
-import StrokeStyle from "ol/style/Stroke";
-import Mask from "ol-ext/filter/Mask";
-import { GeoJSON } from "ol/format";
-import { Fill } from "ol/style";
-
-const transformFn = proj.getTransform('EPSG:4326', 'EPSG:900913');
-
-function isIPAddress(url) {
-  // 匹配 IPv4 地址的正则表达式
-  var ipv4Pattern = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
-  // 匹配 IPv6 地址的正则表达式
-  var ipv6Pattern = /^([0-9a-fA-F]{1,4}:){7}([0-9a-fA-F]{1,4})$/;
-
-  return ipv4Pattern.test(url) || ipv6Pattern.test(url);
-}
-
-
-function calLabel(f, field, geojson) {
-  const geometry = f.geometry;
-  const label = f?.properties?.[field];
-  if (!label) {
-    return;
-  }
-  let coords = [];
-  if (geometry.type === 'Polygon') {
-    if (geometry.coordinates?.length) {
-      coords.push(geometry.coordinates);
-    }
-  } else if (geometry.type === 'MultiPolygon') {
-    for (const p of geometry.coordinates) {
-      if (p?.length) {
-        coords.push(p);
-      }
-    }
-  }
-  for (const c of coords) {
-    // var p = polylabel(c, 1.0); 这里临时修改 有时会卡住
-    // var p = polylabel([c[0][0]], 1.0);
-    // if (Array.isArray(p) && p[0] && p[1]) {
-    //   geojson.features.push({
-    //     type: 'Feature',
-    //     properties: { value: label },
-    //     geometry: {
-    //       type: 'Point',
-    //       coordinates: p,
-    //     }
-    //   })
-    // }
-  }
-}
-
-export default class POILayer2D extends BaseLayer2D {
-  constructor(props) {
-    super(props);
-
-    this._rawlayers.push(new VectorLayer({
-      source: new VectorSource({ wrapX: false }),
-      style: this._styleFunc,
-      zIndex: props.zIndex || zindex2d.default,
-      visible: true,
-      name: this.getLayerName(),
-    }));
-    this.rowKey = props.rowKey || Math.random();
-    this._loading = false;
-
-    this._styleLabel = {};
-
-    this._map = null;
-  }
-
-  setVisible(val) {
-    const changed = val !== this.isVisible();
-    super.setVisible(val);
-    if (changed) {
-      this.redrawLayer();
-    }
-
-    if (this._map && this.getLayerName() === "OfflineMap") {
-      this._map.getLayers().getArray().forEach((layer) => {
-        //离线地图
-        if (layer.values_.name === "OfflineMapWmts") {
-          layer.setVisible(val);
-        }
-      });
-    }
-
-    if (this._map && this.getLayerName() === "SatelliteImage") {
-      this._map.getLayers().getArray().forEach((layer) => {
-        //卫星影像
-        if (layer.values_.name === "SatelliteImage") {
-          layer.setVisible(val);
-        }
-      });
-    }
-
-  }
-
-  handleData(data, label) {
-    if (!data) {
-      data = { type: 'FeatureCollection', features: [] };
-    }
-
-    const features = data.features || [];
-
-    if (features.length > 0) {
-      features.forEach(o => {
-        this._styleC[o.properties.z1] = new Style({
-          stroke: new StrokeStyle({
-            color: 'rgb(0, 0, 0, 0.1)',
-            width: 1,
-          }),
-          fill: new FillStyle({
-            color: o.properties.fill,
-            // color: "#fff",
-          }),
-          //zIndex: zindex2d.sx,
-        });
-      });
-    }
-
-    const labelObj = { type: 'FeatureCollection', features: [] };
-    for (const f of features) {
-      calLabel(f, label, labelObj);
-    }
-
-    let newArray = [];
-    if (labelObj.features.length > 0) {
-      labelObj.features.map(o => {
-        newArray.push(
-          {
-            "NAME": o.properties.value,
-            "level": 3,
-            "lgtd": o.geometry.coordinates[0],
-            "lttd": o.geometry.coordinates[1],
-            "type": "label"
-          }
-        );
-      });
-    }
-
-    const labelData = newArray;
-
-    if (labelData.length > 0) {
-      labelData.forEach(o => {
-        this._styleLabel[o.NAME] = new Style({
-          text: new TextStyle({
-            text: o.NAME,
-            font: 'bold 14px 微软雅黑',
-            fill: new FillStyle({ color: '#000' }),
-            stroke: new StrokeStyle({ color: '#fff', width: 1 }),
-            overflow: true,
-            zIndex: o.level,
-          }),
-        })
-      });
-    };
-
-    return [...features, ...labelData];
-  }
-
-  /**
-   * 读取数据并设置数据源
-   */
-  loadData(cData, map) {
-    //console.log('load Data:' + this.getLayerName());
-    if (this._loading) {
-      return;
-    }
-    this._loading = true;
-    if (this.getLayerName() === "ContourLayer" || this.getLayerName() === "ContourLayerLoop") {
-      //console.log("85",this.getLayerName());
-      this._loading = false;
-      //console.log("POILayer2D.js 146++++++++++",cData);
-      const { shp, shps, index, label } = cData || {};
-      let data = shp || (shps || [])[index];
-
-      let records = this.handleData(data, label);
-
-      map.addLayer(this._rawlayers[0]);
-      this.setDataLoop(records, map);
-
-    } else {
-      //console.log("141",this.getLayerName());
-      this.dataPromise().then((data) => {
-        this._loading = false;
-        this.setData(data);
-      });
-    }
-  }
-
-  /*loadData(cData, map) {
-    //console.log('load Data:' + this.getLayerName());
-    if (this._loading) {
-      return;
-    }
-    this._loading = true;
-
-    this.dataPromise().then((data) => {
-      this._loading = false;
-
-      this.setData(data,map);
-    });
-  }*/
-
-  setData(records) {
-    if (!Array.isArray(records)) {
-      return;
-    }
-
-    this.beforeSetData();
-
-    const source = this._rawlayers[0].getSource();
-    source.clear();
-
-    const features = [];
-    const geojsonFormat = new GeoJSONFormat();
-    for (const props of records) {
-      const { lgtd, lttd, ...info } = props;
-      let geometry;
-      if (typeof lttd === 'number' && typeof lgtd === 'number') {
-        geometry = new Point([lgtd, lttd]);
-        geometry.applyTransform(transformFn);
-      } else if (info.geometry) {
-        geometry = geojsonFormat.readGeometry(info.geometry, {
-          featureProjection: 'EPSG:3857',
-        });
-      }
-
-      if (!geometry) {
-        continue;
-      }
-
-      const feature = new Feature({
-        geometry,
-        data: props,
-        layerName: this.getLayerName(),
-        id: Math.random()
-      });
-
-      features.push(feature);
-    }
-
-    source.addFeatures(features);
-  }
-
-
-  handleFeatureData(data) {
-    //console.log("handleData",data);
-    const features = [];
-    const geojsonFormat = new GeoJSONFormat();
-    for (const props of data) {
-      const { lgtd, lttd, ...info } = props;
-      let geometry;
-      if (typeof lttd === 'number' && typeof lgtd === 'number') {
-        geometry = new Point([lgtd, lttd]);
-        geometry.applyTransform(transformFn);
-      } else if (info.geometry) {
-        geometry = geojsonFormat.readGeometry(info.geometry, {
-          featureProjection: 'EPSG:3857',
-        });
-      }
-
-      if (!geometry) {
-        continue;
-      }
-
-      const feature = new Feature({
-        geometry,
-        data: props,
-        layerName: this.getLayerName(),
-      });
-
-      features.push(feature);
-    }
-
-    return features
-  }
-
-  setDataLoop(records, map) {
-    if (!Array.isArray(records)) {
-      return;
-    }
-
-    let features = this.handleFeatureData(records);
-
-    let targetLayer = null;
-    let that = this;
-
-    let hasLoopLayer = false;
-    map.getLayers().getArray().forEach(layer => {
-      if (layer === that._rawlayers[0]) {
-        targetLayer = layer;
-        hasLoopLayer = true;
-      }
-    });
-
-    if (hasLoopLayer) {
-      targetLayer.getSource().addFeatures(features);
-    }
-  }
-
-  /**
-   * 图层的样式函数，此方法不能继承覆盖
-   */
-  _styleFunc = (feature, res) => {
-    const props = feature.get('data');
-    const geometry = feature.getGeometry();
-    const lod = this.getLod(res);
-
-    return this.styleFunc({
-      props,
-      lod,
-      res,
-      geometry,
-    });
-  }
-
-  getLod() {
-    return 0;
-  }
-
-  styleFunc = ({ props, lod, res, geometry }) => {
-    return null;
-  }
-
-  beforeSetData() { }
-
-  onAdd(map, contourLayerData) {
-    super.onAdd(map);
-
-    this._map = map;
-
-    if (this.getLayerName() === "ContourLayer" || this.getLayerName() === "ContourLayerLoop") {
-      this.loadData(contourLayerData, map);
-    } else {
-      let urlAddress = window.location.href;
-
-      let mapUrl = "";
-
-      if (isIPAddress(urlAddress)) {//是一个 IP 地址
-        mapUrl = "http://223.75.53.141:911{0-7}";
-      } else {
-        if (urlAddress.indexOf("https") !== -1) {
-          mapUrl = "https://slt-sh.chutianyun.gov.cn:1443";
-        } else {
-          mapUrl = "http://223.75.53.141:911{0-7}";
-        }
-      }
-
-      //console.log("@@@@  mapUrl",mapUrl);
-
-      const superMapLayer = new Tile({
-        source: new XYZSource({
-          // url: mapUrl + "/iserver/services/map-ugcv5-YXDOM3857/rest/maps/YXDOM_20230704/zxyTileImage.png?z={z}&x={x}&y={y}&width=256&height=256"
-          // url: "https://t{0-7}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=efc861f25f96dc6e5f884f0403ebfefd"
-        }),
-        name: "OfflineMapWmts",
-        maxZoom: 20,
-      });
-
-      if (this.getLayerName() === "OfflineMap") {
-        //遮罩
-        getWktData().then((wkt) => {
-          console.log(wkt, 2222)
-          var mask2 = new Mask({
-            feature: new GeoJSON().readFeature(wkt[0], {
-              dataProjection: 'EPSG:4326', // json的坐标系
-              featureProjection: 'EPSG:3857', // 当前地图使用的坐标系
-            }),
-            wrapX: true,
-            inner: false,
-            fill: new Fill({
-              color: "rgb(236, 242, 249)",
-              // color: "#fff"
-            }),
-            //fill: new Fill({ color: 'rgba(220,240,253,0.6)' }),
-          });
-          superMapLayer.addFilter(mask2);
-
-          map.addLayer(superMapLayer);
-
-          //wmts
-          /*const url =
-            'http://223.75.53.141:911{0-7}/iserver/services/map-YXFW/wmts100';
-          fetch(url)
-            .then(function (response) {
-              return response.text();
-            })
-            .then(function (text) {
-              const result = parser.read(text);
-              console.log("WMTS result 342+++++",result);
-              const options = optionsFromCapabilities(result, {
-                layer: 'YXDOM',
-              });
-
-              options.crossOrigin = '';
-              options.projection = 'EPSG:4326';
-              options.wrapX = false;
-              options.layer = "OfflineMapWmts";
-
-              console.log("WMTS options 351+++++",options);
-
-              layers.setSource(new WMTS(options));
-
-              map.addLayer(layers);
-            });*/
-
-          // 创建TileImage图层
-          /*const superMapSource = new TileImage({
-            url: 'http://223.75.53.141:81/iserver/services/map-ugcv5-YXDOM3857/rest/maps/YXDOM_20230704', // 超图服务URL
-            attributions: '© <a href="http://www.supermap.com">SuperMap</a>'
-          });*/
-        });
-      }
-
-      // 监听指定图层的源的加载状态
-      if (superMapLayer.getSource().getState() === 'ready') {
-        this.loadData({}, map);
-      }
-
-    }
-  }
-
-  getFeature(id) {
-    const mainKey = this.rowKey;
-    if (!mainKey) {
-      return null;
-    }
-    const source = this._rawlayers[0].getSource();
-    const features = source.getFeatures();
-    for (const feature of features) {
-      const { data } = feature.getProperties();
-      if (data[mainKey] === id) {
-        return feature;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/RainLayer2D-radar.js b/src/views/Home/MapCtrl/M2D/layers/RainLayer2D-radar.js
deleted file mode 100644
index ae99b6a..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/RainLayer2D-radar.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import FillStyle from 'ol/style/Fill';
-import { zindex2d } from "../../zindex";
-import TextStyle from "ol/style/Text";
-import StrokeStyle from "ol/style/Stroke";
-
-export default class RainLayer2DRadar extends POILayer2D {
-  static LayerName = 'RainLayerRadar';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      fill: new FillStyle({
-        color: '#C7DFBB',
-      }),
-      zIndex: zindex2d.sx,
-    });
-
-    this._styleRain = {};
-  }
-
-  getLayerName() {
-    return RainLayer2DRadar.LayerName;
-  }
-
-  async dataPromise() {
-    const rainData = await fetch(`${process.env.PUBLIC_URL}/data/rainfallCenter/建始县20210812.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({ ...o.properties, geometry: o.geometry, type: 'rain1' })))
-      .catch(() => []);
-
-    rainData.forEach(o => {
-      this._styleRain[o.z1] = new Style({
-        fill: new FillStyle({
-          color: o.fill,
-        }),
-        zIndex: zindex2d.sx,
-      })
-    });
-
-    //return [...rainData];
-    return [];
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    return this._styleRain[props.z1];
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/RainLayer2D-rh.js b/src/views/Home/MapCtrl/M2D/layers/RainLayer2D-rh.js
deleted file mode 100644
index d686402..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/RainLayer2D-rh.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import FillStyle from 'ol/style/Fill';
-import { zindex2d } from "../../zindex";
-import TextStyle from "ol/style/Text";
-import StrokeStyle from "ol/style/Stroke";
-
-export default class RainLayer2DRh extends POILayer2D {
-  static LayerName = 'RainLayerRh';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      fill: new FillStyle({
-        color: '#C7DFBB',
-      }),
-      zIndex: zindex2d.sx,
-    });
-
-    this._styleRain = {};
-  }
-
-  getLayerName() {
-    return RainLayer2DRh.LayerName;
-  }
-
-  async dataPromise() {
-    const rainData = await fetch(`${process.env.PUBLIC_URL}/data/rainfallCenter/建始县20210811.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({ ...o.properties, geometry: o.geometry, type: 'rain1' })))
-      .catch(() => []);
-
-    rainData.forEach(o => {
-      this._styleRain[o.z1] = new Style({
-        fill: new FillStyle({
-          color: o.fill,
-        }),
-        zIndex: zindex2d.sx,
-      })
-    });
-
-    //return [...rainData];
-    return [];
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    return this._styleRain[props.z1];
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/RainLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/RainLayer2D.js
deleted file mode 100644
index 375cfef..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/RainLayer2D.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import FillStyle from 'ol/style/Fill';
-import { zindex2d } from "../../zindex";
-import TextStyle from "ol/style/Text";
-import StrokeStyle from "ol/style/Stroke";
-import {BouaPromise} from "../../../../../models/_/base";
-import {config} from "../../../../../config";
-import {calWeatherContour24H} from "../../../../../models/rcview/calculator";
-import polylabel from "polylabel";
-import {useSelector} from "react-redux";
-
-export function wait(tm) {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve(true);
-    }, tm || 0);
-  });
-}
-
-function calLabel(f, field, geojson) {
-  const geometry = f.geometry;
-  const label = f?.properties?.[field];
-  if (!label) {
-    return;
-  }
-  let coords = [];
-  if (geometry.type === 'Polygon') {
-    if (geometry.coordinates?.length) {
-      coords.push(geometry.coordinates);
-    }
-  } else if (geometry.type === 'MultiPolygon') {
-    for (const p of geometry.coordinates) {
-      if (p?.length) {
-        coords.push(p);
-      }
-    }
-  }
-  for (const c of coords) {
-    var p = polylabel(c, 1.0);
-    if (Array.isArray(p) && p[0] && p[1]) {
-      geojson.features.push({
-        type: 'Feature',
-        properties: { value: label },
-        geometry: {
-          type: 'Point',
-          coordinates: p,
-        }
-      })
-    }
-  }
-}
-
-export default class RainLayer2D extends POILayer2D {
-  static LayerName = 'RainLayer';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      fill: new FillStyle({
-        color: '#C7DFBB',
-      }),
-      zIndex: zindex2d.sx,
-    });
-
-    this._styleRain = {};
-
-    this._styleLabel = {};
-  }
-
-  getLayerName() {
-    return RainLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    /*const rainData = await fetch(`${process.env.PUBLIC_URL}/data/rainfallCenter/建始县20210810.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({ ...o.properties, geometry: o.geometry, type: 'rain' })))
-      .catch(() => []);*/
-
-    /*const filename = "Z_QPF_20210718083000.F120.bin.bz2";
-    const extent = config.extent;
-    const strextent = `x1=${extent[0]}&y1=${extent[1]}&x2=${extent[2]}&y2=${extent[3]}`;
-
-    const url = `/service1/res/radarlayer?filename=${filename}&${strextent}`;
-    const rainData = await fetch(url).then(resp => resp.json()).then(data => data.data);*/
-
-    /*const progress = (idx) => {
-      this._dispatch.runtime.setCalculating([idx, 25]);
-      return wait(100);
-    }
-
-    await progress(0);*/
-    /*const result = await calWeatherContour24H();
-    //console.log("60------",result);
-    const { shp, shps, index, label } = result || {};
-    let data = shp || (shps || [])[index];
-
-    data.features.forEach(o => {
-      this._styleRain[o.properties.z1] = new Style({
-        fill: new FillStyle({
-          color: o.properties.fill,
-        }),
-        //zIndex: 2,
-      });
-    });
-
-    const features = data.features || [];
-    const labelObj = { type: 'FeatureCollection', features: [] };
-    for (const f of features) {
-      calLabel(f, label, labelObj);
-    }
-    //console.log("labelObj",labelObj);
-    let newArray = [];
-    if(labelObj.features.length>0){
-      labelObj.features.map(o=>{
-        newArray.push(
-          {
-            "NAME": o.properties.value,
-            "level": 5,
-            "lgtd": o.geometry.coordinates[0],
-            "lttd": o.geometry.coordinates[1],
-            "type": "label"
-          }
-        );
-      });
-    }
-
-    const labelData = newArray;
-    if(labelData.length>0){
-      labelData.forEach(o => {
-        this._styleLabel[o.NAME] = new Style({
-          text: new TextStyle({
-            text: o.NAME,
-            font: 'bold 14px 微软雅黑',
-            fill: new FillStyle({ color: '#000' }),
-            stroke: new StrokeStyle({ color: '#fff', width: 1 }),
-            overflow: true,
-            zIndex: o.level,
-          }),
-        })
-      });
-    };
-
-
-    //console.log("72------",data.features);
-    return [...data.features,...labelData];*/
-    return [];
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    if (props.type === 'label') {
-      return this._styleLabel[props.NAME];
-    }else{
-      return this._styleRain[props.properties.z1];
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/SatelliteImage2D.js b/src/views/Home/MapCtrl/M2D/layers/SatelliteImage2D.js
deleted file mode 100644
index 6d66d10..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/SatelliteImage2D.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-
-export default class SatelliteImage2D extends POILayer2D {
-  static LayerName = 'SatelliteImage';
-
-  constructor(props) {
-    super({ ...props, rowKey: 'code' });
-
-    this.highlights = this.getHighlightMap();
-  }
-
-  getLayerName() {
-    return SatelliteImage2D.LayerName;
-  }
-
-  async dataPromise() {
-
-    return [];
-  }
-
-  styleFunc = ({ props }) => {
-    return null;
-  }
-
-  setSetting(setting) {
-
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/WxqLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/WxqLayer2D.js
deleted file mode 100644
index 6b4a825..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/WxqLayer2D.js
+++ /dev/null
@@ -1,222 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import FillStyle from "ol/style/Fill";
-import Icon from "ol/style/Icon";
-import { DcpjPromise } from '../../../../../models/_/dcpj';
-import { geometryCenter, geometryBound } from '../../../../../utils/tools';
-
-export default class WxqLayer2D extends POILayer2D {
-  static LayerName = 'Dcpj_' + this._type + 'Layer';
-
-  constructor(props, type) {
-    super(props);
-
-    this._style1 = {};
-
-    this._type = type;
-  }
-
-  getLayerName() {
-    //return WxqLayer2D.LayerName;
-    return 'Dcpj_' + this._type + 'Layer';
-  }
-
-  async dataPromise() {
-    const WXQData = await DcpjPromise(this._type);
-    //console.log("WXQData",WXQData);
-    //danad:危险区
-    if(this._type === "danad"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          stroke: new StrokeStyle({
-            color: '#da6361',
-            width: 2,
-          }),
-          fill: new FillStyle({
-            color: 'rgba(218,99,97,0.5)',
-          }),
-          zIndex: zindex2d.sx,
-        })
-      });
-    }
-    //placement:安置点
-    if(this._type === "placement"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/azd1.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.9,
-          }),
-        })
-      });
-    }
-    //transfer:转移路线
-    if(this._type === "transfer"){
-      this._style1 = new Style({
-        stroke: new StrokeStyle({
-          color: 'yellow',
-          width: 2,
-        }),
-        zIndex: zindex2d.sx,
-      })
-    }
-    //flrvvlg:沿河居民户
-    if(this._type === "flrvvlg"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/yhjmh.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.6,
-          }),
-        })
-      });
-    }
-    //bsnssinfo:企事业单位
-    if(this._type === "bsnssinfo"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/qsydw.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.6,
-          }),
-        })
-      });
-    }
-    //bridge:桥梁
-    if(this._type === "bridge"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/ql.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.6,
-          }),
-        })
-      });
-    }
-    //culvert:路涵
-    if(this._type === "culvert"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/lh.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.7,
-          }),
-        })
-      });
-    }
-    //sluice:水闸
-    if(this._type === "sluice"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/sz.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.7,
-          }),
-        })
-      });
-    }
-    //daminfo:塘(堰)坝
-    if(this._type === "daminfo"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/tyb.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.7,
-          }),
-        })
-      });
-    }
-    //dike:堤防
-    if(this._type === "dike"){
-      var lightStroke = new Style({
-        stroke: new StrokeStyle({
-          color: "#C971E8",
-          width: 20,
-          lineDash: [10,40],
-          lineDashOffset: 6,
-          lineCap:"butt"
-        })
-      });
-
-      var darkStroke = new Style({
-        stroke: new StrokeStyle({
-          color: "#C971E8",
-          width: 2,
-          lineDash: [40,10],
-        })
-      });
-
-      WXQData.forEach(o => {
-        this._style1 = [lightStroke, darkStroke]
-      });
-    }
-    //wbrinfo:无线预警广播
-    if(this._type === "wbrinfo"){
-      WXQData.forEach(o => {
-        this._style1 = new Style({
-          image: new Icon({
-            src: require("../../../../../assets/icons/gb.png"),
-            anchor: [0.5, 0.5],
-            opacity: 1,
-            scale: 0.7,
-          }),
-        })
-      });
-    }
-
-    return [...WXQData];
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    //console.log(props);
-    return this._style1;
-  }
-
-  onFeatureClicked(feature, dispatch) {
-    const { data } = feature.getProperties();
-    if (data) {
-      if(this._type !== "danad" && this._type !== "transfer" && this._type !== "dike"){
-        dispatch.runtime.setFeaturePop({
-          id: data.ADCD,
-          type: this._type,
-          data,
-          lgtd: data.lgtd,
-          lttd: data.lttd,
-          elev: data.elev,
-        })
-      }else{
-        const bbox = geometryBound(data.geometry);
-        const center = geometryCenter(data.geometry);
-        if (bbox && center) {
-          dispatch.runtime.setFeaturePop({
-            id: data.ADCD,
-            type: this._type,
-            data,
-            lgtd: center[0],
-            lttd: center[1],
-            elev: center[2],
-          })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/XLYLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/XLYLayer2D.js
deleted file mode 100644
index e69f477..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/XLYLayer2D.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import FillStyle from "ol/style/Fill";
-import {config} from "../../../../../config";
-
-export default class XLYLayer2D extends POILayer2D {
-  static LayerName = 'XLYLayer';
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = {};
-    this._style2 = {};
-  }
-
-  getLayerName() {
-    return XLYLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    /*const XLYData1 = await fetch(`${process.env.PUBLIC_URL}/data/geojson/${localStorage.getItem('address')}/xly-lym1.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({ ...o.properties, geometry: o.geometry, type: 'ly1' })))
-      .catch(() => []);*/
-
-    const XLYData2 = await fetch(`${process.env.PUBLIC_URL}/data/geojson/${localStorage.getItem('address')}/xly-zlm.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({ ...o.properties, geometry: o.geometry, type: 'ly2' })))
-      .catch(() => []);
-
-    /*XLYData1.forEach(o => {
-      this._style1 = new Style({
-        stroke: new StrokeStyle({
-          color: '#da6361',
-          width: 2,
-        }),
-        zIndex: zindex2d.sx,
-      })
-    });*/
-    XLYData2.forEach(o => {
-      this._style2 = new Style({
-        stroke: new StrokeStyle({
-          color: '#2ca98a',
-          width: 2,
-        }),
-        fill: new FillStyle({
-          color: 'rgba(44,169,138,0.5)',
-        }),
-        zIndex: zindex2d.sx,
-      })
-    });
-
-    return [ ...XLYData2];
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    if (props.type === 'ly1') {
-      return this._style1;
-    } else {
-      return this._style2;
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/YsgcLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/YsgcLayer2D.js
deleted file mode 100644
index ab0782f..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/YsgcLayer2D.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-import FillStyle from "ol/style/Fill";
-import Icon from "ol/style/Icon";
-import { DcpjPromise } from '../../../../../models/_/dcpj';
-import Stroke from "ol/style/Stroke";
-import { Text } from 'ol/style';
-import { Fill } from "ol/style.js";
-import { geometryCenter, geometryBound } from '../../../../../utils/tools';
-
-export default class YsgcLayer2D extends POILayer2D {
-  static LayerName = 'YsgcLayer';
-
-  constructor(props, type) {
-    super(props);
-
-    this._style1 = {};
-
-    this._type = type;
-  }
-
-  getLayerName() {
-    return YsgcLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const WXQData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/xianfeng/ysgc.json`)
-        .then(resp => resp.json())
-        .then(data => data)
-        .catch(() => []);
-
-
-    var lightStroke = new Style({
-    stroke: new StrokeStyle({
-        color: "#bae637",
-        width: 20,
-        lineDash: [10,40],
-        lineDashOffset: 6,
-        lineCap:"butt"
-    }),
-    text: new Text(({
-      // 位置
-      textAlign: 'center',
-      // 基准线
-      textBaseline: 'middle',
-      // 文字样式
-      font: 'bold 14px 微软雅黑',
-      // 文本内容
-      text: `十咸引水渠道`,
-      // 文字颜色
-      fill: new Fill({ color: 'rgba(0,0,0,0.7)' }),
-      offsetX:(70),
-      // 文字背景
-      stroke: new Stroke({ color: '#fff', width: 1 })
-    })),
-    });
-
-    var darkStroke = new Style({
-    stroke: new StrokeStyle({
-        color: "#bae637",
-        width: 2,
-        lineDash: [40,10],
-    })
-    });
-
-    WXQData.forEach(o => {
-    this._style1 = [lightStroke, darkStroke]
-    });
-
-
-    return [...WXQData];
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-    //console.log(props);
-    return this._style1;
-  }
-
-  onFeatureClicked(feature, dispatch) {
-    const { data } = feature.getProperties();
-    if (data) {
-      const bbox = geometryBound(data.geometry);
-      const center = geometryCenter(data.geometry);
-      if (bbox && center) {
-        dispatch.runtime.setFeaturePop({
-          id: data.ADCD,
-          type: 'yinshuigongcheng',
-          data,
-          lgtd: center[0],
-          lttd: center[1],
-          elev: center[2],
-        })
-      }
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/baselayer2d.js b/src/views/Home/MapCtrl/M2D/layers/baselayer2d.js
deleted file mode 100644
index 396ed33..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/baselayer2d.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import BaseLayer from "../../baselayer";
-
-export default class BaseLayer2D extends BaseLayer {
-  constructor(props) {
-    super(props);
-
-    this._rawlayers = []; // openlayers的layer对象
-  }
-
-  getRawLayers() {
-    return this._rawlayers;
-  }
-
-  onAdd(/* map */) {
-  }
-
-  redrawLayer() {
-    for (const layer of this._rawlayers) {
-      layer.changed();
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/contourlayer.js b/src/views/Home/MapCtrl/M2D/layers/contourlayer.js
deleted file mode 100644
index adbb87c..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/contourlayer.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import clone from "clone";
-import polylabel from "polylabel";
-import POILayer2D from "./POILayer2D";
-import Style from "ol/style/Style";
-import FillStyle from "ol/style/Fill";
-import {zindex2d} from "../../zindex";
-
-const SourceName = '等值线';
-const LabelSourceName = '等值线Label'
-
-const ShapeStyle = {
-  id: SourceName,
-  type: 'fill-extrusion',
-  source: SourceName,
-  layout: {
-  },
-  paint: {
-    /*
-    'fill-extrusion-color': [
-      'case',
-      ['>', ['get', 'z1'], 0], ['get', 'fill'],
-      '#020315'
-    ],
-    */
-    'fill-extrusion-color': ['get', 'fill'],
-    'fill-extrusion-height': ['*', 50, ['get', 'z1']],
-    'fill-extrusion-opacity': 0.8,
-  },
-};
-const ShapeLabelStyle = {
-  id: LabelSourceName,
-  type: 'symbol',
-  source: LabelSourceName,
-  layout: {
-    'text-size': 12,
-    'text-font': ['Roboto Black'],
-    'text-field': ['get', 'value'],
-    // 'text-offset': [0, 0.6],
-    'text-anchor': 'center',
-    'text-max-width': 6
-  },
-  'paint': {
-    'text-color': '#000',
-    'text-halo-color': '#fff',
-    'text-halo-width': 1
-  }
-};
-
-
-function calLabel(f, field, geojson) {
-  const geometry = f.geometry;
-  const label = f?.properties?.[field];
-  if (!label) {
-    return;
-  }
-  let coords = [];
-  if (geometry.type === 'Polygon') {
-    if (geometry.coordinates?.length) {
-      coords.push(geometry.coordinates);
-    }
-  } else if (geometry.type === 'MultiPolygon') {
-    for (const p of geometry.coordinates) {
-      if (p?.length) {
-        coords.push(p);
-      }
-    }
-  }
-  for (const c of coords) {
-    var p = polylabel(c, 1.0);
-    if (Array.isArray(p) && p[0] && p[1]) {
-      geojson.features.push({
-        type: 'Feature',
-        properties: { value: label },
-        geometry: {
-          type: 'Point',
-          coordinates: p,
-        }
-      })
-    }
-  }
-}
-
-export default class ContourLayer extends POILayer2D {
-
-  static LayerName = 'ContourLayer';
-
-  static SourceName = SourceName;
-  static LabelSourceName = LabelSourceName;
-
-  constructor(props) {
-    super(props);
-
-    this._style1 = new Style({
-      fill: new FillStyle({
-        color: '#C7DFBB',
-      }),
-      zIndex: zindex2d.sx,
-    });
-
-    this._styleLabel = {};
-
-    this._styleC = {};
-  }
-
-  getLayerName() {
-    return ContourLayer.LayerName;
-  }
-
-  async dataPromise() {
-    /*const { shp, shps, index, label } = this._layerSettings?.contour || {};
-    let data = shp || (shps || [])[index];
-    if (!data) {
-      data = { type: 'FeatureCollection', features: [] };
-    }
-
-    console.log("ContourLayer",data);
-
-    return [data];*/
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-
-    if (props.type === 'label') {
-      return this._styleLabel[props.NAME];
-    }else{
-      return this._styleC[props.properties.z1];
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/contourlayerLoop.js b/src/views/Home/MapCtrl/M2D/layers/contourlayerLoop.js
deleted file mode 100644
index 33cd420..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/contourlayerLoop.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import clone from "clone";
-import polylabel from "polylabel";
-import POILayer2D from "./POILayer2D";
-import Style from "ol/style/Style";
-import FillStyle from "ol/style/Fill";
-import {zindex2d} from "../../zindex";
-import TextStyle from "ol/style/Text";
-import StrokeStyle from "ol/style/Stroke";
-
-const SourceName = '等值线';
-const LabelSourceName = '等值线Label'
-
-const ShapeStyle = {
-  id: SourceName,
-  type: 'fill-extrusion',
-  source: SourceName,
-  layout: {
-  },
-  paint: {
-    /*
-    'fill-extrusion-color': [
-      'case',
-      ['>', ['get', 'z1'], 0], ['get', 'fill'],
-      '#020315'
-    ],
-    */
-    'fill-extrusion-color': ['get', 'fill'],
-    'fill-extrusion-height': ['*', 50, ['get', 'z1']],
-    'fill-extrusion-opacity': 0.8,
-  },
-};
-const ShapeLabelStyle = {
-  id: LabelSourceName,
-  type: 'symbol',
-  source: LabelSourceName,
-  layout: {
-    'text-size': 12,
-    'text-font': ['Roboto Black'],
-    'text-field': ['get', 'value'],
-    // 'text-offset': [0, 0.6],
-    'text-anchor': 'center',
-    'text-max-width': 6
-  },
-  'paint': {
-    'text-color': '#000',
-    'text-halo-color': '#fff',
-    'text-halo-width': 1
-  }
-};
-
-
-function calLabel(f, field, geojson) {
-  const geometry = f.geometry;
-  const label = f?.properties?.[field];
-  if (!label) {
-    return;
-  }
-  let coords = [];
-  if (geometry.type === 'Polygon') {
-    if (geometry.coordinates?.length) {
-      coords.push(geometry.coordinates);
-    }
-  } else if (geometry.type === 'MultiPolygon') {
-    for (const p of geometry.coordinates) {
-      if (p?.length) {
-        coords.push(p);
-      }
-    }
-  }
-  for (const c of coords) {
-    var p = polylabel(c, 1.0);
-    if (Array.isArray(p) && p[0] && p[1]) {
-      geojson.features.push({
-        type: 'Feature',
-        properties: { value: label },
-        geometry: {
-          type: 'Point',
-          coordinates: p,
-        }
-      })
-    }
-  }
-}
-
-export default class ContourlayerLoop extends POILayer2D {
-
-  static LayerName = 'ContourLayerLoop';
-
-  static SourceName = SourceName;
-  static LabelSourceName = LabelSourceName;
-
-  constructor(props, map) {
-    super(props);
-    this._style1 = new Style({
-      fill: new FillStyle({
-        color: '#C7DFBB',
-      }),
-      zIndex: zindex2d.sx,
-    });
-
-    this._styleLabel = {};
-
-    this._styleC = {};
-
-    this._data = props.setting;
-  }
-
-  getLayerName() {
-    return ContourlayerLoop.LayerName;
-  }
-
-  async dataPromise() {
-    /*const { shp, shps, index, label } = this._data?.contour || {};
-    let data = shp || (shps || [])[index];
-    if (!data) {
-      data = { type: 'FeatureCollection', features: [] };
-    }
-
-    const features = data.features || [];
-
-    if(features.length>0){
-      features.forEach(o => {
-        this._styleC[o.properties.z1] = new Style({
-          fill: new FillStyle({
-            color: o.properties.fill,
-          }),
-          //zIndex: zindex2d.sx,
-        });
-      });
-    }
-
-    const labelObj = { type: 'FeatureCollection', features: [] };
-    for (const f of features) {
-      calLabel(f, label, labelObj);
-    }
-
-    let newArray = [];
-    if(labelObj.features.length>0){
-      labelObj.features.map(o=>{
-        newArray.push(
-          {
-            "NAME": o.properties.value,
-            "level": 3,
-            "lgtd": o.geometry.coordinates[0],
-            "lttd": o.geometry.coordinates[1],
-            "type": "label"
-          }
-        );
-      });
-    }
-
-    const labelData = newArray;
-
-    if(labelData.length>0){
-      labelData.forEach(o => {
-        this._styleLabel[o.NAME] = new Style({
-          text: new TextStyle({
-            text: o.NAME,
-            font: 'bold 14px 微软雅黑',
-            fill: new FillStyle({ color: '#000' }),
-            stroke: new StrokeStyle({ color: '#fff', width: 1 }),
-            overflow: true,
-            zIndex: o.level,
-          }),
-        })
-      });
-    };
-
-    return [...features,...labelData];*/
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-
-    if (props.type === 'label') {
-      return this._styleLabel[props.NAME];
-    }else{
-      return this._styleC[props.properties.z1];
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/flowAnalysisLayer.js b/src/views/Home/MapCtrl/M2D/layers/flowAnalysisLayer.js
deleted file mode 100644
index 23da574..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/flowAnalysisLayer.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import clone from "clone";
-import polylabel from "polylabel";
-import POILayer2D from "./POILayer2D";
-import Style from "ol/style/Style";
-import FillStyle from "ol/style/Fill";
-import {zindex2d} from "../../zindex";
-import TextStyle from "ol/style/Text";
-import StrokeStyle from "ol/style/Stroke";
-
-const SourceName = '等值线';
-const LabelSourceName = '等值线Label'
-
-const ShapeStyle = {
-  id: SourceName,
-  type: 'fill-extrusion',
-  source: SourceName,
-  layout: {
-  },
-  paint: {
-    /*
-    'fill-extrusion-color': [
-      'case',
-      ['>', ['get', 'z1'], 0], ['get', 'fill'],
-      '#020315'
-    ],
-    */
-    'fill-extrusion-color': ['get', 'fill'],
-    'fill-extrusion-height': ['*', 50, ['get', 'z1']],
-    'fill-extrusion-opacity': 0.8,
-  },
-};
-const ShapeLabelStyle = {
-  id: LabelSourceName,
-  type: 'symbol',
-  source: LabelSourceName,
-  layout: {
-    'text-size': 12,
-    'text-font': ['Roboto Black'],
-    'text-field': ['get', 'value'],
-    // 'text-offset': [0, 0.6],
-    'text-anchor': 'center',
-    'text-max-width': 6
-  },
-  'paint': {
-    'text-color': '#000',
-    'text-halo-color': '#fff',
-    'text-halo-width': 1
-  }
-};
-
-
-function calLabel(f, field, geojson) {
-  const geometry = f.geometry;
-  const label = f?.properties?.[field];
-  if (!label) {
-    return;
-  }
-  let coords = [];
-  if (geometry.type === 'Polygon') {
-    if (geometry.coordinates?.length) {
-      coords.push(geometry.coordinates);
-    }
-  } else if (geometry.type === 'MultiPolygon') {
-    for (const p of geometry.coordinates) {
-      if (p?.length) {
-        coords.push(p);
-      }
-    }
-  }
-  for (const c of coords) {
-    var p = polylabel(c, 1.0);
-    if (Array.isArray(p) && p[0] && p[1]) {
-      geojson.features.push({
-        type: 'Feature',
-        properties: { value: label },
-        geometry: {
-          type: 'Point',
-          coordinates: p,
-        }
-      })
-    }
-  }
-}
-
-export default class FlowAnalysisLayer extends POILayer2D {
-
-  static LayerName = 'FlowAnalysisLayer';
-
-  static SourceName = SourceName;
-
-  constructor(props, map) {
-    super(props);
-    this._style1 = new Style({
-      fill: new FillStyle({
-        color: '#C7DFBB',
-      }),
-      zIndex: zindex2d.sx,
-    });
-
-    this._styleLabel = {};
-
-    this._styleC = {};
-
-    this._data = props.setting;
-  }
-
-  getLayerName() {
-    return FlowAnalysisLayer.LayerName;
-  }
-
-  async dataPromise() {
-    /*const { shp, shps, index, label } = this._data?.contour || {};
-    let data = shp || (shps || [])[index];
-    if (!data) {
-      data = { type: 'FeatureCollection', features: [] };
-    }
-
-    const features = data.features || [];
-
-    if(features.length>0){
-      features.forEach(o => {
-        this._styleC[o.properties.z1] = new Style({
-          fill: new FillStyle({
-            color: o.properties.fill,
-          }),
-          //zIndex: zindex2d.sx,
-        });
-      });
-    }
-
-    const labelObj = { type: 'FeatureCollection', features: [] };
-    for (const f of features) {
-      calLabel(f, label, labelObj);
-    }
-
-    let newArray = [];
-    if(labelObj.features.length>0){
-      labelObj.features.map(o=>{
-        newArray.push(
-          {
-            "NAME": o.properties.value,
-            "level": 3,
-            "lgtd": o.geometry.coordinates[0],
-            "lttd": o.geometry.coordinates[1],
-            "type": "label"
-          }
-        );
-      });
-    }
-
-    const labelData = newArray;
-
-    if(labelData.length>0){
-      labelData.forEach(o => {
-        this._styleLabel[o.NAME] = new Style({
-          text: new TextStyle({
-            text: o.NAME,
-            font: 'bold 14px 微软雅黑',
-            fill: new FillStyle({ color: '#000' }),
-            stroke: new StrokeStyle({ color: '#fff', width: 1 }),
-            overflow: true,
-            zIndex: o.level,
-          }),
-        })
-      });
-    };
-
-    return [...features,...labelData];*/
-  }
-
-  styleFunc = ({ props }) => {
-    if (!this.isVisible()) {
-      return null;
-    }
-
-    if (props.type === 'label') {
-      return this._styleLabel[props.NAME];
-    }else{
-      return this._styleC[props.properties.z1];
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/M2D/layers/highroadLayer2D.js b/src/views/Home/MapCtrl/M2D/layers/highroadLayer2D.js
deleted file mode 100644
index e5d1e2b..0000000
--- a/src/views/Home/MapCtrl/M2D/layers/highroadLayer2D.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import POILayer2D from "./POILayer2D";
-import Style from 'ol/style/Style';
-import StrokeStyle from 'ol/style/Stroke';
-import { zindex2d } from "../../zindex";
-
-export default class highroadLayer2D extends POILayer2D {
-  static LayerName = 'highroadLayer';
-
-  constructor(props) {
-    super({ ...props, rowKey: 'code' });
-
-
-
-    this._style1 = new Style({
-      zIndex: 6,//zindex2d.boua2,
-      stroke: new StrokeStyle({
-        color: 'rgba(138,189,165,0.1)',
-        width: 4,
-      }),
-    });
-    this._style2 = new Style({
-      zIndex: 6,//zindex2d.boua2,
-      stroke: new StrokeStyle({
-        color: '#ffffff',
-        width: 2,
-      }),
-    });
-
-    this._styleLabel = {};
-
-    this.highlights = this.getHighlightMap();
-  }
-
-  getLayerName() {
-    return highroadLayer2D.LayerName;
-  }
-
-  async dataPromise() {
-    const a1 = await fetch(`${process.env.PUBLIC_URL}/data/geojson/macheng/highroad.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .then(features => features.map(o => ({
-        ...o.properties,
-        geometry: o.geometry,
-        type: 'boua',
-        ADCD: `${o.properties.ADCD}000000000`.substr(0, 15)
-      })))
-      .catch(() => []);
-
-    console.log("a1++++",a1);
-
-    return [...a1];
-  }
-
-  styleFunc = ({ props }) => {
-    if (this.highlights[props.code]) {
-      return this._style1Highlight;
-    }
-    if (!this.isVisible()) {
-      return null;
-    }
-    return [this._style1,this._style2];
-  }
-
-  setSetting(setting) {
-    if (setting?.highlight?.highroadLayer !== this._setting?.highlight?.highroadLayer) {
-      this.highlights = this.getHighlightMap(setting?.highlight);
-      this.redrawLayer();
-    }
-
-    this._setting = setting;
-  }
-}
diff --git a/src/views/Home/MapCtrl/MapCtrl.less b/src/views/Home/MapCtrl/MapCtrl.less
deleted file mode 100644
index 803f7e4..0000000
--- a/src/views/Home/MapCtrl/MapCtrl.less
+++ /dev/null
@@ -1,124 +0,0 @@
-.map-ctrl-root {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  overflow: hidden;
-
-  .tip-container {
-    display: block;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .tip-txt {
-    background-color: gray;
-    border: 2px solid white;
-    color: white;
-    padding: 4px;
-  }
-}
-
-
-a.mapboxgl-ctrl-logo {
-  display: none;
-}
-
-.mapboxgl-popup-content {
-  background: rgba(4, 8, 27, 0.8);
-  border-radius: 0px;
-  padding: 0;
-  box-shadow: 0 0 0.5rem 0 rgba(31, 95, 102, 0.7);
-}
-
-.mapboxgl-popup-anchor-bottom .mapboxgl-popup-tip {
-  -webkit-align-self: center;
-  align-self: center;
-  border-bottom: none;
-  border-top-color: rgba(4, 8, 27, 0.8);
-}
-
-.mapboxgl-popup-anchor-left .mapboxgl-popup-tip {
-  -webkit-align-self: center;
-  align-self: center;
-  border-left: none;
-  border-right-color: rgba(4, 8, 27, 0.8);
-}
-
-.mapboxgl-popup-anchor-top .mapboxgl-popup-tip {
-  -webkit-align-self: center;
-  align-self: center;
-  border-top: none;
-  border-bottom-color: rgba(4, 8, 27, 0.8);
-}
-
-.mapboxgl-popup-anchor-right .mapboxgl-popup-tip {
-  -webkit-align-self: center;
-  align-self: center;
-  border-right: none;
-  border-left-color: rgba(4, 8, 27, 0.8);
-}
-
-
-
-.featuretip-title {
-  border-bottom: 1px solid rgba(36, 136, 223, 0.60);
-  color: aliceblue;
-  padding: 0.5rem 1rem;
-  font-size: 1rem;
-  display: flex;
-
-  .extra {
-    flex-shrink: 0;
-  }
-
-  .name {
-    flex-grow: 1;
-  }
-}
-
-.featuretip-prop-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 0.2rem;
-  border-bottom: 1px dashed #00deff88;
-}
-
-
-.marker1 {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  transform: translateX(-50%);
-  line-height: 1;
-}
-
-
-.e-marker {
-  transform-origin: bottom center;
-  cursor: pointer;
-
-  &__image {
-    transform: scale(0);
-    transform-origin: 50% 50%;
-  }
-
-  &__circle {
-    display: none;
-  }
-
-  &__text {
-    font-size: 14px;
-    font-family: brandon-grotesque, sans-serif;
-    text-align: center;
-    opacity: 0;
-    color: #fff;
-    fill: #fff;
-    transform-origin: 50% 50%;
-    // Center SVG text
-    alignment-baseline: middle;
-    text-anchor: middle;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Markers/AZDLayer.js b/src/views/Home/MapCtrl/Markers/AZDLayer.js
deleted file mode 100644
index 1b7ed8f..0000000
--- a/src/views/Home/MapCtrl/Markers/AZDLayer.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { AzdPromise } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import AZDMarker from "./AZDMarker"
-
-export default class AZDLayer extends BaseLayer {
-  static LayerName = 'AZDLayer';//危险区
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return AZDLayer.LayerName;
-  }
-
-  onAdd() {
-    AzdPromise.get().then((data) => {
-      const list = data.map((i)=>{
-        return {
-            id : i.pid,
-            ...i
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.AZDLayer;
-    if (highlights !== this._setting?.highlight?.AZDLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return AZDMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/AZDMarker.js b/src/views/Home/MapCtrl/Markers/AZDMarker.js
deleted file mode 100644
index d445de2..0000000
--- a/src/views/Home/MapCtrl/Markers/AZDMarker.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import React, { useEffect } from 'react';
-// import { zindexmarker } from '../zindex';
-const zindexmarker = {
-    z:36,
-    hilightPlus:40,
-    zLabel:56
-}
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAIABJREFUeF7tXQl4VEXy//UAoiKCwHJ5gXhxyCVHJDPDISCCcskheAASDjWZQdyA7nrgrruKcTUHgiIoeACiK6IccihmJgkEEJHLAxXEP3IsKIeIEZL+Wy8EIyaZ97r7HTN59X3zZT7oqq6qfr/pft3VVQwuuR5wPVCqB5jrG9cDrgdK94ALEPfpcD1QhgdcgLiPh+sBFyDuM+B6QMwD7gwi5jeXq5x4wAWIWQOd0r0KKuU1gaegKYAm4GgKhmoAqwzwygBK+5BGeSV/WB7A88BxGAxbAWxDgWcrTlTehuTlx8wypTzLdQGiYvSf69QS+fktiwGhCYAGKkQbkLETHNtOAwf8EwSyPjXA7zYtwQMuQEQeiyne9ihgfjD4weEFUF1EjAU8PwD4EAV8FTye1QiEPrGgz5jqwgWInuFM83eABx0AdACnv7yOHjYHtvkeQCY4z0UFrEFiVq4DdXSUSi5AShuOdG9XgPUCQJ8rHDVq6pTZDmAxwBcjkLVSndjYkeQCpPhYTvH7kc97gbGeAG8WO8OsxxK2BZwvQQW2GImhkB6O8tDGBUh6fJw2UxAoOFqXh0GPaCPDBg0s2sySvSZi+xhuUH4BkubtB8ZGnlpCxfAQS5u2GJzPRDBrgbSkKBRQ/gCS4R8MzhMAdI3C8bJT5ZVgbAaSQm/YqYTVfZcfgKR57wBYgrY165K4BzhCAJ+BYNar4kKihzP2AZLmSyhcSvG46BmWaNCUrSlceoVnRIO2ojrGLkAyfH3BkaydXbhkpgdywJCCpPA7ZnZil+zYA8iU+KbI9ySDYZhdTi2X/XLMRoWCFCRmU4xYzFDsAGR+k7Owp0YyGKNZo1rMjFB0GXIYnKeg3g8pGLTt1+hSvWRtYwMgaf5BYLSc4m2cPigVPRVwQeWqqF75PO1T9L3wb1VN/UN5R/Fj3lEcyvvp9N+i7ycL8p1uIgC2HhwpCIbmR4GyZaoY3QBJ97YA2EQAQ5w0EA3Pr4c/fKrVR4OqdbV/q1elppSqe44dxI4je7Dz6F7sOPy99r34R0q4eua5AJ8czVHF0QuQdN9wMEwGR23142pMYod6zdD5otbocupjjFtt6+W71mHZrrXI3L0RH+//Qq1wEWkM+8ExEYHwLBF2u3miDyDPXHcOKlUkYCTZ5bzmtRrBX78F/Be2gL9+S9Q59wK7VCmz3++PHcCKXeuRs3cLcvZsxpaDO+zTkyEDJ05OxPjVx+1TwnjP0QWQDF88OCYDiDduqhzHldUvRp/LvNonvt41csJs4s7esxkLv8nSPl8e+s4OLbLBMBFJ4Ww7OhfpM3oAkuZL0pZUwDkihorw0Eu0BoqGhcDwMI+IGMfxFPCCQqDsKAQLbQBYSMe1JVcwnGFhn8JdOR8gKR1qo3IFAsZwYSsNMvZsEHcKFD7HLp8MmlRq830//4iF34Q1sCzZaWng7izk5U9Ecs5+VbaYIcfZAEn1NYcHrwBoYYbxZ8q87apuGN74RnS92PG7xaa4Y+V36zHrs6V4/YsVpsgvQSjdmR+NQHitVR0a7ce5AEnt2BaegtfNvs13TsXKGijo065OY6P+i8n2a/d9pgGFPsdPUoIVU2kPOEtAMLTE1F4EhTsTIPQyDqwEx9mCdkVkq3tujdPAuOqCSyK2L48Nvvhx12mg7P2Z8j+YRicAPgyBrLmm9SAo2HkASevYGazgQ0F7dLHdfU1fPHDtbbikarTmXtBlprJGu47uw5Mfv45pm02ORyxgCRgXmqlMcQWCnAWQNG8PMLZUgV0livDWb64Bo1eD68zqIqblLt65WgNK1vebzLQzCYHwFDM7MCLbOQDJ8I4AZy8ZUV5v22pnVcEDbW7XwOGSvAcIJE+ufw2HfzUpmWPhNvBT8prKS3AGQNK8k8DYo/Lm/FnC0Cu7auC4puZlZogvtzI3H/xGA8mcL03KFsT5YwhmTbLbwfYDJM034dQBoFJfUFDg43EJuKsJpbVyySwPvLRtMR5aMwMURKmcGL8LSVkvK5drQKC9AEn3JQJQfqI64PJO+GdcAq6Okt2p4Sv/jQeuvT1q9D3z+fr8x114eM0MvPXVRwYePZ1NOb8Rwaz3dbZW3sw+gKT6R8LDld5nrlLpbA0Y97UcpNxRZgrs+HYSQrs/xcDLO+OBNreh9V+uNLM702Q/u3G+BpRjJ35R2wf3dEEwc5Vaofqk2QOQdO8QgM3Rp6K+Vt0ubqOBo31dSqweXeT7b+IfdoZol402FGjXLdood+82DSQrvluvVnUGrx1BjtYDJM3fE4zThnolVR6c1H4EHm03QpU4y+XEv3UPcvZs+VO/nS9qpS29ul/S1nKdZDt8bO3LmJSr8PWB4Rfke/wYl7lOVjcj/NYCJN3XDgCBo54RJctq+0SHMVG/fRs3fyxy920r1UyaFWlG6XuZT5XbLJHz/JaFuHvVf1T2tR0FGIBxYVMPYoorbB1ACqNyl6sMPHzGlxh17xslPS3t5o/Gun2fR3yQaKuatqxp6zpaaMHXIfRf8pBKdT9FXn53q6KArQNIuo/mW2Uh63NueARDouhBKesJafPGKEPXYxtVu1CbURKa3qTywTNNFi0faRmpkGYhELZkTW0NQAovO6WrctDaQdPRts7VqsTZLqf1vJH45H9UqsMY0VkPAYViyyp5Khpjtrj114d34/JXFObW4AhYcenKfIAUXpOlCwZKbgIeHLUINc4+3+LhNbe7lnPvwqcHvhLupCiUhoBC351KP504jqrP36BKveNg6Gb2zpa5AKEECxUrEjiU3CE/OnYZzqukBGeqBkmJnOZzhoNCN2SJZhFtRmneF/XOlUsvJKtLafw//HIENV9UtjTMxsmT3cxMBGEuQDJ86aqyj3x151zQ2jsWqdmcYdiqOOPI/a0GY2yzvri8uvN8RhsStDGhhChbSlI4oERWCULMAwjlrQKUbIRnD5gKyj0Vq9T4tdtB4RpmEC27xjbrA0pV5CSa++VKDF32D1UqjTAr75Y5AKGMh4wtV5HU7e2ej6Nfo9gu6XHVq7eZnoZnWOMeGlDi6jZV9VBKy6HQlPEqrn5oyel4dzMyOJoEEB+FkUhvWUzrfL82qLFOV7wyBF8d3m2JmRTvNfaaPloWSCcQ3S15MOcFFarMRSA8VIWg4jLUA0RLJM2ly3RFe/iIkYFq9Mqt+OYwlTC3jijei4ByUwP7y6coC0vhbLDqhNlqAUIlCPbWypbNsk6Bh8v7PmPd02JzTw1nD8LOI3tt0YLivcY064PBV3Sxpf+iTru/M15BgCNbj7oH4lWWXlALkDTv38HY4zKeppD1D/qmRmVUrqjdl84aCEqMYCdRvNeYpr0xoklPW9SgKODr3xknHyrP+UMIZv1LlRHqAEKVnQo8lHNVqnhNrMRXGRmgi17qj93HDhhhMa0txXvRjDK62c2Wn84remk/DE9BvKpKV+oAkuabJVv2jG4Cvnmjsq0/0x4i1YLrv9TPnCurEorSmdOYZr0xullvS0/nBy59RP5mIpWDC4aVxP2pAUhhwUypQvMUV/Rhv7SovXYq8Syi7sw+oBy5TiQalyKgWHE6T+dBXRYE5X8wGPqpKCyqBiDpPlpaSW2HzLx+YrlNsFB7Rm/87/ghJ+LjtE4U40WzyeimvU0/nadEECM/oHzlUpSDQFg6xEkeIFodcrwoYwrdb3j9hkdkREQ1b60Xb8LBX45EhQ0U70XvJwQUM0/nb1v2D/mUQhyjZOu4ywMk3b8a4HGio0u/TOEBz5XrvFU1pvfSinVGA52vzSSFALmi+kWmqUzBm7637pVMTsfWIBCSSqMpB5A07x1gjMoTCFMsXJkVNv4UY/XpPXHY2iI2hlVuUqOBtsS6x8K7J0pO2Tm/E8GsVw0bfIpBEiC+TDAIB0pR1o7wLY5JwyrqQ2k+uiNBdyWcSJQwgoBxS6OOtqh3ZsYXw0pwhBAMCysvDpAM/2BwPs+wwsUYFt082U0kDaDKtO74+aTiXFIyAwNgROOe2r2StrXtvblJCbNveo8qfUsQY7ciKSQU/iQOkHQfXYQSzh5AYdhTO42XsDp2WM+Z2hW/5P9qu0FUrZfeLf7a+lbQu4ZT6J6PnpEtvbASgXA3EXvEAJLm7QfG3hbpkHioeE3uoBfc+hynHFh56vX4Nf+EqDul+a6tfRVGN71ZW0o5kSgMp/38MZAq4sN5fwSzDJ/ViQEk3bcIgHBWaLoWSi/nLhV6oNJznXGyIN9yd1DlXkrT2vHClpb3bbRDComnl3YJWoxA2PBdX+MASY+PAzyrRRWlmoCf3DoTbtmz3z1YYUonUGlmK6joHOPhtsOjqoIvlYNrNW+kZM3EgusQyDZUylcAIN5/Akw4E5j77vE7DI78egxJmWl45XPzk5c3qFoX41oNQrDFACtwaEof8u8i/HEEsh42opxxgGT4PgaH8HU0evdwq8kCb38dQlJmKr43OYrXW685/t72DvS4tL2R58KRban6Lr2LCBPDBiSFrzXCbwwgU/x+FPBMIx0Ub0t1yF/rbgjAol05mk/+lzCyeXQHfVL7u0AzRyzR7cv/KVfH3cM6IjEU0usTYwBJ800GwwS9ws9st6LvM+h6cRtR9qjnW7ZrrTZrbD/0f6bYQluztAHyYJvbTZHvBKErv1uPbu9IHA9wPIVgWPfBijGApPs3A1wo/07PBnFYfLMj6jLaMs7JWVPx9CdS56ql6t28ZiPQHf5Yz/5S5IBe703Akp2G3rWL+Y5tQSB0jd6HQD9A0r1dAUaHg0L0Que/OnafXcggnUzZezYj8aNnsVEitWhpXQ26orNWF4XipMoTTd/yLsaselrCZN4NgSxd1UcNAMT3LIBxIlpVr3wePr/99ajaVhSx80yeSbkv4bG1s1SIKlFGzbOr4dF2w5HU4hbT+nCiYLpcdvVrt+GQeIBnKgLh+/TYZgQgXwK4Qo/QM9vQC+Osrn8TYY1Knk0Hvsa9mc/+oayamYbQTEIv5I0vuNTMbhwlmwqfzv5MeHt8OwJhXYUg9QFkirc9Cpjoog/lITti0dND7xn0vmE11a9SS3sPGdX0Zqu7tqU/6cI8nMUjGMqJpLw+gKR5g2AsNZKwkv7/yuoX47PbX4WHeUTYo4aH4oSGr/g3aKfKTrrz6h7asuuyavXtVMP0vinyoPFrd4inbGUsGUmhiC8y+gCSLp5KNLn1EDwVf7fpDrOzg2mb39G2b/MtCheJZGvD8+tpswmBJZZpQvY0pGyYK2YiYwuQFOofiVkvQChxrNBPUtaA5xBfT/euWiR9HfX/9CtGaWroVNyJRMut/3jvRdWzznWietI60Q6h9617BeWwfQiEIp6iRgZIur8VwDeIaNGsZkNsHjpbhNXxPK9+sQyJH6WC4qmcTI1rXKptBdudWtQsH7WYOwK0KSJEHh6HxKzcsngjAyTVew887DkRBeh+AZ1/xBoNW/FvSwIMVfotsXl/ZHQU2qVXqYZyWbS0nbJJ+GrSBATCKXIASfe9CUAoBJS2dmmLN1Zo6be5SPhgsukBhmb5q2Wty7XtYLoHEiv05lerMGjpo2LmMCxCUrjMbb/IM0i67yCAGiIa7L7rbdD2YyyQFQGGVvmJrtSmxCsty2yV6n/qhw4NKTOlIB1CIHyB+AxClaLANop0Ttc41w+Wyicn0q1yno/3f4Ehyx4zLcBQucI6BVKlqZT4u0GZZaKdqAY71WIXogoVWuHej0p9xsueQSTqDI5vNVjbQYlmMjPA0Cl++XvbO/F4XIJT1BHS46E1M/CvdcLp2cqsbxgJIBR+myyi9bI+/wHlVIpGoiQBfRY9aEqAoRP9QXfSX+wywdRMiWba/eH/bcD1C4Q3IFIQCJd6haNsgKT5FoNBqKIKT3Lm2UCkgaJfIvpFKm9UgXm07eCH2w2LStNZhmD+Qo4lCIZLTUASaQbZAcBwLDWd5H4zTChPl22D88vJX9Ft4XjLAgxtMzRCxzTrU40WJ+XF0uOry2YPxo4je/Q0PbPNTgTCDUtjLB0gKd2roPLxn0R6pAqqH/QTCt0S6U6a58Wt72H0h2Vuh0v3EU0Czq14thYedG/zflGjNi2xaKklRHnnnIfk5SWe+JYOkNSObeEpEIq8G9mkF2Zcr/tWo5BNqph6LPyr7QGGqmxRLaf3ZfFY2OsJ1WJNkUfnUzO3LRaTXeBph3GZ60piLh0gEjtYtCtCuyNOpoXfZOGWJQ85JsDQqb6qcfb5eL7T/Rj4250TJ5Pku2OpO1llAUR4B4uK4VBRHKfSgKUP479fCSdncapZpuo18PLOmH/jY6b2ISN8zpcrQUV3BKnUnazSASKxg5U9YCo61BPK7SBonz621Xu3gpZUTg8w1GeN9a2oXuG8GybBf2EL6zuP0CMdFNKBoRCVsZNV1gySBUCoxtv3dy0AOdNJFEuhInb7NaHpTdq5iZNoz7GDoGrBgpSNQLjEALUyAOJfB3DDSawqeirgxL2rBPVUz/b14d3w/zcpagMM1XtEjURKSPd+n6cdlWNZPAk4W49AqMRT7bJmkE0ADN90+ss51bE/4V01oyAp5dHcl/APE7OKSKoXE+xOClWRqBa8GYFwiUFpZQHkCwC6Mj8UH2kq7PjlHXNsHfyjJ37GtfMSYi7A0FanltH51RdcgtUDnweld7KTrnx1qOiYf4lA+KqSdC8LIDsBGM4j07bO1Vg7aLptfnpu0wIkZlIKL5es9kC6P2hrjq5280dj3b7PRcz+FoFwiREjZQGEzu0j3tk9UxsKVaBARTso7s2xyN27zY6u3T5PecDOH8gbFt6P5btKPO+LND57EQjXMzqD/ACgzMskJQmkJGZv9LB2v1zqVlkk17n/L+QBegboWbCSBr//KOZvF9og+hGBcImXAsuaQSg2xXA6jDHNeuN5C++h9170IN7bkW3lOLh96fTATQ074L2bntTZWr7Z2FVP44UtQhtEP/92N73EqqVlAeQkgApG1Z547W140oL6g5m7N6LT2wGj6rntbfDAqn5p6HRRK9N7fiDnBUwWq2OYj0C4otEllmMBIhWYZvowuR2U5IGRTXthRhdzA1itBogjl1gzti7CqA/Lb52RaIbfc53uwz3XCJ92RzTd6iWWI1/SO78dxEe7P4noLLeB8zww5MqumHPDI6YpZvVLuiO3eSkHEu1auRR9HqCk2pSXyyyyepvXsQeF9370rAaS/x0/ZJavXbkKPdC0ZkMMaNTRVHCQulYfFEZtqMnG/23H7M/fR+pGSgrpkpkeqFa5Cu5rOQh0X8TuUnBWh5pEdbDiziN70eGtu0Fh0C6Z5wEnFWe1OFgx+sPdR6x8ArM+W2re0+FKxstdH8Twxjc6whNWh7tH/YUps4toOuKpsFkJqw4BI5lp/YWpGLhyazdAKPy7ZS2huqeRnofT/7/xwHaZaq+6+ymtoVMAYseV26hP2mAXQOqcWwNTO41H/0aC2f4MPrZU4YquFO/7mY6urCWnAMT6pA0xkPbHDoA0r9kInw592dqn9FRvLeaMwKaDgtWWBDV2CkCsT/sTA4nj7AAIlXyg0g92EJVqaPPGKEu7dgpApOLzhBLHxUDqUasBcl29psgZMM3SB/TMzi6dNRCUnd4qcgpArE89Sh5O90V18mqrAWJ2KIWeh97qWDWnAMT65NU0GhI7WU4of+ACRA+k5No4BSB2lT8Q3slyQgEdFyByD78ebicAxL4COhI7WU4oweYCRM8jLtfGCQCxsQRbdBfxdAEi9/Dr4XYCQOwr4ln4oh61ZaBdgOh5xOXa2A0Qe8tAFwKEYsYHiLhxVte/YVjjHiKsSnhcgChxY5lC7AaIVMonhkVICt9cloFl1ygkzlTvPfCw50RcPbpZb7xgYQqgM3V0ASIyasZ47AZIUmYqpmx625jSv7ee8Fu6nzJr70UGSLq/FcCFir81q9kQm4fOFlVems8FiLQLIwqwGyAt5o7ApgOC4TUeHofErFy5GaRwmbUbQP2I3iqhwZqBz6N93SYirNI8LkCkXRhRgJ0AoTSzlG5WjNg+BEIRU+tGnkEKAULp2oeIKDKp/Qit/rYd5ALEfK/bCZDH1r6MSbmCgaGMLUBSqH8kD+kDSJo3CMaE6jrT7EGziB3kAsR8r9sJEKlk5YwlIyn0dCQP6QPIFG97FLA1kYSV9v92LbNcgIiOmH4+uwAit7wCwFk8gqGcSJbqA0jhMutLAELX42iJRUstq8kFiPketwsgtLSiJZYgbUcgrKs4lBGAUFWacSIK2bXMcgEiMlrGeOwCiNTyCkhFIHyfHksNAMTbFWAr9AgtqY0dyywXIKKjpZ/PDoBIL6/AuyGQtVKPlfoBoi2z/JsBLlQA3Y7dLBcgeh4BuTZ2AERuecW2IBDSXZzWGEDSfJPBIFQgm+qm03XU+lVqyY2IAW4XIAacJdjUaoB8f+yAdq1YOCEgx1MIhnXXYTAGkCl+Pwp4pqAvtRd1K89EXICIjpR+PqsBInX2QWZ5WEckhkJ6LTQGEJKa4fsYHK31dlC8ndWziAsQkVEyxmMlQKRnD4YNSApfa8RC4wBJ9/4TYA8Z6aR4WytnERcgoqOkn89KgEjPHuCPI5D1sH7rAAGAxMcBntVGOrFrFnEBIjpK+vmsAoj07KGZVHAdAtmGDryNA0TbzfItAtBLvxv/2NKqWcQFiOgI6eezCiDyswcWIxC+Sb9lhS3FAJLm7QfGhIPw6V0kd9ALuPi82kb1NdTeBYghdwk1tgIg3/20H+3njxHfuSLLOO+PYNYCo0aKAaRwFqFDw65GOyxqn9TiFqT7g6LsuvhcgOhyk1QjKwASCKUh49P/yui5EoFwNxEB4gDJ8A8G5/NEOi3i+aBfKrpcJLQhpqtbqwHS6cJWWNU/TZduZjVqOHsQqHiQVWQ2QCRT+pxaJ7FbkRR6Q8Qn4gCh3tJ8mWAQTmF+46VxWNLbvJLOVgOEXLLo5sno1eA6kbGQ5lm8czVuek/3GZh0fyTAbID0fHcCln5r6L36j3ZxhBAMdxQ1VhIg3jvA2CuinRMf3Vmnu+tmkB0AuaRqHXw73J7aiFbn5TUbINO3vIsxqyJe2Sj70eH8TgSzXhV9vuQAQr2m+1cDPE5UgcurXYjsgVNR+5wLREWUymcHQEiZRtUuRKo/Cc1qXIYG50e81SllNy2ntvzwDcaFMvD1YboZbS2ZNYPsP/4j4t+8B19J2cTWIBCSms7lAZLmSwDDizLDktx6CJ6Kv1tGRIm8dgFEuSEOFmgWQCZkT0PKhrlylnOMQjA8Q0aIPEC0WcSXDaCDjCIr+j6Drhe3kRHxJ14XIErdWaIwMwCy8rv16PbOeFnlcxAIx8sKUQOQDF9fcBjeYy6ufJvaV2Nlv2dR7awqsjad5ncBosyVpQpSDZDDvx5D1wX3Yf3+z+WUZ+iHpPA7ckJEDwpL6jXNNwsMw2QUuvuavlptP1XkAkSVJ0uXoxogVGtx2mbJ55pjNoLh4SqsVzODkCZT4puiwENLrWoyis28fiLuaiIcxfKHrl2AyIyEPl6VAHlp22KM/GCyvo5Lb3UYnoJ4JGZvlRVE/OoAQtLSvH8HY4/LKEa7WbTUuqbmZTJiNF4XINIujChAFUA2H/xGW1rR7pUUcf4Qgln/kpJRjFktQOY3OQt7a2UDXOptmw7a6MBNllyAyHowMr8qgNABJx10yhFbj7oH4jFo269ycn7nVgsQbRbxDwLjQsf6xY1SEfFLa1la07pknge+vnMeLqsmlJX2tFIKInULZXE2GMHQfJXWqgcIaSeRqrS4cdM634+xzfpI2WvH6bKUwlHEPPiKLpjXY5KUxk9+/DoezHlBSsYp5rkIhIeqEFRchkkA8bYAY8vBIR3P/nbPx9GvkXC4l2brE+tfw99WT1ftu3ItT0VF32c3zsf48BR5PzLsB+fdEcj6VF7YHyWYA5DCWYS22YRT3xVXM3vAVHSoJ5RtSLW/XHmKPDD3y5UYuuwfiqRhBALhWaqEmT+DFPWQ4UsHR5IKxb+6c64W4+RS9Htg3b7P0W7+aDWGMGQgKRxQI+zPUsybQaivZ647BxUr0sUq6SN/End07DKcV+kcs3zhyrXAAz/8cgQ1XzR887U0zbJx8mQ3jF993CzVzQUIaZ3hiwcHgUTJk31w1CLUOPt8s/zhyjXRAz+dOI6qz9+gqofjYOiGpDAdTptG5gOEVE/zJYEhXZUVawdNR9s6V6sS58qxwAMUin/5K0I1mErWjiOAYDjDbNWtAQhZke6jF3Yl8TEkbs4Nj2DIlcJX4s32qyu/mAdy9mwB1TJXSLMQCFtST8M6gKR0qI3KFZYDaKHKUc/4EnFfy0GqxLlyTPDAgq9D6L9EOM9gSRp9irz87kjO2W+Cun8SaR1ACmeRdgAoVLOeKuOe6DAGD1x7mypxrhyFHnh+y0Lcveo/CiViOwowAOPCm1QKLUuWtQDR3kf8PcE4gaSSKiNVhKWo0sWVU+gBZeEjRQ5l+AX5Hj/GZa6z0sfWA0SbSbxDAEaVc5URBTjSbKIiCliZUuVQEEXlUuiIfODhGc5j8Jq9Y1XScNkDENIk1T8SHi51X/hMgyhU/okOo5XdJymHz7eUyXSf48Gc6fIh62dqwT1dEMxcJaWcILN9ANFmEl8inZQI6l4qG91MpNlE5fVd1TrGkjy6JkuzhvRNwJKcwvmNCGa9b5e/7AWI9k7imwAG+csfZ3iQ7rjTbKI6EYRdA+XUfinBAs0a0nfIS1zf8LuQlKUknk/Uf/YDRAOJdxIYe1TUiLL4KKXQX1vfakreLTP0jRaZdPPv6Q3z5FPzlGYw548hmCUXS6/Amc4ACBmS4R0Bzl5SYNOfRFByOgKKWRkczdDZyTIp4yHlrJJL6laGhRwTEQybl5PWgHOdA5DCmaQHGFtqQH9DTSkXMM0mZibMNqRQlDWmRNI0a0jlyo1scxICKi6JRO5ITwtnAUQDScfOYAUf6lFbKEUkAAAEiElEQVRetA2VXqAZxez6JKL6OY2P6nPQjCFZgiCyWQUsAeNCMyM3tK6F8wCiLbd8FB6/Ehxnm+UKKuIzpllvjGp6s6Wlqc2yxwy5VPZs+pb3MH3ru3LFayIrdwLgwxDIksw1Grkjoy2cCRCyIrVjW3gKXgdwhVGjjLR3gfJnb1kIDOp8DzhLQDC0xMi4WdXWuQDRQOJrDg+ovIKyAMfSHOsCBSBgvLj1PbzwW9mBPccOWvEM0h3y0QiE11rRmUgfzgYIWVQYBUznJMpC5ctyVBFQelzSHu3rNhHxadTx5O7dhvd35VoJDPLRLOTlT7QqKld0UJwPkCLLCi9dEVCU3EzU4zACyI2XtkcsgqUIFEu/zQV9t5COo3AbV3kEhRk2RA9Ail7euQYSJXfcjTg0FsBiIyiKXJ0Nhol2BB0aGevibaMLIKQ5JYKoVHGyqmwpIo5rXqsR/PVbwH9hC/jrt0Sdc9VXxxLR60weeqdYsWs9cvZuQc6ezdhycIcKsWIyKPvIiZMTzUywIKZY2VzRB5AieyjvFi25FCSnk3Us5ezqfFFr7QDS7kPI5bvWYdmutcjcvREf7/9C1jR5fi2pGyaalbdKXsFYBQjZle5tATAq66owG4C8yxueXw9/+FSrjwZV62r/RpsAMkS7SzuO7MHOo3ux4/D32vfiHxnZJvDOBfhkMzIemqBriSKjdwYpbo6WMBvJslnlrXB6RU8FXFC5KqpXPk/7FH0v/FtVU+FQ3lH8mHcUh/J+Ov236PvJgnwr1JTsg60HR4rqRNKSSgmxxwZAyHQqvbCnRjIYS5Yt4iPkSZeJPHAYnKeg3g8pKksQ2Ona2AFIkRep0lW+J1m2HJydgxKVfVPZswoFKaoqOznFB7EHkCLPFhYWpdlEqvquUwbKwXrkgCFFRcFMJ9oYuwAp8rZWx52NBHicEwcgenVia8D5TNk65E63P/YBchoo3jsAlgAGuWIjTh9Rs/XjCAF8BoJZr5rdlRPklx+AnF56+QeD8wQAbt5SY0/gSjA2A0kh6fJ6xrq1t3X5A8jvM0q/wqUX1NSctncczex9ceFSKmuBmZ04VXb5BUjRiKTHxwGsFxjrCY7WTh0oS/Vi2ADOlwB8MQLZayzt22GduQApPiBT/H7k80KwgJezmm9siwaKCmwxEkMhhz2ntqnjAqQ016d7u2ozS+ESzNRbjbaNPrAdwOLCmSJrpY16OLZrFyB6hibN3wEe7TylAzj95XX0sDmwzfcAMsF5LipgDRKzch2oo6NUcgEiMhxTvO1RwPzaljGH97fLwdVFxFjA8wOAD1HAV8HjWY1A6BML+oypLlyAqBjO5zq1RH5+y98iwpqAoykY6K5uAxWiDcjYCY5tYNgKYBvAP4nmKFoDdpva1AWIWe5N6V4FlfKawFPQtBhwqgGsMsArAyjtQxrllfxheQDPA8fh00Ao8GzFicrbkLz8mFmmlGe5LkDK8+i7tkf0gAuQiC5yG5RnD7gAKc+j79oe0QMuQCK6yG1Qnj3gAqQ8j75re0QPuACJ6CK3QXn2wP8DJ13vfWZCVAgAAAAASUVORK5CYII="
-     alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function AZDMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_anzhidian_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.z + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setCameraTarget({
-      center: [data.lgtd, data.lttd],
-      zoom: 18,
-      pitch: 60
-    })
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'anzhidian',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_anzhidian_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.z + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      }
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      } */}
-    </>
-  )
-}
-
-export default React.memo(AZDMarker);
diff --git a/src/views/Home/MapCtrl/Markers/AdcdAllLayer.js b/src/views/Home/MapCtrl/Markers/AdcdAllLayer.js
deleted file mode 100644
index 92accab..0000000
--- a/src/views/Home/MapCtrl/Markers/AdcdAllLayer.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import BaseLayer from "../baselayer";
-import AdcdAllMarker from "./AdcdAllMarker";
-import {AllAdcdPromise, xzList} from "../../../../models/_/common";
-
-export default class AdcdAllLayer extends BaseLayer {
-  static LayerName = 'AdcdAllLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return AdcdAllLayer.LayerName;
-  }
-
-  async onAdd() {
-    const agnp = await AllAdcdPromise.get();
-    const xzLabel = agnp.map(o => ({
-      ...o,
-      // id:o.ADCODE99+o.LAST_NAME9,
-      CODE:o.ADCODE99,
-      NAME:o.LAST_NAME9,
-      stcd: o.ADCD,
-      type: 'label'
-    }))
-
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: xzLabel || []
-    });
-  }
-  
-  setSetting(setting) {
-    const highlights = setting?.highlight?.AdcdAllLayer;
-    if (highlights !== this._setting?.highlight?.AdcdAllLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return AdcdAllMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/AdcdAllMarker.js b/src/views/Home/MapCtrl/Markers/AdcdAllMarker.js
deleted file mode 100644
index f2a2984..0000000
--- a/src/views/Home/MapCtrl/Markers/AdcdAllMarker.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import { zindexmarker } from '../zindex';
-import { useDispatch, useSelector } from 'react-redux';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ level }, { width, highlight }) {
-  let color1= 'red'
-
-  return `
-    <div style="cursor:pointer">
-      <svg fill="${color1}" t="1673677830289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="112679" width="${32}" height="32">
-        <path d="M798.235936 511.99828c0 157.609784-127.772934 285.377557-285.374116 285.377557s-285.374116-127.767773-285.374117-285.377557c0-157.611504 127.772934-285.374116 285.374117-285.374117s285.374116 127.764333 285.374116 285.374117z" p-id="112680"></path>
-        <path d="M512.860099 511.99828m-220.653353 0a220.653353 220.653353 0 1 0 441.306706 0 220.653353 220.653353 0 1 0-441.306706 0Z" fill="#8DCDB5" p-id="112681"></path>
-        <path d="M512.860099 511.99828m-179.46491 0a179.464911 179.464911 0 1 0 358.929821 0 179.464911 179.464911 0 1 0-358.929821 0Z" fill="#69C0A3" p-id="112682"></path>
-        <path d="M512.860099 511.99828m-123.565327 0a123.565327 123.565327 0 1 0 247.130655 0 123.565327 123.565327 0 1 0-247.130655 0Z" p-id="112683"></path>
-      </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function AdcdAllMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
-
-  const highlight = setting;
-  const getLayerVisible = useSelector((s) => s.map.layerVisible)
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    //console.log("zoom change",zoom);
-  }, [zoom]);
-
-
-  useEffect(() => {
-    const width = 32;
-
-    const placeholder = document.getElementById(`marker_xianzhuji_${data.CODE}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.xianzhuji + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [ highlight, zoom ]);
-
-  
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-        {
-            data.CODE === '422826'?
-                <div
-                id={`marker_xianzhuji_${data.CODE}`}
-                style={{
-                position: 'absolute',
-                bottom: 0,
-                left: 0,
-                transformOrigin: 'bottom center',
-                transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-                lineHeight: 1,
-                zIndex: zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-                }}
-            ></div>:null
-        }
-        <div
-            className="markerLabel"
-            style={{
-            // backgroundColor: '#0008',
-            color: data.CODE==='422826'?'rgba(230,0,0)':!getLayerVisible.SatelliteImage?'#595959':'#fff',
-            padding: 4,
-            borderRadius: 4,
-            fontSize: data.CODE==='422826'?18:14,
-            fontWeight:data.CODE==='422826'?700:400,
-            lineHeight: 1,
-            top: 0,
-            left: 0,
-            transform: 'translateX(-50%)',
-            zIndex:1,
-            // zIndex: zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.NAME} 
-        </div>
-    </>
-  )
-}
-
-export default React.memo(AdcdAllMarker);
diff --git a/src/views/Home/MapCtrl/Markers/AdcdLayer.js b/src/views/Home/MapCtrl/Markers/AdcdLayer.js
deleted file mode 100644
index 54bf9c5..0000000
--- a/src/views/Home/MapCtrl/Markers/AdcdLayer.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import BaseLayer from "../baselayer";
-import AdcdMarker from "./AdcdMarker";
-import {AgnpPromise, xzList} from "../../../../models/_/common";
-
-export default class AdcdLayer extends BaseLayer {
-  static LayerName = 'AdcdLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return AdcdLayer.LayerName;
-  }
-
-  async onAdd() {
-    const agnp = await AgnpPromise.get();
-    const xzLabel = agnp.filter(o => o.LEVEL === 4 || o.LEVEL === 5 || o.LEVEL === 6).map(o => ({
-      ...o,
-      stcd: o.OBJECTID,
-      level: o.LEVEL,
-      id: o.OBJECTID,
-      type: 'label'
-    }))
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: xzLabel || []
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.AdcdLayer;
-    if (highlights !== this._setting?.highlight?.AdcdLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return AdcdMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/AdcdMarker.js b/src/views/Home/MapCtrl/Markers/AdcdMarker.js
deleted file mode 100644
index c1351c8..0000000
--- a/src/views/Home/MapCtrl/Markers/AdcdMarker.js
+++ /dev/null
@@ -1,243 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ level }, { width, highlight }) {
-  let color1;
-  if (level === 5) {
-    color1 = '#ec4e4e';
-  } else if (level === 6) {
-    color1 = '#1296db';
-  } else {
-    color1 = '#1296db';
-  }
-
-  if(level === 5){
-    return `
-    <div style="position:relative">
-      <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-      </svg>
-      <img width="${width}" style="position:absolute;top:0;left:2px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAACXBIWXMAACxKAAAsSgF3enRNAAAHvUlEQVR4nO1dTW4qORD2oNmTHRKb5Ens4Z3gJScIc4KQG5ATTN4JhhsMOcEkJ0hygsAeaWCDxC59gozMfOY50NCucvkH0p/UShaJ266vq1wul8u/fXx8qJzRabculFL6uVRKnSmleuiu/tnc0/VCKTXB7/rnu1LqRSk1ny1X85zHmx0hnXarB+GbZ5/QuShAzvqZLVcT4fa9kAUhnXZLC34AAs4jv34Bcsaz5eol8rt3kIwQmKIBntgk7IMmZwxykpi26IRY2nAT9cV0PKTQmmiEgIh7pdSPKC+Uw6vudyxighMC03R/BBpRhQcQE9SUBSWk025pIoYBPKVU0B7aaLZc3Yd6fxBC4LrqybEr3ngemOp5MITL3JBusNNuaY14O2EyFMb2hrGKQkxDOu3WGbTiWrqTmeMJ2vIu0U0RQiKaKBMSmeNRW7+bMIv9+6EQixTETJg3ISDjJdCgp1thDtZXCO21wzEhPhz9sVz6kuJFSKfd6kMzJMmYos3HUC4mXPE+FqiS5BTQlEduA2xCOu2WHszf3BeXQPv5o9jBPmj4UHiddDtbrsacf2QRAs34h/PCEkRZcFUhwAL2D46mkAkRnDO0dzLMbX8CxIwEvEXWnEIiRIiMBYhg29kYgBUYeUaiyaQ4EwJP5cVzEhT12UNDaG01BSlOY6as1H3XGXqi6x8LGRq6r7rPuu8ezXQhOyc4EYIQAfcr0Wr7net15AD0/TvGwsG1a5il0mRh3nhjdiRYEC4FBCIS36tk4aIh3C97KrFyzQkYyyXGxkGlLA8Sgv0MztdAmsiOCRgTl5QuZLoXe00W/PEJw8UVienkDo8lgJZPb9/665CG3DPXGydPhvpsvqhoQralKCUECQmcEMLtVyDDAGPluMQ3kPEO9mkIZ8/46ZhdWy4w5ifGv5fKeIcQMEdN1VkglP1VMYAMKPhRpiW/lzTAEewwhUe1T+1jJ7fpsWPhR42AD+AYbPDJy4Jn9S+x0SeEF4IDAb++Yw6wydl9jBXI7LRbj4yIxjfb49rWEJZ2MP7HGQjwDRn5XedwTPQEWiByOwqsyZwQ08CeT7bnECohDyH3M7CI0u3/6Rnyb6KNedXCzAeQxQOxiU8y35gs2ONnYmPfQhASIYtFr7L7gfrOMftXZt6zNSQL7cCH4bvvUgXd9mSfU+ADXy2xCaF2biQ9GCROPEfKBdbveMY7pUGVzUb2a5PFCLFPZ8tVz+HvnME0mVK4knaVO+3WhKjl69C80RCqdoiuyPFBpNxjf4TtlwRVRmsOuIRIC0862Y6KZoAxUdtjEzKVnMw99lykUblXQQFkRNkz+Z8QqCrl6xSztdaiLxcM0ScpUGTV1Fw0rGxxV0hOfrmdrmoKfyBUWa0Joc4f0oTkhpSEXDZQrsIVhVQsCIHCHM8eNtE3b0BWlNShs4ZVO8QFkruBUSLETEj2jSKzHvWMoWSoRDxsIQjJvpFkRtUQSUJyKadRBsm+UWS21pDodjxEUE8aifrYTGmyvgpITlBNSHiQHCHxwgE1/EAlRDoi+hVA2qaoCQkPUmys4XEIhY0cSulVIVEfiwZx0pHUEGqmX0xwz3+UgSKzSUqTlbOWSIaISDKjaojkPnrOx6Il+0aKFTaIC5em1AYO0jujz18OKKRSTyErSiTkvcGJ2RP//hDEU4ky6xN5r6nBWH1LE5KTlhSJCZk3sBlPEYoYIdjAyUlLpJOxKbLSpnJuvCyK2epK5jChwqekm8nFVLLaKGREyab5lNtLnUekd/v6iU1XEWhMFHgRIpoPC7OZcks3RCY8VUa/CMFpUsrKuYv0TzEgVOFT5IWL2wB5vT2iuVqY08v2Sp3aKfEUHpxovYpkvgokWYc4OUyVzUb2NiHUjt0ESFA2mtILPNFPUU1BPHwDmVDP+G9kvyEEnaMG/IIcD9P2HMcdfgpri27rp2474FE8qkwW9oexHVzMQksM4IZeCBBToI2LkIX0fbVD1ceixfvnfSx6pxpQp90aM1hmlUT1RS6FAxS/dK4+p1l+CtdqmHO0bIFJ8uTqY7kAUd0JI8Fu5yjdzgYV/uCV2PC59DG3I8OYQcZrmSZLVgO6DnSiNWtgzJwCoaUyPlRRjjOXKJdCj6cCjwKhO3OHQVVFOY6r+SIdVskRVok/KgpyRTn1K+DH2avQW5Zj4bN6WcGqeM1JVB8dWpS61O2lHoA3OMnKpJ4l1ysLLrikAXEn6u6pmS/LTHGPcVfKspIQTNB3zA6cDCkCZNy5ODtOiXKz5WrELPSoYGffjtklRt/fPA43PUGGlaivqziArK+rQIMDz6jrNepU5XwCdw30ceJJRkH9AOsrj7ZwVFceGdSXgjkhzqVgBvW1eQcR99o8g/piyR2ku1jSoL56dYP0V68aJL6c+N0641JfTmxQX9+d0fXdNlCU/i/RRvPFnesK3BXihKi4JiwVgt0+F4QQAxSVzK2Mnw8KuObBcruCEqLCLLhSIcoCNjghBkgvumfc3pMaryAiSq5XNEIMQMzgCDRGa8Q4dtJddEIMYMoGeHKpLreAMzJOFVtLRogNS2tccnalYXKAo2tDGbIgxAZcZjvMIe2hFVvhmKxyyLIjZBswbfrR5OhogNmfPxQSMSEWDf1Tr6I1AfrcSb5V8ZRS/wHa+fP9yffgMgAAAABJRU5ErkJggg=="
-      alt="" className="panel-icon" />
-    </div>
-  `;
-  }else if(level === 4){
-    return `
-    <div style="position:relative">
-      <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-      </svg>
-      <img width="16" style="position:absolute;top:0;left:2px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGUAAABkCAYAAACfIP5qAAAACXBIWXMAAAsSAAALEgHS3X78AAAH30lEQVR4nO2d33HiSBDGR04AP/DCk8nA3gggg/VFYG8ESwbHRnBsBIsjWBzBQgQHGcCTXniwIuBqdN9gARJS/xlpROlXRa1ry5aEvpme7p6ZnuhwOJiQiaP+vTHmyRgzNsa4n+2/jxUee2eM2RpjPowxa/y8Hhz265C/c3CiQIRniGA/D55utTLGLI0xi9BECkKUOOoPIcRrxR6gTWLFgUCLBu5/QqOixFHfCfG1sYe4xJq8uf0MDvttEw9QuygZ8zT1aJq0eDPGzOo2b7WKEkf9CcTo1XZTHez481pXz6lFFJipWQt6Rhm250wGh/2Hz5t4FQUDuLXPI283qR/rFEwHh/3M1529idJiU1UVbyZNXRQM5Isb6x1FJDBnc82LqooSR/0nBGS32juKeBsc9q9aF1MTJY769qF+qVzsOqtM2sSgEZwzxMelZYY1OBkbm4HQcAJURImjvh30vosvdEmCl55+JPECzOo48/GRObCB57M0rhGLEkd9a09fRBe55M13yiOT2pko96IEPYYtjEgUZUF2iGXmvuOAc+KoP0a6R+u7iIRhi6IoyA5+v6oHwwG9Z6r0vdjCsERREiRBXmkqvI468CJnCm49SxiyKEpe1jv8+0aysFXBd50JXXyyV0YSBbb3D/fpfAVbPlEKhleDw35c9Zfvqv4i7K3EG3ItpjWCWGwLxwv9IbjMCGFDJSr3lDjqrwW+/TvyRLV6Vdog2z0XmLO/qrj5lUSJo74djP9mPohqCqJphKkka76HZY2z1HzhITpBADypMV4wlR562lWqjCncMeDmBHEIhfkKM1jIVVEwJ8IZR95vVRCHUJgZvLpcCscU/NGWYTvVsqUFz+UW5j1lssHnuasV/l0im7z0+DzcuO1HUeB8TRTO4G5bzZN2UAghJkggcj2fDQLBhbZAzCx54aCfKwpikjXjBVRy+aqCVsg1oUW4hXdTzcbDDBlyx92iMeWVIchPLUFs5iCO+kuYBe15jx7ydmtrDa7ZdiLPjPHlJe/+F6LglybEiyfIroqBKfhTwxx/D+Z5DfMoAr2Os8Ll4l3n9RROLxGvhbKNASbAxwzmNayT8C9MpQgM3DviNSqJQu0lK2k+Cy1129DibscvTElIoYrbO28QJ6IgC0ydGhWZrcBWwLxIhRkc9suMS16VYlEYKq/wECzg5YW2JOmFktEtgNpQR3gXKeeiXA3/c2A/fGaeIsQ1Yt8lYwwa6ob4Z8d3fxQFpovygnZCF3jW8BhSxkzolVEb7KUojF7Ctr1oANrLkrSplNG9woIYt4xczJIVpfJ0JZA8cFtmHx+5ZgwhAtWSpBqkokAhiinZcFMUyKm1aZ/K1YxuCXxRkHH1ebMs1DioaXoMrzSFMeamOjhRqKaL5QbDFLRxRb6kIVFiljS15EQZXv/dUwSxSVsnvh7gnHAgvSvr8XFEoUar7mbDlm8k4jYoagO+d6JQXhZ3NTm3pYUC9/mp72tceTFeBm42uO2iPGRTIVXhZM/vGFErdzwRz1kEAPc7UEx+OqZozbyVEXJKpSp1NKx7jvkKuiyTZ7gNmPTOyKJwbKTAnQwNbk8hvTNOT+nwTCdKgHSiBAhZFE7GVDJlHBhcJ4f0zjg95RbiDS7cwJn0zu4EN6JCnbMOkTrCgY87xj7vunJAIcL9DqTcIsd8cQOoto8rO85sK2cMdqKQcjPUm4C2i1JXzm/pRKG0ANacCFoZay4mELiLPajm/oMjiiRt0qo99Bl2Aree9K7sGO9Eod6QJQoWgnP2CDaNZBkrxbKklsSJQvUqqAv3snirUuqJhNvDy3YB55DqkIqCzC8ljnjkzMIZ/h6OJpHsvaGKklqsu/P/ICBZmdKWtV8b7t6bTPl4CheiUBeOSValL1CSMGQSYcOj7mReuR55FAXeBWUQfmDYzCyTwFMvE2GBTqo1OHaK84ie2lvYZgitgrOjtg5+SrYMImSgrkkoFIX6ICPJVC8CSm4pDV/Yve3SMY+6k2uVTeGciAITRvWMRHsehTVOtBEX+UEjpWY9TjpDXkKSGkeMpNudIcyw4THmm1KRH6q1Sc5NZZ4onKhbsocjBWUBbfLup+Q6DKxl+KJRRpG59+aiE1yIggGY2lt6WhUnYM+/1JC8TFAX8knjeCcE05yx6OJddwVzlNAsmNOVltJ5Pv+lpUy7irCd79dMzo7xuJ0ibOazXOE/jBvacoWSaL8VCEqY7GBRchtKaQlcQT3imy3saeQ1Za6OvVUWTnBfrLj4TKgIBXkvc4ZKRYG7yC0pfnPCKBSLLm3kXVl1AnWVVaes+5JkdO2BzUuNsoBNgRDht0CQyjU2u6M6Sgj6qA7zmUX+xnqs/+mhLOCCO8dfJ4hBtkJBNtRp4e74pxxad/yTozsorZR6D0pzdEcKFtLMkYKO7vDNC5o9fNPRHVN7JIxjah3dgc6BHejs6I4+10F1y3ZmAUSb96FQSBQXXBxR7SlZMBczveFes0I+T/1UV2+imE8PZ97yinjnJIirvG3p8CqKA9nVWctK3+bxpnEsSRm1iOJosUnzZqryqFUUB9znNhSNfkN+rtYaAI2I4oBZe8V8SyjsMA7OmzqavVFRHJmUhxWoibKGboGe19ROVYIQJUtmW5pLh/gycSsEuou6zVMZwYlyDkSymQKXLnFTylXcbGuKrAlyaRn72YYmwgnGmP8AWSkBGMJyUL0AAAAASUVORK5CYII="
-      alt="" className="panel-icon" />
-    </div>
-  `;
-  }else{
-    return `
-    <div style="position:relative">
-      <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-      </svg>
-      <img width="${width-4}" style="position:absolute;top:0;left:2px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAACXBIWXMAACxKAAAsSgF3enRNAAAHSUlEQVR4nO1dQXIiORDUEnv37IkILvaBu5kXDPuC5Qe2XzD2C3bmBYNfYPiBfzDMC9zc+wCXjuC05gXeEJPCApqm6coSatwZ0eGwI6yWKrukUqmq9Mfb25uJHd1O+5MxpmeMucLjfi9CYox5NcbM8CRptniNfaxREtLttPvGmD6Ebn9ekJpeGmMmIGuSZosJqV0aoiAEGjDAwyTgEBxBz/aJQYNOSki303Yk3JysE5sYg5jnU3UgOCGeNnwzxlwGfXl5zNG/4FoTjBAQcY8n1JQkhZ3ShvYJRUwQQrqd9i0GVhcitmGJuU+zxUj7RaqEwFqyRFyrvSQspiBGzTpTIQTTk52Dv9IbjwOPdnwa0xidkG6nbfcOozPSin2w2nKbZouE2WiL2Vi307YL9ssHIMNgjC9YH2mgaUi30x5FtJ8IjXGaLSjEiAnBejH5IFpRBDuF9aXrimjKasjYgJXBBDKpjMqENGTkQkxKpSnrhGT88tzqh/YCfc9N/yVQ/xwqT19HExKYjKnniRWZl55LfxCw70eTUoWQRHlAc+xjRmm2mGm8oNtp20OuWzyaDs5pmi0OHaRt4ChClE3blYc1hL/IB/YRmp7no0zi0oSg40+Snu3BSYjYhjIxd2XHV4oQuENeGD3bwveQru1D8I4I/lVo/nOZdfAgIehkQv5yVPxALCj540ot8mX2IWw1HqNjUZJhgb710VcWriHLQhRqCEzFn8ROPaTZYkhsTx1wmP4gvufvovOUQxrCFN5d3cgwv7XF9vmO2GShDPYSAquDNYeWtjJiBPrOIuW6yGWfO2VhIZ+RzsBrTYYPoulvz+iv8hb4fRrCigx5OBcyzLumPBCauoCMd7CjIUTtoB3axAaSxyJXS/I0ZEAgY7rvCzgT3GOMElxA1hvII+SgrVwCt3WINK8KjI2h/Tuy3iAEsbbSTeD3mDd9LGCM34XNXULma2xryI4KHYk5ee8SO4YYswQbMl8v6ljM/xM2fjYmblmQTOG/3BTva4hYOz4aGebdFKZpCZMQhjFQV0jHvpa9P2W9Csxdqx1XoYQJ9/jAC2RwLp65yyfEEXAw46Lbac8EBtEyzRarSJWWeffqSvYeQaYqO1/jTP8Fh0hftvxtl/jbV4R5ztihngWQyOACHKynrP4JO3MQNiih22lPsHge4/C0BD1ZEqFVmpDKYIMQSWenWtEh5n16SoSxVS6ATU1bIAPJ7n3FAUND1BIkQcaE5Oi8gLZoTmESWfzWEOw/JANWySZC7BSLDB9PitOXRBZ2HfnUEk5XRjG9a6SYk6ii1QRZ9FooVVEVv+TD2AUsDs14XOtD0to3SWRyJSVEy84PscnUWkskMlkRIslnoLvYsXaEiFbf8bSSIJGJeA3RWD80hBTyXRKZ9KhJnyRIN6nHIJi7pyxiJESUEnYkQifyHESMhHxoNIREhoaQyBAjISGjVVQ2thLESEjIOohqXuqqaAl3lhomasjyehrvksgkaUl3loL/zQXOFUJMJXOl2ooiz0dLqLZabuwQviytU06JTGZSQlQ2VnBja2qJ1Q4t0iUymUnXEKN42DNAhLhW23S4QAUBkhYi5iQDVxkc+tVXIOVOMTxIQogNBXp1Zq/E1FTzznrZsAxSlgFCXSWyWHHgCJF8Mdc4w1ABSOkJ1xSXI65GBmQgyclcccDQEKN4+raCNYXTbNFH4uUxoTZzaEUvQBSjVAYrDppQUl6fKKGkf3p/tAz9U7FBexx6Gyr6HYKOJikIsV6SRKf1DOX7sqS71ib6vTrWsmcSchkwsDkaELTD5BICu19abOWbtCpnneCVVJdg7CfIbrvfxVpy5unQ27hnaofZUzhAYi04lCrWVWeQirrtWKdaeeqjc566MDaGRVmcpw48E1wV12eeHs24E2WZt0TsEIIFhiHMGxT/OitgTIzKrLm1JvedqQ9JDr0f52QKYyyM6nLLfR99LiFgjvV1a2ctBQG5TO79vlowh2ouMqtY17bKA5mMwmrXh8KAmGvAUx3XFPSZWUC6UAZl6vYOyZd7jYtUNhbAtB2SS6s/ptmikJCydXulxbp83CBFWTtvvDK87F8mGVNx3V6HptQ4BaW8F6VCSdEQs3atgx14EoMVhj4kSmSUDqxorquo63UVDs2FLkdB90IXc7orjybSpPyzvfLINJeClUG4S8Ecmmvz9kJ0wWTlhB0v1JO5R6k7xLd9ijKoGlI2QLl6tbmcmANanXtajiE6pLF5jB13zEsHqEmf2NR9/iBT2BTuEOpGlp6F66UQPLLbjgiPWheb0daQPGAzxggIiAVTHB2opW6rEuIAf9FQsWSfNpYgQt3PFoQQs+naZl2nFAIuGCHYEUEwQhxAzEDZwyrFHP17Dn1WE5wQHyixN4ho/zKGlzlkeY8NnJQQB09rXFZUqCltCX/c8ym0IQ9RELINz1XeIxPkCEgYLn0NREnINqBBlhx7sGQf93sRnJveHnKt8g6jv6jMGPM/EOd1a5bYEyQAAAAASUVORK5CYII="
-      alt="" className="panel-icon" />
-    </div>
-  `;
-  }
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    //console.log("zoom change",zoom);
-  }, [zoom]);
-
-
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_tuxiang_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.tuxiang + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [ highlight, zoom, layerVisible ]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'adcd',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      {
-        ( (zoom > 8 || distSq < dist2 || highlight) && (data.level === 5 || data.level === 4) && 
-        // isShow
-        true
-         ) && (
-          <>
-            <div
-              id={`marker_tuxiang_${data.id}`}
-              style={{
-                position: 'absolute',
-                bottom: 0,
-                left: 0,
-                transformOrigin: 'bottom center',
-                transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-                lineHeight: 1,
-                zIndex: data.level === 4?6:4,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-              }}
-              // onClick={showPop}
-            ></div>
-            <div
-              className="markerLabel"
-              style={{
-                // backgroundColor: '#0008',
-                padding: 4,
-                borderRadius: 4,
-                fontSize: 10,
-                lineHeight: 1,
-                top: 0,
-                left: 0,
-                transform: 'translateX(-50%)',
-                zIndex: 3,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
-                color: data.level === 4? 'red':'#0008'
-              }}>
-              {data?.NAME}
-            </div>
-          </>
-        )
-      }
-
-      {
-        ( (zoom > 12 || distSq < dist2 || highlight) && data.level === 6 && 
-        // isShow
-        true
-         ) && (
-          <>
-            <div
-              id={`marker_tuxiang_${data.id}`}
-              style={{
-                position: 'absolute',
-                bottom: 0,
-                left: 0,
-                transformOrigin: 'bottom center',
-                transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-                lineHeight: 1,
-                zIndex: 2,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-              }}
-              // onClick={showPop}
-            ></div>
-            <div
-              className="markerLabel"
-              style={{
-                // backgroundColor: '#0008',
-                padding: 4,
-                borderRadius: 4,
-                fontSize: 10,
-                lineHeight: 1,
-                top: 0,
-                left: 0,
-                transform: 'translateX(-50%)',
-                zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
-                color: !layerVisible.SatelliteImage?'#0008':'#fff'
-              }}>
-              {data?.NAME}
-            </div>
-          </>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(AdcdMarker);
diff --git a/src/views/Home/MapCtrl/Markers/ForecastLayer.js b/src/views/Home/MapCtrl/Markers/ForecastLayer.js
deleted file mode 100644
index 646796b..0000000
--- a/src/views/Home/MapCtrl/Markers/ForecastLayer.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// import clone from "clone";
-import BaseLayer from "../baselayer";
-import ForecastMarker from "./ForecastMarker";
-import {config} from "../../../../config";
-import staticData from '../../../staticData';
-
-export default class ForecastLayer extends BaseLayer {
-  static LayerName = 'ForecastLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return ForecastLayer.LayerName;
-  }
-
-  onAdd() {
-    /*this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: staticData.ybyjData[0]?.submergeDetails[0].townList || []
-    });*/
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.ForecastLayer;
-    if (highlights !== this._setting?.highlight?.ForecastLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return ForecastMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/ForecastMarker.js b/src/views/Home/MapCtrl/Markers/ForecastMarker.js
deleted file mode 100644
index 8241a0e..0000000
--- a/src/views/Home/MapCtrl/Markers/ForecastMarker.js
+++ /dev/null
@@ -1,218 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { zindexmarker } from '../zindex';
-import {Button, Modal, Tabs, message} from "antd";
-import staticData from '../../../staticData';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ type }, { width, highlight }) {
-  let color1;
-  if (type === 0) {
-    color1 = '#FF0000';
-  } else if (type === 1) {
-    color1 = '#F39800';
-  } else if (type === 2) {
-    color1 = '#F39800';
-  }
-
-  /*return `
-    <div style="cursor:pointer">
-      <svg fill="${color2}" t="1668582218569" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3035" width="${width}" height="22">
-        <path d="M810.666667 170.666667a128 128 0 0 1 128 128v426.666666a128 128 0 0 1-128 128H213.333333a128 128 0 0 1-128-128V298.666667a128 128 0 0 1 128-128h597.333334z m-347.008 359.594666a85.333333 85.333333 0 0 0-115.370667-0.384l-5.205333 5.205334-148.949334 161.28a42.666667 42.666667 0 0 0 26.368 71.338666l4.949334 0.298667H801.706667a42.666667 42.666667 0 0 0 32-70.826667l-97.194667-110.336a41.386667 41.386667 0 0 0-55.466667-0.768l-3.754666 3.754667-77.952 73.514667-2.005334 2.56-130.730666-132.778667-2.901334-2.858667zM704 341.333333a64 64 0 1 0 0 128 64 64 0 0 0 0-128z" p-id="3036" fill="#1296db"></path>
-      </svg>
-    </div>
-  `;*/
-
-  return `
-    <div style="cursor:pointer">
-      <svg fill="${color1}" t="1668582218569" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3035"
-         width="${width}" height="33"
-       >
-        <path d="M1011.982 842.518 606.673 140.565c-49.575-85.822-130.595-85.822-180.157 0L21.205 842.518c-49.562 85.91-9.015 155.99 90.04 155.99l810.693 0C1020.997 998.507 1061.502 928.423 1011.982 842.518zM460.924 339.737c14.565-15.747 33.082-23.622 55.665-23.622 22.595 0 41.095 7.792 55.675 23.307 14.485 15.55 21.725 34.997 21.725 58.382 0 20.12-30.235 168.07-40.32 275.704l-72.825 0c-8.845-107.635-41.652-255.584-41.652-275.704C439.194 374.774 446.446 355.407 460.924 339.737zM571.244 851.538c-15.32 14.92-33.55 22.355-54.65 22.355-21.095 0-39.33-7.435-54.647-22.355-15.275-14.885-22.867-32.915-22.867-54.09 0-21.065 7.592-39.29 22.867-54.565 15.317-15.28 33.552-22.92 54.647-22.92 21.1 0 39.33 7.64 54.65 22.92 15.265 15.275 22.875 33.5 22.875 54.565C594.119 818.623 586.509 836.653 571.244 851.538z" p-id="2697"></path>
-       </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function ForecastMarker({ data, dispatch, setting, zoom, distSq }) {
-  //console.log("ForecastMarker",data);
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.type) {
-    zindexOffset = 0;
-  } else if (data.type) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 14;//12
-
-    const placeholder = document.getElementById(`marker_forecast_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-      //console.log(placeholder);
-      const el = placeholder.firstChild;
-      //console.log(el);
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.tuxiang + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    setActiveKey("1");
-    setVisible(true);
-
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'forecast',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  };
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-
-  const [visible, setVisible] = useState(false);
-  const [modalData, setModalData] = useState(staticData.yjfsjlData);
-  const [modalTitle, setModalTitle] = useState("");
-  const [activeKey, setActiveKey] = useState("1");
-
-  useEffect(() => {
-    if(data.status === 0){
-      setModalTitle("预警核实");
-    }else if(data.status === 1){
-      setModalTitle("发布外部预警");
-    }else if(data.status === 2){
-      setModalTitle("灾情上报");
-    }
-    setModalData(staticData.yjfsjlData);
-  }, []);
-
-  return (
-    <>
-      <div
-        id={`marker_forecast_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%) ${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-
-      {/*<Modal
-        visible={visible}
-        width={960}
-        style={{top:"60px"}}
-        title={<div className="clearFloat">
-          <span className="lf" style={{width:"3px",height:"20px",background:'#0075F9',margin:"4px 8px 0 0",letterSpacing:"1px"}}></span>
-          <span className="lf" style={{lineHeight:"27px",marginRight:"10px",fontWeight:"bold"}}>{modalTitle}</span>
-        </div>}
-        className="homeModal"
-        onCancel={()=>{setVisible(false);setActiveKey("1");}}
-        footer={data.status === 0?[<Button type="primary" style={{marginRight:"20px"}} >发布内部预警</Button>,<Button type="primary"  >关闭预警</Button>]:
-          data.status === 1?[<Button type="primary" style={{marginRight:"20px"}} >发布外部预警</Button>,<Button type="primary"  >关闭预警</Button>]:[]}
-      >
-        <Tabs defaultActiveKey={activeKey}>
-          <Tabs.TabPane tab="基础信息" key="1">
-            <BasePage statusVal={data.status} tabsData={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="关联站点" key="2">
-            <StationWarnPage yjlx={data.yjlx}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="预警配置信息" key="3">
-            <WarnConfigPage record={modalData}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="预警发送记录" key="4">
-            <WarnMsgPage record={modalData}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="预警指标" key="5">
-            <WarnIndicatorsPage />
-          </Tabs.TabPane>
-        </Tabs>
-      </Modal>*/}
-    </>
-  )
-}
-
-export default React.memo(ForecastMarker);
diff --git a/src/views/Home/MapCtrl/Markers/FzdxLayer.js b/src/views/Home/MapCtrl/Markers/FzdxLayer.js
deleted file mode 100644
index f795144..0000000
--- a/src/views/Home/MapCtrl/Markers/FzdxLayer.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// import clone from "clone";
-import BaseLayer from "../baselayer";
-import FzdxMarker from "./FzdxMarker";
-import {FzdxPromise} from "../../../../models/_/base";
-import {DcpjPromise} from "../../../../models/_/dcpj";
-
-export default class FzdxLayer extends BaseLayer {
-  static LayerName = 'FzdxLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return FzdxLayer.LayerName;
-  }
-
-  async onAdd() {
-    const FzdxData = await DcpjPromise("fzdx");
-    if(FzdxData.length>0){
-      FzdxData.map(o=>{
-        o.stcd = o.ADCD
-      });
-    }
-
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: FzdxData || []
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.FzdxLayer;
-    if (highlights !== this._setting?.highlight?.FzdxLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return FzdxMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/FzdxMarker.js b/src/views/Home/MapCtrl/Markers/FzdxMarker.js
deleted file mode 100644
index a52e832..0000000
--- a/src/views/Home/MapCtrl/Markers/FzdxMarker.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ level }, { width, highlight }) {
-  let color1 = '#DF5512';
-
-  return `
-    <div style="cursor:pointer">
-      <svg fill="${color1}" t="1673850589843" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4229" width="${width}" height="22">
-        <path d="M552.96 643.072H471.04c-9.728 0-17.92-7.68-17.92-17.408L429.056 148.48c-0.512-10.24 7.68-18.944 17.92-18.944h129.024c10.24 0 18.944 8.704 17.92 18.944l-23.552 477.696c0 9.216-7.68 16.896-17.408 16.896z" p-id="4230"></path>
-        <path d="M512 817.664m-105.472 0a105.472 105.472 0 1 0 210.944 0 105.472 105.472 0 1 0-210.944 0Z" p-id="4231"></path>
-        </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function FzdxMarker({ data, dispatch, setting, zoom, distSq }) {
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 22;
-
-    const placeholder = document.getElementById(`marker_fzdx_${data.ADCD}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.tuxiang + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [ highlight ]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.ADCD,
-      type: 'adcd',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_fzdx_${data.ADCD}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-
-      {
-        (zoom > 14 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.NAME}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(FzdxMarker);
diff --git a/src/views/Home/MapCtrl/Markers/GongShuiLayer.js b/src/views/Home/MapCtrl/Markers/GongShuiLayer.js
deleted file mode 100644
index f17abb2..0000000
--- a/src/views/Home/MapCtrl/Markers/GongShuiLayer.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { GongShuiPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import GongShuiMarker from "./GongShuiMarker"
-
-export default class GongShuiLayer extends BaseLayer {
-  static LayerName = 'GongShuiLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return GongShuiLayer.LayerName;
-  }
-
-  onAdd() {
-    GongShuiPromiseWX.get().then((data) => {
-      const list = data.map((i)=>{
-        return {
-          id : i.stcd,
-          ...i
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.GongShuiLayer;
-    if (highlights !== this._setting?.highlight?.GongShuiLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return GongShuiMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/GongShuiMarker.js b/src/views/Home/MapCtrl/Markers/GongShuiMarker.js
deleted file mode 100644
index 0d23f60..0000000
--- a/src/views/Home/MapCtrl/Markers/GongShuiMarker.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-import { useDispatch, useSelector } from 'react-redux';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  let color1;
-  color1 = '#1296db';
-
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAABFNJREFUSEudlWtMm2UUx/+npS2lpaUt7aDQcVXGYG7TAjpnFrMtjm1uAy/RL2ZzGWEzfjBZXBgiIIZlRLNPbsyZ4UyMi4kwFGQRNSYOhwNv3AbJuIzScjEttLR0FOhj3teWlLY0zvdbcy6/55zz7zmECB9jTAXgMIBDADYD0PvcLQAGAHwNoJmIZtdLQ+EMjLFoAG8tMbzdZnHGtU0u4K+5RUw9WOHdE6KF2BonQWFiDAr18jkRoQ7ABSJ6EJwvBMAYSwJwo9XiMlb323B/YTlSkUiJiUJljhoH9LJuAEeIyBwYsAbAJfcy1lnTb0u+OOyImDjYeCpDgYoc9YSA6MlAyCrA15afq/usxkjJRQQssfBsDlKZq+EqecbfrkBAWavFVft610zY6ONpsXjzkTgkSqNgWljCh0Nz+GLcGeJ7NU/HtessEZ3jjDyAU4vHy0Z3/jChDNfzU5kKlGYoUd5jxYDDg6fio1GZo0FVnxWfB0G4mdzanWwXCyiNU5cfcLTZ7Gwo6f475EVcSwYKN+K1X6dx27rI2zViAXZvkOJsthrbvjOFxFwxanEoSX6MiD71AxpPds8UNZpdIc7JUiE69xjwYsck1BIhtBIh9iXE4NqYA9cKEpDZOob55bVDKU6S4ZJR10RExX7A4I7vTVnDrlBJigXA8P4UHOmYgtm9jB2aaAzNe5AqE+HCtng82jYe8qgMWRR+2WMYIqJNfoAjvWUs1rUSXh61W9TYrpKgpGsGJvcKsmJFaMjXodnswvnBuRCATEgYOZg6T0QKP8CZ2jImc68D4OZQtzUeLxnkcC57ERsl4Fv0Tp8N3jBvkgoJYwdTXUQk9wNG8ttNaeEUpBQJ+FZw8uUqOZ6uxNVRB8p6rKjYrMLFe3ZYPd41VXBKurPXMEpE6X7AV6XdM8VNQUPepZXislELlViI8l4r3shUQi+NwqR7GR/ds6MmVw37khev3J7CH3OeVUhRkgz1Rl0jEb3gB5Q2TTgvlf62VqbPJcTgs4INfGDtgA2lmUqoxULYPCu4PGxHWbaatx2+ZUGnT8Lc7/ontChKlp8kono/QLHkZab8dpPC4tuYnOP/AeijhVx7HCIBGYjIEbgqKr+1uKqOBawKrv8FaglOZ6lw9M40D9ykEPMyvTm5gBs7E3Hu7izapxfg9P0XGvJ02K+XVRFR9eqq8K0LMYCuil7rYx+PPNwm9Te/JF2Bmi2aHgB5RMQPJXhdG7wMHe/2WQ1XHhJyIl2B93I1JgHhaSJa3R/hDk4KgMZvzM7Hq/ptmHD/e8XW+7hVUpWjxvNJ8t8BFBPR/UDfSCfz9KKXnbk56ZJfH3fixxn3GsazOile3SjHvkSZUyKg8wA++E8nMzALY0wJ4GXuPn8yYs8u77Xx5vdz1TiRobzL3WEAXxKRfb0Kw1YQ7MwYUwD4qW5wdjtjwJls1Z8AdnEyjNi/4CFHcmaMaQG0+GIOEFHo8QiT4B9CpcwoDsGItwAAAABJRU5ErkJggg==" alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function GongShuiMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-  const getLayerVisible = useSelector((s) => s.map.layerVisible)
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 20;
-
-    const placeholder = document.getElementById(`marker_gongshui_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.gongshui + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'gongshui',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 14) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_gongshui_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          fontWeight:"bold",
-          fontSize:16,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.gongshui + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              // backgroundColor: '#0008',
-              width:"100px",
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              top:25,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.gongshuiLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `rgba(0, 0, 0, 0.533)`,
-              // textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.v || '-'}
-          </div>
-        )
-      }
-      {
-        (zoom > 10 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              // backgroundColor: '#0008',
-              padding: "2px 0",
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.gongshuiLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
-              color: !getLayerVisible.SatelliteImage?'#0008':'#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(GongShuiMarker);
diff --git a/src/views/Home/MapCtrl/Markers/HdswAllLayer.js b/src/views/Home/MapCtrl/Markers/HdswAllLayer.js
deleted file mode 100644
index 96a424e..0000000
--- a/src/views/Home/MapCtrl/Markers/HdswAllLayer.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { HDRealPromiseWX2,HDRealPromiseWX3 } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import HdswAllMarker from "./HdswAllMarker";
-
-export default class HdswAllLayer extends BaseLayer {
-  static LayerName = 'HdswAllLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return HdswAllLayer.LayerName;
-  }
-
-  onAdd() {
-    HDRealPromiseWX2.get().then((data) => {
-
-      // const sh = data.filter(o => o.source==='SH')
-      // const sw = data.filter(o => o.source==='SW')
-      // const sk = data.filter(o => o.source==='SK')
-    
-      HDRealPromiseWX3.get().then((data2) => {
-        const list1 = data||[]
-        const list2 = data2||[]
-
-        const list = [...list1,...list2]
-        this._dispatch.runtime.setMarkers({
-          [this.getLayerName()]: list || []
-        });
-      })
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.HdswAllLayer;
-    if (highlights !== this._setting?.highlight?.HdswAllLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return HdswAllMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/HdswAllMarker.js b/src/views/Home/MapCtrl/Markers/HdswAllMarker.js
deleted file mode 100644
index 0045861..0000000
--- a/src/views/Home/MapCtrl/Markers/HdswAllMarker.js
+++ /dev/null
@@ -1,230 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-import {useSelector} from "react-redux";
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ status, warning, source }, { width, highlight }) {
-  let color1, color2;
-
-  color1 = '#0f0';
-  color2 = '#17abe3';
-  // if (status !== "1") {
-  //   color1 = '#888';
-  //   color2 = '#17abe3';
-  // } else if (warning === "3") {
-  //   color1 = '#f00';
-  //   color2 = '#ec4e4e';
-  // } else if (warning === "2") {
-  //   color1 = 'yellow';
-  //   color2 = '#ec4e4e';
-  // } else if (warning === "1") {
-  //   color1 = 'yellow';
-  //   color2 = '#ec4e4e';
-  // } else {
-  //   color1 = '#0f0';
-  //   color2 = '#17abe3';
-  // }
-
-  return `
-    <div style="cursor:pointer">
-      <svg t="1619076397355" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4205" width="${width}" height="${width}">
-    </svg>
-        <div style="display:flex;alignItems:center;margin-top:6px"}}>
-            <div style="width:0px;height:0px; border-left:10px solid transparent; border-right:10px solid transparent; border-top:25px solid #0f0;position:relative">
-                <div style="position:absolute;left:-6px;top:-22px;font-size:12px">
-                ${{'SH':'山','SW':'水','QX':'气','SK':'工'}?.[source]}
-                </div>
-            </div>
-        </div>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function HdswAllMarker({ data, dispatch, setting, zoom, distSq }) {
-
-
-  const sqz = useSelector((s) => s.map.sqz);
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_hdsw_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.hdsw + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight, sqz]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'hdsw',
-      data:{...data,xiangqingShow:'不显示'},
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-
-  const isShow = ()=>{
-    if(sqz && data.source && sqz[data.source]){
-        return true
-    }else{
-        return false
-    }
-  }
-
-  return (
-    <>
-    {
-        isShow()?<div
-        id={`marker_hdsw_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.hdsw + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>:null
-    }
-      {
-        (zoom > 14 || distSq < dist2 || highlight) && isShow() && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.hdswLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.stnm}
-          </div>
-        )
-      }
-      {
-        (zoom > 14 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.hdswLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000',
-              minWidth:"20px"
-            }}>
-            {
-              /*(!data.rz || !(data.state === 1 || data.rzState === 1)?"-":data.rz.toFixed(2))*/
-              // (!data.z || !(data.status === "1" || data.rzState === 1)?"-":data.z.toFixed(2))
-              (!data.z?"-":data.z.toFixed(2))
-            }m
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(HdswAllMarker);
diff --git a/src/views/Home/MapCtrl/Markers/HdswLayer.js b/src/views/Home/MapCtrl/Markers/HdswLayer.js
deleted file mode 100644
index 56a9eb3..0000000
--- a/src/views/Home/MapCtrl/Markers/HdswLayer.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { HDRealPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import HdswMarker from "./HdswMarker";
-
-export default class HdswLayer extends BaseLayer {
-  static LayerName = 'HdswLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return HdswLayer.LayerName;
-  }
-
-  onAdd() {
-    HDRealPromiseWX.get().then((data) => {
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: data || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.HdswLayer;
-    if (highlights !== this._setting?.highlight?.HdswLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return HdswMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/HdswMarker.js b/src/views/Home/MapCtrl/Markers/HdswMarker.js
deleted file mode 100644
index 10f87bc..0000000
--- a/src/views/Home/MapCtrl/Markers/HdswMarker.js
+++ /dev/null
@@ -1,210 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ status, warning }, { width, highlight }) {
-  let color1, color2;
-
-  color1 = '#0f0';
-  color2 = '#17abe3';
-  // if (status !== "1") {
-  //   color1 = '#888';
-  //   color2 = '#17abe3';
-  // } else if (warning === "3") {
-  //   color1 = '#f00';
-  //   color2 = '#ec4e4e';
-  // } else if (warning === "2") {
-  //   color1 = 'yellow';
-  //   color2 = '#ec4e4e';
-  // } else if (warning === "1") {
-  //   color1 = 'yellow';
-  //   color2 = '#ec4e4e';
-  // } else {
-  //   color1 = '#0f0';
-  //   color2 = '#17abe3';
-  // }
-
-  return `
-    <div style="position:relative">
-      <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-      </svg>
-      <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA1CAYAAAAgYencAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAJLSURBVFhHxZk/T8JAGIcBo8HBhMTFmDgbJ930Uxg/pnECYqJlUiZ10k033dRFoiCl/LO/9lqupXd977w7nqW9K4GH6/v+eoRqtV6tbxxvnlRWwNyf+5HAzuf+F45s3hnDi+/zGixGnf41m3NK+LleDSd++6cVzTjGb/ebsYA3cL4Cwf3wbtab9iKB2cfkHRPRFUeMOgMPx0gAJBOuCG97E8dUIJlwwfRt/Dp+8h9xngpgAhfY0Cq+t+i6VADwF2wSVn/adVkB7oItkDtBd3DDhlkBXMAL2NAKCD3+MzICLlIxH3oZAWA7FfOhtyxgMRWj9AtDjw0jlgRspmJR2C0JAFupWBR2hQI2UhErm6QfT6GAjVQU1VahADCdiqLuEgsYTEVZvggFTKai7L2EAiZTUbaaQgFgKhVl9SQXMJCKZR0lFTCRimXFLBUA/03FsjoiCOgXImUFSwWKnmBUKDVUKgB0i5HSRTQBjXZEjgTd33TvJ4IkgDpQTcXxQ/zTiw2FkATib7PYyVIYtmirRhIAqg8n6p6CLqDweJ68BM/U/QRZgP89Vwb12wOyAKDehrBoyempJEBJRVT+6La8/RKUBCipGK6S0oZWSQCUpaLK8gN1AUkqxrsotdhWFpClIjX9eJQFZKlITT8eZQEgakdKl+TREyhIRQQVEpANyWgJFKWiSvrxaAmA/G3Q2TMAbQH+fqPydXfP2gJ8KqL3VTcsCdoCIElF1fQzRv1062w3OJjXGmsNNuUW/Muyfbl3xYarYf2wfsRONahU/gBd1OeNjK84SwAAAABJRU5ErkJggg==" 
-      alt="" className="panel-icon" />
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function HdswMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 8;
-
-    const placeholder = document.getElementById(`marker_hdsw_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.hdsw + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'hdsw',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_hdsw_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.hdsw + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-      {
-        (zoom > 14 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.hdswLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.stnm}
-          </div>
-        )
-      }
-      {
-        (zoom > 14 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.hdswLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000',
-              minWidth:"20px"
-            }}>
-            {
-              /*(!data.rz || !(data.state === 1 || data.rzState === 1)?"-":data.rz.toFixed(2))*/
-              // (!data.z || !(data.status === "1" || data.rzState === 1)?"-":data.z.toFixed(2))
-              (!data.z?"-":data.z.toFixed(2))
-            }m
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(HdswMarker);
diff --git a/src/views/Home/MapCtrl/Markers/HeLiuZhuJiLayer.js b/src/views/Home/MapCtrl/Markers/HeLiuZhuJiLayer.js
deleted file mode 100644
index b7f18e4..0000000
--- a/src/views/Home/MapCtrl/Markers/HeLiuZhuJiLayer.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import BaseLayer from "../baselayer";
-import HeLiuZhuJiMarKer from "./HeLiuZhuJiMarKer";
-import {HeLiuPromise, xzList} from "../../../../models/_/common";
-
-export default class HeLiuZhuJiLayer extends BaseLayer {
-  static LayerName = 'HeLiuZhuJiLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return HeLiuZhuJiLayer.LayerName;
-  }
-
-  async onAdd() {
-    const agnp = await HeLiuPromise.get();
-    const xzLabel = agnp.map(o => ({
-      ...o,
-      id:o.FeatureID,
-      TEXTSTRING:o.TextString,
-      CODE:o.ADCODE99,
-      NAME:o.LAST_NAME9,
-      stcd: o.ADCD,
-      type: 'label'
-    }))
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: xzLabel || []
-    });
-  }
-  
-  setSetting(setting) {
-    const highlights = setting?.highlight?.HeLiuZhuJiLayer;
-    if (highlights !== this._setting?.highlight?.HeLiuZhuJiLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      }); 
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return HeLiuZhuJiMarKer;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/HeLiuZhuJiMarKer.js b/src/views/Home/MapCtrl/Markers/HeLiuZhuJiMarKer.js
deleted file mode 100644
index 1dd8283..0000000
--- a/src/views/Home/MapCtrl/Markers/HeLiuZhuJiMarKer.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ level }, { width, highlight }) {
-  let color1= 'red'
-
-  return `
-    <div style="cursor:pointer">
-      <svg fill="${color1}" t="1673677830289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="112679" width="${32}" height="32">
-        <path d="M798.235936 511.99828c0 157.609784-127.772934 285.377557-285.374116 285.377557s-285.374116-127.767773-285.374117-285.377557c0-157.611504 127.772934-285.374116 285.374117-285.374117s285.374116 127.764333 285.374116 285.374117z" p-id="112680"></path>
-        <path d="M512.860099 511.99828m-220.653353 0a220.653353 220.653353 0 1 0 441.306706 0 220.653353 220.653353 0 1 0-441.306706 0Z" fill="#8DCDB5" p-id="112681"></path>
-        <path d="M512.860099 511.99828m-179.46491 0a179.464911 179.464911 0 1 0 358.929821 0 179.464911 179.464911 0 1 0-358.929821 0Z" fill="#69C0A3" p-id="112682"></path>
-        <path d="M512.860099 511.99828m-123.565327 0a123.565327 123.565327 0 1 0 247.130655 0 123.565327 123.565327 0 1 0-247.130655 0Z" p-id="112683"></path>
-      </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function HeLiuZhuJiMarKer({ data, dispatch, setting, zoom, distSq, layerVisible }) {
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    //console.log("zoom change",zoom);
-  }, [zoom]);
-
-
-  useEffect(() => {
-    const width = 32;
-
-    const placeholder = document.getElementById(`marker_heliuzhuji_${data.CODE}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.xianzhuji + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [ highlight, zoom ]);
-
-  
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-        <div
-            className="markerLabel"
-            style={{
-            // backgroundColor: '#0008',
-            color: 'rgba(0,161,233)',//data.CODE==='422826'?'rgba(230,0,0)':'#595959',
-            padding: 4,
-            borderRadius: 4,
-            fontSize: data.FONTSIZE==='9'?14:10,
-            // fontWeight:data.CODE==='422826'?700:400,
-            lineHeight: 1,
-            top: 0,
-            left: 0,
-            transform: 'translateX(-50%)',
-            // zIndex: zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.TEXTSTRING}
-        </div>
-    </>
-  )
-}
-
-export default React.memo(HeLiuZhuJiMarKer);
diff --git a/src/views/Home/MapCtrl/Markers/PicStLayer.js b/src/views/Home/MapCtrl/Markers/PicStLayer.js
deleted file mode 100644
index d6e3cd2..0000000
--- a/src/views/Home/MapCtrl/Markers/PicStLayer.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// import clone from "clone";
-import { PicStMapDataPromise } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import PicStMarker from "./PicStMarker";
-
-export default class PicStLayer extends BaseLayer {
-  static LayerName = 'PicStLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return PicStLayer.LayerName;
-  }
-
-  onAdd() {
-    PicStMapDataPromise().then((data) => {
-
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: data || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.PicStLayer;
-    if (highlights !== this._setting?.highlight?.PicStLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return PicStMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/PicStMarker.js b/src/views/Home/MapCtrl/Markers/PicStMarker.js
deleted file mode 100644
index 5b6d844..0000000
--- a/src/views/Home/MapCtrl/Markers/PicStMarker.js
+++ /dev/null
@@ -1,178 +0,0 @@
-import React, { useEffect } from 'react';
-import { Table, Tabs,Modal,message,Tooltip } from 'antd';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ alarm, status }, { width, highlight }) {
-  let color1, color2;
-  if (!status) {
-    color1 = '#1296db';
-    color2 = '#17abe3';
-  } else if (alarm) {
-    color1 = '#1296db';
-    color2 = '#ec4e4e';
-  } else {
-    color1 = '#1296db';
-    color2 = '#17abe3';
-  }
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAA8BJREFUSEudlX9M1GUcx9/v41fBdWoac+hxgq3ENSHvDhNHNP+SYULnbAkFuBrUygx1peUCKmy0jJk1Q9oCF7HVONHhMFulMSC5I6k/wJp2HkfMUkv5pcB972nPed92h8eddH/e8/68X9/Pj+f5ECF+Qoh5AHIBbACwHECCTz4EoA/AMQBHSf4zkw2DHQgh7gJQNuVRXj0+0D23zdWD3qsXcGn8ls/C2HlIm78U2XojchLTr0VpIt4DUEPy5nS/2wBCiEUAWlqd3aaKnkZcHP0rVJJYoo1HhbEA6w3pdgB5JP/wDwgASHOP8PxY2dO0+OO+1pDG0w9fXL4e5cbNgxpqHvGH/AfwlaW93N5omq25CpOQSlOBzCRTLZc/YHers3tv8emaWX35dHF9Vpks1+sk35VnXoCclknF7cg4umOOWnMNg/Y/wE8IQEAE/Cd70pm773p0RGSSnC4VUNxyseuz53740Ct+5aFc7Fn5VNhMFI8Hj39die7LvwVoP330ZeQtWb2FZL0KsJa2f/REs6PDK9xrLkJJyrqwACko/H4frk6MQPEosF85743ZmLQGtZkvHSFpUQHnVrWUPXhh+NKMgO1dddixwoJFcfMDwOPuCcRGxuDk4FnkfyevA7BUtxBn8mp+JblMBQwbvii+Z8w9MSMguelZkMT+1SWyibdl983gWWz2AeIiY+DMrx8hqVMBo/rGorgbymRIwE1lEtXpW/DMA2tDAu6OiIaroGGMpFYF/G60bkty+m5tsB7ktJWjylyEtAXJQXvjn4FBG48ey34HyWQV0FzafsDS7OicdZOPODqRqI1H37UBlHXV+ZqcgdrMrVaSG1XA81ZH58GS9gNewa7UTdiZagk7RUII5J18Gx1/9gdoD2VuhSUp4wWSn6gA3ZTH7TJat+mGxv/23r650dqwALdQMDJ1I0CXEHuvLM9wlCZST3LY/6koPz5gqyg69UFY41CChse2IyfRXEGyUur8AdEAbG/YDq+o7W/7X5DSlGxUmQt/AWAm6R3J6c+13iNExx7bYf2hcydmBSlZtg7vmAtdGnINSZcaHGzhGABYjznPrHzT/jkGx66EBC2OW4C3TE9jg2HVTwAsJJ3+AaFW5s4JZeq1Npdd23T+NL4d+jkAtDYhFfn3ZyFbbxqNiYiqBvD+Ha1MfxchxBwAT8r9XNd/ImW3rcF7XGUuRGlKtpxNuTy+JHl9pjTDP/q39oUOwKnq3q8elq//rrRNvQCy5BiGa9QdAaSJEOI+AHJRy5gckpfDmcvzfwGAPogoI769tgAAAABJRU5ErkJggg==" alt="" className="panel-icon" />
-  </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function PicStMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_tuxiang_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.tuxiang + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'tuxiang',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-    <Tooltip title={data.name}>
-      <div
-        id={`marker_tuxiang_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-    </Tooltip>
-      {
-        // (zoom > 12 || distSq < dist2 || highlight) && (
-        //   <div
-        //     className="markerLabel"
-        //     style={{
-        //       backgroundColor: '#0008',
-        //       padding: 4,
-        //       borderRadius: 4,
-        //       fontSize: 10,
-        //       lineHeight: 1,
-        //       top: 0,
-        //       left: 0,
-        //       transform: 'translateX(-50%)',
-        //       zIndex: zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-        //     }}>
-        //     {data?.stnm}
-        //   </div>
-        // )
-      }
-    </>
-  )
-}
-
-export default React.memo(PicStMarker);
diff --git a/src/views/Home/MapCtrl/Markers/QSYDWLayer.js b/src/views/Home/MapCtrl/Markers/QSYDWLayer.js
deleted file mode 100644
index cd8f974..0000000
--- a/src/views/Home/MapCtrl/Markers/QSYDWLayer.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { DzzhdPromise } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import QSYDWMarker from "./QSYDWMarker"
-
-export default class QSYDWLayer extends BaseLayer {
-  static LayerName = 'QSYDWLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return QSYDWLayer.LayerName;
-  }
-
-  onAdd() {
-    DzzhdPromise.get().then((data) => {
-      const list = data.map((i)=>{
-        return {
-            id : i.eicd,
-            ...i
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.QSYDWLayer;
-    if (highlights !== this._setting?.highlight?.QSYDWLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return QSYDWMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/QSYDWMarker.js b/src/views/Home/MapCtrl/Markers/QSYDWMarker.js
deleted file mode 100644
index 547d1e0..0000000
--- a/src/views/Home/MapCtrl/Markers/QSYDWMarker.js
+++ /dev/null
@@ -1,198 +0,0 @@
-import React, { useEffect } from 'react';
-// import { zindexmarker } from '../zindex';
-const zindexmarker = {
-    z:36,
-    hilightPlus:40,
-    zLabel:56
-}
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    aa
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAADOFJREFUeF7tncFvHGcVwN83duN1WlRQW1GFUtFkHUdUouxKXOCSSPwDHEBIHCMqxKmovRRBPE4BIa3FAU4ICXHhBCc4IA6QIHFBVF4LoSqJXagoClEPgKqQrJN4H5pdu7Ed27vzvpnvm/H8LEU5eN573/d7389vZr22nfABAQgcSsDBBgIQOJwAgnA6IHAEAQTheEAAQTgDELARYILYuBHVEAII0pBGs00bAQSxcSOqIQQQpCGNZps2Aghi40ZUQwggSEMazTZtBBDExo2ohhBAkIY0mm3aCCCIjRtRDSGAIA1pNNu0EUAQGzeiGkIAQRrSaLZpI4AgNm5ENYQAgjSk0WzTRgBBbNyIaggBBGlIo9mmjQCC2LgR1RACCNKQRrNNGwEEsXEjqiEEEKQhjWabNgIIYuNGVEMIIEhDGs02bQQQxMaNqIYQQJBj3ujF9H+nrqeP3zzm2yxtewhSGto4iRe/dfeF4ax2RFxHnOuo6psb6XwaZzX1r4ogNe/h4huDRVXX0aF2xElHZPTv6Z1tqeoygtibjCB2dlEiF9Pbn1I309FsQmgmhcuE+NBhi0EQvzYhiB+/cqNTTRblflfd1liI0W2TdkRlbtrCCDItqYOvQxA/foVGP/eNd+fnnnq2M7OlHdWt7vZ0yCaE+QNBzOhGgQjix88r+vT39Um3OejOZLdJQ9fRbDqIvOiVdF8wgvjRRBA/frmi29/TZ+T+5mgyJCLZK0xdEWnnSpLzYgTJCWzf5Qjix+/I6HZ65zlxSUdEu4m4jo5fYXq+xJKPpEYQP9oI4sdvT/RCOjit4rKpMHqYHk0JkWcLLJE7FYLkRrYnAEE8+J1NN89pIt3RrZKTTqIjIT7ikbLwUATxQ4ogOfidvXzvpdGrS6OXXLMpMfpexOM5UgS/FEH8kCPIIfzOp1dmbyaf66gOu7I9IbbFmPVDHjYaQfx4I8g2v1OpnnxCB11NsqnguqNvyIm85Ic3fjSC+PWgsYJ8ItUPz8mgO0yyh+rRrVL2cH3OD2f1ohHEryeNEeSFb97+aDI/25lRN36oHr/ketoPX/WjEcSvR8dWkDPfufNxtzXTHb/UmgmR/XMf88NVv2gE8evZsRGk/cbgjAxdN9FhV0V23sf0jB+eSkVfEye3ROV8nlUhSB5aj15bW0Ha6eYnRz//oNp1iew8Rzzph6NS0Wsiri+qay7R/uyw1b+fbP4aQcL2qDaCLKT3Pq3JVjd7hWn8to3Rc0QrLK6Sqjm3KTpcE3V9SaTvJOmfGj7Wv5q6B7srLlweXEGQknpwSNpaCLKwPHhz+6E6CYuntGrvi0hfnPRdNiE06V9P5/4yqRqCTCJU/OfrIogWv/WgGd8TlbWREOL6iWr/Wtq6kXcFCJKXmP/1COLP8KAM746nQ/YM8WDtgSarf1ue/4dvKQTxJZg/HkHyMzvopY51l00Icf0t1b7I3OrbqXuviNQ8gxRNMV8+BMnHa+fqv2a3SkPR7FWmvkhrdSN12XNFqR9MkFLxHpgcQSYxd7KV3SoNs1eZnFsVHfZPyPzqW6m7Nym06M8jSNFEJ+dDkEcZ3dHsFSaVvnPJavb/enpibTLK8q9AkPIZ76+AIOL+LaNbpexlV7fqVPo30rlr4VsxuSKCTGZU9BUNFET/JZLdKmXPDtqfEbd6LZ1/p2iwZeRDkDKoHp2zCYL8fSSEjL4p15+Vuez54VZ41P4VEcSfYd4Mx1YQJ/JaJsSmtFbfSd1/84Kp4vUIEr4rx1YQVb2wkc5fDY+0vIoIUh7bwzIjSHjm5ooIYkZnDkQQM7rwgQgSnjmChGduroggZnTmQAQxowsfiCDhmSNIeObmighiRmcORBAzuvCBCBKeOYKEZ26uaBFku9i6k6R3Y+nET8zFGxqIIDVqvIcgD3ep8kOVYW8jPfnPGm092lIRJBr6/IULEeRh2d+pSG9jqfXb/CtpTgSC1KjXBQsy2rmK3kqc69241PpBjVAEWyqCBEPtX6gMQfasSt1PnUivqm/39yeYPwOC5GcWLaJ0QT7YmfuT6tbKRnryl9E2W5HCCFKRRkyzjHCC7KzG3VYZrtzRVu9m6u5Ms8bjdg2C1Kij4QV5CMeJ/EJc0rtx6cSfa4TMe6kI4o0wXIKYguza5VvitLd+af5n4XYerxKCxGOfu3JFBHm4bpWVocz1yvgdYLnhlBSAICWBLSNt5QTZ3qSK/GZGdeV6Ov/7MvYdMyeCxKSfs3ZVBdm1jezXq66sL7V+lHNrlb0cQURkdPAifehQ/7CRzqfTlK+BILu38WNNpLfx7dbb0+ytqtcgSCbI8iDab4/P8xegaibIzg3YHzVxmSi/qqoER60LQY65IJmALkkWRfXLMQ+oE/mPiOud0hO9/X8YKOa6JtVGkAYIkt3CnV66+/ysSy6q04siEvmPmbqfi95fWU+fqMSvdGWCTPgycZxvsQ66hWsv3/1KIu6iilyY9BW0zM+vL7Uq/wW68gvMGmQ5wHl+L5Ylf1EHp+xnkKPyt797r+sebL0s4rKpMlvUnqbNgyDTkirhKzyCjKFOJaCqa1/efMWJZKK8WFDbJqZBkImIprvA8hUeQXIIsqsNC+ng8+Lk6yLyhem6Y78KQezs9kQiyBiH5WXeqSbIAX069/r7Tz1oPfaqE/mqiHu6oFbuSYMgBVFFkPCC7G5de3nzi4kOX1HnPltQS0dpEKQgmggSV5CdNp5JB+0kkVdF5WtFtBZBiqDIq1gfUAx5izWpdQuXBy+LymtZeyZde9jnEcRKbl9c2ROknd49X9BSTWmm/TMNVRJkZ6NnL9/7zHC49Zpz7kt5N48geYkdcn3ZghS0zNLTVFGQbNPZFxjnXO43fCJIQUcGQarxDHJYOxGkoINuTYMgCGI9O75xvNXEl2DAeG6xAsLeLoUg4ZmbKyKIGZ05EEHM6MIHIkh45ggSnrm5IoKY0ZkDEcSMLnwggoRnjiDhmZsrIogZnTkQQczowgciSHjmCBKeubkigpjRmQMRxIwufCCChGeOIOGZmysiiBmdORBBtt9sZyZYQGCd382bbZ/3YhVwCHxSlP1eLEt+n/3sjs3zI7FMkKKoT5+HCWL8gazpER99JYIURbKcPAiCIN4ni1ssb4R+CSy3QPzanzHzPBPK2iUEsZIrKA5BxiB5BinoQOVIwy0Wt1g5jsvBlzJBvBH6JWCCMEH8TpA9mgnCBLGfnu1IJog3Qr8ETBAmiN8JskczQZgg9tPDBPFmV0gCJggTpJCDZEjCBDnmf+WW74MYrNgVgiB+/IJG832QoLhHxRAkPHNzRQQxozMHIogZXfhABAnPHEHCMzdXRBAzOnMggpjRhQ9EkPDMESQ8c3NFBDGjMwciiBld+EAECc8cQcIzN1dEEDM6cyCCmNGFD0SQ8MwRJDxzc0UEMaMzByKIGV34QAQJzxxBwjM3V0QQMzpzIIKY0YUPRJDwzBEkPHNzRQQxozMHIghvdzcfnp1AfuTWG6FfAn5gasyPCeJ3jizRTBB+5NZybvbEMEG8EfolYIIwQfxOkD2aCcIEsZ+e7UgmiDdCvwRMECaI3wmyRzNBmCD208ME8WZXSAImCBOkkINkSMIEYYIYjs3eEJ5BvBH6JWCCMEH8TpA9mgnCBLGfHp5BvNkVkoAJwgQp5CAZkjBB+DPQhmPDM4g3tCITlD1Bilxrmbl4L1aZdA/OzQQJz9xcEUHM6MyBCGJGFz4QQcIzR5DwzM0VEcSMzhyIIGZ04QMRJDxzBAnP3FwRQczozIEIYkYXPhBBwjNHkPDMzRURxIzOHIggZnThAxEkPHMECc/cXBFBzOjMgQhiRhc+EEHCM0eQ8MzNFRHEjM4ciCBmdOEDESQ88yiCZD+Blmerzrkrea7PrlXVC3ljqn69S9ySqORip6rLInK17L2F6NFGOl/6PvZziiKI5d25ZTeY/NUnsL7UCn5egxfM2oAg1T+MVVwhglSxK6ypMgQQpDKtYCFVJIAgVewKa6oMAQSpTCtYSBUJIEgVu8KaKkMAQSrTChZSRQIIUsWusKbKEECQyrSChVSRAIJUsSusqTIEEKQyrWAhVSSAIFXsCmuqDIHGCFIZ4iwEAhMIRHmzIl2BQF0IIEhdOsU6oxBAkCjYKVoXAghSl06xzigEECQKdorWhQCC1KVTrDMKAQSJgp2idSGAIHXpFOuMQgBBomCnaF0IIEhdOsU6oxBAkCjYKVoXAghSl06xzigEECQKdorWhQCC1KVTrDMKAQSJgp2idSGAIHXpFOuMQgBBomCnaF0IIEhdOsU6oxBAkCjYKVoXAghSl06xzigEECQKdorWhQCC1KVTrDMKAQSJgp2idSGAIHXpFOuMQgBBomCnaF0IIEhdOsU6oxBAkCjYKVoXAghSl06xzigE/g8tjzZu5tzHhwAAAABJRU5ErkJggg=="
-     alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function QSYDWMarker({ data, dispatch, setting, zoom, distSq }) {
-
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 16;
-
-    const placeholder = document.getElementById(`marker_qishiyedanwei_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.z + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setCameraTarget({
-      center: [data.lgtd, data.lttd],
-      zoom: 18,
-      pitch: 60
-    })
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'qishiyedanwei',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_qishiyedanwei_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.z + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      } */}
-      {/* {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      } */}
-    </>
-  )
-}
-
-export default React.memo(QSYDWMarker);
diff --git a/src/views/Home/MapCtrl/Markers/RadarLayer.js b/src/views/Home/MapCtrl/Markers/RadarLayer.js
deleted file mode 100644
index c34baf5..0000000
--- a/src/views/Home/MapCtrl/Markers/RadarLayer.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// import clone from "clone";
-import BaseLayer from "../baselayer";
-import RadarMarker from "./RadarMarker";
-
-export default class RadarLayer extends BaseLayer {
-  static LayerName = 'RadarLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return RadarLayer.LayerName;
-  }
-
-  onAdd() {
-    const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-    const data = [
-      systemSwitchType?{"id":1,"adcd":"","name":"","level":6,"lgtd":110.498736,"lttd":30.05789, warnType: 0}:
-        {"id":1,"adcd":"","name":"","level":6,"lgtd":109.914319,"lttd":30.510822, warnType: 0},
-    ];
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: data || []
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.WarnLayer;
-    if (highlights !== this._setting?.highlight?.WarnLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return RadarMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/RadarMarker.js b/src/views/Home/MapCtrl/Markers/RadarMarker.js
deleted file mode 100644
index 664cd8c..0000000
--- a/src/views/Home/MapCtrl/Markers/RadarMarker.js
+++ /dev/null
@@ -1,208 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { zindexmarker } from '../zindex';
-import { Modal,Tabs } from "antd";
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ warnType, status }, { width, highlight }) {
-  let color1 = '#11b7cd';
-
-  /*return `
-    <div style="cursor:pointer">
-      <svg fill="${color2}" t="1668582218569" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3035" width="${width}" height="22">
-        <path d="M810.666667 170.666667a128 128 0 0 1 128 128v426.666666a128 128 0 0 1-128 128H213.333333a128 128 0 0 1-128-128V298.666667a128 128 0 0 1 128-128h597.333334z m-347.008 359.594666a85.333333 85.333333 0 0 0-115.370667-0.384l-5.205333 5.205334-148.949334 161.28a42.666667 42.666667 0 0 0 26.368 71.338666l4.949334 0.298667H801.706667a42.666667 42.666667 0 0 0 32-70.826667l-97.194667-110.336a41.386667 41.386667 0 0 0-55.466667-0.768l-3.754666 3.754667-77.952 73.514667-2.005334 2.56-130.730666-132.778667-2.901334-2.858667zM704 341.333333a64 64 0 1 0 0 128 64 64 0 0 0 0-128z" p-id="3036" fill="#1296db"></path>
-      </svg>
-    </div>
-  `;*/
-
-  return `
-    <div style="cursor:pointer">
-      <svg fill="${color1}" t="1668582218569" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3035"
-         width="${width}" height="33"
-       >
-        <path d="M0.19968 0h1023.968712v1023.968712H0.19968z" fill="transparent" p-id="4215"></path><path d="M235.484935 941.368569l-35.952679 36.009567a98.300996 98.300996 0 0 1-139.202858 0l-13.880465-13.709804a98.869868 98.869868 0 0 1 0-139.54418l35.95268-36.009567A519.49346 519.49346 0 0 1 152.145259 140.226826L491.249565 480.127552l100.235159-100.462708a84.875629 84.875629 0 1 1 51.539759 51.653532L542.732436 531.781084l339.218079 339.900726a516.421554 516.421554 0 0 1-646.46558 69.686759z m721.329071-576.323723A303.891159 303.891159 0 0 0 653.26417 60.869251V0a364.703523 364.703523 0 0 1 364.077764 365.044846z m-121.454067 0a182.323318 182.323318 0 0 0-182.038882-182.550867v-54.725439a237.048757 237.048757 0 0 1 236.764321 237.276306z" p-id="4216"></path>
-       </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function RadarMarker({ data, dispatch, setting, zoom, distSq }) {
-  const [visible, setVisible] = useState(false);
-
-  const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-  const [iframeUrl, setIframeUrl] = useState("");
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.warnType) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 30;//12
-
-    const placeholder = document.getElementById(`marker_radar_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-      //console.log(placeholder);
-      const el = placeholder.firstChild;
-      //console.log(el);
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.radar + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    /*dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'radar',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })*/
-
-    setVisible(true);
-  };
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  useEffect(() => {
-    if(systemSwitchType){
-      setIframeUrl("http://223.75.53.141:81/isc/index.html#/player?cameraIndexCode=c53571c976c34fd09f11ad1a61b5e4cd&token=111");
-    }else{
-      setIframeUrl("http://223.75.53.141:81/isc/index.html#/player?cameraIndexCode=0fda6a3d0df743b1ac35debe77155cb1&token=111");
-    }
-
-  }, [systemSwitchType]);
-
-  return (
-    <>
-      <div
-        id={`marker_radar_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%) ${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.radar + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-      {/*{
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.stnm}
-          </div>
-        )
-      }*/}
-
-      <Modal
-        visible={visible}
-        title="测雨雷达监控视频"
-        footer={null}
-        onCancel={()=>{setVisible(false)}}
-        width="70vw"
-        className="radarVideoModal"
-        style={{top:"12vh", height:"82vh"}}
-      >
-        <Tabs defaultActiveKey={1}>
-          <Tabs.TabPane tab="方舱监控" key="1">
-            <iframe src={iframeUrl} style={{width: "100%", height:"100%"}}></iframe>
-          </Tabs.TabPane>
-        </Tabs>
-      </Modal>
-    </>
-  )
-}
-
-export default React.memo(RadarMarker);
diff --git a/src/views/Home/MapCtrl/Markers/RealDrpAllLayer.js b/src/views/Home/MapCtrl/Markers/RealDrpAllLayer.js
deleted file mode 100644
index 65d1177..0000000
--- a/src/views/Home/MapCtrl/Markers/RealDrpAllLayer.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { DrpRealPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import RealDrpAllMarker from "./RealDrpAllMarker";
-
-export default class RealDrpAllLayer extends BaseLayer {
-  static LayerName = 'RealDrpAllLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-
-    this._visible = false;
-    this._layerSettings = {};
-  }
-
-  getLayerName() {
-    return RealDrpAllLayer.LayerName;
-  }
-
-  onAdd() {
-    // 此处为何会重复请求2次？
-    DrpRealPromiseWX.get().then((data) => {
-      let list = []
-      console.log("RealDrpAllLayer.js", data);
-      // if (Array.isArray(data)) {
-      //   if (this._layerSettings.skVisible) {
-      //     list = data.filter(o => o.type !== 'SK' && o.type2 !== 'swsk');
-      //   }
-
-      //   if (this._layerSettings.hdVisible) {
-      //     list = data.filter(o => !o.hasRz || o.type === 'SK' || o.type2 === 'swsk');
-      //   }
-      // }
-      list = data.filter(o => o.lgtd && o.lttd && o.elem=='drp');//筛选一下，保证数据都是有经纬度的
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.RealDrpAllLayer;
-    if (highlights !== this._setting?.highlight?.RealDrpAllLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return RealDrpAllMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/RealDrpAllMarker.js b/src/views/Home/MapCtrl/Markers/RealDrpAllMarker.js
deleted file mode 100644
index e2dcb19..0000000
--- a/src/views/Home/MapCtrl/Markers/RealDrpAllMarker.js
+++ /dev/null
@@ -1,218 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-import { DRP_COLORS } from "../../../../utils/renutils";
-import {useSelector} from "react-redux";
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-function renderMarker({ h24,source }, { width, highlight }) {
-
-  let color1;
-  // if (h24 === 0 || h24 === null) {
-  //   color1 = "#ADB6D9";
-  // } else if (h24 >= 0.1 && h24 < 10) {
-  //   color1 = "#BDEF9A";
-  // } else if (h24 >= 10 && h24 < 25) {
-  //   color1 = "#59B666";
-  // } else if (h24 >= 25 && h24 < 50) {
-  //   color1 = "#6EC2FA";
-  // } else if (h24 >= 50 && h24 < 100) {
-  //   color1 = "#1E1ACA";
-  // } else if (h24 >= 100 && h24 < 250) {
-  //   color1 = "#EB20F7";
-  // } else if (h24 >= 250) {
-  //   color1 = "#781D4F";
-  // }
-  color1 = "#1E1ACA";
-
-  return `
-  <div style="cursor:pointer">
-    <svg t="1619076397355" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4205" width="${12}" height="${12}">
-    </svg>
-    <div style="display:flex;align-items:center">
-        <div style="width:20px;height:20px;background:rgb(102, 177, 255);border-radius:10px;text-align:center;line-height:20px;font-size:12px;color:#ffffff">${{'SH':'山','SW':'水','QX':'气','SK':'工'}?.[source]}</div>
-    </div>
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function RealDrpAllMarker({ data, dispatch, setting, zoom, distSq }) {
-  const yqz = useSelector((s) => s.map.yqz);
-
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_drp_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.drp + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight,yqz]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'drp',
-      data:{...data,xiangqingShow:'不显示'},
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  const isShow = ()=>{
-    if(yqz && data.source && yqz[data.source]){
-        return true
-    }else{
-        return false
-    }
-  }
-
-  return (
-    <>
-    {
-        isShow()?<div
-        id={`marker_drp_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.drp + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>:null
-    }
-     {/* {
-        (zoom > 12 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.h24 || '-'}m
-          </div>
-        )
-      }*/}
-      {
-        (zoom > 14 || distSq < dist2 || highlight) && isShow() && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            <div style={{textAlign:"center"}}>{data.name}</div>
-            {/* <div style={{textAlign:"center"}}>{data.h24 || '-'}m</div> */}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(RealDrpAllMarker);
diff --git a/src/views/Home/MapCtrl/Markers/RealDrpLayer.js b/src/views/Home/MapCtrl/Markers/RealDrpLayer.js
deleted file mode 100644
index 31c86b4..0000000
--- a/src/views/Home/MapCtrl/Markers/RealDrpLayer.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { DrpRealPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import RealDrpMarker from "./RealDrpMarker";
-
-export default class RealDrpLayer extends BaseLayer {
-  static LayerName = 'RealDrpLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-
-    this._visible = false;
-    this._layerSettings = {};
-  }
-
-  getLayerName() {
-    return RealDrpLayer.LayerName;
-  }
-
-  onAdd() {
-    // 此处为何会重复请求2次？
-    DrpRealPromiseWX.get().then((data) => {
-      let list = []
-      console.log("RealDrpLayer.js", data);
-      // if (Array.isArray(data)) {
-      //   if (this._layerSettings.skVisible) {
-      //     list = data.filter(o => o.type !== 'SK' && o.type2 !== 'swsk');
-      //   }
-
-      //   if (this._layerSettings.hdVisible) {
-      //     list = data.filter(o => !o.hasRz || o.type === 'SK' || o.type2 === 'swsk');
-      //   }
-      // }
-      
-      list = data.filter(o => o.lgtd && o.lttd);//筛选一下，保证数据都是有经纬度的
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.RealDrpLayer;
-    if (highlights !== this._setting?.highlight?.RealDrpLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return RealDrpMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/RealDrpMarker.js b/src/views/Home/MapCtrl/Markers/RealDrpMarker.js
deleted file mode 100644
index 04555ce..0000000
--- a/src/views/Home/MapCtrl/Markers/RealDrpMarker.js
+++ /dev/null
@@ -1,203 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-import { DRP_COLORS } from "../../../../utils/renutils";
-import {useSelector} from "react-redux";
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-function renderMarker({ h24 }, { width, highlight }) {
-
-  let color1;
-  // if (h24 === 0 || h24 === null) {
-  //   color1 = "#ADB6D9";
-  // } else if (h24 >= 0.1 && h24 < 10) {
-  //   color1 = "#BDEF9A";
-  // } else if (h24 >= 10 && h24 < 25) {
-  //   color1 = "#59B666";
-  // } else if (h24 >= 25 && h24 < 50) {
-  //   color1 = "#6EC2FA";
-  // } else if (h24 >= 50 && h24 < 100) {
-  //   color1 = "#1E1ACA";
-  // } else if (h24 >= 100 && h24 < 250) {
-  //   color1 = "#EB20F7";
-  // } else if (h24 >= 250) {
-  //   color1 = "#781D4F";
-  // }
-  color1 = "#1E1ACA";
-
-  return `
-  <div style="cursor:pointer">
-    <svg t="1619076397355" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4205" width="${12}" height="${12}">
-      <div style="width:10px;height:10px;background:${color1};border-radius: 50%;"></div>
-    </svg>
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function RealDrpMarker({ data, dispatch, setting, zoom, distSq }) {
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_drp_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.drp + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'drp',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_drp_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.drp + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-     {/* {
-        (zoom > 12 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.h24 || '-'}m
-          </div>
-        )
-      }*/}
-      {
-        (zoom > 14 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            <div style={{textAlign:"center"}}>{data.name}</div>
-            {/* <div style={{textAlign:"center"}}>{data.h24 || '-'}m</div> */}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(RealDrpMarker);
diff --git a/src/views/Home/MapCtrl/Markers/RhbjqLayer.js b/src/views/Home/MapCtrl/Markers/RhbjqLayer.js
deleted file mode 100644
index 2ad38e7..0000000
--- a/src/views/Home/MapCtrl/Markers/RhbjqLayer.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import BaseLayer from "../baselayer";
-import RhbjqMarker from "./RhbjqMarker";
-
-export default class RhbjqLayer extends BaseLayer {
-  static LayerName = 'RhbjqLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return RhbjqLayer.LayerName;
-  }
-
-  async onAdd() {
-    const rhbjqData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/wufeng/rhbjq.json`)//入户报警器.json
-      .then(resp => resp.json())
-      .then(data => data)
-      .catch(() => []);
-
-    if(rhbjqData.length>0){
-      rhbjqData.map(item=>{
-        item.stcd = item.xh;
-        item.id = item.xh;
-      });
-    }
-    //console.log("rhbjqData",rhbjqData);
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: rhbjqData || []
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.RhbjqLayer;
-    if (highlights !== this._setting?.highlight?.RhbjqLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return RhbjqMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/RhbjqMarker.js b/src/views/Home/MapCtrl/Markers/RhbjqMarker.js
deleted file mode 100644
index bcb2084..0000000
--- a/src/views/Home/MapCtrl/Markers/RhbjqMarker.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ },{ width, highlight }) {
-  let color1="#DA6361";
-
-  return `
-    <div style="cursor:pointer">
-      <svg t="1680254166820" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5884" width="${width}">
-        <path fill="${color1}" d="M270.1 781.7h488.6V537.3c0-134.4-110-244.4-244.3-244.4-134.4 0-244.4 110-244.4 244.4v244.4zM426.5 609l113.3-150.1c3.9-5.2 12.1-1.5 10.9 4.9l-18.8 96.8 65.2-0.1c1.1 0 2.1 0.6 2.6 1.6s0.4 2.2-0.3 3.1L486.1 715.1c-3.9 5.2-12.1 1.5-10.9-4.9l18.8-96.8-65.2 0.1c-1.1 0-2.1-0.6-2.6-1.6-0.5-0.9-0.4-2.1 0.3-2.9zM279.9 253.8c7.3 9.9 22 12.3 34.2 4.9 9.9-7.3 12.3-24.4 4.9-34.2l-29.4-39.1c-7.3-12.3-21.9-14.7-34.2-7.3-9.9 9.8-12.3 24.4-4.9 34.2l29.4 41.5zM514.4 195.2c14.7 0 24.4-9.7 24.4-24.4v-48.9c0-14.7-9.7-24.4-24.4-24.4s-24.4 9.8-24.4 24.4v48.9c-0.1 14.7 9.8 24.4 24.4 24.4zM221.3 879.4c0 26.8 22 48.9 48.9 48.9h488.6c26.8 0 48.9-22 48.9-48.9v-48.9H221.3v48.9zM172.4 398L126 383.3c-14.7-4.8-26.8 2.4-31.8 14.7-4.8 14.7 2.4 26.8 14.7 31.8l46.4 14.7c14.7 2.4 26.8-4.9 31.8-14.7 4.8-14.7-2.4-26.9-14.7-31.8zM929.8 402.9c-4.9-12.3-19.5-19.6-31.8-14.7l-46.4 14.7c-12.3 4.9-19.6 19.5-14.7 31.8 4.9 12.3 19.5 19.6 31.8 14.7l46.4-14.7c12.2-2.4 19.5-17.1 14.7-31.8zM712.3 261.2c12.2 7.3 26.8 4.8 34.2-4.9l29.4-39.1c7.2-12.2 4.8-26.8-4.9-34.2-12.2-7.3-26.8-4.8-34.2 4.9L707.4 227c-7.3 9.7-4.9 26.8 4.9 34.2z" p-id="5885"></path>
-      </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function RhbjqMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_rhbjq_${data.xh}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.hdsw + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.xh,
-      type: 'rhbjq',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_rhbjq_${data.xh}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.hdsw + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-      {
-        (zoom > 18 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.hdswLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.MEMO}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(RhbjqMarker);
diff --git a/src/views/Home/MapCtrl/Markers/SLLayer.js b/src/views/Home/MapCtrl/Markers/SLLayer.js
deleted file mode 100644
index a8ff614..0000000
--- a/src/views/Home/MapCtrl/Markers/SLLayer.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { SLPromise } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import SLMarker from "./SLMarker"
-
-export default class SLLayer extends BaseLayer {
-  static LayerName = 'SLLayer';//渗流
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return SLLayer.LayerName;
-  }
-
-  onAdd() {
-    SLPromise.get().then((data) => {
-      const list = data.map((i)=>{
-        i.lgtd = 114.975
-        i.lttd = 31.11174
-
-        return {
-            id : i.stationCode,
-            bz : '这条数据的经纬度是假的',
-            ...i
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.SLLayer;
-    if (highlights !== this._setting?.highlight?.SLLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return SLMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/SLMarker.js b/src/views/Home/MapCtrl/Markers/SLMarker.js
deleted file mode 100644
index 847e3f9..0000000
--- a/src/views/Home/MapCtrl/Markers/SLMarker.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import React, { useEffect } from 'react';
-const zindexmarker = {
-    z:36,
-    hilightPlus:40,
-    zLabel:56
-}
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAABQCAYAAACqCH1tAAAfjElEQVR4Ae1cB1RU17omSi+KWGPsmpjYS2KPEgsaNVWNMWqMSa733eQSRRE0pky6ERXFFqxRUZMxFmKCouAoDEMbygBDcRBErCgIKCjTvpdvnzlIjCbeK7kr963HWv/a55x9zj77+8v3/3vPDHZ2//93hwaAh+zs8JAd23sd/2X778By36cEqkCD/0q5b5B33kjAqCNKNPyvOb8Ty32fEzSByoI6x5ICbvf9lc5pqH/7j+6tgj3F29bWPb7btb9C/xQa4EH++mvhYKeFQ/9QOPBYSKjtmu38r9YvOOhBQXdTwpFCwHWP657/lfqlTPMAqOnC3fRwlKVLBJx4LLfydbmVr8utfF1u5etyK1+XW/m63MrX5Va+Lrfy9brtA8C1PapEQ77gV2K44/wv1E+Pe3DQCjTooILzf4sIcn1w1HZ2bTRwIWi2taK0HdvaP+pvo4RL60NwvZewv3Zsvkc+v8/x5feL9FofoOUB5QnLk7vXuXy9ZSTcKM2VJe6SwL3ZlisezcLvkC1XPJorYbunxF08t+OSmzzOH72vbv8DM7esMMZzay1cfyW02p3XtHCVQBIA3AnOK6y0URPl6cZNlGWNPbcVenpuu+bZeFdRk7rCa+wT94Websxn+GxzlaQIWXm/et/d3n8IrvKcH7hlapJfLLecgHzMVlhKZQMaIQElEIJrtLnYy2P7uaYeu/OauYcYmrtvtcmG/BbiOMTQ3CM0rxnv4b18RlJC2W0FCE+A5AWRcLvz/ZwDQ+KBwdYOoETDugDrHktuWdeqZY0FUKUEVIDakN/CbXdBS9fQ7Iddt+S2/o2EZj/stq2wldumgpbuOyRF1FUAvaTW+srbwOvOg8dMW7VzfvADPHTnC1rqJOtK8QkP4b4Hrnk2ksHuyG9BEATosiHvEZd1mW2d16a2d96Q1kHIpsSOzmsSOzpvy+ngHJzWgX0u6/Lb8l4qx22bvpX71ovN6R2NNuu9PA/Q/csaNwuH5PYqG3idxBucnyiZHxzs7RFIKrXAawHDFrOSdWkdWpYTdl2T27oW6CZdR6dQbWen1WmPOq1K7uq4Rvu4LE6rdF2d1qY/JvpCtZ2dN+R0cF6b3d5lk6ENFSasv9XQ3GN7TlN6kLB6RGkjOZzEnGzA643EZNhkcGFdkouIXXh4idgtayxilvG6I7+F684zD3PCzpuz2zuvT+7k9E3ao47LtY87rkzq7rhS29NhRWJvh+CkPg4rkvs6rND0dVjG48Tejis1PR1DUrvxXj7jvEnXkWO4bNK1oeU5tmT1Yi8ZeC3Z2awuz7X+Wi0cBJvWAUzWJWBh3U0FLV02pD/iHKpvxwk7rdN3cQyOf0IAJbDlCf0dVmoGOKyKH2gfnDhYFocVCYN4zWF50lPinmVJfRyDknsI8OtSuohQCNW3k63usftCM4YQiY5Kl92daav+wNpGmgI0vG1hNPK0xa8AvJuA8yTA6zM6CRdendxDWHFl4pMOK9SD7JfHDrNfphlh/7X6GfuvNaNqJShupH1QvLf98qTh9svihzoEUQEJ/ekN9A6O5bw+oxOVeSdwyeIQwJlWIba06hE6B6RWvSLQSOTan8qbUOuMOQF4bXZ7xq2I1aCEXg7B2n7CqssThgmgQfGj7ZdqxjZcph7fcFnsRI9V8c+7rlA/3zAobkLDpfHPss+e91ABSxOGCesHx/ejpwirM94F8LMizunqjXeVSzEeVtqINXe9guZgFFqa2uXLPPafa1oLmC69NaOTBDill8PKxCftV2iG2H8V600gDZfHP+uvubLsS/2trC+yLdc/zYY16BTw9SngixxYvs61XFuVfTN+nuqMv/0yzTj7oNjRwiuCEwc7rE7o77gqoRfHrmtxOcZl4N4K2P8poMngdGvB0iSt0DMPixhebwO8SgacNMT+64Rn7JfGjPVNuv7dNwXAh9nA0jxgiR74ewrwWqIV05OseC8N+CwH+OoU8GkOsN5gvvLOyUuf2y+L8xFWX5E0RABfk9GTTE/lumzNb8t3i5S2/VxTzkmhQAPZOPXi4ByMg7ZRFruIPEy33lbYSrA0SWtt+mOCsISFJcC9tufM2lRoxRd5QEAWMFljRf9jFngdMKOB0gS77yRx3GtCm0NmeKsseD3Jis9ygSXZwOqcGn2zkMQJIjRWaIYwzh1X63o4fZP9KHM7382ChyFG75uiVDaUgdcr6C4RBidaWSo6zrZmShEsvTK9u0NwfD/ByEHx3sPDzy5Q5AKrDZJFm+w3wW6nUZJdRgnw9zbge0ywCzPCbocRdruMeOxnMwIygXX5wOIMc/mQMN1kurpg+RXJfZnWnMjqm1Pbu24525pu7hViaOStUNnXG2jZZaZMUTbsplA6uisvNhdWXpff1nlTbkfHNRmPO4Qk9nZYmTyAk3tUWTDn/QwLgvOBJ6MsEiCConX/SKiIHUa4fm/ClEQrNp4GFmZYKlqtT37WfnnccIdVSU85rkrp5bRe15VpUVh7W2GrZl+rPf4c0EoJNN2JGhZWZuFBK69O6M9047QqeUxgOowrDcDjRyyw+9Zm1T8CW7d/r80rwkx4Md6KdaeBJTpzoT1TG+M7WNuP7xTW3q5vx2KoZZDOrX+o1oEuLhvpgVxcjmdqsptC78hysDaW1+u6UvMOIZKV/fTGrJA8oH+0DTBdd6sRdptsspkubLM4wVF4baMRdrQyz6kAtgyDMCP+lgIszQEWpFduq7X2Gm1P8oiI7e15j7RWHHKlF3Lrt15cvC7oLiERTo3XZzQhezqFZnZmfDmEJPdleuqjvDD3s2xgltYKuz1GycrbTRgebcb7mRZ8rLfgJbUZzgS1zeYB35nwWoIF/0ixwHmfCXZUkmx1At9phMcBMz7KBgJ0MJHUHFakDHJYl9THMTjlCTI5C5aW/pFuXXwjnOrNxWXQ/eeEOnRQqJw9g1WezttPt3ParO/iyKprdUp/++XaYQvSTFkfZ0NM0m6LEa5KEw5fsOLOP7MFWJVDTzDBbruptrvlj4znOqBl8NuNGKqy4Ks8YGFixQb74OShDmu1/RzXpnen4t3W6Vs1V6jcOyi2Odc/6FCtQxs/pQtJg24l0tSajJ4ksCbfZI9food1RhIk9w014iO9RQDSXbPi3Xgz5iRa8LXt2vfFVsnld5qQf13C3Syclr0L6DAjvMLNIocH6CxX7VcmPs06XU5fbqsSWkqgVc40TL25N5mbRNHGTyNAC9feqO/usFbXz35d2pD+P5YGBRmAIcctsNvO9GPC2SrJynZhJtiF2GI61AjPAyY0pOvyeth9gGas7zFhlhYIzATsgxNH2q9NHeywQd/X8Rt9N/eguBbNAsI9aJD6BW1j7tugDZ0dtp3q47Ipe5D9mjTv1xNqElhUtPzRLOXbnSZcvClZUABcayMrsvl2W+yyOLkf0HTznUah0E9ygCE/nJrkHJI6wmFz3gC3LXm9PRZHNaX3CdCh2nq0tPLXlqZ7u4adfcp5S94w543Zo/3SLcXvpeM2GW00YkmW5N5lNcDyLAve0JjR5yiVYpLimRb8F0B3PWzGB3pgXsx5X+dv9KNcNucPJehGiiNetaDn1CNoxkld93YJ0bXx2Hl+iPv2/GfcNueO+yjLcpGppQHdlgy8ywTnPSasN0jAa9kKwMkSKzoxfpnGdt2He9PSYUa0/9mM9/XA+/ElgW5bDWPdtxm83Xfk9xCgA8I9SLL16t4C9BwbkQWEe7h/GdPcc3fxiMY7i8Z4bD09cXGm5dL/pAIOP9hAsyUpbTai7xEz3tVaEGqwIO+GBF9/3YoGZO9v7x905wizWKz4x5UENvr29ITGu4pGe2zJ7dr4q9gmfxp7Mx0wLfAFfJHnrrPDm4QVP+u5vfCFf6SYDbRC4wNm2O02SsUFQZOsSGy0KguQzUYcPC8R3Pg4M+zWG/+YvWnpHUb0OWaBIgeYFn3Jl+/02l08jhuKngqVZ8ugSDfWEPWesjggB+YLPBUHPJvuKR7YbPf555ruKn55wombP5O9u0VapErqWyNahNtY+hujVIxsMcJuWQ3W2Fx+RpIZdmuNKLBZXxQ0G4xSBccqjsIihrG/y4gXNFaxPG2zu2hG0z3FLzX/4eJ4MneTpccat1ZoXf+U4oQlHstQlnxeiohGLXae6/3w3ssvN/vu/Ksd9pUs5lr4RY2Uf/scNgs/Lq4Gpp40Y+gxM4ZEmvFG4u0Yb2eL67xKyeV9YswYcNiMgdGSDIo2o/8xs+CIhj+YsCgTWJBhNXruOjezufLS1BZ7L/vUMvdKjYtUhtZj7c2qjMW8RGZKF7p4853FXVqHl73aav/l11t+d/7twAzrdb8MCHfu8aMJCVd+W43JhLYg1QI7WjXMhGs18tW7t0xXTcPNWHYKWKwzZrVUnn+rxb7LM1vtvjii8Vc/2eJZ5SwWHFMk0A+02JAflkvR2y6uc3PfoGvR4dC12e3CS//W9oeSd2fG3Tz6dR4wJMYixe82E3odNuPTLAv2n7Mi4qIVX+VY0OOwWUpZuyXSW6izYK3Bgs0Fv5UVLFf3mDAtyYrFGcCzR6582nbf5XfaHyx9++EfLjz5p7j274Fu91Vsk0d/rnzj0UMV73X+sdS/874rHy7UW2uW5QHNWaQwHlmIkMR4TLbmioqtvKJiimMfr98pJL41NRgVY8XqfG43mc91OlCyuFN46fzOhyr+2XHn+a6dQo81bh2qrd8V1t1BG5y8lXr3AdtzmvaIvD612+Ebi7r/VPHREz+WfT5Fff1gUBYwPwPSaoq7IWRfgqTw+H6E1dp2I7ocsWBVPvCBDtaxUdfWPnGo9LMnfq74oMfhGwv77slt3XNXRpNeO3Ru3ZR6saykR1LkeT9AKw3E3cZnQwxOPjsuuU34qajJy/uuPDzwWNUL/Y5WfdEv8sayPhEVq3r9VLZ+VrL59Jp8YK4OcKMlCfx+AfN+uv0OI7oetmCVAVikt2JOUvXJnoeure1zuHJl3yM3lvY9emO+z8HzbX3257cYrTzdeLCy2GUOS1BIm4MPANbOjt/SYWHCjX6FHo4zI+H2hgqebyfcaPmG6loHnxO3xgw8fmv1gGM31w+Jqtr2XMyNqOma64b5qUbzcoO0wdeNMcz9MYKvu16ua3EqhZsGzOl7THhObRUWnq8DPtHXlA89VhH51JHKbU9GXg8deLR67bCoqndeO1rx6KuRpW3nqCqbvam+4vGGCs6KX77r9oDAJcC2gRwVF+C6KBZN3klCq7dP3uz4N/X17jNVlcPGxZr3zNYa0/+Zarz2euLN/AknqmIHHyk/8GW2qfRjvbS1Ozneip6HzXChJblfJm8Syu1uE5odNGNIlAVzUqX98KXZQJDeeHZEdGXSOHXV2QkJNaVj1TeTnlbVhI2Pvjn77Zgbvf6WWPmYbwLavJuIpgo93BWFcJ7zy/fe/m3gtDAB+0bA6R0V3P308ApIRWvfOHR+Nwndl6Sbhh0qNm8MzDSXzkg2pY1S1RwYGlWtHHy0au/AI5U/DIwoPxB22nR5Wa4V3Fz4Mo95FngxzorB0Rb0OmoRVRa3fmckSoXHl6cA7r5sKrAi7HRNwVMR5fsHHq7cNyiy6ocRqlsRzyUYc19JMZfNyzKu9U0wDnonzthnfjoeeycJbRV5aOabgEYK1b8LnHkZaFgXsF86HlmoRefAdHQPK8AMdQkyIi5avpscb173zAnTvhHHTfuGR9/aN/RY9b7BR6r2DThcuX/I4Yrwn8+aLsVdsmC9wYoPsyBKSW78K7IhlPFxDvAJz/VAWKEVuWUWfFdQUzTg52sHBxypPDD4aNX+YdHV+4Yfr9nnrarZPzbWdOSLM+YTweesJxQ5mDgvDn0WJ+Kx+ZlouzgVzafbgCsgufr9fZFOFCJSDPvr4LYoA01oYb8UdPHToueh8wiIv4pTuwst8/6ZbBr6gtriP/qk+eDIE6YD3irT/uFRt/YPi6rePziyav/AyIqI4SfKdQfOGS3ZpRYIKbMgu8yCnDKrdH7H9R35xpsDj1SqBh6uPDgksurAsGPVB0ZE1+z3VpkOjFKZD/qcNG95J8E0LOgMgjZdRG5wAWbOz0LvgGR0fTcO7WnxN9XwCImAkwhNfqn3j/5EIaKCvV8xXBRp8JynxcO0MAH/fAGLEkuh/6YIk+enYJBfIp6cosZUnxjzodEnzeEjT5jCn1GZDnqfvHXUO6GqcHjS9ZphsRXnn1FdT4s8Zy7Tl1pAybqH7CswlQw5WnV6YFR11eDj1aVPq25qRkTfCn/meE04xx99wnxofKzls/cSjP3p3sEF8N11GYbVBZg5Lw19FqfjMV8d2ij08KLBQgEHSF/d/p00VsetGR/+cWgxLx4dFujRbU8RZiaV4tSG05jkr8XA+cno65uAbrPjjf3GxeCwz0lzhM8Jc4RP4q0sn/Sbt0bF3zzlffzmsacjqw4PPXw9clzUjehj5yzlmVctuFMyrlpwsMh8xfvI9aihkdcjnz5aFTlCVZM6PNZU+Uyc+fyYk+ajHHtsjPXwi2rzW/Pia56Yn4jefskYsL4IvgevImepAWPnZqIXPZKGCtSisd8vn1nLjH5PY5O85oTCYSWtrIfX/CS0XaDF45/qMDCpFBl7i+FLwAvTIAiEcUTFTIzF3gmxODZeW1M8Pq3m2rgYo9rnhOnYmOhb0aOib0U/c6xa5X20WjXxeHVc9HnLdd0VC+rKj0Xma2OjqmO8j944MTLq5nE+w2d9VMbjozXmM2MSLTeejTGf5DumxGIYGXthJjr769BjbhKe+u4SQn6+ih8XpOEp/2T0WJSGDozvd8jov3z5hmx+99iuE8sBufCYm4mWfhnoFJiBnkcu4Av1FYTP12HQPC36LcjA4wS8wMaYz5/E8ueTzQXPpRorJp40aybGmGMnxJhix6tM6nHHa+LGRtVofKJuasZEVcdPOlGdcvy8pTqtxALKT0Xmyueiq5PGHKuO94m+qRkbXaMZd9wYx2cnnDDHTjxhjh2vsZwZn4yK59XWk9NUaPZuFJrKPOOfgl4LdXj6WBkyvj2L2fRAMjr756XBk2lMCYhPPn5rbZtrk/LpGkvS8UiADl0XatEv8SpSvy3EbFmT/jp0pIWpHN7/ciJ8X0ozmV7SWDNejLUmvxhj0b4QY9E+f8KU8twJU8rEE8aU4VvT9D3mhhR1fGXepT4zF5RG6C+blYkFpsen+F7tNG3hxd4BmwtGf5+fyfuFnDSJMTgWx3w+0Xr9xURE03KMV+bmgAS0oScuSEH/A5fw5bFyfM85MhwXpKL94kQ0naOF6z1dnARGjSh4kx5efIjpaW0exidexal5qRg8P/22FqkYapEDTs685T8l2VwxJRZZk9UUa9akWGvWpBiL/qUYk/7J97cWtxsz/Vo7n+nX2vrMENJ/+ryKbpP+US6fs6/duBllTwcfLeRzlMkxVj3H4piTNCh+UQct1/VMpQFqePimorl/IjrS2isMeD7+OvLmJ2DQ/FT0Jvkq8tFCoYK74pdvBgsXv9PUBM14phYXaNFMWDMFvfYW4e/qKzgmyCsVveny/jq04H1y9TO5+Ebg1ERr2VQ1DFNjYJiqtgp5JcZqeEVtMXQaP7u8g8/0ig4+Myo7+Myo6DB2RqUQnvOY19g/enpl9zc+uMpn5DFEGwPDKxoUv5ANrSiNmV00cGE6Je/4paN7QDoGaG+g8Os8jKJx3kvDowv1aPU1vVEvvprRQPzcqi5wklioFg6svqhBgqPGDhRjbkwJDvmlYwDTFjVLpdAjCJrKetl89aVp6aYbr6mRJyQWedPU1rzX1Na8V2OteaNWRxd1Hj/rWscx08o7CHmtvMOY1ypuy7Ry9j32wt/LJuzMLJgWa7U9j7xpsdKYr8bj0rjzCOOchUcWwpkxy6IpIBNPLMrCU9obyFl/GhMW6tBPjmuFAY18DeJLOL8lM06eoGlBATpZAr27ELNjryB2rhYD/RPQix4g3Eq2tAINngNcp1y8UTJdg8KZcciZqZbFmjMzzpozXW3NmXrkWt7IZT8VPfnPFRd7zfrw8hNT5l7t9ur8K71nf3x5gF/IhTEhx89MO34zl/fOrBXkcLwZauS+pMetp6swgZauC5rcsyAV3ZboMEhXhWJFNoaThwiaqUuRUAc0fzhX9+9O9ybt07KfZ2N4/FWcXZKB4ax8mAffz0RLxhTdRvplDB56oaZ86it5t269Hoe8WWroZ8UhS7RqZM2KhX4WW15XW/Uz1Vb962prltzymtRv1Yt7eb/8fByypqbh2shyKIVrAw1EWF2AK4mK3MPUFVaMGamVSArQYRBT6sIEyb3led41pu+Mlfe0aEcN+qXiyajLOLL3HN6fp0M/siXjiPEku7icB5+/dmPuK/qaW7PirQWzNcgQokbm7Dhk/ErUdc7v1s/7Nch4Q4OcqemoHFOKSG/Ame8RTEwCNaDRwiS0Yr5mNRZfjq0ny7CG3OOXgZ5yhqnLPXWNLB3L1ZgBTr4GNHqf5SfJIA19dhbh76oSpH+YhaH+tqqHJMGYEimBFucP1YCHxl6+MXpS9q1zrydarr0Vj7y34pD+b0jWrARcmpSH6pGl+NjbtngQiwgVnJkqWXzQyjTMxtOYmF4FQ8gpTGBpHJCCJwTBaeBVW5XdqwanJqfo4Ugy46DCxdPRnbnv6GWEh19AKC1PtiShcW39j1g0ETxggBPdju7uc+mS27O51fNe1prPzoi3Vs/W4OJbauS/HYfMORqkzomrI9I5FZP3ZjyKX09CxeRMVE0oQuiwcnSqta4SjgTA8phzoyeyjgjIxJPJ1xF1vBQrajNMCrrQKDQeSUwp/Trw1/Fca3a5QLExY4AarReloAtZ/As9Rh0pQebuYnxE4MzhYiFCItFKa9k5F+DKl4iY++WnTSSckUmmIS9oLF9NUeP4Kyet5dNjYXldDeOsONycpUHNjHiYX01CzSspyHg5A6E++Xh1SgncBVlBWs9z8cPY9NPAiy49Lw0dhDXT0Te2AtsTKxAZmIYhJDCGX4AObbj+9//l69C1S8w7SawW9C8d1OwcSKmLYFhuUqPMfcF5ePHnEmSHFeOrBRnoT6Kbn4jH3tOjHSfDKkkULdx0KIYLFcDCQFYC49EnEm5D1Wg9WoOeo5LRyZulIrd5pK0ee3GvHo5+SrjQg+jK5A9RASagzaIMdKKnLUnHgJPl2JV8HSc/02Ek50NDiGJFhxb0iBBa+Z4l6G3UYl9M7Imp4CxcyYDmS7Kl2GHdvewUJh64hMTvL2KvQoeRJBHGldhgiEU7upUIjQw0EQrQw91GJq4ivqQqjpXcbZG2eVxpGf9LcON7uTVFdhaZQoc2JCYqn2uB9QV4PrYCseoKhH+ShWdEyGnRU5Aa0xTzdzFchALvudioC5rW5lYRyaNQqsPnJqAl45sLDbFu1eHpsPPYoryM3I1n8QGrIYYANc3FvFioaNHOT4NH6AGs4Og1BMESl24qi0IDL5F62J+K5lzocLFAIqLVmHqoVJaaJNLwq1gVW4n8n0rwuX8iBrPulkPtnwxHekUk3FhzMJaZin8F754nthUXH6R1aDECXxKH9gs0eJwASW4rDJix4wJUOy4gfV0RPv4wAyMYBpygKPq1eJyT9ktGJ6G0VLQnARGQLEu4WuO42SLfdvTToMvcZHQlUIYPlcy18vclCI4sx6nDpdjLOluQVjr6CoXo0HFeNh6mIulVrB8ImMb7Tel5T9DsqAN8pUa4SuP/iUMLkQpS0IUFAd2dC/kgA97aeB4HN19A4fpz+Gl5IRZ9kAlvUQ5yqSfV7MydPWgVTlQWkQmS0UOUuCnoFZiF3hz3Ez2e3XgBn+25ghMHy2DYV4LtwbmYTLC0LhVLdyep0TuYPmXANn74bdn5u4DlThtwERuFcBYMqocX45aWo0WENciaaXiKQFecRuCaczi0+hyKVpyFdukZ7PmsAMs+McBvSR5mLcrGS4HZmBCYg7GBpzBhUQ4mfWjAm5/kY+HSIqxadQH7Qi8h69sSGLZdxJ71Z/BuoBbDGEIESwXOS8ETvlp05tYQQ4KlplwvPBjguwAXbKyFq02rZEiJYJLRlVZkIcOJ0frzkzDkk1xM/6IAH35+Bhs/LUK4ohAxH51B2pIiZAUWITfgDLI+KELKp0U4/mUx9i07i7VBRQj8JAeT/HUYyHFIUgyZQC16Mk2xDA7Uoh0JjmnpTa6ibPvdwqXvj7hkdL/T2j7pEFrk2pQMrIc7CxO6vG2XogOXc8yT3LLhHhZ3MejiLCDE4j4LT4nVGldsdwj7xX20Zjr6zktCH3oRV1CsDElqzL8yWLGBoYUr19aydQVp3Tdx/Q7e213SZ1qsuMRLuPckpR/3pafRmOzMCo3WZ3nIDwU4WSrBl6TEHKpDD1EXp6AXY5Jiq5N7vJeMHiLOWdun4zGmQIYQOYSrJZEGY9GEYOnKb2yTNvXr17q30f76yGZ18TIWFCwkNFIhwdgS+TUHTZmmOFmmLU68lqG506FDxw+45aRDRwITO66paM9CiEtFPsdsodCimVjYGNCIm3yi4ImQKj4ZrJSS7jct/RrKv34muzw/4KP1mdfp+io4c3I2JnVnuiMHiMnr4cU8zby8OAdNRWvL3eznfbyf1hTPc+tKCqXbVZ3tk8n/LNi7qucXTUsFTQPZA+RyUgFbGBRKyqBCxD6ctPPiynMh0h61syBL/e3S1VaDi99nMI3+a3n3rpP9My7e/rc/YtX2yxd0OHExebnGvksr7lGioc1rGojCgiAF0D9jnv+xMW2WksHI7b1XQP+xmf3/i/4vauB/ARm7XuTw6IBvAAAAAElFTkSuQmCC"
-     alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function SLMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 40;
-
-    const placeholder = document.getElementById(`marker_shenliu_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.z + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'shenliu',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_shenliu_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.z + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      }
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      } */}
-    </>
-  )
-}
-
-export default React.memo(SLMarker);
diff --git a/src/views/Home/MapCtrl/Markers/SYLayer.js b/src/views/Home/MapCtrl/Markers/SYLayer.js
deleted file mode 100644
index 98f7ed2..0000000
--- a/src/views/Home/MapCtrl/Markers/SYLayer.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { SYPromise } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import SYMarker from "./SYMarker"
-
-export default class SYLayer extends BaseLayer {
-  static LayerName = 'SYLayer';//渗压
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return SYLayer.LayerName;
-  }
-
-  onAdd() {
-    SYPromise.get().then((data) => {
-      const list = data.map((i,index)=>{
-        i.lgtd = 113.975+0.1*index
-        i.lttd = 30.11174+0.1*index
-
-        return {
-            id : i.stationCode,
-            bz : '这条数据没有经纬度，是造的',
-            ...i
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.SYLayer;
-    if (highlights !== this._setting?.highlight?.SYLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return SYMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/SYMarker.js b/src/views/Home/MapCtrl/Markers/SYMarker.js
deleted file mode 100644
index 01b4180..0000000
--- a/src/views/Home/MapCtrl/Markers/SYMarker.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import React, { useEffect } from 'react';
-const zindexmarker = {
-    z:36,
-    hilightPlus:40,
-    zLabel:56
-}
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAABQCAYAAACqCH1tAAAdeElEQVR4Ae18CXQUVdo2SvYFwo7IDorsm7ILYQsIiAsiIiCiDvN/KpKwBBRnph11RCAEwqIBBFlEJwghooFAoEPS6WydpZN0FjokhEAIgex70l3Px3OrK4QIjmPiHOc/X855z62qW3XrPu/yvO+93Z0WLf7vr5EGgIdatMBDLdg+6PgP298Iy68+JVAVHv6vlF8NsvGNBIwG4oeW/zXnjbH86nOCJlBF0OBYVsDdvj/SOQ31m//o3mpYUVwtbcPj+137I/TPpwGa8jdSB+sWOliP9IU1j4X4Wq5Zzv9o/YKDmgp6gB9sKATc8Ljh+R+pX840TUBNFx5ggI0ifQNhy2OlVa4rrXJdaZXrSqtcV1rlutIq15VWua60ynWlVa43bJsA1/KoH1ryBfeIsdH5H6ifHtd00Co83FMNu/8WEeTadNQtWnTVwp6g2daLn+XY0v6r/q5+sO9yCg4PEvbXj833KOe/cnzl/SK9NgdoZUBlwsrkHnSuXO8UBEdKB798J1ng1P6rW87tAxrJV7ecO/jBck++k3juUJ6jMs6/el/D/iYzt6IwxnMXHRzuEVqt8TUdHGSQBAAngmt7pKBVG7/Lrdv4FbZ2OZDl4nKgyKX1N9ltGgqvsU/c53u5NZ/hsx3UsiIU5d3zvvu9/xQclDk3uWVqUl6stJyAcsxWWEptARooAyUQgmu1L6et88Fr7ZyPprd38jF2cNpvkS8yOopjH2MHZ9/09ryH9/IZWQmFdxUgPAGyFwTBsfH7OQeGRJPB1g/gh5YNATY8lt2yoVULWwugfjJQAeqLjI6ORzM7OfimPOLwVVqXn4lvyiOOB7I6O+7N7OR0SFZEQwXQS+qt73cXeMN58Jhpq37OTT/AQ41f0EkvW1eOTzgL9/UvcmmlgD2U0ZEgCND+i/RH7XcldbPbGdfD7ov4nkL2RvWy2xHVy+5Aak877/ie7LPfldGN91I5jgcMnZ323+hA72i1z9DWxZ/uX9i6fQBkt1dbwOtl3uD8RMncdLB3RyCp1AOvBwxLzMrWpXVoWU7YYUdal3qge/W9bH11fWy3xz9muy2mn80O3ROK2G7T97PdmfC46PPV9bH7IrWn3c6UHvZ7jV2pMGH9/cYOzgdT29GDhNUDC1op4STmZAHebCSmwCaDC+uSXETswrmtiN3C1iJmGa+HMjo6HL7yCCdsty+lh93umN62X8Y/ZrNF94TN1uiBNlt1g629ooZae0cPs/aKGW7tpR1uvYnHUUNttmoH2/jEDeC9fMZur74Xx7Dfq+9Ky3Ns2eo5bRXg9WRnsboy1+ZrdbAWbNoAMFmXgIV192Z2sv8i4VE7X0N3Tth2l6GvjXdEfwGUwLZEjrTeqh1lvS1itJV31FhFrL0ix/Ca9Zbop8Q9m6KH2WyOGSTA74rtK0LB19Bdsbrz0dz2DCESHZWuuDvTVvOBtYw0H2h518Jo5WKJXwH4KAGny4B3J/YWLrw9ZpCw4taoJ629NGOstoRNsNqknWT1uWay1efaqfWyOXyK1eYIV6st0ROtNkWMt95MBUSOpDfQOziW3e7E3lRmY+CyxSGAM61CbGk1I3QOSK22DUQrkWt/LG5DrTPmBOCdKT0YtyJWN0cOsfbWjRBW3RI5QQDdHDHNaqN2RstNmlktN4XNcd4WMdfBSzO35ebw2S03RjzDPiveQwVsjJwgrO8dMYKeIqzOeBfAr4o4p6u3/qZYjvEjBa1YczcraA5GoaWpXb7M+cS1dvWA6dL7E3vLgGOHWG+NetLKSzvO6rMwVwJpuSXimY8jctZF55UF5JXVGqtMUkWdBKlWAg/KrpfVpoZfKz22Wp210mqTdqbV5rBpwiu8o8Zab48cabMtcgjHbmhxJcYV4K4qWP0uoMngdGvB0iQt3yuPiBjebQG8TQEcPc7q88jJVhtDZ2yKyf0gv9J0udYM/KJIcv+1stokT3WWu9WmcDdhda/ocQL4jsTBZHoq135/Rje+W6S0g9facU4qFR5WjNMsDs7BOGhXvxx7kYfp1geyOguWJmntTHhcEJawsAy4/57YF4yFVZqGQE0SYJYAqZHwet29SpHi88p/au8TNVuEhpd2HOPcZrt+kO2XKY8xt/PdLHgYYvS++X5+LRXgzQq6b6DRllaWi46rXZhSBEtvTRho7R0xQjDy5gjX+T+kL7lVZcpUACtAc28CJ88Au74GPtkOeO8BDh8HktMAs1lWRkPw18pq9OOO6F+iqwuW94oZzrRmS1bfF9fD4aurXejmbX2MrVxVaqtmA624zPz5fi0HqPxsnPxudBBW3pXRzW5vWi+bHYlPWPtEDbXeGjOKkxt6MOGFwmrTdQImAFrVmAVs+ByY/dqD5XUPIDhMBk/LKwq7UVGb0nl3zDNWW8InWm+LfspmW+wQ2936fkyLwtoHsjq3/1zj/PuA9pNB052oYWFlFh608vbIkUw3Vl7RU7NKarQNAfufAZ59/cFgGytC5QVUVMphoADX51ecsmJqY3x760bwncLaBw3dWQx12qx3HOmrs6aLK0Zqkosr8UxNDlAZbFgO1sfybn0/at7aR7byiYyCTcpEaeGj/r8ebEPw7iqgugYwMc5lq0s74vLW11t7h24weUTE9sH0R7uoTjnQC7n12ywu3hB0X59A29a7E9uQPW19k/owvqx9YoYzPXX00bkVV5tuEDRjODLutwFWwHv5yqGhKDGvos5AUrP2ih1jvSt6mI13bH8yOQuWTmuCHPuuCLRtNhdXQI9c7mvdU6W2c/FWu9gdvNzddp+hrw2rru2xI6226CaczCjczAkyjuvqgDdXNw30nNeAVGMDN5cg+cTeWGvlHTPeeqduhM3OhIFUvOMuQ+cOKrVTT9UBu+YH7auz7urhZ0/SoFuJNLUjcbAgsC3RE6+X18ZXmyRh5QvhTQOsWPvv3rK1q00AJa2wOtBqa9TTrNOV9OW4LbKTDFptR8M0m3uTuUkUXT20ArRw7T2GgdY79SOsdsWPe2xf/OxKk1RXZZIn+alP84B+8S2gqhqoMQGVJqCo2pxn5R01xWpn3FjrLwzDbb40DHDaHN6xvWeAMw3SvKAtzH0XtLGP9YFLw+z3poyx2hHv+teIXI+KOqCyDuJv6crmAa24eI1JAsevqJOkcd9fmmfnEzfJel/6KMev0oc6vx/cjt4nQPvqmtHSfvdamu7tcOTqU3ZfpU+w25My7evUws1ltQQtiSJj7r+RohRXflCriZFzdmmthNJaSXIPvb7C7kvDVPt9GeMJupXqTNt60MubETTjpKF72/vouzofvj7O6WDGZMd9aTP9LpftLq6RUF7b/KDDY+jeEkpqgJIaSfogIn+d437jDKcDRlenQxmDBGjPAGeSbLO6twC93EJkngHOTv8I7eByNGdS68PZ0533X55z+FLJ7qIaoLRG+l3cu6pOQlG1EGlNeP66Vl9fnt36m+xpzl+l9Wv9WVib3429mQ6YFvgCvsjlm6sT2xzJecblYNZzW5OKNxVUSyisliBJEpqbyMpqJRRUCZEWns9bwXe2PZozkxuKLiq1S6fNQY6sIZo9ZXFADswXuKj8Xdp9mzO6/dHrz7b7JufFReqbq29VSaDQFZs3ZUm4LcYG8qtQ2/Vo9uJ23+a80OH7G7PI3G02nmvdRaVz+F2KE5Z4LENZ8rVVBbbqePja0EeO3Xyx/XfXX2l3JHtpTplUerNSAmO7OYsTujbHpSTdrs1w+ebakg5+eQs6HrvpVs/cW7X2chnajLU3qzIW8zKZ+dnTxTsczunbJaDwlc4nbr7W6bvrb13IrQ2/USGBUmuSmqkMlXCrUh4zt0LCt5kVAZ38rr/Z8fjNJZ2P3pjU+rMfLfGsthMLjvky6CYtNpSHlVL0rovrHZ2+0HfseapoWfeAgj91+z7/nT9ri7blVkgSJ5dfKcd2UxccJMbr5bJcLTXXzQy6pep2/ObbPU4WvPXI97lP/i6u/Uugu38W1uaxn0pff+xUyXt9fihY0+t4/gchN2rTcsokUBiHJLXfurSsqJVwrUzCtXJ5PP8rNZG9/fPf7x1QsKrPqZJ3ex2+3q+377nWXXx1zbvCuj9oo62rn8Fp1MHUdoOCyhYMOF2+fuCPJX/t/0PhJ4vDivdfKZXqskslZJfJFjdL0r+9iUALXy2TIMYplXCp2Fw9I7hoZ/9TBR/3/6nkw0Gny9cO/zaty+BvEtsMOaR3HOBnEMtKeiRFmXcTWnkg7jY+42O0dTuU5zj7x+w2Lx6/9cjocxXPjThb8emIoPJNwwJLtg35sXD3ZkNV6JUSCVdKZaHVWbTQ6v9qu4jMn1chIatUFo6RVSpJnrHlpwefKto57HTp1uFnyjcOP1u+yu3k9W5uJzI6TvO73HqsX479cpagkDcHmwC2RQt+S4eFCTf6VQbYLAmC4+tquLwVWd7pdXVRT7eQ6umjL1RvH3Wuave44IoDz4aWBy/Slhn9s2trMkskNJScUjnXko1rzbISTGYJXJkVV8tklVlixuUSM9gqz+4y1hSOP1cS9NSZ0gNPBpX5jj5buXNCcMXbr54teeyVoIJuy9Wl7d/Q3HJ+XQ071Z3vujURuAzYMpCNKhcO68PQ5u1odH7rYlWvP2nKBi5Rl06YGWb6dpmuNuHduNqi16KqMmaHVISNPVPsfzK7Jiej2Iy7IjU45vXG58q9vC7L18aay5POl0bP1FRcnR1ZUzBDUxX9tLrmyKzzVcveCi0f8qeo0sdXRKLrO1FopzLASZUFu+V3vvf2m4HTwgS8IhC2b6vh5GFAW884dFkRjj7vRGPghoS6CadyTHvWJZkKFsfUxU9V1/iPD670G3u24tjoM6Xfjw4s9j+VXZd7qcgMWSRL+0vnvEe+78jlmsynAotPjD5denxMUMX3k9TVgc9G1qa9HGsqdE+u3bkisnbM2+G1w1Yl4PG3o9FNlY72KyLRSqX+rcCZl4GWDQF7JODRtTr0WZeAgUcysViTj8TAG+bvXoow7ZocUnd80oW64xPPVx8ff67y+NgzFcdHnS49Me50ScBPV+vy0grNSCsyQ7SFkqVVzi1t0d3r32XWZI/6qejkqDOl/mPPVpyYcL7y+MQLNcdd1TUnZoTVnfn0iinE+5oUokrFHPdwDHs/Co+vSkK39+PQYZEFuAqyq/+6L9KJQkSO4TV6OK5PRBta2CMWfT10GHzqOjwjbuPS0Syz+7sxdeOf05jXTLtoOjklpM7fVV13YmJw9YkJwZUnxgZVnBgdVBI4MaRY73+t1pxSYIaQQjNSCs1ILZTk80bXD2XUVo0+U6oefbr05LigCv8J5yr9J52vOeGqrvOfqjaddLto+urtyLoJm69g894bSPPOxJJVyRjqGYN+74SjBy3+hgbOPoGwFaHJL/X+qz9RiKhh5ZEDe1U8XNx1eIQWJuCfcrE+qgCGL7Px0qpYjPGIwpPzNVjgFmo6Ne2iKWBKSF3AZHXdSdeL1WddIyuyJkaX1UwIK7k+WV0WH3TNVGgoMIOS/AA5nlmXP+5sxeXRwZUVYy9UFjytrtJOOl8dMPlCTQDHnxZiOjUrzPzxe5G1I+ne3plY8c1NGLdnYol7PIa9n4DHV+jRVWVAWxrMF7CG/NXtX0hjDdya8bEmHB3dI9BztQEDvs3GkugCXPriMuat0WH0qhgMXxGJAcsiakfMDMVpt4umQLcQU6BbVHWyW0JV9dSIqkuuF6rOPR1UcXr86bKgmcHl589dMxcn3TajsSTeNuNktumW65my4PFBZUFPn60ImqSuiZsYVlc6Odx0ffpF01mOPSNUOv28xvSme0RN/1VRGOoRg1G7s7Hi5G2kbjRixsokDKFH0lDrdGjtcecza4XRH2hsktdyX1hvpZUNaLsqGt1W6/DE3/UYHV2AxGM5WEHAa+MhCIRxRMXMCcOx2WE4N0tXkzMrvqZoZmitxi2k7tz089Xnp56vPj/5XKXa9Wyles6FyvDz181l+ltmNJQfsk1FM4IrQ13PlodMCa66wGf4rJu69sI0renK9Chz+TOhpot8x/wwTCBjr01CnzV6DFoZjae+y4PPT7fxw+p4PLUmBoPWx6Mn4/ttMvqdL9+Qze8f2w1i2TMNziuT0MkjEb3XJWLwmVx8qrmFgFV6jHHXYcTqRDxBwKstjDn3IrbMjTFlPhtXWzLnokk7J9QUNju0LmyWuk4z80JN+IzgGq1bcJV2enBlxLyQytgL182V8flmUH7MNpU+e74yevq5ygi381XaGedrtDMv1Ibz2dkhprA5IaawWVrzlVkxKJmrkS4uVKP9O8Fop/DMmlgMWavH0+cKkfj1VSyjB5LR2e8eDxemMT9AfPLxc2tbXJuUT9fYkIBHPfXot1aHEVG3Efd1FpYpmlyjRy9amMrh/S9GYcUL8XV1L2ilxOfDpJjnQ82650LNurkhdbHPhtTFzgmpjZ24P94waKVPdq+X3fOGLVldEGi4afKLyqx7Yv6K270Xrr0x1HNf5rR/ZiTxfiEX68QYHItjzo2Syp6PwnlajvHK3OwZia70xNWxGOmfh3+cK8Y/OUeG4+o49Hg/Cu2W6+DwQBcngVEjKt5kQFs+xPS0Mx2zom7jknscxq5KuKtFKoZa5IAvJVWvmR9jKpkfhuSXNBQpeV6YlDwv1Gx4IbTO8OQH+3O6T19U1N1tUVE3t8VCRi5yLxkw73+KlXP2dZ+5uPBp77NZfI7yUqhk4Fgcc54WOc/roeO6nqnUUwPnFXHosCYKvWhtLyPmRpQhfVUkxqyKw1CSryoDHVVqOKnufDNYuHhjUxM045laXK1De2HNWAw5lo0/a27hnCCvOAyly6/RoyPvU6qfl3LK1y2IkgoXaGBcEArjAo0k5OVQyfiyxmzsPWtZcU+3RSU93RaX9nRbXNJzxuJSITznMa+xf9qi0oGvf3ibzyhjiDYUxpe1yHkuBTpRGjO7aGHPdEre8UjAQM8EjNKVI+vzdEylcd6Lx2NrDej8Ob3RIL6a8bD4uVVD4CQxXx2sWX1RgwRHjfnnYGVoPk55JGAU0xY1S6XQIwiaynrRdPuFhQl15a9qkC4kDOkLNVL6qxop/ZUwKX3q9vPZfWYtLeo1fWFxTyGvFvec/mrJXVlYzL7Hn/tz4ezDSZkLwyTL80hfGCaP+UoE8mZexxHOWXhkFuwYsyyaPJPQf30yntKVI3X3Zcxeq8cIJa5VRrRaYRRfwvk5mXHyBE0LCtAxMuijWVgWdgthK3UYvSYSQ+gBwq0US6vw8LOAw/wb5fmLtMhaEo7UJRpFpNQl4VLqIo2UuuBMUfqUTT9mP/mu140hS/9ys//8lbcHvLLq1tBlf7s5ysMnd7rPhSsLL1Sl8d4l9YJUjrdYg7QXDKh+ugKzaemGoMk9q+MwYIMeY/QVyFGlYCJ5iKCZulSRDUDzh3MN/xq7N2mflv0kBRMjbuPqhkRMZOXDPPhBEjoxpug28i9j8NBzNcULXk6vrn4tHOlLNTAsDUeyaDVIXhoGw1K2vK6RDEs0kuE1jZSstLwm90sGcS/vV54PR/KCeBRNKYafcG3gYRFWuXAgUZF7mLqO5GBxXCmiPfUYw5S6NlJ2b2We943pxrHyng7dqUGPODwZfBNnjl3DB+56jCBbMo4YT4qLK3lwblH5ypcNNdVLI6TMZVokCtEgaVk4Eu8RTYPz+/Xzfi0SX9cidUECSqcXIMgVsON7BBOTQI1otTYanZmvWY1FFGP/xULsIPd4JGKwkmEack9DI8vHSjVmhO0KI1p9wPKTZBCPYYez8Wd1PhL+kozxayxVD0mCMSVSAi3OH6oBD824WT5tXkr1tdeizEVvRiD9zXAk/AZJXhqJvHnpqJxSgL+5WhYPYhGhhh1TJYsPWpmG2XMZcxIqYPS5hNksjT1j0V8QnBZt66uyB9Xg1OR8A2xIZhxUuHgCBjL3nb2JgIBc+NLyZEsSGtfW/xOGNoIHjLCl29Hd3fLyHJ9Jq3R/UWe6ujhCqlymxY03Nch4KxxJy7WIWx7eQORzKib9jQjkvBaNkpeSUDE7G74TitG73rp+sCEAlsecGz2RdYRnEp6MKUPwhQJ41WeYWPSlUWg8kpif/OvAe+O53uxKgWJhRk8NuqyPRV+y+KcGTD2Tj6SjOfgrgTOHi4UIiUQnr2WX58KBLxExd+enTSScKdF1457Tmj+br8GFly9KxYvCYH5Ng9ql4ahaqkXN4giYXolGzcuxSHwxEb5uGXhlfj6cBFlBXs9z8cPY9NCiLV3aPR49hTUTMDysBAejShC0Lh7jSGAMP089unL9v+bO16Hrl5iNSawe9J0OanY55NRFMCw3qVHmPu90PP9TPlKO5OCz1YkYSaJbFYXH3zOgOyfDKkkULdx0yIE9FcDCQFEC49EtCI7jNegyTYvBU2PQ25WlIrd55K0eK3GvATYefrCnB9GVyR+iAoxE1/WJ6E1P25CAUReL8U1MGS5+rMcUzoeGEMWKHh3pET608gNL0Luoxb6Y2BNTw064khEdNqTIscO6e9MlzPHPQ9Q/b+CYSo8pJBHGldhgCEN3upUIjUS0EQowwMlCJg4ivuQqjpXcXZG3eRxomTV5cOR7uTVFdhaZQo+uJCYqn2uB3ZmYG1aCME0JAj5KxmQRcjoMFqTGNMX8nQN7ocAHLjYagqa1uVVE8siS6/CVkejE+OZCQ6xb9Xj6yHV85XcTaXuu4kNWQwwBapqLebFQ0aG7hxaP0gNYwdFrCIIlLt1UEZUWbUXqYX8cOnChw8UCiYhWY+qhUllqkkgDbmNbWCkyfszHJ2uiMJZ1txJq7zIc6RVBcGTNwVhmKr4H3gNPLCsuPkjr0GIEviEcPVZr8QQBkty8jFh8KBfqQ7lI2JWNv/0lEZMYBpygKPp1eIKT9ohBb6G0OPQgARGQIhu4WuO4KSLf9vLQou/KGPQjUIYPlcy18j/z4R1UjEunC3CMdbYgrQQMFwrRo5d7Ch6hIulVrB8ImMb7Wen5QNDsaAB8q1a4Suv/F46OIhXEoi8LAro7F/KbjXhzz3Wc3JeLrN3X8OOWLKz/MAmuohzkUk+u2Zk7B9EqnKgiIhPEYJAocWMxZF0yhnLcjwx4Zk8uPv72FkJOFsJ4PB8HvdPwEsHSulQs3Z2kRu9g+lQAW/jh52XnLwJWOi3ARWxkwU4wqAFtGbe0HC0irEHWjMdTBOp1Get2XMOp7deQ7XUVuo1X8O3Hmdj0kREeG9KxdH0KXliXgtnrUjFj3SXMXp+KeX8x4o2PMrB2Yza2bcvFcd88JH+dD+OBG/h29xW8s06HCQwhgqUC3WPRf4UOfbg1xJBgqanUC00DfB/ggo11cLBolQwpE0wM+tGKLGQ4MVp/VTTGfZSGRZ9m4i+fXMGev2cjQJWF0L9eQfyGbCSvy0aa5xUkf5iN2L9n48I/cnB801Xs3JyNdR+lYt4aPUZzHJIUQ2adDoOZplgGr9OhOwmOaekNrqIs+93CpX8dcSnofqG1fNIhtMi1KRnYACcWJnR5yy5FTy7nmCe5ZcM9LO5i0MVZQIjFfTKeEqs1rtgaCfvFfbRmAoa7R2MYvYgrKFaGJDXmXwWs2MDQwYFra8W6grR+NXH9At67XfJnWqy4xEu49ySnH6eNl9Ga7MwKjdZnecgPBThZKmEFSYk5VI9Boi6OxRDGJMVSJw96LwaDRJyztk/A40yBDCFyCFdLIg2GoQ3B0pVfPyBv6jevde+ivffIYnXxMhYULCS0ciHB2BL5NRXtmKY4WaYtTryeobnToUevD7nlpEcvAhM7rnHowUKIS0U+x2yh0qG9WNgY0YqbfKLgCZQrPgWsnJJ+bVq6F8q/f6a4PD/go/WZ1+n6athxchYmdWK6IweIyRvQlnmaefn9VLQTrSV3s5/38X5aUzzPrSs5lO5WdZZPJv+zYO+rnjualguahxUPUMpJFSxhkCUrgwoR+3DyzosDz4XIe9R2giwNd0tXSw0ufp/BNPrv5d37Tvb3uHj33/6IVdudL+hw4mLySo19n1bc44eWFq95WBQWBCmA/h7z/I+NabGUAkZpH7wC+o/N7P9e9P+jBv4XjX3yTJDryYsAAAAASUVORK5CYII="
-     alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function SYMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 40;
-
-    const placeholder = document.getElementById(`marker_shenya_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.z + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'shenya',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_shenya_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.z + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      }
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      } */}
-    </>
-  )
-}
-
-export default React.memo(SYMarker);
diff --git a/src/views/Home/MapCtrl/Markers/ShuiDianZhanLayer.js b/src/views/Home/MapCtrl/Markers/ShuiDianZhanLayer.js
deleted file mode 100644
index 5e3c6f6..0000000
--- a/src/views/Home/MapCtrl/Markers/ShuiDianZhanLayer.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { SdzRealPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import ShuikuMarker from "./ShuikuMarker";
-import ShuiDianZhanMarker from "./ShuiDianZhanMarker"
-
-export default class ShuiDianZhanLayer extends BaseLayer {
-  static LayerName = 'ShuiDianZhanLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return ShuiDianZhanLayer.LayerName;
-  }
-
-  onAdd() {
-    SdzRealPromiseWX.get().then((data) => {
-      const list = data.map((i)=>{
-        return {
-          stcd : i.hystCode,
-          stnm : i.hystName,
-          lgtd : i.hystLong,
-          lttd : i.hystLat,
-          ...i
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.ShuiDianZhanLayer;
-    if (highlights !== this._setting?.highlight?.ShuiDianZhanLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return ShuiDianZhanMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/ShuiDianZhanMarker.js b/src/views/Home/MapCtrl/Markers/ShuiDianZhanMarker.js
deleted file mode 100644
index 4b0054d..0000000
--- a/src/views/Home/MapCtrl/Markers/ShuiDianZhanMarker.js
+++ /dev/null
@@ -1,205 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-import { useDispatch, useSelector } from 'react-redux';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-  //rzState !== 1 水库-离线；   rzWarning===1 水库-超汛限
-  //#888灰   #0f0绿   #ec4e4e红    #1296db蓝
-
-  let color1;
-  color1 = '#1296db';
-
-
-  // if (rzState !== 1) {
-  //   color1 = '#888';
-  // }else{
-  //   color1 = '#1296db';
-  // }
-
-  // if (rzWarning === 1) {
-  //   color1 = '#ec4e4e';
-  // }
-
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGUAAABkCAYAAACfIP5qAAAACXBIWXMAAAsSAAALEgHS3X78AAAIhklEQVR4nOVdXW7bOBCmFvueLqAXPSV7gnhPEO8Jmj1BnRPUOUG9J6hzgtg3cE5Q+wQbn6D2k14ErH0CLbj9FBCuLM0MhxQDf0DRFrAsmh/nl8NhVte1uUSUWT4v6mqa4k//JYExREeZ5fcpj+/iSCmz/IMxZm6MeU1gOK24REmxKuvaGLNOYCytuCibUmb5TSMhRV19GH5E7bg0SZkZY65SlhJzSaSUWT42xnzCf5Mm5dcExsAGjPXIeW7s/HuHPxaHoq4agz5zPpOskTfvwaaUWT7CpNu/rU24E3zNEWqrwW9FXR10R6qH5EiBFNyDiPuTydTE1hizMMasirraBXqHCMmQAp0/CUzEOWwRu6xSkKDBSSmzfILY4XbQgfyAVXMra3+GlJ7BSAEZMwRyKWJpF8sQkhOdFBjuudBgx4aVHJu4nMV8bzRSYMDtj/sc5YW62EJqosQ3UUiBdCwSsRs++DuG1AQnBbbjOehL4mJjPcSQtiYoKWWWL5zURgjsnei9wSiCS21tzdjJFqgiCCmwHytlY75Fzsr+2bVNCLLA3888f8TfWoTZ75sUdbVS+r43qJMCQtZK9qMJ6taUuKHM8nXHQniy278BgtSHoq4WCt/zBlVSFAlZcgM4TPa3jo/8dbqqFWMlVWK0SXn1JEQcsJVZvuuZ3LNJSCVyfiJdCrX9FBh1KSHWo/m9qCuroyWE9E3ovut77Sov6srao0fH9nCxgOvvDRVSMCkSL8tOwGNRV2Nprgkqs69UiBT0FXU1h/e2EQzF2qcVxuMFb1Kgy78IHt3CrZx7DmFOMNhk19UuDrtIbKAoGMs1vE4veJHiuL5cbDT8fKgLioSy0yOI3B8E6uwOmkMML0NfZrkl5CPzsaW1HT6Ddt7f5QK/oairzOMdI5DKdZ//kC46saSgynBIQu6JwanEPrwBEzsWSIzYRRaR4lQZcqBJCOf93pldhxgObsssF9UqSyVlyvTptwQPKdT7VfJTIOaB+dhM4o2xSSG6oC6OmllV5Lc471fbA0HU/sR45EqyGCWSMmUavYnyfveM8f7OoFECHJ/YMh6dcqWFRYpASp40s6gnVY4UhNop5NhGtrRwJWXCWKXHk6pEDXC/L8h+B+wLJ7gMSgrny1UrQZA05O7PhNxTn2OTjYIrjJ8EMilQHVSPZ6+Zyha64CbUziC++8CUXPLpMY6kcPSottriOhfGN2ikAAuPKi0fqQafQwqV6aOylNwIE56xjjtwJJg0hyRSkP+hrlTVrVGJ2gJikcL5vXqkcPShxyT+BNgxbn6tQZQzKLAtL8SPk1I1VFKoeZ+tcqAolbpt5Bpgaix2RdmdpJJC3eZUUxlI5kn3zGOf1OIEyL0LvPd4HQwt1Z6oRO9O3bEUB6g+H+yoUm+lsszyDTGO6l3glDOPN9QfplgAzclvteGzQiH5ny3Vl114JZLSO58U9UW2J8TPdQKSOXRl/kawwKgqU82mUKBlWLVdagkkez9UqerVABRSohl5xhZvSCwl6RmOZEEbnAWFlJjtMtRiHCFCZLbb4E0KFV7xCaHKMQbmKRzfToIUweZZCBwVJFUlCZpKbxZKlWNoDHISuA2apIhsD6PKMSS09n/SKfAGpAMa2rgb5l5RF1SkfVD1Jdzi1YYkUPRFp5qkpFlI9bpCSRkr7hBKyVVxMDhnU/riIM1+X2ybolzG+q/gUVGgeAbkHGEfKOqLOugh1ZAkI6wdKFIlpVczUEjhHAZV8T4EkJCiHShSx9DrdveSwhRv3z0MKbjv1QgUT0HVFL3zSfW+qMY4emds2BPuAVjtQkHO7+719KikkO2KxkFMJrhSolooCJBJobjfVFI4frxWIEYFl5QQ46OSQtI4JFJQOU89XhY7scghRT1QRACsWsPAieipP+ZaoWiBBIE9CbFgOJKnTgqnUiVWez+OgdUMFP8HFh/V6yLXxJFJgXGkqrC7SNJCfUeoHUXOd5KdC25CkuO1xMj+UklR31EUJFODkcKZ6FvfzgtdQPEBZftYPVAUnJdZcuIiFilYbUvGI9OAqReqlITYUVww905Yi1Oyn8J5wRVaLoUIKCmkqAeKUFuckwBLrupkkyKQlttA9oVCimqg6DS65oCtwqU7jzNmr5JP0pYYbSDaE9VA0WnFyFFbTxIHQ0QKXsRdMV85J2R7QJESzUUgIUTshov36NEPi1vU/axETB8paoGiR7NSUetFo1A4IZngZwVXuYsUtUDR6fXFJeTFp9OGFylYjY+CR7/YRqASrwwT1WVPVAJFZCQkhOx9HQzvEiP0gKQexHRhC/DWgjimT0q8PT1I8jdBHZdKxyatuq+J8NCQXYX/2ElgSE0XKV6Bol0g6K0sObffvN/blqk1i8ak7jyqBPfo2t0Z7JVZfjjzjj16C7MBF1vaxreB2jUeahWSWKGSXosNruEE7M55aD1NFth63JKBJtffPQlZat6rEuICAml30lPssYezaFQCAtCvLZ/doJcwdYzNBQTSxgku1HpjNgh1VccIE6p1CKghaHzGG+psN+tc4OnTwaINT+iUp4pgl9ooX9nRhX3LXkVzja2k/IgK9Ss6GoS+aajZdxj6/IkmGrc3WKV+rIvSpgoNC1LAJkCj0p8Q80rB93S/Yxui3FxnBrp8871JTRTpcDHINbXv5CLOPciIfcpr2AudlSJpbZAyCyGRxNXnkJyJoIe+Jl6QYY4uGadI5j76BnAImog7NEEvCEqTuIe+QXKkuHAI0rI9GxzrWOPuyGSIcKF5EFUdNnWCrLBB0HbjROruPoyb99o5RwIPIIHc5S4FJE0K0Ez4HCu70fnq18OmgqTVl/mhwmp4RKNU1Y02UmmY0wrnLOHsUggxqZMC1bUdMmYYAu+BlKH7gEVHsqQgoDykEMzFRsqS0sQolwVjzH/c6Y85fRlx9wAAAABJRU5ErkJggg==" alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function ShuiDianZhanMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-  const getLayerVisible = useSelector((s) => s.map.layerVisible)
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 16;
-
-    const placeholder = document.getElementById(`marker_shuidianzhan_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.shuidianzhan + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'shuidianzhan',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_shuidianzhan_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.shuidianzhan + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.shuidianzhanLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      } */}
-      {
-        (zoom > 10 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              // backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.shuidianzhanLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
-              color: !getLayerVisible.SatelliteImage?'#0008':'#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(ShuiDianZhanMarker);
diff --git a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
deleted file mode 100644
index a28e1b9..0000000
--- a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { SkRealPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import ShuikuMarker from "./ShuikuMarker";
-
-export default class ShuiKuLayer extends BaseLayer {
-  static LayerName = 'ShuiKuLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return ShuiKuLayer.LayerName;
-  }
-
-  onAdd() {
-    SkRealPromiseWX.get().then((data) => {
-      // if (Array.isArray(data)) {
-      //   data.forEach(o => {
-      //     const strarz = o.rz - o.fsltdz;
-      //     if (!isNaN(strarz)) {
-      //       o.strarz = strarz.toFixed(2);
-      //     }
-      //   });
-      // } 
-      const list = data.map((i)=>{
-        return {
-          id : i.stcd,
-          name: i.stnm,
-          ...i
-        }
-      })
-      
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.ShuiKuLayer;
-    if (highlights !== this._setting?.highlight?.ShuiKuLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return ShuikuMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/ShuikuMarker.js b/src/views/Home/MapCtrl/Markers/ShuikuMarker.js
deleted file mode 100644
index da82740..0000000
--- a/src/views/Home/MapCtrl/Markers/ShuikuMarker.js
+++ /dev/null
@@ -1,275 +0,0 @@
-import React, { useEffect } from 'react';
-import {useDispatch, useSelector} from "react-redux";
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState, engScal }, { width, highlight },zhongxingSk) {
-  //rzState !== 1 水库-离线；   rzWarning===1 水库-超汛限
-  //#888灰   #0f0绿   #ec4e4e红    #1296db蓝
-
-  let color1;
-  color1 = '#1296db';
-
-  if(zhongxingSk){
-    return `
-    <div style="position:relative">
-      <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-      </svg>
-      <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACcAAAAmCAMAAAEHJkI0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAC0UExURQAAAAC//wCv/wC1/wC3/wCz/wC1/wCy/wCz/wC1/wCz/wC0/wC1/wCz/wC0/wCz/wCz/wC1/wC0/wC1/wC1/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC0/wC0/wi2/xC5/xi7/yC9/yjA/zDC/zjE/0DH/0jJ/1jO/2DQ/3DV/4Da/4/e/5fg/6fl/6/n/7fq/7/s/8fv/8/x/9fz/9/2/+f4/+/6//f9/////6+gwSEAAAAgdFJOUwAIEBggKDA4QEhQWGBocHiAh4+Xn6evt7/Hz9ff5+/3v+H4wgAAAAlwSFlzAAAXEQAAFxEByibzPwAAAcNJREFUOE+NlAtz2jAQhA9c8ipQKI+al33QJk0KNG1ok4D////qnrS25dRm8s3YszqtT9JJsogMOnhlWXYrY7wzaSsQ8W+J8aiFzZKpC/tedLiebNOGOpkCKrGzGD6J0TfzDKJlQiSKB160dvjm6HL9zRP4rOC+lNmsyKVJKS/lmspSJIUCEAuvwEC/7g+HneqYAWnpKzODrX6w2OSObaJzkctiBuRZezL3A1WQIUUAikcVYCMtqUliMfCFbYChS7qjeOJKmNNOdft02N+qRozIqFjQ3sY1ZsF6Trqy0GDNtuOoE8Q03zvPFjMcVWxAUf9H6hwsRblpBRuekCrvjqUUAdKlKPlcU1aswx3cADvXcsWGp2uhqtPtvCMfqFJpR9S3s5uzGJbfBPQSXe+CerzsN6rpkL2kPdPNEw0Bz3eqywt6wES/vbDrDacHnI38FqX6k+Ea/mCqN2a7UP3FWC2vMPbgW+kPRhp4hDGST6q/GWjgCN/UDvP3+/OssWpZwP0OZExxnoV8pDoP9iW4bY0srYB1171K6q/hlM0mltw46fBXVc81XUanqTzJFR0FN//Pc2X7WkfUnfr/9Dzuu3tCRP4B7Ry4DIhW1/gAAAAASUVORK5CYII=" 
-      alt="" className="panel-icon" />
-    </div>
-    `
-  }else{
-    if(engScal==='1'){
-      //大 (1)型
-      return `
-      <div style="position:relative">
-        <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-        </svg>
-        <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAACXBIWXMAAAsSAAALEgHS3X78AAAA9klEQVQ4ja2UwQ2DMAxFfxB3GIEN6AjccykbwAbdoN2kbFAOZY+yQbsBncCVLdMCBSUCvpRT7Jcfx44hIgxlGsQACl0pxmoBVLzIohvlDUGmwVEDIwAvADUgCecJ8M0HkZX9Mcg04uCqgAtZAfZ7hHmVfZyA1MlNrWd/tpdBrJydGdyJa/LUKxymEA8QXzMJtahck9McxEOcW7CjB4CYLJKlHIcjVhvoE9eOQJfSUANi0yDbQuKruWx7KdgDAgW1O3Ck2JVHoEvVsCGjlRBpyECbsNjghoe3k2LrFJcrIDy00oPfV9MpztWqSxzDw/r7IXb52AB8AEaiY4yRlhvQAAAAAElFTkSuQmCC" 
-        alt="" className="panel-icon" />
-      </div>
-      `
-  
-    }else if(engScal==='2'){
-      //大 (2)型
-      return `
-      <div style="position:relative">
-        <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-        </svg>
-        <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAACXBIWXMAAAsSAAALEgHS3X78AAAA9klEQVQ4ja2UwQ2DMAxFfxB3GIEN6AjccykbwAbdoN2kbFAOZY+yQbsBncCVLdMCBSUCvpRT7Jcfx44hIgxlGsQACl0pxmoBVLzIohvlDUGmwVEDIwAvADUgCecJ8M0HkZX9Mcg04uCqgAtZAfZ7hHmVfZyA1MlNrWd/tpdBrJydGdyJa/LUKxymEA8QXzMJtahck9McxEOcW7CjB4CYLJKlHIcjVhvoE9eOQJfSUANi0yDbQuKruWx7KdgDAgW1O3Ck2JVHoEvVsCGjlRBpyECbsNjghoe3k2LrFJcrIDy00oPfV9MpztWqSxzDw/r7IXb52AB8AEaiY4yRlhvQAAAAAElFTkSuQmCC" 
-        alt="" className="panel-icon" />
-      </div>
-      `
-      
-    }else if(engScal==='3'){
-      //中型
-      return `
-      <div style="position:relative">
-        <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-        </svg>
-        <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACcAAAAmCAMAAAEHJkI0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAC0UExURQAAAAC//wCv/wC1/wC3/wCz/wC1/wCy/wCz/wC1/wCz/wC0/wC1/wCz/wC0/wCz/wCz/wC1/wC0/wC1/wC1/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC0/wC0/wi2/xC5/xi7/yC9/yjA/zDC/zjE/0DH/0jJ/1jO/2DQ/3DV/4Da/4/e/5fg/6fl/6/n/7fq/7/s/8fv/8/x/9fz/9/2/+f4/+/6//f9/////6+gwSEAAAAgdFJOUwAIEBggKDA4QEhQWGBocHiAh4+Xn6evt7/Hz9ff5+/3v+H4wgAAAAlwSFlzAAAXEQAAFxEByibzPwAAAcNJREFUOE+NlAtz2jAQhA9c8ipQKI+al33QJk0KNG1ok4D////qnrS25dRm8s3YszqtT9JJsogMOnhlWXYrY7wzaSsQ8W+J8aiFzZKpC/tedLiebNOGOpkCKrGzGD6J0TfzDKJlQiSKB160dvjm6HL9zRP4rOC+lNmsyKVJKS/lmspSJIUCEAuvwEC/7g+HneqYAWnpKzODrX6w2OSObaJzkctiBuRZezL3A1WQIUUAikcVYCMtqUliMfCFbYChS7qjeOJKmNNOdft02N+qRozIqFjQ3sY1ZsF6Trqy0GDNtuOoE8Q03zvPFjMcVWxAUf9H6hwsRblpBRuekCrvjqUUAdKlKPlcU1aswx3cADvXcsWGp2uhqtPtvCMfqFJpR9S3s5uzGJbfBPQSXe+CerzsN6rpkL2kPdPNEw0Bz3eqywt6wES/vbDrDacHnI38FqX6k+Ea/mCqN2a7UP3FWC2vMPbgW+kPRhp4hDGST6q/GWjgCN/UDvP3+/OssWpZwP0OZExxnoV8pDoP9iW4bY0srYB1171K6q/hlM0mltw46fBXVc81XUanqTzJFR0FN//Pc2X7WkfUnfr/9Dzuu3tCRP4B7Ry4DIhW1/gAAAAASUVORK5CYII=" 
-        alt="" className="panel-icon" />
-      </div>
-      `
-      
-    }else if(engScal==='4'){
-      //小 (1)型
-      return `
-      <div style="position:relative">
-        <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-        </svg>
-        <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAMAAACf4xmcAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADeUExURQAAAAC//wCv/wC1/wC3/wCz/wC1/wCy/wCz/wC1/wCz/wC0/wC1/wCz/wC0/wCz/wC1/wC0/wC1/wC1/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC0/wC0/wi2/xC5/xi7/yC9/ybA/yjA/y/C/zDC/zjE/0DH/0vK/1DM/1jO/2DQ/2DR/2jT/2rT/3DV/3jX/4Da/4Tb/5/j/6Xl/6fl/6/n/7/s/8fv/8/x/9Xz/9fz/9z1/9/2/+H2/+P3/+n4/+/6//H7//b8//f9//v+//7//////++NTSgAAAAfdFJOUwAIEBggKDA4QEhQWGBocICHj5efp6+3v8fP19/n7/eclSivAAAACXBIWXMAABcRAAAXEQHKJvM/AAABqUlEQVQ4T4XU61qCQBgE4CWN1DQ0LTSQscys7GiZ2cnKsrj/G+oDBl0Qn95fsjOPu6y7qqSiVbdFwypxIEOx3saC18humraEvdvRZDKZfT7fHwGtAqMlowEc3k39pbdzYH+DMeVb6NzNWIi9HMMxWQiZbXSfGGp+BvCKrIh8G/30V4V+b+BtsaSMFnqZLeldwMmx1sCRvvaEnxM0o5YJjDiY4R2INrCFPocyXcExpFUCJhzJ9AXsSE1WxoE1ToPVGR6u+bzGA5AP5hzzeY0PoKJ2/1ma73/Lb6v2gLWbRnJWVDM6XgmMaQ64ymGkYx6TEeVGSQLjmIzIb7CKMU2BttpnpGNOT8CBqjPSMacRYKsyIx1zGgCWyjHSMY/MDwG5EcG9S2Eh8gg4ckIqzDQsRPpAVWrG6s6xEJIv88LbsM1wiY3ArBudSrGyw6wE5DXd4IwLuaZJrIihTLm4qAXGMXb8+aU8lFkSqT1m6/VMPlushEqJecPSbNiRGSss0KZ+7uRUjC+CD+5iXTFjJ/0i8KzU31too5o4yW4t/o9ZYVbtsOraNX06pf4AF/To1MedNx0AAAAASUVORK5CYII=" 
-        alt="" className="panel-icon" />
-      </div>
-      `
-      
-    }else if(engScal==='5'){
-      //小 (2)型
-      return `
-      <div style="position:relative">
-        <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-        </svg>
-        <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAMAAACf4xmcAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADeUExURQAAAAC//wCv/wC1/wC3/wCz/wC1/wCy/wCz/wC1/wCz/wC0/wC1/wCz/wC0/wCz/wC1/wC0/wC1/wC1/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC0/wC0/wi2/xC5/xi7/yC9/ybA/yjA/y/C/zDC/zjE/0DH/0vK/1DM/1jO/2DQ/2DR/2jT/2rT/3DV/3jX/4Da/4Tb/5/j/6Xl/6fl/6/n/7/s/8fv/8/x/9Xz/9fz/9z1/9/2/+H2/+P3/+n4/+/6//H7//b8//f9//v+//7//////++NTSgAAAAfdFJOUwAIEBggKDA4QEhQWGBocICHj5efp6+3v8fP19/n7/eclSivAAAACXBIWXMAABcRAAAXEQHKJvM/AAABqUlEQVQ4T4XU61qCQBgE4CWN1DQ0LTSQscys7GiZ2cnKsrj/G+oDBl0Qn95fsjOPu6y7qqSiVbdFwypxIEOx3saC18humraEvdvRZDKZfT7fHwGtAqMlowEc3k39pbdzYH+DMeVb6NzNWIi9HMMxWQiZbXSfGGp+BvCKrIh8G/30V4V+b+BtsaSMFnqZLeldwMmx1sCRvvaEnxM0o5YJjDiY4R2INrCFPocyXcExpFUCJhzJ9AXsSE1WxoE1ToPVGR6u+bzGA5AP5hzzeY0PoKJ2/1ma73/Lb6v2gLWbRnJWVDM6XgmMaQ64ymGkYx6TEeVGSQLjmIzIb7CKMU2BttpnpGNOT8CBqjPSMacRYKsyIx1zGgCWyjHSMY/MDwG5EcG9S2Eh8gg4ckIqzDQsRPpAVWrG6s6xEJIv88LbsM1wiY3ArBudSrGyw6wE5DXd4IwLuaZJrIihTLm4qAXGMXb8+aU8lFkSqT1m6/VMPlushEqJecPSbNiRGSss0KZ+7uRUjC+CD+5iXTFjJ/0i8KzU31too5o4yW4t/o9ZYVbtsOraNX06pf4AF/To1MedNx0AAAAASUVORK5CYII=" 
-        alt="" className="panel-icon" />
-      </div>
-      `
-      
-    }else{
-      //其他
-      return `
-              <div>
-                <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-                  <path fill="${color1}" d="M17.165122 443.775672s246.54204-102.656238 497.77576 40.932044c298.928648 170.800023 453.147589-166.074014 453.147589-166.074014s55.018525 335.695395-54.926981 465.963884-419.230178 271.270625-555.803826 177.162398S2.52937 627.781057 17.165122 443.775672z" p-id="4232" data-spm-anchor-id="a313x.7781069.0.i0" class="selected"></path>
-                  <path fill="${color1}" class="${highlight ? 'shuichi-border' : ''}" d="M512 1023.999119A512.125434 512.125434 0 0 1 312.695163 40.245456 512.125434 512.125434 0 0 1 711.304837 983.742219a508.818372 508.818372 0 0 1-199.304837 40.2569z m0-955.340393C267.540608 68.658726 68.659166 267.540167 68.659166 511.999559s198.881442 443.340834 443.340834 443.340834 443.340834-198.881442 443.340834-443.340834S756.459392 68.658726 512 68.658726z" p-id="4231" data-spm-anchor-id="a313x.7781069.0.i1"></path>
-                </svg>
-              </div>
-            `
-    }
-
-  }
-
-
-  // if (rzState !== 1) {
-  //   color1 = '#888';
-  // }else{
-  //   color1 = '#1296db';
-  // }
-
-  // if (rzWarning === 1) {
-  //   color1 = '#ec4e4e';
-  // }
-  
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function ShuikuMarker({ data, dispatch, setting, zoom, distSq }) {
-  const highlight = setting;
-  let zhongxingSk = useSelector((s) => s.map.zhongxingSk);
-  const getLayerVisible = useSelector((s) => s.map.layerVisible)
-  let zindexOffset = 1; 
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 16;
-
-    const placeholder = document.getElementById(`marker_shuiku_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight },zhongxingSk);
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.shuiku + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight,zhongxingSk]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'shuiku',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 14) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_shuiku_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.shuiku + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      } */}
-      {
-        (zoom > 10 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              // backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
-              color: !getLayerVisible.SatelliteImage?'#0008':'#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(ShuikuMarker);
diff --git a/src/views/Home/MapCtrl/Markers/SmallSkRiskLayer.js b/src/views/Home/MapCtrl/Markers/SmallSkRiskLayer.js
deleted file mode 100644
index 3f7bb57..0000000
--- a/src/views/Home/MapCtrl/Markers/SmallSkRiskLayer.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { smallSkRiskFindAllApi } from "../../../../service/homePage";
-import BaseLayer from "../baselayer";
-import SmallSkRiskMarker from "./SmallSkRiskMarker";
-
-export default class SmallSkRiskLayer extends BaseLayer {
-  static LayerName = 'SmallSkRiskLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-    //console.log("props 13",props);
-    this._time = props.otherParams;
-  }
-
-  getLayerName() {
-    return SmallSkRiskLayer.LayerName;
-  }
-
-  onAdd() {
-    let params = {
-      stm: this._time.stm,
-      etm: this._time.etm
-    }
-    //console.log("params 26",params);
-    if(params.stm && params.etm){
-      smallSkRiskFindAllApi(params).then((data) => {
-        //console.log("@@@21@@@ 小水库风险预警",data);
-
-        this._dispatch.runtime.setSmallSkRiskNums({
-          "total": data.smallReservoirRiskWarning.total,
-          "redAlert": data.smallReservoirRiskWarning.redAlert,
-          "orangeAlert": data.smallReservoirRiskWarning.orangeAlert,
-          "yellowAlert": data.smallReservoirRiskWarning.yellowAlert,
-          "blueWarning": data.smallReservoirRiskWarning.blueWarning
-        });
-
-        this._dispatch.runtime.setMarkers({
-          [this.getLayerName()]: data.list || []
-        });
-      });
-    }
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.SmallSkRiskLayer;
-    if (highlights !== this._setting?.highlight?.SmallSkRiskLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return SmallSkRiskMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/SmallSkRiskMarker.js b/src/views/Home/MapCtrl/Markers/SmallSkRiskMarker.js
deleted file mode 100644
index f2b01ec..0000000
--- a/src/views/Home/MapCtrl/Markers/SmallSkRiskMarker.js
+++ /dev/null
@@ -1,197 +0,0 @@
-import React, {useEffect} from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ warningLevel }, { width, highlight }) {
-  let color1;
-
-  if (warningLevel === "1") {
-    color1 = '#FF0000';
-  }else if (warningLevel === "2") {
-    color1 = '#F69A23';
-  }else if (warningLevel === "3") {
-    color1 = '#F1E400';
-  }else if (warningLevel === "4") {
-    color1 = '#2DA1FF';
-  }
-
-
-  return `
-  <div>
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-      <path fill="${color1}" d="M17.165122 443.775672s246.54204-102.656238 497.77576 40.932044c298.928648 170.800023 453.147589-166.074014 453.147589-166.074014s55.018525 335.695395-54.926981 465.963884-419.230178 271.270625-555.803826 177.162398S2.52937 627.781057 17.165122 443.775672z" p-id="4232" data-spm-anchor-id="a313x.7781069.0.i0" class="selected"></path>
-      <path fill="${color1}" class="${highlight ? 'shuichi-border' : ''}" d="M512 1023.999119A512.125434 512.125434 0 0 1 312.695163 40.245456 512.125434 512.125434 0 0 1 711.304837 983.742219a508.818372 508.818372 0 0 1-199.304837 40.2569z m0-955.340393C267.540608 68.658726 68.659166 267.540167 68.659166 511.999559s198.881442 443.340834 443.340834 443.340834 443.340834-198.881442 443.340834-443.340834S756.459392 68.658726 512 68.658726z" p-id="4231" data-spm-anchor-id="a313x.7781069.0.i1"></path>
-    </svg>
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function SmallSkRiskMarker({ data, dispatch, setting, zoom, distSq }) {
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_smallSkRisk_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.shuiku + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'smallSkRisk',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  };
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_smallSkRisk_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.shuiku + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      }
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(SmallSkRiskMarker);
diff --git a/src/views/Home/MapCtrl/Markers/TangYanBaLayer.js b/src/views/Home/MapCtrl/Markers/TangYanBaLayer.js
deleted file mode 100644
index b229caa..0000000
--- a/src/views/Home/MapCtrl/Markers/TangYanBaLayer.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { TybRealPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import TangYanBaMarker from "./TangYanBaMarker"
-
-export default class TangYanBaLayer extends BaseLayer {
-  static LayerName = 'TangYanBaLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return TangYanBaLayer.LayerName;
-  }
-
-  onAdd() {
-    TybRealPromiseWX.get().then((data) => {
-      const list = data.map((i)=>{
-        return {
-            id : i.damcd,
-            ...i
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.TangYanBaLayer;
-    if (highlights !== this._setting?.highlight?.TangYanBaLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return TangYanBaMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/TangYanBaMarker.js b/src/views/Home/MapCtrl/Markers/TangYanBaMarker.js
deleted file mode 100644
index a1d862b..0000000
--- a/src/views/Home/MapCtrl/Markers/TangYanBaMarker.js
+++ /dev/null
@@ -1,192 +0,0 @@
-import React, { useEffect } from 'react';
-// import { zindexmarker } from '../zindex';
-const zindexmarker = {
-    z:36,
-    hilightPlus:40,
-    zLabel:56
-}
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    aa
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAvCAMAAAEz/lMIAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADPUExURQAAAN+fQN+vMN+qNdenMNmmM9uoMtyqMtmpMNmoMdqnMNuoMNuoMdupMNuqMdupMNyqMNypMdypMNuqMNupMdupMNypMNupMdupMNupMdupMNysNt2uPd6xQ+C0SuG2UOK5V+O8XeS/ZOXBaubEcefHd+nJfurMhOvPi+vQjuzRke3UmO7Xnu/ZpPDcq/HdrPHfsfPju/TkvvXnxfbpy/fs0vju1vny3/r05fv26fz37P358v368v369P379v779/78+P78+f79+/7+/P///w9/vtgAAAAadFJOUwAIEBggKDhIUFhgcHiAh4+fp6+/x8/f5+/3+3uB1wAAAAlwSFlzAAAXEQAAFxEByibzPwAAAhpJREFUOE+NlW130kAQhaeo1Vq1iFLthqLUWqtWxZYKGqqC8/9/kzOzdze7yXJOng8w985NsuxLIHLCUD65dk7FzL6Y8cWORhpxNLBPMWvfO1UZkhpUZZl7/tvwnnaFjriQ63juhZaKCNxIOSY6Qunupw33QMWsrusLVdb5lz/HPr2Y8WUj7CEQeKQJq02R+wJxi2vAmF6iEigZW8qIaIiyxYt4r+/h7iB5iPiolKRxzUtUStOwW+lyeELj1nzmNTQaE9iKLLZijV/wQGyctam0sW/9Do9kTvbHEJHjA7GJHidzZ4wP1YbIIXqFKuekHA8/zrntnWyJWveoJ+btV2118Eb034hdn0MkvvvG2wVKIXnu3QaFkvjM8e6pvwmzaUR/oeNZQTT+udrMV5DBr7zNPPU6+HAFr+GvYAoYrPmf4Bk30Z/CAe+CDx2xlZfDhI3QgHyJnf4eipyBbIju4ZETpTws74k2J7at6ACyD0+IDlH244jyXT5f5NxM0ACv2/PwEXOq/OWvcBs681b9RJp/r8MmSCjMs99Kf/gzdEZpXaofMpZVa+SguI6TJZfGopTylzYgfd936eZPwxtpg9dURid/hbSSnNtAKz9dIwqaFwDI83PEGpbJWVfS/Fs98h0+oOtJ8tcItMlWIubP0C2RrDTyVfgXKNOsns+/h7+bsFN3vJ93Qk9R9GNI9AxlH57rgd/re8VoQPQfnZYpHzvsimoAAAAASUVORK5CYII="
-     alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function YinShuiGongChengMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 16;
-
-    const placeholder = document.getElementById(`marker_tangyanba_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.z + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'tangyanba',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_tangyanba_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.z + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      } */}
-      {
-        // (zoom > 12 || distSq < dist2 || highlight) && (
-        //   <div
-        //     className="markerLabel2"
-        //     style={{
-        //       backgroundColor: '#0008',
-        //       padding: 4,
-        //       borderRadius: 4,
-        //       fontSize: 10,
-        //       lineHeight: 1,
-        //       top: 0,
-        //       left: 0,
-        //       transform: 'translateX(-50%)',
-        //       zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-        //     }}>
-        //     {data.name}
-        //   </div>
-        // )
-      }
-    </>
-  )
-}
-
-export default React.memo(YinShuiGongChengMarker);
diff --git a/src/views/Home/MapCtrl/Markers/WYLayer.js b/src/views/Home/MapCtrl/Markers/WYLayer.js
deleted file mode 100644
index a8414d8..0000000
--- a/src/views/Home/MapCtrl/Markers/WYLayer.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { WYPromise } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import WYMarker from "./WYMarker"
-
-export default class WYLayer extends BaseLayer {
-  static LayerName = 'WYLayer';//位移
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return WYLayer.LayerName;
-  }
-
-  onAdd() {
-    WYPromise.get().then((data) => {
-      const list = data.map((i,index)=>{
-        return {
-            id : i.stationCode,
-            ...i,
-            "lgtd": 114.575,
-            "lttd": 31.11174,
-        }
-      })
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.WYLayer;
-    if (highlights !== this._setting?.highlight?.WYLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return WYMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/WYMarker.js b/src/views/Home/MapCtrl/Markers/WYMarker.js
deleted file mode 100644
index 8abb160..0000000
--- a/src/views/Home/MapCtrl/Markers/WYMarker.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import React, { useEffect } from 'react';
-const zindexmarker = {
-    z:36,
-    hilightPlus:40,
-    zLabel:56
-}
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAA1CAYAAAAOJMhOAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFxEAABcRAcom8z8AAA45SURBVGhD1ZoHeJXVHcatInuDyFJQtMVRLbSlWDqsVimICDKUFVlVhggyBB+gCLQIVUZZsrIhbAiBAAECKCSEIDISyCCQhGwybsbNujc3p//fyXclJDdkAH3s/3ne54bvO+d93/93znfWx0P3I4qLi58SvCOYI3AX+AsuCmIF6YJsEJIWU+B0YqnqsmtS7qyzbiFyzVPwuaCv4CmD7n8fIl5H0Eop1Vl+/yJwyrTkzYvLSXWLyko8Gp4RdyE0Lfp6SFp0yuW06OyQjOjckPToXNfwI5Zeh/6hXtwxvmDcd6ujz926diwxL8M5s8A8Dw64DM5WgjqG3IMNEayNqGCQiM6TXzeTJdf3+9SogH0xQSEbwg7FLLmwM2XuOU/T9DPOuVMC1hd+ErDOCgYeWWR7Ycc41Wnr2KJ+fgszV4b6xPjEnr18PvXaaTjgMjgHGRq1Ddn7H0L+qIi1EHQTfJRjyXNJzcu8EJ4eZ/JPvGzdGOZXNDvYwzby5HJbL9+5xd29pxa/sGN88TNbx6iOXiNVxy0jVVvP4aqF+3uq3RYn1X3v1GKnE8tskrhtk9SFAy444UbD0GqBtmHj/oUQ854MECxJy8v0lacauSc6sGBt1GE158o2NSpolerlP1/9dv9U9ezOD1VrrxGqsfsgVc+5v6q9qa9GnU3vqIYuA1Qrz2Gq0/axumxv/wVqtNSFAy444UYDLUPz/r1f8nRqCWEHwVCLzeqaZE4PC0i6kr0uzNc6LmCNevXg5+q53eNVx22jVRsvJ/X45mGqpccQ1VxaoqnbYNXYdZBgoEYT+buZ23vSSu+rxzyG6rJtpQ514YALTrjRQAtNtPGAF8NWzUIIHhaiXwhGmy35XhFZCdd8Y4PVisgDyilgueriPVmbe3SjtICgzqZ+qoHLuzoJksE8iTWXMoCywJ5sQylLHerCwT044UYDLTTRxgNe8GTYq34IwROCUUVFFm8ZuZJ3Rp8unB7sot7w+4fqtHOsauHxvn7qdKNGAt0KbrTCncnYEykN7lOWOtQHcMEJNxpooYk2HvCCJ8Ne1UOews+kYnv5HWTKN2+OMMUn+SadVzMveKjuPtN0l6ot70Nd536qqetgh4ZrArjghBsNtNBEGw94wRNJ4dGwW3lI4SZSqY/NKoNXety17ddPFc266KlePTxb+v1wVd/5XVXfpb9uFfs7cT8AF5xwo4EWmmjjAS94Em9v49GwW3GQtaC+VHjJarV+kWI2hfjFX7B+9r2bemX/dNV6iyQj/Z7uQXdyZAo8J3NNZGaCUFUcsTm31J/3z3RYH2400EITbTzgBU/ibQEehaa+oOKWkpu1peAzguGpeVm7gpMjTAylvY7OV495DtUCDex9XYRbljFix7Qzm/BcaXxz9WC5unZONNBCE2084AVPMlftwSNehabiyVduNpVCvaw266rQjJgQ5zA/65jAVernOz9SdZzf0eTNSolXhBUh3tpwZXEs/qLD+naghSbaeMALnsRbKB7xKjRNDfvlQ24+KYWmZBfkBhxLvJQ5JWij6rZfBgHPIaquMSkiVFHL2OF785w2XFmk5Jkc1gd2DTTRxgNe8HQk8UIWHvEqNE8a9m+HXOTdYQLtJpmvjs5MSna7cVz1lKGTWZ3mbyqo6gBQ2ftTOtpuHuGQww400cYDXvDkcsNf4RGveBaaWoLb7xIX5EYredkGpOVn7g1Mulq4OHKvemnvJD2EMgE6EnMEDFYnKhoY7gSDxLvaC54WRexReMQrnvEuVLdXEXKhgaCL2ZI340p6zKnN104UTTy/QT2z4+96BmcodSxUHhisToz9dqVDnrKg6+EFTxO+X6/wiFc8450cjHR0C7WUC33SCrLWHk+4dHXRD9uL+5/8Uj2xdaReUDKbOxJxhBHHvy5xWsVYcnGXQ56y4KGyTGovnvqdXKTwiFc8412oWhrp6BZqLxibYE7z2Rl1KmlSwDr1h4OzZA4YoSc4liiORJ7eOrrctQXnt5Y4rWLsiQ4ox1G2G7Z0H6I9NHAeoD31ODhT4RGveMY7ORjp6IQ6CfesmOyUoI1hh82Djy1Wz++eIOP/MN06rM1KCwCeLFH2CWOwOhGSHnNH/cHHvtTXvaJO6n+zBHrcY5iszofoAQJPrMzxiFc8S/FZ5GCko7sc295/RWUmhv/n8j7bGwfn6KZtzuJTkmleZnQr3QoMvaeTruhEGBAwWJ0oKLJoTiZZeEqPkC4RR2RkG6rab3ZS7WVT2Eq2HC0ksXay5cAjXvGMdyne2UhHt9ALghVRmQnxS0P3yqJwqmomyZRsAconxLLFUdBVMFjdkN2tw3pce1xapIPsdjt6jVJtPEeUDOPug7VHvOIZ7+RgpKMTekmwLjIj3vR1mLd6ec/Hqr5rfz32O1qzYTyzMFeLMon29Vugeh6cq7rsnqSvVTfoZiQFT+lVxsTTa39M6ClJiB7AiryeSz/tEa94xjs5GOnohBj2XCIz4nK/jtgn7894vWXm/aloEUpSLF0wY79m7//VjdnB7j9ykBi8w2W0RLt0C5EQD7nWxrfV87vGK7ziGe/kYKSjE+oqvG6Rpvj8ryL3qc67xulKje6SkCNgrCbhGnG0HBe6jhJiN/zwhj6qs6zt8IpnoeC0qKuRzu0WumaKN3+lW2iCnpWrmxDGahIMBmW57pZQLZlgaSG84hnv5GCkoxN6WbD+x3do7yd6ldvY2E5XNalztyINi9ULR4vU0gl13DJKv0Pt6HLip65sAF/eM6n0O7SeHIx0dEKMcsujTIlxy0O9VY/9M/Tw2EwIGemqmhDGahplJ+nSCdFCHbxGyig3vOS6jMC/95mh8IpnvJODkY5OiJOdhTcyk0PXXDlQ2OvwPNVh22g9qdFC/DIH3G3bgKF7CUbJ0nz2hDjuaivDdRvZjrNiaCnJ4A2PeMUz3snBSEdPrB3lwqexOSkn3cOPmjhQ/5X3J3pPTwsxS7eWJ8VvididyQAM3Ut8fPqbcpyAJOy6jLqc5eHN6eRShVc8410oOhrp6BZqIxiRaM7Y7hMddPOzIBf1+pG5+hDQvqmrLKGqbrsrCuafspx2oEcynMLi6XW/uQqPeMUz3snBSEe3UDO58GZ6fvaywJSwSywphpxeppuWYyXGfpK5W5dj6XIvwQTtiBeQEKttRl48DTm9VC978IpnvAtFMyMd3UL1BM/nWiwTo7ISj/vEnLXOuOyhnpWxvtaGt/VpqCOh0qjqtruiYA3niNcONnh4wdO0S+4Kj3jFM97JwUhHt9Ajgiay+/tbtiV/y6XU67krrvuqX++bIvv5fppMr+fcHIuB6my7HYV9kVoOotlcgAe84GnZtQMKj3jFs1RvInjESOd2GJkuSs5Ju7H9ZoB1gP+X6smto/TY39BloN7bOxJlwrsfwbKnLDeajUS7iSxI8YKnbbGnrXjEK54N++VDbvLlbHReYd6hwLTw5Pk/bFVvyODQRjZV9F/OyRAp+y5Vd9tdUbDbtXPaNdBEGw94wVNAangyHvGKZ8N++RDOhlLgjzabdX6MOSXQJ/Zs/qxLnqqrNDPvUT2ZoR3tjzgpta++7yVKz0VooIUm2njAC56is5OD8IhXqdbQsF8+5CanP20FvfmKFmGKv7U9PkAN/W6pjC6jVEOGTiGnCyB6t1GvprBzooEWmmjjAS94yinIZzHaG694Nuw7DiMpPnBNyiownwpIvmpecnm36ntsoT5xacTeXoSa6nVe1ReuVYXewBkaaKGJNh7wgifxNhmPlSZjDynIGXd3wYKYrORg//iL+XyAGnBysf7axsKVfs0BiqPzhpoCLjg1t2ighSbaeMALngSv4NGwW7WQSo0Ff8q3Fv47xWwKPZFwqXhxyC7V2+8L9fT2MfL0BmpRdpA8Vfp8yfrLsVlHoKyuI3V1ywgXnHCjgRaaaOMBL3iSZCr/lOIoqCgEPQUrE7LTLh5LuJi17Iq3GhO0WnX3na7abf1A75l4oswRdJOSU6LKuyJlKEsd6sIBF5xwo4EWmmjjAS81TsYeQsJQ/mah1bo4MS8j6GxKeO62mFNq+nlX9drh2aq9LOvtnz1Y91VlD8U9ylCWOtSFAy444UYDLTTRxgNeDFv3FkZLvSZYkGspOBqWEXd9d0xg1sKL29QHAStVT/8vVLcD0/XWnSMm9lGsvXjievvBsl9Aq3CNe5ShLHWoCwdccMKNBlpoon3PLVM2hJDjYk76P8yzFqy9np105kxKWKZv0g/KNe6kmnPZSw399iv9XbT9FumKDLvygrNltifE37z03KPM76Ts+1KHunDABSfcaKBlaN4+5r2fIcQPC/iG9JbgnzabzTc9NzM8PCs+wefm2YyVId4FU85sUH2OLFAv7pogu83h0q1YNpV85aaL8UmEe5SZLGWXSx3qwgEXnHCjgRaahvyDCxFpLYI9BMMEs23Fxaujc5IPSJ8PPxgbbF571Vd9FLBGtxafEx9a/5YGf9Mq3FsjZXylbFBKRDh14YDL4OyBhiH34EPE+OxfR355tzgXf7WouGiidJONmQXmgMtpN1I2R/jbJp5Zp7p6T1YNXAdo8PeEM98oT7l3ScpQtsBm2UhdOAwuOOGu+mf7+x1igDnrRQH/721moaVw/9WMm8keUcf1d9Hf+EwVfKr/drt+XF1Jj03JlzKUFfD/7Kjb2KD7aYQ80boCPjqzBZmUU5jnF5gUlrY6xMc2Ndi5GKwK9bEFJoelZRfmHqEMZalDXYPmpxlilHO+qXHZqftPJYTcOHAzOOdA3LmcU4mhN+JyUmmZaZQxiv/0Q544/3njlwUWy6epuaZDyWZTQkqeKSEtL+sQ17hHGaP4/0+I8dcF/FeWawY4GvqrcfsBxEMP/RfxIT5i1GYFgQAAAABJRU5ErkJggg=="
-     alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function WYMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 20;
-
-    const placeholder = document.getElementById(`marker_weiyi_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.z + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'weiyi',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_weiyi_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.z + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      }
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      } */}
-    </>
-  )
-}
-
-export default React.memo(WYMarker);
diff --git a/src/views/Home/MapCtrl/Markers/WarnLayer.js b/src/views/Home/MapCtrl/Markers/WarnLayer.js
deleted file mode 100644
index a4813bd..0000000
--- a/src/views/Home/MapCtrl/Markers/WarnLayer.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import BaseLayer from "../baselayer";
-import WarnMarker from "./WarnMarker";
-
-export default class WarnLayer extends BaseLayer {
-  static LayerName = 'WarnLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return WarnLayer.LayerName;
-  }
-
-  async onAdd() {
-    /*const params = {
-      status:[0,10,20],
-      pageSize: 999,
-      pageNumber: 1,
-      "warnetm": moment().format('YYYY-MM-DD HH:mm:ss'),
-      "warnstm": moment().subtract(24, 'hour').format('YYYY-MM-DD HH:mm:ss'),
-    }
-    const resData = await page(params);
-    console.log("32",resData);
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: resData.list || []
-    });*/
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.WarnLayer;
-    if (highlights !== this._setting?.highlight?.WarnLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return WarnMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/WarnMarker.js b/src/views/Home/MapCtrl/Markers/WarnMarker.js
deleted file mode 100644
index 96bbf2d..0000000
--- a/src/views/Home/MapCtrl/Markers/WarnMarker.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { zindexmarker } from '../zindex';
-import {Button, Modal, Tabs, message} from "antd";
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ warngradenm }, { width, highlight }) {
-  let color1;
-  if (warngradenm === 5) {
-    color1 = '#F39800';
-  } else if (warngradenm === 6) {
-    color1 = '#FF0000';
-  }
-
-  /*return `
-    <div style="cursor:pointer">
-      <svg fill="${color2}" t="1668582218569" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3035" width="${width}" height="22">
-        <path d="M810.666667 170.666667a128 128 0 0 1 128 128v426.666666a128 128 0 0 1-128 128H213.333333a128 128 0 0 1-128-128V298.666667a128 128 0 0 1 128-128h597.333334z m-347.008 359.594666a85.333333 85.333333 0 0 0-115.370667-0.384l-5.205333 5.205334-148.949334 161.28a42.666667 42.666667 0 0 0 26.368 71.338666l4.949334 0.298667H801.706667a42.666667 42.666667 0 0 0 32-70.826667l-97.194667-110.336a41.386667 41.386667 0 0 0-55.466667-0.768l-3.754666 3.754667-77.952 73.514667-2.005334 2.56-130.730666-132.778667-2.901334-2.858667zM704 341.333333a64 64 0 1 0 0 128 64 64 0 0 0 0-128z" p-id="3036" fill="#1296db"></path>
-      </svg>
-    </div>
-  `;*/
-
-  return `
-    <div style="cursor:pointer">
-       <svg fill="${color1}" t="1678953292388" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3679" 
-        width="${width}" height="33"
-       >
-        <path d="M868.7 211c-0.1 0-0.2-0.1-0.2-0.1-80-20.2-151.3-60.5-219.9-92.3-45.7-20.2-80-54.8-145.7-54.8h-3c-19.9 2.9-31.3 5.8-45.5 11.5-97.1 43.2-185.7 106.7-299.9 135.5h-0.2c-17.1 2.9-28.5 20.2-28.5 37.5C134.4 663.6 311.5 828 494.4 952c11.4 8.7 25.7 8.7 40 0C743 825.1 888.7 580 897.3 248.3c-0.2-17.1-11.5-31.5-28.6-37.3zM576.1 703.9c0 35.3-28.6 63.9-63.9 63.9h-0.2c-35.3 0-63.9-28.6-63.9-63.9S476.7 640 512 640h0.2c35.3 0 63.9 28.6 63.9 63.9z m0.4-191.6c0 35.5-28.7 64.2-64.2 64.2s-64.2-28.7-64.2-64.2V320.2c0-35.5 28.7-64.2 64.2-64.2s64.2 28.7 64.2 64.2v192.1z" fill="${color1}" p-id="3680"></path>
-       </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function WarnMarker({ data, dispatch, setting, zoom, distSq }) {
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.status) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 14;//12
-
-    const placeholder = document.getElementById(`marker_tuxiang_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-      //console.log(placeholder);
-      const el = placeholder.firstChild;
-      //console.log(el);
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.tuxiang + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'warn',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-    })
-  };
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-
-
-
-  return (
-    <>
-      <div
-        id={`marker_tuxiang_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%) ${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-    </>
-  )
-}
-
-export default React.memo(WarnMarker);
diff --git a/src/views/Home/MapCtrl/Markers/XjHdswLayer.js b/src/views/Home/MapCtrl/Markers/XjHdswLayer.js
deleted file mode 100644
index 82a52d5..0000000
--- a/src/views/Home/MapCtrl/Markers/XjHdswLayer.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import BaseLayer from "../baselayer";
-import XjHdswMarker from "./XjHdswMarker";
-
-export default class XjHdswLayer extends BaseLayer {
-  static LayerName = 'XjHdswLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return XjHdswLayer.LayerName;
-  }
-
-  async onAdd() {
-    const hdData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/wufeng/swzjyyl.json`)//五峰水位站简易雨量.json
-      .then(resp => resp.json())
-      .then(data => data.filter(o => o.STTP.indexOf("Z")!== -1 && o.STTPSTR!=="简易水位站"))
-      .catch(() => []);
-
-    if(hdData.length>0){
-      hdData.map(item=>{
-        item.stcd = item.stnm;
-        item.type = '2022年新建水位站'
-      });
-    }
-
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: hdData || []
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.XjHdswLayer;
-    if (highlights !== this._setting?.highlight?.XjHdswLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return XjHdswMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/XjHdswMarker.js b/src/views/Home/MapCtrl/Markers/XjHdswMarker.js
deleted file mode 100644
index e3a0a59..0000000
--- a/src/views/Home/MapCtrl/Markers/XjHdswMarker.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ state, warning }, { width, highlight }) {
-  let color1="#1AFAEA";
-  /*if (state !== 1) {
-    color1 = '#888';
-    color2 = '#17abe3';
-  } else if (warning === 3) {
-    color1 = '#f00';
-    color2 = '#ec4e4e';
-  } else if (warning === 2) {
-    color1 = 'yellow';
-    color2 = '#ec4e4e';
-  } else if (warning === 1) {
-    color1 = 'yellow';
-    color2 = '#ec4e4e';
-  } else {
-    color1 = '#0f0';
-    color2 = '#17abe3';
-  }*/
-
-  return `
-    <div style="cursor:pointer">
-      <svg t="1619076397355" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4205" width="${width}" height="${width}">
-      <path d="M512 25.6l277.94432 972.8H234.05568z" fill="${color1}" p-id="4206" data-spm-anchor-id="a313x.7781069.0.i9" class="selected"></path>
-      <path d="M512 164.57216l208.45568 764.34432H303.54432z" fill="${color1}" p-id="4207" data-spm-anchor-id="a313x.7781069.0.i6" class=""></path>
-    </svg>
-    </div>
-  `;
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function XjHdswMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_hdsw_${data.xh}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.hdsw + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.xh,
-      type: 'xjDrp',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_hdsw_${data.xh}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.hdsw + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.hdswLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.stnm}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(XjHdswMarker);
diff --git a/src/views/Home/MapCtrl/Markers/XjRealDrpLayer.js b/src/views/Home/MapCtrl/Markers/XjRealDrpLayer.js
deleted file mode 100644
index 3e4d901..0000000
--- a/src/views/Home/MapCtrl/Markers/XjRealDrpLayer.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import BaseLayer from "../baselayer";
-import XjRealDrpMarker from "./XjRealDrpMarker";
-
-export default class XjRealDrpLayer extends BaseLayer {
-  static LayerName = 'XjRealDrpLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-
-    this._visible = false;
-    this._layerSettings = {};
-  }
-
-  getLayerName() {
-    return XjRealDrpLayer.LayerName;
-  }
-
-  async onAdd() {
-    const drpData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/wufeng/swzjyyl.json`)//五峰水位站简易雨量.json
-      .then(resp => resp.json())
-      .then(data => data.filter(o => o.STTP.indexOf("P")!== -1))
-      .catch(() => []);
-
-    if(drpData.length>0){
-      drpData.map(item=>{
-        item.stcd = item.stnm;
-        item.type = '2022年新建雨量站'
-      });
-    }
-
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: drpData || []
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.XjRealDrpLayer;
-    if (highlights !== this._setting?.highlight?.XjRealDrpLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return XjRealDrpMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/XjRealDrpMarker.js b/src/views/Home/MapCtrl/Markers/XjRealDrpMarker.js
deleted file mode 100644
index b3e9873..0000000
--- a/src/views/Home/MapCtrl/Markers/XjRealDrpMarker.js
+++ /dev/null
@@ -1,207 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-import { DRP_COLORS } from "../../../../utils/renutils";
-import {useSelector} from "react-redux";
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-function renderMarker() {
-  let color1 = "#1AFAEA";
-  /*if (h24 >= 0 && h24 < 10) {
-    color1 = DRP_COLORS[0];
-  } else if (h24 >= 10) {
-    color1 = DRP_COLORS[1];
-  } else if (h24 >= 25) {
-    color1 = DRP_COLORS[2];
-  } else if (h24 >= 50) {
-    color1 = DRP_COLORS[3];
-  } else if (h24 >= 100) {
-    color1 = DRP_COLORS[4];
-  } else if (h24 >= 250) {
-    color1 = DRP_COLORS[5];
-  } else if (h24 >= 500) {
-    color1 = DRP_COLORS[6];
-  }*/
-
-  // return `
-  // <div>
-  //   <div style="width:10px;height:10px;background:${color1};border-radius: 50%;"></div>
-  // </div>
-  // `
-
-  return `
-  <div style="cursor:pointer">
-    <svg width="${12}" height="${12}">
-      <div style="width:10px;height:10px;background:${color1};border-radius: 50%;"></div>
-    </svg>
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function XjRealDrpMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  /*if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }*/
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_drp_${data.xh}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker();
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.drp + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.xh,
-      type: 'xjDrp',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_drp_${data.xh}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.drp + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-     {/* {
-        (zoom > 12 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.h24 || '-'}m
-          </div>
-        )
-      }*/}
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            <div style={{textAlign:"center"}}>{data.stnm}</div>
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(XjRealDrpMarker);
diff --git a/src/views/Home/MapCtrl/Markers/XxjyswzLayer.js b/src/views/Home/MapCtrl/Markers/XxjyswzLayer.js
deleted file mode 100644
index 5a9bcda..0000000
--- a/src/views/Home/MapCtrl/Markers/XxjyswzLayer.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import BaseLayer from "../baselayer";
-import XxjyswzMarker from "./XxjyswzMarker";
-import {HDJyPromise} from "../../../../models/_/real";
-
-export default class XxjyswzLayer extends BaseLayer {
-  static LayerName = 'XxjyswzLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return XxjyswzLayer.LayerName;
-  }
-
-  async onAdd() {
-    /*const hdData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/wufeng/swzjyyl.json`)//五峰水位站简易雨量.json
-      .then(resp => resp.json())
-      .then(data => data.filter(o => o.STTP.indexOf("Z")!== -1 && o.STTPSTR==="简易水位站"))
-      .catch(() => []);
-
-    if(hdData.length>0){
-      hdData.map(item=>{
-        item.stcd = item.stnm;
-        item.type = '新建简易水位站'
-      });
-    }
-
-    this._dispatch.runtime.setMarkers({
-      [this.getLayerName()]: hdData || []
-    });*/
-
-    HDJyPromise.get().then((data) => {
-      console.log("简易河道水位站  36+++",data);
-
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: data || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.XxjyswzLayer;
-    if (highlights !== this._setting?.highlight?.XxjyswzLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return XxjyswzMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/XxjyswzMarker.js b/src/views/Home/MapCtrl/Markers/XxjyswzMarker.js
deleted file mode 100644
index 48081a3..0000000
--- a/src/views/Home/MapCtrl/Markers/XxjyswzMarker.js
+++ /dev/null
@@ -1,177 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ state, warning }, { width, highlight }) {
-  let color1="#1AFAEA";
-
-  return `
-    <div style="cursor:pointer;background:${color1};border-radius:50%;width:16px;height:16px;line-height:16px;text-align:center">
-      <svg t="1679535728455" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4380" width="${width}" height="${width}">
-        <path fill="#fff" d="M830.17 888.25A372.63 372.63 0 0 0 785 849.59c-45-30.41-59.49-28.89-95.71 10.73l-1.33 1.48a107.37 107.37 0 0 1-169.71 0.55c-43.46-46.72-43.87-47-88.24 0.46A113.05 113.05 0 0 1 344.77 903a123.35 123.35 0 0 1-95.3-53.36 45 45 0 0 0-63-15.57 99.21 99.21 0 0 0-37.79 25c-10 10.42-20 21-29.81 31.52-22.62-15-37.37-35.43-58.71-47.87v-3.92c11.43-11 23-21.89 34.33-33A176.65 176.65 0 0 1 182 757.57 112.94 112.94 0 0 1 302.33 795c37.41 45.62 51.1 43.5 85.75 0a109.5 109.5 0 0 1 172.85 1.11c34.28 43.36 49.76 41.47 82.94 0.5a111.36 111.36 0 0 1 125.2-37.73c3.73 1 7.46 1.75 12.25 2.9v-82.64H667.78V605h113.31V492.75H667.83V419h112.94V306.87H668.24v-74.24H781.6v-73.72h75.57a35.45 35.45 0 0 1 3 24.42c0 198.78 0.74 397.53-0.55 596.26a61.47 61.47 0 0 0 30 59v4z m-446.1-257.63a184.3 184.3 0 0 1-198.92-44.1 175.88 175.88 0 0 1-47.6-193.81A724.32 724.32 0 0 1 310 127.62a76.69 76.69 0 0 1 9.72-7.28 96.36 96.36 0 0 1 11.52 8.8 733.93 733.93 0 0 1 169.07 258 186.82 186.82 0 0 1-116.24 243.48z m0 0" p-id="4381"></path>
-      </svg>
-    </div>
-  `;
-}
-
-/*function renderMarker({ state, warning }, { width, highlight }) {
-  let color1="#1AFAEA";
-
-  return `
-    <div style="cursor:pointer;">
-      <svg t="1680772074338" class="icon" viewBox="0 0 1049 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22473" id="mx_n_1680772074338" width="${width}" height="${width}">
-        <path d="M524.19047633 21.33333333l185.904762 975.238095H338.28571433z" fill="#1AFAEA" p-id="22474" data-spm-anchor-id="a313x.7781069.0.i3" class=""></path><path d="M524.28800033 268.40990433l120.393143 675.035429h-239.469715z" fill="#ffffff" p-id="22475" data-spm-anchor-id="a313x.7781069.0.i4" class="selected"></path>
-      </svg>
-    </div>
-  `;
-}*/
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function XjHdswMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_jyhdsw_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.hdsw + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'hdsw',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_jyhdsw_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.hdsw + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-        }}
-        onClick={showPop}
-      ></div>
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.hdswLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data?.stnm}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(XjHdswMarker);
diff --git a/src/views/Home/MapCtrl/Markers/YHJMHLayer.js b/src/views/Home/MapCtrl/Markers/YHJMHLayer.js
deleted file mode 100644
index 0c768c7..0000000
--- a/src/views/Home/MapCtrl/Markers/YHJMHLayer.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { YfzhdPromise } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import YHJMHMarker from "./YHJMHMarker"
-
-export default class YHJMHLayer extends BaseLayer {
-  static LayerName = 'YHJMHLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return YHJMHLayer.LayerName;
-  }
-
-  onAdd() {
-    YfzhdPromise.get().then((data) => {
-      const list = data.map((i)=>{
-        return {
-            id: i.avrcd,
-            ...i
-        }
-      })
-      const list2 = list.filter(o=>o.adcd.indexOf('421181113')===0)
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: list2 || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.YHJMHLayer;
-    if (highlights !== this._setting?.highlight?.YHJMHLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return YHJMHMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/YHJMHMarker.js b/src/views/Home/MapCtrl/Markers/YHJMHMarker.js
deleted file mode 100644
index c80f461..0000000
--- a/src/views/Home/MapCtrl/Markers/YHJMHMarker.js
+++ /dev/null
@@ -1,200 +0,0 @@
-import React, { useEffect } from 'react';
-// import { zindexmarker } from '../zindex';
-import { useDispatch, useSelector } from 'react-redux';
-const zindexmarker = {
-    z:36,
-    hilightPlus:40,
-    zLabel:56
-}
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    aa
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAIABJREFUeF7tXQdYVEfXfk2iIhCxd7EGG1ixxwIaExUFEQtYsaFExZpYExJUbFFRY42CDezS1ERp9oYVsKBGRcWOjSai/P8B/YLCbbt3d+/dvfM8+yzKmTPnnJmXe2fmlAJQmmIBxQKMFiig2EaxgGIBZgsoAFFWh2IBFgsoAFGWh2IBBSA6WgOj1tVC6ZLtUdzUGsZFLFCokCkKfmWCgl8Zw6iQEQoVLIxCBQuhiNFXKGL0BYwKf5Etafqb90hLp08mMt5mIOPtG6RnpONtZireZqYgIyMZqWnxeJ4cjSfPorBy6DUdaaj3wypPEHWnuGwnE7Rq1xNVKjZD2VL1ULJEVZQtURoVyhmjhJl27Jv0MguJD1PxKOkJniXdxqOncbhz/zSOH9qFRwdS1FXRkPtrZwL1zcKegQNR/GsnlC3VErVrlMLXJtLU8HUKcPXmUzx6egLPX++Ep8NGaQoqXakUgHDNTWKWMcLOOuDdOwcUN2uG6pUrw8Q451VIbi0l9T3+vXsXz1+expdfBqJjk0BUKJAqNzW0Ka8CkPysfSOrDM7HjoNZUSeUL1MNxkZfaXNStDZWanomHjy+hZevdqKR5RLULPBYa2PLZCAFILknavWRiShZoh++qWoFU2P9BAXTwkxOzcT12zF4lrQFbm3+kMn61biYCkBm7hoM8/KusKjaFJXKF9G4xeUwwL0HaYi/fQYJD3zh1dNPDiJrSkbDBMiI1WaoU30lqlbugvq1zDRlXL3ge+naS9y+uw9X/h2FNW4v9UInAUoYFkAmbLBANfNFsLToCPMKhQXYSXXShAfA3USAvp8mASmpOZ9k+qR9+HfKfz/TSCbGgGkRwMTkv59NjXN+pk+pEoB5eaByhZxvbbSExDeIjQ/DrYQJWDQoXhtDSmEMwwDI1G2tYV5+DhrWbY0yJb8U3fC02C9eyQHBvQ9g+AgK0QfLh2FusFT6AJoGdQACldjt8bN3uHD5GBIeTIN3n2Nis5caP/0GiOdOB1SqOANNLBujqKl4uma8Bc5cAs7E5HxfuSG1ec2Rp05NoGl9oKlVznehguLJ+So5C2djz+He/VnwdAoUj7G0OIm3aKSk1/KwlihWfA2s61uioEiHUefjgHOXgezvOHIHkZLG3LIYFQYa1wMa1QMa1835FqO9zQSiL8XixfMRGN3xhBgspcRD/wCy8sgWWFv1QQkz9V+lYuOBqJNA5Eng1j0pzZv6slSrBNi0ANq3ACwt1OeX9PIdomO2YVSbfuozkw4H/QHI4oNDUMN8NupZlFPLvE+eAREfQHH6olqsZNO5WYMcsNi2AEqXVE/suPiHuJkwHeO/W68eI2n0lj9AHmeZYm90CNpat1fLpJEngIhTQNQJICVNLVay7WxSBGjfErBtDti0VE+Nw9FR6GrdDWUKJKvHSLe95Q2QZRFzUM9iDKpUNFXJjC9eAaERQGgkEH9LJRZ628miGmBnA9jZAsWKqqbmnfvJiItfhjG201RjoPte8gRIQExlFHi/H03rq7bTpP3E3gggJBKgVyqlMVuAXrm62QBdbQHat6jSzlyKQ9YXneFsdVeV7rrsIz+AzN8/HtZWXqhSUbiP+YXLOaAgcNBRrdL4W4COiAkkBJaGdfn3+0h5534KomNm4qfOi4V31l0PeQHEJzwYndt3w5cCvc1ps71tH0D7DKWpbwHan/TpAtDmXkh79x7YHxUCjw7dhXTTJa08ANLd0xo9Ou9A22ZVBRmL9hjrdwKb9fYeS5A5RCfu7wAMcRK+Rzl8+jb27O+FYM9o0WUSmaH0ATJ6/Sx0bjsZtWsUEqQ7vUYROPTt/kKQEbRATPsSAgm9fglpV29mYP/hBVg+ZIaQbtqmlTBAmhSE54wD6N25PQoL8Cuk0yjfncA/R7RtS8Me7/s2gKsTQKdffNubN8D2/VHwnNUJOCvJTaE0AWLSpRy8J51CVxtzvrbOpqMnhu8Ow73HEGQsDRDTPYprr5wnipC2NzIBUxc2R8q+h0K6aYNWegAxta+L1Z4n0KIh/8P3a/8CPn7AyQvasJkyBpcFWjQEPAYDtapzUf73+5MXXsHNsyWSgy7z76R5SmkBpJd3Dwx32Y4a5vw9DIPDc8Dx3OBieTS/OtQZobhZDki6d+DP5WZCJtb698aOqXv4d9IspXQAMs7vJ7j2msc7hoHuMZb6Af4hmrWQwl09C7h0A8YO5u9qT7E1vjt+xpLB89UbWJze0gCIV9AKuHQfxVulmHjAxzfH7Vxp0rcAudl7uAJWAryG/YNXYqa9u66V0z1AfMJDYGdrx9sQO//OeaWisFWlyccCFCpMr1xOP/CXOTQiFB4duvHvID6lbgGy6EAA7L/ry1utlVuAtdt4kyuEErTA8D7AKAEhI0EHt2JCJ2ddaaI7gPzsPwYjnJfyVpyeGht28yZXCCVsgUGOOU8Tvm1NwFjMc1nGl1xMOt0AxH2tIyYO28VbkYVrlc04b2PJhJA275OG8xf2j796YsVwrf+F1D5AHGY1w7QfT6FkMX7GmeQNRChOhvyMJTMq25bAwqn8hH72ApjzZ3MEzjjNr4M4VNoFSInOlfCn93U0a2DES3zncQBdAipNfy1Al4kBS/jpd/piOn6c+g2S9mstQYD2AFLMoRjmT76MDq34ZTpr5wxQ+n6l6b8FqHzEoQB+eoYff4CfFtTFi8AX/DqoR6UlgPT6EktGXkU325q8xG3VG0hP50WqEOmJBYyMgOPb+SkTEnED41bVBna849dBdSrtAMRzTyQGOPBLqmA3DEhUsvCrPqUy7lmhDBD6Fz8FNgVGwbOHDT9i1ak0DxCK53B3mc7LZX3ARCDuuuraKD3lb4F63wCbeFRfIFf5Ff6zNR1PolmAUCSgW/9jvIKdxv4OHJV8gJn8F6AcNPjWGlj6C7ekFHS1enNrTUYmahYgvqdu8QqT/dUHCAnnNohCYTgW6NYB+M2DW18K33VtLiBKi5tlbgrNAYQSLNjZcvvRLPEDNmr9/keYlRRq3VhgoCMwjseNe2iExhJBaAYglJrHodMizuwj5Hg4Z4VujK+MKg8LTHPndnCkbCmBByZoIqWQ+AChpG5li1/hzFtFLuvuvyheufJYprqTkryAV/zO7SpPebcePa8jdnI68QGy9WIsZ8ZDCnYicCjxHLpbeHIameJJCCRc9U0og2PfBpZiqiYuQChXbhcbbucaxflQzDk0DF58nRv3RXqLmQtYPIBQlvXY+w84E0lTDLmnj2FMqqKluBbw9OCOcaeE2ZYVy4uVVV48gPieieQsQUCOh+6/KgkWxF02hsONEkGs+I07WwqVXnBtKsotuzgAoeI13Tuu45wp2ncoqXk4zaQQsFiAUgrRfoSrBYcNFaOIjzgACb72gLOyEyV1W76RSy3l94oFuC0weiB3cjqqdNW9Fj/PcZYR1QcI1QTs9K0Lq1aUDnToFCXjIffUZ1N0/d4aLk7t4NKrHbwX7cTm7ZG4fFV2pTV4aqsCGWVwXDeXO83pgaP+6tZMVA8gVE22ufURzoKZUxcouXJ5rgMCR5D/DHyZq8TDxdhbsHeejTt3FS/n/5mRcgF7T2a3KhUWPRXdRp3qu+oBZPPZGLRszH7uTFnWZ/KMGOO5iPSVrP23VggKmI6iXxvnUfHE6auwd5mNJ0+VDJL/M47XOO6s8ifOxaJ/EytV14zqAPHc6YC+9ntY65BTfQ56tVJKEHDOT9PG32Q/OcqXK85IG37oYvaTJCVVCSbLNhKVXqBXLbYailTHfWtQD3g6qVQkRnWA/HUiGjYtmrDO/KL1SvEaTmgAdWtXzgZHzerce8qQv09ngyQrK4sHZwMgoSI+E4awKxp58iyGtbRWxRqqAWTqttbo3eUIipoy96eyZyNnqiKTQfWpUrlM9mtVA0v+Httbdx2B89AFBmUnVmVXebGXg3uVnIXt+9rAu88xoUZTDSArDx9CpzZtWQeb6K3UBOSYjVIli2Y/OVo1ry103rB+cxiGjuafd0/wAHLqQDUT/+DwcDpw5DBGtW0nVC3hAJmwwQK9ul5GmZJfMg5G1WSHTBEqi0HRFzEqhKCAGfjOpqHKei9fsxdjflqtcn+96rh+Lnv13cfP3mHH3rpYNCheiN7CAbIsMhRd2ndlHcTrT2DPP0LkMDjaPVumwaFrC7X1nu+zGz//6qc2H9kz6PE9MPNHdjX2Re3FGBv+idIBCAPIiNVmcLZ7BPMKzEUD6cTK2UOpQ84yVZvXTEC/3vySvPBZuJ5zA/DbXJ55pfgwlCMNucIH+OScbDG1hMQ3CAgtizVuvM/KhQFk8UF/dO/Inmmb3EnIrURp+Vpg9ZIfMWLw96JbZ/JMXyxcJpnCTKLrx4sh1UYkNxS2FhwWgPHfsXt+5OovDCB7rr5A/VpmjOPTvUcfD+DJM176GBrRojlDMd7dXmNq/zhpFVb8tU9j/CXPuHRJYJsP+73IpWsv0aM2z8TQQl6xZu4ajMGOvqxG2hwI0N2HhFtV8zL4dYoz6JtPe/L0FXxWBePYySt8yBlpvKb3w4zJfdTiwaezq7sP/PwNOEMM3YnQ3Qhb89vtCq+evDZu/J8ga44dRodWbVgH7usBkGOihJvnFOdsgAhpOwKPoffgeUK6fEI7ZbwTvH/lePSrzD1vxz6u87F9z1EROcqIFdVp38oRkBd+/AhGtGa/pvigMn+AHEpMRaXyRRhNFXkCoLsPibfI0NkgnychLepoDGzspgvp8j/aMW52WDpvhEp9Ve307t17OPSbjdC/z6jKQt796E6E7kaY2r0HaWhXIa/DWz70/ACy+shEdPx2IavVyCGRHBMl3rQJkCH9O2Ld8rE6scjr5DTYO89C5JEYnYyv00G72gLkyMjWwo5Oglsbzhyn/ACyM+4cGtVtxDgebcod3WUR76EtgPRxbIOt6zncsTW8ih49fgF7l1k4FS3obkzDUmmBPcWL7F4B0KadqZ2/fB5O9RpzScMNkBtZZZCSeh+mxl8xMtu2F5gnjxtdbQDE7oemCNkqDT+0W3ceZT9JYi7f4VoL+vX7n92APiz32cmpmTAxroiaBViDbLgBsiNmDhpbsju6kFMiOSfKoGkaIDZtrBARMltSloi7mpANkpu3HkpKLo0K06wBQE6MbO1crDd6WU1jI+EGyIE78ahh/g0jk9h4YOAkjeoqJnNNAqRZEwucCmffqompixBep8/GZ2/cHzx8LqSbvGk3LgQsLZh1uJlwHZ2qsBBw3YPEZZkC6S9gZMTsmCizm3NNAaRebXOcO7wEhQoxv4nqerXRaRzFkrx6naprUbQzPtfNenr6O8CoGOoVSGYSiP0Jsj56GNo1WcuqTU93WUUMagIgdOl4JnIRyH1d6m3fgejs0N3MTI1XL9O9KcgvaxdHcvRDZ4djiDVjWSt2gPidCUUba+adzsWrgOtPujeEAAlUAcimrZEYOHJxvqOULmWGk2ELUL1qOQFS6JZ0Z9Ax9Bqk+sWnbqUXOLrvfKABS7zNkei9GNyU0cOXHSB7bySidg3mONCNe4Al7N4nAtXROLkqAKHAJApQ+rwZFymMYwfmoaFVdY3LLfYAG7dGYNBIA0imMc4VGNiD2XxXbz5A15oVVHvFikl9D+MizCCSYdSgUICw/bU9tM8bbVvVE3vtao3fynX74T5xpdbG08lAXNGGqWlZsDL+QjhAvIJGwaU78wtcRiZg4wKkySvDhhCA7D94Fo4DvJGenpHHfnTPQfcdcm9/LA/EpBnSdjBVy8ZFjIBIf4Dt8MQ/2B0z7fP9S8H8dPCJCIOdTQdG4aJjgBGq+SeppbCanfkC5NCxWPQc4I1nSa/zjLhl7cTsrIf60rzmb8Mvc7boizp59VgzG7Bm8b8LjQyHh23H/AzADJAdMUlobMmcpGl1AEAfmTU+AIk+fwOO/efg7v2nebRbtdgdbq4/yExrbnGn/rYRcxfraaCbmzNAH6Z2LvY5elmV4A+Q0r1MEeb3GqYsDo90ekWnWDJrXAC5cu1u9mvV1fh7eTSb//tgTB7rKDON+YvrMWUtlq4K4d9BLpR0ikWnWUwtORXoOPhrPNmR5z4k/ydIj9kDsXDaBkaGqWnAt5oP/tGE/dkAQk8MB5fZOHfxZp6hKdiJgp70vQ0bswzrNh3UPzWPbgOMmaM1MGnOIOyZnqf8QP4AGee3HGMGMaeIOHYWGPObLI3IBJCk56/h4DIHR07E5dFr7Mhu8Jk7XJb6qiK0y7CFCNh5WJWu0u2z7FegNUsi0GUb/sSSwaM/VyB/gHiHRqJ3V+a0GwGhwII10jUGi2T5AeTNm7fZfkp/h53L03PogO/w17IxstRVHaHpSRq075Q6LKTVd/IIwJkl48/2vVGYapenKlX+AFlz/BY6tKzKqCGBg0Aiw5YfQOi0anfIiTza9O3ZBgHrdBvToSsTp6VnZHsAH4y8oCsRxB2XwEEgYWrhJ25jRKs8+V/zB0jQ1WRY1jJhZEavV/SaJcP2OUDIhYRcST5v3X5ohuCtM2SooXgiP332KvvJqm7CCvEkUoMTvV7RaxZTi72WAvvapvxesc68eI8SZsxHwA5uQMIDNaTVXdfcAKFbZLpN/rzZtq2P8OBZuhNSQiMn3HuS7QF8IeZfCUmlgijm5YFAlqC+pJdZaFosz416XhCMWlcLk4awn9827q6ChNLo8hEgTInWmltb4GSYNGM6dGVBOvImD+D4G/d1JYI4454LZuezcH1trBx6LTdRXoD8EuiGQfarGDnRk4OeIDJttOG+9/8XgJSu8/NGMR2xJ5fLVDPNik1H3/QkuZeY9/JUsyOLyJ2eIPQkYWobgkbid4dPHjN5AbI4bC26dxjGyETGR7xspqaYjluXGMMCRJwl+bI6evJyNkjoSFyWjeuoNzj8L4zv+Ml5fl6ArD52CB1bMSfVkvERL9OkUkzH4xubZDnn2hb6n/BzcOg3J18HTm3LIng8rqPesOOH4db6Eye7vADxPXMWba2Z06Es2wj46o/PDsV0PL21BVSvQ2n8LLAn9AQc+0s/SWAebVydgDEsGS4PR5+Da9NPbhPzAmTz+ato2bAWo6nmrgK260+C5EfXN6FMaeZ83PyWjOFRbdkehf4jFslL8d5dgCkjmWU+ceEa+jf6JPwwL0C2xSTA2rIyI5eZi4C9UfIyDIO018+t5lU4Uy+U1YASazf8gxEef2qAs4ZYknOI1wRm5tGxd9HHyjw3QV6ABF17DEuL0oxcxs8CDp3WkAbaY3v20GI0blBDewPq6Ug+q0Iwbgp7Xg/JqN6uGbCY5fI3Nv4J7Gt9kvY/L0D2//sSFtWY03MMnw6clXe+Vy6Xd8lMqEwEmfPHDkz3ksEhRxMrYC1LUr/4W6/Qufon79t5ARJ+Nw1VKxkxzo3LeOBqXndwmcxlduHM7p2byUVc2cg5Y9ZmzF64Xdry1q4B+OefnSZb8Nv30tGh8ic+8XkBcvzJW5QtxZz9zH4EcFeeKSw3rZ6A/n3Eqw0o7dWgfekmTFuHxSuCtD8w3xErlwOCWLzQHz3NRKvSBdn3IOdfv0NRU8YsD+gwAHjOuwYiX9E1TvfnwpFwH9ZF4+MY+gAjx6/Aat+/pWmG4mZAOMur4Kvk92j09SdZRPM+Qa5kZIEqhjK1Fj1lV8GWqjtRlSelaccCTB7S2hmdZRRa1yd3MRNkvAXqFPoEE3oPkKkTnDDnF+2VP9P5IpCIAEwxNjoVTxSA6NEr1o/Du2L5Avk6Vup0Mak5eEZGZnbxnvyiNNVkrXp3UV6x9GSTPqCvDTauGq+6MZWealvgxcuU7KjEw8fzxvmrzVwVBqJs0vXgmNe+S3ME+ssvqZ0qcy71PokPk7JBQrnGdN5EOeaV+UWhFCs86Xxh6FiA6zcT4Tx0Ic5e0DFIRLkolLmrSdYLjqgxHS8WQx6+QDEdR6KK4moic2dFSiht3bCmoHX46xSWtJSCOBkG8W/5RGNyaX7izDVQLIlOmyjOigbm7k4Tpjx1hC1bAkh+IcvCuOiAWhR3dwMLmFIAInyhyhYgogRMGWDIrfIEEQYS2QJElJBbA0zaoADEQAAiStIGPU/7k99SUABiIAARJe2PnieOUwAiDAz5Ucv2FUuUxHFkET1OPaoAxEABIlrqUbKfHiev1heAUBK3eUt2IfTvM+qv+A8cBrt0AN0JURI9tibLJ4ioyav1uPyBvgDExm46oo6KnxuAT+yMLAEiavkDPS6goy8A0ZTbRvtvrUBJLfTuCcJ1xCuogI4el2BTAML+Rqa3AOE64hVUgo2riCdVBW3bV7R3X10zkuMxr/IEEbhqDm8Fa9VmQUU8y3YywT+7k/E1c5Ep9JsAXNGx+7JAGzGRKwD5zzJ8niDkh6WKw6JI0yWcTZ2awBaWNKmvU4DvHU3x6EDK58yZq0htvfgETeuXYpRmiR+wcbdwYSXYQwGIMIDIbpM+0BEYN5h55Z259BR9G+SbTZQZID7hwbCz7cbIVY/qhCgA0XOAcO0/QiNC4NEh32AVZoB4Bg7EAPsNjAChFCntXYD0NxJ8JggTSQGIHgPEqDAQ5Q/WVFabggbB02FjfquGGSBEfSnlHUyMmZPIjfYEjus4CEYYFvKlVgCixwBp1RhY7sm8SlJS36O+ySfJ4nITswMk8OptWNWqwsh93Q7gTxkkLeYAkVCApKdn4GT0J7UeecG0oVV1FDNjOfjgxSWHSJenWLLapP84ABjai9myMdfuwKF2VSYCdoD4ntqOts2YuZ+PA4ZOFTCt0iQVAhA//3CM/WkNXienCVaGSr35zB0OZyfmCnd8meoSILLapK/zBhrVYzbr4dM74Nq8t2oA2RjtgtZNtrBOWk934NY9vvMqSTohAKlWfxhuJzxWWQ/yd/Jd4aFy/48dFYDwMGG1SsCuFeyEx872w0Brf9UAkphljGfpL2FsxJztfflGYL28axYKAYi6C5PPPQOPqdfpK5ZsniBDnIDRLGlnU9MzUdLIDBUKpKoGEOp14E48aph/wzhpsfHAwEl85lSyNApA/psaPgCWDUA2LgQsLZjX3c2E6+hUhYUAYN+DEOsdMXPQ2JJ9ozFyJnD6omQBwCWYAhA9BEizBsAqL/apPxfrjV5W09iIuAFyI6sMUlLvw9SY+TVr215g3mqudSjZ38sRIJpyd184awgmjnZgnStZPEF+dgP6dGXWIzk1EybGFVGzAOuGkhsgNMTOuHNoVLcR42hPngGO7kCK8JMdKaBGjgDZ+080LsbewsHIC6KZsKFVNdh3bQ56zWJrkgeISRFg9wqgdElmNc5fPg+neo25jMcPIKuPTETHbxeyMpu5BNgbwTWeJH8vR4Do0pCSB0hXW8BrHLuJwo5OglubP7jsyA8gxOVQYioqlf+kwOEnzCNPABO9ucaT5O8VgAibFskD5I+pgE1LZqXuPUhDuwrGfLTmD5C1xw/BtiX7DVdfDyD+Fp9xJUWjAETYdEgaIBbVgK0+7ApFnDiM4a3a8dGaP0Bm7hqMwY6+rEw3BwKL1vMZV1I0CkCETYekATJhCNCf/ZABfrtd4dXTj4/W/AFC3PZcfYH6tT4ptP7JIC9eAX08ANq0y6gpABE2WZIFCG3Kt/kAxYoyK3Tp2kv0qF2Mr8bCALL4oD+6d2SvFSDDm3UFIHyXSw6dZAHCdXNOwgeHBWD8dy58NRYGkBGrzeBs9wjmFQozDkB+Wc4esioVrQCE73KRMECogm2AD0D+V0wtIfENAkLLYo3bS74aCwMIcV0WGYou7VluYAB4/Qns+YevDDqnUwAibAok+QTp8T0w80d2RfZF7cUYGzsh2goHyIQNFujV9TLKlGQMMsGFy8CQKULk0CmtAhBh5pckQNbPBRrWZVbk8bN32LG3LhYNiheirXCAEPeVhw+hUxv2I1+6E6G7ERk0BSDCJklyAKE7D7r7YGsHjhzGqLa8jnZzs1ENIFO3tUbvLkdQ1JS5PzkvkhOjDJoCEGGTJDmAkFMiOScytVfJWdi+rw28+xwTpikfb14mjn+diIZNiyasA9KdCN2NSLwpABE2QZICCN150N0HW4s8eRbDWloL0zKHWrUnCPX03OmAvvZ7UJDZyRd0LzJ0iuQjDhWACFs6kgEInVitm8t+7/E2E9ga1AOeTir9pVYdIGTTzWdj0LKxJat5yYGRHBkl3BSACJscyQCEHBLJMZGtnTgXi/5N2N2TWfqrB5DlYS3R3PoISpgxn2jR4FMXAP8cETYLWqQO3joD3X5oxjkilRugOAx126t72/C1KbPfp7r8Nd2/ZLV+SHr+WtPDsPP/vg3gPZmdJunlO5yKboPRHVU+LVIPICTeyiNb0Olb9ptJcmCkVy0Jx4ssnTcCY9yYj8gJHL/N3SpKTY6a1cuDxuv8HfsWTrcrMO/oiQ+TMMVzAzZtjdStaBTvQa9W5JjI1g4c9ceoNv3UEVZ9gNDowdceoJ5FOVZBKLEDuaEoTbGAuhagRAzkVsLW4uIfonut8uoOJQ5AFh8cgu4d13EK4/4LcFK8CDjO8RQC/bNAi4bAit+59QoOG4rx36ntWi4OQEhc3zORaGvdnlXya/8C7r8Cz3m7wnAbQqEwHAsUNwNW/AbUqs6u8+HoKLg2tRHDMOIB5HGWKWLvP0CViqasggWHA54cAS1iaKbw0D8LeHoA3Tuw63XnfjIsK5ZHmQLJYhhAPICQNMsi5qCLDXcu0oVrAf8QMeRXeBiKBVy6AZOGc2u7L9IbY2xZU/lwM/mPQlyAEN+tF2PRtD5LMlTkuMLTfuRcnBBZFVpDtUDjejn7DnJpZ2tnLsWhbwP2ezmBNhQfIAExlVG2+BVUqciexjwmPgckKYxZHwWqopDrpQVMjHPAYcWaABG4cz8Fj57XgbPVXTHtID5ASLr5+8fDodMifMlcWiRbiZ1/A3M4kguLqa3CS34WmOYOOP3ALve790DggQn4qfNisRXUDEBISq7lpeTDAAAIyUlEQVQSbh81WbkFWLtNbL0UfvpggeF9gFE87vlYSqipawbNAYQk8z11C22bMRYn+Z/wPn7ABv0oCKruhCj9P1hgkCPgwVJ486OhDp++DdfmHFfqqltVswDp7mkNt/7HULtGIU4RlZMtThMZDAHfE6urNzOwenNrBHtGa8o2mgUIST16/Sy4u0xHYeY8D/9TbpI3EKGyX5mmbKTw1aYFbFsCC7lvCvDmDbDCfzaWD5mhSfE0DxCS3nNPJAY4sN+yf9TSeRxAN+5KMzwL0A15AM/QiE2BUfDsIcptOZuhtQMQNCmIpQtuoKuNOa9Zb+cMvE7hRaoQ6YkFvjYBDgXwU2ZvZALGTq4JnH3Lr4PqVFoCCACTLuWwZvY1tGjIkvYulyKtegPp6aprpvSUjwWMjIDj2/nJe/LCK4yYXgsp+x7y66AelfYAQnKa2tfF7qUXUcOcJU43l0J2w4BE1QtmqmcapbdWLFChDBD6F7+hbiZkwnFsAyQHXebXQX0q7QKE5O3l3QMzxu6GKa/s88CAiUDcdfU1VThIzwL1vgE2cZboyJE7ORWYtdQRO6bu0aYi2gcIaTfO7yeMGTSPt6JjfweOauwkj7cYCqGIFvjWGlj6C3+Gyzb8jCWD5/PvIA6lbgBCsnsFrYBL91G81fjVBwj5f1d5pcnfAt06AL8JqBXvH7wSM+3ddaG47gBC2vqEh8DOln+u1CV+wEblxl0XC0W0MQc6AuN43JB/HDA0IhQeHbqJNr5ARroFCAm76EAA7L/ry1tucnAk1xTFC5i3ySRBSF655DrC5XiYW9igg1sxoRN7uQ0NK6d7gJCCP/uPwQjnpbx1JVd5H18lnoS3wXRMSPEcHq7cLuu5xVwTMBbzXJbpWHI1MiuKLbn7WkcMdtqFkjyL/1DQ1VI/JTJR7HkQmx/5VY0dzB3s9HHcZy8Av509sWK4JN6lpfEE+Wgch1nN0MfuEJo1MOI9TxTjTq9cSiII3ibTCiElWKBXKq4Y8tzCnL6Yjm2h7RA447RWZOQxiLQAQgKX6FwJc2ecRodW/HMake8WgURJKcRjyrVAQql5CBxc2UdyixJ+/AGmzGqGpP33tCAh7yGkBxASvZhDMXiOOYNutjV5a0KElJzOd4ekMzgK0kduxJTx0LUXd1K3z/UKibgBz2VN8SLwhdRUliZAsq3U60t4uoShd+f2vFzlP1qW0pz67pR0LmCpLQJR5KFcua5O3OlAcw9GLuvb90fB078jsOOdKHKIzETCAPmgKcWTdG47mVfQVW7jUFZ5eqJQUVGlac4CVIKA0oByZVn/XAIKdtp/eIGm4znUVVz6ACENKTKxR+cdvMJ3c1uE6pMQSGRQxEfdidRJfypeQ+Bgq0uen2AUJrtnfy9NRgKKZQ95AOSjtpQIonP7bpzZUj63DpWD27ZPNjUTxZpcjfGhmoB9urCXPctvcMo+sj8qBB4dumtMNpEZywsgpDylFLK28uLMu5Wfoaj6bkgkQK9fdI+iNP4WoKRt9BrVzYa9miwTR8pbFR0zUxOpefgrIZxSfgAhHSk5XYH3+zkzODLZg/YlBBICy5Nnwq1mSD1Kl8wBBYGD9huqNMp4mPVFZ7GTuqkiitA+8gTIRy0pF3A9izGcCbOZrEJ7lNAIIDQSoNMvpf1nASpOY2cD2NkK32N85EKJpOPil4mZK1fbUyRvgJC1KKv83ugQztILXJalmu4Rp4CoE4Z7j0L3GO1bArbNAdpnqNOoBEFX625iZVlXRxR1+sofIB+1pyI+Ncxnc1a64rIWvXJFnAQiTwK0uTeERjXGbVoAti0AeqVSp1Flp5sJ08UoXqOOGGL11R+AfLQI1Uy0turDWViUjwVj44GoD2DRt/sU2k8QKNq3ACw5EkPzsRUVzIyO2aZuTUA+Q2mTRv8AQtaj6rvFiq+BdX1L1jruQix98Spw8QpA3yfPA2kyy7hSxAho0QhoUBtoUCfnW4xGdcijL8XixfMR6lSTFUMUTfDQT4B8tJTnTgdUqjgDTSwbo6ipeLpmZAKXrgBnY3PAQqCRYiMQECiaWAL16wCF+CWT4aXKq+QsnI09h3v3Z8HTKZBXHxkSibdopKz81G2tYV5+DhrWbY0yJdlruquiR2oacP4ykPAAuJeY8333w7cq/IT2MS8PVK4A0HelD9+N6gLGGqjF/vjZO1y4fAwJD6bBu88xoaLKjd4wAPJxViZssEA180WwtOgI8wo8kgWLMJ25wfI0KSdUmD6UxiY57cO/U/77mYak8FTTIoCJyX8/U5ok+n/6lCqRA4aPoBBBTE4WCYlvEBsfhlsJE7BoUDwnvZ4QGBZAPk7aiNVmqFN9JapW7oL6tcz0ZC41o8alay9x++4+XPl3FNa4GVx5YsMESO6lNHPXYFQuNwS1qlmjUnkNvJNoZt1qlOu9B2m4disadx+uh1dPP42OJXHmCkByT9DqIxNRskQ/fFPVCqbGIu5oJb4KSLzk1Excvx2DZ0lb4NaGZ7pDGeilpogKQPIz4I2sMjgfOw5mRZ1QsUx1GBmJv7FXc+JE6Z6e/g73H/+Ll692opHlEtQsoCRC/sywCkC4VlpclilOne2LL7IcULp4Y5hXKAfjIvK0W2paFhISH+LJ83N4XyAQzZtsRb0CyVwmMOTfy3OidT1jXkGjUPTrnqhQujEsqhfnnYhb23LTSVn8v8+R+OQcXr3ehZn2K7UtgtzHUwCi7gyW7mWKbxs6okrFZihbqh5KlqiKsiVKo0I5Y5Qw0459k15mIfFhKh4lPcGzpNt49DQOd+6fxtELu/Fkh/KEUGOOtTOBaggo666j1tVC6ZLtUdzUGsZFLFCokCkKfmWCgl8Zw6iQEQoVLIxCBQuhiNFXKGL0BYwK5xSWT3/zHmnp9MlExtsMZLx9g/SMdLzNTMXbzBRkZCQjNS0ez5Oj8eRZFFYOvSZrO0lYeAUgEp4cRTTdW0ABiO7nQJFAwhZQACLhyVFE070FFIDofg4UCSRsgf8D0GeGjIX11hQAAAAASUVORK5CYII="
-     alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function YHJMHMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-  const getLayerVisible = useSelector((s) => s.map.layerVisible)
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_yanhejuminhu_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.z + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setCameraTarget({
-      center: [data.lgtd, data.lttd],
-      zoom: 18,
-      pitch: 60
-    })
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'yanhejuminhu',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-      <div
-        id={`marker_yanhejuminhu_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.z + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {/* {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      } */}
-      {
-        (zoom > 16 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              // backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: !getLayerVisible.SatelliteImage?'#0008':'#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(YHJMHMarker);
diff --git a/src/views/Home/MapCtrl/Markers/YinShuiGongChengLayer.js b/src/views/Home/MapCtrl/Markers/YinShuiGongChengLayer.js
deleted file mode 100644
index 2f9aae5..0000000
--- a/src/views/Home/MapCtrl/Markers/YinShuiGongChengLayer.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { SdzRealPromiseWX } from "../../../../models/_/real";
-import BaseLayer from "../baselayer";
-import ShuikuMarker from "./ShuikuMarker";
-import YinShuiGongChengMarker from "./YinShuiGongChengMarker"
-
-export default class YinShuiGongChengLayer extends BaseLayer {
-  static LayerName = 'YinShuiGongChengLayer';
-
-  constructor(props) {
-    super(props);
-
-    this.highlights = {};
-  }
-
-  getLayerName() {
-    return YinShuiGongChengLayer.LayerName;
-  }
-
-  onAdd() {
-    SdzRealPromiseWX.get().then((data) => {
-      const list = data.map((i)=>{
-        i.stcd = i.hystCode
-        i.stnm = i.hystName
-        i.lgtd = i.hystLong
-        i.lttd = i.hystLat
-      })
-
-      this._dispatch.runtime.setMarkers({
-        [this.getLayerName()]: data || []
-      });
-    });
-  }
-
-  setSetting(setting) {
-    const highlights = setting?.highlight?.YinShuiGongChengLayer;
-    if (highlights !== this._setting?.highlight?.YinShuiGongChengLayer) {
-      const setting = {};
-      if (highlights) {
-        for (const h of highlights) {
-          setting[h] = true
-        }
-      }
-      this._dispatch.map.setMarkerSetting({
-        [this.getLayerName()]: setting,
-      });
-    }
-
-    this._setting = setting;
-  }
-
-  getComponentCls() {
-    return YinShuiGongChengMarker;
-  }
-}
diff --git a/src/views/Home/MapCtrl/Markers/YinShuiGongChengMarker.js b/src/views/Home/MapCtrl/Markers/YinShuiGongChengMarker.js
deleted file mode 100644
index 81a5423..0000000
--- a/src/views/Home/MapCtrl/Markers/YinShuiGongChengMarker.js
+++ /dev/null
@@ -1,204 +0,0 @@
-import React, { useEffect } from 'react';
-import { zindexmarker } from '../zindex';
-
-const {
-  css,
-  physics,
-} = window.popmotionXL;
-
-
-function renderMarker({ rzWarning, rzState }, { width, highlight }) {
-  //rzState !== 1 水库-离线；   rzWarning===1 水库-超汛限
-  //#888灰   #0f0绿   #ec4e4e红    #1296db蓝
-
-  let color1;
-  color1 = '#1296db';
-
-
-  // if (rzState !== 1) {
-  //   color1 = '#888';
-  // }else{
-  //   color1 = '#1296db';
-  // }
-
-  // if (rzWarning === 1) {
-  //   color1 = '#ec4e4e';
-  // }
-
-
-  return `
-  <div style="position:relative">
-    <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
-    aa
-    </svg>
-    <img width="${width}" style="position:absolute;top:0;left:0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACcAAAAmCAMAAAEHJkI0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAFKUExURQAAAAC//wCv/wC1/wC3/wCz/wC1/wCy/wCz/wC1/wCz/wC0/wC1/wCz/wC0/wCz/wCz/wC1/wC0/wC1/wC1/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC1/wC0/wC0/wC0/wC0/wiu9wi2/xCp7xC5/xij5xi7/yC9/yiY1zCSzzDC/ziMxzjE/0CHv0DH/0jJ/1B8r1DM/1jO/2Bwn2hrl2jT/3DV/3hfh3jX/4Baf4Da/4dVeI52l5Rwj5dJaJfg/59EYJ/j/6Bjf6fl/684UK/n/7FRaLczSLfq/78tQL/s/8fv/88iMM8yQM/x/9ccKNfz/98XIN/2/+cRGOf4/+8LEO/6//MMEPcGCPf9//8AAP8ICP8QEP8gIP8oKP8wMP84OP9ISP9oaP9wcP+Xl/+fn/+vr/+/v//Pz//X1//f3//v7//39////2LfAk8AAAAgdFJOUwAIEBggKDA4QEhQWGBocHiAh4+Xn6evt7/Hz9ff5+/3v+H4wgAAAAlwSFlzAAAXEQAAFxEByibzPwAAAo1JREFUOE9tlGlXU0EMhkNr2SxYhNZutKFsohQEV3ABV7CIgkLFwQ1QUXT+/1ffZHIXPD7n3Ok7ubnJTCZTIirkMHjvr9GYd95ThgFRGKmMh/2ZVxfPMDuxT+pL4iUxZqAeQ3xXjzJzu9120xZkXwINi3MFokcEUbZcCKKHP3h/W2NN4es/EgD5vKzEv1V59AXSVyQWwiJ7Q9d29QBDHw1g3JA5IjS4bQpA1IICBbELY2ZA4paE9f4Xnhm+ILaiJBYkOeAqUZ/ZPpoN1iGq8gJ44ITt7SfQLaYRS8H8TFYpoHhBoGq7JnR5dRErd3UOGmIDVxhVCyB1Qn60XNQSRmSa5sZZs9Ao86aub6sleYUKr6lF2OJxMRV4J8w/ydDlImx8Ty3+6Kf+bGKFo7brb9GuGfVfVnXmjvXX+zV0w3NVLi5OF7Z5KY7W5v32i4fQ0jVgDm3RXnHulc7iyqA2bj0Iird14G6aoryJR27O1OWorNMOfRjAPrRxpT0N6WvqhwgJhbyYxDMKxeHklSjRuUor2WHp3YjaSPJNiqGGvl1cXet0Ok9Xl6dk1hyxt0ZGAi2+tmpF7N2Btd5rPqDIPHvO6fSHie4CeiO6RU1udcyu/P58YgrszTIPilsv8wxuWcKJ+2oqsMToaaJxbnXNIpweukPcxzTz0m+XONVWSIlzDo2TsMNcQjNzsoUTaYfj03/i+SmuU03qFGgfiFuK3eScaMxEmsl34rURd4Hc+YumUtwSr/i2KTgXLPAcE2+c29d/kIS6FLBqk8ANdHB8TY1muIYlmwovo6ZOUbeDo1zoFebr+1GfpxgwLyGn5bmf1CGi0W8eMYPVCXsXMy7n+j+y+RL+p0G1PKz3xCD6Cxd9EWCtTYCSAAAAAElFTkSuQmCC" alt="" className="panel-icon" />
-  </div>
-  `
-}
-
-const dist1 = 22000 * 22000;
-const dist2 = 8000 * 8000;
-
-
-function YinShuiGongChengMarker({ data, dispatch, setting, zoom, distSq }) {
-
-  const highlight = setting;
-
-  let zindexOffset = 1;
-  if (!data.status) {
-    zindexOffset = 0;
-  } else if (data.alarm) {
-    zindexOffset = 2;
-  }
-
-  useEffect(() => {
-    const width = 12;
-
-    const placeholder = document.getElementById(`marker_shuidianzhan_${data.id}`);
-    if (!placeholder) {
-      return;
-    }
-
-    const ratio = highlight ? 1.2 : 1.0;
-
-    const svgMarker = renderMarker(data, { width: width * ratio, highlight });
-
-    placeholder.innerHTML = svgMarker;
-
-    if (!highlight) {
-
-      const el = placeholder.firstChild;
-      const marker = el.nextSibling;
-
-      const markerSVG = marker.querySelector('svg');
-
-      const markerRenderer = css(markerSVG, {
-        enableHardwareAcceleration: false
-      });
-
-      const markerGrowSize = 1.2;
-
-      const markerScale = physics({
-        from: 1,
-        to: markerGrowSize,
-        velocity: 20,
-        spring: 300,
-        friction: 0.8,
-        onUpdate: (x) => markerRenderer.set('scale', x),
-      });
-
-
-      const zindex = zindexmarker.shuidianzhan + zindexOffset;
-
-      marker.addEventListener('mouseenter', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex + zindexmarker.hilightPlus;
-        }
-        markerScale.props.from = 1;
-        markerScale.props.to = markerGrowSize;
-        markerScale.start();
-      });
-
-      marker.addEventListener('mouseleave', () => {
-        if (placeholder.parentNode.style.zIndex); {
-          placeholder.parentNode.style.zIndex = zindex;
-        }
-        markerScale.props.from = markerGrowSize;
-        markerScale.props.to = 1;
-        markerScale.start();
-      });
-    }
-
-    return () => {
-      placeholder.innerHTML = '';
-    }
-  }, [highlight]);
-
-  const showPop = () => {
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'yinshuigongcheng',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  let markerZoom;
-  if (highlight) {
-    markerZoom = 2;
-  } else if (zoom) {
-    markerZoom = (zoom - 10) * 0.5;
-  } else {
-    markerZoom = (dist1 - distSq) / (dist1 - dist2) * 2 + 1;
-  }
-  if (markerZoom < 1) {
-    markerZoom = 1;
-  } else if (markerZoom > 2.5) {
-    markerZoom = 2.5;
-  } else {
-    markerZoom = parseFloat(markerZoom.toFixed(1));
-  }
-
-  return (
-    <>
-    B
-      <div
-        id={`marker_shuidianzhan_${data.id}`}
-        style={{
-          position: 'absolute',
-          bottom: 0,
-          left: 0,
-          transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-          lineHeight: 1,
-          zIndex: zindexmarker.shuidianzhan + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-          cursor:"pointer"
-        }}
-        onClick={showPop}
-      ></div>
-      {
-        (zoom > 14 || distSq < dist1 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              fontSize: 12,
-              fontWeight:"bold",
-              lineHeight: 1,
-              bottom: -14 * markerZoom,
-              left: 0,
-              transform: `translateX(-50%)`,
-              zIndex: zindexmarker.shuidianzhanLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
-              color: `#fff`,
-              textShadow: '2px 2px 4px #000000'
-            }}>
-            {data.rz || '-'}m
-          </div>
-        )
-      }
-      {
-        (zoom > 12 || distSq < dist2 || highlight) && (
-          <div
-            className="markerLabel2"
-            style={{
-              backgroundColor: '#0008',
-              padding: 4,
-              borderRadius: 4,
-              fontSize: 10,
-              lineHeight: 1,
-              top: 0,
-              left: 0,
-              transform: 'translateX(-50%)',
-              zIndex: zindexmarker.shuidianzhanLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff'
-            }}>
-            {data.name}
-          </div>
-        )
-      }
-    </>
-  )
-}
-
-export default React.memo(YinShuiGongChengMarker);
diff --git a/src/views/Home/MapCtrl/Markers/index.js b/src/views/Home/MapCtrl/Markers/index.js
deleted file mode 100644
index 6bc2a25..0000000
--- a/src/views/Home/MapCtrl/Markers/index.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { useMemo } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-
-function Markers({ mapobj }) {
-  const markers = useSelector(s => s.runtime.markers);
-  const layerVisible = useSelector(s => s.map.layerVisible);
-  const markerSetting = useSelector(s => s.map.markerSetting);
-
-  useSelector(s => s.runtime.viewTick);
-  const dispatch = useDispatch();
-
-  const rendata = useMemo(() => {
-
-    if (!mapobj || !markers) {
-      return [];
-    }
-
-    const ret = [];
-    for (const type in markers) {
-      // if(type==='GongShuiLayer'){debugger}
-      const setting = markerSetting[type] || {};
-      const layerdata = mapobj.layerMgr.sGetVisibleMarkers(type, layerVisible[type], setting, markers[type]);
-
-      if (!layerdata || !layerdata.length) {
-        continue;
-      }
-      layerdata.forEach(o => {
-        o.id = o.id?o.id:o.stcd?o.stcd+o.source: null;
-        o.name = o.name?o.name:o.stnm?o.stnm: null;
-        if (o.id && o.lgtd && o.lttd) {
-          ret.push({
-            fid: `${type}_${o.id}`,
-            id: o.id,
-            type,
-            lgtd: o.lgtd,
-            lttd: o.lttd,
-            elev: o.elev,
-            data: o,
-            setting: setting[o.id],
-          })
-        }
-      })
-    }
-
-    return ret;
-
-  }, [mapobj, markers, layerVisible, markerSetting]);
-
-  //console.log("48+++++",mapobj, rendata);
-
-  const test = (e) => {
-    const node = (mapobj?._map?.viewport_ || mapobj?._map?._cesiumWidget?.canvas);
-    if (node) {
-      console.log(e.clientX, e.clientY);
-      const evt = new WheelEvent('wheel', {
-        deltaX: e.deltaX,
-        deltaY: e.deltaY,
-        deltaMode: e.deltaMode,
-        clientX: e.clientX,
-        clientY: e.clientY,
-      });
-      node.dispatchEvent(evt);
-    }
-  }
-
-  let zoom, position;
-  if (mapobj?._map?._cesiumWidget) {
-    position = mapobj._map.camera.position;
-  } else if (mapobj?._map?.viewport_) {
-    zoom = mapobj?._map.getView().getZoom();
-    zoom = parseFloat(zoom.toFixed(1));
-  }
-
-  return (
-    <>
-      {
-        rendata.map(o => {
-          const pixels = mapobj.coordinateToPixel(o.lgtd, o.lttd, o.elev);
-          if (!pixels) {
-            return null;
-          }
-          let distSq;
-          if (position) {
-            distSq = (pixels[2] - position.x) * (pixels[2] - position.x) + (pixels[3] - position.y) * (pixels[3] - position.y) + (pixels[4] - position.z) * (pixels[4] - position.z);
-            distSq = parseInt(distSq);
-          }
-          let Comp = mapobj.layerMgr.sGetMarkerLayerComponentCls(o.type);
-          if (!Comp) {
-            return null;
-          }
-          return (
-            <div key={o.fid} style={{ left: pixels[0], top: pixels[1], position: 'absolute' }} onWheel={test}>
-              <Comp data={o.data} setting={o.setting} dispatch={dispatch} zoom={zoom} distSq={distSq} layerVisible={layerVisible}/>
-            </div>
-          )
-        })
-      }
-    </>
-  )
-}
-
-export default React.memo(Markers);
diff --git a/src/views/Home/MapCtrl/Pops/AdcdPop.css b/src/views/Home/MapCtrl/Pops/AdcdPop.css
deleted file mode 100644
index 12b7bf6..0000000
--- a/src/views/Home/MapCtrl/Pops/AdcdPop.css
+++ /dev/null
@@ -1,69 +0,0 @@
-.statContainer {
-  border-bottom: 1px dashed #aeb1b5;
-  padding: 10px 0;
-  box-sizing: border-box;
-}
-.statContainer .person {
-  margin: 5px;
-}
-.statContainer .person span {
-  margin-right: 50px;
-}
-.statContainer .earthgrid .icon {
-  width: 30px;
-  margin: 3px 15px;
-}
-.statContainer .earthgrid .label {
-  color: #909195;
-  margin-bottom: 10px;
-}
-.statContainer .earthgrid .value {
-  color: #000;
-  font-weight: bold;
-}
-.statContainer .statgridhead,
-.statContainer .statgrid {
-  width: 25%;
-  height: 20px;
-  line-height: 20px;
-}
-.statContainer .statgrid {
-  text-align: center;
-}
-.statContainer .itemroot {
-  width: calc((100% - 20px)/2);
-}
-.statContainer .itemroot:nth-child(odd) {
-  margin-right: 20px;
-}
-.statContainer .itemroot .label {
-  line-height: 20px;
-}
-.bottomCon {
-  min-height: 200px;
-  justify-content: space-between;
-}
-.bottomCon > div {
-  width: 31%;
-  background-color: #eaf4fe80;
-}
-.bottomCon .itemroot1 {
-  padding: 5px;
-}
-.bottomCon .itemroot1 > span {
-  margin-bottom: 10px;
-  display: block;
-}
-.bottomCon .itemroot1 > .flexwarp > div {
-  width: 40%;
-  align-items: center;
-  margin-bottom: 5px;
-}
-.bottomCon .itemroot1 .check {
-  width: 35px;
-  height: 35px;
-  border-radius: 50%;
-  background-color: #fff;
-  border: 1px solid blue;
-  margin-bottom: 5px;
-}
diff --git a/src/views/Home/MapCtrl/Pops/AdcdPop.js b/src/views/Home/MapCtrl/Pops/AdcdPop.js
deleted file mode 100644
index 446a1c3..0000000
--- a/src/views/Home/MapCtrl/Pops/AdcdPop.js
+++ /dev/null
@@ -1,314 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { adInfo } from '../../../../models/_/adcd';
-import Earth1 from '../../../../assets/icons/earth1.png';
-import Earth2 from '../../../../assets/icons/earth2.png';
-import Earth3 from '../../../../assets/images/earth3.png';
-import { DcpjPromise } from '../../../../models/_/dcpj';
-import appconsts from '../../../../service/appconsts';
-import { CloseOutlined } from "@ant-design/icons";
-import { conutInfo, countjctx, countslgc, countzddx, countzrr, conutDeteil ,conutInfo1, countjctx1, countslgc1, countzddx1} from './http'
-import "./AdcdPop.less";
-import './TangYanBa.less'
-import { Avatar, Table } from 'antd';
-
-
-function AdcdPop({ id, dispatch, record }) {
-  const [data, setData] = useState();
-  const [resjctx, setResjctx] = useState([]);
-  const [resslgc, setResslgc] = useState([]);
-  const [reszddx, setReszddx] = useState([]);
-  const [resinfo, setResinfo] = useState([]);
-
-  const [reszrr, setReszrr] = useState([
-    { repType: 1, personName: '', position: '', tel: '' },
-    { repType: 2, personName: '', position: '', tel: '' },
-    { repType: 3, personName: '', position: '', tel: '' },
-
-  ]);
-  const columns=[
-    {
-      title:"姓名",
-      dataIndex: 'personName',
-      align:'center'
-    },
-    {
-      title:"职务",
-      dataIndex: 'position',
-      align:'center'
-
-    },{
-      title:"电话",
-      dataIndex: 'tel',
-      align:'center'
-
-    },
-  ]
-  const type = {
-    1: '行政责任人',
-    2: '巡查责任人',
-    3: '主管责任人',
-  }
-  const typeAdcd = record.adcd || record.ADCD
-  if(record.adcd || record.ADCD){
-    const adcd = typeAdcd.substring(0,15);
-    if(adcd.endsWith('000000000')){//县
-      record.state = 3
-    }else if(adcd.endsWith('000000')){//镇
-      record.state = 2
-    }else if(adcd.endsWith('000')){//村
-      record.state = 1
-    }
-  }else{
-    record.state = null;
-  }
-  console.log(record,'-----record.state');
-  const getData = async () => {
-    let params = {
-      adcd: record.ADCD || record.adcd
-    };
-    const resData = await conutDeteil(params);
-
-    const reszrr = await countzrr(params)
-    // const resinfo = await  conutInfo(params)
-
-   
-    if (resData.code === 200) {
-        setData(resData.data);
-    }
-    if (reszrr.code === 200) {
-      if(reszrr.data.length){
-        setReszrr(reszrr.data);
-      }else{
-        setReszrr([
-          { repType: 1, personName: '', position: '', tel: '' },
-          { repType: 2, personName: '', position: '', tel: '' },
-          { repType: 3, personName: '', position: '', tel: '' },
-      
-        ]);
-      }
-    }
-    if(record.state === 1){
-      const resjctx = await countjctx(params)
-      const resslgc = await countslgc(params);
-      const reszddx = await countzddx(params);
-      const resinfo = await  conutInfo(params)
-      if (resinfo.code === 200) {
-      
-        setResinfo(resinfo.data);
-      }
-      if (resjctx.code === 200) {
-        setResjctx(resjctx.data);
-      }
-      if (resslgc.code === 200) {
-        setResslgc(resslgc.data);
-      }
-      if (reszddx.code === 200) {
-        setReszddx(reszddx.data);
-      }
-    }else{
-      const resjctx = await countjctx1(params)
-      const resslgc = await countslgc1(params);
-      const reszddx = await countzddx1(params);
-      const resinfo = await  conutInfo1(params)
-      if (resinfo.code === 200) {
-      
-        setResinfo(resinfo.data);
-      }
-      if (resjctx.code === 200) {
-        setResjctx(resjctx.data);
-      }
-      if (resslgc.code === 200) {
-        setResslgc(resslgc.data);
-      }
-      if (reszddx.code === 200) {
-        setReszddx(reszddx.data);
-      }
-    }
-  };
-  const showBottom = (record?.ADCD && record.ADCD.endsWith('000')) || (record?.adcd && record.adcd.endsWith('000'))
-  useEffect(() => {
-    getData();
-  }, [record]);
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 645;
-
-  const showTypeFeature = (type) => {
-    const adcd = record?.ADCD?.replace(/([0]{3})*$/, '');
-    if (adcd) {
-      DcpjPromise[type]?.get().then(data => {
-        if (data) {
-          const highlights = data.filter(o => o?.ADCD?.startsWith(adcd));
-          if (highlights.length > 0) {
-            dispatch.map.openHighlights({
-              title: `选中${appconsts.GlobalSearch_Type[type]}`,
-              records: highlights.map(o => ({
-                id: o.PID,
-                adcd: o.ADCD,
-                lgtd: o.lgtd,
-                lttd: o.lttd,
-                name: o.NAME,
-                type
-              }))
-            })
-          }
-          dispatch.map.highlightFeatures(highlights.map(o => ({
-            type,
-            props: o,
-          })));
-        }
-      })
-    }
-  };
-
-
-  const DCPJ_TYPES = {
-    dangercount: '危险区',
-    settlecount: '安置点',
-    transfercount: '转移路线',
-    avrcount: '沿河居民户',
-    eicount: '企事业单位',
-    brcount: '桥梁',
-    culcount: '路涵',
-    spcount: '水闸',
-    damcount: '塘(堰)坝',
-    //srstcount: '简易雨量站',
-    //swstcount: '简易水位站',
-    //stcount: '自动监测站',
-    wbrcount: '无线预警广播',
-    dikecount: '堤防',
-  };
-
-  return (
-    <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)', color: '#0000' }}>
-      <div className="dp-popup-tip"></div>
-      <div className="dp-popup-content">
-        <div className="boxhead"></div>
-        <div className="content-body tyb" id='tyb'>
-          <div className="title">
-            <div className="name flex flexac">
-              <div className='nameBorder'></div>
-              {record.NAME || record.adnm}
-            </div>
-            <div className="extra">
-              <CloseOutlined onClick={closePop} style={{ color: "#333" }} />
-            </div>
-          </div>
-
-          <div className="body" >
-            <div className="root">
-              <div className="statContainer clearFloat flex flexsbc">
-                <div className="earthgrid lf" style={{ marginRight: "20px" }}>
-                  <img alt="icon" src={Earth1} className="icon lf" />
-                  <div className=" lf">
-                    <div className="label">{resinfo?.ldarea || '-'}平方千米</div>
-                    <div className="value">土地面积</div>
-                  </div>
-                </div>
-                {/* <div className="earthgrid lf">
-                  <img alt="icon" src={Earth2} className="icon lf" />
-                  <div className=" lf">
-                    <div className="label">{resinfo?.plarea || '-'}亩</div>
-                    <div className="value">耕地面积</div>
-                  </div>
-                </div> */}
-                <div className="earthgrid lf">
-                  <img alt="icon" src={Earth3} className="icon lf" />
-                  <div className=" lf">
-                    <div className="label">{resinfo?.adVillage || '-'}个</div>
-                    <div className="value">{record.state === 1?'村组':'行政村'}</div>
-                  </div>
-                </div>
-              </div>
-              <div className="statContainer clearFloat">
-              <Table columns={columns} dataSource={reszrr} scroll={{ y: 110 }} pagination={false}/>
-                {/* {reszrr.map(item => {
-                  return <div className='flex person'>
-                    <div style={{width:150}}>{type[item.repType]}</div>
-                    <div style={{width:120}}>姓名：{item.personName}</div>
-                    <div style={{width:120}}>职务：{item.position}</div>
-                    <div style={{width:150}}>电话：{item.tel}</div>
-                  </div>
-                })} */}
-              </div>
-
-              <div className="statContainer clearFloat">
-                <div className="statgridhead lf"></div>
-                <div className="statgrid lf">人口数</div>
-                <div className="statgrid lf">户数</div>
-                <div className="statgrid lf">房屋数</div>
-                <div className="statgridhead lf" style={{ color: '#439dd5' }}>行政区划</div>
-                <div className="statgrid lf">{data?.adinfoICCount ?.ptCount || '-'}</div>
-                <div className="statgrid lf">{data?.adinfoICCount ?.etCount || '-'}</div>
-                <div className="statgrid lf">{data?.adinfoICCount ?.htCount || '-'}</div>
-
-                <div className="statgridhead lf" style={{ color: '#f4a957' }}>危险区</div>
-                <div className="statgrid lf">{data?.danadICCount?.ptCount || '-'}</div>
-                <div className="statgrid lf">{data?.danadICCount?.etCount || '-'}</div>
-                <div className="statgrid lf">{data?.danadICCount?.htCount || '-'}</div>
-
-                <div className="statgridhead lf" style={{ color: '#4ebb9c' }}>防治区</div>
-                <div className="statgrid lf">{data?.prevadICCount?.ptCount || '-'}</div>
-                <div className="statgrid lf">{data?.prevadICCount?.etCount || '-'}</div>
-                <div className="statgrid lf">{data?.prevadICCount?.htCount || '-'}</div>
-              </div>
-              {
-                showBottom && (
-                  <div className="statContainer bottomCon flex">
-                    <div className='itemroot1'>
-                      <span>
-                        重点对象
-                      </span>
-                      <div className='flex flexwarp flexsbc'>
-                        {reszddx.map((item) => {
-                          return <div className='flex flexfc'>
-                            <div className="check rf flex flexcc">{item.count}</div>
-                            <div className="label lf">{item.name}</div>
-                          </div>
-                        })}
-                      </div>
-                    </div>
-                    <div className='itemroot1'>
-                      <span>
-                        水利工程
-                      </span>
-                      <div className='flex flexwarp flexsbc'>
-                        {resslgc.map((item) => {
-                          return <div className='flex flexfc'>
-                            <div className="check rf flex flexcc">{item.count}</div>
-                            <div className="label lf">{item.name}</div>
-                          </div>
-                        })}
-                      </div>
-                    </div>
-                    <div className='itemroot1'>
-                      <span>
-                        监测体系
-                      </span>
-                      <div className='flex flexwarp flexsbc'>
-                        {resjctx.map((item) => {
-                          return <div className='flex flexfc'>
-                            <div className="check rf flex flexcc">{item.count}</div>
-                            <div className="label lf">{item.name}</div>
-                          </div>
-                        })}
-                      </div>
-                    </div>
-                  </div>
-                )
-              }
-              <div style={{ padding: '0.1rem' }}></div>
-            </div>
-          </div>
-
-        </div>
-        <div className="boxfoot"></div>
-      </div>
-    </div>
-  )
-}
-
-export default React.memo(AdcdPop);
diff --git a/src/views/Home/MapCtrl/Pops/AdcdPop.less b/src/views/Home/MapCtrl/Pops/AdcdPop.less
deleted file mode 100644
index 074a35a..0000000
--- a/src/views/Home/MapCtrl/Pops/AdcdPop.less
+++ /dev/null
@@ -1,77 +0,0 @@
-.statContainer{
-  border-bottom: 1px dashed #aeb1b5;
-  padding: 10px 0;
-  box-sizing: border-box;
-  .person{
-    margin: 5px;
-    // margin-right: 100px;
-    span{
-      margin-right: 50px;
-    }
-  }
-  .earthgrid{
-    .icon{
-      width: 30px;
-      margin:3px 15px;
-    }
-    .label{
-      color: #909195;
-      margin-bottom:10px;
-    }
-    .value{
-      color: #000;
-      font-weight:bold;
-    }
-  }
-  .statgridhead, .statgrid{
-    width: 25%;
-    height: 20px;
-    line-height: 20px;
-  }
-  .statgrid{
-    text-align:center;
-  }
-  .itemroot{
-    width: calc( (100% - 20px)/2 );
-    &:nth-child(odd){
-      margin-right: 20px;
-    }
-    .label{
-      line-height: 20px;
-    }
-  }
-  
-}
-.bottomCon{
-  min-height: 200px;
-  justify-content: space-between;
-  >div{
-    width: 31%;
-    background-color: #eaf4fe80;
-  }
-  .itemroot1{
-    padding: 5px;
-    >span{
-      margin-bottom: 10px;
-      display: block;
-    }
-    >.flexwarp{
-      >div{
-        width: 40%;
-        align-items: center;
-        margin-bottom: 5px;
-      }
-    }
-    .check{
-      width: 35px;
-      height: 35px;
-      border-radius: 50%;
-      background-color: #fff;
-      border:1px solid blue;
-      margin-bottom: 5px;
-    }
-  }
-}
-.ant-descriptions-row > th, .ant-descriptions-row > td{
-  padding-bottom: 0;
-}
diff --git a/src/views/Home/MapCtrl/Pops/AnZhiDian.js b/src/views/Home/MapCtrl/Pops/AnZhiDian.js
deleted file mode 100644
index 0ffd3ac..0000000
--- a/src/views/Home/MapCtrl/Pops/AnZhiDian.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-
-import moment from "moment"
-
-function AnZhiDian({ id, data, dispatch }) {
-  console.log(data);
-  const width = 400;
-  
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.name}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-              <Descriptions labelStyle={{padding:"5px 0"}}>
-                <Descriptions.Item label="行政区划" span={3} contentStyle={{ padding: "5px 0" }}>{data?.address}</Descriptions.Item>
-                <Descriptions.Item label="安置人口" span={3} contentStyle={{padding:"5px 0"}}>{data?.population}</Descriptions.Item>
-                <Descriptions.Item label="地址" span={3} contentStyle={{padding:"5px 0"}}>{data?.address}</Descriptions.Item>
-                <Descriptions.Item label="备注" span={3} contentStyle={{padding:"5px 0"}}>{data.remark}</Descriptions.Item>
-              </Descriptions>
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(AnZhiDian);
diff --git a/src/views/Home/MapCtrl/Pops/DaiChuLi.js b/src/views/Home/MapCtrl/Pops/DaiChuLi.js
deleted file mode 100644
index b3a6125..0000000
--- a/src/views/Home/MapCtrl/Pops/DaiChuLi.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React, { useEffect, useState } from 'react';
-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 }) {
-  console.log(data);
-  const width = 400;
-  const [detail, setDetail] = useState({})
-  const [visible,setVisible] = useState(false)
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const getDetailData = async(id) => {
-    try {
-      const res = await httpget2(`${apiurl.home.wxqdetail}/${id}`);
-      setDetail(res.data)
-    } catch (error) {
-      
-    }
-  }
-  useEffect(() => {
-    if (data?.PID) {
-      getDetailData(data?.PID)
-    }
-  }, [data])
-  
-
-  return (
-    <>
-      <div className="normalModalStyle homeModal2">
-          <div className="normalModalStyle_title">
-              <div className="normalModalStyle_title_icon"></div>
-              {data.stationCode}
-              <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-          </div>
-          <div className='homeModal2_content'>
-            <ModalForm/>
-          </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(Wxq);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/BridgePop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/BridgePop.js
deleted file mode 100644
index 805c132..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/BridgePop.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function BridgePop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">照片</div>
-                <div className="lf value">{data.picPath}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">类型</div>
-                <div className="lf value">{appconsts.bridge_TYPE[data.TYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">高度(m)</div>
-                <div className="lf value">{data.HEIGHT}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">长度(m)</div>
-                <div className="lf value">{data.LENGTH}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">宽度(m)</div>
-                <div className="lf value">{data.WIDTH}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(BridgePop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/BsnssinfoPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/BsnssinfoPop.js
deleted file mode 100644
index 88ba3fb..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/BsnssinfoPop.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function BsnssinfoPop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">居民户信息</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">照片</div>
-                <div className="lf value">{data.picPath}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">类别</div>
-                <div className="lf value">{appconsts.bsnssinfo_TYPE[data.TYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">组织机构代码</div>
-                <div className="lf value">{data.OCODE}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">地址</div>
-                <div className="lf value">{data.ADDRESS}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">占地面积(㎡)</div>
-                <div className="lf value">{data.AREA}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">在岗人数</div>
-                <div className="lf value">{data.OGNOP}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">房屋数量</div>
-                <div className="lf value">{data.HCOUNT}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">固定资产</div>
-                <div className="lf value">{data.AVALUE}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">年产值</div>
-                <div className="lf value">{data.OVALUE}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(BsnssinfoPop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/CulvertPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/CulvertPop.js
deleted file mode 100644
index 999805a..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/CulvertPop.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function CulvertPop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">照片</div>
-                <div className="lf value">{data.picPath}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">类型</div>
-                <div className="lf value">{appconsts.bridge_TYPE[data.TYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">高度(m)</div>
-                <div className="lf value">{data.HEIGHT}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">长度(m)</div>
-                <div className="lf value">{data.LENGTH}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">宽度(m)</div>
-                <div className="lf value">{data.WIDTH}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(CulvertPop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/DaminfoPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/DaminfoPop.js
deleted file mode 100644
index a556d24..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/DaminfoPop.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function SluicePop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">照片</div>
-                <div className="lf value">{data.picPath}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">类型</div>
-                <div className="lf value">{appconsts.daminfo_MT[data.TYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">容积(m3)</div>
-                <div className="lf value">{data.XHST}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">高度(m)</div>
-                <div className="lf value">{data.HEIGHT}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">宽度(m)</div>
-                <div className="lf value">{data.WIDTH}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(SluicePop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/DikePop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/DikePop.js
deleted file mode 100644
index 03b89a3..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/DikePop.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function CulvertPop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 450;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label1">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">河流编码</div>
-                <div className="lf value">{data.RVCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">河流岸别</div>
-                <div className="lf value">{appconsts.dike_dbank[data.DBANK]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">堤防跨界情况</div>
-                <div className="lf value">{appconsts.dike_dboun[data.DBOUN]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">堤防类型</div>
-                <div className="lf value">{appconsts.dike_type[data.DTYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">堤防形式</div>
-                <div className="lf value">{(data.DSTYL || '').split(',').filter(o => o).map(o => appconsts.dike_dstyl[o]).join(',')}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">规划防洪标准(年)</div>
-                <div className="lf value">{data.PLANSTA}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">堤防长度(m)</div>
-                <div className="lf value">{data.DLEN}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">达到规划防洪标准长度(m)</div>
-                <div className="lf value">{data.FLLEN}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">工程任务</div>
-                <div className="lf value">{data.ENGTASK}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">高程系统</div>
-                <div className="lf value">{data.ELESYS}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">设计水位(m)</div>
-                <div className="lf value">{data.DESSTAG}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">最大堤防高度(m)</div>
-                <div className="lf value">{data.DHMAX}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">最小堤防高度(m)</div>
-                <div className="lf value">{data.DHMIN}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">最小堤防宽度(m)</div>
-                <div className="lf value">{data.DWMIN}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">起点坝顶高程(m)</div>
-                <div className="lf value">{data.DBEGELE}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label1">终点坝顶高程(m)</div>
-                <div className="lf value">{data.DEDNELE}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(CulvertPop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/FlrvvlgPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/FlrvvlgPop.js
deleted file mode 100644
index 3ee90a3..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/FlrvvlgPop.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function PlrvvlgPop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">居民户信息</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">照片</div>
-                <div className="lf value">{data.picPath}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">户主姓名</div>
-                <div className="lf value">{data.HNAME}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">联系电话</div>
-                <div className="lf value">{data.phone}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">宅基高程(m)</div>
-                <div className="lf value">{data.LETELV}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">建筑面积(㎡)</div>
-                <div className="lf value">{data.AREA}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">家庭人口</div>
-                <div className="lf value">{data.PTCOUNT}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">建筑类型</div>
-                <div className="lf value">{appconsts.flrvvlg_BTYPE[data.BTYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">结构形式</div>
-                <div className="lf value">{appconsts.flrvvlg_STYPE[data.STYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">临水</div>
-                <div className="lf value">{data.NWATER ? '是' : '否'}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">切坡</div>
-                <div className="lf value">{data.CSLOP ? '是' : '否'}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(PlrvvlgPop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/ForecastPoints.less b/src/views/Home/MapCtrl/Pops/DcpjPop/ForecastPoints.less
deleted file mode 100644
index ab4be6a..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/ForecastPoints.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.boxfootXc{
-    height: 50px;
-    width: 200px;
-    margin: 0 auto;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-  }
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/PlacementPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/PlacementPop.js
deleted file mode 100644
index 6bbd797..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/PlacementPop.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import {CloseOutlined} from "@ant-design/icons";
-
-function PlacementPop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">安置人口</div>
-                <div className="lf value">{data.POPULATION}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">地址</div>
-                <div className="lf value">{data.ADDRESS}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">备注</div>
-                <div className="lf value">{data.REMARK}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(PlacementPop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/SluicePop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/SluicePop.js
deleted file mode 100644
index 0b17572..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/SluicePop.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function SluicePop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label2">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">照片</div>
-                <div className="lf value">{data.picPath}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">类型</div>
-                <div className="lf value">{appconsts.sluice_TYPE[data.TYPE]}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">闸孔数量</div>
-                <div className="lf value">{data.HOLENUM}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">闸孔总净宽(m)</div>
-                <div className="lf value">{data.HOLEWID}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">过闸流量(m³/s)</div>
-                <div className="lf value">{data.FLOW}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">橡胶坝坝高(m)</div>
-                <div className="lf value">{data.RUBHIG}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label2">橡胶坝坝长(m)</div>
-                <div className="lf value">{data.RUBLEN}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(SluicePop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/TransferPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/TransferPop.js
deleted file mode 100644
index c1ff459..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/TransferPop.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react'
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import {CloseOutlined} from "@ant-design/icons";
-
-function TransferPop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">地址</div>
-                <div className="lf value">{data.ADDRESS}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default TransferPop
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/WbrinfoPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/WbrinfoPop.js
deleted file mode 100644
index 31b0556..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/WbrinfoPop.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import appconsts from '../../../../../service/appconsts';
-import {CloseOutlined} from "@ant-design/icons";
-
-function SrstinfoPop({ id, dispatch, data }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.NAME}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body wxqPopBody">
-              <div className="clearFloat">
-                <div className="lf label">行政区划</div>
-                <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">所属流域</div>
-                <div className="lf value">{data.WSCD}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">站点位置</div>
-                <div className="lf value">{data.ADDRESS}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">建站日期</div>
-                <div className="lf value">{data.BDATE}</div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf label">测水位</div>
-                <div className="lf value">{appconsts.wbrinfo_TYPE[data.TYPE]}</div>
-              </div>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(SrstinfoPop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/WxqPop.js b/src/views/Home/MapCtrl/Pops/DcpjPop/WxqPop.js
deleted file mode 100644
index 62ac0c4..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/WxqPop.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, {useEffect, useState} from 'react'
-import {CloseOutlined} from "@ant-design/icons";
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import "./WxqPop.less";
-
-function WxqPop({ id, dispatch, data }) {
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip"></div>
-      <div className="dp-popup-content">
-        <div className="boxhead"></div>
-        <div className="content-body">
-          <div className="title">
-            <div className="name">{data.NAME}</div>
-            <div className="extra">
-              <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-            </div>
-          </div>
-
-          <div className="body wxqPopBody">
-            <div className="clearFloat">
-              <div className="lf label">行政区划</div>
-              <div className="lf value">{`${adnmZhen(data.ADCD) || '-'}, ${adnmCun(data.ADCD) || '-'}`}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label">所属流域</div>
-              <div className="lf value">{data.WSCD}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label">人口</div>
-              <div className="lf value">{data.PTCOUNT}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label">户数</div>
-              <div className="lf value">{data.HTCOUNT}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label">房屋数</div>
-              <div className="lf value">{data.HHTCOUNT}</div>
-            </div>
-          </div>
-
-        </div>
-        <div className="boxfoot"></div>
-      </div>
-    </div>
-  )
-}
-
-export default React.memo(WxqPop);
diff --git a/src/views/Home/MapCtrl/Pops/DcpjPop/WxqPop.less b/src/views/Home/MapCtrl/Pops/DcpjPop/WxqPop.less
deleted file mode 100644
index 1a33dc3..0000000
--- a/src/views/Home/MapCtrl/Pops/DcpjPop/WxqPop.less
+++ /dev/null
@@ -1,22 +0,0 @@
-.wxqPopBody{
-  padding: 10px 20px !important;
-  box-sizing: border-box;
-  .label,.label1,.label2, .label3{
-    color: #9f9c9c;
-  }
-  .label{
-    width: 90px;
-  }
-  .label1{
-    width: 180px;
-  }
-  .label2{
-    width: 120px;
-  }
-  .label3{
-    width: 140px;
-  }
-  .label,.label1,.label2, .label3, .value{
-    line-height: 24px;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/DiZhiZaiHaiDian.js b/src/views/Home/MapCtrl/Pops/DiZhiZaiHaiDian.js
deleted file mode 100644
index 3f25404..0000000
--- a/src/views/Home/MapCtrl/Pops/DiZhiZaiHaiDian.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions,Modal,Tabs } from 'antd';
-import moment from "moment"
-import { CloseOutlined } from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import './TangYanBa.less'
-import Dzzhtc from './Dzzhtc';
-
-function DiZhiZaiHaiDian({ id, data, dispatch }) {
-
-  const [visible , setVisible] = useState(false)
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const mapOb = {
-    1: '小型',
-    2: '中型',
-    3: '大型'
-  }
-  const width = 780;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background: '#ffffff', transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.name}
-              </div>
-              <div className="extra">
-                <span style={{ display: 'inline-block', marginRight: 50,cursor:'pointer' }}
-                 onClick={()=>{setVisible(true)}}>详情</span>
-                <CloseOutlined onClick={closePop} style={{ color: "#333" }} />
-              </div>
-            </div>
-            <div className="body">
-              <Descriptions size="small" column={2}>
-                <Descriptions.Item label="位置" >{data.adnm}</Descriptions.Item>
-                <Descriptions.Item label="面积(万m²)" >{data.area}</Descriptions.Item>
-                <Descriptions.Item label="体积(万m³)" >{data.vol}</Descriptions.Item>
-                <Descriptions.Item label="规模分级" >{mapOb[data.scaleLevel]}</Descriptions.Item>
-                <Descriptions.Item label="网格责任人" >{data.person}</Descriptions.Item>
-                <Descriptions.Item label="联系电话" >{data.personContact}</Descriptions.Item>
-                <Descriptions.Item label="网格管理员" >{data.admin}</Descriptions.Item>
-                <Descriptions.Item label="联系电话" >{data.adminContact}</Descriptions.Item>
-                <Descriptions.Item label="监测员" >{data.monitor}</Descriptions.Item>
-                <Descriptions.Item label="联系电话" >{data.monitorContact}</Descriptions.Item>
-              </Descriptions>
-            </div>
-            <div className="boxfoot"></div>
-          </div>
-        </div>
-      </div>
-      <Modal
-        visible={visible}
-        footer={null}
-        onCancel={()=>{setVisible(false)}}
-        closeIcon={()=><></>}
-        destroyOnClose
-      >
-        <Dzzhtc data={data} closeM={()=>setVisible(false)}/>
-      </Modal>
-    </>
-  )
-}
-
-export default React.memo(DiZhiZaiHaiDian);
diff --git a/src/views/Home/MapCtrl/Pops/DianXingZaiHaiShiJian.js b/src/views/Home/MapCtrl/Pops/DianXingZaiHaiShiJian.js
deleted file mode 100644
index 6b63636..0000000
--- a/src/views/Home/MapCtrl/Pops/DianXingZaiHaiShiJian.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import moment from "moment"
-import {CloseOutlined} from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import './TangYanBa.less'
-
-
-function DianXingZaiHaiShiJian({ id, data, dispatch }) {
-
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  console.log(data,'-----dxzhsj');
-  const width = 780;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-        <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.address}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-            <Descriptions size="small" column={2} >
-              <Descriptions.Item label="灾害发生时间" >{data.otime}</Descriptions.Item>
-              <Descriptions.Item label="灾害发生地点" >{data.address}</Descriptions.Item>
-              <Descriptions.Item label="过程降雨量(mm)" >{data.pfrain}</Descriptions.Item>
-              <Descriptions.Item label="死亡人数(人)" >{data.dpcount}</Descriptions.Item>
-              <Descriptions.Item label="失踪人数(人)" >{data.mpcount}</Descriptions.Item>
-              <Descriptions.Item label="损毁房屋(间)" >{data.chcount}</Descriptions.Item>
-              <Descriptions.Item label="转移人数(人)" >{data.spcount}</Descriptions.Item>
-              <Descriptions.Item label="直接经济损失(万元)" >{data.elose}</Descriptions.Item>
-              <Descriptions.Item label="灾害描述" span={3}>{data.ddscrib}</Descriptions.Item>
-              <Descriptions.Item label="图片资料" span={3}>{data.files.filter((item)=> item.fileType===1).map((item=>{
-                return <><img src={''}/>{item.id}</>
-              }))}</Descriptions.Item>
-              <Descriptions.Item label="影像资料" span={3}>{data.files.filter((item)=> item.fileType===2).map((item=>{
-                return <a src={''}>{item.id}</a>
-              }))}</Descriptions.Item>
-
-            </Descriptions>
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(DianXingZaiHaiShiJian);
diff --git a/src/views/Home/MapCtrl/Pops/DingWeiFu.css b/src/views/Home/MapCtrl/Pops/DingWeiFu.css
deleted file mode 100644
index a589869..0000000
--- a/src/views/Home/MapCtrl/Pops/DingWeiFu.css
+++ /dev/null
@@ -1,13 +0,0 @@
-
-@keyframes bounce {
-    0%, 100% {
-      transform: translateY(0);
-    }
-    50% {
-      transform: translateY(-20px);
-    }
-  }
-
-  .DingWeiFu{
-    animation: bounce 1s infinite;
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/DingWeiFu.js b/src/views/Home/MapCtrl/Pops/DingWeiFu.js
deleted file mode 100644
index 08da695..0000000
--- a/src/views/Home/MapCtrl/Pops/DingWeiFu.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import moment from "moment"
-import Icon, { EnvironmentOutlined } from '@ant-design/icons';
-import {CloseOutlined} from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import "./DingWeiFu.css"
-function HeLiu({ id, data, dispatch }) {
-
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  return (
-    <>
-      <div className="dp-popup DingWeiFu" style={{ position: 'absolute', top: -60, left: -15,transform: 'translate(0%,0%)' }}> 
-        <img width={30} src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAA0CAMAAADVCGoxAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABjUExURQAAACBg/yBg7yBg9CBg9yBg8iBg9CBg8SBg8yBg9CBg8iBg8yBg9CBg8yBg9CBg8iBi8yBi9iBi9CBi9SBi9SBi9CBi9SBi9CBh9CBh9SBh9CBh9CBh9SBh9CBh9CBh9CBh9Jnm9EAAAAAgdFJOUwAIEBggKDA4QEhQWGBocHiAh4+Xn6evt7/Hz9ff5+/3v+H4wgAAAAlwSFlzAAAXEQAAFxEByibzPwAAAYhJREFUSEuNlW2jgjAIhSnLrG7WTXvP5v//lRfmccG2vD2fGOBpY4PIUB6aK9MeKjgSFs2zD3RtCbemOCIcOC0QCmxfCClcjSA4wB/RzBAXWjgTLu+sDzpCixTawJEF+yoc1nmGUiRnt5y/EBqk/hEapNRdSP34u3JnKutmVML03JeyAd7CBQ7PxtToVQw5RLMHXEJriv2DFGYFl3ClKyxhjgxBbfVJSveBuOcMJ+Oog8VcEPf8wilo2Q5xjz4f3WAI4XCMKtWTTrCEBgnMDi7hRjUsT2iShb7QI1WwPA6VWqvj+PKZdX+uq6rWW+AvuXz6rFlOLG1uOMdGNnDH4gOdbxhzvpSj5HzXCNMP2PcBMykVhsuE1Cg0KRWEJqTeQkRzezcBZ+bYFt6IPcLANNrIXc8wxjygkRWCgT0CCvVQgelZT6fbECzjH8wO/Og1DLefoDu+f0QnGylUSR2GUMoaGcwOrgxhWIXxnQOFj0ttmfv58Ur+nywrqZZvoin4PUR3n2MfXxnRH5UdjiNfuElIAAAAAElFTkSuQmCC" alt="" />
-      </div>
-    </>
-  )
-}
-
-export default React.memo(HeLiu);
diff --git a/src/views/Home/MapCtrl/Pops/DrpPop.js b/src/views/Home/MapCtrl/Pops/DrpPop.js
deleted file mode 100644
index 37154ba..0000000
--- a/src/views/Home/MapCtrl/Pops/DrpPop.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import React, { useState } from 'react'
-import DrpChart from '../charts/RealDrpPop/DrpChart';
-import HDChart from '../charts/RealHDPop/HDChart';
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import { Modal, Tabs } from 'antd';
-import DrpSearch from '../components/DrpSearch';
-import Glfzdx from '../components/Glfzdx'
-import SummarizeRain from "../../../../components/summarizeRain";
-import Jcsj from "../components/Jcsj";
-import DrpStAround from '../components/DrpStAround'
-import {ylLevel} from "../../../../utils/dictType";
-import moment from "moment"
-import BaseInfo from '../components/BaseInfo'
-
-function RealDrpTip({ id, data, dispatch }) {
-  console.log("雨量弹框数据porps",data);
-  const [visible, setVisible] = useState(false);
-
-
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 1050;
-
-  const [hzyqVisible, setHzyqVisible] = useState(false);
-
-  const handleCancel = () => {
-    setHzyqVisible(false);
-  }
-  console.log(data,'-------');
-
-  const ylLevel2 = (val)=>{
-    if(val===null){
-      return '-'
-    }else if(val<0.1){
-        return '无降雨'
-    }else if(val>=0.1 && val<10){
-        return '小雨';
-    }else if(val>=10 && val<25){
-        return '中雨';
-    }else if(val>=25 && val<50){
-        return '大雨';
-    }else if(val>=50 && val<100){
-        return '暴雨';
-    }else if(val>=100 && val<250){
-        return '大暴雨';
-    }else{
-        return '特大暴雨';
-    }
-}
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1 }}>
-        <div className="dp-popup-content" style={{borderRadius:'10px'}}>
-          <div className="content-body tyb skpop" id='tyb' style={{ height: '100%' }}>
-            <div className="normalModalStyle" style={{borderRadius:10}}>
-            <div className="normalModalStyle_title" style={{marginBottom:10}}>
-                        <div className="normalModalStyle_title_icon"></div>
-                        <span>{data?.stnm}&emsp;</span>
-                        {data?.sttp &&
-            <span style={
-              { 
-                display:"inline-block",
-                padding: "5px 10px",
-                color: "#74a7ff",
-                border: "1px solid #74a7ff",
-                borderRadius: "5px"
-              }
-            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}</span>}
-                        <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-                </div>
-              </div>
-              <div style={{ paddingLeft: 15,paddingTop:15,background:"#fff",borderRadius:'0 0 10px 10px' }} className='drp-box' >
-              <Jcsj record={data}/>
-              </div>
-          </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(RealDrpTip);
diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/TableData.js b/src/views/Home/MapCtrl/Pops/DuanMian/TableData.js
deleted file mode 100644
index 2e95ff1..0000000
--- a/src/views/Home/MapCtrl/Pops/DuanMian/TableData.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-import moment from 'moment'
-
-
-const Tabledata = ({tableData}) => {
-  const columns = [
-    { title: '序号', key: '', dataIndex: '', align: 'center',render:(a,b,c)=>c+1},
-    { title: '时间', key: 'tm', dataIndex: 'tm', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: '管水位(m)', key: 'value', dataIndex: 'value', align: 'center',render: (rec) => <span>{rec ?? "-"}</span>},
-  ];
-  
-  return (
-    <>
-      <Table rowKey="tm"
-             sticky 
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{ y: "420px"}}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
deleted file mode 100644
index 0bdb86d..0000000
--- a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
+++ /dev/null
@@ -1,156 +0,0 @@
-export default function drpOption(data) {
-  console.log("data",data);
-  const maxVal = 0//Math.max(...data.map(obj => obj.drp))
-  const max1 = Math.max(...data.map(obj => obj.value))
-  const min1 = Math.min(...data.map(obj => obj.value))
-  const max2 = Math.max(...data.map(obj => obj.rz))
-  const min2 = Math.min(...data.map(obj => obj.rz))
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-
-    },
-    grid: [
-      {
-        top: "12%",
-        left: "5%",
-        right: "5%",
-        width: '90%',
-        height: '75%'
-      },
-    ],
-    legend: {
-      top:'3%',
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ["压测管水位", "库水位"],
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: false,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          padding: [0, 0, 100, 0],
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.slice(0,10)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: "压测管水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, 10, 10],
-          color:'#333333',
-          fontSize: 14
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#bfbfbf',
-            width: 0.5,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          // show: false
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        min: Math.floor(max1*0.8),
-        max: Math.floor(min1*1.2),
-      },
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'right',
-        name: "库水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, 10, 10],
-          color:'#333333',
-          fontSize: 14
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          // show: false
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        min: Math.floor(max2*0.8),
-        max: Math.floor(min2*1.2),
-      }
-    ],
-    series: [
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 0,
-        name: '压测管水位',
-        type: 'line',
-        color: "#d6eaec",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.value),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '库水位',
-        type: 'line',
-        color: "#60a0f8",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.rz),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/index.js b/src/views/Home/MapCtrl/Pops/DuanMian/index.js
deleted file mode 100644
index e1f5cb7..0000000
--- a/src/views/Home/MapCtrl/Pops/DuanMian/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { Tabs, Form, Button, Input, DatePicker } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import ReactEcharts from 'echarts-for-react';
-import { httppost2 } from '../../../../../utils/request';
-import apiurl from '../../../../../service/apiurl';
-import moment from "moment"
-import ToolBar from './toolbar';
-import TableData from './TableData'
-import drpOption from './drpOption';
-
-function ShenYa({ id, data, dispatch, onCancel }) {
-  console.log('data',data);
-  const [ tableData, setTableData ] = useState([])
-  const [ tabVal, setTabVal ] = useState('1')
-  const [ tms, setTms ] = useState([moment().add(-1,'months'),moment()])
-  const option = useMemo(() => drpOption(tableData), [tableData])
-  const width = 780;
-  
-  const closePop = () => {
-    if(onCancel){
-      onCancel()
-    }
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const getData = async(tms,stationCode)=>{
-    const params = {
-      // type: 2,
-      dateTimeRangeSo: {
-        start: moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'),
-      },
-      stationCode: stationCode
-    }
-    
-    const { code, data} = await httppost2(apiurl.home.syslList,params)
-    if(code!==200){
-        return
-    }
-    setTableData(data)
-  }
-
-  useEffect(()=>{
-    if(data.children.length!==0){
-      getData(tms,data.children[0])
-    }
-  },[])
-
-  return (
-    <>
-      <div className="normalModalStyle homeModal2">
-          <div className="normalModalStyle_title">
-              <div className="normalModalStyle_title_icon"></div>
-              {data.stationCode}
-              <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-          </div>
-
-          <div style={{padding:'0 20px'}}>
-            <ToolBar search={(tms)=>getData(tms,data.stationCode)} setTms={setTms} setTabVal={setTabVal}/>
-          </div>
-          <div className='homeModal2_content' style={{paddingLeft:'0px'}}>
-            <Tabs 
-              defaultActiveKey="1" 
-              tabPosition='left' 
-              style={{paddingTop:'10px'}} 
-              onChange={(e)=>getData(tms,e)}
-            >
-              {
-                data.children.map((item)=>
-                  <Tabs.TabPane tab={item} key={item}></Tabs.TabPane>
-                )
-              }
-            </Tabs>
-              {
-                  tabVal==='1'?
-                    tableData.length>0?
-                    <ReactEcharts option={option} style={{width: "100%", height: '100%'}}/>
-                    :<div style={{textAlign: "center", margin: "10%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-                    :null
-              }
-              {
-                  tabVal==='2'?<div style={{marginTop:'10px'}}><TableData tableData={tableData}/></div>:null
-              }
-          </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(ShenYa);
diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js b/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
deleted file mode 100644
index 9d0733e..0000000
--- a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Form, Input, Radio, DatePicker } from 'antd';
-import NormalSelect from '../../../../../components/Form/NormalSelect'
-import { useEffect, useState } from 'react';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({search, setTabVal, setTms}) => {
-
-    const onFinish = (val)=>{
-        setTms(val)
-        search(val)
-    }
-
-
-
-    return (
-        <>
-            <Form className='toolbarBox' layout="inline" onFinish={onFinish}>
-                <Form.Item label="时间段" name="imgName">
-                    <RangePicker
-                        allowClear={false}
-                        defaultValue={[moment().add(-1,'months'),moment()]}
-                        onChange={onFinish}
-                        style={{ width: "300px" }}
-                        format="YYYY-MM-DD"
-                    />
-                </Form.Item>
-                <Form.Item style={{marginLeft:'200px'}}>
-                    <Radio.Group onChange={(e)=>{setTabVal(e.target.value)}} defaultValue="1" size="large" buttonStyle="outline">
-                        <Radio.Button value="1">数据图</Radio.Button>
-                        <Radio.Button value="2">数据表</Radio.Button>
-                    </Radio.Group>
-                </Form.Item>
-            </Form>
-        </>
-    );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/Dzzhtc/index.js b/src/views/Home/MapCtrl/Pops/Dzzhtc/index.js
deleted file mode 100644
index 88145be..0000000
--- a/src/views/Home/MapCtrl/Pops/Dzzhtc/index.js
+++ /dev/null
@@ -1,262 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Descriptions, Modal, Tabs } from 'antd'
-import moment from 'moment'
-import { CloseOutlined } from '@ant-design/icons'
-import '../TangYanBa.less'
-
-function Dzzhtc ({ id, data, dispatch, closeM }) {
-  const [visible, setVisible] = useState(false)
-  const closePop = () => {
-    closeM()
-  }
-  const mapOb = {
-    1: '崩塌',
-    2: '滑坡',
-    3: '塌陷'
-  }
-  const level = {
-    1: '小型',
-    2: '中型',
-    3: '大型',
-    4: '特大型'
-  }
-  const state = {
-    1: '稳定',
-    2: '欠稳定',
-    3: '较稳定',
-    4: '基本稳定',
-    5: '不稳定',
-    其他: '稳定'
-  }
-  const manageLevel = {
-    1: '州级',
-    2: '县级',
-    3: '乡镇级',
-    4: '村级'
-  }
-  // 1=州级 2=县级 3=乡镇级 4=村级
-  // 1=稳定 2=欠稳定 3=较稳定 4=基本稳定 5=不稳定 null=未知 其他=稳定
-  const width = 800
-  console.log(data, '----dtata')
-  return (
-    <>
-      <div
-        className='dp-popup'
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 0,
-          width,
-          lineHeight: 1,
-          background: '#ffffff'
-        }}
-      >
-        <div className='dp-popup-content'>
-          <div className='content-body tyb' id='tyb'>
-            <div className='title'>
-              <div className='name flex flexac'>
-                <div className='nameBorder'></div>
-                {data.name}
-              </div>
-              <div className='extra'>
-                <CloseOutlined onClick={closePop} style={{ color: '#333' }} />
-              </div>
-            </div>
-            <div style={{ height: 600, overflowY: 'auto' }}>
-              <div style={{ padding: '0 5px 5px 5px' }}>
-                <Descriptions
-                  size='small'
-                  column={3}
-                  bordered
-                  labelStyle={{ backgroundColor: '#fff' }}
-                >
-                  <Descriptions.Item
-                    label={
-                      <div style={{ color: '#000', fontWeight: 'bold' }}>
-                        基本情况
-                      </div>
-                    }
-                    span={3}
-                  ></Descriptions.Item>
-                  <Descriptions.Item label='野外编号'>
-                    {data.code}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='名称'>
-                    {data.name}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='专业监测点'>
-                    {data.isProfessional == 1 ? '是' : '否'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='行政区划'>
-                    {data.adnm}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='位置'>
-                    {data.adnm}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='灾害类型'>
-                    {mapOb[data.dtype]}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='经度'>{data.lng}</Descriptions.Item>
-                  <Descriptions.Item label='纬度' span={2}>
-                    {data.lat}
-                  </Descriptions.Item>
-
-                  <Descriptions.Item
-                    label={
-                      <div style={{ color: '#000', fontWeight: 'bold' }}>
-                        灾害体基本特征
-                      </div>
-                    }
-                    span={3}
-                  ></Descriptions.Item>
-                  <Descriptions.Item label='崩滑方向'>
-                    {data.direction}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='是否涉水'>
-                    {data.isWade == 1 ? '是' : '否'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='面积(万m²)'>
-                    {data.area}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='体积(万m³)'>
-                    {data.vol}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='规模分级'>
-                    {level[data.scaleLevel]}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='现状稳定性'>
-                    {data.state ? state[data.state] : '未知'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='潜在稳定性' span={3}>
-                    {data.latentState ? state[data.latentState] : '未知'}
-                  </Descriptions.Item>
-
-                  <Descriptions.Item
-                    label={
-                      <div style={{ color: '#000', fontWeight: 'bold' }}>
-                        灾害体危害特征
-                      </div>
-                    }
-                    span={3}
-                  ></Descriptions.Item>
-                  <Descriptions.Item label='死亡人数'>
-                    {data.death}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='经济损失(万元)'>
-                    {data.ecoLoss}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='威胁户数'>
-                    {data.threatenHouses}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='威胁人口'>
-                    {data.threatenPops}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='威胁资产(万元)'>
-                    {data.threatenAsset}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='险情分级'>
-                    {level[data.dangerLevel]}
-                  </Descriptions.Item>
-
-                  <Descriptions.Item
-                    label={
-                      <div
-                        style={{ color: '#000', fontWeight: 'bold', width: 95 }}
-                      >
-                        防治与管理
-                      </div>
-                    }
-                    span={3}
-                  ></Descriptions.Item>
-                  <Descriptions.Item label='防治措施建议'>
-                    {data.suggestion}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='管理层级'>
-                    {manageLevel[data.manageLevel]}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='灾体位置'>
-                    {data.orgAddr}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='主管部门' span={3}>
-                    {data.org}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='网格责任人'>
-                    {data.person}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='联系电话' span={2}>
-                    {data.personContact}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='网格管理员'>
-                    {data.admin}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='联系电话' span={2}>
-                    {data.adminContact}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='网格协管员'>
-                    {data.collaborator}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='联系电话' span={2}>
-                    {data.collaboratorContact}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='网格专管员'>
-                    {data.manager}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='联系电话' span={2}>
-                    {data.managerContact}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='监测员'>
-                    {data.monitor}
-                  </Descriptions.Item>
-                  <Descriptions.Item label='联系电话' span={2}>
-                    {data.monitorContact}
-                  </Descriptions.Item>
-                </Descriptions>
-              </div>
-              {/* <div className="body">
-                <Descriptions size="small" title='灾害体基本特征' column={3} bordered>
-                  <Descriptions.Item label="崩滑方向" >{data.direction}</Descriptions.Item>
-                  <Descriptions.Item label="是否涉水">{data.isWade == 1?'是':'否'}</Descriptions.Item>
-                  <Descriptions.Item label="面积(万m²)">{data.area}</Descriptions.Item>
-                  <Descriptions.Item label="体积(万m³)">{data.vol}</Descriptions.Item>
-                  <Descriptions.Item label="规模分级" >{level[data.scaleLevel]}</Descriptions.Item>
-                  <Descriptions.Item label="现状稳定性" >{data.state?state[data.state]:'未知'}</Descriptions.Item>
-                  <Descriptions.Item label="潜在稳定性" >{data.latentState?state[data.latentState]:'未知'}</Descriptions.Item>
-                </Descriptions>
-              </div>
-              <div className="body">
-                <Descriptions size="small" title='灾害体危害特征' column={3} bordered>
-                  <Descriptions.Item label="死亡人数" >{data.death}</Descriptions.Item>
-                  <Descriptions.Item label="经济损失(万元)" >{data.ecoLoss}</Descriptions.Item>
-                  <Descriptions.Item label="威胁户数" >{data.threatenHouses}</Descriptions.Item>
-                  <Descriptions.Item label="威胁人口" >{data.threatenPops}</Descriptions.Item>
-                  <Descriptions.Item label="威胁资产(万元)" >{data.threatenAsset}</Descriptions.Item>
-                  <Descriptions.Item label="险情分级" >{level[data.dangerLevel]}</Descriptions.Item>
-                </Descriptions>
-              </div>
-              <div className="body">
-                <Descriptions size="small" title='防治与管理' column={3} bordered>
-                  <Descriptions.Item label="防治措施建议" >{data.suggestion}</Descriptions.Item>
-                  <Descriptions.Item label="管理层级" >{manageLevel[data.manageLevel]}</Descriptions.Item>
-                  <Descriptions.Item label="灾体位置" >{data.orgAddr}</Descriptions.Item>
-                  <Descriptions.Item label="主管部门" span={3}>{data.org}</Descriptions.Item>
-                  <Descriptions.Item label="网格责任人" >{data.person}</Descriptions.Item>
-                  <Descriptions.Item label="联系电话" span={2}>{data.personContact}</Descriptions.Item>
-                  <Descriptions.Item label="网格管理员">{data.admin}</Descriptions.Item>
-                  <Descriptions.Item label="联系电话" span={2}>{data.adminContact}</Descriptions.Item>
-                  <Descriptions.Item label="网格协管员" >{data.collaborator}</Descriptions.Item>
-                  <Descriptions.Item label="联系电话" span={2}>{data.collaboratorContact}</Descriptions.Item>
-                  <Descriptions.Item label="网格专管员" >{data.manager}</Descriptions.Item>
-                  <Descriptions.Item label="联系电话" span={2}>{data.managerContact}</Descriptions.Item>
-                  <Descriptions.Item label="监测员" >{data.monitor}</Descriptions.Item>
-                  <Descriptions.Item label="联系电话" span={2}>{data.monitorContact}</Descriptions.Item>
-                </Descriptions>
-              </div> */}
-            </div>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(Dzzhtc)
diff --git a/src/views/Home/MapCtrl/Pops/GongShuiPop.js b/src/views/Home/MapCtrl/Pops/GongShuiPop.js
deleted file mode 100644
index a479842..0000000
--- a/src/views/Home/MapCtrl/Pops/GongShuiPop.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useState } from 'react'
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import Jcsj from "../components/GsJcsj";
-
-
-function RealDrpTip({ id, data, dispatch }) {
-  console.log("供水弹框数据porps",data);
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 1050;
-
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1 }}>
-        <div className="dp-popup-content" style={{borderRadius:'10px'}}>
-          <div className="content-body tyb skpop" id='tyb' style={{ height: '100%' }}>
-            <div className="normalModalStyle">
-            <div className="normalModalStyle_title" style={{marginBottom:0}}>
-                        <div className="normalModalStyle_title_icon"></div>
-                        <span>{data?.sttp == "QQ" ?"放水管流量": data?.sttp == "PQ" ? "输水管流量" : ""}&emsp;</span>
-                        {data?.sttp &&
-            <span style={
-              { 
-                display:"inline-block",
-                padding: "5px 10px",
-                color: "#74a7ff",
-                border: "1px solid #74a7ff",
-                borderRadius: "5px"
-              }
-            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}（{{'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}?.[data.source]}）</span>}
-                        <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-                </div>
-              </div>
-              <div style={{ paddingLeft: 15,paddingTop:15,background:"#fff",borderRadius:'0 0 10px 10px' }} >
-              <Jcsj record={data}/>
-              </div>
-          </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(RealDrpTip);
diff --git a/src/views/Home/MapCtrl/Pops/HdswPop.js b/src/views/Home/MapCtrl/Pops/HdswPop.js
deleted file mode 100644
index 55ac444..0000000
--- a/src/views/Home/MapCtrl/Pops/HdswPop.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import React, {useState} from 'react'
-import {CloseOutlined} from "@ant-design/icons";
-import HDChart from "../charts/RealHDPop/HDChart";
-import {Modal, Tabs} from "antd";
-import DrpSearch from "../components/DrpSearch";
-import RzSearch from "../components/RzSearch";
-import BaseInfo from '../components/BaseInfo'
-import SummarizeRiverWaterRegime from "../../../../components/summarizeRiverWaterRegime";
-import appconsts from '../../../../service/appconsts';
-import SkImgSearch from "../components/SkImgSearch";
-import Sqjcsj from '../components/Sqjcsj'
-import Swllgx from '../components/Swllgx'
-import Txjc from '../components/Txjc'
-import Spjc from '../components/Spjc'
-import DrpStAround from "../components/DrpStAround";
-import {stType} from "../../../../utils/dictType"
-import moment from 'moment';
-
-function HdswPop({ id, dispatch, data }) {
-
-  console.log('我要的data',data);
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 480;
-
-  const [visible, setVisible] = useState(false);
-
-  const viewInfo = () => {
-    setVisible(true);
-  };
-
-  const [hzhdsqVisible, setHzhdsqVisible] = useState(false);
-
-  const handleCancel = () => {
-    setHzhdsqVisible(false);
-  }
-
-  return (
-    <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip"></div>
-      <div className="dp-popup-content">
-        <div className="boxhead"></div>
-        <div className="content-body">
-          <div className="title">
-            <div className="name">{data.stnm}</div>
-            <div className="extra">
-              <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-            </div>
-          </div>
-
-          <div className="body">
-            <div className="cursor-pointer3" onClick={viewInfo}>{data?.xiangqingShow==='不显示'?'':'详情'}</div>
-          </div>
-
-          <div style={{padding:"10px 15px"}}>
-            <span>站点编码：</span><span style={{fontWeight:"bold", color:"#0893FF"}}>{data.stcd}</span>
-          </div>
-          {
-            data?.xiangqingShow==='不显示'?
-            <>
-            <div style={{padding:"10px 15px"}}>
-              <span>行政区划：</span><span style={{fontWeight:"bold"}}>{data.adnm}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>所属流域：</span><span style={{fontWeight:"bold"}}>{data?.lyname}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>站点类型：</span><span style={{ fontWeight: "bold" }}>{stType(data.sttp)}{
-                data?.source === "SH" ? "（山洪）" :
-                  data.source === "SK" ? "（水库）": "（水文）"
-              }</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>站址：</span><span style={{fontWeight:"bold"}}>{data.stlc}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>建站日期：</span><span style={{fontWeight:"bold"}}>{data.esstym?moment(data.esstym).format('YYYY-MM-DD'):'-'}</span>
-            </div>
-            </>:
-            <>
-            <div style={{padding:"10px 15px"}}>
-              <span>实时水位：</span><span style={{fontWeight:"bold"}}>{data.z?.toFixed(2)}m</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>站点类型：</span><span style={{ fontWeight: "bold" }}>{stType(data.sttp)}{
-                data?.source === "SH" ? "（山洪）" :
-                  data.source === "SK" ? "（水库）": "（水文）"
-              }</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>上报时间：</span><span style={{fontWeight:"bold"}}>{data.tm}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>站址：</span><span style={{fontWeight:"bold"}}>{data.stlc}</span>
-            </div>
-            </>
-          }
-
-        </div>
-        <div className="boxfoot"></div>
-      </div>
-
-      {/*雨量查询弹窗*/}
-      <Modal
-        visible={visible}
-        footer={null}
-        width={1050}
-        // title={data.stnm}
-        title={
-          <>
-            <span>{data.stnm}&emsp;</span>
-            {data?.sttp &&
-            <span style={
-              { 
-                display:"inline-block",
-                padding: "5px 10px",
-                color: "#74a7ff",
-                border: "1px solid #74a7ff",
-                borderRadius: "5px"
-              }
-            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}（{{'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}?.[data.source]}）</span>}
-          </>
-        }
-        className="queryDrpModal"
-        destroyOnClose
-        onCancel={()=>setVisible(false)}>
-        <Tabs defaultActiveKey="1">
-          <Tabs.TabPane tab="监测数据" key="1">
-            <Sqjcsj record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="水位流量关系" key="2">
-            <Swllgx record={data}/>
-          </Tabs.TabPane>
-          {/* <Tabs.TabPane tab="图像监测" key="3">
-            <Txjc record={data}/>
-          </Tabs.TabPane> */}
-          {/* <Tabs.TabPane tab="视频监测" key="4">
-            <Spjc record={data}/>
-          </Tabs.TabPane> */}
-          {/* <Tabs.TabPane tab="周边雨情" key="5">
-            <DrpStAround data={data}/>
-          </Tabs.TabPane> */}
-        </Tabs>
-      </Modal>
-
-      {/*汇总河道水情弹窗*/}
-      <Modal
-        visible={hzhdsqVisible}
-        title="汇总河道水情"
-        footer={null}
-        onCancel={handleCancel}
-        width="99vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        <SummarizeRiverWaterRegime />
-      </Modal>
-    </div>
-  )
-}
-
-export default React.memo(HdswPop);
diff --git a/src/views/Home/MapCtrl/Pops/HdswPop2.js b/src/views/Home/MapCtrl/Pops/HdswPop2.js
deleted file mode 100644
index 694442d..0000000
--- a/src/views/Home/MapCtrl/Pops/HdswPop2.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import moment from "moment"
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import { Modal, Tabs } from 'antd';
-import Sqjcsj from '../components/Sqjcsj'
-import Swllgx from '../components/Swllgx'
-import './TangYanBa.less'
-
-
-
-function HdswPop2({ id, data, dispatch }) {
- 
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const width = 1050;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, width,left: 0,height:646, lineHeight: 1,backgroundColor:'#fff',borderRadius:'10px'}}>
-        <div className="dp-popup-content" style={{height:'100%',borderRadius:'10px'}}>
-          <div className="content-body tyb skpop" id='tyb' style={{ height: '100%' }}>
-            <div className="normalModalStyle" style={{borderRadius:10}}>
-           <div className="normalModalStyle_title" style={{marginBottom:0}}>
-                        <div className="normalModalStyle_title_icon"></div>
-                        <span>{data?.name}&emsp;</span>
-                        {data?.sttp &&
-            <span style={
-              { 
-                display:"inline-block",
-                padding: "5px 10px",
-                color: "#74a7ff",
-                border: "1px solid #74a7ff",
-                borderRadius: "5px"
-              }
-            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}（{{'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}?.[data.source]}）</span>}
-                        <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-                </div>
-              </div>
-          <div style={{paddingLeft:15}}>
-        <Tabs defaultActiveKey="1">
-          <Tabs.TabPane tab="监测数据" key="1">
-            <Sqjcsj record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="水位流量关系" key="2">
-            <Swllgx record={data}/>
-          </Tabs.TabPane>
-        </Tabs>
-          </div>
-          </div>
-            </div >
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(HdswPop2);
diff --git a/src/views/Home/MapCtrl/Pops/HeLiu.js b/src/views/Home/MapCtrl/Pops/HeLiu.js
deleted file mode 100644
index ad9eae2..0000000
--- a/src/views/Home/MapCtrl/Pops/HeLiu.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import moment from "moment"
-import {CloseOutlined} from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import './TangYanBa.less'
-function HeLiu({ id, data, dispatch }) {
-
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const width = 780;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-        <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.rvName}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-            <Descriptions size="small" column={2}>
-              <Descriptions.Item label="河流级别" >{data.rvGrad}</Descriptions.Item>
-              <Descriptions.Item label="发源地" >{data.rvSourLoc}</Descriptions.Item>
-              <Descriptions.Item label="总长(km)" >{data.rvLen}</Descriptions.Item>
-              <Descriptions.Item label="境内河长(km)" >{data.rvRealmLen}</Descriptions.Item>
-              <Descriptions.Item label="流域总面积(k㎡)" >{data.rvBasArea}</Descriptions.Item>
-              <Descriptions.Item label="境内流域面积(k㎡)" >{data.rvRealmArea}</Descriptions.Item>
-              <Descriptions.Item label="多年平均流量(m³/s)" >{data.yearAvgFlow}</Descriptions.Item>
-              <Descriptions.Item label="多年平均降雨量(mm)" >{data.yearAvgDrp}</Descriptions.Item>
-              <Descriptions.Item label="河道平均比降(%)" span={3}>{data.averSlop}</Descriptions.Item>
-              <Descriptions.Item label="涉及乡镇、行政村" span={3}>{data.flowArea}</Descriptions.Item>
-            </Descriptions>
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(HeLiu);
diff --git a/src/views/Home/MapCtrl/Pops/POIPop.tsx b/src/views/Home/MapCtrl/Pops/POIPop.tsx
deleted file mode 100644
index 323a7a8..0000000
--- a/src/views/Home/MapCtrl/Pops/POIPop.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import { RecordId } from '../../../../models/_';
-import { Dispatch } from '../../../../models/store';
-
-
-const POIPop: React.FC<{
-  record: any;
-  dispatch: Dispatch;
-  id: RecordId;
-  type: string;
-}> = ({ record, dispatch, id }) => {
-
-
-  return (
-    <>
-      <div className="boxhead"></div>
-      <div className="featuretip-title">
-        <div className="name">{record?.name}</div>
-        <div style={{ flexGrow: 1 }}></div>
-        <div style={{ cursor: 'pointer', padding: '0 0.8rem' }} onClick={() => dispatch.runtime.closeFeaturePop(id)}>x</div>
-      </div>
-      <div style={{ maxHeight: '60rem', width: '20rem', padding: '0.5rem 1rem', overflowY: 'auto' }}>
-        {
-          Object.keys(record).map(key => {
-            if (key == 'lgtd' || key === 'lttd') {
-              return null;
-            }
-
-            let tkey = key;
-            if (tkey === 'id') {
-              tkey = '序号';
-            } else if (tkey === 'name') {
-              tkey = '名称';
-            }
-
-            return (
-              <div
-                key={key}
-                className="featuretip-prop-row"
-              >
-                <div style={{ color: '#ddd' }}>{tkey}</div>
-                <div style={{ color: '#fff' }}>{record[key]}</div>
-              </div>
-            );
-          })
-        }
-
-      </div>
-
-      <div className="boxfoot"></div>
-
-    </>
-  )
-}
-
-export default React.memo(POIPop);
diff --git a/src/views/Home/MapCtrl/Pops/PciStPop.js b/src/views/Home/MapCtrl/Pops/PciStPop.js
deleted file mode 100644
index 0f9be88..0000000
--- a/src/views/Home/MapCtrl/Pops/PciStPop.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import React, {useEffect, useState} from 'react'
-import {getRealPic1} from "../../../../models/_/real";
-import {Image, Modal} from "antd";
-import {
-  CloseOutlined,
-  CaretUpOutlined,
-  CaretDownOutlined,
-  CaretLeftOutlined,
-  CaretRightOutlined,
-  PlusOutlined,
-  MinusOutlined
-} from "@ant-design/icons";
-import SkImgSearch from "../components/SkImgSearch";
-import apiurl from '../../../../service/apiurl';
-import { httpget2,httppost2 } from '../../../../utils/request';
-import HFivePlayer from '../../../../components/video1Plary';
-function PciStPop({ id, dispatch, data }) {
-console.log("dataee",data);
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 550;
-  const [visible, setVisible] = useState(false);
-  const [videoSrc, setVideoSrc] = useState('')
-  const getVideoSrc = async() => {
-    try {
-      const res = await httpget2(`${apiurl.gsxl.zfzl.videosrc}${data.indexCode}`)
-        setVideoSrc(res.data);
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  // 云台控制
-  let timer = null;
-  // 云台控制
-  const onOperation = async(params) => {
-     let data1 = {
-         ...params,
-         indexCode: data?.indexCode,
-         action:0
-     }
-     try {
-         const res = await httppost2(apiurl.spjk1.aiWarn.controler, data1)
-       if (res.code == 200) {
-        onOperation1(params)
-            //  if(timer) clearTimeout(timer)
-            //  timer = setTimeout(() => {
-                 
-            //  },0)
-         }
-     } catch (error) {
-         console.log(error);
-      }
- }
-
- const onOperation1 = async(params) => {
-     let data1 = {
-         ...params,
-         indexCode: data?.indexCode,
-         action:1
-     }
-     try {
-         const res = await httppost2(apiurl.spjk1.aiWarn.controler,data1)
-     } catch (error) {
-         console.log(error);
-     }
- }
-  useEffect(() => {
-    if (data.indexCode) {
-      getVideoSrc();
-    }
-  }, [data])
-  return (
-    <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1 }}>
-      <div className="dp-popup-tip"></div>
-      <div className="dp-popup-content">
-        <div className="boxhead"></div>
-        <div className="content-body">
-          <div className="title">
-            <div className="name">{data.name}</div>
-            <div className="extra">
-              <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-            </div>
-          </div>
-
-          <div className="body">
-          <div className='jk-video' style={{width:"100%",height:300}}>
-            <HFivePlayer 
-              size={1} 
-              wsUrl={{ src:videoSrc}} 
-              playerID={"333"} />
-            </div>
-            {
-              data?.type == 1 ? 
-              <div
-              className='controler'
-              style={{display:"flex",margin:"20px 0",color:"#70dbfe",fontSize:35,justifyContent:"space-around"}}
-            >
-              <CaretUpOutlined 
-                    style={{ cursor: "pointer" }}
-                    title='向上'
-                    onClick={() => onOperation({speed:30,command:"UP"})}
-              />
-               <CaretDownOutlined
-                  style={{ cursor: "pointer" }}
-                  title='向下'
-                  onClick={() => onOperation({speed:30,command:"DOWN"})}
-                />
-                  <CaretLeftOutlined
-                     style={{ cursor: "pointer" }}
-                     title='向左'
-                     onClick={() => onOperation({speed:30,command:"LEFT"})}
-                  />
-                  <CaretRightOutlined
-                     style={{ cursor: "pointer" }}
-                     title='向右'
-                     onClick={() => onOperation({speed:30,command:"RIGHT"})}
-                  />
-                  <PlusOutlined
-                    style={{ cursor: "pointer" }}
-                    title='放大'
-                    onClick={() => onOperation({speed:30,command:"ZOOM_IN"})}
-                  />
-                  <MinusOutlined
-                    style={{ cursor: "pointer" }}
-                    title='缩小'
-                    onClick={() => onOperation({speed:30,command:"ZOOM_OUT"})}
-                  />
-            </div> :null
-           }
-          </div>
-
-        </div>
-      </div>
-
-      <Modal
-        visible={visible}
-        footer={null}
-        width={1050}
-        title={data.stnm}
-        className="queryDrpModal"
-        onCancel={()=>setVisible(false)}
-      >
-        <div style={{padding:"20px 0"}}>
-          <SkImgSearch record={data}/>
-        </div>
-      </Modal>
-    </div>
-  )
-}
-
-export default React.memo(PciStPop);
diff --git a/src/views/Home/MapCtrl/Pops/QSYDW.js b/src/views/Home/MapCtrl/Pops/QSYDW.js
deleted file mode 100644
index d5c9174..0000000
--- a/src/views/Home/MapCtrl/Pops/QSYDW.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions,Image } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-
-import moment from "moment"
-
-function QSYDW({ id, data, dispatch }) {
-  console.log(data);
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const width = 500;
-  
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.name}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-            <Descriptions labelStyle={{padding:"5px 0"}}>
-                <Descriptions.Item label="行政区划" span={2} contentStyle={{ padding: "5px 0" }}>{data?.adnm}</Descriptions.Item>
-                <Descriptions.Item label="类别" span={1} contentStyle={{padding:"5px 0"}}>{data?.type == 1 ? "事业单位" : data?.type == 2 ? "企业单位":''}</Descriptions.Item>
-                <Descriptions.Item label="地址" span={2} contentStyle={{padding:"5px 0"}}>{data?.address}</Descriptions.Item>
-                <Descriptions.Item label="占地面积(㎡)" span={1} contentStyle={{padding:"5px 0"}}>{data?.area}</Descriptions.Item>
-                <Descriptions.Item label="在岗人数" span={2} contentStyle={{padding:"5px 0"}}>{data?.pcount}</Descriptions.Item>
-                <Descriptions.Item label="房屋数量" span={1} contentStyle={{padding:"5px 0"}}>{data?.hcount}</Descriptions.Item>
-                <Descriptions.Item label="年产值(万元)" span={2} contentStyle={{padding:"5px 0"}}>{data?.ovalue}</Descriptions.Item>
-                <Descriptions.Item label="固定产值(万元)" span={1} contentStyle={{padding:"5px 0"}}>{data?.avalue}</Descriptions.Item>
-                <Descriptions.Item label="照片" span={3} contentStyle={{ padding: "5px 0" }}>
-                  {
-                    data?.files?.length > 0 ? 
-                      data?.files.map(item => <div key={item.id} style={{marginRight:5}} >
-                       <Image
-                  width={100}
-                  height={50}
-                  src={url + item.filePath}
-                  
-                />
-                    </div>) : null
-                  }
-                </Descriptions.Item>
-              </Descriptions>
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(QSYDW);
diff --git a/src/views/Home/MapCtrl/Pops/RainPreviewPop.js b/src/views/Home/MapCtrl/Pops/RainPreviewPop.js
deleted file mode 100644
index e33f382..0000000
--- a/src/views/Home/MapCtrl/Pops/RainPreviewPop.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react'
-
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-
-function YbyjPlanPop({ id, data, dispatch }) {
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.station}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div style={{padding:"10px 15px"}}>
-              <span>站点编码：</span><span style={{fontWeight:"bold", color:"#0893FF"}}>{data.stcd}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>累计雨量：</span><span style={{fontWeight:"bold"}}>{data.totalRain}mm</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>雨量等级：</span><span style={{fontWeight:"bold"}}>{data.typeName}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>对应时间段：</span><span style={{fontWeight:"bold"}}>{data.timeSolt}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>站点类别：</span><span style={{fontWeight:"bold"}}>{data.sttp}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>运维单位：</span><span style={{fontWeight:"bold"}}>{data.company}</span>
-            </div>
-            <div style={{padding:"10px 15px 20px 15px"}}>
-              <span>电话：</span><span style={{fontWeight:"bold"}}>{data.phone}</span>
-            </div>
-            {/*<div style={{padding:"10px 15px"}}>
-              <span>站点位置：</span><span style={{fontWeight:"bold"}}>{data.address}</span>
-            </div>*/}
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(YbyjPlanPop);
diff --git a/src/views/Home/MapCtrl/Pops/RiskPop.js b/src/views/Home/MapCtrl/Pops/RiskPop.js
deleted file mode 100644
index 535c39f..0000000
--- a/src/views/Home/MapCtrl/Pops/RiskPop.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, { useState } from 'react'
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import "./YbyjPreviewPop.less"
-import {levelRender} from "../../../../utils/renutils";
-import appconsts from "../../../../service/appconsts";
-
-function RiskPop({ id, data, dispatch }) {
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 420;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">
-                <span style={{fontWeight:"bold"}}>{data.adnm}</span>
-                <span style={{fontSize:"13px"}}>（24H平均雨量：{data.av}mm）&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                <span style={{fontWeight:"bold"}}>
-                  {appconsts.yjLevel[data.maxLv]}
-                </span>
-                <span style={{position:"relative",top:"2px",left:"5px"}}>{levelRender(data.maxLv, 6)}</span>
-              </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div style={{margin:"15px 0 20px 20px"}}>
-              {
-                data.children && data.children.length>0?data.children.map((item, index)=>
-                  <>
-                    <div style={{padding:"10px 15px"}}>
-                      <span style={{display:"inline-block",width:"20px",height:"20px",lineHeight:"18px",background:"blue",borderRadius:"50%",color:"#fff",textAlign:"center",marginRight:"10px"}}>{index+1}</span>
-                      <span>名称：</span><span style={{fontWeight:"bold"}}>{item.adnm}</span>
-                    </div>
-                    <div style={{padding:"10px 15px 10px 45px"}}>
-                      <span>24H平均雨量：</span><span style={{fontWeight:"bold"}}>{item.av}mm</span>
-                    </div>
-                    <div style={{padding:"10px 15px 10px 45px"}}>
-                      <span>预警等级：</span>
-                      <span style={{fontWeight:"bold"}}>{appconsts.yjLevel[item.maxLv]}</span>
-                      <span style={{position:"relative",top:"4px",left:"6px"}}>{levelRender(item.maxLv, 6)}</span>
-                    </div>
-                  </>):null
-              }
-            </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(RiskPop);
diff --git a/src/views/Home/MapCtrl/Pops/SZPop.tsx b/src/views/Home/MapCtrl/Pops/SZPop.tsx
deleted file mode 100644
index a488c57..0000000
--- a/src/views/Home/MapCtrl/Pops/SZPop.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import React from 'react';
-import { RecordId, SZObject } from '../../../../models/_';
-import { Dispatch } from '../../../../models/store';
-
-
-const SZPop: React.FC<{
-  record: SZObject;
-  dispatch: Dispatch;
-  id: RecordId;
-  type: string;
-}> = ({ record, dispatch, id }) => {
-
-
-  return (
-    <>
-      <div className="boxhead"></div>
-      <div className="featuretip-title">
-        <div className="name">{record.gateName}</div>
-        <div style={{ flexGrow: 1 }}></div>
-        <div style={{ cursor: 'pointer', padding: '0 0.8rem' }} onClick={() => dispatch.runtime.closeFeaturePop(id)}>x</div>
-      </div>
-      <div style={{ maxHeight: '60rem', width: '20rem', padding: '0.5rem 1rem', overflowY: 'auto' }}>
-        <div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>水闸工程代码</div>
-          <div style={{ color: '#fff' }}>{record.gateCode}</div>
-        </div>
-        <div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>工程建设情况</div>
-          <div style={{ color: '#fff' }}>{record.engStat}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>工程等级</div>
-          <div style={{ color: '#fff' }}>{record.engGrad}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>更新或维修原因</div>
-          <div style={{ color: '#fff' }}>{record.updserRsn}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>更新或维修时间</div>
-          <div style={{ color: '#fff' }}>{record.updserDate}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>建成时间</div>
-          <div style={{ color: '#fff' }}>{record.compDate}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>实达流量(m³/s)</div>
-          <div style={{ color: '#fff' }}>{record.stfl}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>设计流量(m³/s)</div>
-          <div style={{ color: '#fff' }}>{record.dsfl}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>进口高程(m)</div>
-          <div style={{ color: '#fff' }}>{record.inEle}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>启闭设备类型</div>
-          <div style={{ color: '#fff' }}>{record.hdgrTp}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>动力类型</div>
-          <div style={{ color: '#fff' }}>{record.pwrTp}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>闸门尺寸(m)</div>
-          <div style={{ color: '#fff' }}>{record.gateSize}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>水闸类别</div>
-          <div style={{ color: '#fff' }}>{record.wagaType}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>闸孔数量</div>
-          <div style={{ color: '#fff' }}>{record.gaorNum}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>桩号</div>
-          <div style={{ color: '#fff' }}>{record.bnch}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>所在渠道</div>
-          <div style={{ color: '#fff' }}>{record.chanName}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>所属行政位置</div>
-          <div style={{ color: '#fff' }}>{record.adNamee}</div>
-        </div><div className="featuretip-prop-row">
-          <div style={{ color: '#ddd' }}>管理单位</div>
-          <div style={{ color: '#fff' }}>{record.engManName}</div>
-        </div>
-      </div>
-
-      <div className="boxfoot"></div>
-
-    </>
-  )
-}
-
-export default React.memo(SZPop);
diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu.js b/src/views/Home/MapCtrl/Pops/ShenLiu.js
deleted file mode 100644
index 8972b1a..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenLiu.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-
-import moment from "moment"
-
-function ShenLiu({ id, data, dispatch }) {
-  console.log(data);
-  const width = 780;
-  
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  return (
-    <>
-    <div style={{width:'100%',height:'100%',background:'#ffffff'}} className='dp-popup'>
-    <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title" style={{background:'f7f7f7',color: '#007AFD'}}>
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.damname}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-              渗流
-            </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-    </div>
-    </>
-  )
-}
-
-export default React.memo(ShenLiu);
diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/TableData.js b/src/views/Home/MapCtrl/Pops/ShenLiu/TableData.js
deleted file mode 100644
index 764e295..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenLiu/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-import moment from 'moment'
-
-
-const Tabledata = ({tableData}) => {
-  const columns = [
-    { title: '序号', key: '', dataIndex: '', align: 'center',width:'40px',render:(a,b,c)=>c+1},
-    { title: '数据时间', key: 'tm', dataIndex: 'tm', align: 'center',width:'200px',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: '渗流量', key: 'value', dataIndex: 'value', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
-  ];
-  
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{ y: "420px"}}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js b/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js
deleted file mode 100644
index a8487ff..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js
+++ /dev/null
@@ -1,173 +0,0 @@
-export default function drpOption(data,yjData) {
-  console.log("data",data);
-  const maxVal = 0//Math.max(...data.map(obj => obj.drp))
-  const max1 = Math.max(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)])
-  const min1 = Math.min(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)])
-  const max2 = Math.max(...data.map(obj => obj.rz))
-  const min2 = Math.min(...data.map(obj => obj.rz))
-  const yj = yjData?.map((item,index)=>{
-    return {
-      yAxisIndex: 0,
-      name: item.yjName,
-      type: 'line',
-      color: item.color,
-      lineStyle: {
-        type: "dashed",
-        width: 1,
-      },
-      data: data.map(o => item.value),
-      symbol: 'none', // 设置标记点为'none'，即去掉圆点
-      smooth: 0.5 
-    }
-  })
-
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-
-    },
-    grid: [
-      {
-        top: "12%",
-        left: "10%",
-        right: "8%",
-        width: '80%',
-        height: '75%'
-      },
-    ],
-    legend: {
-      top:'3%',
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ["流量"],
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: false,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          padding: [0, 0, 100, 0],
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.slice(0,10)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#d9d9d9',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: "流量(L/s)",
-        nameTextStyle: {
-          padding: [0, 0, 10, 10],
-          color:'#333333',
-          fontSize: 14
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#bfbfbf',
-            width: 0.5,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-          // lineStyle: {
-          //   color: '#8c8c8c',
-          //   width: 1,
-          // }
-        },
-        axisTick: {
-          show: false,
-        },
-        min: Math.floor(min1*0.8),
-        max: Math.ceil(max1*1.2),
-      },
-      // {
-      //   // gridIndex: 1,
-      //   type: 'value',
-      //   position: 'right',
-      //   name: "库水位(m)",
-      //   nameTextStyle: {
-      //     padding: [0, 0, 10, 10],
-      //     color:'#333333',
-      //     fontSize: 14
-      //   },
-      //   splitLine: {
-      //     show: false,
-      //     lineStyle: {
-      //       color: '#07a6ff',
-      //       width: 0.25,
-      //       type: 'dotted'
-      //     }
-      //   },
-      //   axisLabel: {
-      //     color: '#333',
-      //     fontSize: 12,
-      //   },
-      //   axisLine: {
-      //     show: false
-      //     // lineStyle: {
-      //     //   color: '#8c8c8c',
-      //     //   width: 1,
-      //     // }
-      //   },
-      //   axisTick: {
-      //     show: false,
-      //   },
-      //   min: Math.floor(min2*0.8),
-      //   max: Math.ceil(max2*1.2),
-      // }
-    ],
-    series: [
-      {
-        // xAxisIndex: 1,
-        // yAxisIndex: 0,
-        name: '流量',
-        type: 'line',
-        color: "#d6eaec",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.value),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      ...yj
-      // {
-      //   // xAxisIndex: 1,
-      //   yAxisIndex: 1,
-      //   name: '库水位',
-      //   type: 'line',
-      //   color: "#60a0f8",
-      //   lineStyle: {
-      //     // type: "dashed"
-      //   },
-      //   data:  data.map(o => o.rz),
-      //   symbol: 'none', // 设置标记点为'none'，即去掉圆点
-      //   smooth: 0.5 
-      // },
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/index.js b/src/views/Home/MapCtrl/Pops/ShenLiu/index.js
deleted file mode 100644
index 027314c..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenLiu/index.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { Descriptions, Form, Button, Input, DatePicker } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import ReactEcharts from 'echarts-for-react';
-import { httppost2 } from '../../../../../utils/request';
-import apiurl from '../../../../../service/apiurl';
-import moment from "moment"
-import ToolBar from './toolbar';
-import TableData from './TableData'
-import drpOption from './drpOption';
-
-function ShenLiu({ id, data, dispatch, onCancel }) {
-  console.log(data);
-  const [ tableData, setTableData ] = useState([])
-  const [ yjData, setYjData ] = useState([])
-  const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData])
-  const width = 780;
-  
-  const closePop = () => {
-    if(onCancel){
-      onCancel()
-    }
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const getData = async(tms,stationCode)=>{
-    const params = {
-      type: 2,
-      dateTimeRangeSo: {
-        start: moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'),
-      },
-      stationCode: stationCode
-    }
-    const { code, data} = await httppost2(apiurl.home.syslList,params)
-    if(code!==200){
-        return
-    }
-    setTableData(data)
-  }
-
-  const getYjData = async(stationCode)=>{
-    const params = {
-      "pageSo": {
-          "pageSize": 10,
-          "pageNumber": 1
-      },
-      "stationCode": stationCode
-    }
-
-    const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params)
-    if(code!==200){
-        return
-    }
-    const linshi = []
-    records?.map((item)=>{
-      if(item.status===0){
-        return
-      }
-      if(item.valueOne||0){
-        linshi.push({
-          yjName:item.level ===1?'黄色预警':'红色预警', 
-          value:item.valueOne,
-          color:item.level ===1?'#f1bf42':'red'
-        })
-      }
-      if(item.valueTwo||0){
-        linshi.push({
-          yjName:item.level ===1?'黄色预警':'红色预警', 
-          value:item.valueTwo,
-          color:item.level ===1?'#f1bf42':'red'
-        })
-      }
-    })
-    setYjData(linshi)
-  }
-
-  useEffect(()=>{
-    getYjData(data.stationCode)
-    getData([moment().add(-1,'months'),moment()],data.stationCode)
-  },[])
-
-  return (
-    <>
-      <div className="normalModalStyle homeModal1">
-          <div className="normalModalStyle_title">
-              <div className="normalModalStyle_title_icon"></div>
-              {data.stationCode}
-              <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-          </div>
-
-          <div style={{padding:'0 20px'}}>
-            <ToolBar search={(tms)=>getData(tms,data.stationCode)}/>
-          </div>
-          <div className='homeModal1_content'>
-                <div className='homeModal1_content_lf'>
-                    <TableData tableData={tableData}/>
-                </div>
-                <div className='homeModal1_content_rf'>
-                    {
-                        tableData.length>0?
-                        <ReactEcharts option={option} style={{width: "100%", height: '100%'}}/>
-                        :<div style={{textAlign: "center", margin: "10%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-                    }
-                </div>
-          </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(ShenLiu);
diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js b/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js
deleted file mode 100644
index 4262b77..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Form, message, Button, DatePicker } from 'antd';
-import NormalSelect from '../../../../../components/Form/NormalSelect'
-import moment from "moment"
-const { RangePicker } = DatePicker;
-
-const cysd = [
-    { label:'今日',value:'今日',tms:[moment().format('YYYY-MM-DD 00:00:00'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-    { label:'近一周',value:'近一周',tms:[moment().add(-7,'days').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-    { label:'近一月',value:'近一月',tms:[moment().add(-1,'months').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-    { label:'近三月',value:'近三月',tms:[moment().add(-3,'months').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-    { label:'近一年',value:'近一年',tms:[moment().add(-1,'years').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-  ]
-
-const ToolBar = ({search, defaultParams}) => {
-    const [form] = Form.useForm();
-
-    const onFinish = (val)=>{
-        search(val.tms)
-    }
-
-    return (
-        <>
-            <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-                <Form.Item label="时间段" name="tms">
-                    <RangePicker
-                        allowClear={false}
-                        defaultValue={[moment().add(-1,'months'),moment()]}
-                        onChange={(e)=>{
-                            form.setFieldValue('cysd',null)
-                        }}
-                        style={{ width: "380px" }}
-                        format="YYYY-MM-DD HH:mm:ss"
-                    />
-                </Form.Item>
-                <Form.Item 
-                    label="常用时段"
-                    name='cysd'
-                >
-                    <NormalSelect options={cysd} style={{ width: '180px' }} onChange={(e,data)=>{
-                        if(e==='今天08:00~当前时间'&& moment().format('HH')<8){
-                            return message.error('请在08:00后选择')
-                        }
-                        form.setFieldValue('tms',[moment(data.tms[0]),moment(data.tms[1])])
-                    }}/>
-                </Form.Item>
-                <Form.Item>
-                    <Button type="primary" htmlType="submit">查询</Button>
-                </Form.Item>
-                <Form.Item>
-                    <Button  htmlType="submit">导出</Button>
-                </Form.Item>
-            </Form>
-        </>
-    );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/TableData.js b/src/views/Home/MapCtrl/Pops/ShenYa/TableData.js
deleted file mode 100644
index 2e95ff1..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenYa/TableData.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-import moment from 'moment'
-
-
-const Tabledata = ({tableData}) => {
-  const columns = [
-    { title: '序号', key: '', dataIndex: '', align: 'center',render:(a,b,c)=>c+1},
-    { title: '时间', key: 'tm', dataIndex: 'tm', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: '管水位(m)', key: 'value', dataIndex: 'value', align: 'center',render: (rec) => <span>{rec ?? "-"}</span>},
-  ];
-  
-  return (
-    <>
-      <Table rowKey="tm"
-             sticky 
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{ y: "420px"}}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js b/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js
deleted file mode 100644
index c7f062f..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js
+++ /dev/null
@@ -1,173 +0,0 @@
-export default function drpOption(data,yjData) {
-  console.log("data",data);
-  const maxVal = 0//Math.max(...data.map(obj => obj.drp))
-  const max1 = Math.max(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)])
-  const min1 = Math.min(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)])
-  const max2 = Math.max(...data.map(obj => obj.rz))
-  const min2 = Math.min(...data.map(obj => obj.rz))
-  
-  const yj = yjData?.map((item,index)=>{
-    return {
-      yAxisIndex: 0,
-      name: item.yjName,
-      type: 'line',
-      color: item.color,
-      lineStyle: {
-        type: "dashed",
-        width: 1,
-      },
-      data: data.map(o => item.value),
-      symbol: 'none', // 设置标记点为'none'，即去掉圆点
-      smooth: 0.5 
-    }
-  })
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-
-    },
-    grid: [
-      {
-        top: "12%",
-        left: "5%",
-        right: "5%",
-        width: '90%',
-        height: '75%'
-      },
-    ],
-    legend: {
-      top:'3%',
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ["压测管水位", "库水位"],
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: false,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          padding: [0, 0, 100, 0],
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.slice(0,10)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: "压测管水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, 10, 10],
-          color:'#333333',
-          fontSize: 14
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#bfbfbf',
-            width: 0.5,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          // show: false
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        min: Math.floor(min1*0.8),
-        max: Math.ceil(max1*1.2),
-      },
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'right',
-        name: "库水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, 10, 10],
-          color:'#333333',
-          fontSize: 14
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          // show: false
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        min: Math.floor(min2*0.8),
-        max: Math.ceil(max2*1.2),
-      }
-    ],
-    series: [
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 0,
-        name: '压测管水位',
-        type: 'line',
-        color: "#d6eaec",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.value),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '库水位',
-        type: 'line',
-        color: "#60a0f8",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.rz),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      ...yj
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/index.js b/src/views/Home/MapCtrl/Pops/ShenYa/index.js
deleted file mode 100644
index 39a13b8..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenYa/index.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { Descriptions, Form, Button, Input, DatePicker } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import ReactEcharts from 'echarts-for-react';
-import { httppost2 } from '../../../../../utils/request';
-import apiurl from '../../../../../service/apiurl';
-import moment from "moment"
-import ToolBar from './toolbar';
-import TableData from './TableData'
-import drpOption from './drpOption';
-import '../TangYanBa.less'
-
-function ShenYa({ id, data, dispatch, onCancel }) {
-  console.log('SY',data);
-  const [ tableData, setTableData ] = useState([])
-  const [ yjData, setYjData ] = useState([])
-  const [ tabVal, setTabVal ] = useState('1')
-  const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData])
-  const width = 780;
-  
-  const closePop = () => {
-    if(onCancel){
-      onCancel()
-    }
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const getData = async(tms,stationCode)=>{
-    const params = {
-      // type: 2,
-      dateTimeRangeSo: {
-        start: moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'),
-      },
-      stationCode: stationCode
-    }
-    
-    const { code, data} = await httppost2(apiurl.home.syslList,params)
-    if(code!==200){
-        return
-    }
-    setTableData(data)
-  }
-
-  const getYjData = async(stationCode)=>{
-    const params = {
-      "pageSo": {
-          "pageSize": 10,
-          "pageNumber": 1
-      },
-      "stationCode": stationCode
-    }
-
-    const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params)
-    if(code!==200){
-        return
-    }
-    const linshi = []
-    records?.map((item)=>{
-      if(item.status===0){
-        return
-      }
-      if(item.valueOne||0){
-        linshi.push({
-          yjName:item.level ===1?'黄色预警':'红色预警', 
-          value:item.valueOne,
-          color:item.level ===1?'#f1bf42':'red'
-        })
-      }
-      if(item.valueTwo||0){
-        linshi.push({
-          yjName:item.level ===1?'黄色预警':'红色预警', 
-          value:item.valueTwo,
-          color:item.level ===1?'#f1bf42':'red'
-        })
-      }
-    })
-    setYjData(linshi)
-  }
-
-  useEffect(()=>{
-    getYjData(data.stationCode)
-    getData([moment().add(-1,'months'),moment()],data.stationCode)
-  },[])
-
-  return (
-    <>
-      <div className="normalModalStyle homeModal2">
-          <div className="normalModalStyle_title">
-              <div className="normalModalStyle_title_icon"></div>
-              {data.stationCode}
-              <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-          </div>
-
-          <div style={{padding:'0 20px'}}>
-            <ToolBar search={(tms)=>getData(tms,data.stationCode)} setTabVal={setTabVal}/>
-          </div>
-          <div className='homeModal2_content' >
-              {
-                  tabVal==='1'?
-                    tableData.length>0?
-                    <ReactEcharts option={option} style={{width: "100%", height: '100%'}}/>
-                    :<div style={{textAlign: "center", margin: "10%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-                    :null
-              }
-              {
-                  tabVal==='2'?<div style={{marginTop:'10px'}}><TableData tableData={tableData}/></div>:null
-              }
-          </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(ShenYa);
diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js b/src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js
deleted file mode 100644
index f2a56ec..0000000
--- a/src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Form, Input, Radio, DatePicker } from 'antd';
-import NormalSelect from '../../../../../components/Form/NormalSelect'
-import { useEffect, useState } from 'react';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({search, setTabVal}) => {
-
-    const onFinish = (val)=>{
-        search(val)
-    }
-
-
-
-    return (
-        <>
-            <Form className='toolbarBox' layout="inline" onFinish={onFinish}>
-                <Form.Item label="时间段" name="imgName">
-                    <RangePicker
-                        allowClear={false}
-                        defaultValue={[moment().add(-1,'months'),moment()]}
-                        onChange={onFinish}
-                        style={{ width: "300px" }}
-                        format="YYYY-MM-DD"
-                    />
-                </Form.Item>
-                <Form.Item style={{marginLeft:'200px'}}>
-                    <Radio.Group onChange={(e)=>{setTabVal(e.target.value)}} defaultValue="1" size="large" buttonStyle="outline">
-                        <Radio.Button value="1">数据图</Radio.Button>
-                        <Radio.Button value="2">数据表</Radio.Button>
-                    </Radio.Group>
-                </Form.Item>
-            </Form>
-        </>
-    );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/ShuiDianZhanPop.js b/src/views/Home/MapCtrl/Pops/ShuiDianZhanPop.js
deleted file mode 100644
index 3b95df3..0000000
--- a/src/views/Home/MapCtrl/Pops/ShuiDianZhanPop.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions,Tabs } from 'antd';
-import moment from "moment"
-import { CloseOutlined } from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import './TangYanBa.less'
-import SdzJbxx from '../components/sdz/jbxx'
-import SdzZrr from '../components/sdz/zrr'
-import SdzGctp from '../components/sdz/gctp'
-import SdzFxya from '../components/sdz/fxya'
-import SdzSjzl from '../components/sdz/sjzl'
-
-
-function ShuiDianZhanPop({ id, data, dispatch }) {
-  const [keys, setKeys] = useState(1)
-  console.log("data",data);
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const TabList = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计资料',
-    },
-  ]
-  const onChange = (key) => {
-    setKeys(key)
-  }
-  const width = 780;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background: '#ffffff', transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.hystName}
-              </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{ color: "#333" }} />
-              </div>
-            </div>
-            <div style={{ padding: '5px', display: 'flex' }}>
-              <Tabs
-                defaultActiveKey="1"
-                type="card"
-                onChange={onChange}
-                tabPosition='left'
-                items={TabList}
-              />
-
-              <div style={{backgroundColor:'#fff',overflowY:'auto',height:420,padding:'0 5px 5px 5px'}}>
-                {keys == 1 && <SdzJbxx data={data} />}
-                {keys == 3 && <SdzZrr data={data} />}
-                {keys == 6 && <SdzGctp data={data} />}
-                {keys == 7 && <SdzFxya data={data} />}
-                {keys == 8 && <SdzSjzl data={data} />}
-
-
-                {/* <Descriptions bordered size="small" column={2}>
-                  <Descriptions.Item label="电站名称">{data.hystName}</Descriptions.Item>
-                  <Descriptions.Item label="电站编码">{data.hystCode}</Descriptions.Item>
-                  <Descriptions.Item label="行政主管单位">{data.managName}</Descriptions.Item>
-                  <Descriptions.Item label="工程类别">{data.engType}</Descriptions.Item>
-                  <Descriptions.Item label="经度">{data.hystLong}</Descriptions.Item>
-                  <Descriptions.Item label="纬度">{data.hystLat}</Descriptions.Item>
-                  <Descriptions.Item label="运营单位" >{data.opName}</Descriptions.Item>
-                  <Descriptions.Item label="行政区划" >{data.adnm}</Descriptions.Item>
-                  <Descriptions.Item label="总装机容量(万kW)" >{data.totInsCap}</Descriptions.Item>
-                  <Descriptions.Item label="建成年份">{data.year}</Descriptions.Item>
-                  <Descriptions.Item label="工程概况">{data.projOverview}</Descriptions.Item>
-                  <Descriptions.Item label="开发方式">{data.deveTp}</Descriptions.Item>
-                  <Descriptions.Item label="多年平均发电量(GW·h)">{data.avgElectGene}</Descriptions.Item>
-                  <Descriptions.Item label="工程状态">{{ '0': '在建', '1': '已建' }[data.engStat]}</Descriptions.Item>
-                  <Descriptions.Item label="开工时间">{data.startDate}</Descriptions.Item>
-                  <Descriptions.Item label="正常蓄水位库容(万m³)">{data.normPoolStagCap}</Descriptions.Item>
-                  <Descriptions.Item label="生态流量(m³/s)">{data.ecoFlow}</Descriptions.Item>
-                  <Descriptions.Item label="所在水系">{data.wsName}</Descriptions.Item>
-                  <Descriptions.Item label="所在干流">{data.msName}</Descriptions.Item>
-                  <Descriptions.Item label="所在支流">{data.tsName}</Descriptions.Item>
-                  <Descriptions.Item label="所有制情况">{data.ownership}</Descriptions.Item>
-                  <Descriptions.Item label="厂房地点">{data.plantLoc}</Descriptions.Item>
-                  <Descriptions.Item label="坝址">{data.damLoc}</Descriptions.Item>
-                </Descriptions> */}
-              </div>
-            </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(ShuiDianZhanPop);
diff --git a/src/views/Home/MapCtrl/Pops/ShuikuPop.js b/src/views/Home/MapCtrl/Pops/ShuikuPop.js
deleted file mode 100644
index d6e8193..0000000
--- a/src/views/Home/MapCtrl/Pops/ShuikuPop.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import moment from "moment"
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import { Modal, Tabs } from 'antd';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import Spjc from "../components/Spjc";
-import Txjc from "../components/Txjc";
-import Skssjc from "../components/Skssjc";
-import Sksjcx from "../components/Sksjcx";
-import {reservoirlist, reswarn} from "../../../../service/sssq";
-import './TangYanBa.less'
-
-
-
-function ShuikuPop({ id, data, dispatch }) {
-  const [picData, setPicData] = useState({});
-  const [damGraph, setDamGraph] = useState();
-  const [tableData, setTableData] = useState([])
-
-  const getData = async (params) => {
-    setTableData(await reservoirlist(params));
-  }
-  
-  useEffect(() => {
-    if (data.url && data.url.length > 1) {
-      setPicData({
-        pic1: data.url[0]?.imgPath,
-        pic2: data.url[1]?.imgPath,
-        pic1Tm: moment(data.url[0]?.tm).format('YYYY-MM-DD HH:mm:ss'),
-        pic2Tm: moment(data.url[1]?.tm).format('YYYY-MM-DD HH:mm:ss'),
-      });
-    } else if (data.url && data.url.length == 1) {
-      setPicData({
-        pic1: data.url[0]?.imgPath,
-        pic1Tm: moment(data.url[0]?.tm).format('YYYY-MM-DD HH:mm:ss'),
-      });
-    }
-
-  }, [data]);// eslint-disable-line
- 
-  useEffect(() => {
-    const img = genDamImage(data, 400, 260)
-    setDamGraph(img);
-  }, [data]);// eslint-disable-line
-
-  useEffect(() => {
-    let option = {
-      sources: ["SW", "SK"],
-      args: "",
-    };
-    getData(option)
-  }, [])
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const width = 1050;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, width,left: 0,height:646, lineHeight: 1,backgroundColor:'#fff',borderRadius:'10px'}}>
-        <div className="dp-popup-content" style={{height:'100%',borderRadius:'10px'}}>
-          <div className="content-body tyb skpop" id='tyb' style={{ height: '100%' }}>
-            <div className="normalModalStyle" style={{borderRadius:10}}>
-           <div className="normalModalStyle_title" style={{marginBottom:0}}>
-                        <div className="normalModalStyle_title_icon"></div>
-                        <span>{data?.name}&emsp;</span>
-                        {data?.sttp &&
-            <span style={
-              { 
-                display:"inline-block",
-                padding: "5px 10px",
-                color: "#74a7ff",
-                border: "1px solid #74a7ff",
-                borderRadius: "5px"
-              }
-            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}（{{'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}?.[data.source]}）</span>}
-                        <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-                </div>
-              </div>
-          <div style={{paddingLeft:15}}>
-          <Tabs defaultActiveKey="1">
-          <Tabs.TabPane tab="实时监测" key="1">
-            <Skssjc data={{...data,...tableData[0]}}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="数据查询" key="2">
-            <Sksjcx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="图像监测" key="3">
-            <Txjc record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="视频监测" key="4">
-            <Spjc record={data}/>
-          </Tabs.TabPane>
-        </Tabs>
-          </div>
-          </div>
-            </div >
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(ShuikuPop);
diff --git a/src/views/Home/MapCtrl/Pops/ShuikuPop2.js b/src/views/Home/MapCtrl/Pops/ShuikuPop2.js
deleted file mode 100644
index 2bc4397..0000000
--- a/src/views/Home/MapCtrl/Pops/ShuikuPop2.js
+++ /dev/null
@@ -1,194 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import clsx from 'clsx';
-import moment from "moment"
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import { Modal, Tabs } from 'antd';
-import { renderDrp, renderSkArz, renderSkDdz } from '../../../../utils/renutils';
-import { imageHistoryInformationApi } from '../../../../service/image';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import DrpSearch from '../components/DrpSearch';
-import RzSearch from '../components/RzSearch';
-import SkImgSearch from '../components/SkImgSearch';
-import SkInfoPage from '../components/SkInfo';
-import SummarizeReservoirWaterRegime from "../../../../components/summarizeReservoirWaterRegime";
-import appconsts from '../../../../service/appconsts';
-import DrpStAround from "../components/DrpStAround";
-import Spjc from "../components/Spjc";
-import Txjc from "../components/Txjc";
-import Skssjc from "../components/Skssjc";
-import Sksjcx from "../components/Sksjcx";
-import Skjcxx from "../components/Skjcxx";
-import {stType} from "../../../../utils/dictType";
-
-function ShuikuPop2({ id, data, dispatch }) {
-  console.log("ShuikuPop2",data);
-
-  const [visible, setVisible] = useState(false);
-
-  const [picData, setPicData] = useState({});
-  const [damGraph, setDamGraph] = useState();
-  const [picidx, setpicidx] = useState([1, 2]);
-  const [hzsksqVisible, setHzsksqVisible] = useState(false);
-
-
-  const viewInfo = () => {
-    //dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: data })
-    setVisible(true);
-  }
-
-
-  useEffect(() => {
-
-      if (data.url&&data.url.length>1) {
-        setPicData({
-          pic1: data.url[0]?.imgPath,
-          pic2: data.url[1]?.imgPath,
-          pic1Tm: moment(data.url[0]?.tm).format('YYYY-MM-DD HH:mm:ss'),
-          pic2Tm: moment(data.url[1]?.tm).format('YYYY-MM-DD HH:mm:ss'),
-        });
-      }else if(data.url&&data.url.length==1){
-        setPicData({
-          pic1: data.url[0]?.imgPath,
-          pic1Tm: moment(data.url[0]?.tm).format('YYYY-MM-DD HH:mm:ss'),
-        });
-      }
-
-  }, [data]);// eslint-disable-line
-
-  useEffect(() => {
-    const img = genDamImage(data, 400, 260)
-    setDamGraph(img);
-  }, [data]);// eslint-disable-line
-
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 550;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '20px', left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.stnm}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-              <div className="cursor-pointer3" onClick={viewInfo}>详情 </div>
-            </div>
-
-            <div style={{display:'flex',flexDirection:'row'}}>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>站点编码：</span><span style={{fontWeight:"bold", color:"#0893FF"}}>{data.stcd}</span>
-              </div>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>站点类型：</span><span style={{fontWeight:"bold"}}>{stType(data.sttp)}{
-                  data?.source === "SH" ? "（山洪）" :
-                    data.source === "SK" ? "（水库）": "（水文）"
-                }</span>
-              </div>
-            </div>
-
-            <div style={{display:'flex',flexDirection:'row'}}>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>实时水位：</span><span style={{fontWeight:"bold"}}>{data.rz?.toFixed(2)}m</span>
-              </div>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>设计洪水位：</span><span style={{fontWeight:"bold"}}>{data.desFloodLev}m</span>
-              </div>
-            </div>
-
-            <div style={{display:'flex',flexDirection:'row'}}>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>正常蓄水位：</span><span style={{fontWeight:"bold"}}>{data.normWatLev}m</span>
-              </div>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>汛限水位：</span><span style={{fontWeight:"bold"}}>{data.flLowLimLev}m</span>
-              </div>
-            </div>
-              
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>死水位：</span><span style={{fontWeight:"bold"}}>{data.deadLev}m</span>
-              </div>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>上报时间：</span><span style={{fontWeight:"bold"}}>{data.tm}</span>
-              </div>
-              <div style={{padding:"10px 15px",width:'50%'}}>
-                <span>站址：</span><span style={{fontWeight:"bold"}}>{data.stlc}</span>
-              </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-      {/*雨量查询弹窗*/}
-      <Modal
-        visible={visible}
-        footer={null}
-        width={1050}
-        // title={data.stnm}
-        title={
-          <>
-            <span>{data.stnm}&emsp;</span>
-            {data?.sttp &&
-            <span style={
-              { 
-                display:"inline-block",
-                padding: "5px 10px",
-                color: "#74a7ff",
-                border: "1px solid #74a7ff",
-                borderRadius: "5px"
-              }
-            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}（{{'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}?.[data.source]}）</span>}
-          </>
-        }
-        className="queryDrpModal"
-        destroyOnClose
-        onCancel={()=>setVisible(false)}>
-        <Tabs defaultActiveKey="1">
-          <Tabs.TabPane tab="实时监测" key="1">
-            <Skssjc data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="数据查询" key="2">
-            <Sksjcx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="基础信息" key="3">
-            <Skjcxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="图像监测" key="4">
-            <Txjc record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="视频监测" key="5">
-            <Spjc record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="周边雨情" key="6">
-            <DrpStAround data={data}/>
-          </Tabs.TabPane>
-        </Tabs>
-      </Modal>
-
-      {/*汇总水库水情弹窗 */}
-      <Modal
-        visible={hzsksqVisible}
-        title="汇总水库水情"
-        footer={null}
-        onCancel={()=>{setHzsksqVisible(false);}}
-        width="99vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        <SummarizeReservoirWaterRegime />
-      </Modal>
-    </>
-  )
-}
-
-export default React.memo(ShuikuPop2);
diff --git a/src/views/Home/MapCtrl/Pops/ShyjPop.js b/src/views/Home/MapCtrl/Pops/ShyjPop.js
deleted file mode 100644
index 38b1a9e..0000000
--- a/src/views/Home/MapCtrl/Pops/ShyjPop.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions, Tooltip, Modal, Tabs } from 'antd';
-import moment from "moment"
-import {CloseOutlined} from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import Jcxx from "../components/Shyj/jcxx";
-import Yjpzxx from "../components/Shyj/yjpzxx"
-import Yjfsjl from "../components/Shyj/yjfsjl"
-
-import './TangYanBa.less'
-
-function ShyjPop({ id, data, dispatch }) {
-
-    const [visible,setVisible] = useState(false)
-
-    console.log('shuj',data);
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 580; 
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.adnm}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-              <div className="cursor-pointer3" onClick={()=>{setVisible(true)}}>详情 </div>
-            </div>
-
-            <div style={{padding:'10px'}}>
-                <Descriptions size="small" column={4}>
-                    <Descriptions.Item label="危险等级" span={4}>{{1: '警戒水位',2: '危险水位',3: '警戒雨量',4: '危险雨量',5: '准备转移',6: '立即转移'}[data.warngradeid]}</Descriptions.Item>
-                    <Descriptions.Item label="预警依据" span={4}>
-                      <div style={{maxHeight:'200px',overflowY:'scroll'}}>
-                        {data.warndesc}
-                      </div>
-                        {/* <Tooltip title={data.warndesc}>
-                                {data.warndesc.substring(0, 100)}
-                                {data.warndesc.length>100?'...':''}
-                        </Tooltip> */}
-                    </Descriptions.Item>
-                    <Descriptions.Item label="预警时间" span={4}>{data.warnstm}</Descriptions.Item>
-                </Descriptions>
-            </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-
-
-      {/*预警 */}
-      <Modal
-        visible={visible}
-        title={data.adnm}
-        footer={null}
-        onCancel={()=>{setVisible(false)}}
-        width="60vw"
-        destroyOnClose
-        className="queryDrpModal"
-        style={{top:"15px", height:"58vh"}}
-      >
-        <Tabs defaultActiveKey="1">
-          <Tabs.TabPane tab="基础信息" key="1">
-            <Jcxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="预警配置信息" key="2">
-            <Yjpzxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="预警发送记录" key="3">
-            <Yjfsjl record={data}/>
-          </Tabs.TabPane>
-        </Tabs>
-      </Modal>
-    </>
-  )
-}
-
-export default React.memo(ShyjPop);
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/TableData.js b/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/TableData.js
deleted file mode 100644
index 55bc614..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center'},
-    {title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/drpOption.js b/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/drpOption.js
deleted file mode 100644
index 09db31b..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/drpOption.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  const maxVal = Math.ceil(Math.max(...data.map(obj => obj.rz)))
-  const minVal = Math.floor(Math.min(...data.map(obj => obj.rz)))
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-  
-
-
-  let arr =[]
-  data.forEach(item=>{
-    console.log(data);
-    arr.push([item.w,item.rz])
-  })
-  // console.log(GetInterval(minValX,maxValX),'jhsdjkashdjkahjk');
-  return {
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "15%",
-        right: "15%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "库容(万m³)",
-        nameGap: 5,
-        type: 'value',
-        min:Math.floor(minValX / 5)  *5,
-        max:Math.ceil(maxValX / 5)  *5,
-        interval:GetInterval(minValX,maxValX),
-        data: data.map(o => o.w),
-        splitLine: {
-          show: false
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        minInterval:1,
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        smooth: true
-      },
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.css b/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.css
deleted file mode 100644
index 25610b6..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.swllgx-sq .content {
-  display: flex;
-  justify-content: space-between;
-}
-.swllgx-sq .content .content-left1 {
-  width: 50%;
-  height: 100%;
-  border: 1px solid #f0f0f0;
-  overflow: auto;
-}
-.swllgx-sq .content .content-right1 {
-  width: 50%;
-  height: 100%;
-}
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.js b/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.js
deleted file mode 100644
index 43a1ba7..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-import {zvarl} from "../../../../../../service/sssq";
-
-function Krqx({record}) {
-  const [data,setData]=useState([])
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  const getData=async (params)=>{
-    setData(await zvarl(params))
-  }
-  useEffect(() => {
-    getData({stcd:record.stcd})
-  }, [record]);
-
-
-  return (
-    <div style={{width: "98%",height:'100%'}} className="swllgx-sq">
-      <div className="content" style={{height:'100%'}} >
-        <div className="content-left1">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right1">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default Krqx
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.less b/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.less
deleted file mode 100644
index 996f1a2..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/Krqx/index.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left1{
-      width: 50%;
-      // max-height: 60vh;
-      height: 100%;
-      border:1px solid #f0f0f0;
-      overflow: auto;
-    }
-    .content-right1{
-      width: 50%;
-      height: 100%;
-      // height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/fxya.js b/src/views/Home/MapCtrl/Pops/Skjcxx/fxya.js
deleted file mode 100644
index af19f87..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/fxya.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {plan} from "../../../../../service/sssq";
-
-
-function Fxya({record}) {
-
-  const [data, setData] = useState({})
-  const getData = async (params) => {
-    let obj = await plan(params)
-    if(obj.lenght){
-      setData(obj[0])
-    }
-  }
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions column={3} bordered >
-        <Descriptions.Item label="是否编制"
-                           style={{width: "16.5%"}}>{data.preparation == 1 ? "是" : data.preparation == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data.approval == 1 ? "是" : data.approval == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="编制时间" style={{width: "16.5%"}}>{data.prepTime}</Descriptions.Item>
-        <Descriptions.Item label="批复时间">{data.apprTime}</Descriptions.Item>
-        <Descriptions.Item label="编制单位">{data.prepOrg}</Descriptions.Item>
-        <Descriptions.Item label="批复部门">{data.apprOrg}</Descriptions.Item>
-        <Descriptions.Item label="预案文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data.apprName}</span>
-        </Descriptions.Item>
-        <Descriptions.Item label="批复文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data.planName}</span>
-        </Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Fxya;
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/gctp.js b/src/views/Home/MapCtrl/Pops/Skjcxx/gctp.js
deleted file mode 100644
index 895de91..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/gctp.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {projectimg, fileget} from "../../../../../service/sssq";
-import {projDict} from "../../../../../utils/dictType"
-
-
-function Gctp({record}) {
-  const [data, setData] = useState([])
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const getData = async (params) => {
-    setData(await projectimg(params))
-  }
-
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered layout="vertical" column={3}>
-        {
-          data.length > 0 ? data.map(o => <Descriptions.Item label={projDict(o.projType)}>
-              <div className="no-data">
-                <img src={url + o.filePath} style={{width: "100%"}} alt=""/>
-              </div>
-            </Descriptions.Item>
-            )
-            : ""
-        }
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Gctp;
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/index.js b/src/views/Home/MapCtrl/Pops/Skjcxx/index.js
deleted file mode 100644
index bc265cc..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { Tabs} from "antd";
-import Jbxx from './jbxx'
-import Krqx from './Krqx'
-import Zrtx from './zrtx'
-import Jzw from './jzw'
-import Jsxx from './jsxx'
-import Gctp from './gctp'
-import Fxya from './fxya'
-import Sjbg from './sjbg'
-
-
-
-function Skjcxx({data}) {
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <>
-      <div>
-        <Tabs defaultActiveKey="1" tabPosition="left" type="card">
-          <Tabs.TabPane tab="基本信息" key="1">
-            <Jbxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="库容曲线" key="2">
-            <Krqx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="责任体系" key="3">
-            <Zrtx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建筑物" key="4">
-            <Jzw record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建设信息" key="5">
-            <Jsxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="工程图片" key="6">
-            <Gctp record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="防汛预案" key="7">
-            <Fxya record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="设计报告" key="8">
-            <Sjbg record={data}/>
-          </Tabs.TabPane>
-
-
-        </Tabs>
-      </div>
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/jbxx.js b/src/views/Home/MapCtrl/Pops/Skjcxx/jbxx.js
deleted file mode 100644
index fd88837..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/jbxx.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {attResBase} from '../../../../../service/sssq'
-import {engScalDict} from '../../../../../utils/dictType'
-import moment from 'moment'
-
-
-
-function Skjcxx({data}) {
-  const [info,setInfo]=useState({})
-  const getData=async (params)=>{
-    setInfo(await attResBase(params))
-  }
-  useEffect(() => {
-    getData({resCode:data.resCode})
-  }, [data]);
-
-  return (
-    <>
-      <Descriptions bordered size="small" column={3}>
-        <Descriptions.Item label="水库名称" style={{ width: '16.5%' }}>{info?.resName}</Descriptions.Item>
-        <Descriptions.Item label="所在地" style={{ width: '16.5%' }}>{info?.resLoc}</Descriptions.Item>
-        <Descriptions.Item label="管理单位" style={{ width: '16.5%' }}>{info?.managName}</Descriptions.Item>
-        <Descriptions.Item label="水库代码">{info.resCode}</Descriptions.Item>
-        <Descriptions.Item label="注册登记号">{info.regSn}</Descriptions.Item>
-        <Descriptions.Item label="注册登记时间">{moment(info.regTime).format('YYYY-MM-DD')}</Descriptions.Item>
-        <Descriptions.Item label="经度">{info.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{info.lttd}</Descriptions.Item>
-        <Descriptions.Item label="高程基准面">{info.elevDat}</Descriptions.Item>
-        <Descriptions.Item label="所在流域">{info.basName}</Descriptions.Item>
-        <Descriptions.Item label="所在水系">{info.wsName}</Descriptions.Item>
-        <Descriptions.Item label="所在河流名称">{info.rvName}</Descriptions.Item>
-        <Descriptions.Item label="工程规模">{engScalDict(info.engScal)}</Descriptions.Item>
-        <Descriptions.Item label="水库功能">{info.rsvFunction}</Descriptions.Item>
-        <Descriptions.Item label="溢洪道是否有闸">{info.spillwayGate==1?"有":info.spillwayGate==0?"无":""}</Descriptions.Item>
-        <Descriptions.Item label="水库特征参数" span={3}></Descriptions.Item>
-        <Descriptions.Item label="坝址以上控制流域面积(km²)">{info.watShedArea}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)">{info.crestElev}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{info.maxDamHeig}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{info.calFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万m³)">{info.totCap}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水时最大下泄流量(m³/s)">{info.maxDesFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{info.desFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="调洪库容(万m³)">{info.storFlCap}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水时最大下泄流量(m³/s)">{info.maxCalFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="防洪高水位(m)">{info.uppLevFlco}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万m³)">{info.flcoCap}</Descriptions.Item>
-        <Descriptions.Item label="下游河道安全流量(m³/s)">{info.dsSaftFlow}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{info.normWatLev}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万m³)">{info.benResCap}</Descriptions.Item>
-        <Descriptions.Item label="主汛期汛限水位(m)">{info.flLowLimLev}</Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{info.deadLev}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万m³)">{info.deadCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="工程概况" span={3}>{info.projOverview}</Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/jsxx.js b/src/views/Home/MapCtrl/Pops/Skjcxx/jsxx.js
deleted file mode 100644
index da943f7..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/jsxx.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {construction} from "../../../../../service/sssq";
-
-
-
-function Jsxx({record}) {
-
-  const columns = [
-    {title: '状态', key: '', dataIndex: '', align: 'center',render:rec=>rec.engStat==0?"始建":rec.engStat==1?"扩建":""},
-    {title: '工程开工时间', key: 'startDate', dataIndex: 'startDate', align: 'center'},
-    {title: '投入使用时间', key: 'useDate', dataIndex: 'useDate', align: 'center'},
-    {title: '竣工验收时间', key: 'compDate', dataIndex: 'compDate', align: 'center'},
-    {title: '改扩建内容', key: 'content', dataIndex: 'content', align: 'center'},
-    {title: '第几次扩建', key: 'buildNo', dataIndex: 'buildNo', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await construction(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Jsxx;
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/jzw.js b/src/views/Home/MapCtrl/Pops/Skjcxx/jzw.js
deleted file mode 100644
index cf22bc6..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/jzw.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions,Table} from "antd";
-import {drainage,dam,transport} from "../../../../../service/sssq";
-
-
-
-function Jzw({record}) {
-
-  const columns1 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns2 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启用标准', key: 'enableCriteria', dataIndex: 'enableCriteria', align: 'center'},
-  ];
-  const columns3 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '洞(孔)身型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '数量(条或孔)', key: 'num', dataIndex: 'num', align: 'center'},
-    {title: '进口底槛高程(m)', key: 'inletEle', dataIndex: 'inletEle', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns4 = [
-    {title: '设计流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '输水道型式', key: 'transType', dataIndex: 'transType', align: 'center',},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '输水道长度(m)', key: 'transLeng', dataIndex: 'transLeng', align: 'center'},
-    {title: '座教', key: 'num', dataIndex: 'num', align: 'center'},
-  ];
-
-  const [tableDataDs, setTableDataDs] = useState([])
-  const [tableDataXs, setTableDataXs] = useState({})
-  const [tableDataSs, setTableDataSs] = useState([])
-
-  const getData=async (params)=>{
-    setTableDataDs(await dam(params))
-    setTableDataXs(await drainage(params))
-    setTableDataSs(await transport(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <div style={{maxHeight:"60vh",overflow:"auto"}}>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>挡水建筑物</div>
-      <Descriptions bordered size="small" column={3}>
-        <Descriptions.Item label="坝型" style={{ width: '16.5%' }}>{tableDataDs[0]?.damType}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damMaxHeig}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damTopElev}</Descriptions.Item>
-        <Descriptions.Item label="坝顶长度(m)">{tableDataDs[0]?.damTopLen}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{tableDataDs[0]?.damTopWid}</Descriptions.Item>
-        <Descriptions.Item label="坝基防渗体型式">{tableDataDs[0]?.damImpermeableType}</Descriptions.Item>
-        <Descriptions.Item label="副坝座数">{tableDataDs[0]?.subDamNum}</Descriptions.Item>
-        <Descriptions.Item label="副坝总长度(m)">{tableDataDs[0]?.subDamLen}</Descriptions.Item>
-        <Descriptions.Item label="副坝最大坝高(m)">{tableDataDs[0]?.subDamMaxHeig}</Descriptions.Item>
-      </Descriptions>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>泄水建筑物</div>
-      <div className="table-title" style={{padding:"4px"}}>☆正常溢洪道</div>
-      <Table rowKey="inx"
-             sticky
-             size="small"
-             columns={columns1}
-             pagination={false}
-             dataSource={tableDataXs.normalSpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆非常溢洪道</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns2}
-             pagination={false}
-             dataSource={tableDataXs.emergencySpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆泄洪洞</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns3}
-             pagination={false}
-             dataSource={tableDataXs.sluiceGateList}
-      />
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>输水建筑物</div>
-      <Table rowKey="key"
-             sticky
-             size="small "
-             columns={columns4}
-             pagination={false}
-             dataSource={tableDataSs}
-      />
-    </div>
-  )
-}
-
-export default Jzw;
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/sjbg.js b/src/views/Home/MapCtrl/Pops/Skjcxx/sjbg.js
deleted file mode 100644
index bbf37c3..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/sjbg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {file} from "../../../../../service/sssq";
-
-
-
-function Sjbg({record}) {
-
-  const columns = [
-    {title: '文件名称', key: '', dataIndex: '', align: 'center',render:rec=><span style={{color:"#689FFF"}}>{rec.fileName}</span>},
-    {title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center'},
-    {title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center'},
-    {title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center'},
-    {title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await file(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             bordered
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Sjbg;
diff --git a/src/views/Home/MapCtrl/Pops/Skjcxx/zrtx.js b/src/views/Home/MapCtrl/Pops/Skjcxx/zrtx.js
deleted file mode 100644
index 5858eb7..0000000
--- a/src/views/Home/MapCtrl/Pops/Skjcxx/zrtx.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {person} from "../../../../../service/sssq";
-import {repDict} from "../../../../../utils/dictType"
-
-
-
-function Zrtx({record}) {
-
-  const columns = [
-    {title: '责任人', key: '', dataIndex: '', align: 'center',render:rec=>repDict(rec.repType)},
-    {title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center'},
-    {title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center'},
-    {title: '职务', key: 'position', dataIndex: 'position', align: 'center'},
-    {title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await person(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Zrtx;
diff --git a/src/views/Home/MapCtrl/Pops/SmallSkRiskPop.js b/src/views/Home/MapCtrl/Pops/SmallSkRiskPop.js
deleted file mode 100644
index 81ce936..0000000
--- a/src/views/Home/MapCtrl/Pops/SmallSkRiskPop.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, {useEffect, useState} from 'react'
-import "./SmallSkRiskPop.less";
-import {CloseOutlined} from "@ant-design/icons";
-import {Button, Modal} from "antd";
-import appconsts from "../../../../service/appconsts";
-
-function SmallSkRiskPop({ id, dispatch, data }) {
-
-  const [visible, setVisible] = useState(false);
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 400;
-
-  useEffect(() => {
-
-  }, []);
-
-  const showLog = (val) => {
-    setVisible(true);
-  };
-
-  return (
-    <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip"></div>
-      <div className="dp-popup-content">
-        <div className="boxhead"></div>
-        <div className="content-body">
-          <div className="title">
-            <div className="name">{data.stnm}[{appconsts.smallSkRiskWarningLevel[data.warningLevel]}]</div>
-            <div className="extra">
-              <Button type="link" style={{marginRight:"10px"}} onClick={()=>showLog(data.stcd)}>查看日志</Button>
-              <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-            </div>
-          </div>
-
-          <div className="body smallSkRiskBox">
-            <div className="clearFloat">
-              <div className="lf label2">水库编码</div>
-              <div className="lf value" >{data.stcd}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">行政区划</div>
-              <div className="lf value" >{data.adnm?data.adnm:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">预警产生时间</div>
-              <div className="lf value" >{data.tm?data.tm:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">预警等级</div>
-              <div className="lf value" >{appconsts.smallSkRiskWarningLevel[data.warningLevel]}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">预警雨量值(mm)</div>
-              <div className="lf value" >{data.drp?data.drp:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">预警阈值(mm)</div>
-              <div className="lf value" >{data.threshold?data.threshold:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">重现期(年)</div>
-              <div className="lf value" >{data.returnPeriod?data.returnPeriod:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">短信接收人姓名</div>
-              <div className="lf value" >{data.zrr?data.zrr:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">电话</div>
-              <div className="lf value" >{data.zrrsjh?data.zrrsjh:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">短信内容</div>
-              <div className="lf value" >{data.warningSms?data.warningSms:"-"}</div>
-            </div>
-            <div className="clearFloat">
-              <div className="lf label2">短信发送时间</div>
-              <div className="lf value" >{data.smsTm?data.smsTm:"-"}</div>
-            </div>
-          </div>
-
-        </div>
-        <div className="boxfoot"></div>
-      </div>
-
-      <Modal
-        visible={visible}
-        title={"小水库风险预警记录日志"}
-        footer={null}
-        onCancel={()=>{setVisible(false)}}
-        width="84vw"
-        className="smallSkRiskModal"
-        style={{top:"12vh", height:"82vh", overflow:"hidden auto"}}
-      >
-      </Modal>
-    </div>
-  )
-}
-
-export default React.memo(SmallSkRiskPop);
diff --git a/src/views/Home/MapCtrl/Pops/SmallSkRiskPop.less b/src/views/Home/MapCtrl/Pops/SmallSkRiskPop.less
deleted file mode 100644
index a9f07a9..0000000
--- a/src/views/Home/MapCtrl/Pops/SmallSkRiskPop.less
+++ /dev/null
@@ -1,28 +0,0 @@
-.smallSkRiskBox{
-  padding: 10px 20px !important;
-  box-sizing: border-box;
-  .label,.label1,.label2, .label3{
-    color: #9f9c9c;
-  }
-  .label{
-    width: 90px;
-  }
-  .label1{
-    width: 180px;
-  }
-  .label2{
-    width: 120px;
-  }
-  .label3{
-    width: 140px;
-  }
-  .label,.label1,.label2, .label3, .value{
-    line-height: 24px;
-  }
-}
-
-.smallSkRiskModal{
-  .ant-modal-body{
-    padding: 10px;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/TangYanBa.css b/src/views/Home/MapCtrl/Pops/TangYanBa.css
deleted file mode 100644
index 017269b..0000000
--- a/src/views/Home/MapCtrl/Pops/TangYanBa.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.tyb .ant-tabs-left > .ant-tabs-content-holder,
-.tyb .ant-tabs-left > div > .ant-tabs-content-holder {
-  display: none;
-}
-.tyb .title {
-  background-color: #f7f7f7;
-  color: #007AFD;
-}
-.tyb .title .name {
-  font-weight: normal;
-}
-.tyb .title .name .nameBorder {
-  width: 5px;
-  height: 16px;
-  background-color: #007AFD;
-  margin-right: 10px;
-}
-.tyb .body {
-  padding: 10px;
-}
-.tyb .body .ant-descriptions-row {
-  border-bottom: 1px solid #f0f0f0;
-}
-#tyb {
-  padding: 0;
-}
-#tyb .title {
-  border-bottom: 1px solid #f0f0f0;
-}
-#tyb .title .name {
-  font-weight: normal;
-}
-.DiZhiZaiHaiDian .title {
-  background-color: #f7f7f7;
-  color: #007AFD;
-}
-.DiZhiZaiHaiDian .title .name {
-  font-weight: normal;
-}
-.DiZhiZaiHaiDian .title .name .nameBorder {
-  width: 5px;
-  height: 16px;
-  background-color: #007AFD;
-  margin-right: 10px;
-}
-#DiZhiZaiHaiDian {
-  padding: 0;
-}
-#DiZhiZaiHaiDian .title {
-  border-bottom: 1px solid #f0f0f0;
-}
-#DiZhiZaiHaiDian .title .name {
-  font-weight: normal;
-}
-.skpop .ant-tabs-top > .ant-tabs-nav,
-.skpop .ant-tabs-bottom > .ant-tabs-nav,
-.skpop .ant-tabs-top > div > .ant-tabs-nav,
-.skpop .ant-tabs-bottom > div > .ant-tabs-nav {
-  margin: 0;
-}
diff --git a/src/views/Home/MapCtrl/Pops/TangYanBa.js b/src/views/Home/MapCtrl/Pops/TangYanBa.js
deleted file mode 100644
index 424c0b1..0000000
--- a/src/views/Home/MapCtrl/Pops/TangYanBa.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import moment from "moment"
-import {CloseOutlined} from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import './TangYanBa.less'
-
-function TangYanBa({ id, data, dispatch }) {
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 780;
-
-  const mapOb={
-    1:'混凝土坝',
-    2:'土坝',
-    3:'堆石坝',
-    4:'其他四种类型'
-  }
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.damname}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-            <Descriptions size="small" column={2}>
-              <Descriptions.Item label="所属行政位置">{data.adnm}</Descriptions.Item>
-              <Descriptions.Item label="所属流域">{data.basName}</Descriptions.Item>
-              <Descriptions.Item label="容积(m³)">{data.xhst}</Descriptions.Item>
-              <Descriptions.Item label="坝高(m)">{data.height}</Descriptions.Item>
-              <Descriptions.Item label="坝长(m)" >{data.width}</Descriptions.Item>
-              <Descriptions.Item label="挡水主坝类型" >{data.mt}</Descriptions.Item>
-              <Descriptions.Item label="附件" span={3}>
-                {data.imgs.map((item)=>{
-                  return <img src={item}/>
-                })}</Descriptions.Item>
-            </Descriptions>
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(TangYanBa);
diff --git a/src/views/Home/MapCtrl/Pops/TangYanBa.less b/src/views/Home/MapCtrl/Pops/TangYanBa.less
deleted file mode 100644
index f496667..0000000
--- a/src/views/Home/MapCtrl/Pops/TangYanBa.less
+++ /dev/null
@@ -1,124 +0,0 @@
-.tyb{
-    .ant-tabs-left > .ant-tabs-content-holder, .ant-tabs-left > div > .ant-tabs-content-holder {
-        display: none;
-    }
- .title{
-
-     .name{
-         font-weight: normal;
-        .nameBorder{
-            width: 5px;
-            height: 16px;
-            background-color: #007AFD;
-            margin-right: 10px;
-         }
-     }
-     
-    background-color:#f7f7f7;
-    color: #007AFD;
- }   
- .body{
-     padding: 10px;
-    
-     .ant-descriptions-row{
-         border-bottom: 1px solid #f0f0f0;
-     }
- }
-}
-#tyb{
-    padding: 0;
-    .title{
-        border-bottom: 1px solid #f0f0f0;
-        .name{
-            font-weight: normal;
-        }
-    }
-}
-.DiZhiZaiHaiDian{
-    .title{
-
-        .name{
-            font-weight: normal;
-           .nameBorder{
-               width: 5px;
-               height: 16px;
-               background-color: #007AFD;
-               margin-right: 10px;
-            }
-        }
-        
-       background-color:#f7f7f7;
-       color: #007AFD;
-    } 
-}
-#DiZhiZaiHaiDian{
-    padding: 0;
-    .title{
-        border-bottom: 1px solid #f0f0f0;
-        .name{
-            font-weight: normal;
-        }
-    }
-}
-
-.skpop{
-    .ant-tabs-top > .ant-tabs-nav, .ant-tabs-bottom > .ant-tabs-nav, .ant-tabs-top > div > .ant-tabs-nav, .ant-tabs-bottom > div > .ant-tabs-nav {
-    margin: 0;
-    }
-    
-}
-
-.normalModalStyle{
-    width: 100%;
-    min-height: 600px;
-  
-    .ant-card-body{
-      
-      .ant-table-thead{
-        .ant-table-cell{
-          background-color: #e2edfd !important;
-        }
-      }
-    }
-  
-    .normalModalStyle_title{
-      height: 40px;
-      background-color: #f7f7f7;
-      border-radius: 10px 10px 0 0 ;
-      display: flex;
-      align-items: center;
-      color: #007afd;
-      font-size: 16px;
-      font-weight: 500;
-      margin-bottom: 10px;
-  
-      .normalModalStyle_title_icon{
-        margin: 0 10px 0 15px;
-        width: 5px;
-        height: 16px;
-        background: #3477f5;
-      }
-      .normalModalStyle_title_cancel{
-        margin-right: 15px;
-        flex: 1;
-        display: flex;
-        flex-direction: row-reverse;
-        // float: right;
-      }
-    }
-  }
-  .home_modal{
-    .ant-modal-content{
-        border-radius: 10px;
-    }
-  }
-  .homeModal2{
-    display: flex;
-    flex-direction: column;
-    .homeModal2_content{
-      height: 504px;
-      display: flex;
-      padding: 5px 20px 20px 20px;
-    }
-  }
-  
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/WeiYi.js b/src/views/Home/MapCtrl/Pops/WeiYi.js
deleted file mode 100644
index 347a122..0000000
--- a/src/views/Home/MapCtrl/Pops/WeiYi.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-
-import moment from "moment"
-
-function WeiYi({ id, data, dispatch }) {
-  console.log(data);
-  const width = 780;
-  
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.damname}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-              位移
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(WeiYi);
diff --git a/src/views/Home/MapCtrl/Pops/WeiYi/TableData.js b/src/views/Home/MapCtrl/Pops/WeiYi/TableData.js
deleted file mode 100644
index eff5e41..0000000
--- a/src/views/Home/MapCtrl/Pops/WeiYi/TableData.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-import moment from 'moment'
-
-
-const Tabledata = ({tableData}) => {
-  const columns = [
-    { title: '序号', key: '', dataIndex: '', align: 'center',render:(a,b,c)=>c+1},
-    { title: '时间', key: 'tm', dataIndex: 'tm', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: 'X方向位移(mm)', key: 'x', dataIndex: 'x', align: 'center',render: (rec) => <span>{rec ?? "-"}</span>},
-    { title: 'Y方向位移(mm)', key: 'y', dataIndex: 'y', align: 'center',render: (rec) => <span>{rec ?? "-"}</span>},
-    { title: 'H方向位移(mm)', key: 'h', dataIndex: 'h', align: 'center',render: (rec) => <span>{rec ?? "-"}</span>},
-
-    
-  ];
-  
-  return (
-    <>
-      <Table rowKey="tm"
-             sticky 
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{ y: "420px"}}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js b/src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js
deleted file mode 100644
index 9af0d84..0000000
--- a/src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js
+++ /dev/null
@@ -1,201 +0,0 @@
-export default function drpOption(data,yjData) {
-  console.log("data",data);
-  const max1 = Math.max(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)])
-  const min1 = Math.min(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)])
-  const max2 = Math.max(...data.map(obj => obj.rz))
-  const min2 = Math.min(...data.map(obj => obj.rz))
-
-
-  const yj = yjData?.map((item,index)=>{
-    return {
-      yAxisIndex: 0,
-      name: item.yjName,
-      type: 'line',
-      color: item.color,
-      lineStyle: {
-        type: "dashed",
-        width: 1,
-      },
-      data: data.map(o => item.value),
-      symbol: 'none', // 设置标记点为'none'，即去掉圆点
-      smooth: 0.5 
-    }
-  })
-
-
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-
-    },
-    grid: [
-      {
-        top: "12%",
-        left: "5%",
-        right: "5%",
-        width: '90%',
-        height: '75%'
-      },
-    ],
-    legend: {
-      top:'3%',
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ["X方向","Y方向","H方向", "库水位"],
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: false,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          padding: [0, 0, 100, 0],
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.slice(0,10)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: "位移(m)",
-        nameTextStyle: {
-          padding: [0, 0, 10, 10],
-          color:'#333333',
-          fontSize: 14
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#bfbfbf',
-            width: 0.5,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          // show: false
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        min: Math.floor(min1*0.8)||0,
-        max: Math.ceil(max1*1.2)||100,
-      },
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'right',
-        name: "库水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, 10, 10],
-          color:'#333333',
-          fontSize: 14
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          // show: false
-          lineStyle: {
-            color: '#8c8c8c',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        min: Math.floor(min2*0.8),
-        max: Math.ceil(max2*1.2),
-      }
-    ],
-    series: [
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 0,
-        name: 'X方向',
-        type: 'line',
-        color: "#d6eaec",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.x),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 0,
-        name: 'Y方向',
-        type: 'line',
-        color: "#d6eaec",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.y),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 0,
-        name: 'H方向',
-        type: 'line',
-        color: "#d6eaec",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.h),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '库水位',
-        type: 'line',
-        color: "#60a0f8",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => o.rz),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      ...yj
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/Pops/WeiYi/index.js b/src/views/Home/MapCtrl/Pops/WeiYi/index.js
deleted file mode 100644
index c355605..0000000
--- a/src/views/Home/MapCtrl/Pops/WeiYi/index.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { Descriptions, Form, Button, Input, DatePicker } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import ReactEcharts from 'echarts-for-react';
-import { httppost2 } from '../../../../../utils/request';
-import apiurl from '../../../../../service/apiurl';
-import moment from "moment"
-import ToolBar from './toolbar';
-import TableData from './TableData'
-import drpOption from './drpOption';
-
-function ShenYa({ id, data, dispatch, onCancel }) {
-  console.log(data);
-  const [ tableData, setTableData ] = useState([])
-  const [ yjData, setYjData ] = useState([])
-  const [ tabVal, setTabVal ] = useState('1')
-  // const option = useMemo(() => drpOption(tableData), [tableData])
-  const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData])
-  const width = 780;
-  
-  const closePop = () => {
-    if(onCancel){
-      onCancel()
-    }
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const getData = async(tms,stationCode)=>{
-    const params = {
-      // type: 0,
-      dateTimeRangeSo: {
-        start: moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'),
-      },
-      stationCode: stationCode
-    }
-    
-    const { code, data} = await httppost2(apiurl.home.wyList,params)
-    if(code!==200){
-        return
-    }
-    setTableData(data)
-  }
-
-  const getYjData = async(stationCode)=>{
-    const params = {
-      "pageSo": {
-          "pageSize": 10,
-          "pageNumber": 1
-      },
-      "stationCode": stationCode
-    }
-
-    const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params)
-    if(code!==200){
-        return
-    }
-    const linshi = []
-    records?.map((item)=>{
-      if(item.status===0){
-        return
-      }
-      if(item.valueOne||0){
-        linshi.push({
-          yjName:item.level ===1?'黄色预警':'红色预警', 
-          value:item.valueOne,
-          color:item.level ===1?'#f1bf42':'red'
-        })
-      }
-      if(item.valueTwo||0){
-        linshi.push({
-          yjName:item.level ===1?'黄色预警':'红色预警', 
-          value:item.valueTwo,
-          color:item.level ===1?'#f1bf42':'red'
-        })
-      }
-    })
-    setYjData(linshi)
-  }
-
-  useEffect(()=>{
-    getYjData(data.stationCode)
-    getData([moment().add(-1,'months'),moment()],data.stationCode)
-  },[])
-
-  return (
-    <>
-      <div className="normalModalStyle homeModal2">
-          <div className="normalModalStyle_title">
-              <div className="normalModalStyle_title_icon"></div>
-              {data.stationCode}
-              <div className="normalModalStyle_title_cancel">
-                  <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-          </div>
-
-          <div style={{padding:'0 20px'}}>
-            <ToolBar search={(tms)=>getData(tms,data.stationCode)} setTabVal={setTabVal}/>
-          </div>
-          <div className='homeModal2_content'>
-              {
-                  tabVal==='1'?
-                    tableData.length>0?
-                    <ReactEcharts option={option} style={{width: "100%", height: '100%'}}/>
-                    :<div style={{textAlign: "center", margin: "10%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-                    :null
-              }
-              {
-                  tabVal==='2'?<div style={{marginTop:'10px'}}><TableData tableData={tableData}/></div>:null
-              }
-          </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(ShenYa);
diff --git a/src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js b/src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js
deleted file mode 100644
index f2a56ec..0000000
--- a/src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Form, Input, Radio, DatePicker } from 'antd';
-import NormalSelect from '../../../../../components/Form/NormalSelect'
-import { useEffect, useState } from 'react';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({search, setTabVal}) => {
-
-    const onFinish = (val)=>{
-        search(val)
-    }
-
-
-
-    return (
-        <>
-            <Form className='toolbarBox' layout="inline" onFinish={onFinish}>
-                <Form.Item label="时间段" name="imgName">
-                    <RangePicker
-                        allowClear={false}
-                        defaultValue={[moment().add(-1,'months'),moment()]}
-                        onChange={onFinish}
-                        style={{ width: "300px" }}
-                        format="YYYY-MM-DD"
-                    />
-                </Form.Item>
-                <Form.Item style={{marginLeft:'200px'}}>
-                    <Radio.Group onChange={(e)=>{setTabVal(e.target.value)}} defaultValue="1" size="large" buttonStyle="outline">
-                        <Radio.Button value="1">数据图</Radio.Button>
-                        <Radio.Button value="2">数据表</Radio.Button>
-                    </Radio.Group>
-                </Form.Item>
-            </Form>
-        </>
-    );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/Wxq.js b/src/views/Home/MapCtrl/Pops/Wxq.js
deleted file mode 100644
index 907d2e2..0000000
--- a/src/views/Home/MapCtrl/Pops/Wxq.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import { httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import moment from "moment"
-
-function Wxq({ id, data, dispatch }) {
-  console.log(data);
-  const width = 400;
-  const [detail, setDetail] = useState({})
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const getDetailData = async(id) => {
-    try {
-      const res = await httpget2(`${apiurl.home.wxqdetail}/${id}`);
-      setDetail(res.data)
-    } catch (error) {
-      
-    }
-  }
-  useEffect(() => {
-    if (data?.PID) {
-      getDetailData(data?.PID)
-    }
-  }, [data])
-  
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-          <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.NAME || detail?.name}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-              <Descriptions labelStyle={{padding:"5px 0"}}>
-                <Descriptions.Item label="行政区划" span={3} contentStyle={{ padding: "5px 0" }}>{data?.adnm || detail?.adnm}</Descriptions.Item>
-                <Descriptions.Item label="人口" span={3} contentStyle={{padding:"5px 0"}}>{data?.ptcount || detail?.ptcount}</Descriptions.Item>
-                <Descriptions.Item label="户数" span={3} contentStyle={{padding:"5px 0"}}>{data?.etcount || detail?.etcount}</Descriptions.Item>
-                <Descriptions.Item label="房屋数" span={3} contentStyle={{padding:"5px 0"}}>{data.htcount  || detail?.htcount}</Descriptions.Item>
-              </Descriptions>
-            </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(Wxq);
diff --git a/src/views/Home/MapCtrl/Pops/XjDrpPop.js b/src/views/Home/MapCtrl/Pops/XjDrpPop.js
deleted file mode 100644
index d55db5a..0000000
--- a/src/views/Home/MapCtrl/Pops/XjDrpPop.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { useState } from 'react'
-import DrpChart from '../charts/RealDrpPop/DrpChart';
-import HDChart from '../charts/RealHDPop/HDChart';
-
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import { Modal, Tabs } from 'antd';
-import DrpSearch from '../components/DrpSearch';
-import RzSearch from "../components/RzSearch";
-
-
-
-function RealDrpTip({ id, data, dispatch }) {
-
-  const [type, setType] = useState('drp');
-
-  const [visible, setVisible] = useState(false);
-
-  const viewInfo = () => {
-    setVisible(true);
-  };
-
-  const switchType = () => {
-    setType(type === 'drp' ? 'rz' : 'drp');
-  };
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 480;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.stnm+'['+data?.STTPSTR+'] '}{data.MEMO?('(备注:'+data.MEMO+')'):''}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            {/* <div style={{padding:"10px 15px"}}>
-              <span>站类名称：</span><span style={{fontWeight:"bold"}}>{data.STTPSTR}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>备注：</span><span style={{fontWeight:"bold"}}>{data.MEMO?data.MEMO:"-"}</span>
-            </div> */}
-            <div className="body">
-              {/* <div className="extra cursor-pointer1" style={{ marginRight: '1rem' }}>
-                {data?.STTPSTR.indexOf("水位")>-1?'水位':''}
-                {data?.STTPSTR.indexOf("雨量")>-1?'雨量':''}
-              </div> */}
-              {/*<div className="cursor-pointer3" onClick={viewInfo}>详细</div>*/}
-              <div className="cursor-pointer3" >详细</div>
-              
-              {/* <div className="cursor-pointer3" onClick={(e)=>{e.stopPropagation();setHzyqVisible(true); }} >汇总雨情</div> */}
-            </div>
-            {data?.STTPSTR.indexOf("雨量")>-1? <DrpChart record={data} /> : null}
-            {data?.STTPSTR.indexOf("水位")>-1? <HDChart record={data} /> : null}
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-      {/*雨量查询弹窗*/}
-      <Modal
-        visible={visible}
-        footer={null}
-        width="55%"
-        title={data.stnm}
-        className="queryDrpModal"
-        onCancel={()=>setVisible(false)}>
-        <Tabs defaultActiveKey="1">
-          {
-            data?.STTPSTR.indexOf("雨量")>-1?
-            <Tabs.TabPane tab="雨量查询" key="1">
-              <DrpSearch record={data}/>
-            </Tabs.TabPane>
-            :null
-          }
-          {
-            data?.STTPSTR.indexOf("水位")>-1?
-            <Tabs.TabPane tab="水位查询" key="1">
-              <RzSearch record={data}/>
-            </Tabs.TabPane>
-            :null
-          }
-
-        </Tabs>
-      </Modal>
-    </>
-  )
-}
-
-export default React.memo(RealDrpTip);
diff --git a/src/views/Home/MapCtrl/Pops/XunJian.js b/src/views/Home/MapCtrl/Pops/XunJian.js
deleted file mode 100644
index 1a2062f..0000000
--- a/src/views/Home/MapCtrl/Pops/XunJian.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { Descriptions, Modal } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import { httpget2 } from '../../../../utils/request';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal'
-import ModalForm from '../../../rcgl/xcxj/xjrw/detailForm';
-import apiurl from '../../../../service/apiurl';
-import moment from "moment"
-
-function Wxq({ id, data, dispatch }) {
-  console.log(data);
-  const width = 400;
-  const refModal = useRef();
-  const [detail, setDetail] = useState({})
-  const [visible,setVisible] = useState(false)
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const getDetailData = async(id) => {
-    try {
-      const res = await httpget2(`${apiurl.home.wxqdetail}/${id}`);
-      setDetail(res.data)
-    } catch (error) {
-      
-    }
-  }
-  useEffect(() => {
-    if (data?.PID) {
-      getDetailData(data?.PID)
-    }
-  }, [data])
-  
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-          <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.taskTitle}
-                </div>
-              <div style={{cursor:'pointer',marginRight:'10px'}} onClick={()=>{
-                refModal.current.showView(data);
-              }}>详情</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-              <Descriptions labelStyle={{padding:"5px 0"}}>
-                <Descriptions.Item label="巡查完成日期" span={3} contentStyle={{ padding: "5px 0" }}>{data?.finishTime || detail?.adnm}</Descriptions.Item>
-                <Descriptions.Item label="检查人" span={3} contentStyle={{padding:"5px 0"}}>{data?.inspectUserName || detail?.ptcount}</Descriptions.Item>
-                <Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}>
-                  {{0: "日常巡查",1: "特别检查",2: "汛前巡检"}?.[data?.taskType]}
-                  </Descriptions.Item>  
-                <Descriptions.Item label="问题数量" span={3} contentStyle={{padding:"5px 0"}}>{data.problemNum  || detail?.htcount}</Descriptions.Item>
-                <Descriptions.Item label="待处理" span={3} contentStyle={{padding:"5px 0"}}>{data.handleNum  || detail?.htcount}</Descriptions.Item>
-              </Descriptions>
-            </div>
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-
-
-
-      <BasicCrudModal
-        width={1000}
-        ref={refModal}
-        style={{top:'100px'}}
-        title=""
-        title1="巡查任务详情"
-        component={ModalForm}
-        onCrudSuccess={()=>{}}
-        // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-      />
-    </>
-  )
-}
-
-export default React.memo(Wxq);
diff --git a/src/views/Home/MapCtrl/Pops/YHJMH.js b/src/views/Home/MapCtrl/Pops/YHJMH.js
deleted file mode 100644
index 21adb6d..0000000
--- a/src/views/Home/MapCtrl/Pops/YHJMH.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import React, { useEffect, useState,} from 'react';
-import { Descriptions,Image  } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-
-import moment from "moment"
-
-function YHJMH({ id, data, dispatch }) {
-  console.log(data);
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const width = 500;
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.name}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-      
-            <Descriptions labelStyle={{padding:"5px 0"}}>
-                <Descriptions.Item label="行政区划" span={2} contentStyle={{ padding: "5px 0" }}>{data?.adnm}</Descriptions.Item>
-                <Descriptions.Item label="户主姓名" span={1} contentStyle={{padding:"5px 0"}}>{data?.name}</Descriptions.Item>
-                <Descriptions.Item label="联系电话" span={2} contentStyle={{padding:"5px 0"}}>{data?.phone}</Descriptions.Item>
-                <Descriptions.Item label="宅基高程(m)" span={1} contentStyle={{padding:"5px 0"}}>{data?.hele ? Number(data?.hele).toFixed(2) : ''}</Descriptions.Item>
-                <Descriptions.Item label="建筑面积(㎡)" span={2} contentStyle={{padding:"5px 0"}}>{data?.area}</Descriptions.Item>
-                <Descriptions.Item label="家庭人口" span={1} contentStyle={{padding:"5px 0"}}>{data?.ptcount}</Descriptions.Item>
-                <Descriptions.Item label="建筑类型" span={2} contentStyle={{ padding: "5px 0" }}>
-                  {data?.btype == "1" ? "1层住宅" :
-                    data?.btype == "2" ? "2层住宅" :
-                      data?.btype == "3" ? "3层住宅" :
-                        data?.btype == "4" ? "3层以上住宅": ''
-                  }</Descriptions.Item>
-                <Descriptions.Item label="结构形式" span={1} contentStyle={{ padding: "5px 0" }}>
-                  {data?.stype == "1" ? "钢筋混凝土结构" :
-                    data?.stype == "2" ? "混合结构" :
-                      data?.stype == "3" ? "砖木结构" :
-                      data?.stype == "4" ? "其他结构" : ''
-                  }</Descriptions.Item>
-                <Descriptions.Item label="临水" span={2} contentStyle={{ padding: "5px 0" }}>
-                  {data?.bwater == "1" ? "是" :
-                    data?.bwater == "0" ? "否" : ''
-                  }</Descriptions.Item>
-                <Descriptions.Item label="切坡" span={1} contentStyle={{ padding: "5px 0" }}>
-                  {data?.bhill == "1" ? "是" :
-                    data?.bhill == "0" ? "否" :""
-                  }</Descriptions.Item>
-                <Descriptions.Item label="照片" span={3} contentStyle={{ padding: "5px 0" }}>
-                {
-                    data?.files?.length > 0 ? 
-                      data?.files.map(item => <div key={item.id} style={{marginRight:5}} >
-                       <Image
-                  width={100}
-                  height={50}
-                  src={url + item.filePath}
-                  
-                />
-                    </div>) : null
-                  }
-                </Descriptions.Item>
-              </Descriptions>
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(YHJMH);
diff --git a/src/views/Home/MapCtrl/Pops/YbyjPlanPop.js b/src/views/Home/MapCtrl/Pops/YbyjPlanPop.js
deleted file mode 100644
index 4916159..0000000
--- a/src/views/Home/MapCtrl/Pops/YbyjPlanPop.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react'
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-
-function YbyjPlanPop({ id, data, dispatch }) {
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 320;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.name}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div style={{padding:"10px 15px"}}>
-              {/*<span>风险等级：</span><span style={{fontWeight:"bold"}}>{data.risk}</span>*/}
-              <span>风险等级：</span>
-              <span style={{fontWeight:"bold"}}>
-                {data.risk==="危险"?<span style={{background:"#FF0000",display:"inline-block",padding:"2px 4px"}}>危险</span>:data.risk==="警戒"?<span style={{background:"#F39800",display:"inline-block",padding:"2px 4px"}}>警戒</span>:<span style={{background:"#F1E400",display:"inline-block",padding:"2px 4px"}}>关注</span>}
-              </span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>影响户数：</span><span style={{fontWeight:"bold"}}>{data.hcount}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>影响人口：</span><span style={{fontWeight:"bold"}}>{data.person}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>行政责任人：</span><span style={{fontWeight:"bold"}}>{data.leader}</span>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(YbyjPlanPop);
diff --git a/src/views/Home/MapCtrl/Pops/YbyjPreviewPop.less b/src/views/Home/MapCtrl/Pops/YbyjPreviewPop.less
deleted file mode 100644
index 00094b2..0000000
--- a/src/views/Home/MapCtrl/Pops/YbyjPreviewPop.less
+++ /dev/null
@@ -1,10 +0,0 @@
-.ybyjPreviewPopModal{
-  width: 1160px !important;
-  height:calc( 100vh - 80px );
-  .ant-modal-content{
-    height:100%;
-  }
-  .ant-modal-body{
-    padding:0 4px;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/YiFaZaiHaiDian.js b/src/views/Home/MapCtrl/Pops/YiFaZaiHaiDian.js
deleted file mode 100644
index 082bebf..0000000
--- a/src/views/Home/MapCtrl/Pops/YiFaZaiHaiDian.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import moment from "moment"
-import {CloseOutlined} from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import './TangYanBa.less'
-
-function YiFaZaiHaiDian({ id, data, dispatch }) {
-
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const width = 780;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-          <div className="content-body tyb" id='tyb'>
-            <div className="title">
-               <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.name}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-            <Descriptions size="small" column={2}>
-              <Descriptions.Item label="易涝点名称">{data.name}</Descriptions.Item>
-              <Descriptions.Item label="所属行政位置">{data.adnm}</Descriptions.Item>
-              <Descriptions.Item label="所在河流">{data.rvName}</Descriptions.Item>
-              <Descriptions.Item label="积水最大深度(m)">{data.depth}</Descriptions.Item>
-              <Descriptions.Item label="影响人口" span={3}>{data.pop}</Descriptions.Item>
-              <Descriptions.Item label="影响区域" span={3}>{data.area}</Descriptions.Item>
-              <Descriptions.Item label="备注" span={3}>
-              {data.remark}
-                </Descriptions.Item>
-            </Descriptions>
-            </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(YiFaZaiHaiDian);
diff --git a/src/views/Home/MapCtrl/Pops/YinShuiGongCheng.js b/src/views/Home/MapCtrl/Pops/YinShuiGongCheng.js
deleted file mode 100644
index 910fdc9..0000000
--- a/src/views/Home/MapCtrl/Pops/YinShuiGongCheng.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from 'antd';
-import moment from "moment"
-import {CloseOutlined} from '@ant-design/icons';
-import genDamImage from '../../../../components/DamGraph/DamImage';
-import './TangYanBa.less'
-
-function YinShuiGongCheng({ id, data2, dispatch }) {
-
-  const data = {
-    "wadiCode": "1",
-    "wadiName": "十咸引水渠道",
-    "startLong": null,
-    "startLat": null,
-    "endLong": null,
-    "endLat": null,
-    "startLoc": null,
-    "endLoc": null,
-    "engGrad": null,
-    "engScal": null,
-    "toWrzName": null,
-    "fromWrzName": null,
-    "toBasName": null,
-    "fromBasName": null,
-    "engTask": null,
-    "proWatTraLine": null,
-    "proRangWatRec": null,
-    "trlnTotLen": 11025,
-    "cvlnTotLen": null,
-    "desAnnDiv": null,
-    "ditrMode": null,
-    "engStat": null,
-    "startDate": null,
-    "compDate": null,
-    "admDep": null,
-    "note": null,
-    "effDate": null,
-    "exprDate": null,
-    "desIrrArea": null,
-    "actualIrrArea2": 5000,
-    "desFlow": 0.5,
-    "actualFlow": null,
-    "buildDate": 757785600000,
-    "investAmount": 271.7,
-    "wadiUse": "野猫河上游高滩取水，并延伸至营坪寨解决县城居民饮水，以饮水为主，兼顾沿线灌溉",
-    "imgs": []
-}
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-  const width = 780;
-  console.log(data,'------');
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: '10px', left: 0, width, lineHeight: 1, background:'#ffffff' ,transform: 'translateX(-50%)' }}>
-      <div className="dp-popup-tip" style={{marginTop:'-10px',borderBottomColor:'#f7f7f7'}}></div>
-        <div className="dp-popup-content">
-        <div className="content-body tyb" id='tyb'>
-            <div className="title">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data.wadiName}
-                </div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div className="body">
-            <Descriptions size="small" column={2}>
-              <Descriptions.Item label="工程名称">{data.wadiName}</Descriptions.Item>
-              <Descriptions.Item label="全长(m)">{data.trlnTotLen}</Descriptions.Item>
-              <Descriptions.Item label="设计灌溉面积(亩)">{data.desIrrArea}</Descriptions.Item>
-              <Descriptions.Item label="实达灌溉面积(亩)">{data.actualIrrArea2}</Descriptions.Item>
-              <Descriptions.Item label="设计流量(m³/s)" >{data.desFlow}</Descriptions.Item>
-              <Descriptions.Item label="实达流量(m³/s)" >{data.actualFlow}</Descriptions.Item>
-              <Descriptions.Item label="建设时间" >{moment(data.buildDate).format('YYYY-MM-DD')}</Descriptions.Item>
-              <Descriptions.Item label="投资(万元)" >{data.investAmount}</Descriptions.Item>
-              <Descriptions.Item label="工程用途" span={2}>{data.wadiUse}</Descriptions.Item>
-
-              {/* <Descriptions.Item label="附件" span={3}>
-                {data.imgs.map((item)=>{
-                  return <img src={item}/>
-                })}</Descriptions.Item> */}
-            </Descriptions>
-            </div>
-
-           
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(YinShuiGongCheng);
diff --git a/src/views/Home/MapCtrl/Pops/http.js b/src/views/Home/MapCtrl/Pops/http.js
deleted file mode 100644
index ed03357..0000000
--- a/src/views/Home/MapCtrl/Pops/http.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { httpget2 } from "../../../../utils/request"
-import apiUrl from '../../../../service/apiurl'
-export const coutxzc = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.coutxzc,params)
-    return res
-}
-
-export const countslgc = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.countslgc,params)
-    return res
-}
-
-export const countjctx = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.countjctx,params)
-    return res
-}
-
-export const countzddx = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.countzddx,params)
-    return res
-}
-
-export const countzrr = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.countzrr,params)
-    return res
-}
-
-export const countjctx1 = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.countjctx1,params)
-    return res
-}
-
-export const countzddx1 = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.countzddx1,params)
-    return res
-}
-
-export const countslgc1 = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.countslgc1,params)
-    return res
-}
-
-export const yfzhdCount = async()=>{
-    const res = await httpget2(apiUrl.jbqk.yfzhd.count,{})
-    return res
-}
-export const conutDeteil = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.conutDeteil,params)
-    return res
-}
-
-export const conutInfo = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.conutInfo,params)
-    return res
-}
-
-export const conutInfo1 = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.conutInfo1,params)
-    return res
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/Pops/index.js b/src/views/Home/MapCtrl/Pops/index.js
deleted file mode 100644
index 7588c9f..0000000
--- a/src/views/Home/MapCtrl/Pops/index.js
+++ /dev/null
@@ -1,236 +0,0 @@
-import React, { useCallback } from 'react'
-import { Button, Modal, Space } from 'antd';
-import { useDispatch, useSelector } from 'react-redux'
-
-import PciStPop from './PciStPop';
-import HdswPop from './HdswPop';
-import HdswPop2 from './HdswPop2'
-import ShuikuPop from './ShuikuPop';
-import ShuikuPop2 from './ShuikuPop2'
-import ShuiDianZhanPop from './ShuiDianZhanPop';
-import SmallSkRiskPop from './SmallSkRiskPop';
-import DrpPop from './DrpPop';
-import XjDrpPop from './XjDrpPop';
-import AdcdPop from './AdcdPop';
-import WxqPop from './DcpjPop/WxqPop';
-
-import PlacementPop from './DcpjPop/PlacementPop';
-import TransferPop from './DcpjPop/TransferPop';
-import FlrvvlgPop from './DcpjPop/FlrvvlgPop';
-import BsnssinfoPop from './DcpjPop/BsnssinfoPop';
-import BridgePop from './DcpjPop/BridgePop';
-import CulvertPop from './DcpjPop/CulvertPop';
-import SluicePop from './DcpjPop/SluicePop';
-import DaminfoPop from './DcpjPop/DaminfoPop';
-import DikePop from './DcpjPop/DikePop';
-import WbrinfoPop from './DcpjPop/WbrinfoPop';
-
-import YbyjPlanPop from './YbyjPlanPop';
-
-import RainPreviewPop from './RainPreviewPop';
-import RiskPop from './RiskPop';
-import ShyjPop from './ShyjPop';
-import DingWeiFu from './DingWeiFu';
-
-import WXQ from './Wxq'
-import AZD from './AnZhiDian'
-import QSYDW from './QSYDW'
-import YHJMH from  './YHJMH'
-import ShenYa from './ShenYa/index.js';
-import ShenLiu from './ShenLiu/index.js';
-import WeiYi from './WeiYi/index.js';
-import XunJian from './XunJian.js'
-import DaiChuLi from './DaiChuLi.js'
-
-
-import YinShuiGongCheng from './YinShuiGongCheng';//这个先不搞
-import TangYanBa from './TangYanBa';
-import YiFaZaiHaiDian from './YiFaZaiHaiDian';
-import DiZhiZaiHaiDian from './DiZhiZaiHaiDian';
-import DianXingZaiHaiShiJian from './DianXingZaiHaiShiJian'
-import HeLiu from './HeLiu';
-import GongShuiPop from './GongShuiPop';
-import "./TangYanBa.less"
-export const InfoPopNames = {
-  RealSkPop: 'RealSkPop',
-  RealHDPop: 'RealHDPop',
-  RealDrpPop: 'RealDrpPop',
-  PicStPop: 'PicStPop',
-};
-
-
-function FeaturePops({ mapobj }) {
-  const popups = useSelector(s => s.runtime.featurePops);
-  const dispatch = useDispatch();
-  useSelector(s => s.runtime.viewTick);
-  if (!mapobj || !popups || !popups.length) {
-    return null;
-  }
-  
-  return (
-    <>
-      {
-        popups.map(({ type, lgtd, lttd, elev, data, id }) => {
-          const pixels = mapobj.coordinateToPixel(lgtd, lttd, elev);
-          let left = null
-          let top = null
-          let zIndex = null
-          console.log("type",type);
-          if (!pixels) {
-            return null;
-          }
-          let Comp = null;
-          if (type === 'tuxiang') {
-            //视频点
-            Comp = PciStPop;
-            return (
-              <Modal width={800}  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <PciStPop id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }else if (type === 'hdsw') {
-            // Comp = HdswPop;
-            return (
-              <Modal width={1050} wrapClassName='home_modal' bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <HdswPop2 id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }else if (type === 'shuiku' || type === InfoPopNames.RealSkPop) {
-            // 水库
-            // Comp = ShuikuPop;
-            return (
-              <Modal width={1050} wrapClassName='home_modal' bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <ShuikuPop id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }else if(type === 'shuiku2'){
-            Comp = ShuikuPop2;
-          }else if (type === 'shuidianzhan') {
-            Comp = ShuiDianZhanPop;
-          }else if (type === 'drp' || type === InfoPopNames.RealDrpPop) {
-            // 雨情
-            // Comp = DrpPop;
-            return (
-              <Modal width={1050} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <DrpPop id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }else if (type === "gongshui" ) {
-            // 供水
-            return (
-              <Modal width={1050} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <GongShuiPop id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }
-          else if (type === 'xjDrp') {
-            Comp = XjDrpPop;
-          }else if (type === 'adcd') {
-            Comp = AdcdPop;
-          }else if (type === 'danad') {
-            Comp = WxqPop;
-          }else if (type === 'placement') {
-            Comp = PlacementPop;
-          }else if (type === 'transfer') {
-            Comp = TransferPop;
-          }else if (type === 'flrvvlg') {
-            Comp = FlrvvlgPop;
-          }else if (type === 'bsnssinfo') {
-            Comp = BsnssinfoPop;
-          }else if (type === 'bridge') {
-            Comp = BridgePop;
-          }else if (type === 'culvert') {
-            Comp = CulvertPop;
-          }else if (type === 'sluice') {
-            Comp = SluicePop;
-          }else if (type === 'daminfo') {
-            Comp = DaminfoPop;
-          }else if (type === 'dike') {
-            Comp = DikePop;
-          }else if (type === 'wbrinfo') {
-            Comp = WbrinfoPop;
-          }else if (type === 'YbyjPlanPop') {
-            Comp = YbyjPlanPop;
-          }else if (type === 'RainPreviewPop') {
-            Comp = RainPreviewPop;
-          }else if (type === 'RiskPop') {
-            Comp = RiskPop;
-          }else if (type === 'smallSkRisk'){
-            Comp = SmallSkRiskPop;
-          }else if (type === 'yinshuigongcheng'){
-            Comp = YinShuiGongCheng;
-          }else if (type === 'tangyanba'){
-            Comp = TangYanBa;
-          }else if (type === 'yifazaihaidian'){
-            Comp = YiFaZaiHaiDian;
-          }else if (type === 'dizhizaihaidian'){
-            Comp = DiZhiZaiHaiDian
-          }else if (type === 'dianxingzaihaishijian'){
-            Comp = DianXingZaiHaiShiJian
-          }else if (type === 'heliu'){
-            Comp = HeLiu
-          }else if (type === 'shanhongyujing'){
-            Comp = ShyjPop
-          }else if (type === 'DingWeiFu'){
-            Comp = DingWeiFu
-          }else if (type === 'wxq'){
-            //危险区
-            Comp = WXQ
-          }else if (type === 'anzhidian'){
-            //安置点
-            Comp = AZD
-          }else if (type === 'qishiyedanwei'){
-            //企事业单位
-            Comp = QSYDW
-          }else if (type === 'yanhejuminhu'){
-            //沿河居民户
-            Comp = YHJMH
-          }else if (type === 'shenliu'){
-            //渗流
-            // Comp = ShenLiu
-            return (
-              <Modal width={1000} wrapClassName='home_modal' bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <ShenLiu id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }else if (type === 'shenya'){
-            //渗压
-            // Comp = ShenYa
-            return (
-              <Modal width={1000} wrapClassName='home_modal' bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <ShenYa id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }else if (type === 'weiyi'){
-            //位移
-            // Comp = WeiYi
-            return (
-              <Modal width={1000} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <WeiYi id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }else if (type === 'xunjian'){
-            Comp = XunJian
-          }else if (type === 'daichuli'){
-            return (
-              <Modal width={1050} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={true} onCancel={()=>dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}>
-                <DaiChuLi id={id} data={data} dispatch={dispatch} record={data}/>
-              </Modal>
-            )
-          }
-          else{
-            return null;
-          }
-
-          return (
-            <div key={id} style={{ left: pixels[0], top: pixels[1], position: 'absolute', zIndex: zIndex?112:101, borderRadius: 3 }}>
-              <Comp id={id} data={data} dispatch={dispatch} record={data}/>
-            </div>
-          )
-        })
-      }
-    </>
-  )
-}
-
-export default FeaturePops;
diff --git a/src/views/Home/MapCtrl/Pops/rhbjqPop.js b/src/views/Home/MapCtrl/Pops/rhbjqPop.js
deleted file mode 100644
index b97cf47..0000000
--- a/src/views/Home/MapCtrl/Pops/rhbjqPop.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, { useState } from 'react'
-import DrpChart from '../charts/RealDrpPop/DrpChart';
-import HDChart from '../charts/RealHDPop/HDChart';
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-
-function RealDrpTip({ id, data, dispatch }) {
-
-  const closePop = () => {
-    dispatch.runtime.closeFeaturePop(id);
-  };
-
-  const width = 320;
-
-  return (
-    <>
-      <div className="dp-popup" style={{ position: 'absolute', top: 0, left: 0, width, lineHeight: 1, transform: 'translateX(-50%)' }}>
-        <div className="dp-popup-tip"></div>
-        <div className="dp-popup-content">
-          <div className="boxhead"></div>
-          <div className="content-body">
-            <div className="title">
-              <div className="name">{data.MEMO}</div>
-              <div className="extra">
-                <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
-              </div>
-            </div>
-
-            <div style={{padding:"10px 15px"}}>
-              <span>说明：</span><span style={{fontWeight:"bold"}}>{data.MEMO}</span>
-            </div>
-            <div style={{padding:"10px 15px"}}>
-              <span>等级：</span><span style={{fontWeight:"bold"}}>{data.grade?data.grade:"-"}</span>
-            </div>
-
-          </div>
-          <div className="boxfoot"></div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(RealDrpTip);
diff --git a/src/views/Home/MapCtrl/baselayer.js b/src/views/Home/MapCtrl/baselayer.js
deleted file mode 100644
index fe68115..0000000
--- a/src/views/Home/MapCtrl/baselayer.js
+++ /dev/null
@@ -1,81 +0,0 @@
-export default class BaseLayer {
-  constructor({ visible, dataExpire, dispatch, setting }) {
-    // 图层是加载完后才进行显示，隐藏逻辑的初始化，这里只记录目标的
-    this._visible = visible;
-    this._lastRefreshTime = 0; // 上次取得数据的时间
-    this._dataExpire = dataExpire || 0;
-    this._dispatch = dispatch;
-    this._setting = setting;
-  }
-
-  getLayerName() {
-    throw 'BaseLayer:getLayerName';
-  }
-
-  _setStyleVisibility(style) {
-    style.layout.visibility = this._visible ? 'visible' : 'none';
-    return style;
-  }
-
-  isVisible() {
-    return !!this._visible;
-  }
-
-  /**
-   * 切换图层显示开关
-   * @param {*} val 
-   */
-  setVisible(val) {
-    this._visible = val;
-  }
-
-  /**
-   * 控件销毁的时候调用
-   */
-  destroy() {
-    //console.error('BaseLayer:destroy')
-  }
-
-  /**
-   * 刷新图层
-   */
-  refresh(force) {
-    const now = Date.now();
-    if (!this.isVisible()) {
-      this._lastRefreshTime = now;
-      return;
-    }
-    if (force) {
-      this.loadData();
-    } else if (this._dataExpire) {
-      if (now - this._lastRefreshTime > this._dataExpire) {
-        this._lastRefreshTime = now;
-        this.loadData();
-      }
-    }
-  }
-
-  /**
-   * 通过数据驱动的装载图层
-   */
-  loadData() {
-    console.error('loadData not impl');
-  }
-
-  setSetting(setting) {
-    this._setting = setting;
-  }
-
-  // 辅助函数
-  getHighlightMap(highlight) {
-    highlight = highlight || this._setting?.highlight;
-    if (!highlight) {
-      return {};
-    }
-    const arrlist = highlight[this.getLayerName()];
-    if (Array.isArray(arrlist)) {
-      return arrlist.reduce((total, cur) => { total[cur] = true; return total; }, {});
-    }
-    return {};
-  }
-}
diff --git a/src/views/Home/MapCtrl/basemap.js b/src/views/Home/MapCtrl/basemap.js
deleted file mode 100644
index d3ddc20..0000000
--- a/src/views/Home/MapCtrl/basemap.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * OL 封装
- */
-export default class BaseMap {
-  /**
-   * 初始化地图、图层
-   */
-  init() {
-    console.error('BaseMap:init');
-  }
-
-  /**
-   * 组件卸载时，需要销毁map对象
-   */
-  destroy() {
-    console.error('BaseMap:destroy');
-  }
-
-  /**
-   * get layer obj
-   */
-  getLayer(name) {
-    console.error('BaseMap:getLayer', name);
-  }
-
-  /**
-   * add layer
-   */
-  addLayer(layer) {
-    console.error('addLayer', layer);
-  }
-}
diff --git a/src/views/Home/MapCtrl/charts/RealDrpPop/DrpChart.js b/src/views/Home/MapCtrl/charts/RealDrpPop/DrpChart.js
deleted file mode 100644
index d475853..0000000
--- a/src/views/Home/MapCtrl/charts/RealDrpPop/DrpChart.js
+++ /dev/null
@@ -1,262 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react'
-import echarts from 'echarts/lib/echarts';
-import ReactEcharts from 'echarts-for-react/lib/index';
-import moment from 'moment/moment';
-import { renderDrpWX } from '../../../../../utils/renutils';
-import { normalizeSearchTmRange } from '../../../../../utils/tools';
-import {xjswDrpSearch, xjylDrpSearch} from '../../../../../models/_/search';
-import "./index.less"
-import {queryImportantStStbprpBAndStPptnRApi} from "../../../../../service/homePage";
-import appconsts from "../../../../../service/appconsts";
-
-function DrpChart({ record }) {
-  console.log("DrpChart 12++++",record);
-
-  const [data, setData] = useState([]);
-  const tm = [moment().add(-24, 'hour'), moment()];
-  const resultTm = normalizeSearchTmRange(tm, 'h');
-
-  const getData = async () => {
-    let params = {
-      "etm": moment().format('YYYY-MM-DD HH:mm:ss'),
-      "source": record.source,
-      "stcds": [record.stcd],
-      "stm": moment().add(-24, 'hour').format('YYYY-MM-DD HH:mm:ss'),
-      "type": ""
-    };
-
-    const ret = await queryImportantStStbprpBAndStPptnRApi(params);
-
-    if(ret.code === 200){
-      setData(ret.data || []);
-    }
-  };
-
-  useEffect(() => {
-    /*drpSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => {
-      setData(data || []);
-    });*/
-
-    console.log("DrpChart 49++++",record.type);
-    if(record.source){
-      getData();
-    }else{
-      if (record.type === '2022年新建雨量站'){
-        xjylDrpSearch(record.stcd, 'h', resultTm, localStorage.getItem('ADCD6') + '000000').then((data) => {
-          setData(data || []);
-        });
-      }
-      if (record.type === '2022年新建水位站'||record.type === '新建简易水位站'){
-        xjswDrpSearch(record.stcd, 'h', resultTm, localStorage.getItem('ADCD6') + '000000').then((data) => {
-          setData(data || []);
-        });
-      }
-    }
-  }, [record])// eslint-disable-line
-
-  const option = useMemo(() => {
-    let totalDrp = 0;
-    const data2 = data.reduce((pre, cur) => {
-      totalDrp += cur.drp;
-      pre.push({
-        ...cur,
-        totalDrp,
-      });
-      return pre;
-    }, []);
-
-    const serialData = data2.map(obj => [obj.tm, obj.drp || 0]);
-
-    const DRPLEVEL = [10, 25, 50, 100, 250];
-    const maxVal = DRPLEVEL.find(o => o > totalDrp);
-
-    return {
-      title: {
-        text: resultTm[0].substr(5, 8) + '至' + resultTm[1].substr(5, 8) + '降雨',
-        textStyle: {
-          color: '#333',
-          fontSize: 14,
-          fontWeight: 'normal'
-        },
-        left: 8,
-        top: 5,
-      },
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          lineStyle: {
-            color: '#333'
-          },
-          label: {
-            formatter: function (params) {
-              var date = new Date(params.value)
-              const year = date.getFullYear();
-              const month = date.getMonth()+1;
-              const day = date.getDate();
-              const hours = date.getHours().toString().padStart(2, '0')
-              const minutes = date.getMinutes().toString().padStart(2, '0')
-              return `${year}-${month}-${day}`+"\n"+`${hours}:${minutes}`
-            }
-          }
-        }
-      },
-      grid: {
-        show:true,
-        left: "7%",
-        top: "5%",
-        right: "7%",
-        bottom: "20%",
-        borderWidth: 0
-      },
-      calculable: true,
-      xAxis: [
-        {
-          type: 'time',
-          splitLine: {
-            show: false
-          },
-          axisLabel: {
-            color: '#333',
-            fontSize: 11,
-            show: true,
-            showMaxLabel: true,
-            showMinLabel: true,
-            formatter: function (value, index) {
-              var date = new Date(value);
-              const year = date.getFullYear();
-              const month = date.getMonth()+1;
-              const day = date.getDate();
-              const hours = date.getHours().toString().padStart(2, '0')
-              const minutes = date.getMinutes().toString().padStart(2, '0')
-              return `${hours}:${minutes}`+ "\n" + `${year}-${month}-${day}`
-            }
-          },
-          axisLine: {
-            lineStyle: {
-              color: '#07a6ff',
-              width: 0.5,
-            }
-          },
-          axisTick: {
-            show: false,
-          }
-        }
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          position: 'right',
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: '#07a6ff',
-              width: 0.25,
-              type: 'dashed'
-            }
-          },
-          axisLabel: {
-            color: '#333',
-            fontSize: 10,
-          },
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false,
-          },
-          min: 0,
-          max: maxVal
-        }
-      ],
-      series: [
-        {
-          name: record.source==="SH"?'降雨':"小时降雨",
-          type: 'bar',
-          barWidth: '60%',
-          data: serialData,//data2.map(o => o.drp),
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0],
-              color: new echarts.graphic.LinearGradient(
-                0, 0, 0, 1,
-                [
-                  { offset: 0, color: '#3876cd' },
-                  { offset: 0.5, color: '#45b4e7' },
-                  { offset: 1, color: '#54ffff' }
-                ]
-              ),
-            },
-          },
-          label: {
-            show: false,
-          },
-          markPoint: {
-            data: [
-              { type: 'max', name: '最大值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, -12] },
-            ]
-          },
-        },
-        {
-          name: '累计降雨',
-          type: 'line',
-          showSymbol: false,
-          label: {
-            show: false,
-          },
-          data: data2.map(o => o?.totalDrp.toFixed(1)),
-          lineStyle: {
-            normal: {
-              width: 1,
-            }
-          },
-          areaStyle: {
-            normal: {
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                offset: 0,
-                color: 'rgba(3, 194, 236, 0.3)'
-              }, {
-                offset: 0.8,
-                color: 'rgba(3, 194, 236, 0)'
-              }
-              ], false),
-              shadowColor: 'rgba(0, 0, 0, 0.1)',
-              shadowBlur: 10
-            }
-          },
-          itemStyle: {
-            normal: {
-              color: '#03C2EC'
-            }
-          },
-        }
-      ]
-    }
-  }, [data]);// eslint-disable-line
-
-  return (
-    <>
-      <ReactEcharts
-        option={option}
-        style={{ height: '15rem', width: '460px' }}
-      />
-      {
-        record?.type === '2022年新建雨量站'?null:<div className="drpChartGrid">
-        <div className="subtitle2">上报时间: {record.tm ? moment(record.tm).format('YYYY-MM-DD HH:mm:ss') : '-'}</div>
-        <div className="realdrpgrid clearFloat">
-          {
-            ['h1', 'h3', 'h6', 'h12', 'h24', 'h48'].map(key => (
-              <div key={key} className="item lf">
-                <div className="caption">{key}</div>
-                <div className="h5">{renderDrpWX(record, key)}</div>
-              </div>
-            ))
-          }
-        </div>
-      </div>
-      }
-
-    </>
-  )
-}
-
-export default React.memo(DrpChart);
diff --git a/src/views/Home/MapCtrl/charts/RealDrpPop/index.less b/src/views/Home/MapCtrl/charts/RealDrpPop/index.less
deleted file mode 100644
index e8c2a57..0000000
--- a/src/views/Home/MapCtrl/charts/RealDrpPop/index.less
+++ /dev/null
@@ -1,32 +0,0 @@
-.drpChartGrid,.hdChartGrid{
-  .subtitle2{
-    font-size:16px;
-    letter-spacing: 1px;
-    margin:15px 0 15px 10px;
-    color:#333;
-    font-weight:bold;
-  }
-  .item{
-    width:calc( 100% / 6 );
-    text-align: center;
-    .caption{
-      color:#333;
-      font-size:15px;
-    }
-    .h5{
-      font-size:22px;
-      margin:10px 0 20px 0;
-      span{
-        //background: rgba(4, 8, 27, 0.9);
-        //background: rgb(220,227,234,1);
-        padding: 0 8px;
-      }
-    }
-  }
-}
-
-.hdChartGrid{
-  .item{
-    width:calc( 100% / 4 );
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/charts/RealHDPop/HDChart.js b/src/views/Home/MapCtrl/charts/RealHDPop/HDChart.js
deleted file mode 100644
index d0cb63e..0000000
--- a/src/views/Home/MapCtrl/charts/RealHDPop/HDChart.js
+++ /dev/null
@@ -1,236 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react'
-import echarts from 'echarts/lib/echarts';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment';
-import { hdyjColor, renderHDRz1 } from '../../../../../utils/renutils';
-import { normalizeSearchTmRange } from '../../../../../utils/tools';
-import { queryImportantStStbprpBAndStRiverRApi, queryImportantStStbprpBAndStRsvrRApi } from '../../../../../service/homePage';
-import {xjswDrpSearch, xjylDrpSearch} from '../../../../../models/_/search';
-import appconsts from "../../../../../service/appconsts";
-
-function HDChart({ record }) {
-  //console.log("HDChart 11++++",record);
-  const [data, setData] = useState([]);
-
-  const tm = [moment().add(-24, 'hour'), moment()];
-  const resultTm = normalizeSearchTmRange(tm, 'h');
-
-  const getData = async () =>{
-    let params = {
-      "etm": moment().format('YYYY-MM-DD HH:mm:ss'),
-      "source": record.source,
-      "stcds": [record.stcd],
-      "stm": moment().add(-24, 'hour').format('YYYY-MM-DD HH:mm:ss'),
-      "type": "h"
-    };
-    const resData = record.source === "SK"?await queryImportantStStbprpBAndStRsvrRApi(params):await queryImportantStStbprpBAndStRiverRApi(params);
-
-    setData(resData || []);
-  };
-
-  useEffect(() => {
-    /*rzSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => {
-      setData(data || []);
-    });*/
-
-    //console.log("DrpChart 49++++",record.type);
-    if(record.source){
-      getData();
-    }else{
-      if (record.type === '2022年新建雨量站'){
-        xjylDrpSearch(record.stcd, 'h', resultTm, localStorage.getItem('ADCD6') + '000000').then((data) => {
-          setData(data || []);
-        });
-      }
-      if (record.type === '2022年新建水位站'||record.type === '新建简易水位站'){
-        xjswDrpSearch(record.stcd, 'h', resultTm, localStorage.getItem('ADCD6') + '000000').then((data) => {
-          setData(data || []);
-        });
-      }
-    }
-  }, [record])// eslint-disable-line
-
-  const option = useMemo(() => {
-    const serialData = data.map(obj => [obj.tm, obj.z || 0]);
-
-    let sorted = data.map(o => o.z);
-
-    const markLine = [];
-    const { sfz, wrz, grz } = record;
-
-    if (sfz) {
-      sorted.push(sfz);
-      markLine.push({ name: '设防', yAxis: sfz, lineStyle: { color: hdyjColor[1] } });
-    }
-    if (wrz) {
-      sorted.push(wrz);
-      markLine.push({ name: '警戒', yAxis: wrz, lineStyle: { color: hdyjColor[2] } });
-    }
-    if (grz) {
-      sorted.push(grz);
-      markLine.push({ name: '保证', yAxis: grz, lineStyle: { color: hdyjColor[3] } });
-    }
-
-
-    sorted = sorted.sort();
-    let minVal = sorted[0] || 0;
-    let maxVal = sorted[sorted.length - 1] || 0;
-    let dz = 0.5;
-    maxVal = Math.ceil(maxVal / dz) * dz;
-    minVal = Math.floor(minVal / dz) * dz;
-    minVal = minVal<0?0:minVal
-
-
-    return {
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          lineStyle: {
-            color: '#333'
-          }
-        }
-      },
-      grid: {
-        x: markLine.length > 0 ? 64 : 24,
-        y: 24,
-        x2: 38,
-        y2: 42,
-        borderWidth: 0
-      },
-      calculable: true,
-      xAxis: [
-        {
-          type: 'time',
-          splitLine: {
-            show: false
-          },
-          axisLabel: {
-            color: '#333',
-            fontSize: 12,
-            // formatter: val => val.substr('2020-10-14 '.length, 2)
-          },
-          axisLine: {
-            lineStyle: {
-              color: '#07a6ff',
-              width: 0.5,
-            }
-          },
-          axisTick: {
-            show: false,
-          }
-        }
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          position: 'right',
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: '#07a6ff',
-              width: 0.25,
-              type: 'dashed'
-            }
-          },
-          axisLabel: {
-            color: '#333',
-            fontSize: 12,
-          },
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false,
-          },
-          min: minVal,
-          max: maxVal
-        }
-      ],
-      series: [
-        {
-          name: '水位',
-          type: 'line',
-          showSymbol: false,
-          label: {
-            show: false,
-          },
-          data: serialData,
-          lineStyle: {
-            normal: {
-              width: 1,
-            }
-          },
-          areaStyle: {
-            normal: {
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                offset: 0,
-                color: 'rgba(3, 194, 236, 0.3)'
-              }, {
-                offset: 0.8,
-                color: 'rgba(3, 194, 236, 0)'
-              }
-              ], false),
-              shadowColor: 'rgba(0, 0, 0, 0.1)',
-              shadowBlur: 10
-            }
-          },
-          itemStyle: {
-            normal: {
-              color: '#03C2EC'
-            }
-          },
-          markPoint: {
-            data: [
-              { type: 'max', name: '最大值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, -12] },
-              { type: 'min', name: '最小值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, 12] }
-            ]
-          },
-          markLine: {
-            silent: true,
-            symbol: 'none',
-            label: {
-              position: 'start',
-              formatter: (p) => p?.name + ' ' + p?.value,
-            },
-            data: markLine
-          }
-        }
-      ]
-    };
-  }, [data]);// eslint-disable-line
-
-  const rtm = record.rzTm || record.tm;
-
-  return (
-    <>
-      <ReactEcharts
-        option={option}
-        style={{ height: '15rem', width: '460px' }}
-      />
-      <div className="hdChartGrid">
-        <div className="subtitle2" >上报时间: {rtm ? moment(rtm).format('YYYY-MM-DD HH:mm:ss') : '-'}</div>
-        <div className="realdrpgrid clearFloat">
-          <div className="item lf">
-            <div className="caption">水位</div>
-            {/*<div className="h5">{renderHDRz1(record)}</div>*/}
-            <div className="h5">{record.z!==null?record.z:"--"}</div>
-          </div>
-          <div className="item lf">
-            <div className="caption">设防水位</div>
-            <div className="h5">{record?.sfz || '--'}</div>
-          </div>
-          <div className="item lf">
-            <div className="caption">警戒水位</div>
-            <div className="h5">{record?.wrz || '--'}</div>
-          </div>
-          <div className="item lf">
-            <div className="caption">保证水位</div>
-            <div className="h5">{record?.grz || '--'}</div>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default React.memo(HDChart);
diff --git a/src/views/Home/MapCtrl/components/BaseInfo/index.js b/src/views/Home/MapCtrl/components/BaseInfo/index.js
deleted file mode 100644
index 7e20c4c..0000000
--- a/src/views/Home/MapCtrl/components/BaseInfo/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Descriptions } from 'antd';
-import React, {useEffect, useState} from 'react';
-import { queryBaseInfoApi } from '../../../../../service/homePage';
-import {dealValue} from "../../../../../utils/tools";
-import {getDictService} from "../../../../../service/SelectValue";
-
-function BaseInfoPage({ record }) {
-  const [data, setData] = useState({});
-  const [importancy,setImportancy] = useState({});
-  const [sttp,setSttp] = useState({});
-  const [source,setSource] = useState({})
-
-  const getDictValue = async()=>{
-    setImportancy(dealValue(await getDictService({dictType:'importancy'})));
-    setSttp(dealValue(await getDictService({dictType:'sttp'})));
-    setSource(dealValue(await getDictService({dictType:'source'})));
-  };
-
-  const getListData = async () => {
-    const resData = await queryBaseInfoApi({addvcd: localStorage.getItem('ADCD6'), "stcd": record.stcd});
-    console.log("12@@@@@",resData.records[0]);
-    setData(resData.records[0] || {});
-  };
-
-  useEffect(() => {
-    getDictValue();
-    getListData();
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered column={2}>
-        <Descriptions.Item label="测站名称">{data.stnm}</Descriptions.Item>
-        <Descriptions.Item label="测站编码">{data.stcd}</Descriptions.Item>
-        <Descriptions.Item label="是否为重点站">{importancy[data.importancy]}</Descriptions.Item>
-        <Descriptions.Item label="建设年度">{data.buildYear}</Descriptions.Item>
-        <Descriptions.Item label="测站类型" >{sttp[data.sttp]}</Descriptions.Item>
-        <Descriptions.Item label="来源">{source[data.source]}</Descriptions.Item>
-        <Descriptions.Item label="经度">{data.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{data.lttd}</Descriptions.Item>
-        <Descriptions.Item label="行政区划">{data.adnm}</Descriptions.Item>
-      </Descriptions>
-    </>
-  )
-}
-
-export default BaseInfoPage;
diff --git a/src/views/Home/MapCtrl/components/DrpSearch/drpOption.js b/src/views/Home/MapCtrl/components/DrpSearch/drpOption.js
deleted file mode 100644
index a1421f5..0000000
--- a/src/views/Home/MapCtrl/components/DrpSearch/drpOption.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-
-export default function drpOption({ data, grid, title }) {
-  let totalDrp = 0;
-  const data2 = data.reduce((pre, cur) => {
-    totalDrp += cur.drp;
-    pre.push({
-      ...cur,
-      totalDrp,
-    });
-    return pre;
-  }, []);
-
-  const DRPLEVEL = [10, 25, 50, 100, 250];
-  const maxVal = DRPLEVEL.find(o => o > totalDrp);
-
-  return {
-    title: title ? {
-      text: title,
-      textStyle: {
-        color: '#333',
-        fontSize: 14,
-        fontWeight: 'normal'
-      },
-      left: 8,
-      top: 16,
-    } : null,
-    tooltip: {
-      trigger: 'axis',
-      formatter: function (params) {
-        var res = `${params[0].name.substr('2020-10-14 '.length, 2)}时降雨: ${params[0].data}mm<br />累计降雨: ${params[1].data}mm`;
-        return res;
-      }
-    },
-    grid: grid || {
-      x: 40,
-      y: 24,
-      x2: 30,
-      y2: 28,
-      borderWidth: 0
-    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        data: data2.map(o => o.tm),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.substr('2020-'.length, 11)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'right',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: 0,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        name: '降雨',
-        type: 'bar',
-        barWidth: '60%',
-        data: data2.map(o => o.drp),
-        itemStyle: {
-          normal: {
-            barBorderRadius: [3, 3, 0, 0],
-            color: new echarts.graphic.LinearGradient(
-              0, 0, 0, 1,
-              [
-                { offset: 0, color: '#3876cd' },
-                { offset: 0.5, color: '#45b4e7' },
-                { offset: 1, color: '#54ffff' }
-              ]
-            ),
-          },
-        },
-        label: {
-          show: false,
-        },
-        markPoint: {
-          data: [
-            { type: 'max', name: '最大值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, -12] },
-          ]
-        },
-      },
-      {
-        name: '累计降雨',
-        type: 'line',
-        showSymbol: false,
-        label: {
-          show: false,
-        },
-        data: data2.map(o => o.totalDrp.toFixed(1)),
-        lineStyle: {
-          normal: {
-            width: 1,
-          }
-        },
-        areaStyle: {
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-              offset: 0,
-              color: 'rgba(3, 194, 236, 0.3)'
-            }, {
-              offset: 0.8,
-              color: 'rgba(3, 194, 236, 0)'
-            }
-            ], false),
-            shadowColor: 'rgba(0, 0, 0, 0.1)',
-            shadowBlur: 10
-          }
-        },
-        itemStyle: {
-          normal: {
-            color: '#03C2EC'
-          }
-        },
-      }
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/components/DrpSearch/index.js b/src/views/Home/MapCtrl/components/DrpSearch/index.js
deleted file mode 100644
index 46df512..0000000
--- a/src/views/Home/MapCtrl/components/DrpSearch/index.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { DatePicker } from 'antd';
-import { normalizeSearchTmRange } from '../../../../../utils/tools';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import drpOption from './drpOption';
-import {queryImportantStStbprpBAndStPptnRApi} from "../../../../../service/homePage";
-
-function DrpSearch({ record, showDatePicker, hasErrorData }) {
-  console.log("关联站点",record);
-
-  /*const [stm, handleDateChange1] = useState(() => moment().add(-1, 'd'));
-  const [etm, handleDateChange2] = useState(() => moment());*/
-  const [stm, handleDateChange1] = useState(() => record.stm?moment(record.stm):moment().add(-1, 'd'));
-  const [etm, handleDateChange2] = useState(() => record.etm?moment(record.etm):moment());
-  const [data, setData] = useState([]);
-
-  const searchTm = useMemo(() => {
-    if(stm && etm){
-      if (stm.isAfter(etm)) {
-        return { error: '开始时间应小于结束时间' };
-      }
-      if (etm.diff(stm, 'd') > 30) {
-        return { error: '查询跨度时间不得超过30天' };
-      }
-
-      return { tm: normalizeSearchTmRange([stm, etm])}// 'h') };
-    }
-  }, [stm, etm]);
-
-  const getData = async () => {
-    let params = {
-      "etm": showDatePicker ===1?moment(record.etm).format('YYYY-MM-DD HH:mm:ss'):moment(etm).format('YYYY-MM-DD HH:mm:ss'),
-      "source": record.source,
-      "stcds": [record.stcd],
-      "stm": showDatePicker ===1?moment(record.stm).format('YYYY-MM-DD HH:mm:ss'):moment(stm).format('YYYY-MM-DD HH:mm:ss'),
-      "type": ""
-    };
-
-    const ret = await queryImportantStStbprpBAndStPptnRApi(params);
-
-    if(ret.code === 200){
-      setData(ret.data || []);
-    }
-  };
-
-  useEffect(() => {
-    if (searchTm && searchTm.tm) {
-      /*drpSearch(record.type, record.stcd, 'h', searchTm.tm, record.countycode).then((data) => {
-        setData(data);
-      })*/
-      getData();
-    }
-  }, [searchTm, record]);// eslint-disable-line
-
-  const option = useMemo(() => {
-    const title = showDatePicker ===1?
-      (record.stm && record.etm && record.stm?.substr(5, 8) + '至' + record.etm?.substr(5, 8) + '降雨'):
-      (searchTm && searchTm.tm && searchTm.tm[0]?.substr(5, 8) + '至' + searchTm.tm[1]?.substr(5, 8) + '降雨');
-    return drpOption({ data, title });
-  }, [data]);// eslint-disable-line
-
-  return (
-    <div style={{ width:"98%", height: '52vh' }}>
-      {
-        showDatePicker !==1 && <div >
-          <DatePicker
-            label="开始时间"
-            value={stm}
-            onChange={handleDateChange1}
-            showTime
-          />
-          <span style={{ margin: '0 1rem' }}>-</span>
-          <DatePicker
-            label="结束时间"
-            value={etm}
-            onChange={handleDateChange2}
-            showTime
-          />
-        </div>
-      }
-
-      {searchTm?.error ? (
-        <div style={{ width: '100%', color:"red" }} className="error">{searchTm.error}</div>
-      ) : (
-        <div style={{ width:"100%", height: '50vh' }}>
-          {
-            showDatePicker ===1?<div style={{textAlign:"center",marginTop:"10px"}}>{record.stnm}</div>:null
-          }
-          {
-            data.length>0 && !hasErrorData?
-              <ReactEcharts
-                option={option}
-                style={{ width:"100%", height: '50vh' }}
-              />:<div style={{textAlign:"center", margin:"10%"}}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-          }
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default DrpSearch
diff --git a/src/views/Home/MapCtrl/components/DrpStAround.js b/src/views/Home/MapCtrl/components/DrpStAround.js
deleted file mode 100644
index e8be416..0000000
--- a/src/views/Home/MapCtrl/components/DrpStAround.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/* eslint-disable react/no-unused-state */
-/* eslint-disable no-unused-vars */
-import React from 'react';
-import {Button, Form, Table, InputNumber, Select, message, Checkbox} from 'antd';
-import {queryNearbyRainStations} from "../../../../service/ssyq";
-import {renderTm} from '../../../../utils/renutils';
-import appconsts from '../../../../service/appconsts';
-
-function distanceOfEarth(latlng1, latlng2) {
-  const rad = Math.PI / 180;
-  const lat1 = latlng1[1] * rad;
-  const lat2 = latlng2[1] * rad;
-  const sinDLat = Math.sin((latlng2[1] - latlng1[1]) * rad / 2);
-  const sinDLon = Math.sin((latlng2[0] - latlng1[0]) * rad / 2);
-  const a = sinDLat * sinDLat + Math.cos(lat1) * Math.cos(lat2) * sinDLon * sinDLon;
-  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-  return 6371000 * c;
-}
-
-export default class DrpStAround extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      record: props.data || {},
-      distance: 1,
-      sources: ["SH", "SW", "QX", "SK"],
-      sttype: undefined,
-      loading: false,
-      data: [],
-      filteredData: [],
-      typeOptions: [
-        {label: "山洪", value: "SH"},
-        {label: "水文", value: "SW"},
-        {label: "气象", value: "QX"},
-        {label: "水库", value: "SK"},
-      ],
-    };
-
-    this.columns = [
-      {
-        title: '测站名称',
-        dataIndex: 'stnm',
-        key: 'stnm',
-        width: 100,
-        align: 'center',
-        ellipsis: true,
-      },
-      {
-        title: '类型',
-        dataIndex: 'source',
-        key: 'source',
-        width: 60,
-        align: 'center',
-        render: val => appconsts.sttype[val]
-      },
-      {
-        title: '距离(km)',
-        dataIndex: 'distance',
-        key: 'distance',
-        width: 80,
-        align: 'center',
-        render: val => val ? val.toFixed(2): 0
-      },
-      {title: '1时(mm)', dataIndex: 'h1', key: 'h1', width: 50, align: 'center', render: (val, record) => record.h1},
-      {title: '3时(mm)', dataIndex: 'h3', key: 'h3', width: 50, align: 'center', render: (val, record) => record.h3},
-      {title: '6时(mm)', dataIndex: 'h6', key: 'h6', width: 50, align: 'center', render: (val, record) => record.h6},
-      {title: '24时(mm)', dataIndex: 'h24', key: 'h24', width: 50, align: 'center', render: (val, record) => record.h24},
-      {
-        title: '上报时间',
-        dataIndex: 'tm',
-        key: 'tm',
-        width: 100,
-        align: 'center',
-        render: (val, record) => renderTm(record)
-      },
-    ];
-  }
-
-  componentDidMount = () => {
-    this.loadData();
-  }
-
-  loadData = async () => {
-    let params = {
-      stcd: this.state.record.stcd,
-      sources: this.state.sources,
-      distance: this.state.distance
-    }
-    this.setState({loading: true});
-    queryNearbyRainStations(params).then((data) => {
-      this.setState({loading: false, data: data});
-    });
-  }
-
-  doSearch = async () => {
-    this.loadData()
-  }
-
-  render() {
-    const {loading, data, distance, typeOptions} = this.state;
-
-    return (
-      <div>
-        <div style={{marginBottom: '12px'}}>
-          <Form layout="inline">
-            <Form.Item label="距离">
-              <InputNumber value={distance} onChange={val => this.setState({distance: val})}/>
-              <span style={{marginLeft: 8}}>(km)</span>
-            </Form.Item>
-            <Form.Item label="类型">
-              <Checkbox.Group options={typeOptions} onChange={val => this.setState({sources: val})}
-                              defaultValue={["SH", "SW", "QX", "SK"]}/>
-            </Form.Item>
-            <Form.Item>
-              <Button type="primary" onClick={this.doSearch} disabled={loading}>查询</Button>
-            </Form.Item>
-          </Form>
-        </div>
-        <div>
-          <Table
-            size="small"
-            rowKey={rec => rec.type + rec.stcd}
-            bordered
-            dataSource={data}
-            columns={this.columns}
-            pagination={{pageSize: 10, hideOnSinglePage: true}}
-          />
-        </div>
-      </div>
-    );
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Glfzdx/index.less b/src/views/Home/MapCtrl/components/Glfzdx/index.less
deleted file mode 100644
index 37e0987..0000000
--- a/src/views/Home/MapCtrl/components/Glfzdx/index.less
+++ /dev/null
@@ -1,90 +0,0 @@
-.riskInfoBox{
-  .name{
-    width:80px;
-    height:32px;
-    line-height:32px;
-    letter-spacing: 1px;
-    background: #0893FF;
-    border-radius:10px;
-    color:#fff;
-    text-align: center;
-    margin:0 10px 0 20px;
-  }
-  .subName{
-    color: #0893FF;
-    line-height: 45px;
-    font-size: 15px;
-  }
-  .title{
-    font-size: 15px;
-    color:#656565;
-    letter-spacing: 1px;
-    position: relative;
-    padding-left:30px;
-    box-sizing: border-box;
-    font-weight:bold;
-    margin-bottom:10px;
-    &:before{
-      content:"";
-      display:block;
-      position: absolute;
-      width: 17px;
-      height:17px;
-      //background:#B5B5B5;
-      border-radius:50%;
-      left:0;
-      top:3px;
-    }
-  }
-  .txt {
-    padding-left: 30px;
-    box-sizing: border-box;
-  }
-
-  .personBox{
-    .txt{
-      .userName{
-        margin-right: 12px;
-        &:nth-child(1){
-          text-indent: 28px;
-        }
-      }
-      span{
-        font-size: 15px;
-      }
-    }
-
-    .telBtn{
-      color:#6FB4FF;
-      font-weight:bold;
-      font-size: 16px;
-      cursor:pointer;
-    }
-  }
-  .possibilityBox{
-    margin:10px 0;
-    .title{
-      &:before{
-        background:#FFFF00;
-      }
-    }
-    .title1{
-      &:before{
-        background: blue;
-      }
-    }
-    .txt{
-      >div{
-        padding-left: 28px;
-        font-size: 15px;
-      }
-    }
-  }
-
-  .item{
-    border-bottom: 1px solid #EEF3F9;
-    margin-top:10px;
-    padding:0 20px;
-    box-sizing: border-box;
-  }
-}
diff --git a/src/views/Home/MapCtrl/components/Glfzdx/index.tsx b/src/views/Home/MapCtrl/components/Glfzdx/index.tsx
deleted file mode 100644
index b1738ed..0000000
--- a/src/views/Home/MapCtrl/components/Glfzdx/index.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, {useMemo, useState, useEffect } from 'react';
-import {Table} from 'antd';
-
-import "./index.less"
-import { getSiteToFZDXApi } from '../../../../../service/homePage';
-
-type IProps = {
-
-}
-
-const Glfzdx: React.FC<IProps> = (props:any) => {
-  const stcd = props?.record?.stcd;
-  const sttp = props?.record?.sttp;
-
-  const [myData,setMyData] = useState<any>([])
-  
-  const columns = useMemo<any>(() => [
-    { title: '序号', key: '', width:50, dataIndex: '', align:"center", render:(item:any,index:any,c:any)=>c+1},
-    { title: '小流域编码', key: 'wscd', width:90, dataIndex: 'wscd', align:"center" },
-    { title: '小流域名称', key: 'wsnm', width:70, dataIndex: 'wsnm' , align:"center"},
-    { title: '区划编码', key: 'adcd', width:80, dataIndex: 'adcd' , align:"center"},
-    { title: '防灾对象', key: 'adnm', width:80, dataIndex: 'adnm' , align:"center"},
-
-  ], [stcd]);
-
-  const getData = async () => {
-    let params = {
-      "stcd": stcd,
-      "sttp": sttp
-    };
-    const resData = await getSiteToFZDXApi(params);
-    setMyData(resData);
-  };
-
-  useEffect(()=>{
-    getData();
-  },[stcd])
-
-  return (
-    <div style={{width:"98%",marginLeft:"1%", position:"relative"}}>
-      <div className="smallTable">
-        <Table
-          rowKey="id"
-          size="small"
-          columns={columns}
-          // @ts-ignore
-          dataSource={myData}
-          scroll={{ y: 390 }}
-          pagination={false}
-        />
-      </div>
-
-    </div>
-  )
-};
-
-export default Glfzdx
diff --git a/src/views/Home/MapCtrl/components/GsJcsj/TableData.js b/src/views/Home/MapCtrl/components/GsJcsj/TableData.js
deleted file mode 100644
index 3f72635..0000000
--- a/src/views/Home/MapCtrl/components/GsJcsj/TableData.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import {Table} from 'antd';
-import React, { useEffect, useState } from 'react';
-import moment from 'moment';
-import { render } from 'react-dom';
-
-
-const Tabledata = ({ data, current }) => {
-  const columns = [
-    {title: '序号', key: 'inx', dataIndex: 'inx', align: 'center',},
-    {
-      title: '数据时间', key: 'tm', dataIndex: 'tm', align: 'center',
-      render:(rec) => <span>{rec ? moment(rec).format("YYYY-MM-DD HH:mm") : "-"}</span>
-    },
-    {
-      title: '流量(m³/s)', key: 'q', dataIndex: 'q', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-    {
-      title: '水量(m³)', key: 'v', dataIndex: 'v', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-  ];
-
- 
-  const [tableData, setTableData] = useState([])
-  useEffect(() => {
-    if (data.length > 0) { 
-      setTableData(data)
-    }
-  },[data])
-  return (
-    <>
-      <Table
-        rowKey="adcd"
-        columns={columns}
-        pagination={false}
-        dataSource={tableData}
-      />
-
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js b/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js
deleted file mode 100644
index 0ca893e..0000000
--- a/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js
+++ /dev/null
@@ -1,168 +0,0 @@
-
-import { useMemo } from 'react';
-import echarts from 'echarts/lib/echarts';
-
-export default function DrpOption(data, num) {
-  console.log("num",num);
-  const minL = Math.floor(Math.min(...data?.map(s => s.q)));
-  const maxL = Math.ceil(Math.max(...data?.map(s => s.q)));
-  const minS = Math.floor(Math.min(...data?.map(s => s.v)));
-  const maxS = Math.ceil(Math.max(...data?.map(s => s.v)));
-  return {
-    title: {
-      text: `时段总水量:${num.value}${num.unit}m³`,
-      top: "2%",
-      right: "12%",
-      textStyle: {
-         fontWeight: "normal",
-         fontSize:14
-      }
-    },
-    tooltip: {
-      trigger: 'axis',
-      // formatter: function (params) {
-      //   var res = `${params[0].name.substr('2020-10-14 '.length, 2)}时降雨: ${params[0].data}mm<br />累计降雨: ${params[1].data}mm`;
-      //   return res;
-      // }
-    },
-    grid:  {
-      // x: 40,
-      // y: 30,
-      // x2: 30,
-      // y2: 28,
-      top: '20%',
-      left: '10%',
-      right: '10%',
-      bottom: '10%',
-      borderWidth: 0
-    },
-    legend: {
-      // 显示图例
-      show: true,
-      top: "8%",
-      // 图例的位置
-      // data: ['实测', '累计']
-    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        data: data?.map(item => item.tm),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 14,
-          formatter: val => val.substr(0,'2020-11-11 11:11'.length)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'left',
-        name:"流量(m³/s)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minL,
-        max: maxL
-      },
-      {
-        type: 'value',
-        position: 'right',
-        name:"水量(m³)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minS - 1,
-        max: maxS
-      }
-    ],
-    series: [
-     
-      {
-        name:'流量',
-        type:'line',
-        smooth: true,
-        showSymbol: false,
-        symbol: false,
-        itemStyle: {
-          normal: {
-            color: "#FAC858",
-          }
-        },
-        lineStyle: {
-          normal: {
-            width: 3,
-            shadowColor: 'rgba(0,0,0,0.4)',
-            shadowBlur: 10,
-            shadowOffsetY: 10
-          }
-        },
-        markPoint: {
-          data: [{
-            name: '最大值',
-            type: 'max',
-          }],
-        },
-        data: data?.map(s => s.q),
-      },
-      {
-        name: '水量',
-        type: 'bar',
-        yAxisIndex:1,
-        barWidth: '10%',
-        data: data?.map(s => s.v),
-        itemStyle: {
-          normal: {
-            color:"#5773c7"
-          },
-        },
-        label: {
-          show: false,
-        },
-      },
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/components/GsJcsj/index.js b/src/views/Home/MapCtrl/components/GsJcsj/index.js
deleted file mode 100644
index 37de561..0000000
--- a/src/views/Home/MapCtrl/components/GsJcsj/index.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import NormalSelect from '../../../../../components/Form/NormalSelect';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption';
-import { httppost2,httppost5 } from '../../../../../utils/request';
-import apiurl from '../../../../../service/apiurl';
-import { exportFile,numberFormat } from '../../../../../utils/tools.js';
-
-const {RangePicker} = DatePicker;
-
-function DrpSearch({record}) {
-  const name = record?.sttp == "QQ" ?"放水管流量": record?.sttp == "PQ" ? "输水管流量" : ""
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-  const [data, setData] = useState([]);
-  const [params, setParams] = useState({tm:[]})
-  const [current, setCurrent] = useState(0);
-
-  const option = useMemo(() => {
-    let num = 0;
-    if (data.length > 0) {
-      data.forEach(s => {
-        num += Number(s.v)
-      })
-      return drpOption(data, numberFormat(num));
-     }
-  }, [data])
-
-  const searchTm = (e) => {
-    setParams({
-      ...params,
-      tm:e,
-    })
-  };
-  const doSearch = () => {
-    let data = {
-      ...params,
-      startTime:params.tm[0].format("YYYY-MM-DD HH:mm:00"),
-      endTime: params.tm[1].format("YYYY-MM-DD HH:mm:00"),
-    }
-    getData(data)
-  }
-  const optionChange = (e) => {
-    onValuesChange(e)
-  }
-  const onValuesChange = (e) => {
-    switch (e) {
-      case 1:
-        setParams({ ...params, tm: [moment().startOf("day"), moment()] })
-        break;
-      case 2:
-        setParams({ ...params, tm: [moment().subtract(7, 'days'), moment()] })
-        break;
-      case 3:
-        setParams({ ...params, tm: [moment().subtract(1, 'months'),moment()] })
-        break;
-      case 4:
-        setParams({ ...params, tm: [moment().subtract(3, 'months'),moment()]})
-        break;
-      case 5:
-        setParams({ ...params, tm: [moment().subtract(1, 'years'),moment()]})
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const exportExcel = () => {
-    let data = {
-      ...params,
-      stcd: record.stcd,
-      isAsc: false,
-      sortField: "tm",
-      tm:undefined
-    }
-    httppost5(apiurl.home.export, data).then(res => {
-      exportFile(`${name}.xlsx`,res.data)
-  })
-  }
-  const getData = async (params) => {
-    let data = {
-      ...params,
-      stcd: record.stcd,
-      isAsc: false,
-      sortField: "tm",
-      tm:undefined
-    }
-   try {
-     const res = await httppost2(apiurl.home.gsPage, data)
-     setData(res.data.map((item,i)=>({...item,inx: i+1})))
-   } catch (error) {
-    console.log(error);
-   }
-  }
-
-  useEffect(() => {
-    let option = "";
-    if (record.stcd) {
-      option = {
-        stcd: record?.stcd,
-        startTime: params?.startTime || moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm:00"), 
-        endTime: params?.endTime || moment().add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:00"),
-        tm:[moment().subtract(7, 'days'), moment()]
-      }
-      setParams(option)
-      getData(option)
-    }
-
-
-  }, [current,record])
-
-
-  return (
-    <div style={{width: "98%", height: '56vh'}}>
-      <div className="top">
-        <div style={{ display: "flex", columnGap: 10, alignItems: "center" }}>
-          <span>时间段：</span>
-        <RangePicker
-          showTime
-          allowClear
-          style={{ width: "407px" }}
-          defaultValue={params.tm}
-          onChange={searchTm}
-          format="YYYY-MM-DD HH:mm"
-          value={params.tm} 
-        />
-        </div>
-        <div style={{ display: "flex", columnGap: 10, alignItems: "center",margin:"0 20px" }}>
-          <span>常用时段：</span>
-          <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-              onChange={(e)=>optionChange(e)}
-            />
-        </div>
-        <Button type="primary" onClick={doSearch} style={{ marginLeft: "10px" }}>查询</Button>
-        <Button  onClick={exportExcel} style={{marginLeft: "10px"}}>导出</Button>
-      </div>
-      <div className="mid">
-        <div className="mid-left">
-          <TableData data={data} current={current}/>
-        </div>
-        <div className="mid-right">
-          {
-            data?.length > 0 ?
-              <ReactEcharts
-                option={option}
-                style={{width: "100%", height: '100%'}}
-              /> : <div style={{textAlign: "center", margin: "10%"}}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-          }
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default DrpSearch
diff --git a/src/views/Home/MapCtrl/components/GsJcsj/index.less b/src/views/Home/MapCtrl/components/GsJcsj/index.less
deleted file mode 100644
index 9977027..0000000
--- a/src/views/Home/MapCtrl/components/GsJcsj/index.less
+++ /dev/null
@@ -1,65 +0,0 @@
-.top {
-  display: flex;
-  align-items: center;
-
-  .time-type {
-    margin-left: 10rem;
-    display: flex;
-
-    div {
-      width: 80px;
-      text-align: center;
-      border: 1px solid #cccccc;
-      padding: 8px 0;
-    }
-
-    .active {
-      color: #5FB7FF;
-      background: #F0F7FF;
-      border: 1px solid #5FB7FF;
-    }
-  }
-}
-
-.mid {
-
-  margin-top: 10px;
-  display: flex;
-  justify-content: space-between;
-  height: 90%;
-  .mid-left {
-    border: 1px solid #eee;
-    width: 47%;
-    height: 100%;
-    overflow: auto;
-  }
-
-  .mid-right {
-    width: 52%;
-    height: 100%;
-    .react-chart {
-      width: 100%;
-      height: 300px;
-    }
-  }
-}
-
-.footer{
-  font-size: 14px;
-  margin-top: 40px;
-  .footer-row{
-    display: flex;
-    justify-content: space-between;
-    .footer-item{
-      flex: 1;
-      text-align: center;
-      .footer-name{
-        background: #E0EDFF ;
-        padding: 4px 0;
-      }
-      .footer-num{
-        padding: 4px 0;
-      }
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/components/Jcsj/TableData.js b/src/views/Home/MapCtrl/components/Jcsj/TableData.js
deleted file mode 100644
index c4661c2..0000000
--- a/src/views/Home/MapCtrl/components/Jcsj/TableData.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-import { render } from 'react-dom';
-
-
-const Tabledata = ({data,current}) => {
-  const columns = [
-    {title: '时间', key: 'time', dataIndex: 'time', align: 'center',},
-    {
-      title: '小时雨量(mm)', key: 'sumDrp', dataIndex: 'sumDrp', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-  ];
-
-  const columns1 = [
-    {title: '时间', key: 'timeStr', dataIndex: 'timeStr', align: 'center',},
-    {
-      title: '日雨量(mm)', key: 'sumDrp', dataIndex: 'sumDrp', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      {
-        current==0?  <Table rowKey="adcd"
-                            columns={columns}
-                            pagination={false}
-                            dataSource={tableData}
-        />: <Table rowKey="adcd"
-                   columns={columns1}
-                   pagination={false}
-                   dataSource={tableData}
-                   bordered
-        />
-      }
-
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Jcsj/drpOption.js b/src/views/Home/MapCtrl/components/Jcsj/drpOption.js
deleted file mode 100644
index ccde8bc..0000000
--- a/src/views/Home/MapCtrl/components/Jcsj/drpOption.js
+++ /dev/null
@@ -1,182 +0,0 @@
-
-import { useMemo } from 'react';
-import echarts from 'echarts/lib/echarts';
-
-export default function DrpOption({ echartData, grid }) {
-  console.log(echartData);
-  let totalDrp = 0;
-  const DRPLEVEL = [10, 20, 50, 100, 250];
-  const maxVal = DRPLEVEL.find(o => o > totalDrp);
-  const xMaxVal = echartData?.actual ? DRPLEVEL.find(o => {
-    let max = Math.max(...echartData?.actual || [])
-    return o > max
-  }):maxVal
-  // const xMaxVal = Math.ceil(Math.max(...echartData.actual)) + 2
-  const yMaxVal = echartData?.actual ? DRPLEVEL.find(o => {
-    let max = Math.max(...echartData?.total) 
-   return  o > max
-  }): maxVal
-  
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-      // formatter: function (params) {
-      //   var res = `${params[0].name.substr('2020-10-14 '.length, 2)}时降雨: ${params[0].data}mm<br />累计降雨: ${params[1].data}mm`;
-      //   return res;
-      // }
-    },
-    grid: grid || {
-      x: 40,
-      y: 30,
-      x2: 30,
-      y2: 28,
-      borderWidth: 0
-    },
-    legend: {
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ['实测', '累计']
-    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        data: echartData?.time,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.substr('2020-'.length, 11)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'left',
-        name:"雨量mm",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: 0,
-        max: xMaxVal
-      },
-      {
-        type: 'value',
-        position: 'right',
-        name:"累计mm",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: 0,
-        max: yMaxVal
-      }
-    ],
-    series: [
-      {
-        name: '实测',
-        type: 'bar',
-        barWidth: '60%',
-        data: echartData?.actual,
-        itemStyle: {
-          normal: {
-            barBorderRadius: [3, 3, 0, 0],
-            color: new echarts.graphic.LinearGradient(
-              0, 0, 0, 1,
-              [
-                { offset: 0, color: '#3876cd' },
-                { offset: 0.5, color: '#45b4e7' },
-                { offset: 1, color: '#54ffff' }
-              ]
-            ),
-          },
-        },
-        label: {
-          show: false,
-        },
-        markPoint: {
-          data: [
-            { type: 'max', name: '最大值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, -12] },
-          ]
-        },
-      },
-      {
-        yAxisIndex: 1,
-        name: '累计',
-        type: 'line',
-        showSymbol: false,
-        label: {
-          show: false,
-        },
-        data: echartData?.total,
-        lineStyle: {
-          normal: {
-            width: 1,
-          }
-        },
-        areaStyle: {
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-              offset: 0,
-              color: 'rgba(3, 194, 236, 0.3)'
-            }, {
-              offset: 0.8,
-              color: 'rgba(3, 194, 236, 0)'
-            }
-            ], false),
-            shadowColor: 'rgba(0, 0, 0, 0.1)',
-            shadowBlur: 10
-          }
-        },
-        itemStyle: {
-          normal: {
-            color: '#03C2EC'
-          }
-        },
-      }
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/components/Jcsj/index.js b/src/views/Home/MapCtrl/components/Jcsj/index.js
deleted file mode 100644
index c458e32..0000000
--- a/src/views/Home/MapCtrl/components/Jcsj/index.js
+++ /dev/null
@@ -1,195 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import clsx from "clsx";
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption';
-import {StcdAndStartTimeAndEndTime,StcdAndStartTimeAndEndTimeHour,queryStPptnDetails,queryStStbprpPerDayChart,queryStStbprpPerHourChart,maxDrpUrl} from '../../../../../service/ssyq'
-
-const {RangePicker} = DatePicker;
-
-function DrpSearch({record}) {
-
-  // 获取当前时间
-  const currentTime = moment();
-
-// 设置早上八点的时间
-  const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0});
-  const [data, setData] = useState([]);
-  const [params, setParams] = useState({tm:[]})
-  const [echartData, setEchartData] = useState({});
-  const [current, setCurrent] = useState(0);
-  const [detail, setDetail] = useState({});
-  const [maxDrp, setMaxDrp] = useState({})
-
-  const option = useMemo(() => {
-      return drpOption({echartData});
-  }, [echartData])
-
-  const searchTm = (e) => {
-    if (!e) {
-      setParams({...params, tm: "" })
-    } else {
-      setParams({
-        ...params,
-        startTime: e[0].format("YYYY-MM-DD HH:mm"),
-        endTime: e[1].format("YYYY-MM-DD HH:mm"),
-        tm:e,
-      })
-      
-    }
-  };
-  const doSearch = () => {
-    getData(params)
-  }
-
-
-  const getData = async (params) => {
-    console.log("params",params);
-    if(current==0){
-      setData(await StcdAndStartTimeAndEndTimeHour(params));
-      setMaxDrp(await maxDrpUrl(params));
-      setEchartData(await queryStStbprpPerHourChart(params));
-    }else{
-      setData(await StcdAndStartTimeAndEndTime(params));
-      setMaxDrp(await maxDrpUrl(params));
-      setEchartData(await queryStStbprpPerDayChart(params));
-    }
-    setDetail(await queryStPptnDetails(record?.stcd))
-  }
-
-  //今天日历数
-  const days=moment().diff(moment().startOf('year'),'days')+1
-
-
-
-  useEffect(() => {
-    let option = "";
-      option = {
-        stcd: record?.stcd,
-        startTime: current == 0 ?
-        params?.startTime || moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm") :
-        params?.startTime || moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
-        endTime:
-          current == 0 ?
-          params?.endTime || moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm") :
-          params?.endTime || moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
-        tm: [
-            params?.tm[0] ||
-            moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}),
-          params?.tm[1] ||
-          moment().add(1, 'hour').set({minute: 0, second: 0})
-        ],
-      }
-
-    if (record.stcd) {
-      setParams(option)
-    getData(option)
-    }
-
-  }, [current,record])
-
-
-  return (
-    <div style={{width: "98%", height: '56vh'}}>
-      <div className="top">
-        {
-          current == 0 ? <RangePicker showTime allowClear style={{width: "330px"}}
-            defaultValue={params.tm}
-                                      onChange={searchTm}
-                                      format="YYYY-MM-DD HH:mm"
-                                      value={params.tm}
-          /> : <RangePicker allowClear style={{width: "330px"}}
-                            onChange={searchTm}
-                            format="YYYY-MM-DD"
-                            value={params.tm}
-          />
-        }
-
-        <Button type="primary" onClick={doSearch} style={{marginLeft: "10px"}}>查询</Button>
-
-        <div className="time-type">
-          {
-            ['小时', '日'].map((item, index) => (
-              <div className={clsx({sqActive: index === current})} onClick={() => setCurrent(index)}>{item}</div>
-            ))
-          }
-        </div>
-      </div>
-      <div className="mid1" >
-        <div className="mid-left" style={record?.height ? { height: "55vh" } : {}}>
-          <TableData data={data} current={current}/>
-        </div>
-        <div className="mid-right" style={record?.height ? { height: "55vh" } : {}}>
-          {
-            data?.length > 0 ?
-              <ReactEcharts
-                option={option}
-                style={{width: "100%", height: '100%'}}
-              /> : <div style={{textAlign: "center", margin: "10%"}}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-          }
-        </div>
-      </div>
-      <div className="footer" style={record?.height?{fontSize:15}:{}}>
-        <div className="footer-row">
-          <div className="footer-item">
-            <div className="footer-name">最大1h雨量(mm)</div>
-            <div className="footer-num">{maxDrp?.h1||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">最大3h雨量(mm)</div>
-            <div className="footer-num">{maxDrp?.h3||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">最大6h雨量(mm)</div>
-            <div className="footer-num">{maxDrp?.h6||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">最大12h雨量(mm)</div>
-            <div className="footer-num">{maxDrp?.h12||0}</div>
-          </div>
-          {/* <div className="footer-item">
-            <div className="footer-name">近24h雨量(mm)</div>
-            <div className="footer-num">{detail?.h24||0}</div>
-          </div> */}
-          <div className="footer-item">
-            <div className="footer-name">本年降雨天数</div>
-            <div className="footer-num"><span style={{color:"#E69224"}}>{detail?.yearDrpDay}</span>/{days}</div>
-          </div>
-        </div>
-        <div className="footer-row">
-          {/* <div className="footer-item">
-            <div className="footer-name">近48h雨量(mm)</div>
-            <div className="footer-num">{detail?.h48||0}</div>
-          </div> */}
-          <div className="footer-item">
-            <div className="footer-name">今日雨量(mm)</div>
-            <div className="footer-num">{detail.today}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">昨日雨量(mm)</div>
-            <div className="footer-num">{detail?.yesterdayDrp}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本月雨量(mm)</div>
-            <div className="footer-num">{detail?.monthDrp}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年雨量(mm)</div>
-            <div className="footer-num">{detail?.yearDrp}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年最大日雨量(mm)</div>
-            <div className="footer-num">{detail?.maxDrp}<span style={{color:"#E69224"}}>({moment(detail?.maxDrpTime).format("YYYY-MM-DD")})</span></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default DrpSearch
diff --git a/src/views/Home/MapCtrl/components/Jcsj/index.less b/src/views/Home/MapCtrl/components/Jcsj/index.less
deleted file mode 100644
index 107e9d9..0000000
--- a/src/views/Home/MapCtrl/components/Jcsj/index.less
+++ /dev/null
@@ -1,65 +0,0 @@
-.top {
-  display: flex;
-  align-items: center;
-
-  .time-type {
-    margin-left: 10rem;
-    display: flex;
-
-    div {
-      width: 80px;
-      text-align: center;
-      border: 1px solid #cccccc;
-      padding: 8px 0;
-    }
-
-    .sqActive {
-      color: #5FB7FF;
-      background: #F0F7FF;
-      border: 1px solid #5FB7FF;
-    }
-  }
-}
-
-.mid1 {
-
-  margin-top: 10px;
-  display: flex;
-  justify-content: space-between;
-
-  .mid-left {
-    border: 1px solid #eee;
-    width: 40%;
-    height: 35vh;
-    overflow: auto;
-  }
-
-  .mid-right {
-    width: 50%;
-
-    .react-chart {
-      width: 100%;
-      height: 300px;
-    }
-  }
-}
-
-.footer{
-  font-size: 14px;
-  margin-top: 40px;
-  .footer-row{
-    display: flex;
-    justify-content: space-between;
-    .footer-item{
-      flex: 1;
-      text-align: center;
-      .footer-name{
-        background: #E0EDFF ;
-        padding: 4px 0;
-      }
-      .footer-num{
-        padding: 4px 0;
-      }
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/components/RzSearch/index.js b/src/views/Home/MapCtrl/components/RzSearch/index.js
deleted file mode 100644
index 45edd39..0000000
--- a/src/views/Home/MapCtrl/components/RzSearch/index.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { DatePicker } from 'antd';
-import {xjswDrpSearch, xjylDrpSearch} from '../../../../../models/_/search';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import rzOption from './rzOption';
-
-import {
-  queryImportantStStbprpBAndStRiverRApi,
-  queryImportantStStbprpBAndStRsvrRApi
-} from "../../../../../service/homePage";
-import appconsts from "../../../../../service/appconsts";
-
-function RzSearch({ record }) {
-  const [selectedDate1, handleDateChange1] = useState(() => moment().add(-24, 'hour'));
-  const [selectedDate2, handleDateChange2] = useState(() => moment());
-  const [data, setData] = useState([]);
-
-  const searchTm = useMemo(() => {
-    if(selectedDate1 && selectedDate2){
-      if (selectedDate1.isAfter(selectedDate2)) {
-        return { error: '开始时间应小于结束时间' };
-      }
-      if (selectedDate2.diff(selectedDate1, 'd') > 30) {
-        return { error: '查询跨度时间不得超过30天' };
-      }
-
-      let time1 = moment(selectedDate1).format('YYYY-MM-DD HH:mm:ss');
-      let time2 = moment(selectedDate2).format('YYYY-MM-DD HH:mm:ss');
-
-      return { tm: [time1, time2] };
-    }else{
-      return { tm: null };
-    }
-  }, [selectedDate1, selectedDate2]);
-
-  const getData = async () =>{
-    console.log("32++++",searchTm.tm);
-
-    let params = {
-      "etm": searchTm.tm[1],//moment().format('YYYY-MM-DD HH:mm:ss'),
-      "source": record.source,
-      "stcds": [record.stcd],
-      "stm": searchTm.tm[0],//moment().add(-24, 'hour').format('YYYY-MM-DD HH:mm:ss'),
-      "type": "h"
-    };
-    const resData = record.source === "SK"?await queryImportantStStbprpBAndStRsvrRApi(params):await queryImportantStStbprpBAndStRiverRApi(params);
-
-    setData(resData || []);
-  };
-
-  useEffect(() => {
-    if (searchTm.tm) {
-      /*rzSearch(record.type, record.stcd, 'h', searchTm.tm).then((data) => {
-        setData(data);
-      })*/
-      console.log("RzSearch 49++++",record.type);
-      if(record.source){
-        getData();
-      }else{
-        if (record.type === '2022年新建雨量站'){
-          xjylDrpSearch(record.stcd, 'h', searchTm.tm, localStorage.getItem('ADCD6') + '000000').then((data) => {
-            setData(data || []);
-          });
-        }
-        if (record.type === '2022年新建水位站'||record.type === '新建简易水位站'){
-          xjswDrpSearch(record.stcd, 'h', searchTm.tm, localStorage.getItem('ADCD6') + '000000').then((data) => {
-            setData(data || []);
-          });
-        }
-      }
-    }
-  }, [searchTm, record]);
-
-  const option = useMemo(() => {
-    return rzOption({ data, skinfo: record })
-  }, [data])
-
-  return (
-    <div style={{ width:"98%", height: '52vh' }}>
-      <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }} className="RzSearchBox">
-        <div>
-          <DatePicker
-            label="开始时间"
-            value={selectedDate1}
-            onChange={handleDateChange1}
-            showTime
-          />
-          <span style={{ margin: '0 1rem' }}>-</span>
-          <DatePicker
-            label="结束时间"
-            value={selectedDate2}
-            onChange={handleDateChange2}
-            showTime
-          />
-        </div>
-        {searchTm?.error ? (
-          <div style={{ width: '100%', color:"red" }} className="error">{searchTm.error}</div>
-        ) : (
-          <div style={{ width:"100%", height: '50vh' }}>
-            {
-              data.length>0?
-                <ReactEcharts
-                  option={option}
-                  style={{ width:"100%", height: '50vh' }}
-                />:<div style={{textAlign:"center", margin:"10%"}}>
-                  <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                </div>
-            }
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
-
-export default RzSearch
diff --git a/src/views/Home/MapCtrl/components/RzSearch/rzOption.js b/src/views/Home/MapCtrl/components/RzSearch/rzOption.js
deleted file mode 100644
index 8586616..0000000
--- a/src/views/Home/MapCtrl/components/RzSearch/rzOption.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { hdyjColor } from '../../../../../utils/renutils';
-
-export default function rzOption({ data, skinfo }) {
-  const serialData = data.map(obj => [obj.tm+":00", obj.rz || obj.z || 0]);
-  console.log(serialData);
-  let sorted = serialData.map(o => o[1]);
-  const markLine = {};
-  if (skinfo && typeof skinfo.damel === 'number' && typeof skinfo.ddz === 'number' && typeof skinfo.fsltdz === 'number') {
-    const { damel, fsltdz, ddz } = skinfo;
-    sorted.push(damel + 0.5);
-    sorted.push(fsltdz);
-    sorted.push(ddz - 0.5);
-
-    markLine.data = [
-      { yAxis: fsltdz, label: { formatter: '汛限水位' }, lineStyle: { color: 'red' } },
-      { yAxis: ddz, label: { formatter: '死水位' } },
-      { yAxis: damel, label: { formatter: '坝顶高程' } },
-    ];
-  } else if (data[0]) {
-    const { sfz, wrz, grz } = data[0];
-    markLine.data = [];
-    if (sfz) {
-      sorted.push(sfz)
-      markLine.data.push({ label: { formatter: '设防水位' }, yAxis: sfz, lineStyle: { color: hdyjColor[1] } });
-    }
-    if (wrz) {
-      sorted.push(wrz)
-      markLine.data.push({ label: { formatter: '警戒水位' }, yAxis: wrz, lineStyle: { color: hdyjColor[2] } });
-    }
-    if (grz) {
-      sorted.push(grz)
-      markLine.data.push({ label: { formatter: '保证水位' }, yAxis: grz, lineStyle: { color: hdyjColor[3] } });
-    }
-  }
-
-  sorted = sorted.sort()
-  let minVal = sorted[0] || 0;
-  let maxVal = sorted[sorted.length - 1] || 0;
-  let dz = 0.5;
-  maxVal = Math.ceil(maxVal / dz) * dz + 0.1;
-  minVal = Math.floor(minVal / dz) * dz - 0.1; 
-  minVal = minVal<0?0:minVal
-
-  return {
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        lineStyle: {
-          color: '#333'
-        },
-        label: {
-          formatter: function (params) {
-            var date = new Date(params.value)
-            const year = date.getFullYear();
-            const month = date.getMonth()+1;
-            const day = date.getDate();
-            const hours = date.getHours().toString().padStart(2, '0')
-            const minutes = date.getMinutes().toString().padStart(2, '0')
-            return `${year}-${month}-${day}`+"\n"+`${hours}:${minutes}`
-          }
-        }
-      }
-    },
-    grid: {
-      show:true,
-      left: "4%",
-      top: "5%",
-      right: "7%",
-      bottom: "8%",
-      borderWidth: 0
-    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'time',
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 11,
-          show: true,
-          showMaxLabel: true,
-          showMinLabel: true,
-          formatter: function (value, index) {
-            var date = new Date(value);
-            const year = date.getFullYear();
-            const month = date.getMonth()+1;
-            const day = date.getDate();
-            const hours = date.getHours().toString().padStart(2, '0')
-            const minutes = date.getMinutes().toString().padStart(2, '0')
-            return `${hours}:${minutes}`+ "\n" + `${year}-${month}-${day}`
-          }
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        }
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'right',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        name: '水位',
-        type: 'line',
-        showSymbol: false,
-        label: {
-          show: false,
-        },
-        data: serialData,
-        lineStyle: {
-          normal: {
-            width: 1,
-          }
-        },
-        areaStyle: {
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-              offset: 0,
-              color: 'rgba(3, 194, 236, 0.3)'
-            }, {
-              offset: 0.8,
-              color: 'rgba(3, 194, 236, 0)'
-            }
-            ], false),
-            shadowColor: 'rgba(0, 0, 0, 0.1)',
-            shadowBlur: 10
-          }
-        },
-        itemStyle: {
-          normal: {
-            color: '#03C2EC'
-          }
-        },
-        markPoint: {
-          data: [
-            { type: 'max', name: '最大值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, -12] },
-            { type: 'min', name: '最小值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, 12] }
-          ]
-        },
-        markLine,
-      }
-    ]
-  };
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Shyj/jcxx/index.js b/src/views/Home/MapCtrl/components/Shyj/jcxx/index.js
deleted file mode 100644
index 762adfa..0000000
--- a/src/views/Home/MapCtrl/components/Shyj/jcxx/index.js
+++ /dev/null
@@ -1,121 +0,0 @@
-
-import React, {useEffect, useState} from 'react';
-import {Tooltip} from 'antd'
-import {
-  PlusCircleOutlined,
-  CloseCircleOutlined
-} from '@ant-design/icons';
-import { httpget2 } from '../../../../../../utils/request';
-import apiurl from '../../../../../../service/apiurl';
-import clsx from 'clsx';
-
-
-
-const warnStatusIcon = {
-  0: <PlusCircleOutlined />,//<AddCircle style={{ fontSize: '3rem', marginRight: '1rem', color: "gray" }} />,
-  10: <PlusCircleOutlined />,//<BarChart style={{ fontSize: '3rem', marginRight: '1rem', color: "yellow" }} />,
-  20: <PlusCircleOutlined />,//<PlayCircleOutline style={{ fontSize: '3rem', marginRight: '1rem', color: "red" }} />,
-  40: <PlusCircleOutlined />,//<ErrorOutline style={{ fontSize: '3rem', marginRight: '1rem', color: "red" }} />,
-  50: <PlusCircleOutlined />,//<LibraryBooks style={{ fontSize: '3rem', marginRight: '1rem', color: "red" }} />,
-  60: <PlusCircleOutlined />,//<CheckCircle style={{ fontSize: '3rem', marginRight: '1rem', color: "red" }} />,
-  30: <CloseCircleOutlined />,//<Cancel style={{ fontSize: '3rem', marginRight: '1rem', color: "gray" }} />,
-};
-
-
-
-
-function Page({ data }) {
-
-  const [current,setCurrent]=useState(0)
-  const [logData,setLogData] = useState([])
-  useEffect(() => {
-    getLog()
-  }, []);
-
-  const getLog = async ()=>{
-    const res = await httpget2(apiurl.shyj2.log,{warnId:data.warnid})
-    if(res && res.data){
-      setLogData(res.data)
-    }
-  }
-
-  return (
-    <>
-      <div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>行政区划: </div>
-            <div style={{width:'35%'}}>{data.adnm}</div>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>预警类型: </div>
-            <div style={{width:'35%'}}>{{10: '山洪',20: '河道洪水',30: '泥石流',40: '山体滑坡',50: '工程险情',60: '其他'}[data.warntypeid]}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>预警等级: </div>
-            <div style={{width:'35%'}}>{{1: '警戒水位',2: '危险水位',3: '警戒雨量',4: '危险雨量',5: '准备转移',6: '立即转移'}[data.warngradeid]}</div>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>预警状态: </div>
-            <div style={{width:'35%'}}>{{0:'新产生', 10:'已内部告警', 20:'已外部告警', 30:'关闭预警', 70:'灾情上报'}[data.warnstatusid]}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>生成类型: </div>
-            <div style={{width:'35%'}}>{{0: '自动',1: '手动'}[data.isauto]}</div>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>预警时间: </div>
-            <div style={{width:'35%'}}>{data.warnstm}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>预警名称: </div>
-            <div style={{width:'85%'}}>{data.warnnm}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',paddingTop:"5px",paddingBottom:'5px',display:'flex',alignItems:'flex-start',fontSize:'15px'}}>
-            <div style={{width:'15%',textAlign:'right',paddingRight:'5px'}}>预警说明: </div>
-            <div style={{width:'85%'}}>
-              <div style={{maxHeight:'150px',overflowY:'scroll'}}>
-                {data.warndesc}
-              </div>
-              {/* <Tooltip title={data.warndesc}>
-                      {data.warndesc.substring(0, 100)}
-                      {data.warndesc.length>100?'...':''}
-              </Tooltip> */}
-            </div>
-        </div>
-
-        <div style={{display:'flex',padding:'50px 100px'}}>
-        {
-          logData.map((o, index, arr) => (
-            <React.Fragment key={index}>
-              <div style={{width:'200xp', display:'flex', flexDirection:'column', alignItems:'center'}}>
-                <div className="icon" style={{fontSize:'24px'}}>
-                  {warnStatusIcon[o.warnstatusid]}
-                  {{0:'新产生', 10:'已内部告警', 20:'已外部告警', 30:'关闭预警', 70:'灾情上报'}[o.warnstatusid]}
-                </div>
-                <div style={{fontSize:'16px',margin:'5px',color:o.warngradeid === 5 ? '#c5c55b' : '#da4444'}}>
-                  {{1: '警戒水位',2: '危险水位',3: '警戒雨量',4: '危险雨量',5: '准备转移',6: '立即转移'}[o.warngradeid]}
-                </div>
-                <div className="subtitle">
-                  {o?.time?.split(' ')[0]}
-                </div>
-                <div className="subtitle">
-                  {o?.time?.split(' ')[1]}
-                </div>
-              </div>
-              {
-                index < arr.length - 1 ? (
-                  <div style={{
-                    width:'80px',
-                    height:'20px',
-                    margin:'20px',
-                    borderBottom:'2px dashed'
-                  }}>
-
-                  </div>
-                ) : null
-              }
-            </React.Fragment>
-          ))
-        }
-      </div>
-
-      </div>
-    </>
-  )
-}
-
-export default Page;
diff --git a/src/views/Home/MapCtrl/components/Shyj/yjfsjl/index.js b/src/views/Home/MapCtrl/components/Shyj/yjfsjl/index.js
deleted file mode 100644
index 67283ab..0000000
--- a/src/views/Home/MapCtrl/components/Shyj/yjfsjl/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-
-import React, {useEffect, useState} from 'react';
-import {Tooltip, Table} from 'antd'
-import { httpget2 } from '../../../../../../utils/request';
-import apiurl from '../../../../../../service/apiurl';
-import clsx from 'clsx';
-
-
-
-
-
-function Page({ record }) {
-
-  const [current,setCurrent]=useState(0)
-  const [data,setData] = useState([])
-  useEffect(() => {
-    getData()
-  }, []);
-
-  const getData = async ()=>{
-    const res = await httpget2(apiurl.shyj2.message,{warnId:record.warnid})
-    if(res && res.data){
-        setData(res.data)
-    }
-  }
-
-  const columns = [
-    {title: '人员姓名', dataIndex: 'name', key: 'name', width: 50, align: 'center'},
-    {title: '短信内容', dataIndex: 'msgcontent', key: 'msgcontent', width: 200, align: 'center'},
-    {title: '短信发送时间', dataIndex: 'sendtm', key: 'sendtm', width: 50, align: 'center'},
-  ];
-
-  return (
-    <>
-      <div>
-    
-        <Table
-            size="small"
-            rowKey={rec => rec.type + rec.stcd}
-            bordered
-            dataSource={data}
-            columns={columns}
-            pagination={{pageSize: 10, hideOnSinglePage: true}}
-          />
-      </div>
-    </>
-  )
-}
-
-export default Page;
diff --git a/src/views/Home/MapCtrl/components/Shyj/yjpzxx/index.js b/src/views/Home/MapCtrl/components/Shyj/yjpzxx/index.js
deleted file mode 100644
index 0db076f..0000000
--- a/src/views/Home/MapCtrl/components/Shyj/yjpzxx/index.js
+++ /dev/null
@@ -1,86 +0,0 @@
-
-import React, {useEffect, useState} from 'react';
-import {Tooltip, Table} from 'antd'
-import { httpget2 } from '../../../../../../utils/request';
-import apiurl from '../../../../../../service/apiurl';
-import clsx from 'clsx';
-
-
-
-
-
-function Page({ record }) {
-
-  const [current,setCurrent]=useState(0)
-  const [data,setData] = useState([])
-  useEffect(() => {
-    getData()
-  }, []);
-
-  const getData = async ()=>{
-    const res = await httpget2(apiurl.shyj2.yjpz,{warnadcd:record.adcd})
-    if(res && res.data){
-        setData(res.data)
-    }
-  }
-
-  const columns = [
-    {title: '预警等级', dataIndex: 'warngradeid', key: 'warngradeid', width: 50, align: 'center', render: (val, record) => {
-        return (<div style={{color:val=='5'?"#c5c55b":"#da4444"}}>{{1: '警戒水位',2: '危险水位',3: '警戒雨量',4: '危险雨量',5: '准备转移',6: '立即转移'}[val]}</div>)
-    }},
-    {title: '预警状态', dataIndex: 'warnstatusid', key: 'warnstatusid', width: 50, align: 'center', render: (val, record) => ({60: '响应结束',0: '新产生',10: '已内部告警',20: '已外部告警',40: '响应启动',50: '响应反馈',30: '已关闭'}[val])},
-    {title: '预警短信发送人员', dataIndex: 'name', key: 'name', width: 200, align: 'center'},
-  ];
-
-  return (
-    <>
-      <div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>响应部门: </div>
-            <div style={{width:'80%'}}>{data?.xybm}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>预警人员: </div>
-            <div style={{width:'80%'}}>{data?.xyry}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>准备转移指标: </div>
-            <div style={{width:'30%'}}>{`预警测站个数：${data?.yjzb?.c2 || '-'}`}</div>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>立即转移指标: </div>
-            <div style={{width:'30%'}}>{`预警测站个数：${data?.yjzb?.c1 || '-'}`}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>短信发送后缀: </div>
-            <div style={{width:'30%'}}>{data?.dxhz?.dxhz}</div>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>是否短信屏蔽: </div>
-            <div style={{width:'30%'}}>{data?.dxhz?.isdxpb !== undefined ? ({0: '否',1: '是'}[data?.dxhz?.isdxpb] || '程序未处理类别') : '-'}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>短信间隔发送时间: </div>
-            <div style={{width:'30%'}}>{`${data?.dxhz?.dxpbtm || '-'}分钟`}</div>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>是否自动处理预警: </div>
-            <div style={{width:'30%'}}>{data?.dxhz?.isautoyj !== undefined ? ({0: '否',1: '是'}[data?.dxhz?.isautoyj] || '程序未处理类别') : '-'}</div>
-        </div>
-        <div style={{borderBottom:'1px dashed #eee',height:'40px',display:'flex',alignItems:'center',fontSize:'15px'}}>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>自动内部预警处理间隔: </div>
-            <div style={{width:'30%'}}>{`${data?.dxhz?.nbyjtm || '-'}分钟`}</div>
-            <div style={{width:'20%',textAlign:'right',marginRight:'5px'}}>自动外部预警处理间隔: </div>
-            <div style={{width:'30%'}}>{`${data?.dxhz?.wbyjtm || '-'}分钟`}</div>
-        </div>
-      </div>
-      <div>
-
-        <Table
-            size="small"
-            rowKey={rec => rec.type + rec.stcd}
-            bordered
-            dataSource={data.yjry}
-            columns={columns}
-            pagination={{pageSize: 10, hideOnSinglePage: true}}
-          />
-      </div>
-    </>
-  )
-}
-
-export default Page;
diff --git a/src/views/Home/MapCtrl/components/SkImgSearch/index.js b/src/views/Home/MapCtrl/components/SkImgSearch/index.js
deleted file mode 100644
index c971e53..0000000
--- a/src/views/Home/MapCtrl/components/SkImgSearch/index.js
+++ /dev/null
@@ -1,195 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { DatePicker, Button, Switch, Row } from 'antd';
-import { skImgSearch } from '../../../../../models/_/search';
-import { imageHistoryInformationApi } from '../../../../../service/image';
-import moment from 'moment'
-import { SearchOutlined } from '@ant-design/icons';
-
-const { RangePicker } = DatePicker;
-
-function SkImgSearch({ record }) {
-  const [camera, setCamera] = useState(0);
-
-  //const [selectedDate, handleDateChange] = useState([moment().add(-1, 'day'), moment()]);
-
-  const [data, setData] = useState([[], []]);
-  const [currentImg, setCurrentImg] = useState([-1, -1]);
-  const [loop, setLoop] = useState(false);
-  const resultTm = useRef('');
-
-  const selData = data[camera] || [];
-  const selImg = currentImg[camera];
-
-  const [selectedDate, setDates] = useState([moment().add(-1, 'day'), moment()]);
-  const [value, setValue] = useState(null);
-
-  const disabledDate = (current) => {
-    if (!selectedDate) {
-      return false;
-    }
-    const tooLate = selectedDate[0] && current.diff(selectedDate[0], 'days') >= 7;
-    const tooEarly = selectedDate[1] && selectedDate[1].diff(current, 'days') >= 7;
-    return !!tooEarly || !!tooLate;
-  };
-
-  const onOpenChange = (open) => {
-    if (open) {
-      setDates([null, null]);
-    }else{
-      setDates(value);
-    }
-  };
-
-  //imageHistoryInformationApi
-  const getImageHistoryData = async (tm, record) => {
-    console.log("23++++",tm);
-    console.log("24++++",record);
-
-    if (!tm) {
-      return;
-    }
-
-    let params = {
-      "stm": moment(tm[0]).format("YYYY-MM-DD HH:mm:ss"),
-      "etm": moment(tm[1]).format("YYYY-MM-DD HH:mm:ss"),
-      "source": record.source,//"SK", record.source  "SH"
-      "stcd": record.stcd//"716095671", record.stcd  "0529000011"
-      /*"etm": "2023-11-07 17:00:00",
-      "source": "SK",
-      "stcd": "716095671",
-      "stm": "2023-10-07 17:00:00"*/
-    };
-
-    const rawdata = await imageHistoryInformationApi(params);
-    console.log("38++++",rawdata);
-    const data = [
-      rawdata && Array.isArray(rawdata[0]) ? rawdata[0] : null,
-      rawdata && Array.isArray(rawdata[1]) ? rawdata[1] : null,
-    ];
-
-    setData(data);
-    setCurrentImg([data[0].length - 1, data[1].length - 1]);
-    console.log("43+++++",selData);
-  };
-
-  useEffect(() => {
-    /*skImgSearch({ stcd: record.stcd, tm: selectedDate }).then((rawdata) => {
-      const data = [
-        rawdata && Array.isArray(rawdata[0]) ? rawdata[0] : null,
-        rawdata && Array.isArray(rawdata[1]) ? rawdata[1] : null,
-      ];
-
-      resultTm.current = selectedDate.format('YYYY-MM-DD');
-      setData(data);
-      setCurrentImg([data[0].length - 1, data[1].length - 1]);
-    })*/
-
-    getImageHistoryData(selectedDate, record);
-  }, [record]);
-
-  const showPic = (index) => {
-    if (index >= selData.length) {
-      index = selData.length - 1;
-    }
-    const newCurrentImg = [...currentImg];
-    newCurrentImg[camera] = index;
-    setCurrentImg(newCurrentImg);
-    setLoop(false);
-  }
-
-  const _loop = () => {
-    const selData = data[camera] || [];
-    if (selData.length === 0) {
-      return;
-    }
-    let index = currentImg[camera] + 1;
-    if (index >= selData.length) {
-      index = 0;
-    }
-    const newCurrentImg = [...currentImg];
-    newCurrentImg[camera] = index;
-    setCurrentImg(newCurrentImg);
-  }
-
-  useEffect(() => {
-    if (loop) {
-      const h = setTimeout(_loop, 2000);
-
-      return () => {
-        clearTimeout(h);
-      }
-    }
-  }, [loop, currentImg])
-  console.log("123++++",record,record.source);
-  return (
-    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }} className="SkImgSearchBox">
-      <div className="clearFloat" style={{marginBottom:"20px"}}>
-        <div className="lf">
-          {
-            record.source === "SK"?
-              <>
-                <Button onClick={() => setCamera(0)} style={{ marginRight: '0.5rem' }} type={camera === 0 ? 'primary' : ''}>通道1</Button>
-                <Button onClick={() => setCamera(1)} style={{ marginRight: '2rem' }} type={camera === 1 ? 'primary' : ''}>通道2</Button>
-              </>:null
-          }
-          {/*<DatePicker
-            style={{ marginRight: '1rem' }}
-            value={selectedDate}
-            onChange={handleDateChange}
-          />*/}
-          <RangePicker style={{ width: 330 }}
-                       value={selectedDate || value}
-                       disabledDate={disabledDate}
-                       onCalendarChange={(val) => {
-                         setDates(val);
-                       }}
-                       onChange={(val) => {
-                         setValue(val);
-                       }}
-                       onOpenChange={onOpenChange}
-                       format="YYYY-MM-DD HH:mm:ss"
-          />
-          <Button color="primary" style={{marginLeft:"20px"}}
-                  onClick={()=>{getImageHistoryData(selectedDate, record)}}>
-            <SearchOutlined />
-          </Button>
-        </div>
-
-        <div className="rf">
-          <span style={{ marginRight: '0.5rem', color:"#333" }}>轮播</span>
-          <Switch color="primary" checked={loop} onChange={(val) => setLoop(val)} />
-        </div>
-      </div>
-
-      <div style={{ overflowY: 'hidden' }}>
-        {
-          selData.length > 0 ? (
-            <div className="clearFloat">
-              <img className="lf" alt="pic" src={selData[selImg]?.imgpath} style={{ height: '100%', width: '72rem', marginRight: '1rem' }} />
-              <div className="rf" style={{ width:"260px", height: '100%', overflowY: 'auto' }}>
-                {/*<div position="sticky" style={{ marginBottom: '0.5rem', padding: '0.5rem', background: '#04081bcc', color:"#fff" }}>
-                  {resultTm.current}
-                </div>*/}
-                <Row container justify="space-between">
-                  {
-                    selData.map((item, index) => (
-                      <Row key={item.tm} item style={{ width: '46%', border: index === selImg ? '2px solid #52a6ff' : '2px solid #d9d9d9', padding: '0.1rem', marginBottom: '0.4rem', textAlign: 'center' }}>
-                        <img alt="pic" src={item.imgpath} style={{ width: '100%', cursor: 'pointer' }} onClick={() => showPic(index)} role="presentation" />
-                        <div style={{width:"100%", textAlign:"center"}}>{item.tm.substr(11,8)}</div>
-                      </Row>
-                    ))
-                  }
-                  {selData.length % 2 ? <Row item style={{ width: '46%' }}></Row> : null}
-                </Row>
-              </div>
-            </div>
-          ) : (
-            <div style={{ display: 'flex', alignItems: 'center', width: '100%', minHeight:"50vh",justifyContent: 'center' }}>无图片</div>
-          )
-        }
-      </div>
-    </div>
-  )
-}
-
-export default SkImgSearch
diff --git a/src/views/Home/MapCtrl/components/SkInfo/index.js b/src/views/Home/MapCtrl/components/SkInfo/index.js
deleted file mode 100644
index dd9bb27..0000000
--- a/src/views/Home/MapCtrl/components/SkInfo/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Col, Row, Descriptions } from 'antd';
-import React, {useEffect, useState} from 'react';
-import { querySkBasicinfoBSkApi } from '../../../../../service/homePage';
-import { adnmCun, adnmZhen } from '../../../../../models/_/adcd';
-import { UserOutlined } from '@ant-design/icons';
-
-
-
-function Personel({ data }) {
-  return (
-    <Row container alignItems="center" spacing={1} style={{ color: '#bbb' }}>
-      <Row item><UserOutlined /></Row>
-      <Row item style={{ fontWeight: 'bold', color: '#fff' }}>{data.name}:</Row>
-      {data.zw && <Row item>{data.zw};</Row>}
-      {data.zz && <Row item>{data.zz};</Row>}
-      {data.dw && <Row item>{data.dw};</Row>}
-      {data.phone && <Row item>{data.phone}</Row>}
-    </Row>
-  )
-}
-
-
-function SkInfoPage({ record }) {
-  //console.log("SkInfoPage",record);
-  const [data, setData] = useState({});
-
-  const getListData = async () => {
-    const resData = await querySkBasicinfoBSkApi({"stcd": record.stcd});
-    setData(resData[0] || {});
-  };
-
-  useEffect(() => {
-    getListData();
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered column={2}>
-        <Descriptions.Item label="水库名称">{data.stnm}</Descriptions.Item>
-        <Descriptions.Item label="水库编码">{data.stcd}</Descriptions.Item>
-        <Descriptions.Item label="行政区划">{adnmZhen(data.adcd)}{adnmCun(data.adcd)}</Descriptions.Item>
-        <Descriptions.Item label="流域编码">{data.wscd}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" >
-          {data.damel}
-        </Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{data.zdbg}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{data.bdkd}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{data.dsflz}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{data.hjhsw}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{data.zcxsw}</Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{data.ddz}</Descriptions.Item>
-        <Descriptions.Item label="汛限水位(m)">{data.fsltdz}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万方)">{data.zkr}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万方)">{data.fhkr}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万方)">{data.xlkr}</Descriptions.Item>
-        <Descriptions.Item label="已淤积库容(万方)">{data.yyjkr}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万方)">{data.skr}</Descriptions.Item>
-        <Descriptions.Item label="集雨面积(k㎡)">{data.jymj}</Descriptions.Item>
-        <Descriptions.Item label="开工日期">{data.kgrq}</Descriptions.Item>
-        <Descriptions.Item label="竣工日期">{data.jgrq}</Descriptions.Item>
-        <Descriptions.Item label="所在河流">{data.szhl}</Descriptions.Item>
-        <Descriptions.Item label="历史最高水位">{data.lszgsw}</Descriptions.Item>
-        {/*<Descriptions.Item label="责任人" span={2}>
-          {
-            data?.personels && (
-              data.personels.map(o => <Personel key={o.id} data={o} />)
-            )
-          }
-        </Descriptions.Item>*/}
-        <Descriptions.Item label="责任人" span={2}>
-          {data.zrr}
-        </Descriptions.Item>
-      </Descriptions>
-    </>
-  )
-}
-
-export default SkInfoPage;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/TableData.js b/src/views/Home/MapCtrl/components/Skjcxx/Krqx/TableData.js
deleted file mode 100644
index 55bc614..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center'},
-    {title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/drpOption.js b/src/views/Home/MapCtrl/components/Skjcxx/Krqx/drpOption.js
deleted file mode 100644
index d7a7904..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/drpOption.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  const maxVal = Math.ceil(Math.max(...data.map(obj => obj.rz)))
-  const minVal = Math.floor(Math.min(...data.map(obj => obj.rz)))
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-
-  let arr =[]
-  data.forEach(item=>{
-    arr.push([item.w,item.rz])
-  })
-  return {
-    title: {
-      text: "",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "15%",
-        right: "15%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "库容万(m³)",
-        nameGap: 5,
-        type: 'value',
-        data: data.map(o => o.w),
-        min:Math.floor(minValX / 5)  *5,
-        max:Math.ceil(maxValX / 5)  *5,
-        interval:GetInterval(minValX,maxValX),
-        splitLine: {
-          show: false
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        interval:1,
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        smooth: true
-      },
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.css b/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.css
deleted file mode 100644
index 9915772..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.swllgx-sq .content {
-  display: flex;
-  justify-content: space-between;
-}
-.swllgx-sq .content .content-left {
-  width: 30%;
-  max-height: 60vh;
-  overflow: auto;
-}
-.swllgx-sq .content .content-right {
-  width: 70%;
-  height: 60vh;
-}
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.js b/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.js
deleted file mode 100644
index f41a04d..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-import {zvarl} from "../../../../../../service/sssq";
-
-function Krqx({record}) {
-  const [data,setData]=useState([])
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  const getData=async (params)=>{
-    setData(await zvarl(params))
-  }
-  useEffect(() => {
-    getData({stcd:record.stcd})
-  }, [record]);
-
-
-  return (
-    <div style={{width: "98%", height: '60vh'}} className="swllgx-sq">
-      <div className="content">
-        <div className="content-left">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default Krqx
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.less b/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.less
deleted file mode 100644
index b59bee0..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/Krqx/index.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left{
-      width: 30%;
-      max-height: 60vh;
-      overflow: auto;
-    }
-    .content-right{
-      width: 70%;
-      height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/fxya.js b/src/views/Home/MapCtrl/components/Skjcxx/fxya.js
deleted file mode 100644
index 26eb54e..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/fxya.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {plan} from "../../../../../service/sssq";
-
-
-function Fxya({record}) {
-
-  const [data, setData] = useState({})
-  const getData = async (params) => {
-    let obj = await plan(params)
-    setData(obj[0])
-  }
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions column={3} bordered>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.preparation == 1 ? "是" : data?.preparation == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.approval == 1 ? "是" : data?.approval == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="编制时间" style={{width: "16.5%"}}>{data?.prepTime}</Descriptions.Item>
-        <Descriptions.Item label="批复时间">{data?.apprTime}</Descriptions.Item>
-        <Descriptions.Item label="编制单位">{data?.prepOrg}</Descriptions.Item>
-        <Descriptions.Item label="批复部门">{data?.apprOrg}</Descriptions.Item>
-        <Descriptions.Item label="预案文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.apprName}</span>
-        </Descriptions.Item>
-        <Descriptions.Item label="批复文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.planName}</span>
-        </Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Fxya;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/gctp.js b/src/views/Home/MapCtrl/components/Skjcxx/gctp.js
deleted file mode 100644
index 881cebe..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/gctp.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {projectimg, fileget} from "../../../../../service/sssq";
-import {projDict} from "../../../../../utils/dictType"
-
-
-function Gctp({record}) {
-  const [data, setData] = useState([])
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const getData = async (params) => {
-    setData(await projectimg(params))
-  }
-
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered layout="vertical" column={3}>
-        {
-          data?.length > 0 ? data.map(o => <Descriptions.Item label={projDict(o.projType)}>
-              <div className="no-data">
-                <img src={url + o.filePath} style={{width: "100%"}} alt=""/>
-              </div>
-            </Descriptions.Item>
-            )
-            : ""
-        }
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Gctp;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/index.js b/src/views/Home/MapCtrl/components/Skjcxx/index.js
deleted file mode 100644
index bc265cc..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { Tabs} from "antd";
-import Jbxx from './jbxx'
-import Krqx from './Krqx'
-import Zrtx from './zrtx'
-import Jzw from './jzw'
-import Jsxx from './jsxx'
-import Gctp from './gctp'
-import Fxya from './fxya'
-import Sjbg from './sjbg'
-
-
-
-function Skjcxx({data}) {
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <>
-      <div>
-        <Tabs defaultActiveKey="1" tabPosition="left" type="card">
-          <Tabs.TabPane tab="基本信息" key="1">
-            <Jbxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="库容曲线" key="2">
-            <Krqx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="责任体系" key="3">
-            <Zrtx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建筑物" key="4">
-            <Jzw record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建设信息" key="5">
-            <Jsxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="工程图片" key="6">
-            <Gctp record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="防汛预案" key="7">
-            <Fxya record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="设计报告" key="8">
-            <Sjbg record={data}/>
-          </Tabs.TabPane>
-
-
-        </Tabs>
-      </div>
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/jbxx.js b/src/views/Home/MapCtrl/components/Skjcxx/jbxx.js
deleted file mode 100644
index 49c0aac..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/jbxx.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {attResBase} from '../../../../../service/sssq'
-import {engScalDict} from '../../../../../utils/dictType'
-
-
-
-function Skjcxx({ data }) {
-  const [info,setInfo]=useState({})
-  const getData=async (params)=>{
-    setInfo(await attResBase(params))
-  }
-  useEffect(() => {
-    if (data.resCode) {
-      
-      getData({resCode:data.resCode})
-    }
-  }, [data]);
-
-  return (
-    <>
-      <Descriptions bordered size="small" column={3}>
-        <Descriptions.Item label="水库名称" style={{ width: '16.5%' }}>{info?.resName}</Descriptions.Item>
-        <Descriptions.Item label="所在地" style={{ width: '16.5%' }}>{info?.resLoc}</Descriptions.Item>
-        <Descriptions.Item label="管理单位" style={{ width: '16.5%' }}>{info?.managName}</Descriptions.Item>
-        <Descriptions.Item label="水库代码">{info.resCode}</Descriptions.Item>
-        <Descriptions.Item label="注册登记号">{info.regSn}</Descriptions.Item>
-        <Descriptions.Item label="注册登记时间">{info.regTime}</Descriptions.Item>
-        <Descriptions.Item label="经度">{info.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{info.lttd}</Descriptions.Item>
-        <Descriptions.Item label="高程基准面">{info.elevDat}</Descriptions.Item>
-        <Descriptions.Item label="所在流域">{info.basName}</Descriptions.Item>
-        <Descriptions.Item label="所在水系">{info.wsName}</Descriptions.Item>
-        <Descriptions.Item label="所在河流名称">{info.rvName}</Descriptions.Item>
-        <Descriptions.Item label="工程规模">{engScalDict(info.engScal)}</Descriptions.Item>
-        <Descriptions.Item label="水库功能">{info.rsvFunction}</Descriptions.Item>
-        <Descriptions.Item label="溢洪道是否有闸">{info.spillwayGate==1?"有":info.spillwayGate==0?"无":""}</Descriptions.Item>
-        <Descriptions.Item label="水库特征参数" span={3}></Descriptions.Item>
-        <Descriptions.Item label="坝址以上控制流域面积(km²)">{info.watShedArea}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)">{info.crestElev}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{info.maxDamHeig}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{info.calFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万m³)">{info.totCap}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水时最大下泄流量(m³/s)">{info.maxDesFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{info.desFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="调洪库容(万m³)">{info.storFlCap}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水时最大下泄流量(m³/s)">{info.maxCalFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="防洪高水位(m)">{info.uppLevFlco}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万m³)">{info.flcoCap}</Descriptions.Item>
-        <Descriptions.Item label="下游河道安全流量(m³/s)">{info.dsSaftFlow}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{info.normWatLev}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万m³)">{info.benResCap}</Descriptions.Item>
-        <Descriptions.Item label="主汛期汛限水位(m)">{info.flLowLimLev}</Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{info.deadLev}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万m³)">{info.deadCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="工程概况" span={3}>{info.projOverview}</Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/jsxx.js b/src/views/Home/MapCtrl/components/Skjcxx/jsxx.js
deleted file mode 100644
index da943f7..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/jsxx.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {construction} from "../../../../../service/sssq";
-
-
-
-function Jsxx({record}) {
-
-  const columns = [
-    {title: '状态', key: '', dataIndex: '', align: 'center',render:rec=>rec.engStat==0?"始建":rec.engStat==1?"扩建":""},
-    {title: '工程开工时间', key: 'startDate', dataIndex: 'startDate', align: 'center'},
-    {title: '投入使用时间', key: 'useDate', dataIndex: 'useDate', align: 'center'},
-    {title: '竣工验收时间', key: 'compDate', dataIndex: 'compDate', align: 'center'},
-    {title: '改扩建内容', key: 'content', dataIndex: 'content', align: 'center'},
-    {title: '第几次扩建', key: 'buildNo', dataIndex: 'buildNo', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await construction(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Jsxx;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/jzw.js b/src/views/Home/MapCtrl/components/Skjcxx/jzw.js
deleted file mode 100644
index cf22bc6..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/jzw.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions,Table} from "antd";
-import {drainage,dam,transport} from "../../../../../service/sssq";
-
-
-
-function Jzw({record}) {
-
-  const columns1 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns2 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启用标准', key: 'enableCriteria', dataIndex: 'enableCriteria', align: 'center'},
-  ];
-  const columns3 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '洞(孔)身型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '数量(条或孔)', key: 'num', dataIndex: 'num', align: 'center'},
-    {title: '进口底槛高程(m)', key: 'inletEle', dataIndex: 'inletEle', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns4 = [
-    {title: '设计流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '输水道型式', key: 'transType', dataIndex: 'transType', align: 'center',},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '输水道长度(m)', key: 'transLeng', dataIndex: 'transLeng', align: 'center'},
-    {title: '座教', key: 'num', dataIndex: 'num', align: 'center'},
-  ];
-
-  const [tableDataDs, setTableDataDs] = useState([])
-  const [tableDataXs, setTableDataXs] = useState({})
-  const [tableDataSs, setTableDataSs] = useState([])
-
-  const getData=async (params)=>{
-    setTableDataDs(await dam(params))
-    setTableDataXs(await drainage(params))
-    setTableDataSs(await transport(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <div style={{maxHeight:"60vh",overflow:"auto"}}>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>挡水建筑物</div>
-      <Descriptions bordered size="small" column={3}>
-        <Descriptions.Item label="坝型" style={{ width: '16.5%' }}>{tableDataDs[0]?.damType}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damMaxHeig}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damTopElev}</Descriptions.Item>
-        <Descriptions.Item label="坝顶长度(m)">{tableDataDs[0]?.damTopLen}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{tableDataDs[0]?.damTopWid}</Descriptions.Item>
-        <Descriptions.Item label="坝基防渗体型式">{tableDataDs[0]?.damImpermeableType}</Descriptions.Item>
-        <Descriptions.Item label="副坝座数">{tableDataDs[0]?.subDamNum}</Descriptions.Item>
-        <Descriptions.Item label="副坝总长度(m)">{tableDataDs[0]?.subDamLen}</Descriptions.Item>
-        <Descriptions.Item label="副坝最大坝高(m)">{tableDataDs[0]?.subDamMaxHeig}</Descriptions.Item>
-      </Descriptions>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>泄水建筑物</div>
-      <div className="table-title" style={{padding:"4px"}}>☆正常溢洪道</div>
-      <Table rowKey="inx"
-             sticky
-             size="small"
-             columns={columns1}
-             pagination={false}
-             dataSource={tableDataXs.normalSpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆非常溢洪道</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns2}
-             pagination={false}
-             dataSource={tableDataXs.emergencySpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆泄洪洞</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns3}
-             pagination={false}
-             dataSource={tableDataXs.sluiceGateList}
-      />
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>输水建筑物</div>
-      <Table rowKey="key"
-             sticky
-             size="small "
-             columns={columns4}
-             pagination={false}
-             dataSource={tableDataSs}
-      />
-    </div>
-  )
-}
-
-export default Jzw;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/sjbg.js b/src/views/Home/MapCtrl/components/Skjcxx/sjbg.js
deleted file mode 100644
index bbf37c3..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/sjbg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {file} from "../../../../../service/sssq";
-
-
-
-function Sjbg({record}) {
-
-  const columns = [
-    {title: '文件名称', key: '', dataIndex: '', align: 'center',render:rec=><span style={{color:"#689FFF"}}>{rec.fileName}</span>},
-    {title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center'},
-    {title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center'},
-    {title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center'},
-    {title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await file(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             bordered
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Sjbg;
diff --git a/src/views/Home/MapCtrl/components/Skjcxx/zrtx.js b/src/views/Home/MapCtrl/components/Skjcxx/zrtx.js
deleted file mode 100644
index 5858eb7..0000000
--- a/src/views/Home/MapCtrl/components/Skjcxx/zrtx.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {person} from "../../../../../service/sssq";
-import {repDict} from "../../../../../utils/dictType"
-
-
-
-function Zrtx({record}) {
-
-  const columns = [
-    {title: '责任人', key: '', dataIndex: '', align: 'center',render:rec=>repDict(rec.repType)},
-    {title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center'},
-    {title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center'},
-    {title: '职务', key: 'position', dataIndex: 'position', align: 'center'},
-    {title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await person(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Zrtx;
diff --git a/src/views/Home/MapCtrl/components/Sksjcx/TableData.js b/src/views/Home/MapCtrl/components/Sksjcx/TableData.js
deleted file mode 100644
index 077c69d..0000000
--- a/src/views/Home/MapCtrl/components/Sksjcx/TableData.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')},
-    {
-      title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-    {
-      title: '水位(m)', key: 'rz', dataIndex: 'rz', align: 'center',
-      render: (rec) => <span>{rec ? rec.toFixed(2) :  "-"}</span>},
-    {
-      title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center',
-      render: (rec) => <span>{rec ??"-"}</span>,
-    },
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Sksjcx/drpOption.js b/src/views/Home/MapCtrl/components/Sksjcx/drpOption.js
deleted file mode 100644
index 9604e49..0000000
--- a/src/views/Home/MapCtrl/components/Sksjcx/drpOption.js
+++ /dev/null
@@ -1,252 +0,0 @@
-import echarts from 'echarts/lib/echarts'
-
-export default function drpOption ({
-  data,
-  afsltdz,
-  flLowLimLev,
-  desFloodLev,
-  calFloodLev
-}) {
-  console.log('data', data)
-  const maxVal = Math.max(...data.map(obj => obj.drp))
-  // const minVal = Math.min(...data.map(obj => obj.drp))
-  const maxSw = Math.ceil(Math.max(...data.map(obj => obj.rz)))
-  const minSw = Math.floor(Math.min(...data.map(obj => obj.rz)))
-  const maxKr = Math.max(...data.map(obj => obj.w))
-  const minKr = Math.min(...data.map(obj => obj.w))
-  return {
-    tooltip: {
-      trigger: 'axis'
-    },
-    grid: [
-      {
-        top: '15%',
-        left: '10%',
-        right: '8%',
-        width: '80%',
-        height: '35%'
-      },
-      {
-        bottom: '5%',
-        left: '10%',
-        right: '8%',
-        width: '80%',
-        height: '35%'
-      }
-    ],
-    legend: {
-      // 显示图例
-      show: true,
-      // 图例的位置
-      // data: ['汛限水位', '设计水位', '校核水位', "降雨量", "水位", "库容"],
-      data: ['校核水位', '设计水位', '汛限水位', '降雨量', '水位', '库容']
-    },
-    xAxis: [
-      {
-        gridIndex: 0,
-        type: 'category',
-        data: data.map(o => o.tm).reverse(),
-
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          show: false
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5
-          }
-        },
-        axisTick: {
-          show: false
-        }
-      },
-      {
-        gridIndex: 1,
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: true,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.substr('2020-'.length, 11)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5
-          }
-        },
-        axisTick: {
-          show: false
-        }
-      }
-    ],
-    yAxis: [
-      {
-        inverse: true,
-        gridIndex: 0,
-        type: 'value',
-        position: 'left',
-        name: '降雨量(mm)',
-        nameLocation: 'start',
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: 0,
-        max: maxVal
-      },
-      {
-        gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: '水位(m)',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minSw,
-        max: maxSw
-      },
-      {
-        gridIndex: 1,
-        type: 'value',
-        position: 'right',
-        name: '库容(万m³)',
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minKr - 0.1,
-        max: maxKr + 0.1
-      }
-    ],
-    series: [
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '校核水位',
-        type: 'line',
-        color: '#D9001B',
-        lineStyle: {
-          type: 'dashed'
-        },
-        data: data.map(o => calFloodLev),
-        symbol: 'none' // 设置标记点为'none'，即去掉圆点
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '设计水位',
-        type: 'line',
-        color: '#F59A23',
-        data: data.map(o => desFloodLev),
-        lineStyle: {
-          type: 'dashed'
-        },
-        symbol: 'none' // 设置标记点为'none'，即去掉圆点
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '汛限水位',
-        type: 'line',
-        color: '#FDDC9F',
-        data: data.map(o => {
-          return flLowLimLev
-        }),
-        lineStyle: {
-          type: 'dashed'
-        },
-        symbol: 'none' // 设置标记点为'none'，即去掉圆点
-      },
-      {
-        name: '降雨量',
-        type: 'bar',
-        barWidth: '60%',
-        data: data.map(o => o.drp).reverse(),
-        itemStyle: {
-          color: '#007AFD'
-        },
-        label: {
-          show: false
-        }
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '水位',
-        type: 'line',
-        symbol: 'none',
-        color: '#0AE0B5',
-        label: {
-          show: false
-        },
-        data: data.map(o => o.rz ? o.rz.toFixed(2):null )
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 2,
-        name: '库容',
-        type: 'line',
-        color: '#007AFD',
-        symbol: 'none',
-        showSymbol: false,
-        label: {
-          show: false
-        },
-        data: data.map(o => o.w)
-      }
-    ]
-  }
-}
diff --git a/src/views/Home/MapCtrl/components/Sksjcx/index.js b/src/views/Home/MapCtrl/components/Sksjcx/index.js
deleted file mode 100644
index 0bcbc61..0000000
--- a/src/views/Home/MapCtrl/components/Sksjcx/index.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import {normalizeSearchTmRange} from '../../../../../utils/tools';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption';
-import {getDetail,  reservoirmonitor} from '../../../../../service/sssq'
-
-const {RangePicker} = DatePicker;
-
-function DrpSearch({ record }) {
-  const [data, setData] = useState([]);
-  const [params, setParams] = useState({})
-  const [detail, setDetail] = useState({});
-  const option = useMemo(() => {
-    return drpOption({data,afsltdz:record.afsltdz,flLowLimLev:record.flLowLimLev,desFloodLev:record.desFloodLev,calFloodLev:record.calFloodLev});
-  }, [data])
-
-  // 获取当前时间
-  const currentTime = moment();
-  // 设置早上八点的时间
-  const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0});
-  const searchTm = (e) => {
-    if (!e) {
-      setParams({...params, tm: "" })
-    } else {
-      setParams({
-        ...params,
-        stm: e[0].format("YYYY-MM-DD HH:mm"),
-        etm: e[1].format("YYYY-MM-DD HH:mm"),
-        tm:e,
-      })
-      
-    }
-  };
-  const doSearch = () => {
-    getData(params)
-  }
-  const getData = async (params) => {
-    setData(await reservoirmonitor(params));
-    setDetail(await getDetail({stcd:record.stcd}))
-  }
-
-
-  useEffect(() => {
-   
-    let option = "";
-
-    option = {
-      stcd: record.stcd,
-      source: record.source,
-      etm: moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
-      stm: moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
-      tm: [
-        moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }),
-        moment().add(1, 'hour').set({ minute: 0, second: 0 }),
-      ],
-    }
-    if (record?.stcd && record.source) {
-      setParams(option)
-      getData(option)
-      
-    }
-  }, [record])
-
-
-  return (
-    <div style={{width: "98%", height: '65vh'}} className="jcsj-sq">
-      <div className="top">
-        <div className="top-left" style={record?.height?{height:"65vh"}:{}}>
-          <div className="top-toobar">
-            <RangePicker showTime allowClear style={{width: "330px"}}
-                         onChange={searchTm}
-                         format="YYYY-MM-DD HH:mm"
-                         value={params.tm}
-            />
-            <Button type="primary" onClick={doSearch} style={{marginLeft: "10px"}}>查询</Button>
-          </div>
-          <div className="top-left-table" style={record?.height?{height:"60vh"}:{}}>
-            <TableData data={data} />
-          </div>
-        </div>
-        <div className="top-right" style={record?.height?{height:"65vh"}:{}}>
-          {
-            data.length > 0 ?
-              <ReactEcharts
-                option={option}
-                style={{width: "100%", height: '100%'}}
-              /> : <div style={{textAlign: "center", margin: "10%"}}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-          }
-        </div>
-      </div>
-      <div className="footer" style={record?.height?{fontSize:15}:{}}>
-        <div className="footer-row">
-          <div className="footer-item">
-            <div className="footer-name">近1h雨量(mm)</div>
-            <div className="footer-num">{detail?.h1?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近3h雨量(mm)</div>
-            <div className="footer-num">{detail?.h3?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近6h雨量(mm)</div>
-            <div className="footer-num">{detail?.h6?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近12h雨量(mm)</div>
-            <div className="footer-num">{detail?.h12?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近24h雨量(mm)</div>
-            <div className="footer-num">{detail?.h24?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年降雨天数</div>
-            <div className="footer-num">{detail?.yearDrpDay||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">24h水位变幅(m)</div>
-            <div className="footer-num">{detail?.rzDiff > 0 ? "+" :"" }{detail?.rzDiff ?detail?.rzDiff.toFixed(2) : '-'}</div>
-          </div>
-        </div>
-        <div className="footer-row">
-          <div className="footer-item">
-            <div className="footer-name">近48h雨量(mm)</div>
-            <div className="footer-num">{detail?.h48?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">今日雨量(mm)</div>
-            <div className="footer-num">{detail?.today ?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">昨日雨量(mm)</div>
-            <div className="footer-num">{detail?.yesterdayDrp?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本月雨量(mm)</div>
-            <div className="footer-num">{detail?.monthDrp?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年雨量(mm)</div>
-            <div className="footer-num">{detail?.yearDrp?? "-"}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年最大日雨量(mm)</div>
-            <div className="footer-num">{detail?.maxDrp?? "-"}({moment(detail?.maxDrpTime).format('MM-DD')})</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年最高水位(mm)</div>
-            <div className="footer-num">{detail?.maxRz ? detail?.maxRz.toFixed(2) :'-'}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default DrpSearch
diff --git a/src/views/Home/MapCtrl/components/Sksjcx/index.less b/src/views/Home/MapCtrl/components/Sksjcx/index.less
deleted file mode 100644
index 9806cfe..0000000
--- a/src/views/Home/MapCtrl/components/Sksjcx/index.less
+++ /dev/null
@@ -1,45 +0,0 @@
-
-.jcsj-sq{
-  .top {
-    width: 100%;
-    display: flex;
-    align-items: flex-start;
-    justify-content: space-between;
-    .top-left{
-      width: 48%;
-      .top-left-table{
-
-        height: 46vh;
-        overflow: auto;
-        margin-top: 10px;
-      }
-    }
-    .top-right{
-      width: 48%;
-      height: 50vh;
-    }
-  }
-
-
-
-  .footer{
-    font-size: 12px;
-    margin-top: 10px;
-    .footer-row{
-      display: flex;
-      justify-content: space-between;
-      .footer-item{
-        flex: 1;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Skssjc/index.js b/src/views/Home/MapCtrl/components/Skssjc/index.js
deleted file mode 100644
index fd0722e..0000000
--- a/src/views/Home/MapCtrl/components/Skssjc/index.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import clsx from 'clsx';
-import moment from "moment"
-import genDamImage from '../../../../../components/DamGraph/DamImage';
-import {renderDrp, renderSkArz, renderSkDdz} from '../../../../../utils/renutils';
-import './index.less'
-import MyImg from './myImg.js'
-import { httpget,httppost } from '../../../../../utils/request';
-import apiurl from '../../../../../service/apiurl';
-import { Image,Divider } from 'antd';
-
-function Skssjc({data}) {
-
-  const [damGraph, setDamGraph] = useState();
-  const [imgList, setImgList] = useState([])
-  const [currentIndex, setCurrentIndex] = useState(0)
-  useEffect(() => {
-    const img = genDamImage(data, 400, 260)
-    setDamGraph(img);
-    if (data.resCode) {
-      httppost(apiurl.ssyq.imglist, {
-       resCode: data.resCode
-      }).then(res => {
-        if (res.code === 200) {
-         setImgList(res?.data)
-       }
-     })
-   }
-  }, [data]);// eslint-disable-line
-
-  return (
-    <>
-      <div className="ssjc">
-        <div className="root">
-          <div className="realinfo">
-            <div
-              // className={clsx(data.rzState === 1 ? "online" : "offline", "dataTm")}
-              className='report-time'
-            ><span className='small-icon'></span> 水位上报时间: {data.tm}</div>
-
-            <div className="infoItem">
-              <div className="row-key">监测水位:</div>
-              <div className="row-value">{data.rz ? data.rz.toFixed(2):'-'}</div>
-              <div className="row-unit">m</div>
-            </div>
-
-            <div className="infoItem">
-          <div className="row-key">校验洪水位:</div>
-            <div className="row-value">{data?.calFloodLev ? data?.calFloodLev.toFixed(2) : '-'}</div>
-            <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-            <div className="row-value" style={{width:"20%"}}>{(data.calFloodLev && data?.rz) ? (data?.rz - data.calFloodLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-        <div className="infoItem">
-          <div className="row-key">设计洪水位:</div>
-          <div className="row-value">{data?.desFloodLev ? data?.desFloodLev.toFixed(2):'-'}</div>
-          <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-          <div className="row-value" style={{width:"20%"}}>{(data.desFloodLev && data?.rz) ? (data?.rz - data.desFloodLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">汛限水位:</div>
-          <div className="row-value">{data.flLowLimLev ? data.flLowLimLev.toFixed(2):'-'}</div>
-          <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-          <div className="row-value" style={{width:"20%"}}>{(data.flLowLimLev && data?.rz) ? (data?.rz - data.flLowLimLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">死水位:</div>
-          <div className="row-value">{data.deadLev ? data.deadLev.toFixed(2):'-'}</div>
-          <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-          <div className="row-value" style={{width:"20%"}}>{(data.deadLev && data?.rz) ? (data?.rz - data.deadLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-            <div className="infoItem">
-              <div className="row-key">坝顶高程:</div>
-              <div className="row-value">{data.crestElev}</div>
-              <div className="row-unit">{ data.crestElev ? "m" : "-"}</div>
-            </div>
-
-            <div className="infoItem">
-              <div className="row-key">水库当前库容:</div>
-              <div className="row-value">{data.nowCap}</div>
-              <div className="row-unit">万m³</div>
-            </div>
-
-            <div className="infoItem">
-              <div className="row-key">兴利库容:</div>
-              <div className="row-value">{data.benResCap}</div>
-              <div className="row-unit">万m³</div>
-            </div>
-
-
-            <div style={{marginTop: "10px"}}
-              //  className={clsx(data.drpState === 1 ? "online" : "offline", "dataTm")}
-              className='rain-report'
-            ><span className='small-icon'></span>雨量上报时间: {data.drpTm ? moment(data.drpTm).format('YYYY-MM-DD HH:mm') : "-"}</div>
-
-            <div className="infoItem">
-              <div className="row-key">小时雨量:</div>
-              <div className="row-value"><span>
-                {/* {renderDrp(data, 'h1')} */}
-                {data?.h1 ?? "-"}
-              </span></div>
-              <div className="row-unit">mm</div>
-            </div>
-            <div className="infoItem">
-              <div className="row-key">24小时雨量:</div>
-              <div className="row-value"><span>
-                {data?.h24 ?? "-"}
-                {/* {renderDrp(data, 'h24')} */}
-              </span></div>
-              <div className="row-unit">mm</div>
-            </div>
-            <div className="infoItem">
-              <div className="row-key">今日雨量:</div>
-              <div className="row-value"><span>
-                {data?.today ?? "-"}
-                {/* {renderDrp(data, 'today')} */}
-              </span></div>
-              <div className="row-unit">mm</div>
-            </div>
-          </div>
-          <div className="picContainer">
-            {
-              damGraph ? (
-                <MyImg record={data}/>
-              ) : (
-                <div className="noPic">暂无数据</div>
-              )
-            }
-
-            {
-              imgList.length > 0 ? (
-                <div className="tx-item">
-                <Image
-                   src={imgList[currentIndex]?.imgPath || `${process.env.PUBLIC_URL}/assets/default_img.png`}
-                   alt=''
-                   width="100%"
-                   height="215px"
-                   style={{zIndex:9999999}}
-                />
-               <div className='num-box'>
-                 {imgList.length > 1 && imgList.map((item,index)=> 
-                     <span className={clsx(currentIndex == index && "active",'img-num')} onClick={() => setCurrentIndex(index)}>{index + 1}</span>
-                 )}
-              </div>
-            </div>
-              ) : (
-                <div className="noPic">暂无数据</div>
-              )
-            }
-
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default Skssjc;
diff --git a/src/views/Home/MapCtrl/components/Skssjc/index.less b/src/views/Home/MapCtrl/components/Skssjc/index.less
deleted file mode 100644
index c913072..0000000
--- a/src/views/Home/MapCtrl/components/Skssjc/index.less
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-.ssjc{
-  .root {
-    display: flex;
-    color: #333;
-    padding: 1rem 1rem 1rem 1rem;
-  }
-
-  .realinfo {
-    width: 45%;
-    margin-right: 1rem
-  }
-
-  .dataTm {
-    padding: 0.4rem 1rem;
-    border-radius: 0.4rem;
-    margin-bottom: 0.5rem;
-    font-size: 0.8rem;
-  }
-
-  .online, .offline{
-    color:#fff;
-    line-height:22px;
-    font-size:14px;
-    letter-spacing: 1px;
-  }
-
-  .online {
-    border: 1px solid #9ccc65;
-    background-color: #33691e;
-  }
-  .report-time,.rain-report{
-    display: flex;
-    align-items: center;
-    color: #000;
-    font-size: 15px;
-    font-weight: 500;
-    line-height: 1.5;
-    column-gap: 5px;
-    margin-bottom: 10px;
-    .small-icon{
-      display: inline-block;
-      width: 5px;
-      height: 20px;
-      border-radius: 2px;
-      background-color: #0084ff;
-    }
-  }
-
-  .offline {
-    border: 1px solid #ef5350;
-    background-color: #b71c1c;
-  }
-
-  .infoItem {
-    border-bottom: 1px dashed #aaa;
-    display: flex;
-    font-size: 14px;
-    line-height: 1.8;
-    margin-bottom: 0.5rem;
-
-    & > .row-key{
-      width: 9rem;
-      line-height:30px;
-    }
-
-    & > .row-value{
-      width: 50%;
-      text-align: right;
-      font-weight: bold;
-      margin-right: 0.5rem;
-      flex-grow: 1;
-    }
-
-    & > .row-unit{
-      width: 3rem;
-      flex-shrink: 0;
-    }
-  }
-
-  .picContainer {
-    width: 55%;
-    display: flex;
-    flex-direction: column;
-    // background-color: #eff3f6;
-
-    & > div{
-      position: relative;
-
-      & > .tm{
-        position: absolute;
-        top: 0;
-        left: 0;
-        background-color: grey;
-        border-radius: 0.3rem 0 0 0.3rem;
-        padding: 0.2rem 0.5rem;
-        color: #fff;
-      }
-      & > .thumb{
-        position: absolute;
-        right: 0;
-        bottom: 0;
-        left: 60%;
-      }
-    }
-    .tx-item{
-      margin-top: 1.5%;
-      position: relative;
-      .num-box{
-          position: absolute;
-          top: 11rem;
-          left: 3%;
-      }
-      .img-num{
-          padding: 3px 8px;
-          color: #fff;
-          background-color: #86919c;
-          border: 1px solid #2b65df;
-          margin-right: 2px;
-          cursor: pointer;
-      }
-      .active{
-          background-color:#2b65df
-      }
-      .tx-description{
-          margin-top: 3%;
-          padding: 2%;
-          background-color: #26293a;
-          .tx-name{
-              display: flex;
-              justify-content: space-between;
-              // margin-top: 2%;
-          }
-      }
-  }
-  }
-
-  .noPic {
-    height: 35%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-color: #eff3f6;
-    margin-top: 5%;
-    border-radius: 5%;
-  }
-
-  .divider {
-    margin-bottom: 1rem;
-  }
-
-  .action {
-    text-align: right;
-    color: #fff;
-    font-size: 1rem;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Skssjc/myImg.js b/src/views/Home/MapCtrl/components/Skssjc/myImg.js
deleted file mode 100644
index 017b23f..0000000
--- a/src/views/Home/MapCtrl/components/Skssjc/myImg.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import { translate } from "ol/transform";
-
-
-const MyImg = ({ record }) => {
-  console.log("record: ", record);
-  /**
-   * 
-   * @param {*} h1 动态水位
-   * @param {*} h2 坝高
-   * @param {*} h3 死水位
-   * @returns 
-   */
-  const computerHeight = (h1, h2, h3) => {
-    let height;
-    let comHeight;
-    if (h1 & h2 & h3) {
-      comHeight = (h1 - h3) / (h2 - h3)
-      // height = comHeight * 100 < 80 ? `${comHeight}%` : "80%"
-      height = `${comHeight * 80}%`
-      return height
-    } else {
-      return ''
-    }
-  }
-  return (
-    <div style={{
-      flexGrow: 1,
-      height: '36vh',
-      overflow: 'hidden',
-      position: 'relative',
-      backgroundColor: "#eff3f6",
-      borderRadius:"2%"
-    }}>
-      <img
-        src={`${process.env.PUBLIC_URL}/assets/images/waterz.png`}
-        style={
-          {
-            position: 'absolute',
-            bottom:computerHeight(record.rz,record.crestElev,record.deadLev),
-            // top: '50%'
-            transform:"translateY(100%)"
-          }}
-      />
-
-        <img src={`${process.env.PUBLIC_URL}/assets/images/dam.png`} style={{ position: 'absolute', bottom: 0, height: '100%', right: -20 }} />
-
-        <img src={`${process.env.PUBLIC_URL}/assets/images/ruler.png`} style={{ position: 'absolute', bottom: 0, height: '100%', left: 20 }} />
-
-      <div style={
-        {
-          position: 'absolute',
-          left: 40,
-          // width: '65%',
-          bottom:computerHeight(record.desFloodLev,record.crestElev,record.deadLev),
-          display: 'flex',
-          alignItems: 'center',
-          gap: 8,
-          // zIndex:1
-        }}>
-        <img src={`${process.env.PUBLIC_URL}/assets/images/red1.png`}
-          style={{
-            width: 90,
-            height: 15,
-            }}
-        />
-        <div style={{
-          // width: "210px",
-          // border: '2px solid #fff',
-          // backgroundColor: '#0bcbeb',
-          // padding: '2px 16px',
-          color:'#ff0a0a',
-          fontSize: 16,
-          justifyContent: 'space-between',
-          display: 'flex',
-          columnGap:10
-        }}>
-            设计洪水位 <strong>{record.desFloodLev?record.desFloodLev.toFixed(2):"-"}m</strong>
-          </div>
-        </div>
-
-      <div style={
-        {
-          position: 'absolute',
-          left: 40,
-          // width: '65%',
-          bottom:computerHeight(record.flLowLimLev,record.crestElev,record.deadLev),
-          display: 'flex',
-          alignItems: 'center',
-          gap: 8
-        }}>
-        <img src={`${process.env.PUBLIC_URL}/assets/images/orange.png`}
-          style={{
-            width: 90,
-            height:15
-            }}
-        />
-        <div style={{
-          // width: "210px",
-          // border: '2px solid red',
-          // backgroundColor: '#0008',
-          // padding: '2px 16px',
-          color:'#ff7200',
-          fontSize: 16,
-          justifyContent: 'space-between',
-          display: 'flex',
-          columnGap:10
-        }}>
-            汛限水位 <strong>{record.flLowLimLev?record.flLowLimLev.toFixed(2):"-"}m</strong>
-          </div>
-        </div>
-
-      <div style={
-        {
-          position: 'absolute',
-          // left: 150,
-          // left:78,
-          width: '82%',
-          bottom:computerHeight(record.rz,record.crestElev,record.deadLev),
-          display: 'flex',
-          alignItems: 'center',
-          gap: 8,
-          justifyContent: 'end',
-        }}>
-        <img src={`${process.env.PUBLIC_URL}/assets/images/blue2.png`}
-          style={{
-            flex:0.5,
-            // width: 30,
-            height:15
-            }}
-        />
-        <div style={{
-          // flexGrow: 0.5,
-          // border: '2px solid #fff',
-          // color: "#fff",
-          // backgroundColor:
-          //   '#0008',
-          // padding: '2px 16px',
-          color:'#06caff',
-          fontSize: 16,
-        }}>
-          <div style={{
-            // justifyContent: 'space-between',
-            display: 'flex',
-            columnGap:10
-          }}> <span>实时水位</span> <strong>{record.rz?record.rz.toFixed(2):"-"}m</strong></div>
-            {/* <div style={{ justifyContent: 'space-between', display: 'flex'}}> <span>库容</span> <strong>{record.totCap}m³</strong></div> */}
-          </div>
-        </div>
-
-      <div style={{
-        position: 'absolute', left: 40,
-        // width: '65%',
-        top: '90%', transform: 'translateY(-50%)', display: 'flex', alignItems: 'center', gap: 8
-      }}>
-        <img src={`${process.env.PUBLIC_URL}/assets/images/white1.png`}
-          style={{
-            width: 90,
-            height:15
-            }}
-        />
-        <div style={{
-          // width: "210px",
-          // border: '2px solid #fff',
-          // color: "#fff",
-          // backgroundColor: '#0bcbeb',
-          // padding: '2px 16px',
-          color:'#fff',
-          fontSize: 16,
-          justifyContent: 'space-between',
-          display: 'flex',
-          columnGap:10
-        }}>
-            死水位 <strong>{record.deadLev?record.deadLev.toFixed(2):''}m</strong>
-          </div>
-        </div>
-      </div>
-  )
-}
-
-export default MyImg
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Spjc/index.js b/src/views/Home/MapCtrl/components/Spjc/index.js
deleted file mode 100644
index 36d8cb2..0000000
--- a/src/views/Home/MapCtrl/components/Spjc/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-
-import React, { useEffect, useState } from 'react';
-import './index.less'
-import clsx from "clsx";
-import HFivePlayer from '../../../../../components/video1Plary.js'
-import { httpget2 } from '../../../../../utils/request'
-import apiurl from '../../../../../service/apiurl';
-import { Empty } from 'antd'
-
-
-function Spjc({ record }) {
-  console.log(record);
-  const [current, setCurrent] = useState(0)
-  const [list, setList] = useState([])
-  const [videoArr, setvideoArr] = useState({})
-
-  const getVideo = async () => {
-    const res = await httpget2(`${apiurl.spjk.videoBystcd}${record.stcd}`)
-    setList(res.data)
-  }
-  const getVideoSrc = async (current) => {
-    const res = await httpget2(`${apiurl.spjk.srcData}${current}`)
-    if(res.code ==200 && res.data?.length!== 0){
-      setvideoArr({src:res.data})
-    }else{
-      setvideoArr({})
-    }
-  }
-  useEffect(() => {
-    getVideo()
-  }, []);
-
-  return (
-    <>
-      <div className="spjc-sq">
-        <div className="btn-list">
-          {
-            list?.map((item, index) => <div className={clsx({ active: item.camId === current })} onClick={() => { setCurrent(item.camId); getVideoSrc(item.camId) }}>{item.name}</div>)
-          }
-        </div>
-        {videoArr?.src && <div className="content-video" style={{ height: 500 }}>
-          <HFivePlayer size={1} wsUrl={videoArr} playerID={'111'} />
-        </div>}
-        {!videoArr?.src && <Empty style={{ position: 'absolute', top: '200px', left: '400px' }} description={false} />}
-      </div>
-    </>
-  )
-}
-
-export default Spjc;
diff --git a/src/views/Home/MapCtrl/components/Spjc/index.less b/src/views/Home/MapCtrl/components/Spjc/index.less
deleted file mode 100644
index c5ff536..0000000
--- a/src/views/Home/MapCtrl/components/Spjc/index.less
+++ /dev/null
@@ -1,25 +0,0 @@
-.spjc-sq {
-  overflow: auto;
-  height: 65vh;
-  .btn-list {
-    display: flex;
-    flex-wrap: wrap;
-    div{
-      padding: 2px 15px;
-      color:#666;
-      border: 1px solid #ccc;
-      border-radius: 5px;
-      margin-right: 20px;
-    }
-    .active{
-      border: 1px solid #0D7DF5;
-      color:#0D7DF5;
-    }
-  }
-  .content-video{
-    margin-top: 20px;
-    img{
-      width: 100%;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/TableData.js b/src/views/Home/MapCtrl/components/Sqjcsj/TableData.js
deleted file mode 100644
index 24a8f24..0000000
--- a/src/views/Home/MapCtrl/components/Sqjcsj/TableData.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-import moment from 'moment'
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')},
-    {
-      title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-    {
-      title: '水位(m)', key: 'z', dataIndex: 'z', align: 'center',
-      render: (rec) => <span>{rec ? rec.toFixed(2) : "-"}</span>
-    },
-    {
-      title: '转换流量(m³/s)', key: 'tq', dataIndex: 'tq', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js b/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js
deleted file mode 100644
index 40704cf..0000000
--- a/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js
+++ /dev/null
@@ -1,231 +0,0 @@
-export default function drpOption({ data, wrz, grz }) {
-  console.log("data",wrz, grz);
-  const maxVal = Math.max(...data.map(obj => obj.drp))
-  const maxSw = Math.ceil(Math.max(...data.map(obj => obj.z)))
-  const minSw = Math.floor(Math.min(...data.map(obj => obj.z)))
-  const maxLl = Math.max(...data.map(obj => obj.tq))
-  const minLl = Math.min(...data.map(obj => obj.tq))
-  return {
-    tooltip: {
-      trigger: 'axis',
-
-    },
-    grid: [
-      {
-        top: "15%",
-        left: "10%",
-        right: "8%",
-        width: '80%',
-        height: '35%'
-      },
-      {
-        bottom: "5%",
-        left: "10%",
-        right: "8%",
-        width: '80%',
-        height: '35%'
-      },
-    ],
-    legend: {
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ['警戒水位', '危险水位', "降雨量", "水位", "转换流量"],
-    },
-    xAxis: [
-      {
-        gridIndex: 0,
-        type: 'category',
-        data: data.map(o => o.tm).reverse(),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          show:false,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      },
-      {
-        gridIndex: 1,
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: true,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.substr('2020-'.length, 11)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        inverse: true,
-        gridIndex: 0,
-        type: 'value',
-        position: 'left',
-        name: "降雨量(mm)",
-        nameLocation: "start",
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: 0,
-        max: maxVal
-      },
-      {
-        gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: "水位(m)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minSw,
-        max: maxSw
-      },
-      {
-        gridIndex: 1,
-        type: 'value',
-        position: 'right',
-        name: "流量(m³/s)",
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minLl,
-        max: maxLl
-      }
-    ],
-    series: [
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '危险水位',
-        type: 'line',
-        color: "#D9001B",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => grz),
-        symbol: 'none' // 设置标记点为'none'，即去掉圆点
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '警戒水位',
-        type: 'line',
-        color: "#F59A23",
-        barWidth: '60%',
-        data:  data.map(o => wrz),
-        lineStyle: {
-          type: "dashed"
-        },
-        symbol: 'none' // 设置标记点为'none'，即去掉圆点
-      },
-    
-      {
-        name: '降雨量',
-        type: 'bar',
-        barWidth: '60%',
-        data:  data.map(o => o.drp).reverse(),
-        itemStyle: {
-          color: "#007AFD",
-        },
-        label: {
-          show: false,
-        },
-
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '水位',
-        type: 'line',
-        symbol: 'none',
-        color: "#0AE0B5",
-        label: {
-          show: false,
-        },
-        data:  data.map(o => o.z ? o.z.toFixed(2) : null),
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 2,
-        name: '转换流量',
-        type: 'line',
-        color: "#007AFD",
-        symbol: 'none',
-        showSymbol: false,
-        label: {
-          show: false,
-        },
-        data:  data.map(o => o.tq),
-      }
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/index.js b/src/views/Home/MapCtrl/components/Sqjcsj/index.js
deleted file mode 100644
index 8e1752f..0000000
--- a/src/views/Home/MapCtrl/components/Sqjcsj/index.js
+++ /dev/null
@@ -1,171 +0,0 @@
-import React, {useEffect, useMemo, useState,useRef} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import {normalizeSearchTmRange} from '../../../../../utils/tools';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption';
-import {monitor,getDetail} from '../../../../../service/sssq'
-
-
-const {RangePicker} = DatePicker;
-
-function DrpSearch({record}) {
-  const [data, setData] = useState([]);
-  const [params, setParams] = useState({})
-  const [detail, setDetail] = useState({});
-  const rangePickerRef = useRef();
-  const [initialDateRange , setInitialDateRange] = useState({})
-  const option = useMemo(() => {
-    if (data && data.length) {
-      return drpOption({data,wrz:record.wrz,grz:record.grz});
-    }
-  }, [data])
-
-  // 获取当前时间
-  const currentTime = moment();
-  // 设置早上八点的时间
-  const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0});
-  const searchTm = (e) => {
-    if (!e) {
-      setParams({...params, tm: "" })
-    } else {
-      setParams({
-        ...params,
-        stm: e[0].format("YYYY-MM-DD HH:mm"),
-        etm: e[1].format("YYYY-MM-DD HH:mm"),
-        tm:e,
-      })
-      
-    }
-  };
-  const doSearch = () => {
-    console.log(params);
-    getData(params)
-  }
-  const getData = async (params) => {
-    setData(await monitor(params));
-    setDetail(await getDetail({stcd:record.stcd,source:record.source,type:1}))
-  }
-  const handleReset = () => {
-   setParams({...params,tm:initialDateRange?.tm,stm:initialDateRange.stm,etm:initialDateRange.etm})
-  };
-
-  useEffect(() => {
-    let option = "";
-    option = {
-      stcd: record.stcd,
-      source: record.source,
-      etm: moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
-      stm: moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
-      tm: [
-        moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }),
-        moment().add(1, 'hour').set({ minute: 0, second: 0 }),
-      ],
-    }
-    if (record.stcd) {
-      setParams(option)
-      setInitialDateRange(option)
-      getData(option)
-      
-    }
-  }, [record])
-
-  return (
-    <div style={{width: "98%", height: '65vh'}} className="jcsj-sq">
-      <div className="top">
-        <div className="top-left" style={record?.height?{height:"65vh"}:{}}>
-          <div className="top-toobar">
-            <RangePicker showTime allowClear style={{width: "320px"}}
-                         onChange={searchTm}
-                         format="YYYY-MM-DD HH:mm"
-                         value={params.tm}
-                         ref={rangePickerRef}
-            />
-            <Button type="primary" onClick={doSearch} style={{ marginLeft: "10px" }}>查询</Button>
-            <Button  style={{ marginLeft: "10px" }} onClick={() => { handleReset()}}>重置</Button>
-          </div>
-          <div className="top-left-table" style={record?.height?{height:"60vh"}:{}}>
-            <TableData data={data} />
-          </div>
-        </div>
-        <div className="top-right" style={record?.height?{height:"65vh"}:{}}>
-          {
-            data.length > 0 ?
-              <ReactEcharts
-                option={option}
-                style={{width: "100%", height: '100%'}}
-              /> : <div style={{textAlign: "center", margin: "10%"}}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-          }
-        </div>
-      </div>
-      <div className="footer" style={record?.height?{fontSize:15}:{}}>
-        <div className="footer-row">
-          <div className="footer-item">
-            <div className="footer-name">近1h雨量(mm)</div>
-            <div className="footer-num">{detail.h1||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近3h雨量(mm)</div>
-            <div className="footer-num">{detail.h3||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近6h雨量(mm)</div>
-            <div className="footer-num">{detail.h6||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近12h雨量(mm)</div>
-            <div className="footer-num">{detail.h12||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">近24h雨量(mm)</div>
-            <div className="footer-num">{detail.h24||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年降雨天数</div>
-            <div className="footer-num">{detail.yearDrpDay||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">24h水位变幅(m)</div>
-            <div className="footer-num">{detail.rzDiff > 0 ? "+" :"" }{detail.rzDiff?detail.rzDiff.toFixed(2) : 0}</div>
-          </div>
-        </div>
-        <div className="footer-row">
-          <div className="footer-item">
-            <div className="footer-name">近48h雨量(mm)</div>
-            <div className="footer-num">{detail.h48||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">今日雨量(mm)</div>
-            <div className="footer-num">{detail.today||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">昨日雨量(mm)</div>
-            <div className="footer-num">{detail.yesterdayDrp||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本月雨量(mm)</div>
-            <div className="footer-num">{detail.monthDrp||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年雨量(mm)</div>
-            <div className="footer-num">{detail.yearDrp||0}</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年最大日雨量(mm)</div>
-            <div className="footer-num">{detail.maxDrp||0}({moment(detail.maxDrpTime).format('MM-DD')})</div>
-          </div>
-          <div className="footer-item">
-            <div className="footer-name">本年最高水位(mm)</div>
-            <div className="footer-num">{detail.maxRz ? detail.maxRz.toFixed(2) :0}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default DrpSearch
diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/index.less b/src/views/Home/MapCtrl/components/Sqjcsj/index.less
deleted file mode 100644
index 9806cfe..0000000
--- a/src/views/Home/MapCtrl/components/Sqjcsj/index.less
+++ /dev/null
@@ -1,45 +0,0 @@
-
-.jcsj-sq{
-  .top {
-    width: 100%;
-    display: flex;
-    align-items: flex-start;
-    justify-content: space-between;
-    .top-left{
-      width: 48%;
-      .top-left-table{
-
-        height: 46vh;
-        overflow: auto;
-        margin-top: 10px;
-      }
-    }
-    .top-right{
-      width: 48%;
-      height: 50vh;
-    }
-  }
-
-
-
-  .footer{
-    font-size: 12px;
-    margin-top: 10px;
-    .footer-row{
-      display: flex;
-      justify-content: space-between;
-      .footer-item{
-        flex: 1;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Swllgx/TableData.js b/src/views/Home/MapCtrl/components/Swllgx/TableData.js
deleted file mode 100644
index 41c9160..0000000
--- a/src/views/Home/MapCtrl/components/Swllgx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '水位(m)', key: 'z', dataIndex: 'z', align: 'center'},
-    {title: '流量(m³/s)', key: 'q', dataIndex: 'q', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Swllgx/drpOption.js b/src/views/Home/MapCtrl/components/Swllgx/drpOption.js
deleted file mode 100644
index b44d571..0000000
--- a/src/views/Home/MapCtrl/components/Swllgx/drpOption.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-
-export default function drpOption({data}) {
-  const maxVal = Math.max(...data.map(obj => obj.q))
-  const minVal = Math.floor(Math.min(...data.map(obj => obj.q)))
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "6%",
-        left: "10%",
-        right: "8%",
-        bottom:"8%"
-      },
-    ],
-    xAxis: [
-      {
-        name:"水位(m)",
-        nameLocation:"center",
-        nameGap:"30",
-        type: 'category',
-        data: data.map(o => o.z),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#333',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "流量(m³/s)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: data.map(o => o.q),
-        symbol: 'none' // 设置标记点为'none'，即去掉圆点
-      },
-    ]
-  };
-}
diff --git a/src/views/Home/MapCtrl/components/Swllgx/index.js b/src/views/Home/MapCtrl/components/Swllgx/index.js
deleted file mode 100644
index b969e5f..0000000
--- a/src/views/Home/MapCtrl/components/Swllgx/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import {normalizeSearchTmRange} from '../../../../../utils/tools';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import {zqrl} from "../../../../../service/sssq";
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-
-
-function DrpSearch({record}) {
-
-
-  const [data, setData] = useState([]);
-
-
-  const getData = async () => {
-    setData(await zqrl(record.stcd));
-  };
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  useEffect(() => {
-    getData();
-  }, [ record]);// eslint-disable-line
-
-  ;
-
-  return (
-    <div style={{width: "98%", height: '60vh'}} className="swllgx-sq">
-      <div className="content">
-        <div className="content-left">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default DrpSearch
diff --git a/src/views/Home/MapCtrl/components/Swllgx/index.less b/src/views/Home/MapCtrl/components/Swllgx/index.less
deleted file mode 100644
index 6e2608b..0000000
--- a/src/views/Home/MapCtrl/components/Swllgx/index.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left{
-      width: 48%;
-      max-height: 60vh;
-      overflow: auto;
-    }
-    .content-right{
-      width: 48%;
-      height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/components/Txjc/DataTable.tsx b/src/views/Home/MapCtrl/components/Txjc/DataTable.tsx
deleted file mode 100644
index bab1794..0000000
--- a/src/views/Home/MapCtrl/components/Txjc/DataTable.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, {useCallback, useMemo, useState, useEffect} from 'react';
-import {Image, Button, Card, Space, Table, Modal, Divider} from 'antd';
-import {SearchOption} from "../../../../../service/def";
-import ToolBar from './ToolBar';
-import "./index.less";
-import {Pagination} from 'antd';
-import {adnmCun, adnmZhen} from "../../../../../models/_/adcd";
-
-
-type IProps = {
-  pagerCtx: any;
-  params: any;
-}
-
-
-const DataTable: React.FC<IProps> = ({pagerCtx, params}) => {
-  const [list, setList] = useState([]);
-  const pagination = pagerCtx.tableProps.pagination
-
-  useEffect(() => {
-    setList(pagerCtx.tableProps.dataSource);
-  }, [pagerCtx.tableProps.dataSource]);
-
-
-  const doSearch = (params1: any) => { 
-    const searchParams: SearchOption = {
-      search: {
-        ...params1,
-        stcd: params1.stcd,
-        resCode: params.resCode
-       }
-    };
-    pagerCtx.search(searchParams);
-  };
-
-
-  const onchange = (page: any, pageSize: any) => {
-    const obj = {
-      pageNumber: page,
-      pageSize: pageSize,
-    }
-    const searchParams: SearchOption = {
-      ...obj
-    };
-    pagerCtx.search(searchParams);
-  }
-  return (
-    <>
-      <div style={{padding: "15px", background: "#FBFBFB", border: "1px solid #F0F0F0"}}>
-        <Space wrap>
-          <ToolBar
-            params={{...params.search,resCode:params.resCode}}
-            search={doSearch}
-          />
-        </Space>
-      </div>
-
-      {/*列表数据*/}
-      <div style={{marginTop: "15px"}}>
-        <div className="summaryImageMonitorBoxs" style={{overflow: "auto"}}>
-          {
-            list && list.map((record: any, index: any) =>
-              <div className="picContainer">
-                <div className="picContainer-box">
-                  {/*// @ts-ignore*/}
-                  <Image alt="pic"
-                         src={record.imgPath ? record.imgPath : `${process.env.PUBLIC_URL}/assets/default_img.png`}/>
-                  {/*// @ts-ignore*/}
-                  <div className="tm">{record.url ? record.url[0]?.tm : ""}</div>
-                </div>
-              </div>
-            )
-          }
-
-
-        </div>
-      </div>
-      <div style={{textAlign: "right", marginTop: "25px",marginRight:20}}>
-        <Pagination
-          current={pagination.current}
-          total={pagination.total}
-          showTotal={pagination.showTotal}
-          pageSize={pagination.pageSize}
-          showSizeChanger
-          showQuickJumper
-          pageSizeOptions={[4, 8, 12, 16]}
-          onChange={onchange}
-        />
-      </div>
-    </>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/MapCtrl/components/Txjc/ToolBar.tsx b/src/views/Home/MapCtrl/components/Txjc/ToolBar.tsx
deleted file mode 100644
index a3e90cc..0000000
--- a/src/views/Home/MapCtrl/components/Txjc/ToolBar.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import moment from 'moment';
-import { Form, Input, Button, DatePicker, Select } from 'antd';
-import { SearchOutlined, RedoOutlined, UploadOutlined } from '@ant-design/icons';
-import {channel} from '../../../../../service/sssq'
-
-const { RangePicker } = DatePicker;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-}
-
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search }) => {
-  
-  const [form] = Form.useForm();
-  const [types,setTypes]=useState([])
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-
-  const onSearchClick = () => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD HH:mm:ss');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD HH:mm:ss');
-      }
-    }
-    rec.pageNumber = 1;
-    console.log("rec",rec);
-    
-    search(rec);
-  };
-  const getData= async (option:any)=>{
-    let data = await channel(option);
-    setTypes(data)
-  }
-
-
-  useEffect(() => {
-    let option={
-      // stcd:params.stcd,
-      // source: params.source,
-      resCode:params.resCode
-    }
-    getData(option)
-  }, []);
-
-
-  return record ? (
-    <Form layout="inline" form={form} initialValues={{ ...record,stcd:"" }}>
-      <Form.Item label="" name="tm">
-        <RangePicker allowClear format="YYYY-MM-DD HH:mm" style={{ width: 310 }}/>
-      </Form.Item>
-      <Form.Item label="" name="stcd">
-        <Select style={{ width: 240 }} allowClear>
-          {
-            types.map((o:any) => <Select.Option key={o.stcd} value={o.stcd}>{o.stnm}</Select.Option>)
-          }
-        </Select>
-      </Form.Item>
-      <Form.Item>
-        <Button type="primary" icon={<SearchOutlined />} onClick={onSearchClick}>查询</Button>
-      </Form.Item>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/MapCtrl/components/Txjc/index.less b/src/views/Home/MapCtrl/components/Txjc/index.less
deleted file mode 100644
index 5002307..0000000
--- a/src/views/Home/MapCtrl/components/Txjc/index.less
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-.summaryImageMonitorBoxs {
-  display: flex;
-  flex-wrap: wrap;
-  .picContainer {
-    width: 25%;
-    display: flex;
-    flex-direction: column;
-    padding: 10px;
-    border-radius: 20px;
-    overflow: hidden;
-
-    .picContainer-box {
-      position: relative;
-      width: 100%;
-      overflow: hidden;
-      & > .tm {
-        position: absolute;
-        top: 0;
-        left: 0;
-        background-color: grey;
-        padding: 0.2rem 0.5rem;
-        color: #fff;
-      }
-
-      & > .thumb {
-        position: absolute;
-        left: 0;
-        bottom: 0;
-        right: 60%;
-        border: 2px solid #fff;
-        border-left: 0;
-        border-bottom: 0;
-      }
-    }
-  }
-}
diff --git a/src/views/Home/MapCtrl/components/Txjc/index.tsx b/src/views/Home/MapCtrl/components/Txjc/index.tsx
deleted file mode 100644
index 64dc33e..0000000
--- a/src/views/Home/MapCtrl/components/Txjc/index.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import DataTable from './DataTable';
-import usePageTableTxhz from "./usePageTableTxhz";
-import {SearchOption} from "../../../../../service/def";
-import {imageinfo} from "../../../../../service/sssq";
-import moment from "moment";
-
-type IProps = {
-  record?: any;
-}
-
-const Txjc: React.FC<IProps> = ({ record }) => {
-  // 页面初始默认查询参数
-  const options = {
-    search: {
-      // stcd:record.stcd,
-      source: record.source,
-      stm: moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:ss"),
-      etm:moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm:ss")
-      // stm: moment().subtract(8, 'days').startOf('day').set({hour: 8, minute: 0}).format("YYYY-MM-DD HH:mm:ss"),
-      // etm: moment().subtract(1, 'days').startOf('day').set({hour: 8, minute: 0}).format("YYYY-MM-DD HH:mm:ss"),
-    },
-  };
-  const pager = usePageTableTxhz<any>(async (params?: SearchOption) => {
-    let myParams={
-      ...options.search,
-      ...params,
-      resCode:record.resCode
-    }
-    let data:any = await imageinfo(myParams);
-    return { list: data?.records, totalRow: data?.total ,}
-  });
-
-
-  useEffect(() => {
-    if (record.resCode) {
-      pager.search({
-        search: {
-          ...options.search,
-          resCode:record.resCode
-        },
-      });
-    }
-  }, [record]);
-
-  return (
-    <div className="content-root" style={{height:"60vh",overflow:"auto"}}>
-      <DataTable
-        pagerCtx={pager}
-        params={{...options,resCode:record.resCode}}
-      />
-    </div>
-  )
-};
-
-export default Txjc
diff --git a/src/views/Home/MapCtrl/components/Txjc/usePageTableTxhz.ts b/src/views/Home/MapCtrl/components/Txjc/usePageTableTxhz.ts
deleted file mode 100644
index 2bda05c..0000000
--- a/src/views/Home/MapCtrl/components/Txjc/usePageTableTxhz.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { useState, useRef, useEffect } from 'react';
-import { ListProps, TableProps } from 'antd';
-
-import { PageResult, SearchOption } from '../../../../../service/def';
-import { camel2UnderLine } from "../../../../../utils/utils";
-import { log } from 'console';
-import moment from 'moment';
-
-
-type TableState<T> = {
-  data: T[];
-  total: number;
-  loading: boolean;
-
-  pageSize: number;
-  pageNumber: number;
-  search: { [key: string]: string };
-  sortField?: string;
-  sortOrder?: 'asc' | 'desc';
-}
-
-
-export type PageTableContext<T> = {
-  tableProps: TableProps<T>,
-  listProps?: ListProps<T>,
-  search: (params?: SearchOption) => void,
-  refresh: () => void
-}
-
-function usePageTable<T>(
-  service: (params?: SearchOption) => Promise<PageResult<T>>,
-  options: SearchOption = {}
-): PageTableContext<T> {
-  const [screenHeight, setScreenHeight] = useState(window.innerHeight);
-  const [num, setNum] = useState(4);
-
-  useEffect(() => {
-    const handleResize = () => {
-      setScreenHeight(window.innerHeight);
-    };
-
-    window.addEventListener('resize', handleResize);
-
-    return () => {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, []);
-
-  useEffect(() => {
-    let a = parseInt(((Number(screenHeight * 0.98) - 360) / 380).toFixed(0));
-    setNum(4 * a);
-  }, [screenHeight]);
-
-  // 写在一起避免异步之后多次setState导致多次重绘
-  const [state, setState] = useState<TableState<T>>(() => ({
-    data: [],
-    total: 0,
-    loading: false,
-    pageSize: options.pageSize ?? num,
-    pageNumber: options.pageNumber ?? 1,
-    sortField: options.sortField,
-    sortOrder: options.sortOrder,
-    search: options.search || {},
-  }));
-
-  const abort = useRef(false);
-  useEffect(() => {
-    abort.current = false;
-    if(num>0){
-      search({ pageSize: num });
-    }
-    return () => { abort.current = true; }
-  }, [num]);
-
-  const search = (opt: SearchOption = {}) => {
-    console.log("opt",opt);
-    
-    setState(s => ({ ...s, loading: true }));
-    const pageParams = {
-      pageNumber: opt?.pageNumber ?? state.pageNumber,
-      pageSize: opt?.pageSize ?? num,
-      sortField: opt?.sortField ?? state.sortField,
-      sortOrder: opt?.sortOrder ?? state.sortOrder,
-      search: opt?.search ?? state.search,
-    };
-    console.log(pageParams);
-    const { search, ...params } = pageParams;
-    console.log(pageParams);
-    service({ ...search, ...params }).then((data) => {
-      if (!abort.current) {
-
-        //从c里找到shortName加到data.list里
-        const c:any = sessionStorage.getItem('projectInformation')
-        const allproject = JSON.parse(c)
-        data.list?.map((itemD:any,index:any)=>{
-          if(allproject && allproject.length>0){
-            itemD.shortName = ''
-            //给每个数据加一个key
-            itemD.xcIndex = moment(new Date()).valueOf()+'index:'+index
-            allproject?.map((itemA:any)=>{
-              if(itemD.sn === itemA.sn){
-                itemD.shortName=itemA.shortName
-              }
-            })
-          }
-        })
-
-
-
-        setState({
-          ...pageParams,
-          data: data.list,
-          total: data.totalRow,
-          loading: false,
-        })
-      }
-    });
-  };
-
-  const handleTableChange = (pagination: any, filters: any, sort: any) => {
-    const { field, order } = sort;
-    if (field && order) {
-      const sortOrder: any = order === 'ascend' ? 'asc' : 'desc';
-      const _field = camel2UnderLine(field);
-      search({ pageNumber: pagination.current, pageSize: num, sortOrder, sortField: _field });
-      return;
-    }
-    search({ pageNumber: pagination.current, pageSize: pagination.pageSize });
-  };
-
-  let listProps = undefined;
-  if (false) {
-    const handleListChange = (page: number, pageSize: number) => {
-      search({ pageNumber: page, pageSize: pageSize });
-    };
-    listProps = {
-      dataSource: state.data,
-      loading: state.loading,
-      pagination: {
-        showTotal: (totalRow: any) => `共${totalRow}条`,
-        showSizeChanger: true,
-        showQuickJumper: true,
-        pageSize: state.pageSize,
-        current: state.pageNumber,
-        total: state.total,
-        pageSizeOptions: ['10', '20', '50', '100'],
-        onChange: handleListChange
-      }
-    }
-  }
-
-  return {
-    tableProps: {
-      size: 'small',
-      bordered: true,
-      dataSource: state.data,
-      pagination: {
-        showTotal: (totalRow: any) => `共${totalRow}条`,
-        showSizeChanger: true,
-        showQuickJumper: true,
-        pageSize: state.pageSize,
-        current: state.pageNumber,
-        total: state.total,
-        pageSizeOptions: ['10', '15', '20', '50', '100'],
-        hideOnSinglePage: true,
-      },
-      loading: state.loading,
-      onChange: handleTableChange,
-    },
-    listProps,
-    search: (params?: SearchOption) => search({ ...params}),
-    refresh: search,
-  }
-}
-
-export default usePageTable
diff --git a/src/views/Home/MapCtrl/components/sdz/fxya.js b/src/views/Home/MapCtrl/components/sdz/fxya.js
deleted file mode 100644
index 8bf5fdd..0000000
--- a/src/views/Home/MapCtrl/components/sdz/fxya.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions, Table } from "antd";
-import { plan } from "../../../../../service/sssq";
-import { httpget2 } from "../../../../../utils/request"
-import apiUrl from '../../../../../service/apiurl'
-
-function SdzFxya({ data }) {
-    const [tableData, setData] = useState([])
-    const url = "http://local.gunshiiot.com:18083/gunshiApp/xfflood"
-    const type = {
-        1: '属地监管责任人',
-        2: '行业监管责任人',
-        3: '安全生产责任人'
-    }
-    const columns = [
-        { title: '文件名称', key: 'fileName', dataIndex: 'fileName', align: 'center', render: rec => { return <a href={`${url}/bzPredictionScheme/file/download/${rec.fileId}`} download={rec.fileName}>{rec.fileId}</a> } },
-        { title: '编制单位', key: 'prepOrg', dataIndex: 'prepOrg', align: 'center' },
-        { title: '编制时间', key: 'prepTime', dataIndex: 'prepTime', align: 'center' },
-        { title: '批复部门', key: 'apprOrg', dataIndex: 'apprOrg', align: 'center' },
-        { title: '批复时间', key: 'apprTime', dataIndex: 'apprTime', align: 'center' },
-    ];
-    //   const download=()=>{
-    //     let downloadLink = document.createElement("a");
-    //     downloadLink.href = `${url}/bzPredictionScheme/file/download/${params.fileId}`;
-    //     downloadLink.download = `${params.fileName}`;
-    //     downloadLink.style.display = "none";
-    //     // 将链接添加到页面中
-    //     document.body.appendChild(downloadLink);
-
-    //     // 模拟点击事件，开始下载
-    //     downloadLink.click();
-    //   }
-
-    const getInfo = () => {
-        httpget2(apiUrl.sdz.fxya, { hystCode: data.hystCode }).then(res => {
-            if (res.code == 200) {
-                //避免文件查询过慢，或者接口报错影响渲染
-                setData(res.data)
-                //根据文件id查询文件名称，塞在数组里面
-                res.data.forEach(item => {
-                    httpget2(`${apiUrl.sdz.filedNameById}${item.planId}`).then(res1 => {
-                        if (res1.code == 200) {
-                            let count = tableData.findIndex(() => item.planId == res1.id)
-                            if (count !== -1) {
-                                let newA = [...tableData]
-                                newA[count].filedName = res1.data.fileName
-                                setData(newA)
-                            }
-                        }
-                    })
-                })
-
-            } else {
-                setData([])
-            }
-        })
-    }
-    useEffect(() => {
-        getInfo()
-    }, [])
-    return (
-        <>
-            <Table rowKey="adcd"
-                sticky
-                columns={columns}
-                pagination={false}
-                dataSource={tableData}
-                scroll={{ y: "60vh" }}
-            />
-
-        </>
-    )
-}
-
-export default SdzFxya;
diff --git a/src/views/Home/MapCtrl/components/sdz/gctp.js b/src/views/Home/MapCtrl/components/sdz/gctp.js
deleted file mode 100644
index 9a3ba8e..0000000
--- a/src/views/Home/MapCtrl/components/sdz/gctp.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions, message, Table } from "antd";
-import { plan } from "../../../../../service/sssq";
-import { httpget2 } from "../../../../../utils/request"
-import apiUrl from '../../../../../service/apiurl'
-import { projDict } from "../../../../../utils/dictType"
-import { DeleteOutlined } from '@ant-design/icons'
-
-function SdzGctp({ data }) {
-    const [tableData, setData] = useState([])
-    const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-    const getInfo = () => {
-        httpget2(apiUrl.sdz.gctp, { hystCode: data.hystCode }).then(res => {
-            if (res.code == 200) {
-                setData(res.data)
-            } else {
-                setData([])
-            }
-        })
-    }
-    const delGct = (id) => {
-        httpget2(apiUrl.sdz.delGctp, { id }).then(res => {
-            if (res.code == 200) {
-                message.success('删除成功')
-                getInfo()
-            }
-        })
-    }
-    useEffect(() => {
-        getInfo()
-    }, [])
-    return (
-        <>
-            <Descriptions bordered layout="vertical" column={3}>
-                {
-                    tableData.length > 0 ? tableData.map(o => <Descriptions.Item label={projDict(o.projType)}>
-                        <div className="no-data flex flexsbc">
-                            <img src={url + o.filePath} style={{ width: "80%" }} alt="" />
-                            <span>{o.fileId}</span>
-                            <DeleteOutlined style={{ fontSize: 20 }} onClick={() => delGct(o.fileId)} />
-                        </div>
-                    </Descriptions.Item>
-                    )
-                        : ""
-                }
-            </Descriptions>
-
-        </>
-    )
-}
-
-export default SdzGctp;
diff --git a/src/views/Home/MapCtrl/components/sdz/jbxx.js b/src/views/Home/MapCtrl/components/sdz/jbxx.js
deleted file mode 100644
index fa0a18a..0000000
--- a/src/views/Home/MapCtrl/components/sdz/jbxx.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions } from "antd";
-import { plan } from "../../../../../service/sssq";
-
-
-function SdzJbxx({ data }) {
-
-
-    return (
-        <>
-            <Descriptions bordered size="small" column={2}>
-                <Descriptions.Item label="电站名称">{data.hystName}</Descriptions.Item>
-                <Descriptions.Item label="电站编码">{data.hystCode}</Descriptions.Item>
-                <Descriptions.Item label="行政主管单位">{data.managName}</Descriptions.Item>
-                <Descriptions.Item label="工程类别">{data.engType}</Descriptions.Item>
-                <Descriptions.Item label="经度">{data.hystLong}</Descriptions.Item>
-                <Descriptions.Item label="纬度">{data.hystLat}</Descriptions.Item>
-                <Descriptions.Item label="运营单位" >{data.opName}</Descriptions.Item>
-                <Descriptions.Item label="行政区划" >{data.adnm}</Descriptions.Item>
-                <Descriptions.Item label="总装机容量(万kW)" >{data.totInsCap}</Descriptions.Item>
-                <Descriptions.Item label="建成年份">{data.year}</Descriptions.Item>
-                <Descriptions.Item label="工程概况">{data.projOverview}</Descriptions.Item>
-                <Descriptions.Item label="开发方式">{data.deveTp}</Descriptions.Item>
-                <Descriptions.Item label="多年平均发电量(GW·h)">{data.avgElectGene}</Descriptions.Item>
-                <Descriptions.Item label="工程状态">{{ '0': '在建', '1': '已建' }[data.engStat]}</Descriptions.Item>
-                <Descriptions.Item label="开工时间">{data.startDate}</Descriptions.Item>
-                <Descriptions.Item label="正常蓄水位库容(万m³)">{data.normPoolStagCap}</Descriptions.Item>
-                <Descriptions.Item label="生态流量(m³/s)">{data.ecoFlow}</Descriptions.Item>
-                <Descriptions.Item label="所在水系">{data.wsName}</Descriptions.Item>
-                <Descriptions.Item label="所在干流">{data.msName}</Descriptions.Item>
-                <Descriptions.Item label="所在支流">{data.tsName}</Descriptions.Item>
-                <Descriptions.Item label="所有制情况">{data.ownership}</Descriptions.Item>
-                <Descriptions.Item label="厂房地点">{data.plantLoc}</Descriptions.Item>
-                <Descriptions.Item label="坝址">{data.damLoc}</Descriptions.Item>
-            </Descriptions>
-
-        </>
-    )
-}
-
-export default SdzJbxx;
diff --git a/src/views/Home/MapCtrl/components/sdz/sjzl.js b/src/views/Home/MapCtrl/components/sdz/sjzl.js
deleted file mode 100644
index f7081a3..0000000
--- a/src/views/Home/MapCtrl/components/sdz/sjzl.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions, Table } from "antd";
-import { plan } from "../../../../../service/sssq";
-import { httpget2 } from "../../../../../utils/request"
-import apiUrl from '../../../../../service/apiurl'
-
-function SdzSjzl({ data }) {
-    const [tableData, setData] = useState([])
-    const url = "http://local.gunshiiot.com:18083/gunshiApp/xfflood"
-    const columns = [
-        { title: '文件名称', key: 'fileName', dataIndex: 'fileName', align: 'center', render: rec => { return <a href={`${url}/bzPredictionScheme/file/download/${rec.fileId}`} download={rec.fileName}>{rec.fileId}</a> } },
-        { title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center' },
-        { title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center' },
-        { title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center' },
-        { title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center' },
-    ];
-    //   const download=()=>{
-    //     let downloadLink = document.createElement("a");
-    //     downloadLink.href = `${url}/bzPredictionScheme/file/download/${params.fileId}`;
-    //     downloadLink.download = `${params.fileName}`;
-    //     downloadLink.style.display = "none";
-    //     // 将链接添加到页面中
-    //     document.body.appendChild(downloadLink);
-    //     // 模拟点击事件，开始下载
-    //     downloadLink.click();
-    //   }
-    const getInfo = () => {
-        console.log(11111);
-        httpget2(apiUrl.sdz.sjzl, { hystCode: data.hystCode }).then(res => {
-            if (res.code == 200) {
-                setData(res.data)
-                //根据文件id查询文件名称，塞在数组里面
-                res.data.forEach(item => {
-                    httpget2(`${apiUrl.sdz.filedNameById}${item.id}`).then(res1 => {
-                        if (res1.code == 200) {
-                            let count = tableData.findIndex(() => item.id == res1.id)
-                            if (count !== -1) {
-                                let newA = [...tableData]
-                                newA[count].filedName = res1.data.fileName
-                                setData(newA)
-                            }
-                        }
-
-                    })
-                })
-            } else {
-                setData([])
-            }
-        })
-    }
-    useEffect(() => {
-        getInfo()
-    }, [])
-    return (
-        <>
-            <Table rowKey="adcd"
-                sticky
-                columns={columns}
-                pagination={false}
-                dataSource={tableData}
-                scroll={{ y: "60vh" }}
-            />
-
-        </>
-    )
-}
-
-export default SdzSjzl;
diff --git a/src/views/Home/MapCtrl/components/sdz/zrr.js b/src/views/Home/MapCtrl/components/sdz/zrr.js
deleted file mode 100644
index f5b57fd..0000000
--- a/src/views/Home/MapCtrl/components/sdz/zrr.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions, Table } from "antd";
-import { plan } from "../../../../../service/sssq";
-import { httpget2 } from "../../../../../utils/request"
-import apiUrl from '../../../../../service/apiurl'
-
-function SdzZrr({ data }) {
-    const [tableData, setData] = useState([])
-    const type = {
-        1: '属地监管责任人',
-        2: '行业监管责任人',
-        3: '安全生产责任人'
-    }
-    const columns = [
-        { title: '责任人', key: 'repType', dataIndex: 'repType', align: 'center', render: rec => type[rec] },
-        { title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center' },
-        { title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center' },
-        { title: '职务', key: 'position', dataIndex: 'position', align: 'center' },
-        { title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center' },
-    ];
-
-    const getInfo = () => {
-        httpget2(apiUrl.sdz.zrrByCode, { hystCode: data.hystCode }).then(res => {
-            if (res.code == 200) {
-                setData(res.data)
-            } else {
-                setData([])
-            }
-        })
-    }
-    useEffect(() => {
-        getInfo()
-    }, [])
-    return (
-        <>
-            <Table rowKey="adcd"
-                sticky
-                columns={columns}
-                pagination={false}
-                dataSource={tableData}
-                scroll={{ y: "60vh" }}
-            />
-
-        </>
-    )
-}
-
-export default SdzZrr;
diff --git a/src/views/Home/MapCtrl/config.js b/src/views/Home/MapCtrl/config.js
deleted file mode 100644
index 82564f6..0000000
--- a/src/views/Home/MapCtrl/config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import {config} from "../../../config";
-
-const extent = config.extent;
-const address = config.address;
-const mapConfig = {
-  address,
-  extent,
-  //homeCenter3D: [(extent[0] + extent[2]) * 0.5, (extent[1] + extent[3]) * 0.5 - 0.5, 30000],
-  homeCenter3D: [(extent[0] + extent[2]) * 0.5, (extent[1] + extent[3]) * 0.5 - 0.5, 40000],//100000
-  homeRadius3D: 20000,
-  ebuf: [0.4, 0.4],
-
-  // baseDemUrl: `http://res3d.cloudowr.cn/${address}/terrain`,
-  baseDemUrl: `${localStorage.getItem('address')}/terrain`,
-};
-
-export default mapConfig;
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/index.js b/src/views/Home/MapCtrl/index.js
deleted file mode 100644
index 308c2a1..0000000
--- a/src/views/Home/MapCtrl/index.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import React, { useEffect, useReducer, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import FeaturePops from './Pops';
-import FeatureTip from './FeatureTip';
-import './index.less';
-import Map2D from './M2D/Map2D';
-import Markers from './Markers';
-import { useLocation, useNavigate } from "react-router";
-
-let id_factory_index = 1;
-
-export default function MapCtrl() {
-  const location = useLocation();
-  const navigate = useNavigate();
-
-  const pathname = location.pathname;
-
-  const ctrlIdRef = useRef(`cloudowr_mapdiv_${id_factory_index++}`);
-  const mapobjRef = useRef();
-  const [_, forceRender] = useReducer(s => s + 1, 1);
-
-  const dispatch = useDispatch();
-
-  const cameraTarget = useSelector(s => s.runtime.cameraTarget);
-  const mapIn = useSelector(s => s.runtime.mapIn);
-  const mapOut = useSelector(s => s.runtime.mapOut);
-  const layerVisible = useSelector(s => s.map.layerVisible);
-  const layerSetting = useSelector(s => s.map.layerSetting);
-
-  const clickLoopBtn = useSelector(s => s.map.clickLoopBtn);
-  const layerSetting1 = useSelector(s => s.runtime.layerSetting);
-  const layerSettingLoop = useSelector(s => s.runtime.layerSettingLoop);
-  const smallSkRiskTime = useSelector(s => s.runtime.smallSkRiskTime);
-
-  useEffect(() => {
-    const mapCtrl = mapobjRef.current;
-    if (!mapCtrl) {
-      return;
-    }
-    mapCtrl.layerMgr.setSetting(layerSetting || {});
-    mapCtrl.layerMgr.setVisible(layerVisible || {});
-
-  }, [layerVisible, layerSetting, mapobjRef.current]);
-
-  // useEffect(() => {
-  //   const mapCtrl = mapobjRef.current;
-  //   if (!mapCtrl) {
-  //     return;
-  //   }
-  //   // mapCtrl.zoomIn()
-  //    const a = mapCtrl.getView().getZoom()
-  //    debugger
-  // },[mapIn,mapOut])
-
-  useEffect(() => {
-    const mapCtrl = mapobjRef.current;
-    if (!mapCtrl) {
-      return;
-    }
-    console.log("75", layerVisible);
-    // || !layerVisible["forecastPoints"]
-    // if (layerVisible["HLLayer"]) {
-    //   mapCtrl.zoomTo(cameraTarget);
-    // }
-    mapCtrl.zoomTo(cameraTarget);
-  }, [cameraTarget])
-
-  const [mapObj, setMapObj] = useState(null);
-
-  useEffect(() => {
-    const params = {
-      divid: ctrlIdRef.current,
-      dispatch
-    };
-    const mapobj = new Map2D(params);
-    setMapObj(mapobj);
-
-    mapobj.init();
-
-    mapobj.layerMgr.addAppLayers(dispatch, layerVisible, layerSetting, smallSkRiskTime);
-
-    mapobjRef.current = mapobj;
-
-    forceRender();
-
-    return () => {
-      mapobj.destroy();
-      mapobjRef.current = null;
-    }
-  }, [pathname]);
-
-  useEffect(() => {
-    if (layerVisible["ContourLayer"]) {
-      mapObj.layerMgr.addAppLayersC(dispatch, layerVisible, layerSetting1);
-    }
-  }, [layerSetting1]);
-
-  //smallSkRiskTime
-  useEffect(() => {
-    const mapCtrl = mapobjRef.current;
-
-    if (smallSkRiskTime && smallSkRiskTime.stm && smallSkRiskTime.etm) {
-      mapCtrl.layerMgr.addAppLayers(dispatch, layerVisible, layerSetting, smallSkRiskTime);
-    }
-  }, [smallSkRiskTime]);
-
-  useEffect(() => {
-    const mapCtrl = mapobjRef.current;
-    if (mapCtrl) {
-      console.log("mapCtrl.layerMgr 100++++++++++++++", layerVisible["ContourLayerLoop"]);
-
-      //console.log("clickLoopBtn",clickLoopBtn);
-
-      if (clickLoopBtn) {
-        mapCtrl.layerMgr.addAppLayersCLoop(dispatch, layerVisible, layerSettingLoop);
-      }
-    }
-  }, [layerSettingLoop, clickLoopBtn]);
-
-  return (
-    <div id={ctrlIdRef.current} className="map2d3d">
-      <FeaturePops mapobj={mapobjRef.current} />
-      <FeatureTip />
-      {/*<CoordsText />*/}
-      <Markers mapobj={mapobjRef.current} />
-    </div>
-  );
-}
diff --git a/src/views/Home/MapCtrl/index.less b/src/views/Home/MapCtrl/index.less
deleted file mode 100644
index d5cb733..0000000
--- a/src/views/Home/MapCtrl/index.less
+++ /dev/null
@@ -1,420 +0,0 @@
-.map2d3d {
-  position: absolute;
-  top: -12px;
-  left: -12px;
-  right: 0;
-  bottom: 0;
-  overflow: hidden;
-  width: calc( 100vw + 12px );
-  height: calc( 100vh - 62px );
-}
-
-.coords_txt {
-  color: white;
-  position: absolute;
-  z-index: 998;
-  right: 4px;
-  bottom: 4px;
-}
-
-.tip_container {
-  position: absolute;
-  z-index: 999;
-}
-
-.tip_txt {
-  background-color: gray;
-  border: 2px solid white;
-  color: white;
-  padding: 4px;
-}
-
-.e-marker {
-  transform-origin: bottom center;
-  cursor: pointer;
-  
-  &__image {
-    transform: scale(0);
-    transform-origin: 50% 50%;
-  }
-  
-  &__circle {
-    display: none;
-  }
-  
-  &__text {
-    font-size: 14px;
-    font-family: brandon-grotesque, sans-serif;
-    text-align: center;
-    opacity: 0;
-    color: #fff;
-    fill: #fff;
-    transform-origin: 50% 50%;
-    // Center SVG text
-    alignment-baseline: middle;
-    text-anchor: middle;
-  }  
-}
-
-.markerLabel {
-  font-size: 0.75rem;
-  color: #fff;
-  padding: 0 4px;
-  border-radius: 4px;
-  position: absolute;
-  pointer-events: none;
-  //background-color: rgba(255, 255, 255, 0.3);
-  word-break: keep-all;
-}
-
-
-.markerLabel2 {
-  color: #fff;
-  position: absolute;
-  pointer-events: none;
-  word-break: keep-all;
-  text-align: center;
-  // white-space: nowrap;
-}
-
-.dp-popup {
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: flex;
-  pointer-events: none;
-  flex-direction: column;
-
-  .dp-popup-tip {
-    align-self: center;
-    border-top: none;
-    //border-bottom-color: rgba(4, 8, 27, 0.8);
-    border-bottom-color: rgba(255, 255, 255, 0.8);
-    width: 0;
-    height: 0;
-  }
-  
-  .dp-popup-content {
-    position: relative;
-    box-shadow: 0 1px 2px rgba(0,0,0,.1);
-    pointer-events: auto;
-    //background: rgba(4, 8, 27, 0.9);
-    background: rgba(255, 255, 255, 0.9);
-    border-radius: 0px;
-    padding: 0;
-  }
-
-  .content-body {
-    color: #333;
-    padding: 0.4rem 0.4rem 0.2rem 0.4rem;
-    position: relative;
-
-    .cursor-pointer1, .cursor-pointer2, .cursor-pointer3{
-      position: absolute;
-      top:15px;
-      color:#0893FF;
-      cursor:pointer;
-    }
-    .cursor-pointer1{
-      right:145px;
-    }
-    .cursor-pointer2{
-      right:115px;
-    }
-    .cursor-pointer3{
-      right:45px;
-    }
-
-    .title {
-      display: flex;
-      align-items: center;
-      border-bottom: 1px solid rgba(36, 136, 223, 0.60);
-      padding: 0.2rem 0.6rem 0.4rem 0.6rem;
-      line-height:30px;
-      font-size:16px;
-
-      .icon {
-        width: 1.2rem;
-        height: 1.2rem;
-        flex-shrink: 0;
-        margin-right: 0.5rem;
-      }
-
-      .name {
-        flex-grow: 1;
-        font-weight:bold;
-      }
-
-      .close {
-        flex-shrink: 0;
-        width: 0.8rem;
-        margin: 0 0.1rem 0.1rem 0;
-        cursor: pointer;
-      }
-    }
-
-    .body {
-      padding: 0.5rem 1rem;
-      .body-row {
-        display: flex;
-        line-height: 2;
-
-        .row-key {
-          width: 6rem;
-        }
-
-        .row-value {
-          color: rgb(184, 233, 248)
-        }
-
-        .row-key-w {
-          width: 10rem;
-        }
-      }
-
-      .body-row-grid {
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 0.5rem;
-      }
-
-    }
-      .foot {
-        padding-top: 0.2rem;
-        border-top: 1px solid rgba(36, 136, 223, 0.60);
-        display: flex;
-        justify-content: space-around;
-      }
-  }
-}
-
-.dp-popup-tip {
-  border: 10px solid transparent;
-}
-
-
-.shuichi-border {
-  animation: redred 1000ms 0ms infinite linear;
-
-  @keyframes redred {
-    0% {
-      fill:  #17abe3;
-    }
-    100% {
-      fill:  #f7d28d;
-    }
-  }
-}
-
-.pulsating-circle {
-  position: absolute;
-  transform: translateX(-50%) translateY(-50%) scaleY(0.6);
-
-  &:before {
-    content: '';
-    position: relative;
-    display: block;
-    width: 300%;
-    height: 300%;
-    box-sizing: border-box;
-    margin-left: -100%;
-    margin-top: -100%;
-    border-radius: 45px;
-    background-color: #01a4e9;
-    animation: pulse-ring 1.25s cubic-bezier(0.215, 0.61, 0.355, 1) infinite;
-  }
-  
-  &:after {
-    content: '';
-    position: absolute;
-    left: 0; 
-    top: 0;
-    display: block;
-    width: 100%;
-    height: 100%;
-    background-color: rgb(152 218 237);
-    border-radius: 15px;
-    box-shadow: 0 0 8px rgba(0,0,0,.3);
-    animation: pulse-dot 1.25s cubic-bezier(0.455, 0.03, 0.515, 0.955) -.4s infinite;
-  }
-}
-
-.pulsating-circle-blue {
-  &:before {
-    background-color: #01a4e9;
-  }
-}
-
-@keyframes pulse-ring {
-  0% {
-    transform: scale(.63);
-  }
-  80%, 100% {
-    opacity: 0;
-  }
-}
-
-@keyframes pulse-dot {
-  0% {
-    transform: scale(.8);
-  }
-  50% {
-    transform: scale(1);
-  }
-  100% {
-    transform: scale(.8);
-  }
-}
-
-
-.dlg-content{
-  .title{
-    display: flex;
-    align-items: center;
-    border-bottom: 1px solid rgba(36, 136, 223, 0.60);
-    background-color: rgba(16, 102, 141, 0.25);
-  }
-
-  .name{
-    padding: 10px 20px;
-  }
-
-  .tabs {
-    flex-grow: 1;
-  }
-
-  .body{
-    display: flex;
-  }
-
-  .body-row{
-    display: flex;
-  }
-
-  .width33{
-    width: 33.33%;
-  }
-
-  .width25{
-    width: 25%;
-  }
-
-  .row-value{
-    padding: 0 1rem;
-  }
-}
-
-.queryDrpModal{
-  .ant-modal-body{
-    padding:0 24px 24px 24px;
-    min-height:510px;
-    background:#fff;
-  }
-}
-
-.skPop{
-  .root {
-    display: flex;
-    width: 660px;
-    color: #333;
-    padding: 1rem 1rem 1rem 1rem;
-  }
-
-  .realinfo {
-    width: 45%;
-    margin-right: 1rem
-  }
-
-  .dataTm {
-    padding: 0.4rem 1rem;
-    border-radius: 0.4rem;
-    margin-bottom: 0.5rem;
-    font-size: 0.8rem;
-  }
-
-  .online, .offline{
-    color:#fff;
-    line-height:22px;
-    font-size:14px;
-    letter-spacing: 1px;
-  }
-
-  .online {
-    border: 1px solid #9ccc65;
-    background-color: #33691e;
-  }
-
-  .offline {
-    border: 1px solid #ef5350;
-    background-color: #b71c1c;
-  }
-
-  .infoItem {
-    border-bottom: 1px dashed #aaa;
-    display: flex;
-    font-size: 14px;
-    line-height: 1.8;
-    margin-bottom: 0.5rem;
-
-    & > .row-key{
-      width: 9rem;
-      line-height:30px;
-    }
-
-    & > .row-value{
-      width: 50%;
-      text-align: right;
-      font-weight: bold;
-      margin-right: 0.5rem;
-      flex-grow: 1;
-    }
-
-    & > .row-unit{
-      width: 3rem;
-      flex-shrink: 0;
-    }
-  }
-
-  .picContainer {
-    width: 55%;
-    display: flex;
-    flex-direction: column;
-
-    & > div{
-      position: relative;
-
-      & > .tm{
-        position: absolute;
-        top: 0;
-        left: 0;
-        background-color: grey;
-        border-radius: 0.3rem 0 0 0.3rem;
-        padding: 0.2rem 0.5rem;
-        color: #fff;
-      }
-      & > .thumb{
-        position: absolute;
-        right: 0;
-        bottom: 0;
-        left: 60%;
-      }
-    }
-  }
-
-  .noPic {
-    height: 50%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .divider {
-    margin-bottom: 1rem;
-  }
-
-  .action {
-    text-align: right;
-    color: #fff;
-    font-size: 1rem;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/layermgr.js b/src/views/Home/MapCtrl/layermgr.js
deleted file mode 100644
index 98076cb..0000000
--- a/src/views/Home/MapCtrl/layermgr.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import AdcdLayer from "./Markers/AdcdLayer";
-import AdcdAllLayer from "./Markers/AdcdAllLayer";
-import FzdxLayer from "./Markers/FzdxLayer";
-import PicStLayer from "./Markers/PicStLayer";
-import HdswLayer from "./Markers/HdswLayer";
-import XjHdswLayer from "./Markers/XjHdswLayer";
-import XxjyswzLayer from "./Markers/XxjyswzLayer";
-import ShuiKuLayer from "./Markers/ShuiKuLayer";
-import ShuiDianZhanLayer from "./Markers/ShuiDianZhanLayer";
-import GongShuiLayer from "./Markers/GongShuiLayer";
-import YinShuiGongChengLayer from "./Markers/YinShuiGongChengLayer"
-import TangYanBaLayer from "./Markers/TangYanBaLayer";
-import YHJMHLayer from "./Markers/YHJMHLayer";
-import QSYDWLayer from "./Markers/QSYDWLayer";
-import AZDLayer from "./Markers/AZDLayer";
-import SLLayer from "./Markers/SLLayer";
-import SYLayer from "./Markers/SYLayer";
-import WYLayer from "./Markers/WYLayer";
-
-
-
-import SmallSkRiskLayer from "./Markers/SmallSkRiskLayer";
-import RhbjqLayer from "./Markers/RhbjqLayer";
-import RealDrpLayer from "./Markers/RealDrpLayer";
-import XjRealDrpLayer from "./Markers/XjRealDrpLayer";
-
-import WarnLayer from "./Markers/WarnLayer";
-import ForecastLayer from "./Markers/ForecastLayer";
-import RadarLayer from "./Markers/RadarLayer";
-import RealDrpAllLayer from "./Markers/RealDrpAllLayer";
-import HdswAllLayer from "./Markers/HdswAllLayer";
-import HeLiuZhuJiLayer from "./Markers/HeLiuZhuJiLayer"
-
-
-export default class LayerMgr {
-  constructor() {
-    this.layerMap = {};
-    this.layers = [];
-
-    this.markerLayerMap = {};
-  }
-
-  getLayer(name) {
-    return this.layers.find(o => o.getLayerName() === name);
-  }
-
-  setVisible(visible) {
-    visible = visible || {};
-
-    for (const layerName in visible) {
-      const layerVisible = visible[layerName];
-      const layer = this.getLayer(layerName);
-      if (!layer) {
-        continue;
-      }
-      if (layerVisible != layer.isVisible()) {
-        layer.setVisible(layerVisible);
-      }
-    }
-  }
-
-  setSetting(setting) {
-    setting = setting || {};
-
-    for (const layer of this.layers) {
-      layer.setSetting(setting);
-    }
-  }
-
-  // called by discreate implementation
-  _addAppMarkerLayers(dispatch, visible, setting, otherParams) {
-    const clss = [
-      AdcdLayer, 
-      // AdcdAllLayer,
-      ShuiKuLayer, 
-      GongShuiLayer,
-      ShuiDianZhanLayer,
-      TangYanBaLayer,
-      YHJMHLayer,
-      QSYDWLayer,
-      AZDLayer,
-      RealDrpLayer,
-      RadarLayer,
-      HdswLayer, 
-      RealDrpAllLayer,
-      HdswAllLayer,
-      SLLayer,
-      SYLayer,
-      WYLayer,
-      HeLiuZhuJiLayer,
-      // FzdxLayer, 
-      PicStLayer,
-      // XjHdswLayer, 
-      // SmallSkRiskLayer, RhbjqLayer, XjRealDrpLayer, WarnLayer, ForecastLayer, RadarLayer, XxjyswzLayer
-    ];
-
-    for (const cls of clss) {
-      const layer = new cls({ visible: visible[cls.LayerName], setting, dispatch, otherParams });
-      this.addLayer(layer);
-      this.markerLayerMap[cls.LayerName] = layer;
-    }
-  }
-
-  sGetMarkerLayerComponentCls(layername) {
-    const layer = this.markerLayerMap[layername];
-    if (!layer) {
-      return null;
-    }
-    return layer.getComponentCls();
-  }
-
-  sGetVisibleMarkers(layername, visible, setting, markerList) {
-    //console.log(layername, visible, setting, markerList);
-    const layer = this.markerLayerMap[layername];
-    if (!layer) {
-      return null;
-    }
-    if (layer.sGetVisibleMarkers) {
-      return layer.sGetVisibleMarkers(layername, visible, setting, markerList)
-    }
-
-    // 默认我们认为data的setting就是boolean的highligh
-    if (visible) {
-      return markerList;
-    }
-    if (markerList) {
-      return markerList.filter(o => setting[o.id]);
-    }
-    return null;
-  }
-
-}
-
diff --git a/src/views/Home/MapCtrl/utils.ts b/src/views/Home/MapCtrl/utils.ts
deleted file mode 100644
index 29f9282..0000000
--- a/src/views/Home/MapCtrl/utils.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { CameraInfo } from "../../../models/_";
-
-export function getCameraInfo(): CameraInfo | null {
-  try {
-    const cameraInfo = sessionStorage.getItem('___cameraInfo');
-
-    if (cameraInfo) {
-      const ret: CameraInfo | null = JSON.parse(cameraInfo);
-
-      if (ret && ret.pos && typeof ret.heading === 'number' && typeof ret.pitch === 'number') {
-        return ret;
-      }
-    }
-
-  } catch (e) {
-  }
-  return null;
-}
-
-export function setCameraInfo(val: CameraInfo) {
-  sessionStorage.setItem('___cameraInfo', JSON.stringify(val));
-}
\ No newline at end of file
diff --git a/src/views/Home/MapCtrl/zindex.js b/src/views/Home/MapCtrl/zindex.js
deleted file mode 100644
index 34594e9..0000000
--- a/src/views/Home/MapCtrl/zindex.js
+++ /dev/null
@@ -1,39 +0,0 @@
-export const zindex2d = {
-  default: 100,
-  sx: 4,
-
-  pipe: [201, 201, 203, 204, 205, 206, 207, 208],
-  pipehighligh: [211, 211, 213, 214, 215, 216, 217, 218],
-
-  boua1: 1,
-  boua2: 2,
-  bouahighlight: 3,
-};
-
-// 10 - 90;
-// normal 20 - 50
-// highlight 60 - 90
-export const zindexmarker = {
-  hilightPlus: 40,
-
-  tuxiang: 20,
-  tuxiangLabel: 40,
-  hdsw: 20,
-  hdswLabel: 40,
-  drp: 20,
-  drpLabel: 40,
-
-  shuichang: 20,
-  shuichi: 24,
-  pump: 28,
-  jcd: 32,
-  shuiku: 36,
-  shuidianzhan:36,
-
-  shuichangLabel: 40,
-  shuichiLabel: 44,
-  pumpLabel: 48,
-  jcdLabel: 52,
-  shuikuLabel: 56,
-  shuidianzhanLabel: 56,
-};
diff --git a/src/views/Home/TuLi/Tuli.js b/src/views/Home/TuLi/Tuli.js
deleted file mode 100644
index ae1e812..0000000
--- a/src/views/Home/TuLi/Tuli.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { useEffect, useReducer, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import './index.less'
-import shengjie from './img/shengjie.png'
-import xianjie from './img/xianjie.png'
-import shengjigonglu from './img/shengjigonglu.png'
-import yinshuigongcheng from './img/yinshuigongcheng.png'
-import xian from './img/xian.png'
-
-
-export default function TuLi() {
-
-  return (
-    <div className='homePage_tuli'>
-      <div className='homePage_tuli_title'>雨量图例(mm)</div>
-      {/* <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1'><div style={{background:'#ffffff'}}></div></div>
-        <div className='homePage_tuli_row_text2'>0</div>
-        <div className='homePage_tuli_row_text3'>无降雨</div>
-      </div> */}
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1'><div style={{background:'#BDEF9A'}}></div></div>
-        <div className='homePage_tuli_row_text2'>0.1~10</div>
-        <div className='homePage_tuli_row_text3'>小雨</div>
-      </div>
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1'><div style={{background:'#59B665'}}></div></div>
-        <div className='homePage_tuli_row_text2'>10~25</div>
-        <div className='homePage_tuli_row_text3'>中雨</div>
-      </div>
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1'><div style={{background:'#6EC1FB'}}></div></div>
-        <div className='homePage_tuli_row_text2'>25~50</div>
-        <div className='homePage_tuli_row_text3'>大雨</div>
-      </div>
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1'><div style={{background:'#1D1BC7'}}></div></div>
-        <div className='homePage_tuli_row_text2'>50~100</div>
-        <div className='homePage_tuli_row_text3'>暴雨</div>
-      </div>
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1'><div style={{background:'#EB20F5'}}></div></div>
-        <div className='homePage_tuli_row_text2'>100~250</div>
-        <div className='homePage_tuli_row_text3'>大暴雨</div>
-      </div>
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1'><div style={{background:'#761E50'}}></div></div>
-        <div className='homePage_tuli_row_text2'>≥250</div>
-        <div className='homePage_tuli_row_text3'>特大暴雨</div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/views/Home/TuLi/Tuli2.js b/src/views/Home/TuLi/Tuli2.js
deleted file mode 100644
index 0a7e81f..0000000
--- a/src/views/Home/TuLi/Tuli2.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { useEffect, useReducer, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import './index.less'
-import shengjie from './img/shengjie.png'
-import xianjie from './img/xianjie.png'
-import shengjigonglu from './img/shengjigonglu.png'
-import yinshuigongcheng from './img/yinshuigongcheng.png'
-import xian from './img/xian.png'
-
-
-export default function TuLi() {
-
-  return (
-    <div className='homePage_tuli2'>
-        <div className='homePage_tuli2_title'>图例</div>
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shengjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省(直辖市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shi.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>红安县</div>
-            </div>
-        </div>
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xianjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>县(市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xian.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>乡、镇政府所在地</div>
-            </div>
-        </div>
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gonglu.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省级公路</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/cun.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>村委所在地</div>
-            </div>
-        </div>    
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/heliu.svg`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>河流</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shuiku.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>水库</div>
-            </div>
-        </div>       
-    </div>
-  );
-}
diff --git a/src/views/Home/TuLi/Tuli3.js b/src/views/Home/TuLi/Tuli3.js
deleted file mode 100644
index c99aecd..0000000
--- a/src/views/Home/TuLi/Tuli3.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { useEffect, useReducer, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import './index.less'
-import shengjie from './img/shengjie.png'
-import xianjie from './img/xianjie.png'
-import shengjigonglu from './img/shengjigonglu.png'
-import yinshuigongcheng from './img/yinshuigongcheng.png'
-import xian from './img/xian.png'
-
-
-export default function TuLi() {
-
-  return (
-    <div className='homePage_tuli2'>
-        <div className='homePage_tuli2_title'>图例</div>
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shengjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省(直辖市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shi.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>红安县</div>
-            </div>
-        </div>
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xianjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>县(市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xian.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>乡、镇政府所在地</div>
-            </div>
-        </div>
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gonglu.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省级公路</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/cun.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>村委所在地</div>
-            </div>
-        </div>    
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/heliu.svg`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>河流</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/liuliangzhan.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>流量站</div>
-            </div>
-        </div>       
-    </div>
-  );
-}
diff --git a/src/views/Home/TuLi/Tuli4.js b/src/views/Home/TuLi/Tuli4.js
deleted file mode 100644
index c474dcb..0000000
--- a/src/views/Home/TuLi/Tuli4.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { useEffect, useReducer, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import './index.less'
-import shengjie from './img/shengjie.png'
-import xianjie from './img/xianjie.png'
-import shengjigonglu from './img/shengjigonglu.png'
-import yinshuigongcheng from './img/yinshuigongcheng.png'
-import xian from './img/xian.png'
-
-
-export default function TuLi() {
-
-  return (
-    <div className='homePage_tuli2'>
-        <div className='homePage_tuli2_title'>图例</div>
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shengjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省(直辖市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shi.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>红安县</div>
-            </div>
-        </div>
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xianjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>县(市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xian.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>乡、镇政府所在地</div>
-            </div>
-        </div>
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gonglu.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省级公路</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/cun.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>村委所在地</div>
-            </div>
-        </div>    
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/heliu.svg`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>河流</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shipindian.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>视频点</div>
-            </div>
-        </div>       
-    </div>
-  );
-}
diff --git a/src/views/Home/TuLi/Tuli5.js b/src/views/Home/TuLi/Tuli5.js
deleted file mode 100644
index b05a5ec..0000000
--- a/src/views/Home/TuLi/Tuli5.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { useEffect, useReducer, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import './index.less'
-import shengjie from './img/shengjie.png'
-import xianjie from './img/xianjie.png'
-import shengjigonglu from './img/shengjigonglu.png'
-import yinshuigongcheng from './img/yinshuigongcheng.png'
-import xian from './img/xian.png'
-
-
-export default function TuLi() {
-
-  return (
-    <div className='homePage_tuli2'>
-        <div className='homePage_tuli2_title'>图例</div>
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shengjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省(直辖市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shi.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>红安县</div>
-            </div>
-        </div>
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xianjie.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>县(市)界</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/xian.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>乡、镇政府所在地</div>
-            </div>
-        </div>
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gonglu.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>省级公路</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/cun.png`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>村委所在地</div>
-            </div>
-        </div>    
-
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={45} height={4} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/heliu.svg`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text'>河流</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/weixianqu.svg`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>危险区</div>
-            </div>
-        </div>   
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={16} height={16} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/anzhidian.png`} alt="" style={{marginLeft:'15px'}}/>
-                </div>
-                <div className='homePage_tuli2_row_item_text'>安置点</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon2'>
-                    <img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/qishiyedanwei.svg`} alt="" />
-                </div>
-                <div className='homePage_tuli2_row_item_text2'>企事业单位</div>
-            </div>
-        </div>   
-
-        <div className='homePage_tuli2_row'>
-            <div className='homePage_tuli2_row_item'>
-                <div className='homePage_tuli2_row_item_icon'>
-                    <img width={16} height={16} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/yanhejuminhu.png`} alt="" style={{marginLeft:'15px'}}/>
-                </div>
-                <div className='homePage_tuli2_row_item_text'>沿河居民户</div>
-            </div>
-            <div className='homePage_tuli2_row_item'>
-            </div>
-        </div>       
-    </div>
-  );
-}
diff --git a/src/views/Home/TuLi/Tuli6.js b/src/views/Home/TuLi/Tuli6.js
deleted file mode 100644
index 58278ec..0000000
--- a/src/views/Home/TuLi/Tuli6.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, { useEffect, useReducer, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import './index.less'
-import shengjie from './img/shengjie.png'
-import xianjie from './img/xianjie.png'
-import shengjigonglu from './img/shengjigonglu.png'
-import yinshuigongcheng from './img/yinshuigongcheng.png'
-import xian from './img/xian.png'
-
-
-export default function TuLi() {
-
-  return (
-    <div className='homePage_tuli'>
-      <div className='homePage_tuli_title'>雨量</div>
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1' style={{width:'40%',marginTop:'-2px'}}>
-          <img width={20} height={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/dm.png`} alt="" />
-        </div>
-        <div className='homePage_tuli_row_text3' style={{width:'60%'}}>断面</div>
-      </div>
-
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1' style={{width:'40%',marginTop:'-2px'}}>
-          <img width={20} height={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/sy.png`} alt="" />
-        </div>
-        <div className='homePage_tuli_row_text3' style={{width:'60%'}}>渗压监测点</div>
-      </div>
-
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1' style={{width:'40%',marginTop:'-2px'}}>
-          <img width={20} height={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/sl.png`} alt="" />
-        </div>
-        <div className='homePage_tuli_row_text3' style={{width:'60%'}}>渗流监测点</div>
-      </div>
-
-      <div className='homePage_tuli_row'>
-        <div className='homePage_tuli_row_text1' style={{width:'40%',marginTop:'-2px'}}>
-          <img width={20} height={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/wy.png`} alt="" />
-        </div>
-        <div className='homePage_tuli_row_text3' style={{width:'60%'}}>位移监测点</div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/views/Home/TuLi/img/anzhidian.png b/src/views/Home/TuLi/img/anzhidian.png
deleted file mode 100644
index 37554c5..0000000
Binary files a/src/views/Home/TuLi/img/anzhidian.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/cun.png b/src/views/Home/TuLi/img/cun.png
deleted file mode 100644
index 9a8a073..0000000
Binary files a/src/views/Home/TuLi/img/cun.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/daolu.png b/src/views/Home/TuLi/img/daolu.png
deleted file mode 100644
index cc594cc..0000000
Binary files a/src/views/Home/TuLi/img/daolu.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/shengjie.png b/src/views/Home/TuLi/img/shengjie.png
deleted file mode 100644
index 831d6ed..0000000
Binary files a/src/views/Home/TuLi/img/shengjie.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/shengjigonglu.png b/src/views/Home/TuLi/img/shengjigonglu.png
deleted file mode 100644
index 0898b7c..0000000
Binary files a/src/views/Home/TuLi/img/shengjigonglu.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/shuidianzhan.png b/src/views/Home/TuLi/img/shuidianzhan.png
deleted file mode 100644
index 2521a76..0000000
Binary files a/src/views/Home/TuLi/img/shuidianzhan.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/xian.png b/src/views/Home/TuLi/img/xian.png
deleted file mode 100644
index c0d4597..0000000
Binary files a/src/views/Home/TuLi/img/xian.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/xiang.png b/src/views/Home/TuLi/img/xiang.png
deleted file mode 100644
index f7fd928..0000000
Binary files a/src/views/Home/TuLi/img/xiang.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/xiangzhenjie.png b/src/views/Home/TuLi/img/xiangzhenjie.png
deleted file mode 100644
index 15a167f..0000000
Binary files a/src/views/Home/TuLi/img/xiangzhenjie.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/xianjie.png b/src/views/Home/TuLi/img/xianjie.png
deleted file mode 100644
index 499a759..0000000
Binary files a/src/views/Home/TuLi/img/xianjie.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/yanhejuminhu.png b/src/views/Home/TuLi/img/yanhejuminhu.png
deleted file mode 100644
index 691d62b..0000000
Binary files a/src/views/Home/TuLi/img/yanhejuminhu.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/yinshuigongcheng.png b/src/views/Home/TuLi/img/yinshuigongcheng.png
deleted file mode 100644
index 06723e1..0000000
Binary files a/src/views/Home/TuLi/img/yinshuigongcheng.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/ũ.png b/src/views/Home/TuLi/img/ũ.png
deleted file mode 100644
index 50b56ca..0000000
Binary files a/src/views/Home/TuLi/img/ũ.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/Сһ.png b/src/views/Home/TuLi/img/Сһ.png
deleted file mode 100644
index fd0d39c..0000000
Binary files a/src/views/Home/TuLi/img/Сһ.png and /dev/null differ
diff --git a/src/views/Home/TuLi/img/自然村.png b/src/views/Home/TuLi/img/自然村.png
deleted file mode 100644
index 8bbe595..0000000
Binary files a/src/views/Home/TuLi/img/自然村.png and /dev/null differ
diff --git a/src/views/Home/TuLi/index.less b/src/views/Home/TuLi/index.less
deleted file mode 100644
index b9c3a66..0000000
--- a/src/views/Home/TuLi/index.less
+++ /dev/null
@@ -1,85 +0,0 @@
-.homePage_tuli{
-    width: 180px;
-    padding: 5px;
-    background: #ffffff;
-    border: 1px solid #eee;
-
-    .homePage_tuli_title{
-        width: 100%;
-        text-align: center;
-        font-size: 14px;
-        font-weight: 500;
-        color: #333333;
-    }
-    .homePage_tuli_row{
-        display: flex;
-        padding: 5px 0;
-        font-size: 14px;
-        color: #333333;
-
-        .homePage_tuli_row_text1{
-            width: 20%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            div{
-                width: 15px;
-                height: 15px;
-                border-radius: 15px;
-            }
-        }
-        .homePage_tuli_row_text2{
-            width: 40%;
-        }
-        .homePage_tuli_row_text3{
-            width: 40%;
-        }
-    }
-}
-
-.homePage_tuli2{
-    width: 400px;
-    padding: 5px 15px 20px 15px;
-    background: #ffffff;
-    border: 1px solid #eee;
-
-    .homePage_tuli2_title{
-        width: 100%;
-        text-align: center;
-        font-size: 14px;
-        font-weight: 500;
-        margin-bottom: 10px;
-        color: #333333;
-    }
-    .homePage_tuli2_row{
-        width: 100%;
-        display: flex;
-        
-        .homePage_tuli2_row_item{
-            width: 50%;
-            display: flex;
-            font-size: 15px;
-            color: #333333;
-            font-weight: 400;
-
-            .homePage_tuli2_row_item_icon{
-                width: 35%;
-                display: flex;
-                align-items: center;
-            }
-            .homePage_tuli2_row_item_text{
-                width: 65%;
-            }
-
-            .homePage_tuli2_row_item_icon2{
-                width: 20%;
-                padding-left: 5px;
-                display: flex;
-                align-items: center;
-            }
-            .homePage_tuli2_row_item_text2{
-                width: 80%;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/Home/consts.js b/src/views/Home/consts.js
deleted file mode 100644
index 5fb9d71..0000000
--- a/src/views/Home/consts.js
+++ /dev/null
@@ -1,25 +0,0 @@
-
-export const SLGC_PT_TYPES = {
-  bridge: '桥梁',
-  culvert: '路涵',
-  sluice: '水闸',
-  daminfo: '塘(堰)坝',
-  srstinfo: '简易雨量站',
-  swstinfo: '简易水位站',
-  stinfo: '自动监测站',
-  wbrinfo: '无线预警广播',
-};
-
-export const SLGC_TYPES = {
-  ...SLGC_PT_TYPES,
-  dike: '堤防',
-};
-
-export const DCPJ_TYPES = {
-  danad: '危险区',
-  placement: '安置点',
-  transfer: '转移路线',
-  flrvvlg: '沿河居民户',
-  bsnssinfo: '企事业单位',
-  ...SLGC_TYPES,
-};
diff --git a/src/views/Home/dlg/Calculating/index.js b/src/views/Home/dlg/Calculating/index.js
deleted file mode 100644
index 192e123..0000000
--- a/src/views/Home/dlg/Calculating/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import {Spin} from 'antd';
-import React, {useState} from 'react'
-import { useSelector } from 'react-redux';
-
-
-function Calculating() {
-  const calculating = useSelector(s => s.runtime.calculating);
-
-  if (!calculating) {
-    return null;
-  }
-
-  return (
-    <div style={{ width: '30rem', height: '20rem', display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center' }}>
-      {
-        Array.isArray(calculating) ? (
-          <div style={{fontSize:"24px", color:"#0893FF",margin:"-10px 0 10px 0"}}>
-            {calculating[0]} / {calculating[1]}
-          </div>
-        ) : null
-      }
-      <Spin size="large" />
-      <div style={{fontSize:"20px", color:"#333", marginTop:"10px"}}>载入中</div>
-    </div>
-  )
-}
-
-export default React.memo(Calculating);
diff --git a/src/views/Home/dlg/LayersDlg/RowItem.js b/src/views/Home/dlg/LayersDlg/RowItem.js
deleted file mode 100644
index 4f91f67..0000000
--- a/src/views/Home/dlg/LayersDlg/RowItem.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Checkbox  } from 'antd';
-import React from 'react';
-
-function RowItem({ icon, name, label, checked, onChange }) {
-
-  return (
-    <div >
-      <Checkbox color="primary" checked={checked} onChange={onChange} name={name} >{label}</Checkbox>
-    </div>
-  )
-}
-
-export default RowItem;
diff --git a/src/views/Home/dlg/LayersDlg/img/dxzhsj.png b/src/views/Home/dlg/LayersDlg/img/dxzhsj.png
deleted file mode 100644
index 49b9be6..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/dxzhsj.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/dzzhd.png b/src/views/Home/dlg/LayersDlg/img/dzzhd.png
deleted file mode 100644
index a44d6cf..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/dzzhd.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/rhbjq.png b/src/views/Home/dlg/LayersDlg/img/rhbjq.png
deleted file mode 100644
index 5b02189..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/rhbjq.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/sdz.png b/src/views/Home/dlg/LayersDlg/img/sdz.png
deleted file mode 100644
index d41d30c..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/sdz.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/sprite@2x.png b/src/views/Home/dlg/LayersDlg/img/sprite@2x.png
deleted file mode 100644
index 769cafa..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/sprite@2x.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/swzd.png b/src/views/Home/dlg/LayersDlg/img/swzd.png
deleted file mode 100644
index 4430c5d..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/swzd.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/tyb.png b/src/views/Home/dlg/LayersDlg/img/tyb.png
deleted file mode 100644
index 66fd5f8..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/tyb.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/yfzhd.png b/src/views/Home/dlg/LayersDlg/img/yfzhd.png
deleted file mode 100644
index 8da24fb..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/yfzhd.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/img/ysgc.png b/src/views/Home/dlg/LayersDlg/img/ysgc.png
deleted file mode 100644
index 13f877d..0000000
Binary files a/src/views/Home/dlg/LayersDlg/img/ysgc.png and /dev/null differ
diff --git a/src/views/Home/dlg/LayersDlg/index.js b/src/views/Home/dlg/LayersDlg/index.js
deleted file mode 100644
index c1ed588..0000000
--- a/src/views/Home/dlg/LayersDlg/index.js
+++ /dev/null
@@ -1,232 +0,0 @@
-import React, {useState} from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import {Button, Checkbox, Radio} from 'antd';
-
-import RowItem from './RowItem';
-
-import RealHDLayer from '../../MapCtrl/Markers/HdswLayer';
-import XjRealHDLayer from '../../MapCtrl/Markers/XjHdswLayer';
-import XxjyswzLayer from '../../MapCtrl/Markers/XxjyswzLayer';
-import RealSkLayer from '../../MapCtrl/Markers/ShuiKuLayer';
-import ShuiDianZhanLayer from '../../MapCtrl/Markers/ShuiDianZhanLayer'
-import YinShuiGongChengLayer from '../../MapCtrl/Markers/YinShuiGongChengLayer'
-import TangYanBaLayer from '../../MapCtrl/Markers/TangYanBaLayer';
-import YFZHDLayer from '../../MapCtrl/Markers/YHJMHLayer';
-import DZZHDLayer from '../../MapCtrl/Markers/QSYDWLayer';
-import DXZHSJLayer from '../../MapCtrl/Markers/AZDLayer';
-import YsgcLayer2D from '../../MapCtrl/M2D/layers/YsgcLayer2D';
-import HighroadLayer2D from '../../MapCtrl/M2D/layers/highroadLayer2D'
-
-
-
-import PicStLayer from '../../MapCtrl/Markers/PicStLayer';
-import RealDrpLayer from '../../MapCtrl/Markers/RealDrpLayer';
-import XjRealDrpLayer from "../../MapCtrl/Markers/XjRealDrpLayer";
-import HLLayer2D from '../../MapCtrl/M2D/layers/HLLayer2D';
-import XLYLayer2D from '../../MapCtrl/M2D/layers/XLYLayer2D';
-import AdcdLayer from '../../MapCtrl/Markers/AdcdLayer';
-import FzdxLayer from '../../MapCtrl/Markers/FzdxLayer';
-import RhbjqLayer from '../../MapCtrl/Markers/RhbjqLayer';
-import OfflineMap2D from '../../MapCtrl/M2D/layers/OfflineMap2D';
-
-import SwzdImg from './img/swzd.png';
-import RhbjqImg from './img/rhbjq.png';
-import WxyjgbImg from '../../../../assets/icons/gb.png';
-import SdzImg from './img/sdz.png'
-import YsgcImg from './img/ysgc.png'
-import TybImg from './img/tyb.png'
-import YfzhdImg from './img/yfzhd.png'
-import DzzhdImg from './img/dzzhd.png'
-import DxzhsjImg from './img/dxzhsj.png'
-
-
-
-
-
-import "./index.less"
-
-
-function LayersDlg({ onClose }) {
-  const getLayerVisible = s => s.map.layerVisible;
-  const layerVisible = useSelector(getLayerVisible);
-  const clickLoopBtn = useSelector(s => s.map.clickLoopBtn);
-  let mapObj = useSelector(s => s.map.map);
-
-  const dispatch = useDispatch();
-
-  const layerVisibleChanged = (event) => {
-    console.log("layerVisibleChanged",event.target.name);
-    if(mapObj && event.target.name === "HLLayer"){
-      mapObj.getLayers().getArray().forEach((layer)=> {
-        if(layer.values_.name === "HLLayer"||layer.values_.name === "HL2Layer"){
-          layer.setVisible(event.target.checked);
-        }
-      });
-    }
-
-    if(mapObj && event.target.name === HighroadLayer2D.LayerName){
-      mapObj.getLayers().getArray().forEach((layer)=> {
-        if(layer.values_.name === HighroadLayer2D.LayerName){
-          layer.setVisible(event.target.checked);
-        }
-      });
-    }
-
-    if(event.target.name === "SatelliteImage"){
-      dispatch.map.setLayerVisible({"OfflineMap": !event.target.checked});
-    }
-    if(event.target.name === "OfflineMap"){
-      dispatch.map.setLayerVisible({"SatelliteImage": !event.target.checked});
-    }
-
-    const vo = { [event.target.name]: event.target.checked };
-    dispatch.map.setLayerVisible(vo);
-
-    dispatch.map.setClickLoopBtn(false);
-
-    if(clickLoopBtn){
-      closeLayer();
-    }
-  };
-
-  const mode = useSelector(s => s.map.mode);
-  const options = [
-    { label: '2d', value: '2d' },
-    { label: '3d', value: '3d' },
-  ];
-
-  const onRadioChange = ({ target: { value } }) => {
-    dispatch.map.setMode(value);
-  };
-
-  const options1 = [
-    { label: '气象局24小时预报', value: 'RainLayer' },
-    { label: '气象局2小时预报', value: 'RainLayerRh' },
-    { label: '测雨雷达短临预报', value: 'RainLayerRadar' },
-  ];
-
-  const onClickRadio1 = (value) => {
-    dispatch.map.setLayerVisible({'RainLayer': true});
-
-    dispatch.shyjview.showWeather24h();
-  };
-
-  const onClickRadio2 = (value) => {
-    dispatch.map.setLayerVisible({'RainLayerRh': true});
-    dispatch.map.setLayerVisible({'RainLayer': false});
-    dispatch.shyjview.showWeatherRadar();
-  };
-
-  const onClickRadio3 = (value) => {
-    dispatch.map.setLayerVisible({'RainLayerRadar': true});
-    dispatch.map.setLayerVisible({"RadarLayer": true});
-  };
-
-  const closeLayer = () => {
-    dispatch.runtime.setLayerSetting({ contour: null, dem: undefined });
-    dispatch.map.setLayerVisible({ ContourLayer: false });
-    dispatch.map.setLayerVisible({'RainLayerRh': false});
-    dispatch.map.setLayerVisible({'RainLayer': false});
-    dispatch.map.setLayerVisible({'RainLayerRadar': false});
-    dispatch.map.setLayerVisible({"RadarLayer": false});
-  }
-
-  return (
-    <div style={{ overflowX: 'hidden', marginTop:"-10px" }} className="layersModal">
-      <div className="toolBox" style={{width:"100%", padding:"0 0 20px 20px"}}>
-        {/* <Radio.Group options={options} onChange={onRadioChange} value={mode}  optionType="button" buttonStyle="solid"/> */}
-      </div>
-
-      <div className="title">基础图层</div>
-      <div style={{width:"100%", borderBottom:"1px dashed #A9A9A9", padding:"0 0 10px 20px"}}>
-        <div className="clearFloat">
-          <div className="lf">
-            <RowItem icon="rz" label={<><span className="wxyx"></span><span className="txt" style={{fontWeight:"bold"}}>卫星影像</span></>} name={"SatelliteImage"} checked={!!layerVisible["SatelliteImage"]} onChange={layerVisibleChanged} />
-          </div>
-          <div className="lf" style={{margin:"0 0 0 30px"}}>
-            <RowItem icon="rz" label={<><span className="wxyx"></span><span className="txt" style={{fontWeight:"bold"}}>离线地图</span></>} name={OfflineMap2D.LayerName} checked={!!layerVisible[OfflineMap2D.LayerName]} onChange={layerVisibleChanged} />
-          </div>
-        </div>
-        <div className="clearFloat">
-          <div className="lf">
-            <RowItem icon="rz" label={<><span className="xzqh"></span><span className="txt" style={{fontWeight:"bold"}}>行政区划</span></>} name={AdcdLayer.LayerName} checked={!!layerVisible[AdcdLayer.LayerName]} onChange={layerVisibleChanged} />
-          </div>
-          <div className="lf" style={{margin:"0 0 0 30px"}}>
-            <RowItem icon="rz" label={<><span className="hl"></span><span className="txt" style={{fontWeight:"bold"}}>河流</span></>} name={HLLayer2D.LayerName} checked={!!layerVisible[HLLayer2D.LayerName]} onChange={layerVisibleChanged} />
-          </div>
-        </div>
-
-
-        <div className="clearFloat">
-          <div className="lf">
-            <RowItem icon="rz" label={<>
-              <span style={{position:"relative",top:"5px", left:"-9px",padding:"3px", display:"inline-block", borderRadius:"50%"}}>
-                <img className="lf" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAA/hJREFUWEfFl19oHFUUxr9vdjchii9VkUr7oIIItkopvvjQ2kyaiApq1WB3sonYWmIFqbYzWyli64NlZhuborYU26DZvVuxkIBQMc3OxtZ/KCL1DxSpURGK6IMU0Qfd3Tk6Kxs22T8zu6t4H+/9znd+c+6dc2eI/3kwTP79s+k7KrooAC/CCIXLKnOWbpwM41NPEwrAD3wh9/qNUUT3gBgWwZcgpjTyVxFsBaRHyMMxKWSf1kcutgITGqBimsqph4XcA8gqgOdBGYdgJcDtgBQBmUCJE1a/cSEMSMsAvumL7xxbVoz1nADQX04imCPlJRHeCWKbAL9BMCGaN7G7N/F5M5C2AHzDsTMnVpaK3ikAq6sSbIegC8T4P2DiQeMRFkpj5sDwdx2dgXrBTl5tg+Bo9ZoA+6jJeXh8ozJP4kfP41iyLz621KftClSMHFd9CmDtImPx1gm4heTI4oTMWHo8UT33LwBksgA3L3myr6lFHhSv9C6AKxcn5Lipx59aqE6Yk9pM47jZA4DsrCmtcBTwbhDSXLomnrcvuTGx15/vuAJ2LvMK6b+CNWNOE0l65Cd11ooUrjP74h91DODks3MQWeiUVckKlm50Oa76CsDNNRUiT5m98Xs6BrBd9TOBq2tPNy+aenyF7arPCKxpsI2DHQHYuexOUg7UNSfOWb3GGienfgD9Tll3HGwbIDUzeR1ikQ9EsLxBg5kydeMBx1W/A7isAUD7Z8DJq5cheKLxG8LHNMisB3zf7C1qqwK2qxIEJpsZRxFbUZI/NwiZbqgT/NIyQCqXvcWjnCZwTWMAecvSh+51cuqofzk10gnkm5YBHFfNLNyCDZw9YH13zLtQKGh+m762yTZ93BKA4yoFIB7QPQ9ZurHDnk3vpaY9F7D/6dAATj57HCKPBiSfjxS1DVpPsRj89ACFo6EAHFcdBvB40L1ByCZTH5q2c+oQiScD9VpkdSBAKq+eF8GzQWaVC8Zx1UMA3gzSAzht6cZAUwA7lxkh+VqwmUxb+tCmg2fTywsFLQ/gpqAYAYaTutH4DKTmVJ94mA0yAjAPFAYs/ZF5x1WvAv5XcuD4wtKNW31V3QrYbmaU4JFAm7JBZd/DVqvsalq6Ub5DagAcV6UA7AqTHMTdVq/xtpNXd0E4BUh3iLhvu4S37+iL/1QD4LhqGsB9IUygAet36cbZ1Mzk5RKN+P3+qjBxAAar/6TKFbDfP34F/+j+EOCqMCZS0m5L9m/2uxwcV80DuD5MHAHb1I3d1Vruz6u1EcF7f3P0hDC5VPK8+5/ZmPA/NpHKq2Mi2BIizpectHRjcKmW1T+eQUYR0S5Z/cY5X9dKnK+vQNcABCX9r9f/ApxxatsIbPk/AAAAAElFTkSuQmCC" alt="" width={14} height={14}/>
-              </span>
-              <span className="txt" style={{fontWeight:"bold"}}>道路</span>
-            </>} name={HighroadLayer2D.LayerName} checked={!!layerVisible[HighroadLayer2D.LayerName]} onChange={layerVisibleChanged} />
-          </div >
-          <div className="lf" style={{margin:"0 0 0 30px"}}>
-            {/* <RowItem icon="rz" label={<><span className="dl"></span><span className="txt" style={{fontWeight:"bold"}}>监测数据</span></>} name={'jcsjLayer'} checked={!!layerVisible['jcsjLayer']} onChange={layerVisibleChanged} /> */}
-          </div>
-        </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        <div className="clearFloat">
-          <div className="lf">
-            {/* <RowItem icon="rz" label={<><span className="xzqh"></span><span className="txt" style={{fontWeight:"bold"}}>行政区划</span></>} name={AdcdLayer.LayerName} checked={!!layerVisible[AdcdLayer.LayerName]} onChange={layerVisibleChanged} /> */}
-          </div>
-          <div className="lf" style={{margin:"0 0 0 30px"}}>
-            {/* <RowItem icon="rz" label={<><span className="fzdxIcon"></span><span className="txt" style={{fontWeight:"bold"}}>防灾对象</span></>} name={FzdxLayer.LayerName} checked={!!layerVisible[FzdxLayer.LayerName]} onChange={layerVisibleChanged} /> */}
-          </div>
-        </div>
-        {/*<div className="clearFloat">
-          <div className="lf">
-            <Checkbox ><span className="dl"></span><span className="txt">道路</span></Checkbox>
-          </div>
-          <div className="lf" style={{margin:"0 0 0 30px"}}>
-            <Checkbox ><span className="dx"></span><span className="txt">地形</span></Checkbox>
-          </div>
-        </div>*/}
-        <div className="clearFloat">
-          <div className="lf">
-            {/* <RowItem icon="rz" label={<><span className="hl"></span><span className="txt" style={{fontWeight:"bold"}}>河流</span></>} name={HLLayer2D.LayerName} checked={!!layerVisible[HLLayer2D.LayerName]} onChange={layerVisibleChanged} /> */}
-          </div>
-          <div className="lf" style={{margin:"0 0 0 30px"}}>
-            {/* <RowItem icon="rz" label={<>
-              <span style={{position:"relative",top:"5px", left:"-9px",padding:"3px", display:"inline-block", background:"rgba(0, 132, 231, 0.88)", border:"1px solid rgb(27, 157, 255)", borderRadius:"50%"}}>
-                <img className="lf" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAASBJREFUOE+Fkk8rxUEUhp83ykZSylLZ2JCysPUhlKWtL3AtlI9gZ627u0s2ig0bspCirC4rZaHuAin579XRzG3c+/tlajoz03nO+86ZET3D9gAwAYwBsX6UdNWbpwpwEJgE5oC2pMvenNj/grangRlgBHgGHtK8lnRfCdpeBBaAHeBYkqsS+6za3kqHT8AhcCap8x8s2+vALPAFvAHvwB1wAZxLuq2zOgysJTigDOf1DbAnqV0WyM2JuAQsR6+SalkgihwB25K+u13NlWxPARvAUIIDKF2cSmr2gelposuNGtVw0ZJ0UPUBwu5qjWKox7s2/oC2x4F9YBT4KOB834ivQLML2o6vtgvMJ+izAgzFF+CkBFeATSCAPLNqGQPs/ABm/4WQujCQVwAAAABJRU5ErkJggg==" alt="" width={14} height={14}/>
-              </span>
-              <span className="txt" style={{fontWeight:"bold"}}>小流域</span>
-            </>} name={XLYLayer2D.LayerName} checked={!!layerVisible[XLYLayer2D.LayerName]} onChange={layerVisibleChanged} /> */}
-          </div>
-        </div>
-        <div className="clearFloat">
-          {/*<div className="lf">
-            <RowItem icon="rz" label={<><span className="wxyx"></span><span className="txt" style={{fontWeight:"bold"}}>卫星影像</span></>} name={"SatelliteImage"} checked={!!layerVisible["SatelliteImage"]} onChange={layerVisibleChanged} />
-          </div>*/}
-          <div className="lf">
-            {/* <RowItem icon="rz" label={<><span className="wxyx"></span><span className="txt" style={{fontWeight:"bold"}}>卫星影像</span></>} name={"SatelliteImage"} checked={!!layerVisible["SatelliteImage"]} onChange={layerVisibleChanged} /> */}
-          </div>
-          <div className="lf" style={{margin:"0 0 0 30px"}}>
-            {/* <RowItem icon="rz" label={<><span className="wxyx"></span><span className="txt" style={{fontWeight:"bold"}}>离线地图</span></>} name={OfflineMap2D.LayerName} checked={!!layerVisible[OfflineMap2D.LayerName]} onChange={layerVisibleChanged} /> */}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default React.memo(LayersDlg);
diff --git a/src/views/Home/dlg/LayersDlg/index.less b/src/views/Home/dlg/LayersDlg/index.less
deleted file mode 100644
index dd7890a..0000000
--- a/src/views/Home/dlg/LayersDlg/index.less
+++ /dev/null
@@ -1,157 +0,0 @@
-.layersModal{
-  .xzqh, .fzdxIcon, .dl, .hl, .dx, .wxyx, .mx,
-  .hdswjc, .skjc, .yljc, .txz,
-  .wxq, .azd, .zylxIcon, .yhjmh, .qsydw, .ql, .lh, .sz, .tyb, .jyylz, .jyswz, .zdjcz, .wxyjgb, .df,
-  .xj-yljc, .xj-hdswjc{
-    display:inline-block;
-    // width: 2rem;
-    width: 20px;
-    // height: 2rem;
-    height: 20px;
-    position:relative;
-    top:2px;
-    right:8px;
-    background-size: 1600% 1450%;
-    background-image: url(./img/sprite@2x.png);
-  }
-
-  .skjc, .yljc, .txz{
-    top:5px;
-  }
-
-  .newImgBox{
-    display:inline-block;
-    // width: 2rem;
-    width: 20px;
-    // height: 2rem;
-    height: 20px;
-    position:relative;
-    // top:2px;
-    right:8px;
-    top:5px;
-  }
-
-  .xzqh{
-    background-position: -300% -600%;
-  }
-  .fzdxIcon{
-    background-position: -200% -200%;
-  }
-  .dl{
-    background-position: -200% -700%;
-  }
-  .hl{
-    background-position: -100% -701.2%;
-  }
-  .dx, .wxyx, .mx{
-    background-position: 0 -700%;
-  }
-  
-
-  .skjc{
-    background-position: -100% 0;
-  }
-  .yljc{
-    background-position: -200% -100%;
-  }
-  .txz{
-    background-position: -300% -100%;
-  }
-
-  .wxq{
-    background-position: 0 -500%;
-  }
-  .azd{
-    background-position: -300% -500%;
-  }
-  .zylxIcon{
-    background-position: 0 -600%;
-  }
-  .yhjmh{
-    background-position: -500% -500%;
-  }
-  .qsydw{
-    background-position: -400% -500%;
-  }
-  .ql{
-    background-position: -200% 0;
-  }
-  .lh{
-    background-position: -300% 0;
-  }
-  .sz{
-    background-position: -500% 0;
-  }
-  .tyb{
-    background-position: -400% 0;
-  }
-  .jyylz{
-    background-position: -900% 0;
-  }
-  .jyswz{
-    background-position: -700% 0;
-  }
-  .zdjcz{
-    background-position: -1000% 0;
-  }
-  .wxyjgb{
-    background-position: -600% 0;
-  }
-  .df{
-    background-position: -100% -600%;
-  }
-
-  .xj-yljc{
-    background-position: -99% -800%;
-  }
-  .xj-hdswjc{
-    background-position: -107% -800%;
-  }
-
-
-  .ant-checkbox-wrapper{
-    display: inline-block;
-    >span:nth-child(2){
-      float:left;
-      width: 162px;
-    }
-    .ant-checkbox{
-      float:right;
-      margin-top:3px;
-    }
-    .txt{
-      font-size:13px;
-      color:#333;
-      letter-spacing: 1px;
-    }
-  }
-
-  .title{
-    font-weight:bold;
-    margin-bottom:10px;
-    font-size:16px;
-    letter-spacing: 1px;
-  }
-
-  .ant-radio-wrapper{
-    font-size: 14px;
-    display: inline-block;
-  }
-  .ant-radio-wrapper > span:nth-child(2) {
-    float: left;
-    width: 162px;
-  }
-  .ant-radio{
-    float:right;
-    margin-top:3px;
-  }
-}
-
-.radioFalse{
-  .ant-radio-inner::after{
-    background: transparent !important;
-  }
-  .ant-radio-checked .ant-radio-inner{
-    border-color: #d9d9d9;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/dlg/index.js b/src/views/Home/dlg/index.js
deleted file mode 100644
index 6a36bac..0000000
--- a/src/views/Home/dlg/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-
-import { useDispatch, useSelector } from 'react-redux';
-
-import LayersDlg from './LayersDlg';
-
-
-function InfoDlg() {
-  const getInfoDlg = s => s.runtime.infoDlg;
-  const infoDlg = useSelector(getInfoDlg);
-  const dispatch = useDispatch();
-
-  const handleClose = () => {
-    dispatch.runtime.setInfoDlg(undefined);
-  };
-
-  if (!infoDlg) {
-    return null;
-  }
-
-  const { layerId, properties } = infoDlg;
-  if (layerId === "Layers") {
-    return <LayersDlg onClose={handleClose} />
-  }
-
-  return null;
-}
-
-export default React.memo(InfoDlg);
diff --git a/src/views/Home/fhxs/drpOption.js b/src/views/Home/fhxs/drpOption.js
deleted file mode 100644
index 1ed4e00..0000000
--- a/src/views/Home/fhxs/drpOption.js
+++ /dev/null
@@ -1,142 +0,0 @@
-export default function drpOption(data,xxsw) {
-  console.log("data",data);
-  const maxVal = 0//Math.max(...data.map(obj => obj.drp))
-  const maxSw = Math.max(...data.map(obj => obj.rz))
-  const minSw = Math.min(...data.map(obj => obj.rz))
-
-
-  return {
-    tooltip: {
-      trigger: 'axis',
-
-    },
-    grid: [
-      {
-        top: "12%",
-        left: "10%",
-        right: "8%",
-        width: '80%',
-        height: '75%'
-      },
-    ],
-    legend: {
-      top:'3%',
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ["库水位", "汛限水位"],
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: true,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter: val => (val.slice(5,10)+'\n'+val.slice(11,16))
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#d9d9d9',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: "水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, -5, -20]
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#bfbfbf',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        max: Math.floor((maxSw>xxsw?maxSw:xxsw)*1.2),
-        min: Math.floor((minSw<xxsw?minSw:xxsw)*0.8),
-      },
-      // {
-      //   // gridIndex: 1,
-      //   type: 'value',
-      //   position: 'right',
-      //   name: "流量(m³/s)",
-      //   splitLine: {
-      //     show: false,
-      //     lineStyle: {
-      //       color: '#07a6ff',
-      //       width: 0.25,
-      //       type: 'dotted'
-      //     }
-      //   },
-      //   axisLabel: {
-      //     color: '#333',
-      //     fontSize: 12,
-      //   },
-      //   axisLine: {
-      //     show: false
-      //   },
-      //   axisTick: {
-      //     show: false,
-      //   },
-      //   // min: minLl,
-      //   // max: maxLl
-      // }
-    ],
-    series: [
-      {
-        // xAxisIndex: 1,
-        // yAxisIndex: 0,
-        name: '库水位',
-        type: 'line',
-        color: "#669ee3",
-        lineStyle: {
-          // type: "dashed"
-          width: 1.5,
-        },
-        data:  data.map(o => o.rz),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      {
-        // xAxisIndex: 1,
-        // yAxisIndex: 1,
-        name: '汛限水位',
-        type: 'line',
-        color: "#f2ca6b",
-        lineStyle: {
-          type: "dashed",
-          dashOffset:5,
-          width: 1.5,
-        },
-        data:  data.map(o => xxsw),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-    ]
-  };
-}
diff --git a/src/views/Home/fhxs/index.js b/src/views/Home/fhxs/index.js
deleted file mode 100644
index 527dabd..0000000
--- a/src/views/Home/fhxs/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-
-import React, { useEffect, useState } from 'react'
-import { Collapse, DatePicker } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import Jyxx from './jyxx'
-import Sksw from './sksw'
-import TuLi from '../TuLi/Tuli.js';
-import moment from 'moment';
-import { SkRealPromiseWX } from "../../../models/_/real";
-import './index.less'
-const { Panel } = Collapse;
-const { RangePicker } = DatePicker
-
-const Page = ({showPanels}) => {  
-    const dispatch = useDispatch();
-    let mapObj = useSelector(s => s.map.map)
-    const [tms, setTms] = useState([moment(moment().add(-1,'days').format('YYYY-MM-DD 08:00')),moment(moment().format('YYYY-MM-DD 08:00'))])
-    const [myKey, setMyKey] = useState('')
-    const [data,setData] = useState({})//水库
-
-    useEffect(()=>{
-        // dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-        dispatch.map.setLayerVisible({ HdswLayer: true })
-        getData()
-        return ()=>{
-            dispatch.map.setLayerVisible({ ShuiKuLayer: false })
-            dispatch.map.setLayerVisible({ HdswLayer: false })
-        }
-    },[])
-
-    useEffect(()=>{
-      if(myKey==='2'){
-        dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-      }else{
-        dispatch.map.setLayerVisible({ ShuiKuLayer: false })
-      }
-    },[myKey])
-
-    useEffect(()=>{
-      if(mapObj){
-        setMyKey('1')
-      }
-    },[mapObj])
-
-  const getData = async (params) => {
-    SkRealPromiseWX.get().then((res) => {
-      const list = res.map((i)=>{
-        return {
-          id : i.stcd,
-          name: i.stnm,
-          ...i
-        }
-      })
-      const data = list[0]
-      setData(data)
-    });
-  }
-
-  const getShuiKu = (e)=>{
-    e.stopPropagation()
-    dispatch.runtime.setFeaturePop({
-      id: data.id,
-      type: 'shuiku',
-      data,
-      lgtd: data.lgtd,
-      lttd: data.lttd,
-      elev: data.elev,
-    })
-  }
-
-  return (
-    <div className='fxdd_fhxs' style={{display:!showPanels?'none':'block'}}>
-        <div className='homePage_leftBox'>
-            <Collapse ghost onChange={(e)=>setMyKey(e)} defaultActiveKey={['1']} expandIconPosition="end" accordion={true} bordered={false}>
-                <Panel  
-                    key={'1'}
-                    header={<div className='homePage_Panel'><img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>降雨信息</div>}
-                >
-                    { myKey==='1'||myKey==='2'?<Jyxx setTms2={setTms}/>:null } 
-                </Panel>
-                <Panel
-                    key={'2'}
-                    header={<div className='homePage_Panel'><img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>水库水位（近七日）
-                    {
-                      data.resCode?<div onClick={getShuiKu} className='fxdd_fhxs_xq'>详情</div>:null
-                    }
-                    </div>}
-                >
-                    { myKey==='2'?<Sksw data={data}/>:null }
-                </Panel>
-            </Collapse>
-        </div>
-        <div style={{position:'absolute',left:'calc( 40% + 50px)',top:'10px'}} className='homePage_centerBox2'><RangePicker showTime value={tms} disabled/></div> 
-        <div style={{position:'absolute',left:'20px',top:'calc( 100vh - 400px )'}}><TuLi/></div>
-    </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/Home/fhxs/index.less b/src/views/Home/fhxs/index.less
deleted file mode 100644
index 022c01f..0000000
--- a/src/views/Home/fhxs/index.less
+++ /dev/null
@@ -1,349 +0,0 @@
-.fxdd_fhxs{
-    width: 100%;
-    position: relative;
-    z-index: 9999;
-
-
-    .fxdd_fhxs_jyxx{
-        padding: 5px;
-        
-        .fxdd_fhxs_jyxx_cyxx{
-            padding: 5px;
-            background: #007afd;
-        }
-        .fxdd_fhxs_jyxx_cyxx:hover{
-            background: red;
-        }
-    }
-    .fxdd_fhxs_xq{
-        position: absolute;
-        right: 10px;
-        color: #0079FE;
-        cursor: pointer;
-        margin-right: 50px;
-        font-weight: 500;
-    }
-
-    // .fxdd_tqyb_h24{
-
-        .radarPageBox, .sateCloudPageBox{
-            position: absolute;
-            left: 500px;
-            padding-top: 15px;
-            top: calc(100vh - 200px);
-            width: calc(100vw - 1000px);
-            height: 60px;
-            background: #fff;
-            z-index: 101;
-            box-shadow: 1px 2px 10px #bdbaba;
-            box-sizing: border-box;
-            border-radius: 6px;
-        }
-    // }
-
-    .homePage_leftBox{
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 470px;
-        border: 1px solid rgba(215, 215, 215, 1);
-
-        .homePage_head{
-            padding-left: 20px;
-            background-color: rgba(0, 122, 253, 1);
-            height: 40px;
-            line-height: 40px;
-            font-size: 14px;
-            font-weight: 500;
-            color: #ffffff;
-        }
-        .ant-collapse-header{
-            height: 40px;
-            background-color: rgba(233, 245, 254, 1);
-            border-bottom: 1px solid rgba(215, 215, 215, 1);
-        }
-        .ant-collapse-content{
-            border-bottom: 1px solid rgba(215, 215, 215, 1);
-            .ant-collapse-content-box{
-                padding: 0;
-                // padding: 5px;
-                background-color: #ffffff;
-            }
-        }
-        .homePage_Panel{
-            display: flex;
-            font-size: 14px;
-            font-weight: 500;
-            color: #333333;
-            align-items: center;
-
-            img{
-                margin-right: 10px;
-            }
-            .homePage_Panel_icon{
-                width: 5px;
-                height: 14px;
-                background-color: #007afd;
-                margin-right: 10px;
-            }
-        }
-        .homePage_Panel_item{
-            display: flex;
-            background-color: #ffffff;
-            width: 100%;
-            height: 40px;
-            align-items: center;
-            font-size: 14px;
-            font-weight: 500;
-            padding-left: 15px;
-            cursor: pointer;
-        }
-        .homePage_Panel_item_acitve{
-            flex: 1;
-            display: flex;
-
-            
-        }
-    }
-
-    .homePage_rightBox{
-        position: absolute;
-        right: 50px;
-        top: 0;
-        width: 390px;
-        padding: 10px;
-        border-radius: 10px;
-        background: #ffffff;
-
-        .homePage_head2{
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            margin-top: -5px;
-
-            .homePage_head2_Bg{
-                width: 175px; 
-                height: 46px;
-                color: #ffffff;
-                font-weight: 500;
-                background: url(../../../../public/assets/xyt/homeImg/titleBg.png) 0 0 no-repeat;
-                background-size:100% 95%;
-                display: flex;
-                align-items: center;
-            }
-        }
-
-    
-
-        .yujing{
-            .title{
-                width: 100%;
-                height: 35px;
-                line-height: 35px;
-                padding: 0 10px;
-                background-color: #f2f2f2;
-                letter-spacing: -0.5px;
-                font-size: 14px;
-                font-weight: 500;
-                margin-bottom: 10px;
-            }
-            .bodyBox{
-                width: 100%;
-                display: flex;
-                flex-wrap: wrap;
-                .bodyBoxItem{
-                    width: calc( 33% - 10px);
-                    margin: 5px;
-                    height: 90px;
-                    background-color: rgba(234, 244, 254, 1);
-                    border-radius: 5px;
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-                    justify-content: center;
-                    text-align: center;
-                    cursor: pointer;
-                    .num{
-                        height: 45%;
-                        font-weight: 500;
-                        font-size: 22px;
-                        color: #D9001B;
-                    }
-                    .sw{
-                        color: #04D919;
-                    }
-                    .content{
-                        display: block;
-                        font-size: 17px;
-                        color: #409EFF;
-                        font-weight: 500;
-                    }
-                }
-            }
-        }
-
-        .home_gongshui{
-            width: 100%;
-            padding: 5px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            .home_gongshui_item{
-                width: 49%;
-                .home_gongshui_item_title{
-                    width: 100%;
-                    height: 75px;
-                    display: flex;
-                    justify-content: center;
-                    margin-bottom: 20px;
-                    align-items: center;
-                    border-radius: 10px;
-                    background-color: rgba(234, 244, 254, 1);
-                    font-size: 20px;
-                    font-weight: 500;
-                    img{
-                        margin: 0 15px 0 0;
-                    }
-                }
-                .home_gongshui_item_text{
-                    display: flex;
-                    padding-left: 10px;
-                    
-                    .lf, .rf{
-                        height: 50px;
-                        font-size: 14px;
-                        color: #000000;
-                        font-weight: 400;
-                    }
-                    .lf2, .rf2{
-                        height: 20px;
-                        font-size: 12px;
-                        color: #000000;
-                    }
-
-                    .rf{
-                        flex: 1;
-                        margin-left: 5px;
-                    }
-                }
-            }
-        }
-        .home_yuqing{
-            min-height: 400px;
-         
-            .home_yuqing_header{
-                width: 100%;
-                background-color: #eaf4fe;
-                border-radius: 5px;
-                display: flex;
-                flex-wrap: wrap;
-                padding-top: 10px;
-
-                div{
-                    width: 33%;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-
-                    .home_yuqing_header_item{
-                        margin-bottom: 10px;
-                        width: 7rem;
-                        height: 2rem;
-                        font-size: 14px;
-                        font-weight: 500;
-                        color: #999999;
-                        cursor: pointer;
-                    }
-                    .avtive{
-                        border-radius: 2rem;
-                        border: 1px solid #409EFF;
-                        color: #409EFF;
-                    }
-                }
-            }
-        }
-        .home_shuizhi{
-
-            .home_shuizhi_title1{
-                width: 100%;
-                padding: 5px 10px;
-                background-color: #F2F2F2;
-            }
-            .home_shuizhi_title2{
-                display: flex;
-                height: 80px;
-                margin: 8px 5px 0 5px;
-                border-radius: 5px;
-                background: #EAF4FE;
-                div{
-                    width: 50%;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                }
-                .lf{
-                    font-size: 17px;
-                    color: #409EFF;
-                    font-weight: 500;
-                }
-                .rf{
-                    font-size: 22px;
-                    color: #333333;
-                    font-weight: 500;
-                    .icon{
-                        margin: -5px 0 0 10px;
-                        width: 12px;
-                        height: 12px;
-                        color: #7F7F7F;
-                        cursor: pointer;
-                    }
-                }
-            }
-            .home_shuizhi_item{
-                display: flex;
-                padding: 5px 10px;
-                margin-top: 10px;
-                border-radius: 10px;
-                background: linear-gradient(to right, #e8effd, rgba(255, 0, 0, 0));
-
-                .home_shuizhi_item_box1{
-                    width: 46%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    text-align: left;
-                }
-                .home_shuizhi_item_box2{
-                    width: 18%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    color: #3749C7;
-                    text-align: center;
-                }
-                .home_shuizhi_item_box3{
-                    width: 18%;
-                    text-align: center;
-                }
-                .home_shuizhi_item_box4{
-                    width: 18%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    color: #3749C7;
-                    text-align: center;
-                }
-            }
-            .home_shuizhi_item2{
-                display: flex;
-                padding: 5px 10px;
-                margin-top: 10px;
-                border-radius: 10px;
-                font-size: 14px;
-                font-weight: 500;
-                background: linear-gradient(to right, #e8effd, rgba(255, 0, 0, 0));
-                justify-content: space-between;
-            }
-        }
-    }
-}
-
-
-
diff --git a/src/views/Home/fhxs/jyxx.js b/src/views/Home/fhxs/jyxx.js
deleted file mode 100644
index 4b3aaa2..0000000
--- a/src/views/Home/fhxs/jyxx.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Form, Input, DatePicker, Popover, Button, message, Table} from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import moment from 'moment';
-import SetDrpStation from '../setMapStation/drp.js'
-
-const { RangePicker } = DatePicker
-
-
-const cysd = [
-  { label:'昨天08:00~当前时间',tms:[moment().add(-1,'days').format('YYYY-MM-DD 08:00:00'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-  { label:'今天08:00~当前时间',tms:[moment().format('YYYY-MM-DD 08:00:00'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-  { label:'昨天08:00~今天08:00',tms:[moment().add(-1,'days').format('YYYY-MM-DD 08:00:00'),moment().format('YYYY-MM-DD 08:00:00')]},
-  { label:'最近1小时',tms:[moment().add(-1,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-  { label:'最近3小时',tms:[moment().add(-3,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-  { label:'最近6小时',tms:[moment().add(-6,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-  { label:'最近12小时',tms:[moment().add(-12,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-  { label:'最近24小时',tms:[moment().add(-24,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
-]
-
-const Page = ({showPanels,setTms2}) => {  
-  const dispatch = useDispatch();
-  const [tms, setTms] = useState([moment(moment().add(-1,'days').format('YYYY-MM-DD 08:00')),moment(moment().format('YYYY-MM-DD 08:00'))])
-  const tmsStr = useMemo(()=>[moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'),moment(tms[1]).format('YYYY-MM-DD HH:mm:ss')],[tms])
-  const [ tableData, setTableData ] = useState([])
-  const [open, setOpen] = useState(false)
-
-  const columns = [
-    { title: '站名', key: 'stnm', dataIndex: 'stnm',align: "center", ellipsis: true },
-    { title: '时段雨量', key: 'drp', dataIndex: 'drp',align: "center", render:(v)=>v===null?'-':v },
-  ];
-
-  const getData = (label,tms)=>{
-    if(label==='今天08:00~当前时间'&& moment().format('HH')<8){
-      return message.error('请在08:00后选择')
-    }
-    setTms([moment(tms[0]),moment(tms[1])])
-  }
-
-  useEffect(()=>{
-    setTms2(tms)
-  },[tms])
-
-
-  return (
-    <div className='fxdd_fhxs_jyxx'>
-         <Form
-          className='toolbarBox'
-        >
-          <Form.Item label='时段选择' name='tm' style={{ margin: '0 0 8px 5px' }}>
-            <RangePicker
-              showTime
-              allowClear={false}
-              style={{ width: '340px' }}
-              onChange={(v)=>setTms(v)}
-              value={tms}
-              format='YYYY-MM-DD HH:mm'
-            />
-            <Popover content={
-              cysd.map((item)=>
-                <div style={{padding:'5px',cursor:'pointer'}} onClick={()=>{
-                  getData(item.label,item.tms)
-                  setOpen(false)
-                }}>
-                  {item.label}
-                </div>
-              )
-            } placement="bottom" trigger="focus" open={open}>
-              <img onClick={()=>setOpen(!open)} width={25} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/changyong.png`} alt="" style={{marginLeft:'10px',cursor:'pointer'}}/>
-            </Popover>
-          </Form.Item>
-        </Form>
-        <div className="ant-card-body" style={{padding:"10px"}}>
-            <Table rowKey="adcd"
-                sticky
-                columns={columns}
-                pagination={false}
-                dataSource={tableData}
-                scroll={{ y: "300px"}}
-                onRow={
-                    (data)=>({
-                        onClick:()=>{
-                        // dispatch.map.setLayerVisible({"HdswLayer":true});
-                        dispatch.runtime.setFeaturePop({
-                            id: data.stcd,
-                            data:{...data,myParams:tms},
-                            type: 'drp',
-                            lgtd: data.lgtd,
-                            lttd: data.lttd,
-                        })
-                        }
-                    })
-                }
-            />
-        </div>
-        <SetDrpStation tms={tmsStr} setTableData={setTableData}/>
-    </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/Home/fhxs/sksw.js b/src/views/Home/fhxs/sksw.js
deleted file mode 100644
index cebe960..0000000
--- a/src/views/Home/fhxs/sksw.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { Descriptions, Form, Button, Input, DatePicker } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import ReactEcharts from 'echarts-for-react';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import moment from "moment"
-import drpOption from './drpOption';
-
-const Page = ({data}) => {  
-  const [ tableData, setTableData ] = useState([])
-  const [ xxsw, setXxsw ] = useState(null)
-  const option = useMemo(() => drpOption(tableData,xxsw), [tableData])
-
-  const getData = async(resCode)=>{
-    const { code, data} = await httppost2(apiurl.fxdd_xyt.fhxs.getSk,{resCode:resCode})
-    if(code!==200 ){
-        return
-    }
-    const list = data.list.filter(o=>o.rz)
-    setTableData(list)
-    setXxsw(Number(data.flLowLimLev))
-  }
-
-  useEffect(()=>{
-    if(data.resCode){
-      getData(data.resCode)
-    }
-  },[data])
-
-  return (
-    <>
-      {
-        tableData.length>0?
-        <ReactEcharts option={option} style={{width: "100%", height: '300px'}}/>
-        :<div style={{textAlign: "center", padding: "5%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-      }
-    </>
-  )
-}
-
-export default Page;
diff --git a/src/views/Home/homePanelsLayoutPage/index.js b/src/views/Home/homePanelsLayoutPage/index.js
deleted file mode 100644
index 1661c74..0000000
--- a/src/views/Home/homePanelsLayoutPage/index.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { useLocation } from 'react-router'
-import { useDispatch, useSelector } from 'react-redux'
-import { Collapse, DatePicker } from 'antd';
-import './index.less'
-import Yujing from './item_yujing/index.js'
-import Yuqing from './item_yuqing'
-import ShuiKu from './item_shuiku'
-import GongShui from './item_gongshui'
-import GongCheng from './item_gongcheng'
-import JianCe from './item_jiance'
-import ShuiZhi from './item_shuizhi'
-import ShiPinDian from './item_shipindian'
-import XunChaXunJian from './item_xunchaxunjian'
-
-import GCShuiKu from './item_gongchengshuiku'
-import DaBa from './item_daba'
-import YiHongDao from './item_yihongdao'
-
-import WeiXianQx from './item_weixianqu'
-import AnZhiDian from './item_anzhidian'
-import QSYDW from './item_qishiyedanwei'
-import YHJMH from './item_yanhejuminhu'
-import SetWxqStation from '../setMapStation/wxq'
-import Bzt from '../../gcaqjc/bzt'
-
-import Tuli from '../TuLi/Tuli.js'
-import Tuli2 from '../TuLi/Tuli2.js';
-import Tuli3 from '../TuLi/Tuli3.js'
-import Tuli4 from '../TuLi/Tuli4.js'
-import Tuli5 from '../TuLi/Tuli5.js'
-
-
-
-import moment from 'moment';
-
-const { Panel } = Collapse;
-const { RangePicker } = DatePicker;
-
-const items = [
-    { key:'1', label:'综合监视', children:[
-        { key:'11', label:'预警', labelRight:'预警', icon:'yujing' },
-        { key:'12', label:'雨情', labelRight:'统计', icon:'yuqing' },
-        { key:'13', label:'水情', labelRight:'实时水情', icon:'shuikushuiqing' },
-        { key:'15', label:'工程安全', labelRight:'工程安全监测', icon:'gongchenganquan' },
-        { key:'16', label:'监测设备状态', labelRight:'监测设备运行', icon:'jianceshebeizhuangtai' },
-        { key:'17', label:'水质', labelRight:'水质', icon:'shuizhi' },
-        { key:'18', label:'视频点', labelRight:'视频点', icon:'shipindian' },
-    ] },
-    // { key:'2', label:'水库工程', children:[
-    //     { key:'21', label:'水库', labelRight:'基本信息', icon:'shuiku' },
-    //     { key:'22', label:'大坝', labelRight:'基本信息', icon:'daba' },
-    //     { key:'23', label:'溢洪道', labelRight:'基本信息', icon:'yihongdao' },
-    // ] },
-    { key:'2', label:'巡查巡检', children:[
-        { key:'21', label:'巡查巡检', labelRight:'工程巡检', icon:'jianceshebeizhuangtai' },
-        // { key:'22', label:'大坝', labelRight:'基本信息', icon:'daba' },
-        // { key:'23', label:'溢洪道', labelRight:'基本信息', icon:'yihongdao' },
-    ] },
-    { key:'3', label:'洪水防御', children:[
-        { key:'31', label:'危险区', labelRight:'危险区列表', icon:'weixianqu' },
-        { key:'32', label:'安置点', labelRight:'安置点列表', icon:'anzhidian' },
-        { key:'33', label:'企事业单位', labelRight:'企事业单位列表', icon:'qishiyedanwei' },
-        { key:'34', label:'沿河居民户', labelRight:'沿河居民户列表', icon:'yanhejuminhu' },
-    ] },
-    { key:'4', label:'水资源调度', children:[
-        { key:'41', label:'供水', labelRight:'今日供水实况', icon:'gongshui' },
-    ] },
-
-]
-
-const HomePage = ({showPanels}) => {
-
-    const dispatch = useDispatch();
-    const [ checkedObj, setCheckedObj ] = useState({})
-    const [ showTable, setShowTable ] = useState(false)
-    const [ tms , setTms ] = useState([
-        moment(moment().add(-1,'days').format('YYYY-MM-DD 08:00:00')),
-        moment(moment().format('YYYY-MM-DD 08:00:00')),
-    ])
-
-
-    useEffect(()=>{
-        dispatch.runtime.closeFeaturePopAll()
-        if(checkedObj.label==='水库'||checkedObj.label==='大坝'||checkedObj.label==='溢洪道'||checkedObj.label==='视频点'){
-            dispatch.map.setLayerVisible({ PicStLayer: true })
-        }else{
-            dispatch.map.setLayerVisible({ PicStLayer: false })
-        }
-
-        if(checkedObj.label==='危险区'||checkedObj.label==='安置点'||checkedObj.label==='企事业单位'||checkedObj.label==='沿河居民户'){
-            dispatch.map.setLayerVisible({ AZDLayer: true })
-            dispatch.map.setLayerVisible({ QSYDWLayer: true })
-            dispatch.map.setLayerVisible({ YHJMHLayer: true })
-        }else{
-            dispatch.map.setLayerVisible({ AZDLayer: false })
-            dispatch.map.setLayerVisible({ QSYDWLayer: false })
-            dispatch.map.setLayerVisible({ YHJMHLayer: false })
-        }
-
-        return ()=>{
-            dispatch.runtime.closeFeaturePopAll()
-            dispatch.map.setLayerVisible({ PicStLayer: false })
-            dispatch.map.setLayerVisible({ AZDLayer: false })
-            dispatch.map.setLayerVisible({ QSYDWLayer: false })
-            dispatch.map.setLayerVisible({ YHJMHLayer: false })
-        }
-    },[checkedObj])
-
-    useEffect(()=>{
-        setCheckedObj({ key:'12', label:'雨情', labelRight:'统计', icon:'yuqing' })
-    },[])
-  
-
-    return (
-        <div className='homePage' style={{display:!showPanels?'none':'block'}}>
-            <div className='homePage_leftBox'>
-                <div className='homePage_head'>综合展示</div>
-                <Collapse ghost onChange={(a)=>{
-                    dispatch.runtime.closeFeaturePopAll()
-                    if(a===undefined){
-                        setCheckedObj({ key:'12', label:'雨情', labelRight:'统计', icon:'yuqing' })
-                        setShowTable(false)
-                    }else if(a==='1'){
-                        setShowTable(true)
-                        dispatch.runtime.setHome()
-                        setCheckedObj({ key:'11', label:'预警', labelRight:'预警', icon:'yujing' })
-                    }else if(a==='2'){
-                        setShowTable(true)
-                        // dispatch.runtime.setHome()
-                        setCheckedObj({ key:'21', label:'巡查巡检', labelRight:'工程巡检', icon:'shuiku' })
-                    }else if(a==='3'){
-                        dispatch.runtime.setCameraTarget({
-                            center: [114.75, 31.493],  
-                            zoom: 13.5,
-                            pitch: 60
-                          })
-                        setShowTable(true)
-                        setCheckedObj({ key:'31', label:'危险区', labelRight:'危险区列表', icon:'weixianqu' })
-                    }else if(a==='4'){
-                        setCheckedObj({ key:'41', label:'供水', labelRight:'今日供水实况', icon:'gongshui' })
-                    }else{
-                    }
-                }} expandIconPosition="end" accordion={true} bordered={false}>
-                    {
-                        items.map((item,index)=>
-                            <Panel  
-                                key={item.key}
-                                header={
-                                    <>
-                                        <div className='homePage_Panel'>
-                                            <div className='homePage_Panel_icon'></div>
-                                            {item.label}
-                                        </div>
-                                    </>
-                                }
-                            >
-                                {
-                                    item.children.map((item)=>
-                                        <dit className='homePage_Panel_item' style={(checkedObj.key===item.key&&showTable)?{color:'#409eff'}:{}} onClick={()=>{
-                                            setCheckedObj(item)
-                                            setShowTable(true)
-                                            }}>
-                                            <img src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/${item.icon}.png`} width="20" height="20" alt="" style={{marginRight:'10px'}} />
-                                            {item.label}
-                                            {
-                                                (checkedObj.key===item.key&&showTable)?
-                                                <div style={{flex:1,display:'flex',flexDirection:'row-reverse'}}>
-                                                    <div style={{width:"3px",height:'40px',background:'rgba(64, 158, 255, 1)'}}></div>
-                                                </div>
-                                                :null
-                                            }
-                                        </dit>
-                                    )
-                                }
-                            </Panel>
-                        )
-                    }
-                </Collapse>
-            </div>
-            {
-                (checkedObj.label === '预警'||checkedObj.label === '雨情')?
-                <div className='homePage_centerBox'><RangePicker showTime value={tms} disabled/></div>
-                :null
-            }
-            {
-                checkedObj.labelRight?
-                <div className='homePage_rightBox' style={{display:!showPanels?'none':'block',padding:showTable?'10px':'0px'}}>
-                    {
-                        showTable?
-                        <div className='homePage_head2'>
-                            <div className='homePage_head2_Bg'>
-                                <img src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/titleBg2.png`} width="14" height="14" alt="" style={{margin:'0 10px'}} />
-                                {checkedObj.labelRight}
-                            </div>
-                            <div style={{display:'flex',alignItems:'center'}}>
-                                {/* <img src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/x.svg`} width="12" height="12" alt="" style={{margin:'0 10px'}} /> */}
-                            </div>
-                        </div>:null
-                    }
-                    { checkedObj.label === '预警' ? <><Yujing mySetTms={setTms}/><Yuqing mySetTms={setTms} show={false}/></>:null }
-                    { checkedObj.label === '雨情' ? <Yuqing mySetTms={setTms} show={showTable}/>:null }
-                    { checkedObj.label === '水情' ? <ShuiKu/>:null }
-                    { checkedObj.label === '供水' ? <GongShui/>:null }
-                    { checkedObj.label === '工程安全' ? <GongCheng/>:null }
-                    { checkedObj.label === '监测设备状态' ? <JianCe/>:null }
-                    { checkedObj.label === '水质' ? <ShuiZhi/>:null }
-                    { checkedObj.label === '视频点' ? <ShiPinDian/>:null }
-
-                    { checkedObj.label === '巡查巡检' ? <XunChaXunJian/>:null }
-
-                    { checkedObj.label === '水库' ? <GCShuiKu/>:null }
-                    { checkedObj.label === '大坝' ? <DaBa/>:null }
-                    { checkedObj.label === '溢洪道' ? <YiHongDao/>:null }
-
-                    { checkedObj.label === '危险区' ? <WeiXianQx/>:null }
-                    { checkedObj.label === '安置点' ? <AnZhiDian/>:null }
-                    { checkedObj.label === '企事业单位' ? <QSYDW/>:null }
-                    { checkedObj.label === '沿河居民户' ? <YHJMH/>:null }
-
-                    { checkedObj.label === '危险区' || checkedObj.label === '安置点' || checkedObj.label === '企事业单位' || checkedObj.label === '沿河居民户'?<SetWxqStation/>:null }
-                </div>
-                :null
-            }
-
-            {
-                checkedObj.label === '工程安全' ?<div className='homePage_bztBox'>
-                    <Bzt isHome={true}/>
-                </div>:null
-            }
-
-            <div className='homePage_leftBottomBox'>
-                { checkedObj.label==='雨情'?<Tuli/>:null }
-                { checkedObj.label==='水情'?<Tuli2/>:null }
-                { checkedObj.label==='供水'?<Tuli3/>:null }
-                { (checkedObj.label==='水库'||checkedObj.label==='大坝'||checkedObj.label==='溢洪道'||checkedObj.label==='视频点')?<Tuli4/>:null }
-                { (checkedObj.label==='危险区'||checkedObj.label==='安置点'||checkedObj.label==='企事业单位'||checkedObj.label==='沿河居民户')?<Tuli5/>:null }
-            </div>
-            
-        </div>
-    )
-}
-
-export default HomePage
diff --git a/src/views/Home/homePanelsLayoutPage/index.less b/src/views/Home/homePanelsLayoutPage/index.less
deleted file mode 100644
index 88cde57..0000000
--- a/src/views/Home/homePanelsLayoutPage/index.less
+++ /dev/null
@@ -1,393 +0,0 @@
-.homePage{
-    width: 100%;
-    position: relative;
-    z-index: 99;
-
-    .homePage_leftBox{
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 250px;
-        border: 1px solid rgba(215, 215, 215, 1);
-
-        .homePage_head{
-            padding-left: 20px;
-            background-color: rgba(0, 122, 253, 1);
-            height: 40px;
-            line-height: 40px;
-            font-size: 14px;
-            font-weight: 500;
-            color: #ffffff;
-        }
-        .ant-collapse-header{
-            height: 40px;
-            background-color: rgba(233, 245, 254, 1);
-            border-bottom: 1px solid rgba(215, 215, 215, 1);
-        }
-        .ant-collapse-content{
-            border-bottom: 1px solid rgba(215, 215, 215, 1);
-            .ant-collapse-content-box{
-                padding: 0;
-            }
-        }
-        .homePage_Panel{
-            display: flex;
-            font-size: 14px;
-            font-weight: 500;
-            color: #333333;
-            align-items: center;
-
-            .homePage_Panel_icon{
-                width: 5px;
-                height: 14px;
-                background-color: #007afd;
-                margin-right: 10px;
-            }
-        }
-        .homePage_Panel_item{
-            display: flex;
-            background-color: #ffffff;
-            width: 100%;
-            height: 40px;
-            align-items: center;
-            font-size: 14px;
-            font-weight: 500;
-            padding-left: 15px;
-            cursor: pointer;
-        }
-        .homePage_Panel_item_acitve{
-            flex: 1;
-            display: flex;
-
-            
-        }
-    }
-
-    .homePage_centerBox{
-        position: absolute;
-        top: 10px;
-        left: 50%;
-        transform: translate(-50%,0);
-
-        .ant-picker.ant-picker-disabled{
-            background-color: #ffffff;
-        }
-    }
-
-    .homePage_rightBox{
-        position: absolute;
-        right: 50px;
-        top: 0;
-        width: 390px;
-        padding: 10px;
-        border-radius: 10px;
-        background: #ffffff;
-        border: 1px solid #eee;
-
-        .homePage_head2{
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            margin-top: -5px;
-
-            .homePage_head2_Bg{
-                width: 175px; 
-                height: 46px;
-                color: #ffffff;
-                font-weight: 500;
-                background: url(../../../../public/assets/xyt/homeImg/titleBg.png) 0 0 no-repeat;
-                background-size:100% 95%;
-                display: flex;
-                align-items: center;
-            }
-        }
-
-    
-
-        .yujing{
-            .title{
-                width: 100%;
-                height: 35px;
-                line-height: 35px;
-                padding: 0 10px;
-                background-color: #f2f2f2;
-                letter-spacing: -0.5px;
-                font-size: 14px;
-                font-weight: 500;
-                margin-bottom: 10px;
-            }
-            .bodyBox{
-                width: 100%;
-                display: flex;
-                flex-wrap: wrap;
-                .bodyBoxItem{
-                    width: calc( 33% - 10px);
-                    margin: 5px;
-                    height: 90px;
-                    background-color: rgba(234, 244, 254, 1);
-                    border-radius: 5px;
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-                    justify-content: center;
-                    text-align: center;
-                    cursor: pointer;
-                    .num{
-                        height: 45%;
-                        font-weight: 500;
-                        font-size: 22px;
-                        color: #D9001B;
-                    }
-                    .sw{
-                        color: #04D919;
-                    }
-                    .content{
-                        display: block;
-                        font-size: 17px;
-                        color: #409EFF;
-                        font-weight: 500;
-                    }
-                }
-            }
-        }
-
-
-        .xunchaxunjian{
-            .title{
-                width: 100%;
-                height: 35px;
-                line-height: 35px;
-                padding: 0 10px;
-                background-color: #f2f2f2;
-                letter-spacing: -0.5px;
-                font-size: 14px;
-                font-weight: 500;
-                margin-bottom: 10px;
-            }
-            .bodyBox{
-                width: 100%;
-                display: flex;
-                flex-wrap: wrap;
-                .bodyBoxItem{
-                    width: calc( 33% - 10px);
-                    margin: 5px;
-                    height: 90px;
-                    background-color: rgba(234, 244, 254, 1);
-                    border-radius: 5px;
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-                    justify-content: center;
-                    text-align: center;
-                    cursor: pointer;
-                    .num{
-                        height: 45%;
-                        font-weight: 500;
-                        font-size: 22px;
-                        color: #D9001B;
-                    }
-                    .sw{
-                        color: #04D919;
-                    }
-                    .content{
-                        display: block;
-                        font-size: 17px;
-                        color: #409EFF;
-                        font-weight: 500;
-                    }
-                }
-            }
-        }
-
-        .home_gongshui{
-            width: 100%;
-            padding: 5px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            .home_gongshui_item{
-                width: 49%;
-                .home_gongshui_item_title{
-                    width: 100%;
-                    height: 75px;
-                    display: flex;
-                    justify-content: center;
-                    margin-bottom: 20px;
-                    align-items: center;
-                    border-radius: 10px;
-                    background-color: rgba(234, 244, 254, 1);
-                    font-size: 20px;
-                    font-weight: 500;
-                    img{
-                        margin: 0 15px 0 0;
-                    }
-                }
-                .home_gongshui_item_text{
-                    display: flex;
-                    padding-left: 10px;
-                    
-                    .lf, .rf{
-                        height: 50px;
-                        font-size: 14px;
-                        color: #000000;
-                        font-weight: 400;
-                    }
-                    .lf2, .rf2{
-                        height: 20px;
-                        font-size: 12px;
-                        color: #000000;
-                    }
-
-                    .rf{
-                        flex: 1;
-                        margin-left: 5px;
-                    }
-                }
-            }
-        }
-        .home_yuqing{
-            // min-height: 100px;
-         
-            .home_yuqing_header{
-                width: 100%;
-                background-color: #eaf4fe;
-                border-radius: 5px;
-                display: flex;
-                flex-wrap: wrap;
-                padding-top: 10px;
-
-                div{
-                    width: 33%;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-
-                    .home_yuqing_header_item{
-                        margin-bottom: 10px;
-                        width: 7rem;
-                        height: 2rem;
-                        font-size: 14px;
-                        font-weight: 500;
-                        color: #999999;
-                        cursor: pointer;
-                    }
-                    .avtive{
-                        border-radius: 2rem;
-                        border: 1px solid #409EFF;
-                        color: #409EFF;
-                    }
-                }
-            }
-        }
-        .home_shuizhi{
-
-            .home_shuizhi_title1{
-                width: 100%;
-                padding: 5px 10px;
-                background-color: #F2F2F2;
-            }
-            .home_shuizhi_title2{
-                display: flex;
-                height: 80px;
-                margin: 8px 5px 0 5px;
-                border-radius: 5px;
-                background: #EAF4FE;
-                div{
-                    width: 50%;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                }
-                .lf{
-                    font-size: 17px;
-                    color: #409EFF;
-                    font-weight: 500;
-                }
-                .rf{
-                    font-size: 22px;
-                    color: #333333;
-                    font-weight: 500;
-                    .icon{
-                        margin: -5px 0 0 10px;
-                        width: 12px;
-                        height: 12px;
-                        color: #7F7F7F;
-                        cursor: pointer;
-                    }
-                }
-            }
-            .home_shuizhi_item{
-                display: flex;
-                padding: 5px 10px;
-                margin-top: 10px;
-                border-radius: 10px;
-                background: linear-gradient(to right, #e8effd, rgba(255, 0, 0, 0));
-
-                .home_shuizhi_item_box1{
-                    width: 40%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    text-align: left;
-                }
-                .home_shuizhi_item_box2{
-                    width: 18%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    color: #3749C7;
-                    text-align: center;
-                }
-                .home_shuizhi_item_box3{
-                    width: 18%;
-                    text-align: center;
-                }
-                .home_shuizhi_item_box4{
-                    width: 24%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    color: #3749C7;
-                    text-align: center;
-                }
-            }
-            .home_shuizhi_item2{
-                display: flex;
-                padding: 5px 10px;
-                margin-top: 10px;
-                border-radius: 10px;
-                font-size: 14px;
-                font-weight: 500;
-                background: linear-gradient(to right, #e8effd, rgba(255, 0, 0, 0));
-                justify-content: space-between;
-            }
-            .home_shuizhi_wenhao{
-                width: 200px;
-                height: 200px;
-                background-color: red;
-            }
-        }
-    }
-
-    
-    .homePage_bztBox{
-        position: absolute;
-        left: -12px;
-        top: -12px;
-        overflow: hidden;
-        width: 100vw;
-        height: calc( 100vh - 60px);
-        z-index: -1;
-    }
-
-    .homePage_leftBottomBox{
-        position: absolute;
-        left: 50px;
-        top: calc( 100vh - 400px);
-        z-index: -1;
-    }
-}
-
-.homePage_centerBox2{
-
-    .ant-picker.ant-picker-disabled{
-        background-color: #ffffff;
-    }
-}
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutPage/item_anzhidian.js b/src/views/Home/homePanelsLayoutPage/item_anzhidian.js
deleted file mode 100644
index eae242f..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_anzhidian.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState([])
-    const dispatch = useDispatch();
-    const columns = [
-        { title: '名称', key: 'name', dataIndex: 'name',align: "center", ellipsis: true },
-        { title: '行政区划', key: 'address', dataIndex: 'address',align: "center" },
-    ];
-
-    // useEffect(()=>{
-    //     dispatch.map.setLayerVisible({ AZDLayer: true })
-    //     return ()=>{
-    //         dispatch.map.setLayerVisible({ AZDLayer: false })
-    //     }
-    // },[])
-
-    useEffect(()=>{
-        (async()=>{
-            const params = {
-
-            }
-            const { code, data} = await httppost2(apiurl.home.azd)
-            if(code!==200){
-                return
-            } 
-        
-            setTableData(data)
-        })()
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="adcd"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={tableData}
-                    scroll={{ y: "400px"}}
-                    onRow={
-                        (row)=>({
-                            onClick:()=>{
-                                dispatch.runtime.setCameraTarget({
-                                    center: [row.lgtd, row.lttd],
-                                    zoom: 18,
-                                    pitch: 60
-                                  })
-                                dispatch.runtime.setFeaturePop({
-                                    id: row.pid,
-                                    data:{...row},
-                                    type: 'anzhidian',
-                                    lgtd: row.lgtd,
-                                    lttd: row.lttd,
-                                  })
-                            }
-                        })
-                    }
-                />
-            </div>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_daba.js b/src/views/Home/homePanelsLayoutPage/item_daba.js
deleted file mode 100644
index 0f15605..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_daba.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message, Image } from 'antd';
-import { QuestionCircleOutlined } from '@ant-design/icons';
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState({})//在线
-    console.log('tableData',tableData)
-    const [ left, setLeft ] = useState(0)
-    const [ imgList, setImgList ] = useState([
-        { url:'https://axhub.im/ax9/6cde96761d7f938f/images/__-gis/u913.png' },
-        { url:'https://axhub.im/ax9/6cde96761d7f938f/images/__-gis/u914.png' },
-        { url:'https://axhub.im/ax9/6cde96761d7f938f/images/__-gis/u915.png' },
-        { url:'https://img2.baidu.com/it/u=223726554,3148772466&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800' },
-        { url:'https://t7.baidu.com/it/u=2604797219,1573897854&fm=193&f=GIF' },
-        { url:'https://t7.baidu.com/it/u=2942499027,2479446682&fm=193&f=GIF' }
-
-    ])
-    const getData = async(val)=>{
-        const { code, data} = await httppost2(apiurl.home.db)
-        if(code!==200){
-            return
-        }
-        setTableData(data[0])
-    }
-
-    useEffect(()=>{
-        getData()
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_shuizhi">
-            <dit className='home_shuizhi_item2'>
-                <div>建筑物型式:</div>
-                <div>{tableData.buildType}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>地基特性:</div>
-                <div>{tableData.foundCharacter}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>坝顶高程(m):</div>
-                <div>{tableData.damTopElev}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>最大坝高(m):</div>
-                <div>{tableData.damMaxHeig}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>坝顶长度(m):</div>
-                <div>{tableData.damTopLen}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>坝顶宽度(m):</div>
-                <div>{tableData.damTopWid}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>防浪墙顶高程(m):</div>
-                <div>{tableData.damWaveWall}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>开工日期:</div>
-                <div>{tableData?.startDate?.slice(0,10)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>竣工日期:</div>
-                <div>{tableData?.endDate?.slice(0,10)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>蓄水日期:</div>
-                <div>{tableData?.storageDate?.slice(0,10)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>图片资料</div>
-                <div></div>
-            </dit>
-            <div style={{margin:'10px 35px',height:'70ox',overflow:'hidden' }}>
-                <div style={{width:100*(imgList.length||0),position:'relative',left:left+'px'}}>
-                    {
-                        imgList.map((item)=>{
-                            return (
-                                <div style={{marginRight:'10px',display:"inline-block"}}>
-                                    <Image width={90} height={60} src={item.url}/>
-                                </div>
-                            )
-                        })
-                    }
-                </div>
-                <img 
-                    src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/leftBtn.svg`} 
-                    alt="" 
-                    style={{position:'absolute',left:'20px',marginTop:'-40px',cursor:'pointer'}}
-                    onClick={()=>{
-                        const imgLength = imgList.length
-                        if(left<0){
-                            setLeft(left+100)
-                        }  
-                    }}
-                />
-                <img 
-                    src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/rightBtn.svg`} 
-                    alt="" 
-                    style={{position:'absolute',right:'30px',marginTop:'-40px',cursor:'pointer'}}
-                    onClick={()=>{
-                        const imgLength = imgList.length
-                        if(imgLength>3 && left>(3-imgLength)*100){
-                            setLeft(left-100)
-                        }  
-                    }}
-                />
-            </div>
-            {/*  */}
-            <dit className='home_shuizhi_item2'>
-                <div>视频资料:</div>
-                <div></div>
-            </dit>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
deleted file mode 100644
index df37a6e..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import { useDispatch, useSelector } from 'react-redux'
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httpget2, httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const dispatch = useDispatch();
-    const [ tableData, setTableData ] = useState([])
-    const [ checked, setChecked ] = useState('渗压监测')
-    const columns = useMemo(() => {
-        if(checked==='渗压监测'){
-            return [
-                { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
-                { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-                { title: '管水位(m)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true,  render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>  },
-            ]
-        }else if(checked === '渗流监测'){
-            return [
-                { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
-                { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-                { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>   },
-            ]
-        }else{
-            return [
-                { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 80, ellipsis: true },
-                { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}><div>{v?.slice(5,10)}</div><div>{v?.slice(11,16)}</div></div> },
-                { title: <div><div>X方向</div><div>(mm)</div></div>, key: 'x', dataIndex: 'x',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
-                { title: <div><div>Y方向</div><div>(mm)</div></div>, key: 'y', dataIndex: 'y',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
-                { title: <div><div>H方向</div><div>(mm)</div></div>, key: 'h', dataIndex: 'h',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
-            ]
-        }
-    }, [checked]);
-    const getData = async(val)=>{
-        let url = ''
-        dispatch.map.setLayerVisible({ SLLayer: false })
-        dispatch.map.setLayerVisible({ SYLayer: false })
-        dispatch.map.setLayerVisible({ WYLayer: false })
-        if(val==='渗压监测'){
-            dispatch.map.setLayerVisible({ SYLayer: true })//渗压
-            url = apiurl.home.sy
-        }else if(val==='渗流监测'){
-            dispatch.map.setLayerVisible({ SLLayer: true })//渗流
-            url = apiurl.home.sl
-        }else{
-            dispatch.map.setLayerVisible({ WYLayer: true })//位移
-            url = apiurl.home.wy
-        }
-        const { code, data} = await httpget2(url)
-        if(code!==200){
-            message.error('查询失败')
-            return 
-        }
-        setChecked(val)
-        setTableData(data)
-        console.log('list',data)
-    }
-
-    useEffect(()=>{
-        getData('渗压监测')
-
-        return ()=>{
-            dispatch.map.setLayerVisible({ SLLayer: false })
-            dispatch.map.setLayerVisible({ SYLayer: false })
-            dispatch.map.setLayerVisible({ WYLayer: false })
-        }
-
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            <div className="home_yuqing_header">
-                {
-                    ['渗压监测','渗流监测','位移监测'].map((item)=>
-                        <div><div className={checked===item?'home_yuqing_header_item avtive':'home_yuqing_header_item'} onClick={()=>getData(item)}>{item}</div></div>
-                    )
-                }
-            </div>
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="stationCode"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={tableData}
-                    scroll={{ y: "300px"}}
-                    onRow={
-                        (data)=>({
-                            onClick:()=>{
-                            dispatch.runtime.setFeaturePop({
-                                id: data.stcd,
-                                data:{...data},
-                                type: checked==='渗压监测'?'shenya':checked==='渗流监测'?'shenliu':'weiyi',//'drp',
-                                lgtd: data.lgtd,
-                                lttd: data.lttd,
-                            })
-                            }
-                        })
-                    }
-                />
-            </div>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_gongchengshuiku.js b/src/views/Home/homePanelsLayoutPage/item_gongchengshuiku.js
deleted file mode 100644
index 0437e80..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_gongchengshuiku.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {CloseOutlined} from "@ant-design/icons";
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState([])//在线
-    const [ open, setOpen ] = useState(false)
-    const getData = async(val)=>{
-        const { code, data} = await httppost2(apiurl.home.skjbxx)
-        if(code!==200){
-            return
-        }
-        setTableData(data[0])
-    }
-
-    useEffect(()=>{
-        getData()
-    },[])
-
-
-    const getNum = (v)=>{
-        const num = +v
-        if(Number.isFinite(num)){
-            return num.toFixed(2)
-        }
-    }
-  
-
-    return (
-        <>
-        <div className="home_shuizhi">
-            <dit className='home_shuizhi_item2'>
-                <div>工程位置:</div>
-                <div>{tableData.resLoc}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>水库规模:</div>
-                <div>{
-                    {
-                        1:'大 (1)型',
-                        2:'大 (2)型',
-                        3:'中型',
-                        4:'小 (1)型',
-                        5:'小 (2)型',
-                        9:'其他',
-                    }[tableData.engScal]
-                    }</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>主要功能:</div>
-                <div>{tableData.rsvFunction}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>坝址以上流域面积(km²):</div>
-                <div>{getNum(tableData.watShedArea)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>总库容(万m³):</div>
-                <div>{getNum(tableData.totCap)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>校核洪水位(m):</div>
-                <div>{getNum(tableData.calFloodLev)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>设计洪水位(m):</div>
-                <div>{getNum(tableData.desFloodLev)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>正常蓄水位(m):</div>
-                <div>{getNum(tableData.normWatLev)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>汛限水位(m):</div>
-                <div>{getNum(tableData.flLowLimLev)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>死水位(m):</div>
-                <div>{getNum(tableData.deadLev)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>兴利库容(万m³):</div>
-                <div>{getNum(tableData.benResCap)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>死库容(万m³):</div>
-                <div>{getNum(tableData.deadCap)}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>工程特性表:</div>
-                <div style={{color:'#007AFDB3',cursor:'pointer'}} onClick={()=>setOpen(true)}>工程特性表详情</div>
-            </dit>
-            <div style={{width:'100%',color:'#007AFDB3',fontWeight:500,cursor:'pointer',marginTop:'10px',textAlign:'center'}}>更多详情</div>
-        </div>
-
-
-        <Modal 
-            footer={null} 
-            width={1200}
-            bodyStyle={{
-                padding:0,
-            }}
-            closable={false}
-            destroyOnClose={true}
-            open={open} 
-            onCancel={()=>setOpen(false)}
-            wrapClassName='home_modal'
-        >
-            <div className="normalModalStyle">
-                <div className="normalModalStyle_title">
-                    <div className="normalModalStyle_title_icon"></div>
-                    {'工程特性表'}
-                    <div className="normalModalStyle_title_cancel">
-                        <CloseOutlined onClick={()=>setOpen(false)} style={{color:"#333"}}/>
-                    </div>
-                </div>
-                <iframe
-                    style={{
-                        height: '70vh',
-                        width: '100%',
-                        border: 0,
-                        marginTop: 0,
-                    }}
-                    src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`http://local.gunshiiot.com:18083/xyt/data.pdf`)}`}
-                />
-            </div>
-        </Modal>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_gongshui.js b/src/views/Home/homePanelsLayoutPage/item_gongshui.js
deleted file mode 100644
index 7ba8c01..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_gongshui.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import { useEffect, useState } from "react"
-import {useDispatch, useSelector} from "react-redux";
-import { httppost, httppost2 } from "../../../utils/request";
-import apiurl from "../../../service/apiurl";
-
-
-const Page = () => {
-    const dispatch = useDispatch();
-    const [data1,setData1] = useState({})//放水=生态=QQ
-    const [data2,setData2] = useState({})//输水=生活=PQ
-    console.log(1111,data1,data2);
-
-    useEffect(()=>{
-        dispatch.map.setLayerVisible({ GongShuiLayer: true })
-        getData1()
-        return ()=>{
-            dispatch.map.setLayerVisible({ GongShuiLayer: false })
-        }
-    },[])
-
-    const getData1 = async()=>{
-        const { code, data } = await httppost2(apiurl.home.getGsList)
-        if(code!==200){
-            return
-        }
-        data?.map((item,index)=>{
-            if(index<2){
-                if(item.sttp==='QQ'){
-                    setData1({...item})
-                }else{
-                    setData2({...item})
-                }
-            }
-        })
-    }
-
-
-  
-
-    return (
-        <>
-            <div className="home_gongshui">
-                <div className="home_gongshui_item">
-                    <div className="home_gongshui_item_title">
-                        <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui2.png`} alt=""/>
-                        灌溉发电
-                    </div>
-                    <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
-                        <div style={{display:'flex'}}>
-                            <div className="lf2">实时流量: </div>
-                            <div className="rf2">{data1.q}</div>
-                        </div>
-                        <div style={{marginBottom:'10px', display:'flex'}}>
-                            <div className="lf2" style={{color:'#70B603'}}>{data1?.resMonthEcoFlow?.month||'-'}月核定流量: </div>
-                            <div className="rf2" style={{color:'#70B603'}}>{data1?.resMonthEcoFlow?.value}</div>
-                        </div>
-                    </div>
-                    <div className="home_gongshui_item_text">
-                        <div className="lf">采集时间: </div>
-                        <div className="rf">{data1.tm}</div>
-                    </div>
-                    <div className="home_gongshui_item_text">
-                        <div className="lf">今日水量: </div>
-                        <div className="rf">{data1.v}</div>
-                    </div>
-                </div>
-                <div className="home_gongshui_item">
-                    <div className="home_gongshui_item_title">
-                        <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui1.png`} alt=""/>
-                        水厂取水
-                    </div>
-                    <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
-                        <div style={{display:'flex'}}>
-                            <div className="lf2">实时流量: </div>
-                            <div className="rf2">{data2.q}</div>
-                        </div>
-                        <div style={{marginBottom:'10px', display:'flex'}}>
-                            <div className="lf2" style={{color:'#70B603'}}></div>
-                            <div className="rf2" style={{color:'#70B603'}}></div>
-                        </div>
-                    </div>
-                    <div className="home_gongshui_item_text">
-                        <div className="lf">采集时间: </div>
-                        <div className="rf">{data2.tm}</div>
-                    </div>
-                    <div className="home_gongshui_item_text">
-                        <div className="lf">今日水量: </div>
-                        <div className="rf">{data2.v}</div>
-                    </div>
-                </div>
-            </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_jiance.js b/src/views/Home/homePanelsLayoutPage/item_jiance.js
deleted file mode 100644
index 905c6b1..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_jiance.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState([])//在线
-    const [ tableData2, setTableData2 ] = useState([])//离线
-    const [ checked, setChecked ] = useState('离线')
-    console.log(checked)
-    const columns = [
-        { title: '序号', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 50, ellipsis: true, render: (text, rec, index) => index + 1 },
-        { title: '站点名称', key: 'stnm', dataIndex: 'stnm',align: "center",width:80, ellipsis: true, },
-        { title: '最后数据时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true },
-    ];
-    const getData = async(val)=>{
-        setChecked(val)
-        const { code, data} = await httppost2(apiurl.home.jcsb)
-        if(code!==200){
-            return
-        }
-        setTableData(data.online)
-        setTableData2(data.offLine)
-        console.log('list',data)
-    }
-
-    useEffect(()=>{
-        getData('离线')
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            <div className="home_yuqing_header">
-                {
-                    ['离线','在线'].map((item)=>
-                        <div style={{width:'50%'}}><div style={{width:'90%'}} className={checked===item?'home_yuqing_header_item avtive':'home_yuqing_header_item'} onClick={()=>getData(item)}>{item}</div></div>
-                    )
-                }
-            </div>
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="stationCode"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={checked==='离线'?tableData2:tableData}
-                    scroll={{ y: "300px"}}
-                />
-            </div>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_qishiyedanwei.js b/src/views/Home/homePanelsLayoutPage/item_qishiyedanwei.js
deleted file mode 100644
index 6c7ec68..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_qishiyedanwei.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState([])
-    const dispatch = useDispatch();
-    const columns = [
-        { title: '名称', key: 'name', dataIndex: 'name',align: "center", ellipsis: true },
-        { title: '行政区划', key: 'adnm', dataIndex: 'adnm',align: "center" },
-    ];
-
-    // useEffect(()=>{
-    //     dispatch.map.setLayerVisible({ QSYDWLayer: true })
-    //     return ()=>{
-    //         dispatch.map.setLayerVisible({ QSYDWLayer: false })
-    //     }
-    // },[])
-
-    useEffect(()=>{
-        (async()=>{
-            const params = {
-
-            }
-            const { code, data} = await httppost2(apiurl.home.getqsydw)
-            if(code!==200){
-                return
-            }
-        
-            setTableData(data)
-        })()
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="adcd"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={tableData}
-                    scroll={{ y: "400px"}}
-                    onRow={
-                        (row)=>({
-                            onClick:()=>{
-                                dispatch.runtime.setCameraTarget({
-                                    center: [row.lgtd, row.lttd],
-                                    zoom: 18,
-                                    pitch: 60
-                                  })
-                                dispatch.runtime.setFeaturePop({
-                                    id: row.eicd,
-                                    data:{...row},
-                                    type: 'qishiyedanwei',
-                                    lgtd: row.lgtd,
-                                    lttd: row.lttd,
-                                  })
-                            }
-                        })
-                    }
-                />
-            </div>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_shipindian.js b/src/views/Home/homePanelsLayoutPage/item_shipindian.js
deleted file mode 100644
index 4791cf4..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_shipindian.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState([])//在线
-    const [ checked, setChecked ] = useState('离线')
-    const dispatch = useDispatch();
-    console.log(checked)
-    const columns = [
-        // { title: '序号', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 50, ellipsis: true, render: (text, rec, index) => index + 1 },
-        { title: '视频点名称', key: 'name', dataIndex: 'name',align: "center",width:80, ellipsis: true, },
-        { title: '所属区域', key: 'name', dataIndex: 'name',align: "center",width: 150, ellipsis: true },
-    ];
-    const getData = async(val)=>{ 
-        setChecked(val)
-        const { code, data} = await httppost2(apiurl.home.video)
-        if(code!==200){
-            return
-        }
-        setTableData(data)
-    }
-
-    useEffect(()=>{
-        getData('离线')
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="stationCode"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={tableData}
-                    scroll={{ y: "300px"}}
-                    onRow={
-                        (row)=>({
-                            onClick:()=>{
-                                // dispatch.runtime.setCameraTarget({
-                                //     center: [row.lgtd, row.lttd],
-                                //     zoom: 13,
-                                //     pitch: 60
-                                //   })
-                                dispatch.runtime.setFeaturePop({
-                                    id: row.id,
-                                    data:{...row},
-                                    type: 'tuxiang',
-                                    lgtd: row.lgtd,
-                                    lttd: row.lttd,
-                                  })
-                            }
-                        })
-                    }
-                />
-            </div>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_shuiku.js b/src/views/Home/homePanelsLayoutPage/item_shuiku.js
deleted file mode 100644
index 5613369..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_shuiku.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useEffect, useState } from "react"
-import {useDispatch, useSelector} from "react-redux";
-import {reservoirlist, reswarn} from "../../../service/sssq"
-import { SkRealPromiseWX } from "../../../models/_/real";
-import genDamImage from '../../../components/DamGraph/DamImage'
-import MyImg from './myImg'
-
-
-const Page = () => {
-    const dispatch = useDispatch();
-    const [data,setData] = useState([])
-    console.log('aaa',data);
-    useEffect(()=>{
-        dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-        dispatch.map.setLayerVisible({ HdswLayer: true })
-        getData()
-        return ()=>{
-            dispatch.map.setLayerVisible({ ShuiKuLayer: false })
-            dispatch.map.setLayerVisible({ HdswLayer: false })
-        }
-    },[])
-
-    const getData = async (params) => {
-        setData(await reservoirlist(params))
-      }
-
-    const getShuiKu = ()=>{
-      SkRealPromiseWX.get().then((res) => {
-        const list = res.map((i)=>{
-          return {
-            id : i.stcd,
-            name: i.stnm,
-            ...i
-          }
-        })
-        const data = list[0]
-        
-
-        dispatch.runtime.setFeaturePop({
-          id: data.id,
-          type: 'shuiku',
-          data,
-          lgtd: data.lgtd,
-          lttd: data.lttd,
-          elev: data.elev,
-        })
-      });
-    }
-  
-
-    return (
-        <>
-        <div>
-            {
-              data ? (
-                <MyImg record={{...data[0]}}/>
-              ) : (
-                <div className="noPic">暂无数据</div>
-              )
-            }
-            <div style={{position:'absolute',right:'14px',top:'15px',color:'#409EFF',cursor:'pointer',fontWeight:'500'}} onClick={getShuiKu}>详情</div>
-        </div>
-        
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_shuizhi.js b/src/views/Home/homePanelsLayoutPage/item_shuizhi.js
deleted file mode 100644
index cb2d84c..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_shuizhi.js
+++ /dev/null
@@ -1,131 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import { QuestionCircleOutlined, CloseOutlined } from '@ant-design/icons';
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState({})//在线
-    const [ open, setOpen ] = useState(false)
-    const getData = async(val)=>{
-        const { code, data} = await httppost2(apiurl.home.szList)
-        if(code!==200){
-            return
-        }
-        setTableData(data)
-        console.log('list',data)
-    }
-
-    useEffect(()=>{
-        getData()
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_shuizhi">
-            <div className='home_shuizhi_title1'>水质最后采集时间：{tableData?.tm?moment(tableData.tm).format('YYYY-MM-DD HH:mm'):'-'}</div>
-            <div className='home_shuizhi_title2'>
-                <div className='lf'>水质类别</div> 
-                <div className='rf'>{tableData?.level}<QuestionCircleOutlined className='icon'onClick={()=>setOpen(true)}/></div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>水温(℃)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.temp}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.tempLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.tempStandard}</div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>PH</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.ph}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.phLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.phStandard}</div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>溶解氧(mg/L)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.bod}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.bodLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.bodStandard}</div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>浊度(NTU)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.turb}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.turbLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.turbStandard}</div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>电导率(μs/cm)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.cond}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.condLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.condStandard}</div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>高锰酸盐(mg/L)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.codmn}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.codmnLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.codmnStandard}</div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>氨氮(mg/L)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.nh3n}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.nh3nLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.nh3nStandard}</div>
-            </div>
-            <div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>总磷(mg/L)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.tp}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.tpLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.tpStandard}</div>
-            </div><div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>总氮(mg/L)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.tn}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.tnLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.tnStandard}</div>
-            </div><div className='home_shuizhi_item'>
-                <div className='home_shuizhi_item_box1'>叶绿素(ug/L)</div>
-                <div className='home_shuizhi_item_box2'>{tableData?.chla}</div>
-                <div className='home_shuizhi_item_box3'>{tableData?.chlaLevel}</div>
-                <div className='home_shuizhi_item_box4'>{tableData?.chlaStandard}</div>
-            </div>
-
-            <Modal 
-                footer={null} 
-                width={1000}
-                bodyStyle={{
-                    padding:0,
-                }}
-                closable={false}
-                destroyOnClose={true}
-                open={open} 
-                onCancel={()=>setOpen(false)}
-                wrapClassName='home_modal'
-            >
-                <div className="normalModalStyle">
-                    <div className="normalModalStyle_title">
-                        <div className="normalModalStyle_title_icon"></div>
-                        水质级别评定标准
-                        <div className="normalModalStyle_title_cancel">
-                            <CloseOutlined onClick={()=>setOpen(false)} style={{color:"#333"}}/>
-                        </div>
-                    </div>
-                    <div style={{padding:'10px 60px 60px 60px'}}>
-                        <h4>标准文件：<a href='http://local.gunshiiot.com:18083/tsg/GB3838-2002地表水环境质量标准.pdf' target="_blank">GB3838-2002地表水环境质量标准.pdf</a></h4>
-                        <h4>本系统根据以下水质检测项目进行判断：</h4>
-                        <img width={'100%'} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shuizhi2.png`} alt="" />
-                    </div>  
-                </div>
-            </Modal>
-
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_weixianqu.js b/src/views/Home/homePanelsLayoutPage/item_weixianqu.js
deleted file mode 100644
index 644a707..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_weixianqu.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import { geometryCenter } from '../../../utils/tools'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const dispatch = useDispatch();
-    const [ tableData, setTableData ] = useState([])
-    const columns = [
-        { title: '名称', key: 'name', dataIndex: 'name',align: "center", ellipsis: true },
-        { title: '行政区划', key: 'adnm', dataIndex: 'adnm',align: "center" },
-    ];
-
-    useEffect(()=>{
-        (async()=>{
-            const { code, data} = await httppost2(apiurl.home.wxq)
-            if(code!==200){
-                return
-            }
-        
-            setTableData(data)
-        })()
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="adcd"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={tableData}
-                    scroll={{ y: "400px"}}
-                    onRow={
-                        (row)=>({
-                            onClick:()=>{
-                                const wxq = JSON.parse(sessionStorage.getItem('wxq'))?.[row?.adcd]||''
-                                if(!wxq){
-                                    message.error('暂无经纬度数据')
-                                    return
-                                }
-                                const data = wxq.properties
-                                const center = geometryCenter(wxq.geometry);
-                                dispatch.runtime.setCameraTarget({
-                                    center: [center[0], center[1]],
-                                    zoom: 18,
-                                    pitch: 60
-                                  })
-                                dispatch.runtime.setFeaturePop({
-                                    id: data.PID,
-                                    data:{...data},
-                                    type: 'wxq',
-                                    lgtd: center[0],
-                                    lttd: center[1],
-                                  })
-                            }
-                        })
-                    }
-                />
-            </div>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js
deleted file mode 100644
index 5f31d43..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js
+++ /dev/null
@@ -1,249 +0,0 @@
-import { useEffect, useState, useRef } from "react"
-import { Button, Modal, message, Table } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-
-import GeoJSONFormat from "ol/format/GeoJSON";
-import Feature from "ol/Feature";
-import FillStyle from "ol/style/Fill";
-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([])
-    const [ data2, setData2 ] = useState([])
-    const [ data3, setData3 ] = useState(0)
-
-
-
-    const columns1 = [
-        { title: '巡查完成日期', key: 'finishTime', dataIndex: 'finishTime',align: "center",width:180, ellipsis: true },
-        { title: '巡查人', key: 'inspectUserName', dataIndex: 'inspectUserName',align: "center" },
-        { title: '异常项次', key: 'problemNum', dataIndex: 'problemNum',align: "center" },
-    ];
-
-    const columns2 = [
-        { title: '上报时间', key: 'finishTime', dataIndex: 'finishTime',align: "center", ellipsis: true },
-        { title: '巡检问题描述', key: 'problemDesc', dataIndex: 'problemDesc',align: "center" },
-    ];
-
-    useEffect(()=>{
-        getDcl()
-        getBy()
-        getBn()
-
-
-        return ()=>{
-            mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-                const a = layer.values_
-                if( (layer.values_.name) && ((layer.values_.name).indexOf("HlSX_") !== -1 || (layer.values_.name).indexOf("HlItem_") !== -1 || (layer.values_.name).indexOf("LyItem_") !== -1) ){
-                    layer.getSource().clear();
-                }
-              })
-            dispatch.runtime.closeFeaturePopAll()
-        }
-    },[])
-
-    const getDcl = async()=>{
-        const { code, data } = await httppost2(apiurl.home.xcxj_dcl)
-        if(code!==200){
-            message.error('请求失败')
-            return
-        }
-        setData(data)
-    }
-
-    const getBy = async()=>{
-        const { code, data } = await httppost2(apiurl.home.xcxj_by)
-        if(code!==200){
-            message.error('请求失败')
-            return
-        }
-        setData2(data)
-    }
-
-    const getBn = async()=>{
-        const { code, data } = await httppost2(apiurl.home.xcxj_bn)
-        if(code!==200){
-            message.error('请求失败')
-            return
-        }
-        setData3(data)
-    }
-
-
-    const addHlLayer = (geojsonrv,name,color,item)=>{
-        mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-            if( (layer.values_.name) && ((layer.values_.name).indexOf("HlSX_") !== -1 || (layer.values_.name).indexOf("HlItem_") !== -1 || (layer.values_.name).indexOf("LyItem_") !== -1) ){
-                layer.getSource().clear();
-            }
-        })
-
-        if(!geojsonrv){
-            return
-        }
-        const geojsonFormat = new GeoJSONFormat();
-        let geometry = geojsonFormat.readGeometry(geojsonrv, {
-        featureProjection: 'EPSG:3857',
-        });
-        const feature = new Feature({
-            geometry,
-            data: item,
-            name: name
-        });
-
-        var vectorSource = new VectorSource({
-            features: [feature]
-        });
-
-        const vectorLayer = new VectorLayer({
-            // @ts-ignore
-            name: name,
-            source: vectorSource,
-            style: new Style({
-                stroke: new StrokeStyle({
-                    color: color,
-                    width: 4,
-                }),
-            }),
-            zIndex:100
-        });
-
-        mapObj.addLayer(vectorLayer);
-    }
-
-    const onRowClick = async(data)=>{
-        const { code, data:res } = await httppost2(apiurl.home.xcxj_gj+'?taskId='+data.id)
-        if(code!==200){
-            message.error('请求失败')
-            return
-        }
-        if(res.length===0){
-            message.error('无轨迹信息')
-            return
-        }
-        const list = res.map(o=>[o.lgtd-0.0115,o.lttd-0.0036])
-
-        data.data = {
-            "type":"MultiLineString",
-            "coordinates":[
-                [
-                    ...list
-                ]
-            ]
-        }
-        addHlLayer(data?.data,'HlItem_'+data.id,'#00FFFF',data)
-        const center = geometryCenter({type:"LineString",coordinates:data.data.coordinates[0]}); 
-        dispatch.runtime.setFeaturePop({
-            id: data.id,
-            data: data,
-            type: 'xunjian',
-            lgtd: center[0],
-            lttd: center[1],
-        })
-    }
-  
-
-    return (
-        <div className="xunchaxunjian">
-            <div className="bodyBox">
-                <div className="bodyBoxItem">
-                    <div className="num" style={{color:'#04D919'}}>{data2.length||0}</div>
-                    <div className="content">本月巡查</div>
-                </div>
-                <div className="bodyBoxItem">
-                    <div className="num" style={{color:'#04D919'}}>{data3||0}</div>
-                    <div className="content">本年巡查</div>
-                    <div></div>
-                </div>
-                <div className="bodyBoxItem">
-                    <div className="num">{data?.length||0}</div>
-                    <div className="content">未处理异常</div>
-                    <div></div>
-                </div>
-            </div>
-
-            <div style={{width:'100%',borderBottom:'1px solid #eee',margin:'10px 0 10px 0'}}></div>
-            
-            <div className='homePage_head2'>
-                <div className='homePage_head2_Bg'>
-                    <img src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/titleBg2.png`} width="14" height="14" alt="" style={{margin:'0 10px'}} />
-                    {'本月巡查记录'}
-                </div>
-            </div>
-
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="adcd"
-                    sticky
-                    columns={columns1}
-                    pagination={false}
-                    dataSource={data2}
-                    scroll={{ y: "300px"}}
-                    onRow={
-                        (data)=>({
-                            onClick:()=>onRowClick(data)
-                        })
-                    }
-                />
-            </div>
-
-            <div style={{width:'100%',borderBottom:'1px solid #eee',margin:'10px 0 10px 0'}}></div>
-            
-            <div className='homePage_head2'>
-                <div className='homePage_head2_Bg'>
-                    <img src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/titleBg2.png`} width="14" height="14" alt="" style={{margin:'0 10px'}} />
-                    {'待处理问题清单'}
-                </div>
-            </div>
-
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="adcd"
-                    sticky
-                    columns={columns2}
-                    pagination={false}
-                    dataSource={data}
-                    scroll={{ y: "300px"}}
-                    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,
-                            // })
-                            }
-                        })
-                    }
-                />
-            </div>
-
-            <BasicCrudModal
-                width={1000}
-                ref={refModal}
-                style={{top:'100px'}}
-                title=""
-                component={ModalForm}
-                title1="详情"
-            />
-        </div>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js b/src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js
deleted file mode 100644
index 8745f51..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState([])
-    const dispatch = useDispatch();
-    const columns = [
-        { title: '名称', key: 'name', dataIndex: 'name',align: "center", ellipsis: true },
-        { title: '行政区划', key: 'adnm', dataIndex: 'adnm',align: "center" },
-    ];
-
-    // useEffect(()=>{
-    //     dispatch.map.setLayerVisible({ YHJMHLayer: true })
-    //     return ()=>{
-    //         dispatch.map.setLayerVisible({ YHJMHLayer: false })
-    //     }
-    // },[])
-
-    useEffect(()=>{
-        (async()=>{
-            const { code, data} = await httppost2(apiurl.home.getyhjmh)
-            if(code!==200){
-                return
-            }
-            // const list = data.filter(o=>o.adcd.indexOf('421181113')===0)
-            setTableData(data)
-        })()
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="adcd"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={tableData}
-                    scroll={{ y: "400px"}}
-                    onRow={
-                        (row)=>({
-                            onClick:()=>{
-                                dispatch.runtime.setCameraTarget({
-                                    center: [row.lgtd, row.lttd],
-                                    zoom: 18,
-                                    pitch: 60
-                                  })
-                                dispatch.runtime.setFeaturePop({
-                                    id: row.avrcd,
-                                    data:{...row},
-                                    type: 'yanhejuminhu',
-                                    lgtd: row.lgtd,
-                                    lttd: row.lttd,
-                                  })
-                            }
-                        })
-                    }
-                />
-            </div>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yihongdao.js b/src/views/Home/homePanelsLayoutPage/item_yihongdao.js
deleted file mode 100644
index 61eaa0d..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yihongdao.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message, Image } from 'antd';
-import { QuestionCircleOutlined } from '@ant-design/icons';
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = () => {
-    const [ tableData, setTableData ] = useState([])//在线
-    console.log('tableData',tableData)
-    const getData = async(val)=>{
-        const { code, data} = await httppost2(apiurl.home.yhd)
-        if(code!==200){
-            return
-        }
-        setTableData(data[0])
-    }
-
-    useEffect(()=>{
-        getData()
-    },[])
-
-  
-
-    return (
-        <>
-        <div className="home_shuizhi">
-            <dit className='home_shuizhi_item2'>
-                <div>型式:</div>
-                <div>{tableData.buildType}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>堰顶高程(m):</div>
-                <div>{tableData.crestEle}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>总净宽(m):</div>
-                <div>{tableData.netWidth}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>最大单宽流量m³/(s·m):</div>
-                <div>{tableData.bwidQ}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>消能方式:</div>
-                <div>{tableData.elimMethod}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>消能防冲流量(m³/s):</div>
-                <div>{tableData.elimQ}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>设计泄洪流量(m³/s):</div>
-                <div>{tableData.desQ}</div>
-            </dit>
-            <dit className='home_shuizhi_item2'>
-                <div>校核泄洪流量(m³/s):</div>
-                <div>{tableData.caliQ}</div>
-            </dit>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/index.js b/src/views/Home/homePanelsLayoutPage/item_yujing/index.js
deleted file mode 100644
index f11e457..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yujing/index.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useEffect, useState } from "react"
-import { Button, Modal, message } from 'antd';
-import {CloseOutlined} from "@ant-design/icons";
-import { httppost2 } from "../../../../utils/request";
-import apiurl from "../../../../service/apiurl";
-import moment from "moment";
-import Table_qx from './table_qx'
-import Table_wy from './table_wy'
-import Table_sl from './table_sl'
-import Table_sy from './table_sy'
-import Table_AI from './table_AI'
-
-
-
-const Page = ({mySetTms}) => {
-    const [ dataObj, setDataObj ] = useState({})
-    console.log(dataObj)
-    const [ open, setOpen ] = useState(false)
-    const [ key , setkey ] = useState('')
-    const [ tms , setTms ] = useState([
-        moment().add(-1,'days').format('YYYY-MM-DD HH:mm:ss'),
-        moment().format('YYYY-MM-DD HH:mm:ss'),
-    ])
-
-    useEffect(()=>{
-        (async()=>{
-            const params = {
-                start:tms[0],
-                end:tms[1]
-            }
-            const { code, data } = await httppost2(apiurl.home.yj_qxyj,params)
-            if(code!==200){
-                message.error('请求失败')
-                return
-            }
-            mySetTms([
-                moment(tms[0]),
-                moment(tms[1])
-            ]) 
-            setDataObj(data)
-        })()
-    },[])
-  
-
-    return (
-        <div className="yujing">
-            <div className="title">
-                预警时间：{tms[0]?.slice(0,16)} 至 {tms[1]?.slice(0,16)}
-            </div>
-            <div className="bodyBox">
-                <div className="bodyBoxItem">
-                    <div className="num sw">
-                        <div style={{fontSize:'18px'}}>{dataObj.rzWarn?.split('(')[0]}</div>
-                        {
-                            dataObj.rzWarn!=='-'?
-                            <div style={{fontSize:'14px',marginTop:'-7px'}}>({dataObj.rzWarn?.split('(')[1]?.split(')')[0]})</div>
-                            :null
-                        }
-                    
-                    </div>
-                    <div className="content">超汛限告警</div>
-                    <div></div>
-                </div>
-                <div className="bodyBoxItem" onClick={()=>{setOpen(true);setkey('气象预警')}}>
-                    <div className="num">{dataObj.qxWarn?.length||0}</div>
-                    <div className="content">气象预警</div>
-                </div>
-                <div className="bodyBoxItem" onClick={()=>{setOpen(true);setkey('位移告警')}}>
-                    <div className="num">{dataObj.shiftWarn?.length||0}</div>
-                    <div className="content">位移告警</div>
-                    <div></div>
-                </div>
-                <div className="bodyBoxItem" onClick={()=>{setOpen(true);setkey('渗压告警')}}>
-                    <div className="num">{dataObj.pressWarn?.length||0}</div>
-                    <div className="content">渗压告警</div>
-                    <div></div>
-                </div>
-                <div className="bodyBoxItem" onClick={()=>{setOpen(true);setkey('渗流告警')}}>
-                    <div className="num">{dataObj.flowWarn?.length||0}</div>
-                    <div className="content">渗流告警</div>
-                    <div></div>
-                </div>
-                <div className="bodyBoxItem" onClick={()=>{setOpen(true);setkey('AI告警')}}>
-                    <div className="num">{dataObj.aiWarnCount}</div>
-                    <div className="content">AI告警</div>
-                    <div></div>
-                </div>
-            </div>
-
-            <Modal 
-                footer={null} 
-                width={1000}
-                bodyStyle={{
-                    padding:0,
-                }}
-                closable={false}
-                destroyOnClose={true}
-                open={open} 
-                onCancel={()=>setOpen(false)}
-                wrapClassName='home_modal'
-            >
-                <div className="normalModalStyle">
-                    <div className="normalModalStyle_title">
-                        <div className="normalModalStyle_title_icon"></div>
-                        {key}
-                        <div className="normalModalStyle_title_cancel">
-                            <CloseOutlined onClick={()=>setOpen(false)} style={{color:"#333"}}/>
-                        </div>
-                    </div>
-                    { key==='气象预警'?<Table_qx data={dataObj.qxWarn} onCancel={()=>setOpen(false)}/>:null }
-                    { key==='位移告警'?<Table_wy data={dataObj.shiftWarn} onCancel={()=>setOpen(false)}/>:null }
-                    { key==='渗压告警'?<Table_sy data={dataObj.pressWarn} onCancel={()=>setOpen(false)}/>:null }
-                    { key==='渗流告警'?<Table_sl data={dataObj.flowWarn} onCancel={()=>setOpen(false)}/>:null }
-                    { key==='AI告警'?<Table_AI/>:null }
-                </div>
-            </Modal>
-        </div>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/index.less b/src/views/Home/homePanelsLayoutPage/item_yujing/index.less
deleted file mode 100644
index 6dc6711..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yujing/index.less
+++ /dev/null
@@ -1,55 +0,0 @@
-.home_yujing_qxModal{
-
-
-
-
-    .home_yujing_qxModal_item{
-        padding: 5px;
-        .line{
-            margin-top: 10px;
-            width: 100%;
-            height: 1px;
-            background-color: #eee;//rgb(215, 215, 215);
-        }
-
-        .row1{
-
-            display: flex;
-            align-items: center;
-            padding: 5px;
-            margin: 0 10px;
-            // border-bottom: 1px solid #eee;
-            .icon{
-                margin-right: 10px;
-                width: 10px;
-                height: 10px;
-                border-radius: 5px;
-                background: red;
-            }
-            .text{
-                font-size: 16px;
-                font-weight: 500;
-                color: #333333;
-            }
-            .tm{
-                flex: 1;
-                display: flex;
-                flex-direction: row-reverse;
-                margin-right: 10px;
-            }
-        }
-
-        .row2{
-            padding: 10px;
-            display: flex;
-            align-items: flex-start;
-
-            img{
-                margin: 0 10px;
-            }
-            .text{
-                // padding-top: 5px;
-            }
-        }
-    }
-}
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js b/src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js
deleted file mode 100644
index 12e3d85..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yujing/table_AI.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-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";
-import moment from 'moment';
-
-
-const Page = () => {
-
-    const { tableProps, search, refresh } = usePageTable(createCrudService('/gunshiApp/tsg/rescue/goods/page/query').find_noCode,{});
-
-    useEffect(()=>{
-        const params = {
-            search: {}
-        };
-        search(params)
-    }, [])
-
-    return (
-            <div className="ant-card-body" style={{padding:"0 10px",height:'600px',overflowY:'auto'}}>
-                <AiWarn/>
-                {/* <div>时间：{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}</div> */}
-            </div>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/table_qx.js b/src/views/Home/homePanelsLayoutPage/item_yujing/table_qx.js
deleted file mode 100644
index 4f5ffa7..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yujing/table_qx.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useEffect, useState } from "react"
-import { Button, Modal, Empty } from 'antd';
-import {CloseOutlined} from "@ant-design/icons";
-import './index.less'
-
-
-const Page = ({data,onCancel}) => {
-    
-
-  
-
-    return (
-        <div className="home_yujing_qxModal">
-            {
-                data.map((item,index)=>(
-                    <div className="home_yujing_qxModal_item">
-                        <div className="row1">
-                            <div className="icon"></div>
-                            <div className="text">{item.title}</div>
-                            <div className="tm">{item.tm}</div>
-                        </div>
-                        <div className="row2">
-                            <img width={70} height={60} src={`${process.env.PUBLIC_URL}/assets/yjImages/baoxueBlue.png`} alt=""/>
-                            <div className="text">{item.content}</div>
-                        </div>
-                        { index !== (data.length-1)?<div className="line"></div>:null }
-                    </div>
-                ))
-            }
-            {
-                data.length===0?
-                <div style={{marginTop:'200px'}}>
-                    <Empty />
-                </div>
-                :null
-            }
-        </div>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/table_sl.js b/src/views/Home/homePanelsLayoutPage/item_yujing/table_sl.js
deleted file mode 100644
index 90c1b10..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yujing/table_sl.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {CloseOutlined} from "@ant-design/icons";
-import usePageTable from '../../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../../components/crud/_';
-
-import { httppost2 } from "../../../../utils/request";
-import apiurl from "../../../../service/apiurl";
-
-
-const Page = ({data}) => {
-
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-        { title: '预警时间', key: 'tm', dataIndex: 'tm', ellipsis: true },
-        { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode'},
-        { title: '预警级别', key: 'level', dataIndex: 'level',render:(v)=><div style={{color:v===1?'yellow':'red'}}>{v===1?'黄色':'红色'}</div> },
-        { title: '监测值', key: 'value', dataIndex: 'value', ellipsis: true },
-        { title: '阈值', key: '', dataIndex: '', ellipsis: true,render:(v)=>'字段未知' },
-        { title: '校验规则描述', key: 'ruleDesc', dataIndex: 'ruleDesc', ellipsis: true },
-      ];
-    return (
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="id"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={data}
-                    scroll={{ y: "350px"}}
-                />
-            </div>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/table_sy.js b/src/views/Home/homePanelsLayoutPage/item_yujing/table_sy.js
deleted file mode 100644
index 90c1b10..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yujing/table_sy.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {CloseOutlined} from "@ant-design/icons";
-import usePageTable from '../../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../../components/crud/_';
-
-import { httppost2 } from "../../../../utils/request";
-import apiurl from "../../../../service/apiurl";
-
-
-const Page = ({data}) => {
-
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-        { title: '预警时间', key: 'tm', dataIndex: 'tm', ellipsis: true },
-        { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode'},
-        { title: '预警级别', key: 'level', dataIndex: 'level',render:(v)=><div style={{color:v===1?'yellow':'red'}}>{v===1?'黄色':'红色'}</div> },
-        { title: '监测值', key: 'value', dataIndex: 'value', ellipsis: true },
-        { title: '阈值', key: '', dataIndex: '', ellipsis: true,render:(v)=>'字段未知' },
-        { title: '校验规则描述', key: 'ruleDesc', dataIndex: 'ruleDesc', ellipsis: true },
-      ];
-    return (
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="id"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={data}
-                    scroll={{ y: "350px"}}
-                />
-            </div>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/table_wy.js b/src/views/Home/homePanelsLayoutPage/item_yujing/table_wy.js
deleted file mode 100644
index dff86d8..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yujing/table_wy.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {CloseOutlined} from "@ant-design/icons";
-import usePageTable from '../../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../../components/crud/_';
-
-import { httppost2 } from "../../../../utils/request";
-import apiurl from "../../../../service/apiurl";
-
-
-const Page = ({data}) => {
-
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-        { title: '预警时间', key: 'tm', dataIndex: 'tm', ellipsis: true },
-        { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode'},
-        { title: '预警级别', key: 'level', dataIndex: 'level',render:(v)=><div style={{color:v===1?'yellow':'red'}}>{v===1?'黄色':'红色'}</div> },
-        { title: '监测值', key: 'value', dataIndex: 'value', ellipsis: true },
-        { title: '阈值', key: '', dataIndex: '', ellipsis: true,render:(v)=>'字段未知' },
-        { title: '校验规则描述', key: 'ruleDesc', dataIndex: 'ruleDesc', ellipsis: true },
-      ];
-  
-    return (
-            <div className="ant-card-body" style={{padding:"10px"}}>
-                <Table rowKey="id"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={data}
-                    scroll={{ y: "350px"}}
-                />
-            </div>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/item_yuqing.js b/src/views/Home/homePanelsLayoutPage/item_yuqing.js
deleted file mode 100644
index 7c83de7..0000000
--- a/src/views/Home/homePanelsLayoutPage/item_yuqing.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, message } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import usePageTable from '../../../components/crud/usePageTable2'
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import SetDrpStation from '../setMapStation/drp.js'
-import moment from 'moment';
-
-
-
-const Page = ({mySetTms,show}) => {
-    const dispatch = useDispatch();
-    const [ tableData, setTableData ] = useState([])
-    const [ checked, setChecked ] = useState('昨日')
-    const [ tms , setTms ] = useState([
-        moment().add(-1,'days').format('YYYY-MM-DD 08:00:00'),
-        moment().format('YYYY-MM-DD 08:00:00'),
-    ])
-    const columns = [
-        { title: '站名', key: 'stnm', dataIndex: 'stnm',align: "center", ellipsis: true },
-        { title: '时段雨量', key: 'drp', dataIndex: 'drp',align: "center", render:(v)=>v===null?'-':v },
-      ];
-
-
-    const change = (val)=>{
-        // '昨日','今日8:00-当前','昨日8:00-当前','1h','3h','6h','12h','24h'
-        if(val==='昨日'){
-            setTms([
-                moment().add(-1,'days').format('YYYY-MM-DD 08:00:00'),
-                moment().format('YYYY-MM-DD 08:00:00'),
-            ])
-        }else if(val==='今日8:00-当前'){
-            if(moment().format('HH')<8){
-                return message.error('请在08:00后选择')
-            }
-            setTms([
-                moment().format('YYYY-MM-DD 08:00:00'),
-                moment().format('YYYY-MM-DD HH:mm:ss'),
-            ])
-        }else if(val==='昨日8:00-当前'){
-            if(moment().format('HH')<8){
-                return message.error('请在08:00后选择')
-            }
-            setTms([
-                moment().add(-1,'days').format('YYYY-MM-DD 08:00:00'),
-                moment().format('YYYY-MM-DD HH:mm:ss'),
-            ])
-        }else if(val==='1h'){
-            if(moment().format('HH')<8){
-                return message.error('请在08:00后选择')
-            }
-            setTms([
-                moment().add(-1,'hours').format('YYYY-MM-DD HH:mm:ss'),
-                moment().format('YYYY-MM-DD HH:mm:ss'),
-            ])
-        }else if(val==='3h'){
-            if(moment().format('HH')<8){
-                return message.error('请在08:00后选择')
-            }
-            setTms([
-                moment().add(-3,'hours').format('YYYY-MM-DD HH:mm:ss'),
-                moment().format('YYYY-MM-DD HH:mm:ss'),
-            ])
-        }else if(val==='6h'){
-            if(moment().format('HH')<8){
-                return message.error('请在08:00后选择')
-            }
-            setTms([
-                moment().add(-6,'hours').format('YYYY-MM-DD HH:mm:ss'),
-                moment().format('YYYY-MM-DD HH:mm:ss'),
-            ])
-        }else if(val==='12h'){
-            if(moment().format('HH')<8){
-                return message.error('请在08:00后选择')
-            }
-            setTms([
-                moment().add(-12,'hours').format('YYYY-MM-DD HH:mm:ss'),
-                moment().format('YYYY-MM-DD HH:mm:ss'),
-            ])
-        }else if(val==='24h'){
-            if(moment().format('HH')<8){
-                return message.error('请在08:00后选择')
-            }
-            setTms([
-                moment().add(-24,'hours').format('YYYY-MM-DD HH:mm:ss'),
-                moment().format('YYYY-MM-DD HH:mm:ss'),
-            ])
-        }else{
-        }
-        setChecked(val)
-    }
-
-    useEffect(()=>{
-        if(tms.length===2){
-            mySetTms([
-                moment(tms[0]),
-                moment(tms[1])
-            ])   
-        }
-    },[tms])
-
-  
-
-    return (
-        <>
-        <div className="home_yuqing">
-            {
-                show?
-                <>
-                    <div className="home_yuqing_header">
-                        {
-                            ['昨日','今日8:00-当前','昨日8:00-当前','1h','3h','6h','12h','24h'].map((item)=>
-                                <div><div className={checked===item?'home_yuqing_header_item avtive':'home_yuqing_header_item'} onClick={()=>change(item)}>{item}</div></div>
-                            )
-                        }
-                    </div>
-                    <div className="ant-card-body" style={{padding:"10px"}}>
-                        <Table rowKey="adcd"
-                            sticky
-                            columns={columns}
-                            pagination={false}
-                            dataSource={tableData}
-                            scroll={{ y: "300px"}}
-                            onRow={
-                                (data)=>({
-                                    onClick:()=>{
-                                    // dispatch.map.setLayerVisible({"HdswLayer":true});
-                                    dispatch.runtime.setFeaturePop({
-                                        id: data.stcd,
-                                        data:{...data,myParams:tms},
-                                        type: 'drp',
-                                        lgtd: data.lgtd,
-                                        lttd: data.lttd,
-                                    })
-                                    }
-                                })
-                            }
-                        />
-                    </div>
-                </>:null
-            }
-            <SetDrpStation tms={tms} setTableData={setTableData}/>
-        </div>
-        </>
-    )
-}
-
-export default Page
diff --git a/src/views/Home/homePanelsLayoutPage/myImg.js b/src/views/Home/homePanelsLayoutPage/myImg.js
deleted file mode 100644
index 2835893..0000000
--- a/src/views/Home/homePanelsLayoutPage/myImg.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import { translate } from "ol/transform";
-
-
-const MyImg = ({ record }) => {
-  console.log("record: ", record);
-  /**
-   * 
-   * @param {*} h1 动态水位
-   * @param {*} h2 坝高
-   * @param {*} h3 死水位
-   * @returns 
-   */
-  const computerHeight = (h1, h2, h3) => {
-    let height;
-    let comHeight;
-    if (h1 & h2 & h3) {
-      comHeight = (h1 - h3) / (h2 - h3)
-      // height = comHeight * 100 < 80 ? `${comHeight}%` : "80%"
-      height = `${comHeight * 80}%`
-      return height
-    } else {
-      return ''
-    }
-  }
-  return (
-    <div style={{
-      flexGrow: 1,
-      height: '33vh',
-      overflow: 'hidden',
-      position: 'relative',
-      backgroundColor: "#eff3f6",
-      borderRadius:"2%"
-    }}>
-      <img
-        src={`${process.env.PUBLIC_URL}/assets/images/waterz.png`}
-        style={
-          {
-            position: 'absolute',
-            bottom:computerHeight(record.rz,record.crestElev,record.deadLev),
-            // top: '50%'
-            transform:"translateY(100%)"
-          }}
-      />
-
-        <img src={`${process.env.PUBLIC_URL}/assets/images/dam.png`} style={{ position: 'absolute', bottom: 0, height: '100%', right: -20 }} />
-
-        <img src={`${process.env.PUBLIC_URL}/assets/images/ruler.png`} style={{ position: 'absolute', bottom: 0, height: '100%', left: 20 }} />
-
-      <div style={
-        {
-          position: 'absolute',
-          left: 40,
-          // width: '65%',
-          bottom:computerHeight(record.desFloodLev,record.crestElev,record.deadLev),
-          display: 'flex',
-          alignItems: 'center',
-          gap: 8,
-          // zIndex:1
-        }}>
-        <img src={`${process.env.PUBLIC_URL}/assets/images/red1.png`}
-          style={{
-            width: 90,
-            height: 15,
-            }}
-        />
-        <div style={{
-          // width: "210px",
-          // border: '2px solid #fff',
-          // backgroundColor: '#0bcbeb',
-          // padding: '2px 16px',
-          color:'#ff0a0a',
-          fontSize: 16,
-          justifyContent: 'space-between',
-          display: 'flex',
-          columnGap:10
-        }}>
-            设计洪水位 <strong>{record.desFloodLev?record.desFloodLev.toFixed(2):"-"}m</strong>
-          </div>
-        </div>
-
-      <div style={
-        {
-          position: 'absolute',
-          left: 40,
-          // width: '65%',
-          bottom:computerHeight(record.flLowLimLev,record.crestElev,record.deadLev),
-          display: 'flex',
-          alignItems: 'center',
-          gap: 8
-        }}>
-        <img src={`${process.env.PUBLIC_URL}/assets/images/orange.png`}
-          style={{
-            width: 90,
-            height:15
-            }}
-        />
-        <div style={{
-          // width: "210px",
-          // border: '2px solid red',
-          // backgroundColor: '#0008',
-          // padding: '2px 16px',
-          color:'#ff7200',
-          fontSize: 16,
-          justifyContent: 'space-between',
-          display: 'flex',
-          columnGap:10
-        }}>
-            汛限水位 <strong>{record.flLowLimLev?record.flLowLimLev.toFixed(2):"-"}m</strong>
-          </div>
-        </div>
-
-      <div style={
-        {
-          position: 'absolute',
-          // left: 150,
-          // left:78,
-          width: '82%',
-          bottom:computerHeight(record.rz,record.crestElev,record.deadLev),
-          display: 'flex',
-          alignItems: 'center',
-          gap: 8,
-          justifyContent: 'end',
-        }}>
-        <div style={{width:'105px',overflow:'hidden'}}>
-          <img src={`${process.env.PUBLIC_URL}/assets/images/blue2.png`}
-            style={{
-              flex:0.5,
-              // width: 30,
-              height:15
-              }}
-          />
-        </div>
-        <div style={{
-          // flexGrow: 0.5,
-          // border: '2px solid #fff',
-          // color: "#fff",
-          // backgroundColor:
-          //   '#0008',
-          // padding: '2px 16px',
-          color:'#06caff',
-          fontSize: 16,
-        }}>
-          <div style={{
-            // justifyContent: 'space-between',
-            display: 'flex',
-            columnGap:10
-          }}> <span>实时水位</span> <strong>{record.rz?record.rz.toFixed(2):"-"}m</strong></div>
-            {/* <div style={{ justifyContent: 'space-between', display: 'flex'}}> <span>库容</span> <strong>{record.totCap}m³</strong></div> */}
-          </div>
-        </div>
-
-      <div style={{
-        position: 'absolute', left: 40,
-        // width: '65%',
-        top: '90%', transform: 'translateY(-50%)', display: 'flex', alignItems: 'center', gap: 8
-      }}>
-        <img src={`${process.env.PUBLIC_URL}/assets/images/white1.png`}
-          style={{
-            width: 90,
-            height:15
-            }}
-        />
-        <div style={{
-          // width: "210px",
-          // border: '2px solid #fff',
-          // color: "#fff",
-          // backgroundColor: '#0bcbeb',
-          // padding: '2px 16px',
-          color:'#bfbfbf',
-          fontSize: 16,
-          justifyContent: 'space-between',
-          display: 'flex',
-          columnGap:10
-        }}>
-            死水位 <strong>{record.deadLev?record.deadLev.toFixed(2):''}m</strong>
-          </div>
-        </div>
-      </div>
-  )
-}
-
-export default MyImg
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/http/rightHtpp.js b/src/views/Home/homePanelsLayoutXL/http/rightHtpp.js
deleted file mode 100644
index 8157c8d..0000000
--- a/src/views/Home/homePanelsLayoutXL/http/rightHtpp.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import { httpget2 } from "../../../../utils/request"
-import apiUrl from '../../../../service/apiurl'
-export const adList = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.list,params)
-    return res
-}
-export const info = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.info,params)
-    return res
-}
-
-export const cList = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.shjj.cList,params)
-    return res
-}
-
-export const hlsxList = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.hlsx.list,params)
-    return res
-}
-
-export const qhtdInfo = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.qxsw.qxtd.qhtd,params)
-    return res
-}
-
-export const jysdfbInfo = async(params)=>{
-    const res = await httpget2(apiUrl.jbqk.qxsw.qxtd.jysdfb,params)
-    return res
-}
-
-export const byjzInfo = async(params)=>{
-    let url = params === 'hb'? apiUrl.jbqk.qxsw.qxtd.byjzhb:apiUrl.jbqk.qxsw.qxtd.byjzxf
-    const res = await httpget2(url,{})
-    return res
-}
-
-export const byplInfo = async()=>{
-    const res = await httpget2(apiUrl.jbqk.qxsw.qxtd.bypl,{})
-    return res
-}
-
-export const skList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.sk.list,{})
-    return res
-}
-
-export const skcount = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.sk.count,{})
-    return res
-}
-
-export const sdzCount = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.sdz.count,{})
-    return res
-}
-
-export const sdzList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.sdz.list,{})
-    return res
-}
-
-export const ysgcCount = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.ysgc.count,{})
-    return res
-}
-
-export const ysgcList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.ysgc.list,{})
-    return res
-}
-
-export const tybCount = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.tyb.count,{})
-    return res
-}
-
-export const tybList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.slgc.tyb.list,{})
-    return res
-}
-
-
-export const yfzhdCount = async()=>{
-    const res = await httpget2(apiUrl.jbqk.yfzhd.count,{})
-    return res
-}
-export const yfzhdList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.yfzhd.list,{})
-    return res
-}
-export const yfzhdTableList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.yfzhd.tableList,{})
-    return res
-}
-
-
-export const dzzhdCount = async()=>{
-    const res = await httpget2(apiUrl.jbqk.dzzhd.count,{})
-    return res
-}
-export const dzzhdList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.dzzhd.list,{})
-    return res
-}
-export const dzzhdTableList = async()=>{
-    const res = await httpget2(apiUrl.jbqk.dzzhd.tableList,{})
-    return res
-}
-
-
-export const dxzhsjlist = async()=>{
-    const res = await httpget2(apiUrl.jbqk.dxzhsj.list,{})
-    return res
-}
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/index.tsx b/src/views/Home/homePanelsLayoutXL/index.tsx
deleted file mode 100644
index 91c4310..0000000
--- a/src/views/Home/homePanelsLayoutXL/index.tsx
+++ /dev/null
@@ -1,270 +0,0 @@
-import React, { useEffect, useRef, useState } from "react";
-import {useDispatch, useSelector} from "react-redux";
-import { Collapse } from 'antd'
-import appconsts from '../../../service/appconsts';
-import { getRainConditionApi } from "../../../service/homePage";
-import LeftContent from "./leftContent";
-import RightContentkey1 from "./right/SocioEconomic";
-import RightContent from "./right";
-import { dxzhsjlist, dzzhdCount, hlsxList, sdzCount, skcount, tybCount, yfzhdCount, ysgcCount } from "./http/rightHtpp";
-import Tuli2 from "./right/img/tuli2.png"
-
-
-
-const { Panel } = Collapse;
-
-type IProps = {
-  showPanels: Boolean;
-}
-
-const HomePanelsLayoutPage: React.FC<IProps> = ({ showPanels }) => {
-  const dispatch = useDispatch();
-  const hasAlertBox = useSelector((s: any) => s.runtime.hasAlertBox);
-  const childRef = useRef<any>(null);
-  const [showRight, setShowRight] = useState(false)
-
-  const [keyItem, setKeyItem] = useState<any>('>1000')
-
-
-
-  //const { data } = useRequest(OverallPromise.get);
-
-  const [countT, setCount] = useState<any>({});
-  const [dataList, setDataList] = useState<any>();
-  const [hlsxListData, setHlsxList] = useState<any>();
-  const [keys, setKeys] = useState<string>('0');
-  const [rightKeys, setRightKeys] = useState<string>('1');
-  const [list, setList] = useState([]);
-  const [defaultActiveKey, setDefaultActiveKey] = useState();
-  const [noKey,setNoKey] = useState(true)
-  const onChange = (key: any) => {
-    // childRef.current?.showModal()
-    // setDefaultActiveKey[]
-    console.log(rightKeys, key, '0989800');
-
-    if (key) {
-      setShowRight(true)
-      setRightKeys(key)
-      setNoKey(false)
-    } else {
-      setShowRight(false)
-      setNoKey(true)
-    }
-
-
-  };
-
-  let listItem: any =
-    [
-      {
-        title: '社会经济', key: 1, icon: `${process.env.PUBLIC_URL}/assets/panelTitle.png`,
-        child: [{ img: 'xzgh', title: '行政区划', keysType: 'xzqh', key: '1' }]
-      },
-      {
-        title: '河流水系', key: 2, icon: `${process.env.PUBLIC_URL}/assets/panelTitle.png`,
-        child: [{ img: 'hlsx', title: '>1000平方公里', key: '1', keysType: '>1000', num: 0 },
-        { img: 'hlsx', title: '50-1000平方公里', key: '2', keysType: '50-1000', num: 0 },
-        { img: 'hlsx', title: '<50平方公里', key: '3', keysType: '<50', num: 0 }]
-      },
-      {
-        title: '气象水文', key: 3, icon: `${process.env.PUBLIC_URL}/assets/panelTitle.png`,
-        child: [{ img: 'qxtd', title: '气象特点', key: '1', keysType: 'qxtd' }]
-      },
-      {
-        title: '水利工程', key: 4, icon: `${process.env.PUBLIC_URL}/assets/panelTitle.png`,
-        child: [{ img: 'sk', title: '水库', keysType: 'sk', key: '1', num: 0 },
-        { img: "sdz", title: "水电站", keysType: 'sdz', key: '2', num: 0 },
-        { img: "ysgc", title: "引水工程", keysType: 'ysgc', key: '3', num: 0 },
-        { img: "st", title: "塘(堰)坝", keysType: 'st', key: '4', num: 0 }]
-      },
-      {
-        title: '易发灾害点', key: 5, icon: `${process.env.PUBLIC_URL}/assets/panelTitle.png`,
-        child: [{ img: 'yld', title: '易涝点', keysType: 'yld', key: '1', num: 0 }]
-      },
-      {
-        title: '地质灾害点', key: 6, icon: `${process.env.PUBLIC_URL}/assets/panelTitle.png`,
-        child: [{ img: 'dzzhd', title: '地质灾害点', keysType: 'dzzhd', key: '1', num: 0 }]
-      },
-      {
-        title: '典型灾害事件', key: 7, icon: `${process.env.PUBLIC_URL}/assets/panelTitle.png`,
-        child: [{ img: 'dxzhsj', title: '典型灾害事件', keysType: 'dxzhsj', key: '1', num: 0 }]
-      },
-    ]
-
-  // -------------------------------获取数据
-
-  //获取河流水系数据
-  const getHlsxInfo = async () => {
-    const res = await hlsxList()
-    listItem[1].child.map((item: any) => {
-      if (item.keysType === '<50') {
-        item.num = res.data[1].length
-      }
-      if (item.keysType === '50-1000') {
-        item.num = res.data[2].length
-      }
-      if (item.keysType === '>1000') {
-        item.num = res.data[3].length
-      }
-    })
-    console.log(res.data,'567899');
-    
-    setHlsxList(res.data)
-  }
-  const getSlgcInfo = async () => {
-    const resCount = await skcount()
-    const resSdzCount = await sdzCount()
-    const resYsgcCount = await ysgcCount()
-    const resTybCount = await tybCount()
-    if(resCount.code !== 200)return
-    setCount({ sk: resCount.data, sdz: resSdzCount.data, ysgc: resYsgcCount.data, st: resTybCount.data })
-    listItem[3].child.map((item: any) => {
-      if (item.keysType === 'sk') {
-        item.num = resCount.data.total
-      }
-      if (item.keysType === 'sdz') {
-        item.num = resSdzCount.data.total
-      }
-      if (item.keysType === 'ysgc') {
-        item.num = resYsgcCount.data.total
-      }
-      if (item.keysType === 'st') {
-        item.num = resTybCount.data.total
-      }
-      return item
-    })
-  }
-  const geDxzhsj = async () => {
-    const res = await dxzhsjlist()
-    if(res.code !== 200)return
-    listItem[6].child[0].num = res.data.length
-  }
-  const geDzzhd = async () => {
-    const res = await dzzhdCount()
-    if(res.code == 200){
-      listItem[5].child[0].num = res.data
-    }
-  }
-  const geyfzhd = async () => {
-    const res = await yfzhdCount()
-    if(res.code !== 200)return
-    listItem[4].child[0].num = res.data
-  }
-
-  //----------------------------
-
-  const selected = (key: string) => {
-    console.log(hlsxListData);
-    setKeys(key)
-    if (key == '<50') {
-      setDataList(hlsxListData?.[1])
-    }
-    if (key == '50-1000') {
-      setDataList(hlsxListData?.[2])
-    }
-    if (key == '>1000') {
-      setDataList(hlsxListData?.[3])
-    }
-  }
-  const mapList = [
-    {
-      title: '0-500',
-    },
-    {
-      title: '0-500',
-    },
-    {
-      title: '0-500',
-    }, {
-      title: '0-500',
-    }
-  ]
-  useEffect(() => {
-    // dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-    // dispatch.map.setZhongxingSk(false);
-    //避免第一次加载过慢，先行渲染
-    setList(listItem)
-    Promise.all([getHlsxInfo(), getSlgcInfo(), geyfzhd(), geDzzhd(), geDxzhsj()]).then(() => {
-      //主要为了渲染菜单项后面的统计数据
-      setList(listItem)
-    })
-
-    return ()=>{
-      // dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-      dispatch.map.setZhongxingSk(true);
-    }
-  }, [])
-  useEffect(()=>{
-    if (keys == '<50') {
-      setDataList(hlsxListData?.[1])
-    }
-    if (keys == '50-1000') {
-      setDataList(hlsxListData?.[2])
-    }
-    if (keys == '>1000') {
-      setDataList(hlsxListData?.[3])
-    }
-  },[hlsxListData])
-  return (
-    <div>
-      {
-        true//showPanels 
-        ? <>
-        <div style={showPanels?{display:'block'}:{display:'none'}}>
-          {/*左侧面板*/}
-          <div className="leftPanel" style={{ top: hasAlertBox ? "20px" : "0", maxHeight: hasAlertBox ? "calc(100vh - 104px)" : "calc(100vh - 84px)" }}>
-            <div style={{ maxHeight: hasAlertBox ? "calc(100vh - 104px)" : "calc(100vh - 84px)" }}>
-              <div className="clearFloat panelTitle flexac" style={{ color: '#333',padding: '8px 16px' }}>
-                <img src={require('../../../assets/images/panelTitle.png')} alt="" />
-                <span className="txt" style={{ color: '#000',fontSize:16,fontWeight:400 }}>基本情况</span>
-              </div>
-              <Collapse ghost onChange={onChange} expandIconPosition="end" accordion={true} bordered={false}>
-                {list.map((item: any) => {
-                  return <Panel key={item.key} style={{ cursor: 'pointer' }}
-                    header={<div className="clearFloat panelTitle1">
-                      <div className="lf iconDiv">
-                      </div>
-                      <span className="lf txt" style={{ color: '#333', fontWeight: 400 }}>{item.title}</span>
-                    </div>} >
-                    <LeftContent selected={selected} rightKeys={rightKeys} ref={childRef} data1={item.child} />
-                  </Panel>
-                })}
-              </Collapse>
-            </div>
-          </div>
-          {rightKeys === '3' && <div style={{ zIndex: 101, position: 'absolute', height: '102%', margin: '-12px', width: '102%', backgroundColor: '#FFF', justifyContent: 'center' }} className="flex flexjcac">
-            <div style={{ position: 'relative' }}>
-              <div style={{ textAlign: 'center',fontSize: 24,marginTop: 24}}>2022年咸丰县降水量等值线图</div>
-              <img width={765} style={{ height: `calc(100% - 60px)` }} src={require('../../../assets/images/bigImg.png')} alt="" />
-              
-              <div>
-              <img style={{ position: 'absolute', right: 10, top: 98,width:50, }} src={require('../../../assets/images/North.png')} alt="" />
-              </div>
-              <div style={{ position: 'absolute', left: -134, bottom: 150, border: '1px solid #f0f0f0' }}>
-                <img style={{ height: `calc(100% - 22px)` }} src={require('../../../assets/images/tuli_icon.png')} alt="" />
-              </div>
-              <span style={{position:'absolute',left: -134, bottom: 100,}}>资料来源:《2022年咸丰县水资源公报》</span>
-            </div>
-          </div>}
-          {noKey?<>
-            <div style={{position:'absolute',top:'calc(100vh - 250px)', left:'0px'}}>
-              <img src={Tuli2} alt="" width={300}/>
-            </div>
-          </>:null}
-          {/*右侧面板*/}
-          {showRight && <div className="rightPanel" style={{ top: hasAlertBox ? "20px" : "0" }}>
-            <div>
-              <RightContent keys={keys} rightKeys={rightKeys} dataList={dataList} countT={countT} noKey={noKey}/>
-            </div>
-          </div>}
-          </div>
-        </> : null
-
-                
-          
-      }
-    </div>
-  )
-}
-
-export default HomePanelsLayoutPage
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/leftContent.css b/src/views/Home/homePanelsLayoutXL/leftContent.css
deleted file mode 100644
index 8f342f2..0000000
--- a/src/views/Home/homePanelsLayoutXL/leftContent.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.leftContent .txt {
-  margin-left: 10px;
-  font-family: 'Microsoft YaHei UI', sans-serif;
-  font-weight: 400;
-  font-style: normal;
-  font-size: 14px;
-  color: #000000;
-  text-align: left;
-}
-.leftContent .selectItem {
-  color: #409eff;
-}
diff --git a/src/views/Home/homePanelsLayoutXL/leftContent.less b/src/views/Home/homePanelsLayoutXL/leftContent.less
deleted file mode 100644
index 875f9a8..0000000
--- a/src/views/Home/homePanelsLayoutXL/leftContent.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.leftContent{
-    // padding: 0 40px;
-    .txt{
-        margin-left: 10px;
-        font-family: 'Microsoft YaHei UI', sans-serif;
-        font-weight: 400;
-        font-style: normal;
-        font-size: 14px;
-        color: #000000;
-        text-align: left;
-    }
-    .selectItem{
-        color: #409eff;
-    }
-}
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/leftContent.tsx b/src/views/Home/homePanelsLayoutXL/leftContent.tsx
deleted file mode 100644
index 71e306f..0000000
--- a/src/views/Home/homePanelsLayoutXL/leftContent.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { forwardRef, useEffect, useState } from "react";
-import "./leftContent.less"
-
-const LeftContent = forwardRef((props: any, ref) => {
-    const [keyItem, setKeyItem] = useState<any>('>1000')
-    const selectedItem = (item: any) => {
-        setKeyItem(item.keysType);
-        props.selected(item.keysType);
-    }
-    useEffect(() => {
-        let mapob: any = {
-            1: 'xzqh',
-            2: '>1000',
-            3: 'qxtd',
-            4: 'sk',
-            5: 'yld',
-            6: 'dzzhd',
-            7: 'dxzhsj'
-        }
-        setKeyItem(mapob[props.rightKeys])
-        props.selected(mapob[props.rightKeys]);
-    }, [props.rightKeys])
-    return (
-        <div className='leftContent' >
-            {props.data1.map((item: any) => {
-                return (
-                    <>
-                        <div onClick={() => selectedItem(item)} style={{ backgroundColor: keyItem == item.keysType ? '#f0f7ff' : '#fff',padding:
-                        '5px 40px' }}>
-                            <img src={require(`../../../assets/images/${item.img}.png`)} height='18px' alt="" />
-                            <span className="txt" style={{ color: keyItem == item.keysType ? '#0094ff' : '#000' }}>{item.title}
-                                {['2', '4', '5', '6', '7'].includes(props.rightKeys) && <span>({item.num})
-                                </span>}
-                            </span>
-                        </div>
-                    </>)
-            })}
-        </div>
-    )
-})
-export default LeftContent
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/SocioEconomic.tsx b/src/views/Home/homePanelsLayoutXL/right/SocioEconomic.tsx
deleted file mode 100644
index acf1aea..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/SocioEconomic.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import { title } from "process";
-import { stringify } from "querystring";
-import React, {useEffect, useState} from "react";
-import { adList, cList, info } from "../http/rightHtpp";
-import { useSelector, useDispatch } from "react-redux";
-import PubTable from "./components/pubTable";
-import "./rightContent.less"
-
-type IProps = {
-    key: Number;
-  }
-type infoDataType={
-    townCount?:number,
-    villageCount?:number,
-    countyArea?:number,
-    committeeCount?:number,
-    pcount?:number
-}
-const SocioEconomic: React.FC = (IProps) => {
-    const [data,setData] = useState([])
-    const [infoData,setInfo] = useState<infoDataType>({})
-    const dispatch = useDispatch();
-    const getList=async()=>{
-        const res = await adList()
-        if(res.code == 200){
-            setData(res.data)
-        }
-    }
-    const getInfo=async()=>{
-        const res = await info()
-        if(res.code == 200){
-            setInfo(res.data)
-        }
-    }
-    const columns = [
-        {
-          title: '序号',
-          render:(text:string,record:object,index:number)=>`${index+1}`,
-          align:'center' as const,
-        },
-        {
-          title: '行政村名',
-          dataIndex: 'adnm',
-          key: 'adnm',
-          align:'center' as const,
-
-        },
-        {
-          title: '面积(km²)',
-          dataIndex: 'ldarea',
-          key: 'ldarea',
-          align:'center' as const,
-
-        },
-        {
-            title: '人口',
-            dataIndex: 'population',
-            key: 'population',
-            align:'center' as const,
-
-        },
-      ];
-    useEffect(()=>{
-        getList()
-        getInfo()
-
-
-        dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        return ()=>{
-            dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-        }
-    },[])
-    return(
-        <div className='rightContent'>
-            <div className='title flex flexac'>
-                <BarChartOutlined style={{fontSize:'14px',marginRight:'5px'}}/>
-                统计
-                </div>
-            <div className='flex flexsbc item'>
-                <div className='flex flexcc'>辖{infoData.townCount}镇{infoData.villageCount}乡{infoData.committeeCount}个区工委</div>
-                <div className='flex flexcc flexfc'>
-                    <div>{infoData.countyArea}平方千米</div>
-                    <div>县域面积</div>
-                </div>
-                <div className='flex flexcc flexfc'>
-                    <div>{infoData.pcount}人</div>
-                    <div>常住人口</div>
-                </div>
-            </div>
-            <PubTable data={data} cList={cList} showNum={false} columns={columns} type={{layer:'AdcdLayer',pops:'adcd'}}/>
-        </div>
-    )
-}
-export default SocioEconomic
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/components/pubTable.css b/src/views/Home/homePanelsLayoutXL/right/components/pubTable.css
deleted file mode 100644
index 951c9b5..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/components/pubTable.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.pubTable .listItem {
-  height: 30px;
-  background: linear-gradient(to right, #eaf4fe, #eaf4fe, #eaf4fe, #eaf4fe, #fff);
-  border-radius: 10px;
-  margin-top: 5px;
-  padding: 0 8px;
-  font-family: 'Arial Normal', 'Arial', sans-serif;
-  font-weight: 400;
-  font-style: normal;
-  font-size: 13px;
-  letter-spacing: normal;
-  color: #333333;
-  vertical-align: none;
-  text-align: center;
-  line-height: normal;
-  text-transform: none;
-}
-.pubTable .listItem .iconCircle {
-  border: 2px solid #000;
-  border-radius: 50%;
-  background-color: saddlebrown;
-  height: 8px;
-  width: 8px;
-  margin-right: 10px;
-}
-.pubTable .listItem .blueColor {
-  color: #3749c7;
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/components/pubTable.less b/src/views/Home/homePanelsLayoutXL/right/components/pubTable.less
deleted file mode 100644
index 4e5db12..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/components/pubTable.less
+++ /dev/null
@@ -1,32 +0,0 @@
-.pubTable{
-    .listItem{
-        height: 30px;
-        background: linear-gradient(to right,#eaf4fe,#eaf4fe,#eaf4fe,#eaf4fe,#fff);
-        border-radius: 10px;
-        margin-top: 5px;
-        padding: 0 8px;
-        font-family: 'Arial Normal', 'Arial', sans-serif;
-        font-weight: 400;
-        font-style: normal;
-        font-size: 13px;
-        letter-spacing: normal;
-        color: #333333;
-        vertical-align: none;
-        text-align: center;
-        line-height: normal;
-        text-transform: none;
-        .iconCircle{
-            border: 2px solid #000;
-            border-radius: 50%;
-            background-color: saddlebrown;
-            height:8px;
-            width: 8px;
-            margin-right: 10px;
-            
-        }
-        .blueColor{
-            color:#3749c7
-        }
-    }
-  
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/components/pubTable.tsx b/src/views/Home/homePanelsLayoutXL/right/components/pubTable.tsx
deleted file mode 100644
index 3323ae7..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/components/pubTable.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-import { DownCircleOutlined, UpCircleOutlined } from "@ant-design/icons";
-import { message, Table } from "antd";
-import { useSelector, useDispatch } from "react-redux";
-import React, { useEffect, useState } from "react";
-// import { cList } from "../../http/rightHtpp";
-import './pubTable.less'
-
-type IProps = {
-  data?: Record<string, any>[],
-  cList?: any,
-  columns: any,
-  keysType?: any,
-  showNum: boolean,
-  type?: any,
-  scrollYData?:number
-}
-
-const PubTable: React.FC<IProps> = (props: IProps) => {
-  const [data, setData] = useState([])
-
-  const [show, setShow] = useState<boolean>(true)
-  const [idex, setIndex] = useState<number>()
-  const [dataList, setList] = useState<any>()
-  const dispatch = useDispatch();
-
-  const setShowType = (idx: number, item: any) => {
-    if (idx != idex) {
-      setIndex(idx)
-      console.log(props,'------');
-      if (props.cList) {
-        getTabelData(item.adcd)
-      } else {
-        console.log(item[props.keysType]);
-        
-        if (item[props.keysType] && item[props.keysType].length > 0) {
-          const list = item[props.keysType].map((item: any) => {
-            return {
-              ...item,
-              lgtd: item.lng,
-              lttd: item.lat
-            }
-          })
-          setData(list)
-        }else{
-          setData(item[props.keysType])
-        }
-      }
-    } else {
-      setIndex(999)
-    }
-  }
-  const getTabelData = async (params: string) => {
-    const res = await props.cList({ adcd: params })
-    setData(res.data)
-  }
-  useEffect(() => {
-    dispatch.map.setLayerVisible({ [props.type.layer]: true });
-    setList(props.data)
-
-    return () => {
-      clearHighlight()
-      dispatch.map.setLayerVisible({ [props.type.layer]: false });
-      dispatch.runtime.closeFeaturePopAll()
-    }
-  }, [props.data])
-
-  const myClick = (item: any, index: any) => {
-    // if (index != idex) {
-    //   if (props.type.layer === 'AdcdLayer') {
-    //     adcdBorderHighlight(item.adcd)
-    //     flyToAdcd(item)
-    //   }
-    // }
-    // setShowType(index, item)
-
-
-    //高亮镇范围，飞行
-    adcdBorderHighlight(item.adcd)
-
-    dispatch.map.setLayerVisible({ 'AdcdLayer': true });
-    const { lgtd, lttd, elev, adcd } = item;
-    if (lgtd && lttd) {
-      if(props.type.layer==='AdcdLayer'){
-        // dispatch.runtime.setFeaturePop({ type: 'adcd', data: item, lgtd:lgtd, lttd: lttd, });
-        // dispatch.runtime.setFeaturePop({ type: 'DingWeiFu',  data: item, lgtd:lgtd, lttd: lttd, }); 
-      }
-      // dispatch.runtime.setCameraTarget({
-      //   center: [lgtd, lttd - 0.05, elev],
-      //   zoom: 12.2,
-      //   pitch: 60,
-      // });
-    } else {
-      message.info('缺失经纬度');
-    }
-  } 
-
-
-  const flyToAdcd = (record: any) => {
-    if(props.type.layer==='AdcdLayer'||props.type.layer==='YFZHDLayer'||props.type.layer==='DZZHDLayer'){
-      const adcd = record.adcd.substring(0, 9);
-      adcdBorderHighlight(adcd)
-    }
-
-
-
-    dispatch.map.setLayerVisible({ [props.type.layer]: true });
-    const { lgtd, lttd, elev, adcd } = record;
-    if (lgtd && lttd) {
-      if(props.type.layer==='AdcdLayer'){
-        dispatch.runtime.setFeaturePop({ type: 'DingWeiFu', data: record, lgtd: record.lgtd, lttd: record.lttd, }); 
-      }else{
-        dispatch.runtime.setFeaturePop({ type: props.type.pops, data: record, lgtd: record.lgtd, lttd: record.lttd, });
-      }
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 12.2,
-        pitch: 60,
-      });
-    } else {
-      message.info('缺失经纬度');
-    }
-  };
-
-  const clearHighlight = () => {
-    //清除
-    ['422826102', '422826100', '422826201', '422826104', '422826203', '422826204', '422826200', '422826101', '422826103', '422826202', '422826400'].map((i) => {
-      const vo = { ["AdcdBorderLayer_" + i]: false };
-      dispatch.map.setLayerVisible(vo);
-    })
-  }
-
-  const adcdBorderHighlight = (adcd: any) => {
-    clearHighlight()
-    const value = adcd.substring(0, 9)
-    const vo = { ["AdcdBorderLayer_" + value]: true };
-    dispatch.map.setLayerVisible(vo);
-  }
-
-  return (
-    <div className='pubTable'>
-      {props.data?.map((item, index) => {
-        return <div>
-          <div className='listItem flex flexsbc' onClick={()=>{
-            // myClick(item, index)
-          }}>
-            <div className='flex flexac' style={{ width: 100, cursor: 'pointer'}} onClick={()=>{
-              myClick(item, index)
-            }}>
-              <div className='iconCircle' ></div>
-              {item.adnm}
-            </div>
-            {!props.showNum && <div className='flex' >
-              <div className='blueColor' style={{ width: 100, textAlign: 'right' }}>{item.ldarea}平方千米</div>
-              <div className='blueColor' style={{ width: 100, textAlign: 'right',marginRight:20 }}>{item.population}人</div>
-            </div>}
-            {props.showNum && <div style={{ textAlign: 'right' }}>
-              <div className='blueColor'>{item.con}个</div>
-            </div>}
-            <div>
-              {(idex === index) && <UpCircleOutlined onClick={() => setShowType(index, item)} />}
-              {(idex !== index) && <DownCircleOutlined onClick={() => setShowType(index, item)} />}
-            </div>
-          </div>
-          {(idex === index) &&
-            <div style={{ margin: '5px 0'}}>
-              <Table
-                dataSource={data}
-                columns={props.columns}
-                pagination={false}
-                scroll={{ y: props.scrollYData || 275 }}
-                onRow={(record: any) => {
-                  return {
-                    onClick: (event: any) => flyToAdcd(record),
-                  };
-                }}
-              />
-            </div>
-          }
-        </div>
-      })}
-    </div>
-  )
-}
-export default PubTable
diff --git a/src/views/Home/homePanelsLayoutXL/right/disasterPronePoints.tsx b/src/views/Home/homePanelsLayoutXL/right/disasterPronePoints.tsx
deleted file mode 100644
index 4bcf0c8..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/disasterPronePoints.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import { title } from "process";
-import { stringify } from "querystring";
-import React, { useEffect, useState } from "react";
-import {useSelector, useDispatch} from "react-redux";
-import { yfzhdList, yfzhdTableList } from "../http/rightHtpp";
-import PubTable from "./components/pubTable";
-import "./rightContent.less"
-
-
-type IProps = {
-    key?: number;
-    rightKeys?: string;
-}
-
-const DisasterPronePoints: React.FC<IProps> = (props: IProps) => {
-    const dispatch = useDispatch();
-    const [data, setData] = useState()
-    const getList = async () => {
-        const res = await yfzhdTableList()
-        if (res.code == 200) {
-            setData(res.data)
-        }
-    }
-    useEffect(()=>{
-        dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        return ()=>{
-            dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-        }
-    },[])
-
-    const columns = [
-        {
-          title: '序号',
-          render:(text:string,record:object,index:number)=>`${index+1}`,
-          align:'center' as const,
-        },
-        {
-          title: '名称',
-          dataIndex: 'name',
-          key: 'name',
-          align:'center' as const,
-          ellipsis: true,
-        },
-        {
-          title: '积水最大深度(m)',
-          dataIndex: 'depth',
-          key: 'depth',
-          align:'center' as const,
-          with:400,
-        },
-        {
-            title: '影响人口',
-            dataIndex: 'pop',
-            key: 'pop',
-            align:'center' as const,
-
-        },
-      ];
-    useEffect(() => {
-        getList()
-    }, [])
-    return (
-        <>
-            <div className='rightContent'>
-                <div className='title flex flexac'>
-                    <BarChartOutlined style={{ fontSize: '14px', marginRight: '5px' }} />
-                    统计
-                </div>
-                <PubTable data={data} showNum={true}  columns={columns} keysType='attWaterloggedList' type={{layer:'YFZHDLayer',pops:'yifazaihaidian'}}/>
-            </div>
-        </>
-    )
-}
-export default DisasterPronePoints
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/geologicalHazardPoints.tsx b/src/views/Home/homePanelsLayoutXL/right/geologicalHazardPoints.tsx
deleted file mode 100644
index afae0a4..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/geologicalHazardPoints.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import { title } from "process";
-import { stringify } from "querystring";
-import React, {useEffect, useState} from "react";
-import {useSelector, useDispatch} from "react-redux";
-import { dzzhdTableList } from "../http/rightHtpp";
-import PubTable from "./components/pubTable";
-import "./rightContent.less"
-
-
-type IProps = {
-    key?: number;
-    rightKeys?:string;
-  }
-
-const GeologicalHazardPoints:React.FC<IProps>= (props:IProps) => {
-    const dispatch = useDispatch();
-    const mapob: { [key: string]: any }={
-        1:'崩塌',
-        2:'滑坡',
-        3:'塌陷'
-    }
-    const columns = [
-        {
-          title: '序号',
-          render:(text:string,record:object,index:number)=>`${index+1}`,
-          align:'center' as const,
-        },
-        {
-          title: '名称',
-          dataIndex: 'name',
-          key: 'name',
-          align:'center' as const,
-          ellipsis: true,
-        },
-        {
-          title: '体积(万m³)',
-          dataIndex: 'vol',
-          key: 'vol',
-          align:'center' as const,
-
-        },
-        {
-            title: '灾害类型',
-            dataIndex: 'dtype',
-            key: 'dtype',
-            render: (text: string, record: any, index: number) => `${mapob[record.dtype]}`,
-            align:'center' as const,
-
-        },
-      ];
-    const [data, setData] = useState()
-    const getList = async () => {
-        const res = await dzzhdTableList()
-        if (res.code == 200) {
-            setData(res.data)
-        }
-    }
-    useEffect(()=>{
-        dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        getList()
-
-        return ()=>{
-          dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-        }
-    },[])
-    return(
-        <>
-         <div className='rightContent'>
-            <div className='title flex flexac'>
-                <BarChartOutlined style={{fontSize:'14px',marginRight:'5px'}}/>
-                统计
-                </div>
-                <PubTable data={data} showNum={true} columns={columns} keysType='attGeoHazzardList' type={{layer:'DZZHDLayer',pops:'dizhizaihaidian'}}/>
-        </div>
-        </>
-    )
-}
-export default GeologicalHazardPoints
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli1.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli1.png
deleted file mode 100644
index cf5ec9e..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli1.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli2.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli2.png
deleted file mode 100644
index aa811ab..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli2.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli3.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli3.png
deleted file mode 100644
index e82a78f..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli3.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli4.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli4.png
deleted file mode 100644
index f4d14fc..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli4.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli5.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli5.png
deleted file mode 100644
index ef9e2b1..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli5.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli6.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli6.png
deleted file mode 100644
index 4e29fdb..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli6.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli7.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli7.png
deleted file mode 100644
index 82f4e59..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli7.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli8.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli8.png
deleted file mode 100644
index c8c4ab9..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli8.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/img/tuli9.png b/src/views/Home/homePanelsLayoutXL/right/img/tuli9.png
deleted file mode 100644
index a8c6271..0000000
Binary files a/src/views/Home/homePanelsLayoutXL/right/img/tuli9.png and /dev/null differ
diff --git a/src/views/Home/homePanelsLayoutXL/right/index.tsx b/src/views/Home/homePanelsLayoutXL/right/index.tsx
deleted file mode 100644
index 843ad2a..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/index.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import { title } from "process";
-import { stringify } from "querystring";
-import React, {useEffect, useState} from "react";
-import PubTable from "./components/pubTable";
-import DisasterPronePoints from "./disasterPronePoints";
-import GeologicalHazardPoints from "./geologicalHazardPoints";
-import "./rightContent.less"
-import River from "./river";
-import SocioEconomic from "./SocioEconomic";
-import TypicalDisasterEvents from "./typicalDisasterEvents";
-import WaterConservancyProject from "./waterConservancyProject";
-import Weather from "./weather/weather";
-import Tuli1 from "./img/tuli1.png"
-import Tuli2 from "./img/tuli2.png"
-import Tuli3 from "./img/tuli3.png"
-import Tuli4 from "./img/tuli4.png"
-import Tuli5 from "./img/tuli5.png"
-import Tuli6 from "./img/tuli6.png"
-import Tuli7 from "./img/tuli7.png"
-import Tuli8 from "./img/tuli8.png"
-import Tuli9 from "./img/tuli9.png"
-
-
-type IProps = {
-    keys: string;
-    rightKeys:string;
-    dataList?:any,
-    countT?:any,
-    noKey?:any
-  }
-//   const mapob={
-      
-//   }
-// if (key == '<50') {
-    //   setDataList(hlsxListData?.[1])
-    // }
-    // if (key == '50-1000') {
-    //   setDataList(hlsxListData?.[2])
-    // }
-    // if (key == '>1000') {
-    //   setDataList(hlsxListData?.[3])
-    // }
-const RightContent:React.FC<IProps>= (props:IProps) => {
-    const [dataList,setDataList] =useState() 
-    useEffect(()=>{
-        console.log(props,'我是props');
-    },[props])
-    return(
-        <>
-        {/* <div style={{position:'absolute',top:'calc(100vh - 300px)', left:'-78vw'}}> */}
-        <div style={{position:'absolute',top:'70vh', left:'calc(-100vw + 425px)'}}>
-            {props.keys==='xzqh'?<img src={Tuli1} alt="" width={300}/>:null}
-            {(props.keys==='<50'||props.keys==='50-1000'||props.keys==='>1000')?<img src={Tuli2} alt="" width={300}/>:null}
-            {props.keys==='sk'?<img src={Tuli3} alt="" width={300}/>:null}
-            {props.keys==='sdz'?<img src={Tuli4} alt="" width={300}/>:null}
-            {props.keys==='ysgc'?<img src={Tuli5} alt="" width={300}/>:null}
-            {props.keys==='st'?<img src={Tuli6} alt="" width={300}/>:null}
-            {props.keys==='yld'?<img src={Tuli7} alt="" width={300}/>:null}
-            {props.keys==='dzzhd'?<img src={Tuli8} alt="" width={300}/>:null}
-            {props.keys==='dxzhsj'?<img src={Tuli9} alt="" width={300}/>:null}
-            
-
-
-
-            {/* <img src={Tuli} alt="" width={300}/> */}
-        </div> 
-        {props.rightKeys === '1'&&<SocioEconomic />}
-        {props.rightKeys === '2'&&<River keys={props.keys} dataList={props.dataList}/>}
-        {props.rightKeys === '3'&&<Weather />}
-        {props.rightKeys === '4'&&<WaterConservancyProject keys={props.keys} countT={props.countT}/>}
-        {props.rightKeys === '5'&&<DisasterPronePoints />}
-        {props.rightKeys === '6'&&<GeologicalHazardPoints />} 
-        {props.rightKeys === '7'&&<TypicalDisasterEvents />} 
-        </>
-    )
-}
-export default RightContent
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/rightContent.css b/src/views/Home/homePanelsLayoutXL/right/rightContent.css
deleted file mode 100644
index 6e8ec06..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/rightContent.css
+++ /dev/null
@@ -1,85 +0,0 @@
-.rightContent {
-  font-size: 14px;
-}
-.rightContent .title {
-  width: 155px;
-  height: 46px;
-  background-image: url('../../../../assets/images/titleback.png');
-  background-repeat: no-repeat;
-  background-size: cover;
-  color: #fff;
-  padding-left: 8px ;
-}
-.rightContent .item {
-  color: #3749C7;
-}
-.rightContent .item > div {
-  width: 30%;
-  height: 85px;
-  background: inherit;
-  background-color: #eaf4fe;
-  border: none;
-  border-radius: 5px;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  text-align: center;
-}
-.riverlistItem {
-  height: 30px;
-  background: linear-gradient(to right, #eaf4fe, #eaf4fe, #eaf4fe, #eaf4fe, #fff);
-  border-radius: 10px;
-  margin-top: 5px;
-  padding: 0 8px;
-  font-family: 'Arial Normal', 'Arial', sans-serif;
-  font-weight: 400;
-  font-style: normal;
-  font-size: 13px;
-  letter-spacing: normal;
-  color: #3749c7;
-  vertical-align: none;
-  text-align: center;
-  line-height: normal;
-  text-transform: none;
-}
-.riverlistItem .iconCircle {
-  border: 2px solid #000;
-  border-radius: 50%;
-  background-color: saddlebrown;
-  height: 8px;
-  width: 8px;
-  margin-right: 10px;
-}
-.riverlistItem .imgTitle {
-  height: 14px;
-  width: 14px;
-  margin-right: 10px;
-}
-.riverlistItem .blueColor {
-  color: #3749c7;
-}
-.list50 {
-  width: 100px;
-  height: 36px;
-  background-color: #eaf4fe;
-  margin-bottom: 10px;
-  border-radius: 5px;
-}
-.tooltipsRiver {
-  border-width: 0px;
-  padding: 10px;
-  position: absolute;
-  left: 34px;
-  top: 50%;
-  width: 289px;
-  height: 70px;
-  background: inherit;
-  background-color: #fef5cd;
-  border: none;
-  border-radius: 0px;
-  -moz-box-shadow: 2px 5px 9px rgba(0, 0, 0, 0.34901961);
-  -webkit-box-shadow: 2px 5px 9px rgba(0, 0, 0, 0.34901961);
-  box-shadow: 2px 5px 9px rgba(0, 0, 0, 0.34901961);
-  font-size: 14px;
-  color: #212121;
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/rightContent.less b/src/views/Home/homePanelsLayoutXL/right/rightContent.less
deleted file mode 100644
index fef2f75..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/rightContent.less
+++ /dev/null
@@ -1,89 +0,0 @@
-.rightContent{
-    font-size: 14px;
-    // margin-right: 35px;
-    .title{
-        width: 155px;
-        height: 46px;
-        background-image: url('../../../../assets/images/titleback.png');
-        background-repeat:no-repeat;
-        background-size: cover;
-        color: #fff;
-        padding-left:8px ;
-    }
-    .item{
-        color: #3749C7;
-        >div{
-            width: 30%;
-            height: 85px;
-            background: inherit;
-            background-color: rgba(234, 244, 254, 1);
-            border: none;
-            border-radius: 5px;
-            -moz-box-shadow: none;
-            -webkit-box-shadow: none;
-            box-shadow: none;
-            text-align: center;
-        }
-        
-    }
-}
-
-.riverlistItem{
-    height: 30px;
-    background: linear-gradient(to right,#eaf4fe,#eaf4fe,#eaf4fe,#eaf4fe,#fff);
-    border-radius: 10px;
-    margin-top: 5px;
-    padding: 0 8px;
-    font-family: 'Arial Normal', 'Arial', sans-serif;
-    font-weight: 400;
-    font-style: normal;
-    font-size: 13px;
-    letter-spacing: normal;
-    color: #3749c7;
-    vertical-align: none;
-    text-align: center;
-    line-height: normal;
-    text-transform: none;
-    .iconCircle{
-        border: 2px solid #000;
-        border-radius: 50%;
-        background-color: saddlebrown;
-        height:8px;
-        width: 8px;
-        margin-right: 10px;
-        
-    }
-    .imgTitle{
-        height: 14px;
-        width: 14px;
-        margin-right: 10px;
-    }
-    .blueColor{
-        color:#3749c7
-    }
-}
-.list50{
-    width: 100px;
-    height: 36px;
-    background-color: #eaf4fe;
-    margin-bottom: 10px;
-    border-radius: 5px;
-}
-.tooltipsRiver{
-    border-width: 0px;
-    padding: 10px;
-    position: absolute;
-    left: 34px;
-    top: 50%;
-    width: 289px;
-    height: 70px;
-    background: inherit;
-    background-color: rgba(254, 245, 205, 1);
-    border: none;
-    border-radius: 0px;
-    -moz-box-shadow: 2px 5px 9px rgba(0, 0, 0, 0.349019607843137);
-    -webkit-box-shadow: 2px 5px 9px rgba(0, 0, 0, 0.349019607843137);
-    box-shadow: 2px 5px 9px rgba(0, 0, 0, 0.349019607843137);
-    font-size: 14px;
-    color: #212121;
-}
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/river.tsx b/src/views/Home/homePanelsLayoutXL/right/river.tsx
deleted file mode 100644
index ce9fdec..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/river.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import { title } from "process";
-import { stringify } from "querystring";
-import React, { useEffect, useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import { isArray } from "../../../../utils/tools";
-import PubTable from "./components/pubTable";
-import {message} from "antd"
-
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import StrokeStyle from "ol/style/Stroke";
-import Stroke from "ol/style/Stroke";
-import FillStyle from "ol/style/Fill";
-import {unByKey} from 'ol/Observable.js';
-import {easeOut} from 'ol/easing.js';
-import {getVectorContext} from 'ol/render.js';
-import Circle from "ol/style/Circle";
-import GeoJSONFormat from "ol/format/GeoJSON";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import { geometryCenter } from "../../../../utils/tools";
-
-
-
-import "./rightContent.less"
-
-type IProps = {
-    keys: string;
-    dataList: any
-}
-
-const River: React.FC<IProps> = (props: IProps) => {
-    const dispatch = useDispatch();
-    let mapObj = useSelector((s: any) => s.map.map);
-    const [data, setData] = useState([{ rvName: '', rvBasArea: '' }])
-    const [keyItem, setKeyItem] = useState(0)
-    const [showType, setShowType] = useState<boolean>(true)
-    const getData = () => {
-        console.log(props.dataList, isArray(props.dataList), '----riverList');
-        if (isArray(props.dataList)) {
-            setData(props.dataList)
-        }
-    }
-    useEffect(() => {
-        getData()
-
-        mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-            if( (layer.values_.name) && ((layer.values_.name).indexOf("HlSX_") !== -1 || (layer.values_.name).indexOf("HlItem_") !== -1 || (layer.values_.name).indexOf("LyItem_") !== -1) ){
-                layer.getSource().clear();
-            }
-        })
-
-        if(props.keys==='<50'){
-            props.dataList?.map((item:any,index:any)=>{
-                const arr = JSON.parse(item.geojsonrv)
-                addHlLayer(arr,'HlSX_'+item.rvCode+index,'#00FFFF',item)
-            })
-        }
-        if(props.keys==='50-1000'){
-            props.dataList?.map((item:any,index:any)=>{
-                const arr = JSON.parse(item.geojsonrv)
-                addHlLayer(arr,'HlSX_'+item.rvCode+index,'#00FFFF',item)
-            })
-        }
-        if(props.keys==='>1000'){
-            props.dataList?.map((item:any,index:any)=>{
-                const arr = JSON.parse(item.geojsonrv)
-                addHlLayer(arr,'HlSX_'+item.rvCode+index,'#00FFFF',item)
-            })
-        }
-
-        return ()=>{
-            mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-                const a = layer.values_
-                if( (layer.values_.name) && ((layer.values_.name).indexOf("HlSX_") !== -1 || (layer.values_.name).indexOf("HlItem_") !== -1 || (layer.values_.name).indexOf("LyItem_") !== -1) ){
-                    layer.getSource().clear();
-                }
-              })
-            dispatch.runtime.closeFeaturePopAll()
-        }
-    }, [props])
-
-
-    const highlight = (item:any)=>{
-        mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-            if( (layer.values_.name) && ((layer.values_.name).indexOf("HlSX_") !== -1 || (layer.values_.name).indexOf("HlItem_") !== -1 || (layer.values_.name).indexOf("LyItem_") !== -1) ){
-                layer.getSource().clear();
-            }
-        })
-        console.log(item);
-        // const arr = JSON.parse(item.geojsonrv)?.coordinates[0]||[]
-        const arr = JSON.parse(item.geojsonrv)
-        // const arr2 = JSON.parse(item.geojsonly)?.coordinates[0]||[[]]
-        const arr2 = JSON.parse(item.geojsonly)
-
-
-        // addHlLayer({type:"LineString",coordinates:arr},'HlItem_'+item.rvCode,'#00FFFF',item)
-        addHlLayer(arr,'HlItem_'+item.rvCode,'#00FFFF',item)
-
-        // addLyLayer({type:"Polygon",coordinates:arr2},'LyItem_'+item.rvCode,'#00FFFF',item)
-        addLyLayer(arr2,'LyItem_'+item.rvCode,'#00FFFF',item)
-
-        // const center:any = geometryCenter({type:"LineString",coordinates:arr});
-        // if (center) {
-        //     // dispatch.runtime.setFeaturePop({ type: 'heliu', data: item, lgtd: center[0], lttd: center[1], });
-        //     // dispatch.runtime.setCameraTarget({
-        //     // center: [center[0], center[1], null],
-        //     // zoom: 12.2,
-        //     // pitch: 60,
-        //     // });
-        // }else{
-        //     message.info('缺失经纬度');
-        // }
-    }
-
-    const addHlLayer = (geojsonrv:any,name:any,color?:any,item?:any)=>{
-        if(!geojsonrv){
-            return
-        }
-        const geojsonFormat = new GeoJSONFormat();
-        let geometry = geojsonFormat.readGeometry(geojsonrv, {
-        featureProjection: 'EPSG:3857',
-        });
-        const feature = new Feature({
-            geometry,
-            data: item,
-            name: name
-        });
-
-        var vectorSource = new VectorSource({
-            features: [feature]
-        });
-
-        const vectorLayer = new VectorLayer({
-            // @ts-ignore
-            name: name,
-            source: vectorSource,
-            style: new Style({
-                stroke: new StrokeStyle({
-                    color: color,
-                    width: 4,
-                }),
-            }),
-            zIndex:100
-        });
-
-        mapObj.addLayer(vectorLayer);
-    }   
-
-    const addLyLayer = (geojsonly:any,name:any,color?:any,item?:any)=>{
-        if(!geojsonly){
-            return
-        }
-        console.log('流域数据',geojsonly);
-        const geojsonFormat = new GeoJSONFormat();
-        let geometry = geojsonFormat.readGeometry(geojsonly, {
-        featureProjection: 'EPSG:3857',
-        });
-        const feature = new Feature({
-        geometry,
-        data:item,
-        name: name
-        });
-
-        var vectorSource = new VectorSource({
-        features: [feature]
-        });         
-
-        const vectorLayer = new VectorLayer({
-            // @ts-ignore
-            name: name,
-            source: vectorSource,
-            style: 
-            // new Style({
-            //     stroke: new StrokeStyle({
-            //     color: color,
-            //     width: 4,
-            //     }),
-            // }),
-
-            new Style({
-                stroke: new StrokeStyle({
-                  color: 'rgba(122,227,200, 1)',
-                  width: 2,
-                }),
-                fill: new FillStyle({
-                  color: 'rgba(44,169,138,0.5)',
-                }),
-              }),
-            zIndex:102
-        });
-
-        mapObj.addLayer(vectorLayer);
-    }
-
-
-
-    useEffect(() => {
-        dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-        dispatch.map.setLayerVisible({'AdcdLayer': true });
-        dispatch.map.setZhongxingSk(true);
-        
-
-        mapObj.on('click', function (evt: any) {
-            var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function (feature: any) {
-                return feature;
-            });
-            const name = feature?.values_?.name || ""
-            if (feature && (name.indexOf('HlSX_')>-1 || name.indexOf('HlItem')>-1 || name.indexOf('LyItem_')>-1)) {
-              let data = feature.values_.data;
-              const arr = JSON.parse(data.geojsonrv).coordinates[0]
-              const center:any = geometryCenter({type:"LineString",coordinates:arr});
-              if(center){
-                dispatch.runtime.setFeaturePop({
-                    id: data.rvCode,
-                    type: 'heliu',
-                    data,
-                    lgtd: center[0],
-                    lttd: center[1],
-                })
-              }else{
-                message.info('缺失经纬度');
-              }
-            }
-        });
-
-        return ()=>{
-            dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-            dispatch.map.setLayerVisible({'AdcdLayer': false});
-            dispatch.map.setZhongxingSk(false);
-        }
-    }, [mapObj])
-
-
-    return (
-        <div className='rightContent'>
-            <div className='title flex flexac' onClick={() => {
-
-
-            }}>
-                <BarChartOutlined style={{ fontSize: '14px', marginRight: '5px' }} />
-                统计
-            </div>
-            {props.keys !== '<50' && <div>{data.map(item => {
-                const dom = <div className='riverlistItem flex flexsbc' onClick={() => highlight(item)}>
-                    <div className='flex flexac'>
-                        <img src={require('../../../../assets/images/river.png')} alt="" className='imgTitle' />
-                        {item.rvName}</div>
-                    {item.rvBasArea && <div className='blueColor'>{item.rvBasArea}平方公里</div>}
-                </div>
-
-                return dom
-            })}</div>}
-            {props.keys === '<50' && <div>
-                <div className='flex flexsbc' style={{ flexWrap: 'wrap' }}>
-                    {data.map(item => {
-                        const dom = <div className='blueColor flex flexcc list50' onClick={() => highlight(item)}>{item.rvName}
-                        </div>
-                        return dom
-                    })}
-                </div>
-                {/* <div className='tooltipsRiver'>其它的49条河名录</div> */}
-            </div>}
-
-
-        </div>
-
-    )
-}
-export default River
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/typicalDisasterEvents.tsx b/src/views/Home/homePanelsLayoutXL/right/typicalDisasterEvents.tsx
deleted file mode 100644
index 2b47e76..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/typicalDisasterEvents.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import { Table } from "antd";
-import {useSelector, useDispatch} from "react-redux";
-import { title } from "process";
-import { stringify } from "querystring";
-import React, {useEffect, useState} from "react";
-import { dxzhsjlist } from "../http/rightHtpp";
-import PubTable from "./components/pubTable";
-import "./rightContent.less"
-
-
-type IProps = {
-    key?: number;
-    rightKeys?:string;
-  }
-
-const TypicalDisasterEvents:React.FC<IProps>= (props:IProps) => {
-  const dispatch = useDispatch();
-  const [data,setData] = useState()
-  const getList = async()=>{
-    const res = await dxzhsjlist()
-    setData(res.data)
-  }
-    const columns = [
-        {
-          title: '序号',
-          render:(text:string,record:object,index:number)=>`${index+1}`,
-          align:'center' as const,
-        },
-        {
-          title: '灾害发生时间',
-          dataIndex: 'otime',
-          key: 'otime',
-          align:'center' as const,
-
-        },
-        {
-          title: '灾害发生地点',
-          dataIndex: 'address',
-          key: 'address',
-          align:'center' as const,
-
-        },
-      ];
-      useEffect(()=>{
-        getList()
-
-        dispatch.map.setLayerVisible({'DXZHSJLayer': true});
-        dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        return ()=>{
-            dispatch.runtime.closeFeaturePopAll()
-            dispatch.map.setLayerVisible({'DXZHSJLayer': false});
-            dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-        }
-      },[])
-
-
-      const flyToAdcd = (record:any) => {
-        dispatch.map.setLayerVisible({"DXZHSJLayer": true});
-    
-        const { lgtd, lttd, elev, adcd } = record;
-    
-        if (lgtd && lttd) {
-          dispatch.runtime.setFeaturePop({ type: 'dianxingzaihaishijian', data: record, lgtd: record.lgtd, lttd: record.lttd, });
-    
-          dispatch.runtime.setCameraTarget({
-            center: [lgtd, lttd, elev],
-            zoom: 12.2,
-            pitch: 60,
-          });
-        }
-      };
-    return(
-        <>
-         <div className='rightContent'>
-            <div className='title flex flexac'>
-                <BarChartOutlined style={{fontSize:'14px',marginRight:'5px'}}/>
-                典型灾害事件
-                </div>
-                <Table dataSource={data} columns={columns}  pagination={false} onRow={(record:any) => {
-                                            return {
-                                              onClick: (event:any) =>flyToAdcd(record),
-                                            };
-                                          }}/>
-        </div>
-        </>
-    )
-}
-export default TypicalDisasterEvents
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.css b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.css
deleted file mode 100644
index 08cb44e..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.pubTable .listItem {
-  height: 30px;
-  background: linear-gradient(to right, #eaf4fe, #eaf4fe, #eaf4fe, #eaf4fe, #fff);
-  border-radius: 10px;
-  margin-top: 5px;
-  padding: 0 8px;
-  font-family: 'Arial Normal', 'Arial', sans-serif;
-  font-weight: 400;
-  font-style: normal;
-  font-size: 13px;
-  letter-spacing: normal;
-  color: #333333;
-  vertical-align: none;
-  text-align: center;
-  line-height: normal;
-  text-transform: none;
-}
-.pubTable .listItem img {
-  height: 18px;
-  width: 18px;
-  margin-right: 10px;
-}
-.pubTable .listItem .blueColor {
-  color: #3749c7;
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.less b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.less
deleted file mode 100644
index 1743241..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.less
+++ /dev/null
@@ -1,27 +0,0 @@
-.pubTable{
-    .listItem{
-        height: 30px;
-        background: linear-gradient(to right,#eaf4fe,#eaf4fe,#eaf4fe,#eaf4fe,#fff);
-        border-radius: 10px;
-        margin-top: 5px;
-        padding: 0 8px;
-        font-family: 'Arial Normal', 'Arial', sans-serif;
-        font-weight: 400;
-        font-style: normal;
-        font-size: 13px;
-        letter-spacing: normal;
-        color: #333333;
-        vertical-align: none;
-        text-align: center;
-        line-height: normal;
-        text-transform: none;
-        img{
-            height:18px;
-            width: 18px;
-            margin-right: 10px; 
-        }
-        .blueColor{
-            color:#3749c7
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.tsx b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.tsx
deleted file mode 100644
index 284fe7c..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/components/pubTable.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import { DownCircleOutlined, UpCircleOutlined } from "@ant-design/icons";
-import { useSelector, useDispatch } from "react-redux";
-import { tsInferType } from "@babel/types";
-import { message, Table } from "antd";
-import React, { useEffect, useState } from "react";
-import './pubTable.less'
-type IProps = {
-  keys: any,
-  img: string,
-  data: any,
-  count?: any,
-  columns: any,
-  type?: any
-}
-type arr = {
-  title: string,
-  num: string,
-  show?: boolean
-}
-const PubTable: React.FC<IProps> = (props: IProps) => {
-  const dispatch = useDispatch();
-  const [data, setData] = useState<arr[]>([])
-  const [show, setShow] = useState<boolean>(true)
-  const [idex, setIndex] = useState<number>(0)
-
-
-
-  const setShowType = (idx: number) => {
-    setShow(!show)
-    setIndex(idx)
-  }
-  const setDataList = () => {
-
-    let data: any = []
-    if (props.keys == 'sk') {
-      data = [
-        { title: '水库总数', num: `${props.count?.sk?.total}座`, show: true },
-        { title: '总库容', num: `${props.count?.sk?.totcap}万m³` },
-        { title: props.count?.sk?.maxres, num: '县内最大水库' },
-      ]
-    } else if (props.keys == 'sdz') {
-      data = [
-        { title: '电站总数', num: `${props.count?.sdz?.total}座`, show: true },
-        { title: '装机总容量', num: `${props.count?.sdz?.totcap}万kW` },
-        { title: '多年平均发电总量', num: `${props.count?.sdz?.avgelect.toFixed(4)}GW.h` },
-      ]
-    } else if (props.keys == 'ysgc') {
-      data = [
-        { title: '工程总数', num: `${props.count?.ysgc?.total}条`, show: false },
-        { title: '渠道总长', num: `${props.count?.ysgc?.tlong}米` },
-      ]
-    } else if (props.keys == 'st') {
-      data = [
-        { title: '塘(堰)坝总数', num: `${props.count?.st?.total}座`, show: true },
-        { title: '总容积', num: `${props.count?.st?.txhst}m³` },
-      ]
-    }
-    setData(data)
-  }
-  useEffect(() => {
-    setDataList()
-
-
-    return () => {
-      dispatch.runtime.closeFeaturePopAll()
-    }
-  }, [props])
-
-
-  const flyToAdcd = (record: any) => {
-    dispatch.map.setLayerVisible({ [props.type.layer]: true });
-
-    const { lgtd, lttd, elev, adcd } = record;
-    if (lgtd && lttd) {
-      if(props.type.layer==='ShuiKuLayer'){
-        dispatch.runtime.setFeaturePop({ type: 'DingWeiFu', data: record, lgtd: record.lgtd, lttd: record.lttd, }); 
-      }else{
-        dispatch.runtime.setFeaturePop({ type: props.type.pops, data: record, lgtd: record.lgtd, lttd: record.lttd, });
-      }
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 12.2,
-        pitch: 60,
-      });
-    } else {
-      message.info('缺失经纬度');
-    }
-  };
-
-
-  return (
-    <div className='pubTable'>
-      {data.map((item, index) => {
-        return <div>
-          <div className='listItem flex flexsbc'>
-
-            <div className='flex flexac' style={{width:200}} onClick={() => {
-              if(props.type.pops!=='yinshuigongcheng' || index!==0){
-                return
-              }
-              const data = props.data?.[0]
-              dispatch.runtime.setFeaturePop({
-                id: data.wadiName,
-                type: 'yinshuigongcheng',
-                data: data,
-                lgtd: 109.10271856170048,
-                lttd: 29.64073449479511,
-              })
-              // dispatch.runtime.setFeaturePop({ type: 'DingWeiFu', data: data, lgtd:109.10271856170048, lttd:29.64073449479511, }); 
-              dispatch.runtime.setCameraTarget({
-                center: ['109.10271856170048', '29.64073449479511', null],
-                zoom: 12.2,
-                pitch: 60,
-              });
-            }}>
-              <img src={require(`../../../../../../assets/images/${props.img}.png`)} alt="" />
-              {item.title}</div>
-            <div className='flex flexac'>
-              <div className='blueColor' style={{ marginRight: 10 }}>{item.num}</div>
-              {item.show && <div>
-                {!show && <UpCircleOutlined onClick={() => setShowType(index)} />}
-                {show && <DownCircleOutlined onClick={() => setShowType(index)} />}
-              </div>}
-            </div>
-
-          </div>
-          {((!show) && idex == index) &&
-            <div style={{margin:'5px 0'}}>
-              <Table
-                dataSource={props.data}
-                columns={props.columns}
-                scroll={{ y: 300 }}
-                pagination={false}
-                onRow={(record: any) => {
-                  return {
-                    onClick: (event: any) => flyToAdcd(record),
-                  };
-                }}
-              />
-            </div>
-          }
-        </div>
-      })}
-    </div>
-  )
-}
-export default PubTable
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/hydropowerStation.tsx b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/hydropowerStation.tsx
deleted file mode 100644
index 9cd999c..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/hydropowerStation.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import React, {useEffect, useState} from "react";
-import {useSelector, useDispatch} from "react-redux";
-import { sdzList } from "../../http/rightHtpp";
-import PubTable from "./components/pubTable";
-import './index.less'
-import moment from "moment"
-type IProps = {
-    keys: string;
-    countT:any
-  }
-
-const HydropowerStation: React.FC<IProps> = (props:IProps) => {
-    const dispatch = useDispatch();
-    const [data,setData] = useState([{img:'',title:''}])
-    const [keyItem,setKeyItem] = useState(0)
-    const columns = [
-        {
-          title: '序号',
-          render: (text: string, record: object, index: number) => `${index + 1}`,
-          align: 'center' as const,
-        },
-        {
-          title: '水电站名称',
-          dataIndex: 'hystName',
-          key: 'hystName',
-          align: 'center' as const,
-    
-        },
-        {
-          title: ()=>{return <div className='headerCell'>
-          <div className='afer'>装机容量</div>
-          <div className='before'>(万kW)</div>
-         </div>},
-          dataIndex: 'totInsCap',
-          render: (text: string, record: any, index: number) => `${record.totInsCap}`,
-          key: 'totInsCap',
-          align: 'center' as const,
-        },
-        {
-          title: '建成年份',
-          dataIndex: 'compDate',
-          render: (text: string, record: any, index: number) => `${moment(record.compDate).format('YYYY')}`,
-          key: 'compDate',
-          align: 'center' as const,
-    
-        },
-      ];
-      const getInfo = async()=>{
-        
-        
-        const res = await sdzList()
-        if(res.data && res.data.length>0){
-          const list = res.data.map((i:any)=>{
-            return {
-              ...i,
-              lgtd:i.hystLong,
-              lttd:i.hystLat
-            }
-          })
-          console.log(list,'sdz');
-          setData(list)
-        }
-
-    }
-    useEffect(()=>{
-        getInfo()
-        dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        dispatch.map.setLayerVisible({'ShuiDianZhanLayer': true});
-        dispatch.map.setLayerVisible({'AdcdLayer': true});
-        return ()=>{
-            dispatch.map.setLayerVisible({'ShuiDianZhanLayer': false});
-            dispatch.map.setLayerVisible({'AdcdLayer': true});
-        }
-    },[])
-    return(
-        <div className='reservoir'>
-            <div className='title flex flexac'>
-                <BarChartOutlined style={{fontSize:'14px',marginRight:'5px'}}/>
-                统计
-                </div>
-             <PubTable img='station' keys={props.keys} data={data}  count={props.countT} columns={columns} type={{layer:'ShuiDianZhanLayer',pops:'shuidianzhan'}}/> 
-        </div>
-    )
-}
-export default HydropowerStation
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.css b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.css
deleted file mode 100644
index 316a57a..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.reservoir .item > div {
-  width: 23%;
-}
-.reservoir .item img {
-  height: 18px;
-  width: 18px;
-}
-.reservoir .item .blueColor {
-  color: #3749c7;
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.less b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.less
deleted file mode 100644
index 8f615b7..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.reservoir{
-    .item{
-       >div{width: 23%;}
-        img{
-            height:18px;
-            width: 18px;
-        }
-        .blueColor{
-            color:#3749c7
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.tsx b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.tsx
deleted file mode 100644
index fa7cb2e..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/index.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, { useEffect, useState } from "react";
-import HydropowerStation from "./hydropowerStation";
-import {useSelector, useDispatch} from "react-redux";
-import "./index.less"
-import Pond from "./pond";
-import Reservoir from "./reservoir";
-import WaterDiversionEngineering from "./waterDiversionEngineering";
-
-type IProps = {
-    keys: string,
-    countT: any
-}
-
-const WaterConservancyProject: React.FC<IProps> = (props: IProps) => {
-    const [data, setData] = useState([{ img: '', title: '' }])
-    const [keyItem, setKeyItem] = useState(0)
-    const dispatch = useDispatch();
-
-    useEffect(() => {
-        // console.log(props,'我是props');
-        dispatch.map.setZhongxingSk(false)
-        // dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        return ()=>{
-            dispatch.map.setZhongxingSk(true) 
-            dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-        }
-    }, [])
-    return (
-        <div className='rightContent'>
-            {props.keys === 'sk' && <Reservoir countT={props.countT} keys={props.keys}/>}
-            {props.keys === 'sdz' && <HydropowerStation countT={props.countT} keys={props.keys}/>}
-            {props.keys === 'ysgc' && <WaterDiversionEngineering countT={props.countT} keys={props.keys}/>}
-            {props.keys === 'st' && <Pond countT={props.countT} keys={props.keys}/>}
-        </div>
-    )
-}
-export default WaterConservancyProject
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/pond.tsx b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/pond.tsx
deleted file mode 100644
index 939e5c2..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/pond.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import React, {useEffect, useState} from "react";
-import {useSelector, useDispatch} from "react-redux";
-import { tybList } from "../../http/rightHtpp";
-import PubTable from "./components/pubTable";
-import './index.less'
-type IProps = {
-    keys: string,
-    countT: any
-
-  }
-
-const Pond: React.FC<IProps> = (props:IProps) => {
-    const dispatch = useDispatch();
-    const [data,setData] = useState([{img:'',title:''}])
-    const [keyItem,setKeyItem] = useState(0)
-    const columns = [
-        {
-          title: '序号',
-          render: (text: string, record: object, index: number) => `${index + 1}`,
-          align: 'center' as const,
-          width:50
-        },
-        {
-          title: '名称',
-          dataIndex: 'damname',
-          key: 'damname',
-          align: 'center' as const,
-          width:100,
-        },
-        {
-          title: '容积(m³)',
-          dataIndex: 'xhst',
-          key: 'xhst',
-          align: 'center' as const,
-    
-        },
-        {
-          title: '所在政区',
-          dataIndex: 'adnm',
-          key: 'adnm',
-          align: 'center' as const,
-          ellipsis:true
-        },
-      ];
-      const getInfo = async()=>{
-        
-        
-        const res = await tybList()
-        console.log(res);
-        if(res && res.data){
-          setData(res.data)
-        }
-    }
-    useEffect(()=>{
-        getInfo()
-        dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        dispatch.map.setLayerVisible({'TangYanBaLayer': true});
-        return ()=>{
-            dispatch.map.setLayerVisible({'TangYanBaLayer': false});
-        }
-    },[])
-    return(
-        <div className='reservoir'>
-            <div className='title flex flexac'>
-                <BarChartOutlined style={{fontSize:'14px',marginRight:'5px'}}/>
-                统计
-                </div>
-            <PubTable img='pond' keys={props.keys} count={props.countT} data={data} columns={columns} type={{layer:'TangYanBaLayer',pops:'tangyanba'}}/>
-        </div>
-    )
-}
-export default Pond
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/reservoir.tsx b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/reservoir.tsx
deleted file mode 100644
index 55e2b72..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/reservoir.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import React, {useEffect, useState} from "react";
-import {useSelector, useDispatch} from "react-redux";
-import { skcount, skList } from "../../http/rightHtpp";
-import PubTable from "./components/pubTable";
-import './index.less'
-type IProps = {
-    keys: string;
-    countT:any
-  }
-type objType={
-    scal1:number,
-    scal3:number,
-    scal4:number,
-    scal5:number
-}
-const Reservoir: React.FC<IProps> = (props:IProps) => {
-    const dispatch = useDispatch();
-    const [data,setData] = useState([{img:'',title:''}])
-    const [keyItem,setKeyItem] = useState(0)
-    const [countNum,setCount] = useState<objType>({
-        scal1:0,
-    scal3:0,
-    scal4:0,
-    scal5:0
-    })
-    const mapOb: { [key: string]: any }={
-        1:'大(1)型',
-        2:'大(2)型',
-        3:'中型',
-        4:'小(1)型',
-        5:'小(2)型',
-        9:'其他'
-    }
-    const columns = [
-        {
-          title: '序号',
-          render: (text: string, record: object, index: number) => `${index + 1}`,
-          align: 'center' as const,
-        },
-        {
-          title: '水库名称',
-          dataIndex: 'resName',
-          key: 'resName',
-          align: 'center' as const,
-    
-        },
-        {
-          title: '水库规模',
-          dataIndex: 'engScal',
-          render: (text: string, record: any, index: number) => `${mapOb[record.engScal]}`,
-          key: 'engScal',
-          align: 'center' as const,
-    
-        },
-        {
-          title: '库容(万m³)',
-          dataIndex: 'totCap',
-          key: 'totCap',
-          align: 'center' as const,
-    
-        },
-      ];
-    const getInfo = async()=>{
-        
-        
-        const res = await skList()
-        console.log(res);
-        setData(res.data)
-
-    }
-    useEffect(()=>{
-        getInfo()
-        dispatch.map.setZhongxingSk(false)
-        dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-        dispatch.map.setLayerVisible({'AdcdLayer': true});
-        return ()=>{
-            dispatch.map.setZhongxingSk(true)
-            // dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-            dispatch.map.setLayerVisible({'AdcdLayer': false});
-        }
-    },[])
-    return(
-        <div className='reservoir'>
-            <div className='title flex flexac'>
-                <BarChartOutlined style={{fontSize:'14px',marginRight:'5px'}}/>
-                统计
-                </div>
-            <div className='flex flexsbc item'>
-                <div className='flex flexcc flexfc' >
-                <img src={require('../../../../../assets/images/big.png')} alt="" height='18px'/>
-                    <span>{props.countT?.[props.keys]?.scal2}座</span>
-                    <span>大(2)型</span>
-                </div>
-                <div className='flex flexcc flexfc' >
-                <img src={require('../../../../../assets/images/mid.png')} alt="" height='18px'/>
-                    <span>{props.countT?.[props.keys]?.scal3}座</span>
-                    <span>中型</span>
-                </div>
-                <div className='flex flexcc flexfc'>
-                <img src={require('../../../../../assets/images/small1.png')} alt="" height='18px'/>
-                    <span>{props.countT?.[props.keys]?.scal4}座</span>
-                    <span>小(1)型</span>
-                </div>
-                <div className='flex flexcc flexfc'>
-                <img src={require('../../../../../assets/images/small2.png')} alt="" height='18px' />
-                    <span>{props.countT?.[props.keys]?.scal5}座</span>
-                    <span>小(2)型</span>
-                </div>
-            </div>
-            <PubTable img='mid' keys={props.keys} data={data} count={props.countT} columns={columns} type={{layer:'ShuiKuLayer',pops:'shuiku'}} />
-        </div>
-    )
-}
-export default Reservoir
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/waterDiversionEngineering.tsx b/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/waterDiversionEngineering.tsx
deleted file mode 100644
index 6ddafde..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/waterConservancyProject/waterDiversionEngineering.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import moment from "moment";
-import React, {useEffect, useState} from "react";
-import {useSelector, useDispatch} from "react-redux";
-import { ysgcList } from "../../http/rightHtpp";
-import PubTable from "./components/pubTable";
-import './index.less'
-type IProps = {
-    keys: string,
-    countT:any
-  }
-
-const WaterDiversionEngineering: React.FC<IProps> = (props:IProps) => {
-    const dispatch = useDispatch();
-    const [data,setData] = useState([{img:'',title:''}])
-    const [keyItem,setKeyItem] = useState(0)
-    const columns = [
-        {
-          title: '序号',
-          render: (text: string, record: object, index: number) => `${index + 1}`,
-          align: 'center' as const,
-        },
-        {
-          title: '名称',
-          dataIndex: 'wadiName',
-          key: 'wadiName',
-          align: 'center' as const,
-    
-        },
-        {
-          title: '工程规模',
-          dataIndex: 'engScal',
-          key: 'engScal',
-          align: 'center' as const,
-    
-        },
-        {
-          title: '修建时间',
-          dataIndex: 'buildDate',
-          key: 'buildDate',
-          render: (text: string, record: any, index: number) => `${moment(record.buildDate).format('YYYY-DD')}`,
-          align: 'center' as const,
-    
-        },
-      ];
-      const getInfo = async()=>{
-        
-        
-        const res = await ysgcList()
-        console.log(res,'sdz');
-        setData(res.data)
-
-    }
-    useEffect(()=>{
-        getInfo()
-        dispatch.map.setLayerVisible({'ShuiKuLayer': false});
-        dispatch.map.setLayerVisible({'YsgcLayer': true});
-        return ()=>{
-            dispatch.map.setLayerVisible({'YsgcLayer': false});
-        }
-    },[])
-    return(
-        <div className='reservoir'>
-            <div className='title flex flexac'>
-                <BarChartOutlined style={{fontSize:'14px',marginRight:'5px'}}/>
-                统计
-                </div>
-            <PubTable img='waterDivers' data={data} keys={props.keys} columns={columns} count={props.countT} type={{layer:'YsgcLayer',pops:'yinshuigongcheng'}}/>
-        </div>
-    )
-}
-export default WaterDiversionEngineering
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/cimateCharacteristics.tsx b/src/views/Home/homePanelsLayoutXL/right/weather/components/cimateCharacteristics.tsx
deleted file mode 100644
index c5eb6ad..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/cimateCharacteristics.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Table } from "antd";
-import React, {useEffect, useState} from "react";
-import './feature.less'
-import type { ColumnsType } from 'antd/es/table';
-import { byjzInfo } from "../../../http/rightHtpp";
-
-type obj={
-    content:string,
-    time?:string,
-    key:string
-}
-interface DataType {
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-    address1: string;
-  }
-const CimateCharacteristics: React.FC = (IProps) => {
-    const [idex,setIndex] = useState<number>(0)
-    const [data,setData] = useState([])
-
-      
-      const columns: ColumnsType<DataType> = [
-        {
-          title: ()=>{return <div >时段
-         </div>},
-          dataIndex: 'tmTp',
-          key: 'tmTp',
-          align:'center',
-          render: text => <span>{text}h</span>,
-          width:40
-        },
-        {
-          title: ()=>{return <div >雨量
-          </div>},
-          dataIndex: 'drp',
-          key: 'drp',
-          render: text => <span >{text}mm</span>,
-          align:'center'
-        },
-        {
-          title: ()=>{return <div >发生时段
-          </div>},
-          dataIndex: 'happenTm',
-          key: 'happenTm',
-          render: text => <div style={{textAlign:'left',marginLeft:10}}>{text}</div>,
-          align:'center'
-        },
-        {
-          title: ()=>{return <div >政区
-          </div>},
-          dataIndex: 'happenAdnm',
-          key: 'happenAdnm',
-          align:'center',
-          width:50
-        },
-      ];
-      const mapOb:{[key:number]:any}={
-        0:'xf',
-        1:'hb'
-      }
-      const selectAddress=(idex:number)=>{
-        setIndex(idex)
-        getInfo(mapOb[idex])
-      }
-      const getInfo = async(type:number)=>{
-        const res = await byjzInfo(type)
-        setData(res.data)
-      }
-    useEffect(()=>{
-      getInfo(0)
-    },[])
-    return(
-        <div className='cimateCharacteristics'>
-           <div className='flex flexsac tabs'>
-               <div onClick={()=>selectAddress(0)} className={idex === 0?'active':''}>咸丰县</div>
-               <div onClick={()=>selectAddress(1)} className={idex === 1?'active':''}>湖北省</div>
-           </div>
-           <Table columns={columns} dataSource={data} pagination={false}/>
-
-        </div>
-    )
-}
-export default CimateCharacteristics
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.css b/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.css
deleted file mode 100644
index faf8b66..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.feature {
-  margin: 5px 0;
-  padding: 0 15px;
-  background-color: #e9f5fe;
-  border-radius: 5px;
-  height: 30px;
-}
-.cimateCharacteristics .tabs {
-  height: 35px;
-  background-color: #d7e0ff;
-  margin-bottom: 5px;
-}
-.cimateCharacteristics .tabs .active {
-  color: #0079fe;
-  border-bottom: 1px solid #0079fe;
-}
-.cimateCharacteristics .tabs > div {
-  flex: 1;
-  text-align: center;
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.less b/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.less
deleted file mode 100644
index e58bcbf..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.less
+++ /dev/null
@@ -1,23 +0,0 @@
-.feature{
-    margin: 5px 0;
-    padding: 0 15px;
-    background-color: #e9f5fe;
-    border-radius: 5px;
-    height: 30px;
-}
-.cimateCharacteristics{
-    .tabs{
-        height: 35px;
-        background-color: #d7e0ff;
-        margin-bottom: 5px;
-        .active{
-            color: #0079fe;
-            border-bottom: 1px solid #0079fe;
-        }
-        >div{
-            flex:1;
-            text-align: center;
-        }
-    }
-}
-
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.tsx b/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.tsx
deleted file mode 100644
index cbef3d1..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/feature.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import moment from "moment";
-import React, {useEffect, useState} from "react";
-import { qhtdInfo } from "../../../http/rightHtpp";
-import './feature.less'
-
-type IProps = {
-    qhtdData:any
-}
-type obj={
-    content:string,
-    time?:string,
-    key:string
-}
-
-const Feature: React.FC<IProps> = (props:IProps) => {
-    const [data,setData] = useState<obj[]>([])
-    const getInfo = async()=>{
-        setData([
-            {content:`${props.qhtdData.avgTmp}℃`,key:'历年平均气温'},
-            {content:`${props.qhtdData.maxTmp}℃`,key:'极端最高气温',time:moment(props.qhtdData.maxTmpDate).format('YYYY-MM-DD')},
-            {content:`${props.qhtdData.minTmp}℃`,key:'极端最低气温',time:moment(props.qhtdData.minTmpDate).format('YYYY-MM-DD')},
-            {content:`${props.qhtdData.avgSunshineHour}`,key:'历年平均日照时数'},
-            {content:`${props.qhtdData.minAvgWindSpeed}-${props.qhtdData.maxAvgWindSpeed}米/秒`,key:'多年平均风速'},
-            {content:`${props.qhtdData.avgDye}mm`,key:'多年平均蒸发量'},
-            {content:`${props.qhtdData.minHumidity}-${props.qhtdData.maxHumidity}%`,key:'相对湿度'},
-        ]
-        )
-    }
-    useEffect(()=>{
-        getInfo()
-    },[props])
-    return(
-        <div>
-           {data.map(item=>{
-               return <div className='flex flexsbc feature'>
-                   <span>{item.key}</span>
-                   <span className='blueColor'>{item.time}</span>
-                   <span className="blueColor">{item.content}</span>
-               </div>
-           })}
-        </div>
-    )
-}
-export default Feature
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainfallPeriod.tsx b/src/views/Home/homePanelsLayoutXL/right/weather/components/rainfallPeriod.tsx
deleted file mode 100644
index 461c02c..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainfallPeriod.tsx
+++ /dev/null
@@ -1,265 +0,0 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import './feature.less'
-import ReactEcharts from 'echarts-for-react/lib/index';
-import { Button, Modal } from "antd";
-
-
-type obj = {
-  content: string,
-  time?: string,
-  key: string
-}
-type IProps = {
-  jysdfbData: any
-}
-const RainfallPeriod: React.FC<IProps> = (props: IProps) => {
-  const [data, setData] = useState<any>([])
-  const [dataP, setDataP] = useState<any>([])
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [height, setHeight] = useState(200);
-
-  const [isModalOpen1, setIsModalOpen1] = useState(false);
-
-
-  let myChart:any = null;
- 
-  const showModal = () => {
-    setIsModalOpen(true);
-    setIsModalOpen1(true)
-    setHeight(300)
-    // setTimeout(()=>{
-    //   setIsModalOpen1(true)
-    // })
-  };
- 
-
- 
-  const handleCancel = () => {
-    setIsModalOpen(false);
-    
-    myChart && myChart.resize(); // 在 Modal 关闭前调用 resize
-  };
-
-  const option = (data: any) => {
-    return {
-      tooltip: {
-        trigger: 'axis',
-        position: ['20%', '50%'],
-        formatter: function (params:any) {
-         let num = params[0].value.name.replace(/\D/g, '')
-         const dom =`<div>${num + '月'}</div><div>${params[0].seriesName}:${params[0].value.value}mm</div><div>${params[1].seriesName}:${params[1].value.value}mm</div>`
-         return dom
-      }
-      },
-      legend: {
-        data: ['咸丰多年逐月平均降水量', '全省多年逐月平均降水量'],
-        type:'scroll',
-        right:50,
-        left:50,
-        // itemWidth:'12',
-        // itemHeight:'12',
-        itemGap:10
-      },
-      toolbox: {
-        feature: {
-            myTool1: {
-                show: true,
-                icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891',
-                onclick: function (){
-                  showModal()
-                }
-            },
-        }
-    },
-      grid: {
-        right: '10',
-        top: 30
-      },
-      calculable: true,
-      dataset: [
-        { source: data },
-        { source: dataP }
-      ]
-      ,
-      xAxis:
-      {
-        type: 'category',
-        axisLabel: {
-          formatter: function (value: any) {
-            let num = value.replace(/\D/g, '')
-            let str = ''
-            if (num < 10) {
-              str = '0' + num
-            } else {
-              str = num
-            }
-            return str + '月';
-          }
-        }
-      }
-      ,
-      yAxis: [
-        {
-          name: 'mm',
-          type: 'value'
-        }
-      ],
-      series: [
-        {
-          name: '咸丰多年逐月平均降水量',
-          type: 'bar',
-          datasetIndex: 0,
-          encode: {
-            x: 'name',
-            y: 'value'
-          },
-          itemStyle: {
-            color: 'skyblue'
-          }
-        },
-        {
-          name: '全省多年逐月平均降水量',
-          type: 'bar',
-          datasetIndex: 1,
-          encode: {
-            x: 'name',
-            y: 'value'
-          },
-          itemStyle: {
-            color: 'blue'
-          }
-        },
-      ]
-    }
-  };
-
-  const option1 = (data: any) => {
-    return {
-      tooltip: {
-        trigger: 'axis',
-        position: ['20%', '50%'],
-        formatter: function (params:any) {
-         let num = params[0].value.name.replace(/\D/g, '')
-         const dom =`<div>${num + '月'}</div><div>${params[0].seriesName}:${params[0].value.value}mm</div><div>${params[1].seriesName}:${params[1].value.value}mm</div>`
-         return dom
-      }
-      },
-      legend: {
-        data: ['咸丰多年逐月平均降水量', '全省多年逐月平均降水量'],
-    
-      },
-
-      grid: {
-        right: '10',
-        top: 30
-      },
-      calculable: true,
-      dataset: [
-        { source: data },
-        { source: dataP }
-      ]
-      ,
-      xAxis:
-      {
-        type: 'category',
-        axisLabel: {
-          formatter: function (value: any) {
-            let num = value.replace(/\D/g, '')
-            let str = ''
-            if (num < 10) {
-              str = '0' + num
-            } else {
-              str = num
-            }
-            return str + '月';
-          }
-        }
-      }
-      ,
-      yAxis: [
-        {
-          name: 'mm',
-          type: 'value'
-        }
-      ],
-      series: [
-        {
-          name: '咸丰多年逐月平均降水量',
-          type: 'bar',
-          datasetIndex: 0,
-          encode: {
-            x: 'name',
-            y: 'value'
-          },
-          itemStyle: {
-            color: 'skyblue'
-          }
-        },
-        {
-          name: '全省多年逐月平均降水量',
-          type: 'bar',
-          datasetIndex: 1,
-          encode: {
-            x: 'name',
-            y: 'value'
-          },
-          itemStyle: {
-            color: 'blue'
-          }
-        },
-      ]
-    }
-  };
-
-
-  const handData = () => {
-    let dataKey = Object.keys(props.jysdfbData)
-    let arr = dataKey.map(item => {
-      return { name: item, value: props.jysdfbData[item] }
-    }).filter(item => item.name.includes('avg'))
-    let data1: any = []
-    let data2: any = []
-    arr.forEach(item => {
-      if (item.name.indexOf('p') !== -1) {
-        const obj ={
-          name:item.name.replace('p', ''),
-          value:item.value
-        }
-        data1.push(obj)
-      } else {
-        data2.push(item)
-      }
-    })
-    console.log(data1,data2);
-    
-    setDataP(data1)
-    setData(data2)
-  }
-  useEffect(() => {
-    if(props.jysdfbData){
-      handData()
-    }
-  }, [])
-  return (
-    <div>
-      <ReactEcharts
-        option={option(data)}
-        style={{ height: '15rem' }}
-      />
-      <div id='modelY'>
-      <Modal key={`${new Date()}`} centered={true} open={isModalOpen} width={650} onCancel={handleCancel} zIndex={2000} footer={null} >
-       
-        <ReactEcharts
-          option={option1(data)}
-          key={`${isModalOpen}`}
-          style={{width:600,height:400}}
-          notMerge={true}
-          lazyUpdate
-        />
-      </Modal>
-      </div>
-       
-    </div>
-  )
-}
-export default RainfallPeriod
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.css b/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.css
deleted file mode 100644
index 3a6fe1b..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.rainstormFrequency .headerCell {
-  border-top: 43px #f2f3f5 solid;
-  /*上边框宽度等于表格第一行行高*/
-  width: 0px;
-  /*让容器宽度为0*/
-  height: 0px;
-  /*让容器高度为0*/
-  border-left: 70px #f2f3f5 solid;
-  /*左边框宽度等于表格第一行第一格宽度*/
-  position: relative;
-}
-.rainstormFrequency .headerCell .afer {
-  position: absolute;
-  top: -40px;
-  left: -28px;
-  width: 28px;
-}
-.rainstormFrequency .headerCell .before {
-  position: absolute;
-  top: -20px;
-  left: -65px;
-  width: 28px;
-}
-.rainstormFrequency .headerCell::after {
-  content: '';
-  position: absolute;
-  width: 1px;
-  height: 76px;
-  top: -58px;
-  left: -36px;
-  background-color: #ccc;
-  display: block;
-  transform: rotate(-59deg);
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.less b/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.less
deleted file mode 100644
index 6d61b6e..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.less
+++ /dev/null
@@ -1,41 +0,0 @@
-.rainstormFrequency{
-
-.headerCell {
-        // 画三角形
-        border-top: 43px #f2f3f5 solid;
-        /*上边框宽度等于表格第一行行高*/
-        width: 0px;
-        /*让容器宽度为0*/
-        height: 0px;
-        /*让容器高度为0*/
-        border-left: 70px #f2f3f5 solid;
-        /*左边框宽度等于表格第一行第一格宽度*/
-        position: relative;
-        .afer {
-            position: absolute;
-            top: -40px;
-            left: -28px;
-            width: 28px;
-            // color: #666666;        
-        }
-        .before {
-            position: absolute;
-            top: -20px;
-            left: -65px;
-            width: 28px;
-            // color: #666666;
-        }
-        // 伪元素画分割线
-        &::after {
-            content: '';
-            position: absolute;
-            width: 1px;
-            height: 76px;
-            top: -58px;
-            left: -36px;
-            background-color: #ccc;
-            display: block;
-            transform: rotate(-59deg);
-        }
-      }
-    }
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.tsx b/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.tsx
deleted file mode 100644
index c31762e..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/components/rainstormFrequency.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Table } from "antd";
-import React, {useEffect, useState} from "react";
-import './rainstormFrequency.less'
-import styler from './rainstormFrequency.less'
-
-import type { ColumnsType } from 'antd/es/table';
-import { byplInfo } from "../../../http/rightHtpp";
-
-type obj={
-    content:string,
-    time?:string,
-    key:string
-}
-interface DataType {
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-    address1: string;
-  }
-const RainstormFrequency: React.FC = (IProps) => {
-  const [data,setData]=useState()
-      const columns: ColumnsType<DataType> = [
-        {
-          title: ()=>{return <div className='headerCell'>
-            <div className='afer'>频率</div>
-            <div className='before'>时段</div>
-           </div>},
-          dataIndex: 'tmTp',
-          key: 'tmTp',
-          render: text => <span>{text}h</span>,
-          align:'center'
-        },
-        {
-          title: ()=>{return <div>
-          <div className='afer'>5年</div>
-          <div className='before'>一遇</div>
-         </div>},
-          dataIndex: 'per20',
-          key: 'per20',
-          align:'center'
-        },
-        {
-          title: ()=>{return <div>
-            <div className='afer'>10年</div>
-            <div className='before'>一遇</div>
-           </div>},
-          dataIndex: 'per10',
-          key: 'per10',
-          align:'center'
-        },
-        {
-          title: ()=>{return <div>
-            <div className='afer'>20年</div>
-            <div className='before'>一遇</div>
-           </div>},
-          dataIndex: 'per5',
-          key: 'per5',
-          align:'center'
-        },
-        {
-          title: ()=>{return <div>
-            <div className='afer'>50年</div>
-            <div className='before'>一遇</div>
-           </div>},
-          dataIndex: 'per2',
-          key: 'per2',
-          align:'center'
-        },
-        {
-          title: ()=>{return <div>
-            <div className='afer'>100年</div>
-            <div className='before'>一遇</div>
-           </div>},
-          dataIndex: 'per1',
-          key: 'per1',
-          align:'center'
-        },
-      ];
-      const getInfo = async()=>{
-        const res =await byplInfo()
-        console.log(res,'--数据');
-        setData(res.data)
-      }
-    useEffect(()=>{
-      getInfo()
-    },[])
-    return(
-        <div className='rainstormFrequency'>
-           <Table columns={columns} dataSource={data} pagination={false}/>
-
-        </div>
-    )
-}
-export default RainstormFrequency
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/weather.css b/src/views/Home/homePanelsLayoutXL/right/weather/weather.css
deleted file mode 100644
index 922e44f..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/weather.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.weatherContent {
-  font-size: 14px;
-  box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.34901961);
-  margin-bottom: 30px;
-  position: relative;
-}
-.weatherContent .title {
-  width: 155px;
-  height: 46px;
-  background-image: url('../../../../../assets/images/titleback.png');
-  background-repeat: no-repeat;
-  background-size: cover;
-  color: #fff;
-  padding-left: 8px ;
-}
-.weatherContent .message {
-  background-color: #e9f5fe;
-  color: #000;
-  padding: 15px;
-  border-radius: 5px;
-}
-.weatherContent .icon {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-.blueColor {
-  color: #3749c7;
-}
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/weather.less b/src/views/Home/homePanelsLayoutXL/right/weather/weather.less
deleted file mode 100644
index fa2b93e..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/weather.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.weatherContent{
-    font-size: 14px;
-    box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.349019607843137);
-    margin-bottom: 30px;
-    position: relative;
-    .title{
-        width: 155px;
-        height: 46px;
-        background-image: url('../../../../../assets/images/titleback.png');
-        background-repeat:no-repeat;
-        background-size: cover;
-        color: #fff;
-        padding-left:8px ;
-    }
-    .message{
-      background-color: #e9f5fe;
-      color: #000;
-      padding: 15px;
-      border-radius: 5px;
-    }
-    .icon{
-        position: absolute;
-        right: 15px;
-        top: 10px;
-    }
-}
-.blueColor{
-    color:#3749c7
-}
\ No newline at end of file
diff --git a/src/views/Home/homePanelsLayoutXL/right/weather/weather.tsx b/src/views/Home/homePanelsLayoutXL/right/weather/weather.tsx
deleted file mode 100644
index e3e58f6..0000000
--- a/src/views/Home/homePanelsLayoutXL/right/weather/weather.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { BarChartOutlined, DownCircleOutlined, UpCircleOutlined } from "@ant-design/icons";
-import { title } from "process";
-import { stringify } from "querystring";
-import React, { useEffect, useState } from "react";
-import { jysdfbInfo, qhtdInfo } from "../../http/rightHtpp";
-import PubTable from "../components/pubTable";
-import CimateCharacteristics from "./components/cimateCharacteristics";
-import Feature from "./components/feature";
-import RainfallPeriod from "./components/rainfallPeriod";
-import RainstormFrequency from "./components/rainstormFrequency";
-import "./weather.less"
-
-type IProps = {
-    key: Number;
-}
-type arr = {
-    content?: string,
-    title: string,
-    key: number
-}
-const Weather: React.FC = (IProps) => {
-    const [data, setData] = useState<arr[]>([])
-    const [keyItem, setKeyItem] = useState(0)
-    const [show, setShow] = useState<boolean>(false)
-    const [idex, setIndex] = useState<number>(0)
-    const [qhtdData, setQhtdData] = useState({})
-    const [jysdfbData, setJysdfbData] = useState({})
-
-
-
-    const setShowType = (idx: number) => {
-        setShow(!show)
-        setIndex(idx)
-        if(idx != idex){
-            setIndex(idx)
-          }else{
-            setIndex(999)
-          }
-    }
-    const getInfo = async () => {
-        const { data } = await qhtdInfo()
-        if(data){
-            setQhtdData(data)
-        }
-        const res = await jysdfbInfo()
-        if(res.code == 200){
-            setJysdfbData(res.data)
-        }
-        setData([
-            { content: data.feature, title: '气候特点', key: 1 },
-            { content: res.data.feature, title: '降雨时段分布', key: 2 },
-            { title: '暴雨极值', key: 3, },
-            { title: '暴雨频率(mm)', key: 4, },
-        ])
-    }
-    useEffect(() => {
-        getInfo()
-    }, [])
-    return (
-        <div>
-            {data.map((item, index) => {
-                return <div className='weatherContent'>
-                    <div className='title flex flexac'>
-                        <BarChartOutlined style={{ fontSize: '14px', marginRight: '5px' }} />
-                        {item.title}
-
-                    </div>
-                    {!item.content && <div className='icon'>
-                        {(idex === item.key) && <UpCircleOutlined onClick={() => setShowType(item.key)} />}
-                        {!(idex === item.key) && <DownCircleOutlined onClick={() => setShowType(item.key)} />}
-                    </div>}
-                    {item.content && <div className='message'>
-                        {item.content}
-                        <div style={{ float: 'right' }}>
-                            {(idex === item.key) && <UpCircleOutlined onClick={() => setShowType(item.key)} />}
-                            {!(idex === item.key) && <DownCircleOutlined onClick={() => setShowType(item.key)} />}
-                        </div>
-                    </div>}
-                    {(idex === item.key) && <div>
-                        {idex === 1  && <Feature qhtdData={qhtdData} />}
-                        {idex === 2 && <RainfallPeriod jysdfbData={jysdfbData} />}
-                        {idex === 3  && <CimateCharacteristics />}
-                        {idex === 4  && <RainstormFrequency />}
-                    </div>}
-                </div>
-            })}
-        </div>
-
-
-    )
-}
-export default Weather
\ No newline at end of file
diff --git a/src/views/Home/img/DiQiu.png b/src/views/Home/img/DiQiu.png
deleted file mode 100644
index 92f1c9e..0000000
Binary files a/src/views/Home/img/DiQiu.png and /dev/null differ
diff --git a/src/views/Home/img/ZhongXin.png b/src/views/Home/img/ZhongXin.png
deleted file mode 100644
index d0e2fd8..0000000
Binary files a/src/views/Home/img/ZhongXin.png and /dev/null differ
diff --git a/src/views/Home/img/fangda.png b/src/views/Home/img/fangda.png
deleted file mode 100644
index 772cebf..0000000
Binary files a/src/views/Home/img/fangda.png and /dev/null differ
diff --git a/src/views/Home/img/shouqi.png b/src/views/Home/img/shouqi.png
deleted file mode 100644
index a42694e..0000000
Binary files a/src/views/Home/img/shouqi.png and /dev/null differ
diff --git a/src/views/Home/img/shouqi2.png b/src/views/Home/img/shouqi2.png
deleted file mode 100644
index 9c9e7aa..0000000
Binary files a/src/views/Home/img/shouqi2.png and /dev/null differ
diff --git a/src/views/Home/img/suoxiao.png b/src/views/Home/img/suoxiao.png
deleted file mode 100644
index a015431..0000000
Binary files a/src/views/Home/img/suoxiao.png and /dev/null differ
diff --git a/src/views/Home/img/tuli.png b/src/views/Home/img/tuli.png
deleted file mode 100644
index 39e0059..0000000
Binary files a/src/views/Home/img/tuli.png and /dev/null differ
diff --git a/src/views/Home/img/ysgzqTuli.png b/src/views/Home/img/ysgzqTuli.png
deleted file mode 100644
index 9b56084..0000000
Binary files a/src/views/Home/img/ysgzqTuli.png and /dev/null differ
diff --git a/src/views/Home/img/zhankai.png b/src/views/Home/img/zhankai.png
deleted file mode 100644
index d0fdec2..0000000
Binary files a/src/views/Home/img/zhankai.png and /dev/null differ
diff --git a/src/views/Home/img/zhankai2.png b/src/views/Home/img/zhankai2.png
deleted file mode 100644
index 467c527..0000000
Binary files a/src/views/Home/img/zhankai2.png and /dev/null differ
diff --git a/src/views/Home/index.css b/src/views/Home/index.css
deleted file mode 100644
index 30ebee7..0000000
--- a/src/views/Home/index.css
+++ /dev/null
@@ -1,582 +0,0 @@
-.indexBox {
-  /*预报*/
-}
-.indexBox .ant-table-tbody > tr > td {
-  padding: 2px 0 !important;
-}
-.indexBox .ant-collapse-content-box {
-  padding: 0;
-}
-.indexBox .ant-collapse > .ant-collapse-item,
-.indexBox .ant-collapse-content {
-  border: 0;
-}
-.indexBox .ant-collapse {
-  border: 0;
-  background-color: transparent;
-}
-.indexBox .ant-collapse-icon-position-end > .ant-collapse-item > .ant-collapse-header .ant-collapse-arrow {
-  top: 49%;
-  right: 30px;
-  font-size: 16px;
-  color: #7D7D7D;
-}
-.indexBox .panelTitle {
-  box-sizing: border-box;
-}
-.indexBox .panelTitle .txt {
-  color: #050505;
-  font-size: 14px;
-  letter-spacing: 1px;
-  font-weight: bold;
-  margin-left: 10px;
-  line-height: 25px;
-}
-.indexBox .panelTitle1 {
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-}
-.indexBox .panelTitle1 .txt {
-  color: #050505;
-  font-size: 14px;
-  letter-spacing: 1px;
-  margin-left: 10px;
-  line-height: 25px;
-}
-.indexBox .contentBox {
-  padding: 0 20px;
-  box-sizing: border-box;
-}
-.indexBox .contentBox .numBox:nth-child(1) {
-  margin-bottom: 10px;
-}
-.indexBox .contentBox .numBox > div {
-  background: #ECF2F9;
-  border-radius: 6px;
-  padding: 10px 0 4px 0;
-  box-sizing: border-box;
-  text-align: center;
-  width: 84px;
-  height: 74px;
-}
-.indexBox .contentBox .numBox > div:nth-child(2) {
-  margin: 0 16px;
-}
-.indexBox .contentBox .numBox > div span {
-  font-size: 1.3rem;
-}
-.indexBox .contentBox .numBox > div p {
-  font-size: 24px;
-  color: #0893FF;
-  margin: 0;
-  font-weight: bold;
-}
-.indexBox .contentBox .txtBox {
-  margin-top: 10px;
-  padding-right: 10px;
-}
-.indexBox .contentBox .txtBox p {
-  margin: 0;
-  line-height: 20px;
-  font-size: 1.2rem;
-  text-indent: 28px;
-  text-align: justify;
-}
-.indexBox .card-group {
-  font-size: 12px;
-  color: #acbcbe;
-}
-.indexBox .card-group > span {
-  cursor: pointer;
-  margin: 0.1rem 0.2rem;
-  display: inline-block;
-  position: relative;
-  border: 1px solid #209aec46;
-  padding: 0.1rem 0.5rem 0 0.5rem;
-  border-radius: 0.2rem;
-  height: 22px;
-}
-.indexBox .card-group .number {
-  color: #fff;
-  font-size: 12px;
-  background-color: red;
-  display: inline-block;
-  position: absolute;
-  top: -0.2rem;
-  right: -0.2rem;
-  border-radius: 50%;
-  padding: 0px 0.35rem;
-  margin-top: -0.5rem;
-  margin-right: -0.5rem;
-}
-.indexBox .card-group .value {
-  color: #00deff;
-  font-weight: bold;
-  text-shadow: 0 0 2rem #00deff;
-}
-.indexBox .card-group .active {
-  color: #0893FF;
-  cursor: default;
-  font-weight: bold;
-  border: 1px solid #209aec9f;
-}
-.indexBox .selectedTr td {
-  border: 1px solid #279FFD !important;
-  border-left: 0 !important;
-  border-right: 0 !important;
-}
-.indexBox .selectedTr td:nth-child(1) {
-  border-left: 1px solid #279FFD !important;
-}
-.indexBox .selectedTr td:last-child {
-  border-right: 1px solid #279FFD !important;
-}
-.indexBox .ant-collapse-icon-position-end > .ant-collapse-item > .ant-collapse-header {
-  padding: 8px 0 8px 16px;
-}
-.indexBox .layerPanelBtn {
-  width: 50px;
-  /* height: 130px; */
-  border-radius: 4px;
-  box-shadow: 1px 2px 10px #eee;
-  padding: 4px 0 0 5px;
-  color: #818181;
-  margin-top: 6px;
-  cursor: pointer;
-  background: #ECF2F9;
-}
-.indexBox .layerPanelBtn > div {
-  margin-right: 8px;
-  color: #0068F4;
-}
-.indexBox .layerPanelBtn > div:last-child {
-  margin-right: 0;
-}
-.indexBox .leftPanel {
-  position: absolute;
-  width: 290px;
-  max-height: calc(100vh - 84px);
-  background: #fff;
-  z-index: 111;
-  box-shadow: 1px 2px 10px #e8ecf1;
-  /*padding:0 0 20px 0;
-    box-sizing: border-box;*/
-}
-.indexBox .leftPanel > div {
-  max-height: calc(100vh - 84px);
-  overflow: hidden auto;
-}
-.indexBox .leftPanel .iconDiv {
-  border-width: 0px;
-  width: 5px;
-  height: 14px;
-  background-color: #007afd;
-}
-.indexBox .leftPanel .ant-collapse-header {
-  font-size: 14px;
-  padding: 3px 16px;
-}
-.indexBox .leftPanel .ant-collapse-header .ant-collapse-header-text {
-  font-family: 'Microsoft YaHei UI', sans-serif;
-  font-weight: 400;
-  font-style: normal;
-  font-size: 14px;
-}
-.indexBox .leftPanel .monitorAndWarningDiv {
-  padding: 0 20px 0 10px;
-  margin-bottom: 5px;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .ant-collapse-header {
-  padding: 3px 16px;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox {
-  min-height: 40px;
-  padding: 0 10px;
-  box-sizing: border-box;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox:nth-child(2) {
-  margin: 8px 0;
-  border-top: 1px solid #e4eaf1;
-  border-bottom: 1px solid #e4eaf1;
-  padding: 5px 10px 8px 10px;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .imgBox {
-  width: 40px;
-  height: 40px;
-  margin-right: 10px;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .imgBox div {
-  width: 38px;
-  height: 38px;
-  border: 1px solid #E1EFFF;
-  background: #E1EFFF;
-  border-radius: 6px;
-  text-align: center;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .imgBox div img {
-  width: 22px;
-  margin-top: 6px;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .yjNumBox {
-  width: 22rem;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .yjNumBox .titleSpan {
-  width: 100px;
-  font-size: 14px;
-  font-weight: bold;
-  margin-right: 20px;
-  cursor: pointer;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .yjNumBox .totalSpan {
-  font-weight: bold;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .ybyjBox .wxYbyj {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .ybyjBox .jjYbyj {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .ybyjBox .gzYbyj {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .bottom > div {
-  width: 8rem;
-  height: 18px;
-  border-radius: 2px;
-  /*&:nth-child(2),&:nth-child(3){
-              margin:0 10px 10px 10px;
-            }*/
-  margin: 5px 30px 0 0;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .bottom > div span {
-  color: #9E9E9E;
-}
-.indexBox .leftPanel .monitorAndWarningDiv .cardBox .bottom > div span:nth-child(1) {
-  margin-right: 15px;
-}
-.indexBox .rightPanel {
-  position: absolute;
-  width: 365px;
-  background: #fff;
-  z-index: 101;
-  right: 35px;
-  box-shadow: 1px 2px 10px #e8ecf1;
-  padding: 5px 10px;
-  max-height: calc(100vh - 84px);
-}
-.indexBox .rightPanel > div {
-  max-height: calc(100vh - 94px);
-  overflow: hidden auto;
-}
-.indexBox .rightPanel .dutyBox {
-  background: #ECF2F9;
-  border-radius: 4px;
-  padding: 5px 20px;
-  box-sizing: border-box;
-}
-.indexBox .rightPanel .dutyBox .labelSpan,
-.indexBox .rightPanel .dutyBox .text {
-  line-height: 26px;
-}
-.indexBox .rightPanel .dutyBox .labelSpan {
-  color: #A9A9A9;
-  margin-right: 10px;
-}
-.indexBox .rightPanel .dutyBox .text {
-  color: #333;
-}
-.indexBox .button-group {
-  font-size: 1.5rem;
-  color: #A5A5A5;
-}
-.indexBox .button-group span {
-  cursor: pointer;
-  margin: 0.1rem 0.2rem;
-  display: inline-block;
-  padding: 0 0.5rem;
-}
-.indexBox .button-group .active {
-  color: #0893FF;
-  cursor: pointer;
-  font-weight: bold;
-}
-.indexBox .leftPanel1 {
-  position: absolute;
-  left: -12px;
-  top: -12px;
-  width: 45rem;
-  height: calc(100vh - 64px);
-  z-index: 111;
-}
-.indexBox .leftPanel1 .ant-tabs-left,
-.indexBox .leftPanel1 .ant-tabs-nav {
-  height: 100%;
-}
-.indexBox .leftPanel1 .ant-tabs-nav-wrap {
-  background: #4E5A6A;
-}
-.indexBox .leftPanel1 .ant-input-affix-wrapper {
-  padding: 2px 10px !important;
-}
-.indexBox .leftPanel1 .ant-tabs-tab {
-  height: 100px;
-  border-bottom: 1px solid #353F4D;
-  padding: 8px 13px !important;
-}
-.indexBox .leftPanel1 .ant-tabs-tab:nth-child(6) {
-  border-bottom: 0;
-}
-.indexBox .leftPanel1 .ant-tabs-left > .ant-tabs-nav .ant-tabs-tab + .ant-tabs-tab {
-  margin: 0;
-}
-.indexBox .leftPanel1 .tabTitle {
-  margin-top: 4px;
-}
-.indexBox .leftPanel1 .tabTitle .iconDiv {
-  width: 38px;
-  height: 38px;
-  font-size: 22px;
-  color: #B6B6B6;
-  border: 1px solid #9EA9B7;
-  border-radius: 10px;
-  text-align: center;
-  margin-bottom: 10px;
-  margin-left: 11px;
-}
-.indexBox .leftPanel1 .tabTitle .iconDiv span {
-  margin-left: 7px;
-}
-.indexBox .leftPanel1 .tabTitle .txtDiv {
-  font-size: 14px;
-  color: #B6B6B6;
-  letter-spacing: 1px;
-  width: 60px;
-}
-.indexBox .leftPanel1 .ant-tabs-tab-active {
-  background: #3F4A59;
-}
-.indexBox .leftPanel1 .ant-tabs-tab-active .tabTitle .iconDiv {
-  background: #0B81FF;
-  border-color: #0B81FF;
-  color: #fff;
-}
-.indexBox .leftPanel1 .ant-tabs-tab-active .tabTitle .txtDiv {
-  color: #fff;
-}
-.indexBox .leftPanel1 .ant-tabs-content-holder {
-  height: calc(100% - 20px);
-  background: #fff;
-  box-shadow: 1px 2px 10px #bdbaba;
-  margin: 12px 0 0 12px;
-  padding: 10px 0;
-  box-sizing: border-box;
-}
-.indexBox .leftPanel1 .ant-tabs-content-holder .ant-tabs-content > div {
-  padding: 0;
-}
-.indexBox .leftPanel1 .yagl-tab .ant-tabs-content-holder {
-  background: transparent;
-  box-shadow: none;
-}
-.indexBox .leftPanel2 {
-  width: 54rem;
-}
-.indexBox .topNumBox {
-  position: absolute;
-  top: 25px;
-  width: 640px;
-  height: 72px;
-  left: calc((100vw - 640px)/2);
-  z-index: 110;
-}
-.indexBox .topNumBox > div {
-  margin-right: 18px;
-  width: calc((100% - 145px)/4);
-  height: 72px;
-  background: rgba(255, 255, 255, 0.85);
-  box-shadow: 1px 2px 10px #eee;
-  border-radius: 10px;
-}
-.indexBox .topNumBox > div:last-child {
-  margin-right: 0;
-}
-.indexBox .topNumBox > div p {
-  text-align: center;
-  line-height: 25px;
-  letter-spacing: 1px;
-  margin: 5px 0 0 0;
-  font-weight: bold;
-}
-.indexBox .topNumBox > div div {
-  width: 100px;
-  margin: 0 auto;
-  text-align: center;
-}
-.indexBox .topNumBox > div div span {
-  font-size: 24px;
-  color: #0893FF;
-  font-weight: bold;
-}
-.indexBox .topNumBox > div div span:nth-child(1) {
-  color: #0893FF;
-}
-.indexBox .topNumBox > div div span:nth-child(2) {
-  color: #565656;
-}
-.indexBox .tipsBox {
-  width: 210px;
-  background: rgba(255, 255, 255, 0.85);
-  box-shadow: 1px 2px 10px #bdbaba;
-  padding: 10px 0 0 7px;
-  box-sizing: border-box;
-  border-radius: 10px;
-}
-.indexBox .tipsBox .title {
-  font-size: 14px;
-  color: #333;
-  letter-spacing: 1px;
-  font-weight: bold;
-  margin-bottom: 5px;
-}
-.indexBox .tipsBox span {
-  line-height: 33px;
-  margin-left: 5px;
-  font-size: 12px;
-}
-.indexBox .tipsBox .legendBox .title {
-  font-size: 14px;
-}
-.indexBox .tipsBox .legendBox ul,
-.indexBox .tipsBox .legendBox li {
-  list-style: none;
-  padding: 0;
-  font-size: 12px;
-}
-.indexBox .tipsBox .legendBox li {
-  width: 105px;
-}
-.indexBox .tipsBox .legendBox span {
-  height: 15px;
-  line-height: 15px;
-  margin-left: 0;
-}
-.indexBox .tipsBox .legendBox .colorSpan1,
-.indexBox .tipsBox .legendBox .colorSpan2,
-.indexBox .tipsBox .legendBox .colorSpan3,
-.indexBox .tipsBox .legendBox .colorSpan4,
-.indexBox .tipsBox .legendBox .colorSpan5,
-.indexBox .tipsBox .legendBox .colorSpan6,
-.indexBox .tipsBox .legendBox .colorSpan7 {
-  width: 22px;
-  height: 10px;
-  border: 1px solid #ddd;
-  margin: 2px 5px 0 0;
-}
-.indexBox .tipsBox .legendBox .colorSpan1 {
-  background: #781D4F;
-}
-.indexBox .tipsBox .legendBox .colorSpan2 {
-  background: #EB20F7;
-}
-.indexBox .tipsBox .legendBox .colorSpan3 {
-  background: #1E1ACA;
-}
-.indexBox .tipsBox .legendBox .colorSpan4 {
-  background: #6EC2FA;
-}
-.indexBox .tipsBox .legendBox .colorSpan5 {
-  background: #59B666;
-}
-.indexBox .tipsBox .legendBox .colorSpan6 {
-  background: #BDEF9A;
-}
-.indexBox .tipsBox .legendBox .colorSpan7 {
-  background: #ADB6D9;
-}
-.indexBox .skcx {
-  cursor: pointer;
-}
-.indexBox .skcxBox {
-  width: 250px;
-  background: rgba(255, 255, 255, 0.85);
-  box-shadow: 1px 2px 10px #bdbaba;
-  box-sizing: border-box;
-  border-radius: 10px;
-  overflow: hidden;
-}
-.indexBox .skcxBox .skcxBox_Scroll {
-  overflow-y: scroll;
-  max-height: 400px;
-}
-.indexBox .skcxBox .skcxBox_Scroll .item {
-  cursor: pointer;
-  display: flex;
-  align-items: flex-start;
-  padding: 10px 5px 0px 5px;
-}
-.indexBox .skcxBox .skcxBox_Scroll .item .skcxIcon {
-  padding: 15px 10px;
-}
-.indexBox .skcxBox .skcxBox_Scroll .item .content {
-  display: flex;
-  flex-direction: column;
-}
-.indexBox .skcxBox .skcxBox_Scroll .item .content .title {
-  display: flex;
-  justify-content: space-between;
-  font-size: 16px;
-  font-weight: bold;
-  color: #3B4859;
-  padding: 5px 0;
-}
-.indexBox .skcxBox .skcxBox_Scroll .item .content .title .num {
-  color: #c69c6b;
-}
-.indexBox .skcxBox .skcxBox_Scroll .item .content .text {
-  font-size: 14px;
-  color: #9E9E9E;
-  font-weight: bold;
-}
-.indexBox .skcxBox .skcxBox_Scroll .item .content .time {
-  font-size: 14px;
-  font-weight: bold;
-  color: #9E9E9E;
-  padding: 5px 0;
-}
-@media screen and (max-width: 1600px) {
-  .indexBox .topNumBox {
-    top: 25px;
-    width: 660px;
-    left: calc((100vw - 540px)/2);
-    zoom: 0.9;
-  }
-}
-.ant-radio-button-wrapper {
-  height: 28px;
-  line-height: 26px;
-  border: 1px solid #0893FF !important;
-  color: #0893FF;
-}
-.ant-radio-button-wrapper.ant-radio-button-wrapper-checked {
-  color: #fff !important;
-}
-.ant-radio-button-wrapper .ant-radio-button-checked {
-  background: #0893FF;
-  border-color: #0893FF !important;
-}
-.introductionDrawer .ant-drawer-body {
-  padding: 0 0 0 12px;
-}
-.color666 {
-  color: #666;
-}
-.ant-table-thead > tr > th {
-  background-color: #f2f3f5 !important;
-}
diff --git a/src/views/Home/index.js b/src/views/Home/index.js
new file mode 100644
index 0000000..2ed541d
--- /dev/null
+++ b/src/views/Home/index.js
@@ -0,0 +1,7 @@
+import React from 'react'
+
+export default function Home() {
+  return (
+    <div>Home</div>
+  )
+}
diff --git a/src/views/Home/index.less b/src/views/Home/index.less
deleted file mode 100644
index 34838ce..0000000
--- a/src/views/Home/index.less
+++ /dev/null
@@ -1,810 +0,0 @@
-.indexBox{
-  .ant-table-tbody>tr>td{
-    padding:2px 0 !important;
-  }
-
-  .ant-collapse-content-box{
-    padding:0;
-  }
-  .ant-collapse > .ant-collapse-item,.ant-collapse-content{
-    border:0;
-    
-  }
-  .ant-collapse{
-    border:0;
-    background-color: transparent;
-  }
-  .ant-collapse-icon-position-end > .ant-collapse-item > .ant-collapse-header .ant-collapse-arrow{
-    top:49%;
-    right:30px;
-    font-size:16px;
-    color: #7D7D7D;
-  }
-  .panelTitle{
-    // height:30px;
-    // border-bottom: 1px solid #f5f5f5;
-    //padding-left: 14px;
-    box-sizing: border-box;
-    .txt{
-      color:#050505;
-      font-size:14px;
-      letter-spacing: 1px;
-      font-weight:bold;
-      margin-left:10px;
-      line-height: 25px;
-    }
-  }
-  .panelTitle1{
-    // border-bottom: 1px solid #f5f5f5;
-    //padding-left: 14px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    .txt{
-      color:#050505;
-      font-size:14px;
-      letter-spacing: 1px;
-      margin-left:10px;
-      line-height: 25px;
-    }
-  }
-  .contentBox{
-    padding:0 20px;
-    box-sizing: border-box;
-    .numBox{
-      &:nth-child(1){
-        margin-bottom:10px;
-      }
-      >div{
-        background: #ECF2F9;
-        border-radius: 6px;
-        padding: 10px 0 4px 0;
-        box-sizing: border-box;
-        text-align:center;
-        //width:calc( 230px/3 );
-        //width:calc( (33rem - 110px)/3 );
-        width:84px;
-        height:74px;
-        &:nth-child(2){
-          margin:0 16px;
-        }
-        span{
-          font-size:1.3rem;
-        }
-        p{
-          font-size:24px;
-          color:#0893FF;
-          margin:0;
-          font-weight:bold;
-        }
-      }
-    }
-    .txtBox{
-      margin-top:10px;
-      padding-right:10px;
-      p{
-        margin:0;
-        line-height:20px;
-        font-size:1.2rem;
-        text-indent: 28px;
-        text-align: justify;
-      }
-    }
-  }
-
-  .card-group {
-    //font-size: 0.8rem;
-    font-size: 12px;
-    color: rgb(172, 188, 190);
-
-    & > span {
-      cursor: pointer;
-      margin: 0.1rem 0.2rem;
-      display: inline-block;
-      position: relative;
-      border: 1px solid #209aec46;
-      //padding: 0.1rem 0.5rem;
-      padding: 0.1rem 0.5rem 0 0.5rem;
-      border-radius: 0.2rem;
-      height:22px;
-    }
-
-    .number {
-      color: #fff;
-      //font-size: 0.8rem;
-      font-size: 12px;
-      background-color: red;
-      display: inline-block;
-      position: absolute;
-      top: -0.2rem;
-      right: -0.2rem;
-      border-radius: 50%;
-      padding: 0px 0.35rem;
-      margin-top: -0.5rem;
-      margin-right: -0.5rem;
-    }
-
-    .value {
-      color: #00deff;
-      font-weight: bold;
-      text-shadow: 0 0 2rem #00deff;
-    }
-
-    .active {
-      color: #0893FF;
-      cursor: default;
-      font-weight: bold;
-      border: 1px solid #209aec9f;
-    }
-  }
-
-  .selectedTr{
-    td{
-      border: 1px solid #279FFD !important;
-      border-left:0 !important;
-      border-right:0 !important;
-      &:nth-child(1){
-        border-left:1px solid #279FFD !important;
-      }
-      &:last-child{
-        border-right:1px solid #279FFD !important;
-      }
-    }
-  }
-
-  .ant-collapse-icon-position-end > .ant-collapse-item > .ant-collapse-header{
-    padding: 8px 0 8px 16px;
-  }
-
-
-
-  .layerPanelBtn{
-    // width:125px;
-    width:45px;
-    // height:28px;
-    // height:130px;
-    //background: rgba(255,255,255,0.8);
-    border-radius:4px;
-    box-shadow: 1px 2px 10px #eee;
-    padding:4px 0 0 5px;
-    color: #818181;
-    margin-top:6px;
-    cursor: pointer;
-    background: #ECF2F9;
-    >div{
-      margin-right:8px;
-      color: #0068F4;
-      &:last-child{
-        margin-right:0;
-      }
-    }
-  }
-
-  .leftPanel{
-    position: absolute;
-    width:290px;
-    // width:33rem;
-    max-height:calc( 100vh - 84px );
-    background:#fff;
-    z-index:111;
-    box-shadow: 1px 2px 10px #e8ecf1;//3px 5px 3px 2px #e8ecf1;
-    /*padding:0 0 20px 0;
-    box-sizing: border-box;*/
-    >div{
-      max-height:calc( 100vh - 84px );
-      overflow: hidden auto;
-    }
-    .iconDiv{
-      border-width: 0px;
-      width: 5px;
-      height: 14px;
-      background-color: #007afd;
-    }
-    .ant-collapse-header{
-      font-size: 14px;
-      padding: 3px 16px;
-      // border-bottom:1px solid #d7d7d7;
-      // border-left:1px solid #d7d7d7;
-      // border-right:1px solid #d7d7d7;
-      .ant-collapse-header-text{
-        font-family: 'Microsoft YaHei UI', sans-serif;
-        font-weight: 400;
-        font-style: normal;
-        font-size: 14px;
-        
-      }
-    }
-    .monitorAndWarningDiv{
-      padding:0 20px 0 10px;
-      margin-bottom:5px;
-      .ant-collapse-header{
-        padding: 3px 16px;
-        // .ant-collapse-header-text{
-        //   font-weight:bold;
-        // }
-      }
-      .cardBox{
-        min-height:40px;
-        //box-shadow: 0 0 4px 4px #ECECEC;
-        padding:0 10px;
-        box-sizing: border-box;
-        &:nth-child(2){
-          margin:8px 0;
-          border-top:1px solid #e4eaf1;
-          border-bottom:1px solid #e4eaf1;
-          padding:5px 10px 8px 10px;
-        }
-        .imgBox{
-          width:40px;
-          height:40px;
-          margin-right:10px;
-          div{
-            width:38px;
-            height:38px;
-            border:1px solid #E1EFFF;
-            background: #E1EFFF;
-            border-radius:6px;
-            text-align: center;
-            img{
-              width:22px;
-              margin-top:6px;
-            }
-          }
-        }
-        .yjNumBox{
-          //width:260px;
-          width:22rem;
-          .titleSpan{
-            width:100px;
-            font-size:14px;
-            font-weight:bold;
-            margin-right:20px;
-            cursor:pointer;
-          }
-          .totalSpan{
-            font-weight:bold;
-          }
-        }
-        .ybyjBox{
-          .wxYbyj{
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            .color{
-              // color: rgb(246, 66, 66);
-            }
-          }
-          .jjYbyj{
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            .color{
-              // color: rgb(255, 158, 91);
-            }
-          }
-          .gzYbyj{
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            .color{
-              // color: rgb(227, 194, 29);
-            }
-          }   
-        }
-        .bottom{
-          //margin-top:15px;
-          >div{
-            width:8rem;
-            height:18px;
-            //background:#F0F0F0;
-            border-radius:2px;
-            /*&:nth-child(2),&:nth-child(3){
-              margin:0 10px 10px 10px;
-            }*/
-            margin:5px 30px 0 0;
-            span{
-              color: #9E9E9E;
-              &:nth-child(1){
-                margin-right:15px;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    .operationalMaintenanceBox{
-      .ant-radio-button-wrapper{
-
-      }
-    }
-  }
-
-  .rightPanel{
-    position: absolute;
-    width:365px;
-    background:#fff;
-    z-index:101;
-    right:35px;
-    box-shadow: 1px 2px 10px #e8ecf1;//3px 5px 3px 5px #e8ecf1;
-    padding: 5px 10px;
-    max-height:calc( 100vh - 84px );
-
-    >div{
-      max-height:calc( 100vh - 94px );
-      // height: 500px;
-      overflow: hidden auto;
-    }
-    .dutyBox{
-      background:#ECF2F9;
-      border-radius:4px;
-      padding:5px 20px;
-      box-sizing: border-box;
-      .labelSpan,.text{
-        //letter-spacing: 2px;
-        line-height:26px;
-      }
-      .labelSpan{
-        color:#A9A9A9;
-        margin-right:10px;
-      }
-      .text{
-        color:#333;
-      }
-    }
-  }
-
-
-  .button-group {
-    font-size: 1.5rem;
-    color: #A5A5A5;
-
-    span {
-      cursor: pointer;
-      margin: 0.1rem 0.2rem;
-      display: inline-block;
-      //border: 1px solid #209aec46;
-      padding: 0 0.5rem;
-      //border-radius: 0.2rem;
-    }
-
-    .active {
-      color: #0893FF;
-      cursor: pointer;
-      font-weight: bold;
-      //border: 1px solid #209aec9f;
-    }
-  }
-
-  /*预报*/
-  .leftPanel1{
-    position: absolute;
-    left: -12px;
-    top: -12px;
-    //width:540px;
-    width:45rem;
-    height:calc( 100vh - 64px );
-    z-index:111;
-    .ant-tabs-left, .ant-tabs-nav{
-      height: 100%;
-    }
-    .ant-tabs-nav-wrap{
-      background: #4E5A6A;
-    }
-    .ant-input-affix-wrapper{
-      padding:2px 10px !important;
-    }
-
-    .ant-tabs-tab{
-      height:100px;
-      border-bottom: 1px solid #353F4D;
-      padding: 8px 13px !important;
-      &:nth-child(6){
-        border-bottom: 0;
-      }
-    }
-
-    .ant-tabs-left > .ant-tabs-nav .ant-tabs-tab + .ant-tabs-tab{
-      margin:0;
-    }
-
-    .tabTitle{
-      margin-top:4px;
-      .iconDiv{
-        width:38px;
-        height:38px;
-        font-size:22px;
-        color: #B6B6B6;
-        border: 1px solid #9EA9B7;
-        border-radius: 10px;
-        text-align: center;
-        margin-bottom:10px;
-        margin-left: 11px;
-        span{
-          margin-left:7px;
-        }
-      }
-      .txtDiv{
-        font-size:14px;
-        color: #B6B6B6;
-        letter-spacing: 1px;
-        width: 60px;
-      }
-    }
-
-    .ant-tabs-tab-active{
-      background: #3F4A59;
-      .tabTitle{
-        .iconDiv{
-          background: #0B81FF;
-          border-color: #0B81FF;
-          color: #fff;
-        }
-        .txtDiv{
-          color: #fff;
-        }
-      }
-    }
-
-    .ant-tabs-content-holder{
-      //height: calc( 100vh - 84px );
-      height:calc( 100% - 20px );
-      background:#fff;
-      box-shadow: 1px 2px 10px #bdbaba;
-      margin: 12px 0 0 12px;
-      padding: 10px 0;
-      box-sizing: border-box;
-      .ant-tabs-content{
-        >div{
-          padding:0;
-        }
-      }
-    }
-
-    .yagl-tab{
-      .ant-tabs-content-holder{
-        background: transparent;
-        box-shadow: none;
-      }
-    }
-
-  }
-
-  .leftPanel2{
-    width:54rem;
-  }
-
-  .topNumBox{
-    position: absolute;
-    top:25px;
-    width:640px;
-    height: 72px;
-    left: calc( (100vw - 640px)/2 );
-    z-index: 110;
-    >div{
-      margin-right: 18px;
-      width: calc( (100% - 145px)/4 );
-      height: 72px;
-      background: rgba(255,255,255,0.85);
-      box-shadow: 1px 2px 10px #eee;
-      border-radius: 10px;
-      &:last-child{
-        margin-right: 0;
-      }
-      p{
-        text-align: center;
-        line-height:25px;
-        letter-spacing: 1px;
-        margin:5px 0 0 0;
-        font-weight:bold;
-      }
-      div{
-        width: 100px;
-        margin: 0 auto;
-        text-align: center;
-        span{
-          font-size: 24px;
-          color: #0893FF;
-          font-weight: bold;
-        }
-        span:nth-child(1){
-          color: #0893FF;
-        }
-        span:nth-child(2){
-          color: #565656;
-        }
-      }
-    }
-  }
-
-  .tipsBox{
-    width: 210px;
-    background: rgba(255, 255, 255, 0.85);
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding: 10px 0 0 7px;
-    box-sizing: border-box;
-    border-radius: 10px;
-    .title{
-      font-size: 14px;
-      color: #333;
-      letter-spacing: 1px;
-      font-weight: bold;
-      margin-bottom: 5px;
-    }
-    span{
-      line-height: 33px;
-      margin-left: 5px;
-      font-size: 12px;
-    }
-
-    .legendBox{
-      .title{
-        font-size: 14px;
-      }
-      ul,li{
-        list-style: none;
-        padding:0;
-        font-size: 12px;
-      }
-      li{
-        width: 105px;
-      }
-      span{
-        height:15px;
-        line-height: 15px;
-        margin-left:0;
-      }
-      .colorSpan1,.colorSpan2,.colorSpan3,.colorSpan4,.colorSpan5,.colorSpan6,.colorSpan7{
-        width:22px;
-        height:10px;
-        border:1px solid #ddd;
-        margin:2px 5px 0 0;
-      }
-      .colorSpan1{
-        background:#781D4F;
-      }
-      .colorSpan2{
-        background:#EB20F7;
-      }
-      .colorSpan3{
-        background:#1E1ACA;
-      }
-      .colorSpan4{
-        background:#6EC2FA;
-      }
-      .colorSpan5{
-        background:#59B666;
-      }
-      .colorSpan6{
-        background:#BDEF9A;
-      }
-      .colorSpan7{
-        background:#ADB6D9;
-      }
-    }
-  }
-
-  .skcx{
-    cursor: pointer;
-  }
-
-  .skcxBox{
-    width: 250px;
-    background: rgba(255, 255, 255, 0.85);
-    box-shadow: 1px 2px 10px #bdbaba;
-    box-sizing: border-box;
-    border-radius: 10px;
-    overflow:hidden;
-    
-    .skcxBox_Scroll{
-    overflow-y: scroll;
-    max-height: 400px;
-      .item{
-        cursor: pointer;
-        display: flex;
-        align-items: flex-start;
-        padding: 10px 5px 0px 5px;
-        .skcxIcon{
-          padding: 15px 10px;
-        }
-        .content{
-          display: flex;
-          flex-direction: column;
-          .title{
-            display: flex;
-            justify-content: space-between;
-            font-size: 16px;
-            font-weight: bold;
-            color: #3B4859;
-            padding: 5px 0;
-            .num{
-              color: #c69c6b;
-            }
-          }
-          .text{
-            font-size: 14px;
-            color: #9E9E9E;
-            font-weight: bold;
-          }
-          .time{
-            font-size: 14px;
-            font-weight: bold;
-            color: #9E9E9E;
-            padding: 5px 0;
-          }
-        }
-      }
-    }
-  }
-
-}
-
-
-@media screen and (max-width: 1600px){
-  .indexBox .topNumBox {
-    top: 25px;
-    width: 660px;
-    left: calc((100vw - 540px)/2);
-    zoom: 0.9;
-  }
-}
-@media screen and (max-width: 1750px){
-  .toolBox{
-    //top: 110px !important;
-    //left: 63vw !important;
-  }
-}
-
-
-.ant-radio-button-wrapper{
-  height:28px;
-  line-height:26px;
-  border: 1px solid #0893FF !important;
-  color:#0893FF;
-  &.ant-radio-button-wrapper-checked{
-    color: #fff !important;
-  }
-  .ant-radio-button-checked{
-    background:#0893FF;
-    border-color:#0893FF !important;
-  }
-}
-
-.introductionDrawer{
-  .ant-drawer-body{
-    padding: 0 0 0 12px;
-  }
-}
-
-.color666{
-  color: #666;
-}
-.ant-table-thead > tr > th{
-  // background-color: #f2f3f5 !important;
-  // font-size: 13px;
-}
-
-.mapToolBoxTuCeng{
-  position: absolute;
-  top: 10px;
-  left: 5px;
-  border-radius: 5px;
-  padding: 0 10px;
-  background: #fff;
-  border: 1px solid #eee;
-  display: flex;
-  z-index: -1;
-  transition: all 0.2s ease 0s;
-  .mapToolBoxTuCengItem{
-    width: 70px;
-    margin-top: 10px;
-    margin-bottom: 2px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    color: #000000;
-    font-size: 14px;
-  }
-}
-
-.normalModalStyle{
-  width: 100%;
-  // min-height: 600px;
-  background-color: #fff;
-  .ant-card-body{
-    
-    .ant-table-thead{
-      .ant-table-cell{
-        background-color: #e2edfd !important;
-      }
-    }
-  }
-
-  .normalModalStyle_title{
-    height: 40px;
-    background-color: #f7f7f7;
-    border-radius: 10px 10px 0 0 ;
-    display: flex;
-    align-items: center;
-    color: #007afd;
-    font-size: 16px;
-    font-weight: 500;
-    margin-bottom: 10px;
-
-    .normalModalStyle_title_icon{
-      margin: 0 10px 0 15px;
-      width: 5px;
-      height: 16px;
-      background: #3477f5;
-    }
-    .normalModalStyle_title_cancel{
-      margin-right: 15px;
-      flex: 1;
-      display: flex;
-      flex-direction: row-reverse;
-    }
-  }
-}
-
-.home_modal{
-  .ant-modal-content{
-      border-radius: 10px;
-  }
-}
-
-.homeModal1{
-  // .ant-radio-button-wrapper:not(:first-child)::before{
-  //   background-color: red;
-  // }
-
-
-
-  display: flex;
-  flex-direction: column;
-  .homeModal1_content{
-    height: 504px;
-    display: flex;
-    padding: 5px 20px 20px 20px;
-    .homeModal1_content_lf{
-      width: 40%;
-      height: 100%;
-    }
-    .homeModal1_content_rf{
-      width: 60%;
-      height: 100%;
-    }
-  }
-}
-
-.homeModal2{
-  display: flex;
-  flex-direction: column;
-  .homeModal2_content{
-    height: 504px;
-    display: flex;
-    padding: 5px 20px 20px 20px;
-  }
-}
-
-
-.colorTable{
-  .ant-table-thead{
-    th{
-      height: 40px !important;
-      background-color: #e2edfd !important;
-    }
-  }
-  .ant-table-tbody{
-    .ant-table-measure-row{
-      td{
-        padding: 0 !important;
-      }
-    }
-    tr:nth-child(odd) {
-      td{
-        background-color: #f5f8fe !important;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/index.tsx b/src/views/Home/index.tsx
deleted file mode 100644
index bbd39d2..0000000
--- a/src/views/Home/index.tsx
+++ /dev/null
@@ -1,231 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { useLocation } from 'react-router'
-import { useDispatch, useSelector } from 'react-redux'
-import { Drawer } from 'antd'
-import './index.less'
-import MapCtrl from './MapCtrl'
-import HomePanelsLayoutPage from './homePanelsLayoutPage'
-import LayersPage from '../Home/dlg/LayersDlg'
-import Shouqi2 from './img/shouqi2.png'
-import Zhankai2 from './img/zhankai2.png'
-import DiQiu from './img/DiQiu.png'
-import ZhongXin from './img/ZhongXin.png'
-import Ysgzq from '../ysgzq/ssyq'
-import Sssq from '../ysgzq/sssq'
-import Yqz from '../fxzb/jczw/yqz/index.js'
-import Sqz from '../fxzb/jczw/sqz/index.js'
-import Ddxsfx from '../fxdd/dqxsfx'
-// import Tqyb from '../fxdd/tqyb'
-import Fhxs from './fhxs'
-import Tqyb from './tqyb'
-import Tuli from './img/tuli.png'
-import ysgzqTuli from './img/ysgzqTuli.png'
-
-
-const HomePage = () => {
-  const getLayerVisible = (s:any) => s.map.layerVisible;
-  let mapObj = useSelector((s:any) => s.map.map);
-  const layerVisible = useSelector(getLayerVisible);
-  const location = useLocation()
-  const dispatch = useDispatch()
-  const pathname = location.pathname
-  const [showPanels, setShowPanels] = useState(true)
-  const [open, setOpen] = useState(false)
-
-  //收起\展开
-  const collapseExpand = () => {
-    setShowPanels(!showPanels)
-  }
-
-  //还原地图位置
-  const reduction = () => {
-    dispatch.runtime.setHome()
-  }
-
-  //图层控制
-  const showLayers = () => {
-    setOpen(!open)
-  }
-
-  const onClose = () => {
-    setOpen(false)
-  }
-
-  useEffect(() => {
-    // if (pathname !== '/mgr/home') {
-    //   dispatch.map.setLayerVisible({ ShuiKuLayer: false })
-    //   dispatch.map.setZhongxingSk(true)
-    // } else {
-      // dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-      // dispatch.map.setZhongxingSk(true)
-    // }
-  }, [pathname])
-
-  useEffect(() => {
-    // if (pathname == '/mgr/home' && !showPanels) {
-    //   dispatch.map.setZhongxingSk(true)
-    //   dispatch.map.setLayerVisible({ AdcdLayer: true })
-    //   dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-    // }
-  }, [showPanels])
-
-
-  return (
-    <div
-      style={{
-        height: '100%',
-        background: '#ECF2F9',
-        display: 'flex',
-        alignItems: 'stretch',
-      }}
-    >
-      <div style={{ flex: 1, padding: 0 }} className="indexBox">
-        <div
-          style={{
-            height: '100%',
-            position: 'relative',
-            background: '#ECF2F9',
-          }}
-        >
-          {/* 控制按钮 */}
-          <div
-            className="toolBox"
-            style={{
-              position: 'absolute',
-              zIndex: '110',
-              right: '-1rem',
-              top: '-7px',
-            }}
-          >
-            <div className="layerPanelBtn clearFloat">
-              <div className="lf" title="地图展示图层控制" onClick={showLayers}>
-                <img
-                  src={DiQiu}
-                  alt=""
-                  style={{ width: '30px', marginTop: '5px' }}
-                />
-              </div>
-              <div className="lf" title="还原地图展示位置" onClick={reduction}>
-                <img
-                  src={ZhongXin}
-                  alt=""
-                  style={{ width: '30px', marginTop: ' 5px' }}
-                />
-              </div>
-              <div
-                className="lf"
-                title="收起悬浮功能块"
-                onClick={collapseExpand}
-              >
-                {showPanels ? (
-                  <img
-                    src={Shouqi2}
-                    alt=""
-                    style={{ width: '30px', marginTop: '5px' }}
-                  />
-                ) : (
-                  <img
-                    src={Zhankai2}
-                    alt=""
-                    style={{ width: '30px', marginTop: '5px' }}
-                  />
-                )}
-              </div>
-              {/* <div className="lf" title="地图放大" onClick={()=>{
-                dispatch.runtime.setIn();
-              }}>
-                <img src={Fangda} alt="" style={{ width: "18px", marginTop: "-5px" }} />
-              </div>
-              <div className="lf" title="地图缩小" onClick={()=>{
-                dispatch.runtime.setOut();
-              }}>
-                <img src={Suoxiao} alt="" style={{ width: "18px", marginTop: "-5px" }} />
-              </div> */}
-              {/* <div className="lf" title="地图展示图层控制" onClick={showLayers}>
-                <DatabaseFilled style={{ fontSize: "17px", marginTop: "2px" }} />
-              </div> */}
-              <div className='mapToolBoxTuCeng' style={{left:open?'-170px':'5px'}}>
-                <div className='mapToolBoxTuCengItem' style={{color:!!layerVisible["SatelliteImage"]?'#1677ff':'black'}} onClick={()=>{
-                  dispatch.map.setLayerVisible({ ['OfflineMap']: false });
-                  dispatch.map.setLayerVisible({ ['SatelliteImage']: true });
-                  //卫星图打开河流面很丑，所以关掉
-                  mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-                    if(layer.values_.name === "HLLayer"||layer.values_.name === "HL2Layer"){
-                      layer.setVisible(false);
-                    }
-                    if(layer.values_.name === "HLLayer2"){
-                      layer.setVisible(true);
-                    }
-                  });
-                }}>
-                  <img width={50} height={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/yingxiangtu.png`} alt=""/>
-                  影像图
-                </div>
-                <div className='mapToolBoxTuCengItem' style={{color:!!layerVisible["OfflineMap"]?'#1677ff':'black'}}  onClick={()=>{
-                  dispatch.map.setLayerVisible({ ['SatelliteImage']: false });
-                  dispatch.map.setLayerVisible({ ['OfflineMap']: true });
-                  mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-                    if(layer.values_.name === "HLLayer"||layer.values_.name === "HL2Layer"){
-                      layer.setVisible(true);
-                    }
-                    if(layer.values_.name === "HLLayer2"){
-                      layer.setVisible(false);
-                    }
-                  });
-                }}>
-                  <img width={50} height={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shiliangtu.svg`} alt=""/>
-                  矢量图
-                </div>
-              </div>
-            </div>
-          </div>
-
-
-          {/* 地图 */}
-          <MapCtrl />
-
-
-          {/*首页面板*/}
-          {pathname === '/mgr/home' ? (
-            <HomePanelsLayoutPage showPanels={showPanels} />
-          ) : null}
-
-          {/*四预-防洪形势*/}
-          {pathname === '/mgr/sy/fhxzfx' ? (
-            <Fhxs showPanels={showPanels}/>
-          ) : null}
-
-          {/*四预-天气预报*/}
-          {pathname === '/mgr/sy/tqyb' ? (
-            <Tqyb showPanels={showPanels}/>
-          ) : null}
-
-          
-
-
-          {/*雨水工灾情面板-雨情*/}
-          {pathname === '/mgr/ysgzq/ssyq' ? (
-            <div style={showPanels ? { display: 'block' } : { display: 'none' }}><Ysgzq /></div>
-          ) : null}
-
-          {/*雨水工灾情面板-水情*/}
-          {pathname === '/mgr/ysgzq/sssq' ? (
-            <div style={showPanels ? { display: 'block' } : { display: 'none' }}><Sssq /></div>
-          ) : null}
-
-          {/*防汛调度面板-当前形势*/}
-          {pathname === '/mgr/fxdd/dqxsfx' ? (
-            <div style={showPanels ? { display: 'block' } : { display: 'none' }}><Ddxsfx /></div>
-          ) : null}
-
-          {/*防汛调度-天气预报面板*/}
-          {/* {pathname === '/mgr/fxdd/tqyb' ? (
-            <div style={showPanels ? { display: 'block' } : { display: 'none' }}><Tqyb /></div>
-          ) : null} */}
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default HomePage
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/index.less b/src/views/Home/panels/earlyWarningPanels/forecast/index.less
deleted file mode 100644
index c92e786..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/index.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.forecastBox{
-  margin-top:-10px;
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 55rem)*(-1) );
-    top: 0;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-
-  .drpBox{
-    .button-group span{
-      padding: 0 0.1rem;
-    }
-  }
-  .ellipsisDiv{
-    width:115px;
-    overflow: hidden;//溢出隐藏
-    white-space: nowrap;//禁止换行
-    text-overflow: ellipsis;//...
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/index.tsx b/src/views/Home/panels/earlyWarningPanels/forecast/index.tsx
deleted file mode 100644
index 7ed95d6..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/index.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import {Collapse, Image, Radio} from 'antd'
-import React, {useEffect, useState} from 'react'
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import "./index.less"
-import moment from "moment";
-import useCrud from "../../../../../components/crud/useCrud";
-import RainfallPage from './rainfall';
-import RiverCoursePage from './riverCourse';
-
-const { Panel } = Collapse;
-
-type IProps = {
-  activeKey: any;
-}
-
-const HoursPanelPage: React.FC<IProps> = ({ activeKey }) => {
-  const crud = useCrud();
-
-  const onChange = (key: string | string[]) => {
-    console.log(key);
-  };
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <div className="forecastBox">
-      <Collapse defaultActiveKey={['1', '2', '3']} onChange={onChange} expandIconPosition="end" >
-        <Panel header={<div className="clearFloat panelTitle">
-            <div className="lf">
-              {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">短临降雨预警</span>
-          </div>} key="1">
-          <RainfallPage activeKey={activeKey}/>
-        </Panel>
-        <Panel header={<div className="clearFloat panelTitle">
-          <div className="lf">
-            {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-            <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-          </div>
-          <span className="lf txt">短临河道预警</span>
-        </div>} key="2">
-          <RiverCoursePage activeKey={activeKey}/>
-        </Panel>
-      </Collapse>
-    </div>
-  )
-}
-
-export default HoursPanelPage
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/ToolBar.tsx b/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/ToolBar.tsx
deleted file mode 100644
index 3bc1747..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/ToolBar.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Select, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search }) => {
-  const [form] = Form.useForm();
-
-  const plainOptions = ["红色", "橙色", "黄色", "蓝色"];
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  const onSearchClick = () => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD');
-      }
-    }
-    search(rec);
-  };
-
-  const reset = () => {
-    form.resetFields();
-    form.setFieldsValue({"deptNames": undefined});
-  };
-
-
-  return record ? (
-    <Form layout="inline" form={form} >
-      <Form.Item name="informantTime" label="">
-        <DatePicker format="YYYY-MM-DD HH:mm:ss" showTime />
-      </Form.Item>
-      <div style={{width:"100%"}}>
-        <FormItem label="等级" name="type">
-          <CheckboxGroup options={plainOptions} onChange={onSearchClick} />
-        </FormItem>
-      </div>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/index.less b/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/index.less
deleted file mode 100644
index e982268..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/index.less
+++ /dev/null
@@ -1,107 +0,0 @@
-.picBox{
-  .panelTitle {
-    padding-left: 14px;
-    box-sizing: border-box;
-  }
-  .topQuery{
-    min-height: 30px;
-    line-height: 30px;
-    margin: 5px 15px;
-    .ant-checkbox-wrapper{
-      width:75px;
-    }
-    .ant-input{
-      padding: 2px 10px;
-    }
-  }
-  .listDiv{
-    height:calc( 100vh - 220px );
-    overflow: hidden auto;
-    .item{
-      padding: 10px 26px 0 20px;
-      box-sizing: border-box;
-      border-top: 1px solid #ECF2F9;
-    }
-    .nameSpan{
-      padding: 0 8px;
-      background: #0893FF;
-      color: #fff;
-      letter-spacing: 1px;
-      border-radius: 4px;
-      margin-right:10px;
-      line-height:26px;
-      cursor:pointer;
-    }
-    .time{
-      color:#333;
-      font-weight:bold;
-      font-size:13px;
-      line-height:26px;
-    }
-    .imgBox{
-      text-align: center;
-      margin: 20px 0;
-    }
-    .text{
-      margin-bottom:20px;
-      >div{
-        padding: 0 25px 0 10px;
-        span{
-          color:#333;
-          font-size:15px;
-          line-height: 26px;
-        }
-        .linkTxt{
-          color:#0083FE;
-          text-decoration: underline;
-          text-decoration-color: #0083FE;
-          font-weight:bold;
-        }
-      }
-    }
-  }
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .picDiv{
-        position: relative;
-        .picTm{
-          position: absolute;
-          right: 15px;
-          bottom: 0;
-          line-height: 20px;
-          background: rgba(255, 255, 255, 0.5);
-          padding:2px 5px;
-          box-sizing: border-box;
-          font-weight:bold;
-        }
-      }
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/index.tsx b/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/index.tsx
deleted file mode 100644
index 1cb24d9..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/rainfall/index.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import {
-  EditOutlined, CloseOutlined
-} from '@ant-design/icons';
-import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Divider, Popconfirm, Image} from 'antd';
-import { ColumnsType } from 'antd/lib/table';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-import { SearchOption } from "../../../../../../service/def";
-import ToolBar from './ToolBar';
-import moment from "moment";
-import {yjLevelColor} from "../../../../../../utils/renutils";
-import {useDispatch, useSelector} from "react-redux";
-import staticData from '../../../../../staticData';
-
-const { Option } = Select;
-
-type IProps = {
-  activeKey: any;
-}
-
-const DataTable: React.FC<IProps> = ({ activeKey }) => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const dispatch = useDispatch();
-
-  const [showDetails, setShowDetails] = useState(false);
-  const [detailsData, setDetailsData] = useState({});
-
-  const hasRightPanel = useSelector((s:any) => s.runtime.hasRightPanel);
-  const rightDetails = useSelector((s:any) => s.overallview.rightDetails);
-
-  const showDetailsFun = (val:any) => {
-    setShowDetails(true);
-    setDetailsData(val);
-    dispatch.overallview.setRightDetails("dljyyj");
-    dispatch.runtime.setHasRightPanel(true);
-  };
-
-  useEffect(() => {
-    setShowDetails(false);
-    dispatch.runtime.setHasRightPanel(false);
-  }, [activeKey]);
-
-  useEffect(() => {
-    //console.log("42+++++",showDetails);
-    if(showDetails){
-      /*setShowDetails(true);
-      dispatch.overallview.setRightDetails("dljyyj");*/
-      dispatch.runtime.setHasRightPanel(true);
-    }
-  }, [showDetails]);
-
-  const tableData:any = staticData.dljyyjData;
-
-  const columns:any = useMemo(() => [
-    { title: '序号', key: 'inx', dataIndex: 'inx', align: 'center', width: 80, render: (val:any, rec:any, inx:any) => inx + 1 },
-    { title: '乡镇', key: '', dataIndex: '', align: 'center', render: (rec:any)=>
-    <div className="ellipsisDiv" onClick={()=>showDetailsFun(rec)} style={{cursor:"pointer"}} title={rec.adnm}>{rec.adnm}</div>},
-    { title: '平均雨量', key: '', dataIndex: '', align: 'center', render: (rec:any)=><div >{rec.av?(rec.av).toFixed(1):"-"}</div>},
-    { title: '最大雨量', key: '', dataIndex: '', align: 'center', render: (rec:any)=><div >{rec.drp?(rec.drp).toFixed(1):"-"}</div>},
-  ], []);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-      deptNames: null,
-      stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-      etm:  moment().format("YYYY-MM-DD"),
-    }};
-
-  const doSearch = (params:any) => {
-
-  };
-
-  return (
-    <div className="rWaterBox" style={{width:"92%",marginLeft:"4%", marginBottom:"10px"}}>
-      <div style={{margin:"0 0 10px 6px"}}>
-        <ToolBar params={{ ...options1.search }} search={doSearch} />
-      </div>
-      {/*<div className="card-h-margin" />*/}
-      <div className="smallTable">
-        <Table rowKey="adcd" bordered
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               scroll={{ y: 230 }}
-               defaultExpandAllRows={true}
-        />
-      </div>
-
-      {/*右侧详情*/}
-      {
-        showDetails && rightDetails==="dljyyj"?<div className="rightDetails" style={{height: hasAlertBox?"calc(100vh - 114px)":"calc(100vh - 84px)"}}>
-          <div className="clearFloat panelTitle">
-            <div className="lf">
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">详情</span>
-            <div className="rf closeBtn" onClick={()=>{setShowDetails(false); dispatch.runtime.setHasRightPanel(false);}}>
-              <CloseOutlined />
-            </div>
-          </div>
-          <div className="listDiv">
-            <div className="clearFloat">
-              {/*// @ts-ignore*/}
-              <span className="lf nameSpan">防灾对象</span>
-            </div>
-            <div className="txtDiv">
-              <div className="clearFloat">
-                <span className="lf labelSpan">预警等级:</span>
-                {/*// @ts-ignore*/}
-                <span className="rf textSpan" style={{ background: yjLevelColor(detailsData.maxLv), width:"10px", height:"10px", borderRadius:"50%", margin:"0 auto" }}></span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">行政区划:</span>
-                {/*// @ts-ignore*/}
-                <span className="rf textSpan">{detailsData.adnm}</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">防洪能力:</span>
-                <span className="rf textSpan">-</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">关联站点:</span>
-                <span className="rf textSpan">-</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">所属小流域:</span>
-                <span className="rf textSpan">-</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">防灾对象编码:</span>
-                <span className="rf textSpan">-</span>
-              </div>
-            </div>
-          </div>
-        </div>:null
-      }
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/ToolBar.tsx b/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/ToolBar.tsx
deleted file mode 100644
index 3bc1747..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/ToolBar.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Select, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search }) => {
-  const [form] = Form.useForm();
-
-  const plainOptions = ["红色", "橙色", "黄色", "蓝色"];
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  const onSearchClick = () => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD');
-      }
-    }
-    search(rec);
-  };
-
-  const reset = () => {
-    form.resetFields();
-    form.setFieldsValue({"deptNames": undefined});
-  };
-
-
-  return record ? (
-    <Form layout="inline" form={form} >
-      <Form.Item name="informantTime" label="">
-        <DatePicker format="YYYY-MM-DD HH:mm:ss" showTime />
-      </Form.Item>
-      <div style={{width:"100%"}}>
-        <FormItem label="等级" name="type">
-          <CheckboxGroup options={plainOptions} onChange={onSearchClick} />
-        </FormItem>
-      </div>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/index.less b/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/index.less
deleted file mode 100644
index e982268..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/index.less
+++ /dev/null
@@ -1,107 +0,0 @@
-.picBox{
-  .panelTitle {
-    padding-left: 14px;
-    box-sizing: border-box;
-  }
-  .topQuery{
-    min-height: 30px;
-    line-height: 30px;
-    margin: 5px 15px;
-    .ant-checkbox-wrapper{
-      width:75px;
-    }
-    .ant-input{
-      padding: 2px 10px;
-    }
-  }
-  .listDiv{
-    height:calc( 100vh - 220px );
-    overflow: hidden auto;
-    .item{
-      padding: 10px 26px 0 20px;
-      box-sizing: border-box;
-      border-top: 1px solid #ECF2F9;
-    }
-    .nameSpan{
-      padding: 0 8px;
-      background: #0893FF;
-      color: #fff;
-      letter-spacing: 1px;
-      border-radius: 4px;
-      margin-right:10px;
-      line-height:26px;
-      cursor:pointer;
-    }
-    .time{
-      color:#333;
-      font-weight:bold;
-      font-size:13px;
-      line-height:26px;
-    }
-    .imgBox{
-      text-align: center;
-      margin: 20px 0;
-    }
-    .text{
-      margin-bottom:20px;
-      >div{
-        padding: 0 25px 0 10px;
-        span{
-          color:#333;
-          font-size:15px;
-          line-height: 26px;
-        }
-        .linkTxt{
-          color:#0083FE;
-          text-decoration: underline;
-          text-decoration-color: #0083FE;
-          font-weight:bold;
-        }
-      }
-    }
-  }
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .picDiv{
-        position: relative;
-        .picTm{
-          position: absolute;
-          right: 15px;
-          bottom: 0;
-          line-height: 20px;
-          background: rgba(255, 255, 255, 0.5);
-          padding:2px 5px;
-          box-sizing: border-box;
-          font-weight:bold;
-        }
-      }
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/index.tsx b/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/index.tsx
deleted file mode 100644
index 41eb0ab..0000000
--- a/src/views/Home/panels/earlyWarningPanels/forecast/riverCourse/index.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import {
-  EditOutlined, CloseOutlined
-} from '@ant-design/icons';
-import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Divider, Popconfirm, Image} from 'antd';
-import { ColumnsType } from 'antd/lib/table';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-import { SearchOption } from "../../../../../../service/def";
-import ToolBar from './ToolBar';
-import moment from "moment";
-import {yjLevelColor} from "../../../../../../utils/renutils";
-import {useDispatch, useSelector} from "react-redux";
-import staticData from '../../../../../staticData';
-
-const { Option } = Select;
-
-type IProps = {
-  activeKey: any;
-}
-
-const DataTable: React.FC<IProps> = ({ activeKey }) => {
-  const dispatch = useDispatch();
-
-  const [showDetails, setShowDetails] = useState(false);
-  const [detailsData, setDetailsData] = useState({});
-
-  const rightDetails = useSelector((s:any) => s.overallview.rightDetails);
-
-  const showDetailsFun = (val:any) => {
-    setShowDetails(true);
-    setDetailsData(val);
-
-    dispatch.overallview.setRightDetails("dlhdyj");
-  };
-
-  useEffect(() => {
-    setShowDetails(false);
-  }, [activeKey]);
-
-  useEffect(() => {
-    dispatch.runtime.setHasRightPanel(showDetails);
-  }, [showDetails, rightDetails]);
-
-  const tableData:any = staticData.dlhdyjData;
-
-  const columns:any = useMemo(() => [
-    { title: '序号', key: 'inx', dataIndex: 'inx', align: 'center', width: 60, render: (val:any, rec:any, inx:any) => inx + 1 },
-    { title: '河道断面', key: '', dataIndex: '', align: 'center', render: (rec:any)=>
-    <div className="ellipsisDiv" onClick={()=>showDetailsFun(rec)} style={{cursor:"pointer",width:'100%'}} title={rec.name}>{rec.name}</div>},
-    { title: '乡镇', key: 'adnm', dataIndex: 'adnm', align: 'center', },
-    { title: '预警等级', key: 'warnGrade_TYPE', dataIndex: 'warnGrade_TYPE', align: 'center', },
-    { title: '预警产生时间', key: 'tm', dataIndex: 'tm', align: 'center', },
-  ], []);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-      deptNames: null,
-      stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-      etm:  moment().format("YYYY-MM-DD"),
-    }};
-
-  const doSearch = (params:any) => {
-
-  };
-
-  return (
-    <div className="rWaterBox" style={{width:"92%",marginLeft:"4%"}}>
-      <div style={{margin:"0 0 10px 6px"}}>
-        <ToolBar params={{ ...options1.search }} search={doSearch} />
-      </div>
-      {/*<div className="card-h-margin" />*/}
-      <div className="smallTable">
-        <Table rowKey="id" bordered
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               scroll={{ y: 130 }}
-        />
-      </div>
-
-      {/*右侧详情*/}
-      {
-        showDetails && rightDetails==="dlhdyj"?<div className="rightDetails">
-          <div className="clearFloat panelTitle">
-            <div className="lf">
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">详情</span>
-            <div className="rf closeBtn" onClick={()=>setShowDetails(false)}>
-              <CloseOutlined />
-            </div>
-          </div>
-          <div className="listDiv">
-            <div className="clearFloat">
-              {/*// @ts-ignore*/}
-              <span className="lf nameSpan">{detailsData.name}</span>
-            </div>
-            <div className="txtDiv">
-              <div className="clearFloat">
-                <span className="lf labelSpan">预警等级:</span>
-                {/*// @ts-ignore*/}
-                <span className="rf textSpan" style={{ background: yjLevelColor(detailsData.maxLv), width:"10px", height:"10px", borderRadius:"50%", margin:"0 auto" }}></span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">预警依据:</span>
-                {/*// @ts-ignore*/}
-                <span className="rf textSpan">-</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">预警产生时间:</span>
-                {/*// @ts-ignore*/}
-                <span className="rf textSpan">{detailsData.tm}</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">防汛责任人:</span>
-                <span className="rf textSpan">-</span>
-              </div>
-            </div>
-          </div>
-        </div>:null
-      }
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/earlyWarningPanels/risk/Information/ToolBar.tsx b/src/views/Home/panels/earlyWarningPanels/risk/Information/ToolBar.tsx
deleted file mode 100644
index e16aa6f..0000000
--- a/src/views/Home/panels/earlyWarningPanels/risk/Information/ToolBar.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Radio, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search }) => {
-  const [form] = Form.useForm();
-
-  //const plainOptions = ["高(可能性大)", "中(可能性较大)", "低(可能发生)"];
-  //{label:"准备转移", value: 5}
-  const plainOptions = [
-    {label:"高(可能性大)", value: 3},
-    {label:"中(可能性较大)", value: 2},
-    {label:"低(可能发生)", value: 1}
-  ];
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  useEffect(() => {
-    form.setFieldsValue({"tm": moment()});
-    form.setFieldsValue({"time": "08"});
-    form.setFieldsValue({type:[3, 2, 1]})
-  }, []);
-
-  const onSearchClick = () => {
-    const { ...rec } = form.getFieldsValue();
-    //console.log("32++++++++",rec);
-    let type1:any = "";
-    let type2:any = "";
-    let type3:any = "";
-    if(rec.type.length>0){
-      rec.type.map((item:any)=>{
-        if(item==="高(可能性大)"){
-          type1 = 3
-        }else if(item==="中(可能性较大)"){
-          type2 = 2
-        }else if(item==="低(可能发生)"){
-          type3 = 1
-        }
-      });
-    }
-    rec.tm = (rec.tm).format("YYYYMMDD") + rec.time;
-    rec.type1 = type1;
-    rec.type2 = type2;
-    rec.type3 = type3;
-    search(rec);
-  };
-
-  return record ? (
-    <Form layout="inline" form={form} >
-      <Form.Item name="tm" label="">
-        <DatePicker allowClear={false} format="YYYY-MM-DD" onChange={onSearchClick}/>
-      </Form.Item>
-      <Form.Item name="time" label="">
-        <Radio.Group onChange={onSearchClick}>
-          <Radio value={"08"}>08:00</Radio>
-          <Radio value={"20"}>20:00</Radio>
-        </Radio.Group>
-      </Form.Item>
-      <div style={{width:"100%"}}>
-        <FormItem label="" name="type">
-          <CheckboxGroup options={plainOptions} onChange={onSearchClick} />
-        </FormItem>
-      </div>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/earlyWarningPanels/risk/Information/index.less b/src/views/Home/panels/earlyWarningPanels/risk/Information/index.less
deleted file mode 100644
index 8c2964e..0000000
--- a/src/views/Home/panels/earlyWarningPanels/risk/Information/index.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.riskInformation{
-  .smallTable{
-    cursor:pointer;
-    .ant-table-thead > tr > th{
-      padding:0 10px !important;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/risk/Information/index.tsx b/src/views/Home/panels/earlyWarningPanels/risk/Information/index.tsx
deleted file mode 100644
index f7c2329..0000000
--- a/src/views/Home/panels/earlyWarningPanels/risk/Information/index.tsx
+++ /dev/null
@@ -1,373 +0,0 @@
-import {
-  EditOutlined, CloseOutlined
-} from '@ant-design/icons';
-import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Divider, Popconfirm, Image} from 'antd';
-import { ColumnsType } from 'antd/lib/table';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {fxyjDetails} from "../../../../../../models/_/shqxjs";
-import ToolBar from './ToolBar';
-import moment from "moment";
-import {httpget} from "../../../../../../utils/request";
-import apiurl from "../../../../../../service/apiurl";
-import { yjLevelColor } from '../../../../../../utils/renutils';
-import appconsts from "../../../../../../service/appconsts";
-import {useDispatch, useSelector} from "react-redux";
-import * as proj from "ol/proj";
-import "./index.less"
-import Style from "ol/style/Style";
-import Icon from "ol/style/Icon";
-import VectorLayer from "ol/layer/Vector";
-import {Vector as VectorSource} from "ol/source";
-import {transform} from "ol/proj";
-import Feature from "ol/Feature";
-import {Point} from "ol/geom";
-
-const { Option } = Select;
-
-type IProps = {
-  activeKey: any;
-}
-
-const DataTable: React.FC<IProps> = ({ activeKey }) => {
-  let mapObj = useSelector((s:any) => s.map.map);
-
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-
-  const dispatch = useDispatch();
-
-  const [showDetails, setShowDetails] = useState(false);
-  const [detailsData, setDetailsData] = useState({});
-
-  const showDetailsFun = (val:any) => {
-    setShowDetails(true);
-    setDetailsData(val);
-  };
-
-  useEffect(() => {
-    setShowDetails(false);
-  }, [activeKey]);
-
-  useEffect(() => {
-    dispatch.runtime.setHasRightPanel(showDetails);
-  }, [showDetails]);
-
-  const [tableData, setTableData] = useState<any>([]);
-  const [defalutData, setDefalutData] = useState<any>([]);
-
-  const [timeVal, setTimeVal] = useState(moment().format("YYYYMMDD")+"08");
-
-  const [selectedValues, setSelectedValues] = useState([]);
-
-  const doSearch = (params:any) => {
-    //console.log("params  64+++",params);
-    setSelectedValues(params.type);
-
-    setTimeVal(params.tm?params.tm:"");
-  };
-
-  const getData = async (tm:any) => {
-    const params = {
-      tm: timeVal,//"2021061808"
-      adcd: systemSwitchType?"420529":"422822" //建始县422822 五峰县420529
-    };
-    const resData = await fxyjDetails(params);
-    let data = resData.data;
-    if(resData.code === 200){
-      if(data && Object.keys(data).length>0 && data.children.length>0){
-        if(selectedValues.length===0){
-          setDefalutData([]);
-          setTableData([]);
-        }else{
-          setDefalutData([data]);
-          setTableData([data]);
-        }
-      }else{
-        setDefalutData([]);
-        setTableData([]);
-      }
-    }
-  };
-
-  useEffect(() => {
-    let tm = timeVal;//moment().format("YYYYMMDD")+"08";
-    getData(tm);
-  }, [timeVal]);
-
-  // 筛选函数
-  // @ts-ignore
-  const filterData = (data) => {
-    let filteredData:any = [];
-    //console.log("114+++",data,selectedValues);
-    if (Array.isArray(data)) {
-      for (let i = 0; i < data.length; i++) {
-        const node = data[i];
-        // @ts-ignore
-        if (selectedValues.includes(node.maxLv)) {
-          filteredData.push({
-            ...node,
-            children: filterData(node.children),
-          });
-        } else if (node.children && node.children.length > 0) {
-          const children = filterData(node.children);
-          if (children.length > 0) {
-            filteredData.push({
-              ...node,
-              children: children,
-            });
-          }
-        }
-      }
-    }
-    return filteredData;
-  };
-
-  useEffect(() => {
-    const filteredData = filterData(defalutData);
-    //console.log("filteredData 133++++",filteredData);
-    setTableData(filteredData);
-  }, [timeVal, selectedValues]);
-
-
-  const columns:any = useMemo(() => [
-    //{ title: '序号', key: 'inx', dataIndex: 'inx', align: 'center', width: 80, render: (val:any, rec:any, inx:any) => inx + 1 },
-    { title: '乡镇', key: 'adnm', dataIndex: 'adnm', align: 'left',  width: 160, ellipsis: true},
-    { title: '平均雨量', key: '', dataIndex: '', align: 'center', render: (rec:any)=><div >{rec.av?(rec.av).toFixed(1):"-"}</div>},
-    { title: '最大雨量', key: '', dataIndex: '', align: 'center', render: (rec:any)=><div >{rec.drp?(rec.drp).toFixed(1):"-"}</div>},
-    // @ts-ignore
-    { title: '预警等级', key: '', dataIndex: '', align: 'center', render: (rec:any)=><div style={{ background: yjLevelColor(rec.maxLv), width:"10px", height:"10px", borderRadius:"50%", margin:"0 auto" }}></div>}
-  ], []);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-
-    }};
-
-
-  const [mapData, setMapData] = useState<any>([]);
-
-  useEffect(() => {
-    let cunData:any = [];
-    if(tableData[0] && Object.keys(tableData[0]).length>0){
-      if(tableData[0].children.length>0){
-        tableData[0].children.map((item:any)=>{
-          if(item.children.length>0){
-            item.children.map((item1:any)=>{
-              cunData.push(item1);
-            });
-          }
-        });
-        setMapData(cunData);
-      }
-    }else{
-      setMapData([]);
-    }
-  }, [tableData]);
-
-  const [selectedPoint, setSelectedPoint] = useState<any>([]);
-
-  const clickRow = (val:any) => {
-    setSelectedPoint(proj.fromLonLat([val.lgtd,val.lttd]));
-
-    let forecastPointsLayer:any = {};
-    mapObj.getLayers().getArray().forEach((layer:any)=> {
-      if(layer.values_.name === "riskPoints"){
-        forecastPointsLayer = layer;
-      }
-    });
-    //清除选中的三角形
-    let features = forecastPointsLayer.getSource().getFeatures();
-    features.forEach((f:any) => f.setStyle([]));
-  };
-
-  useEffect(() => {
-    //console.log("mapData 194+++",mapData);
-    if(mapObj && activeKey === "1"){
-      const circleStyle = new Style({
-        image: new Icon({
-          src: `${process.env.PUBLIC_URL}/assets/riskSelect.png`,
-          anchor: [0.5, 0.5],
-          opacity: 1,
-          scale: 1,
-        })
-      });
-
-      var layer = new VectorLayer({
-        // @ts-ignore
-        name:"riskPoints",
-        source: new VectorSource(),
-        style: (feature:any) =>{
-          if(feature.getGeometry().getCoordinates()[0] === selectedPoint[0] && feature.getGeometry().getCoordinates()[1] === selectedPoint[1]){
-            return [new Style({
-              image: new Icon({
-                //可能性大  高  3      可能性较大  中   2      可能发生  低  1
-                src: feature.get("maxLv")==="高(可能性大)"?`${process.env.PUBLIC_URL}/assets/high.png`:
-                  feature.get("maxLv")==="中(可能性较大)"?`${process.env.PUBLIC_URL}/assets/mid.png`:
-                    feature.get("maxLv")==="低(可能发生)"?`${process.env.PUBLIC_URL}/assets/low.png`:"",
-                anchor: [0.5, 0.5],
-                opacity: 1,
-                scale: 0.25,
-              }),
-              zIndex:20
-            }), circleStyle]
-          }else{
-            return [new Style({
-              image: new Icon({
-                //可能性大  高  3      可能性较大  中   2      可能发生  低  1
-                src: feature.get("maxLv")==="高(可能性大)"?`${process.env.PUBLIC_URL}/assets/high.png`:
-                  feature.get("maxLv")==="中(可能性较大)"?`${process.env.PUBLIC_URL}/assets/mid.png`:
-                    feature.get("maxLv")==="低(可能发生)"?`${process.env.PUBLIC_URL}/assets/low.png`:"",
-                anchor: [0.5, 0.5],
-                opacity: 1,
-                scale: 0.25,
-              }),
-              zIndex:20
-            })]
-          }
-        }
-      });
-
-      mapData.forEach((point:any) => {
-        const point2 = transform([point.lgtd, point.lttd], 'EPSG:4326', 'EPSG:3857');
-
-        const feature = new Feature({
-          geometry: new Point(point2),
-          adcd: point.adcd,
-          adnm: point.adnm,
-          maxLv: point.maxLv===3?"高(可能性大)":point.maxLv===2?"中(可能性较大)":"低(可能发生)",
-          lgtd: point.lgtd,
-          lttd: point.lttd,
-          data: point
-        });
-
-        // @ts-ignore
-        layer.getSource().addFeature(feature);
-      });
-
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "riskPoints"){
-          layer.getSource().clear();
-        }
-      });
-
-      mapObj.addLayer(layer);
-
-      mapObj.on('click', function(evt:any) {
-        var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function(feature:any) {
-          return feature;
-        });
-        if (feature) {
-          let adcd = feature.get('adcd');
-          let lgtd = feature.get('lgtd');
-          let lttd = feature.get('lttd');
-          let data = feature.get('data');
-
-          if(adcd){
-            dispatch.runtime.setFeaturePop({
-              id: adcd,
-              type: 'RiskPop',
-              data,
-              lgtd: lgtd,
-              lttd: lttd,
-            })
-          }
-        }
-      });
-    }
-  }, [mapData, mapObj, selectedPoint, activeKey]);
-
-  return (
-    <div className="riskInformation" style={{width:"92%",marginLeft:"4%"}}>
-      <div style={{margin:"0 0 10px 6px"}}>
-        <ToolBar params={{ ...options1.search }} search={doSearch} />
-      </div>
-      {/*<div className="card-h-margin" />*/}
-      <div className="smallTable">
-        {
-          tableData.length>0?
-            <Table rowKey="lgtd" bordered
-                   columns={columns}
-                   pagination={false}
-                   dataSource={tableData}
-                   scroll={{ y: "50vh" }}
-                   expandable={
-                     {
-                       indentSize: 10,
-                       defaultExpandAllRows: true
-                     }
-                   }
-                   onRow={
-                     (record:any)=>({
-                       onClick:()=>{
-                         showDetailsFun(record);
-
-                         if(!record.adcd.endsWith('000000') && record.adcd.endsWith('000')){
-                           mapObj.getView().setCenter(proj.fromLonLat([record.lgtd,record.lttd]));
-                           mapObj.getView().setZoom(12.5);
-
-                           clickRow(record);
-                         }
-                       }
-                     })
-                   }
-            />:<div style={{textAlign:"center", margin:"18% 10% 0 10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }
-      </div>
-
-      {/*右侧详情*/}
-      {
-      showDetails?<div className="rightDetails" style={{height: hasAlertBox?"calc(100vh - 114px)":"calc(100vh - 84px)"}}>
-        <div className="clearFloat panelTitle">
-          <div className="lf">
-            <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-          </div>
-          <span className="lf txt">详情</span>
-          <div className="rf closeBtn" onClick={()=>setShowDetails(false)}>
-            <CloseOutlined />
-          </div>
-        </div>
-        <div className="listDiv">
-          <div className="clearFloat">
-            {/*// @ts-ignore*/}
-            <span className="lf nameSpan">防灾对象</span>
-          </div>
-          <div className="txtDiv">
-            <div className="clearFloat">
-              <span className="lf labelSpan">预警等级:</span>
-              {/*// @ts-ignore*/}
-              <span className="rf textSpan" style={{ background: yjLevelColor(detailsData.maxLv), width:"10px", height:"10px", borderRadius:"50%", margin:"0 auto" }}></span>
-            </div>
-            <div className="clearFloat">
-              <span className="lf labelSpan">行政区划:</span>
-              {/*// @ts-ignore*/}
-              <span className="rf textSpan">{detailsData.adnm}</span>
-            </div>
-            <div className="clearFloat">
-              <span className="lf labelSpan">防洪能力:</span>
-              <span className="rf textSpan">-</span>
-            </div>
-            <div className="clearFloat">
-              <span className="lf labelSpan">关联站点:</span>
-              <span className="rf textSpan">-</span>
-            </div>
-            <div className="clearFloat">
-              <span className="lf labelSpan">所属小流域:</span>
-              <span className="rf textSpan">-</span>
-            </div>
-            <div className="clearFloat">
-              <span className="lf labelSpan">防灾对象编码:</span>
-              <span className="rf textSpan">-</span>
-            </div>
-          </div>
-        </div>
-      </div>:null
-    }
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/earlyWarningPanels/risk/index.less b/src/views/Home/panels/earlyWarningPanels/risk/index.less
deleted file mode 100644
index 51f2135..0000000
--- a/src/views/Home/panels/earlyWarningPanels/risk/index.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.riskBox{
-  margin-top:-10px;
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 55rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-
-  .drpBox{
-    .button-group span{
-      padding: 0 0.1rem;
-    }
-  }
-  .ellipsisDiv{
-    width:115px;
-    overflow: hidden;//溢出隐藏
-    white-space: nowrap;//禁止换行
-    text-overflow: ellipsis;//...
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/risk/index.tsx b/src/views/Home/panels/earlyWarningPanels/risk/index.tsx
deleted file mode 100644
index 0a4b273..0000000
--- a/src/views/Home/panels/earlyWarningPanels/risk/index.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {Collapse, Image, Radio} from 'antd'
-import React, {useEffect, useState} from 'react'
-import "./index.less"
-import InformationPage from './Information';
-import {useSelector} from "react-redux";
-
-const { Panel } = Collapse;
-
-type IProps = {
-  activeKey: any;
-}
-
-const HoursPanelPage: React.FC<IProps> = ({ activeKey }) => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const onChange = (key: string | string[]) => {
-    console.log(key);
-  };
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <div className="riskBox" style={{top:"20px", height: hasAlertBox?"calc(100vh - 110px)":"calc(100vh - 90px)"}}>
-      <Collapse defaultActiveKey={['1', '2', '3']} onChange={onChange} expandIconPosition="end" >
-        <Panel header={<div className="clearFloat panelTitle">
-            <div className="lf">
-              {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">预警信息</span>
-          </div>} key="1">
-          <InformationPage activeKey={activeKey}/>
-        </Panel>
-
-      </Collapse>
-    </div>
-  )
-}
-
-export default HoursPanelPage
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/ToolBar.tsx b/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/ToolBar.tsx
deleted file mode 100644
index bdd1f43..0000000
--- a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/ToolBar.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, {useEffect} from 'react';
-import moment from "moment";
-import {Form, DatePicker, Button} from 'antd';
-
-const { RangePicker } = DatePicker;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  activeKey: any;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, activeKey }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  const onSearchClick = () => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD HH:mm:ss');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD HH:mm:ss');
-      }
-    }
-    search(rec);
-  };
-
-  useEffect(() => {
-   if(activeKey === "4"){
-     form.setFieldsValue({"tm": [moment().add(-1, 'day'), moment()]});
-   }
-  }, [activeKey]);
-
-  return record ? (
-    <Form layout="inline" form={form} >
-      <Form.Item name="tm" label="" style={{marginRight:8}} rules={[{ required: true }]}>
-        <RangePicker
-          allowClear={false}
-          showTime
-          format="YYYY-MM-DD HH:mm:ss"
-          style={{width:"325px"}}
-          defaultValue={[moment().add(-1, 'day'), moment()]}
-        />
-      </Form.Item>
-      <FormItem style={{margin:0}}>
-        <Button type="primary" onClick={onSearchClick}>查询</Button>
-      </FormItem>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/index.less b/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/index.less
deleted file mode 100644
index e982268..0000000
--- a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/index.less
+++ /dev/null
@@ -1,107 +0,0 @@
-.picBox{
-  .panelTitle {
-    padding-left: 14px;
-    box-sizing: border-box;
-  }
-  .topQuery{
-    min-height: 30px;
-    line-height: 30px;
-    margin: 5px 15px;
-    .ant-checkbox-wrapper{
-      width:75px;
-    }
-    .ant-input{
-      padding: 2px 10px;
-    }
-  }
-  .listDiv{
-    height:calc( 100vh - 220px );
-    overflow: hidden auto;
-    .item{
-      padding: 10px 26px 0 20px;
-      box-sizing: border-box;
-      border-top: 1px solid #ECF2F9;
-    }
-    .nameSpan{
-      padding: 0 8px;
-      background: #0893FF;
-      color: #fff;
-      letter-spacing: 1px;
-      border-radius: 4px;
-      margin-right:10px;
-      line-height:26px;
-      cursor:pointer;
-    }
-    .time{
-      color:#333;
-      font-weight:bold;
-      font-size:13px;
-      line-height:26px;
-    }
-    .imgBox{
-      text-align: center;
-      margin: 20px 0;
-    }
-    .text{
-      margin-bottom:20px;
-      >div{
-        padding: 0 25px 0 10px;
-        span{
-          color:#333;
-          font-size:15px;
-          line-height: 26px;
-        }
-        .linkTxt{
-          color:#0083FE;
-          text-decoration: underline;
-          text-decoration-color: #0083FE;
-          font-weight:bold;
-        }
-      }
-    }
-  }
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .picDiv{
-        position: relative;
-        .picTm{
-          position: absolute;
-          right: 15px;
-          bottom: 0;
-          line-height: 20px;
-          background: rgba(255, 255, 255, 0.5);
-          padding:2px 5px;
-          box-sizing: border-box;
-          font-weight:bold;
-        }
-      }
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/index.tsx b/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/index.tsx
deleted file mode 100644
index 99f1397..0000000
--- a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/Information/index.tsx
+++ /dev/null
@@ -1,277 +0,0 @@
-import {
-  EditOutlined, CloseOutlined
-} from '@ant-design/icons';
-import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Divider, Popconfirm, Image} from 'antd';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import ToolBar from './ToolBar';
-import moment from "moment";
-import clsx from "clsx";
-import {renderDrp, renderSkArz, renderSkDdz} from "../../../../../../utils/renutils";
-import genDamImage from "../../../../../../components/DamGraph/DamImage";
-import {config} from "../../../../../../config";
-import {useDispatch, useSelector} from "react-redux";
-import appconsts from '../../../../../../service/appconsts';
-
-type IProps = {
-  activeKey: any;
-}
-
-const DataTable: React.FC<IProps> = ({ activeKey }) => {
-  const markers = useSelector((s:any) => s.runtime.markers);
-
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const [selectedTr, setSelectedTr] = useState("");
-
-  const dispatch = useDispatch();
-
-  const [tableData, setTableData] = useState<any>([]);
-
-  const [showDetails, setShowDetails] = useState(false);
-  const [detailsData, setDetailsData] = useState<any>({});
-
-  const showDetailsFun = (val:any) => {
-    setSelectedTr(val.stcd);
-
-    setShowDetails(true);
-    setDetailsData(val);
-
-    dispatch.map.setLayerVisible({'SmallSkRiskLayer': true});
-
-    dispatch.runtime.setFeaturePop({ type: "smallSkRisk", data: val, lgtd: val.lgtd, lttd: val.lttd, });
-
-    dispatch.runtime.setCameraTarget({
-      center: [val.lgtd, val.lttd],
-      zoom: 15,
-      pitch: config.poiPitch,
-    });
-  };
-
-  useEffect(() => {
-    setShowDetails(false);
-
-    dispatch.runtime.setSmallSkRiskTime({
-      "stm": moment().add(-1, 'day').format('YYYY-MM-DD HH:mm:ss'),
-      "etm": moment().format('YYYY-MM-DD HH:mm:ss')
-    });
-  }, [activeKey]);
-
-  useEffect(()=>{
-    if( markers.SmallSkRiskLayer && markers.SmallSkRiskLayer.length>0 && activeKey === "4"){
-      setTableData(markers.SmallSkRiskLayer);
-      dispatch.map.setLayerVisible({SmallSkRiskLayer: true});
-    }else{
-      setTableData([]);
-      dispatch.map.setLayerVisible({SmallSkRiskLayer: false});
-      setShowDetails(false);
-      setSelectedTr("");
-
-      dispatch.runtime.closeFeaturePop(undefined);
-    }
-  },[markers]);
-
-  useEffect(() => {
-    dispatch.runtime.setHasRightPanel(showDetails);
-  }, [showDetails]);
-
-  const [picData, setPicData] = useState({});
-  const [damGraph, setDamGraph] = useState();
-  const [picidx, setpicidx] = useState([1, 2]);
-
-  useEffect(() => {
-    if(detailsData.length>0){
-      setPicData({
-        pic1: detailsData.pic[0].url,
-        pic2: detailsData.pic[1].url,
-        pic1Tm: moment(detailsData.pic[0].tm).format('YYYY-MM-DD HH:mm:ss'),
-        pic2Tm: moment(detailsData.pic[1].tm).format('YYYY-MM-DD HH:mm:ss'),
-      });
-    }
-  }, []);
-
-  useEffect(() => {
-    const img = genDamImage(detailsData, 400, 260);
-    // @ts-ignore
-    setDamGraph(img);
-  }, [detailsData]);// eslint-disable-line
-
-  const changePic = () => {
-    setpicidx([picidx[0] === 1 ? 2 : 1, picidx[1] === 1 ? 2 : 1])
-  }
-
-  const columns:any = useMemo(() => [
-    { title: '序号', key: 'inx', dataIndex: 'inx', align: 'center', width: 80, render: (val:any, rec:any, inx:any) => inx + 1 },
-    { title: '水库名称', key: '', dataIndex: '', align: 'center', render: (rec:any)=><span onClick={()=>showDetailsFun(rec)} style={{cursor:"pointer"}}>{rec.stnm}</span>},
-    { title: '预报雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center', },
-    //@ts-ignore
-    { title: '预警等级', key: 'warningLevel', dataIndex: 'warningLevel', align: 'center', render:(data)=>(<>{appconsts.smallSkRiskWarningLevel[data]}</>) },
-  ], []);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-      deptNames: null,
-      stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-      etm:  moment().format("YYYY-MM-DD"),
-    }};
-
-  const doSearch = (params:any) => {
-    console.log("params  120+++",params);
-
-    dispatch.runtime.setSmallSkRiskTime({
-      stm: params.stm,
-      etm: params.etm,
-    });
-  };
-
-  return (
-    <div className="rWaterBox" style={{width:"92%",marginLeft:"4%"}}>
-      <div style={{margin:"0 0 10px 6px"}}>
-        <ToolBar params={{ ...options1.search }} search={doSearch} activeKey={activeKey}/>
-      </div>
-      {/*<div className="card-h-margin" />*/}
-      <div className="smallTable">
-        <Table rowKey="id" bordered rowClassName={(record:any) => record.stcd === selectedTr?"selectedTr":""}
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               scroll={{ y: "calc( 100vh - 300px )" }}
-        />
-      </div>
-
-      {/*右侧详情*/}
-      {
-        showDetails?<div className="rightDetails" style={{height: hasAlertBox?"calc(100vh - 114px)":"calc(100vh - 84px)"}}>
-          <div className="clearFloat panelTitle">
-            <div className="lf">
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">详情</span>
-            <div className="rf closeBtn" onClick={()=>setShowDetails(false)}>
-              <CloseOutlined />
-            </div>
-          </div>
-          <div className="listDiv" style={{height: hasAlertBox?"calc(100vh - 150px)":"calc(100vh - 135px)"}}>
-            <div className="clearFloat">
-              {/*// @ts-ignore*/}
-              <span className="lf nameSpan">{detailsData.name}</span>
-            </div>
-            <div style={{height:"calc( 100% - 20px )", overflow:"hidden auto"}}>
-              <div className="txtDiv skPop">
-                <div className="realinfo">
-                  <div
-                    className={clsx(detailsData.rzState === 1 ? "online" : "offline","dataTm")}
-                  >水位上报时间: {detailsData.rzTm?moment(detailsData.rzTm).format('YYYY-MM-DD HH:mm'):"-"}</div>
-
-                  <div className="infoItem">
-                    <div className="row-key">监测水位:</div>
-                    <div className="row-value">{detailsData.rz}</div>
-                    <div className="row-unit">米</div>
-                  </div>
-
-                  <div className="infoItem">
-                    <div className="row-key">汛限水位:</div>
-                    <div className="row-value">{detailsData.fsltdz} ｜ {renderSkArz(detailsData)}</div>
-                    <div className="row-unit">米</div>
-                  </div>
-
-                  <div className="infoItem">
-                    <div className="row-key">正常蓄水位:</div>
-                    <div className="row-value">{detailsData.zcxsw} ｜ {renderSkArz(detailsData, 'zcxsw')}</div>
-                    <div className="row-unit">米</div>
-                  </div>
-
-                  <div className="infoItem">
-                    <div className="row-key">设计洪水位:</div>
-                    <div className="row-value">{detailsData.dsflz} ｜ {renderSkArz(detailsData, 'dsflz')}</div>
-                    <div className="row-unit">米</div>
-                  </div>
-
-                  <div className="infoItem">
-                    <div className="row-key">死水位:</div>
-                    {/*// @ts-ignore*/}
-                    <div className="row-value">{detailsData.ddz} ｜ {renderSkDdz(detailsData, 'hjhsw')}</div>
-                    <div className="row-unit">米</div>
-                  </div>
-
-                  <div className="infoItem">
-                    <div className="row-key">水库库容:</div>
-                    <div className="row-value">{detailsData.cpw || detailsData.w || ''}</div>
-                    <div className="row-unit">万方</div>
-                  </div>
-
-                  <div className="infoItem">
-                    <div className="row-key">兴利库容:</div>
-                    <div className="row-value">{detailsData.xlkr}</div>
-                    <div className="row-unit">万方</div>
-                  </div>
-
-
-                  <div style={{marginTop:"10px"}}
-                       className={clsx(detailsData.drpState === 1 ? "online" : "offline","dataTm")}
-                  >雨量上报时间: {detailsData.drpTm?moment(detailsData.drpTm).format('YYYY-MM-DD HH:mm'):"-"}</div>
-
-
-                  <div className="infoItem">
-                    <div className="row-key">小时雨量:</div>
-                    <div className="row-value"><span style={{background:"rgba(4, 8, 27, 0.9)", padding:"0 6px"}}>{renderDrp(detailsData, 'h1')}</span></div>
-                    <div className="row-unit">毫米</div>
-                  </div>
-                  <div className="infoItem">
-                    <div className="row-key">24小时雨量:</div>
-                    <div className="row-value"><span style={{background:"rgba(4, 8, 27, 0.9)", padding:"0 6px"}}>{renderDrp(detailsData, 'h24')}</span></div>
-                    <div className="row-unit">毫米</div>
-                  </div>
-                  <div className="infoItem">
-                    <div className="row-key">今日雨量:</div>
-                    <div className="row-value"><span style={{background:"rgba(4, 8, 27, 0.9)", padding:"0 6px"}}>{renderDrp(detailsData, 'today')}</span></div>
-                    <div className="row-unit">毫米</div>
-                  </div>
-                </div>
-
-                <div className="picContainer">
-                  {
-                    damGraph ? (
-                      <div style={{margin:"16px 0"}}>
-                        <img alt="pic" src={damGraph} style={{ width: '100%', opacity: 1.0, borderRadius: 4 }} />
-                      </div>
-                    ) : (
-                      <div className="noPic">-</div>
-                    )
-                  }
-                  <div>
-                    {/*// @ts-ignore*/}
-                    <img alt="pic" src={picData?.[`pic${picidx[0]}`]} style={{ width: '100%', borderRadius: 4 }} />
-                    {/*// @ts-ignore*/}
-                    <div className="tm">{picData?.[`pic${picidx[0]}Tm`]}</div>
-                    {
-                      // @ts-ignore
-                      picData?.[`pic${picidx[1]}`] ? (
-                        <div className="thumb">
-                          <img
-                            onClick={changePic}
-                            alt="pic2"
-                            // @ts-ignore
-                            src={picData?.[`pic${picidx[1]}`]}
-                            style={{
-                              width: 'calc(100% - 2px)',
-                              cursor: 'pointer',
-                              borderTop: '2px solid white',
-                              borderLeft: '2px solid white'
-                            }}
-                            role="presentation" />
-                        </div>
-                      ) : null
-                    }
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>:null
-      }
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/index.less b/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/index.less
deleted file mode 100644
index f5d2428..0000000
--- a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/index.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.smallReservoirRiskBox{
-  margin-top:-10px;
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 55rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-
-  .drpBox{
-    .button-group span{
-      padding: 0 0.1rem;
-    }
-  }
-  .ellipsisDiv{
-    width:115px;
-    overflow: hidden;//溢出隐藏
-    white-space: nowrap;//禁止换行
-    text-overflow: ellipsis;//...
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/index.tsx b/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/index.tsx
deleted file mode 100644
index bf0849f..0000000
--- a/src/views/Home/panels/earlyWarningPanels/smallReservoirRisk/index.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import {Collapse, Image, Radio} from 'antd'
-import React, {useEffect, useState} from 'react'
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import "./index.less"
-import moment from "moment";
-import useCrud from "../../../../../components/crud/useCrud";
-import InformationPage from './Information';
-
-const { Panel } = Collapse;
-
-type IProps = {
-  activeKey: any;
-}
-
-const HoursPanelPage: React.FC<IProps> = ({ activeKey }) => {
-  const crud = useCrud();
-
-  const onChange = (key: string | string[]) => {
-    console.log(key);
-  };
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <div className="smallReservoirRiskBox">
-      <Collapse defaultActiveKey={['1']} onChange={onChange} expandIconPosition="end" >
-        <Panel header={<div className="clearFloat panelTitle">
-          <div className="lf">
-            {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-            <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-          </div>
-          <span className="lf txt">预警信息</span>
-        </div>} key="1">
-          <InformationPage activeKey={activeKey}/>
-        </Panel>
-
-      </Collapse>
-    </div>
-  )
-}
-
-export default HoursPanelPage
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/yagl/DataTable.tsx b/src/views/Home/panels/earlyWarningPanels/yagl/DataTable.tsx
deleted file mode 100644
index b0e135c..0000000
--- a/src/views/Home/panels/earlyWarningPanels/yagl/DataTable.tsx
+++ /dev/null
@@ -1,646 +0,0 @@
-import {
-    EditOutlined, CloseOutlined
-  } from '@ant-design/icons';
-  import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Divider, Popconfirm, Image} from 'antd';
-  import { ColumnsType } from 'antd/lib/table';
-  import React, {useCallback, useEffect, useMemo, useState} from 'react';
-  import { CrudContext } from '../../../../../components/crud/useCrud';
-  import { SearchOption } from "../../../../../service/def";
-  // import ToolBar from './ToolBar';
-  import moment from "moment";
-  import clsx from "clsx";
-  import {renderDrp, renderSkArz, renderSkDdz} from "../../../../../utils/renutils";
-  import genDamImage from "../../../../../components/DamGraph/DamImage";
-  import {config} from "../../../../../config";
-  import {useDispatch} from "react-redux";
-  import staticData from '../../../../staticData';
-
-  
-  const { Option } = Select;
-  
-  type IProps = {
-    activeKey: any;
-    pdf:any
-  }
-  
-  const DataTable: React.FC<IProps> = ({ activeKey,pdf }) => {
-    const dispatch = useDispatch();
-    const [showDetails, setShowDetails] = useState(false);
-    const [detailsData, setDetailsData] = useState({});
-  
-    const data:any = staticData.xskfxyjData;
-  
-    const showDetailsFun = (val:any) => {
-      setShowDetails(true);
-      setDetailsData(val);
-  
-      dispatch.runtime.setCameraTarget({
-        center: [data.lgtd, data.lttd],
-        zoom: 15,
-        pitch: config.poiPitch,
-      });
-    };
-  
-    useEffect(() => {
-      setShowDetails(false);
-    }, [activeKey]);
-  
-    useEffect(() => {
-      dispatch.runtime.setHasRightPanel(showDetails);
-    }, [showDetails]);
-  
-    const [picData, setPicData] = useState({});
-    const [damGraph, setDamGraph] = useState();
-    const [picidx, setpicidx] = useState([1, 2]);
-  
-    useEffect(() => {
-      setPicData({
-        pic1: data.pic[0].url,
-        pic2: data.pic[1].url,
-        pic1Tm: moment(data.pic[0].tm).format('YYYY-MM-DD HH:mm:ss'),
-        pic2Tm: moment(data.pic[1].tm).format('YYYY-MM-DD HH:mm:ss'),
-      });
-    }, []);
-  
-    useEffect(() => {
-      const img = genDamImage(data, 400, 260);
-      // @ts-ignore
-      setDamGraph(img);
-    }, [data]);// eslint-disable-line
-  
-    const changePic = () => {
-      setpicidx([picidx[0] === 1 ? 2 : 1, picidx[1] === 1 ? 2 : 1])
-    }
-  
-    const name = data.stnm;
-    const tableData:any = [
-      {
-          "planId": 5,
-          "levels": 6,
-          "planName": "妥安村马店山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001100",
-          "lgtd": 110.425785,
-          "lttd": 30.053044,
-          "attachUpdateTime": null,
-          "planStatus": 1,
-          "uploadAttachStatus": true,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 1,
-          "levels": 6,
-          "planName": "马厂村下马厂山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105207101",
-          "lgtd": 110.353433,
-          "lttd": 30.090529,
-          "attachUpdateTime": null,
-          "planStatus": 1,
-          "uploadAttachStatus": true,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 32,
-          "levels": 6,
-          "planName": "三组（黄家湾下）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001105",
-          "lgtd": 110.423788,
-          "lttd": 30.052927,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 4,
-          "levels": 6,
-          "planName": "城关村粮管所山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001105",
-          "lgtd": 110.423788,
-          "lttd": 30.052927,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 33,
-          "levels": 6,
-          "planName": "上街山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001100",
-          "lgtd": 110.425785,
-          "lttd": 30.053044,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 34,
-          "levels": 6,
-          "planName": "二组山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105207101",
-          "lgtd": 110.353433,
-          "lttd": 30.090529,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 35,
-          "levels": 6,
-          "planName": "三组山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105207100",
-          "lgtd": 110.348484,
-          "lttd": 30.077671,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 2,
-          "levels": 6,
-          "planName": "杜家庄村盐柴河山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105207100",
-          "lgtd": 110.348484,
-          "lttd": 30.077671,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 36,
-          "levels": 6,
-          "planName": "二组（胡家坪）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105201101",
-          "lgtd": 110.439722,
-          "lttd": 30.055551,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 37,
-          "levels": 6,
-          "planName": "四组（覃家坪）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105201103",
-          "lgtd": 110.430404,
-          "lttd": 30.036725,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 38,
-          "levels": 6,
-          "planName": "一组（八里铺）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105201104",
-          "lgtd": 110.458963,
-          "lttd": 30.074837,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 39,
-          "levels": 6,
-          "planName": "二组（白果湾）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105201105",
-          "lgtd": 110.436559,
-          "lttd": 30.051893,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 40,
-          "levels": 6,
-          "planName": "中街山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001101",
-          "lgtd": 110.425614,
-          "lttd": 30.048871,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 41,
-          "levels": 6,
-          "planName": "下街山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001102",
-          "lgtd": 110.427007,
-          "lttd": 30.041187,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 42,
-          "levels": 6,
-          "planName": "四组山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001103",
-          "lgtd": 110.435104,
-          "lttd": 30.057728,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 43,
-          "levels": 6,
-          "planName": "二组（小凤池下）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105203103",
-          "lgtd": 110.406546,
-          "lttd": 30.024965,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 44,
-          "levels": 6,
-          "planName": "三组（横渡口）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105203100",
-          "lgtd": 110.397542,
-          "lttd": 30.052772,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 45,
-          "levels": 6,
-          "planName": "四组（三峰岗）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105204101",
-          "lgtd": 110.456626,
-          "lttd": 30.106181,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 46,
-          "levels": 6,
-          "planName": "一组（土坪）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105204103",
-          "lgtd": 110.510515,
-          "lttd": 30.127021,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 47,
-          "levels": 6,
-          "planName": "二组（横河）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105204104",
-          "lgtd": 110.47501,
-          "lttd": 30.097844,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 48,
-          "levels": 6,
-          "planName": "三组（关岔口）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105204105",
-          "lgtd": 110.47866,
-          "lttd": 30.080996,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 49,
-          "levels": 6,
-          "planName": "二组（茅庄）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105204106",
-          "lgtd": 110.487741,
-          "lttd": 30.117695,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 50,
-          "levels": 6,
-          "planName": "五组（三板桥）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105204100",
-          "lgtd": 110.385549,
-          "lttd": 30.084092,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 51,
-          "levels": 6,
-          "planName": "二组（红旗2）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105205101",
-          "lgtd": 110.403766,
-          "lttd": 30.016641,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 52,
-          "levels": 6,
-          "planName": "三组(幺牌）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105205102",
-          "lgtd": 110.407947,
-          "lttd": 30.013943,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 53,
-          "levels": 6,
-          "planName": "一组（龚家坪）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105205103",
-          "lgtd": 110.370446,
-          "lttd": 30.04961,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 54,
-          "levels": 6,
-          "planName": "二组（红旗1）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105205100",
-          "lgtd": 110.403549,
-          "lttd": 30.021536,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 55,
-          "levels": 6,
-          "planName": "三组山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105201102",
-          "lgtd": 110.457203,
-          "lttd": 30.049073,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 56,
-          "levels": 6,
-          "planName": "二组（小凤池上）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105203102",
-          "lgtd": 110.41154,
-          "lttd": 30.032823,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 31,
-          "levels": 6,
-          "planName": "三组（黄家湾上）山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001104",
-          "lgtd": 110.421384,
-          "lttd": 30.061152,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-        "planId": 4,
-        "levels": 6,
-        "planName": "城关村粮管所山洪灾害村级预案",
-        "adnm": null,
-        "adcd": "420529105001105",
-        "lgtd": 110.423788,
-        "lttd": 30.052927,
-        "attachUpdateTime": null,
-        "planStatus": 0,
-        "uploadAttachStatus": false,
-        "updateTime": null,
-        "updateBy": null,
-        "padnm": null
-      },
-      {
-          "planId": 33,
-          "levels": 6,
-          "planName": "上街山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105001100",
-          "lgtd": 110.425785,
-          "lttd": 30.053044,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-      {
-          "planId": 34,
-          "levels": 6,
-          "planName": "二组山洪灾害村级预案",
-          "adnm": null,
-          "adcd": "420529105207101",
-          "lgtd": 110.353433,
-          "lttd": 30.090529,
-          "attachUpdateTime": null,
-          "planStatus": 0,
-          "uploadAttachStatus": false,
-          "updateTime": null,
-          "updateBy": null,
-          "padnm": null
-      },
-  ]
-  
-    const columns:any = useMemo(() => [
-      // { title: '序号', key: 'inx', dataIndex: 'inx', align: 'center', width: 80, render: (val:any, rec:any, inx:any) => inx + 1 },
-      { title: ' 预案名称', key: 'planName', dataIndex: 'planName', align: 'left',width: 350},
-      { title: '预警级别', key: 'levels', dataIndex: 'levels', align: 'center', render:()=>('社区级')},
-      { title: '更新时间', key: 'updateTime', dataIndex: 'updateTime', align: 'center', },
-      { title: '更新用户', key: 'updateBy', dataIndex: 'updateBy', align: 'center', },
-    ], []);
-  
-    // 初始接收默认查询参数
-    const options1 = {
-      search: {
-        deptNames: null,
-        stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-        etm:  moment().format("YYYY-MM-DD"),
-      }};
-  
-    const doSearch = (params:any) => {
-  
-    };
-  
-    return (
-      <div className="rWaterBox">
-        {/* <div style={{margin:"0 0 10px 6px"}}>
-          <ToolBar params={{ ...options1.search }} search={doSearch} />
-        </div> */}
-        {/*<div className="card-h-margin" />*/}
-        <div className="smallTable">
-          <Table rowKey="id" bordered
-              
-                 columns={columns}
-                //  pagination={true}
-                 dataSource={tableData}
-                 pagination={
-                  {
-                    showSizeChanger: true,
-                    showQuickJumper: true,
-                    pageSize: 30,
-                    current: 1,
-                    pageSizeOptions: [
-                        "10",
-                        "15",
-                        "20",
-                        "50",
-                        "100"
-                    ],
-                    total:32,
-                    showTotal:()=>'共32条'
-                  }
-                 }
-                 scroll={{ y: 750 }}
-                 rowClassName={
-                  (record, index) => {
-                    let className = '';
-                    className = index % 2 === 0 ? 'oddRow' : 'evenRow';
-                    return className;}
-                 }
-                 onRow={
-                  (record)=>({
-                    onClick:()=>{
-                      if(record.planName === '妥安村马店山洪灾害村级预案'){
-                        pdf(`${process.env.PUBLIC_URL}/data/pdf/${localStorage.getItem('address')}/妥安村马店山洪灾害村级预案.pdf`)
-                      }
-                    }
-                  })
-                 }
-          />
-        </div>
-      </div>
-    )
-  };
-  
-  export default DataTable
-  
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/yagl/Information/index.less b/src/views/Home/panels/earlyWarningPanels/yagl/Information/index.less
deleted file mode 100644
index e982268..0000000
--- a/src/views/Home/panels/earlyWarningPanels/yagl/Information/index.less
+++ /dev/null
@@ -1,107 +0,0 @@
-.picBox{
-  .panelTitle {
-    padding-left: 14px;
-    box-sizing: border-box;
-  }
-  .topQuery{
-    min-height: 30px;
-    line-height: 30px;
-    margin: 5px 15px;
-    .ant-checkbox-wrapper{
-      width:75px;
-    }
-    .ant-input{
-      padding: 2px 10px;
-    }
-  }
-  .listDiv{
-    height:calc( 100vh - 220px );
-    overflow: hidden auto;
-    .item{
-      padding: 10px 26px 0 20px;
-      box-sizing: border-box;
-      border-top: 1px solid #ECF2F9;
-    }
-    .nameSpan{
-      padding: 0 8px;
-      background: #0893FF;
-      color: #fff;
-      letter-spacing: 1px;
-      border-radius: 4px;
-      margin-right:10px;
-      line-height:26px;
-      cursor:pointer;
-    }
-    .time{
-      color:#333;
-      font-weight:bold;
-      font-size:13px;
-      line-height:26px;
-    }
-    .imgBox{
-      text-align: center;
-      margin: 20px 0;
-    }
-    .text{
-      margin-bottom:20px;
-      >div{
-        padding: 0 25px 0 10px;
-        span{
-          color:#333;
-          font-size:15px;
-          line-height: 26px;
-        }
-        .linkTxt{
-          color:#0083FE;
-          text-decoration: underline;
-          text-decoration-color: #0083FE;
-          font-weight:bold;
-        }
-      }
-    }
-  }
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .picDiv{
-        position: relative;
-        .picTm{
-          position: absolute;
-          right: 15px;
-          bottom: 0;
-          line-height: 20px;
-          background: rgba(255, 255, 255, 0.5);
-          padding:2px 5px;
-          box-sizing: border-box;
-          font-weight:bold;
-        }
-      }
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/yagl/Information/index.tsx b/src/views/Home/panels/earlyWarningPanels/yagl/Information/index.tsx
deleted file mode 100644
index f868930..0000000
--- a/src/views/Home/panels/earlyWarningPanels/yagl/Information/index.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import {
-  EditOutlined, CloseOutlined
-} from '@ant-design/icons';
-import {Tooltip, Input, Button, Card, Space, Table, Modal, Select, Tree, Image} from 'antd';
-import { ColumnsType } from 'antd/lib/table';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-import { SearchOption } from "../../../../../../service/def";
-import moment from "moment";
-import clsx from "clsx";
-import {renderDrp, renderSkArz, renderSkDdz} from "../../../../../../utils/renutils";
-import genDamImage from "../../../../../../components/DamGraph/DamImage";
-import {config} from "../../../../../../config";
-import {useDispatch} from "react-redux";
-import staticData from '../../../../../staticData';
-
-const { Option } = Select;
-
-type IProps = {
-  activeKey: any;
-}
-
-const DataTable: React.FC<IProps> = ({ activeKey }) => {
-  const dispatch = useDispatch();
-
-  const [showDetails, setShowDetails] = useState(false);
-  const [detailsData, setDetailsData] = useState({});
-
-  const data:any = staticData.xskfxyjData;
-
-
-
-
-
-  
-
-  return (
-    <div className="rWaterBox" style={{width:"100%"}}>
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/earlyWarningPanels/yagl/ToolBar.tsx b/src/views/Home/panels/earlyWarningPanels/yagl/ToolBar.tsx
deleted file mode 100644
index bb561ed..0000000
--- a/src/views/Home/panels/earlyWarningPanels/yagl/ToolBar.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Select, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../components/crud/useCrud';
-
-const { RangePicker } = DatePicker;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  const onSearchClick = () => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD');
-      }
-    }
-    search(rec);
-  };
-
-  const reset = () => {
-    form.resetFields();
-    form.setFieldsValue({"deptNames": undefined});
-  };
-
-
-  return record ? (
-    <Form layout="inline" form={form} >
-      <FormItem label="" name="stnm">
-        <Input style={{ width: 140 }} allowClear placeholder="搜索预案"/>
-      </FormItem>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/earlyWarningPanels/yagl/index.less b/src/views/Home/panels/earlyWarningPanels/yagl/index.less
deleted file mode 100644
index cfc9479..0000000
--- a/src/views/Home/panels/earlyWarningPanels/yagl/index.less
+++ /dev/null
@@ -1,125 +0,0 @@
-.yaglBox{
-  margin-top:-10px;
-  width: calc( 100vw - 110px );
-  height: calc( 100vh - 90px );
-  display: flex;
-  justify-content: space-between;
-  gap: 14px;
-  .yaglBox_content{
-    height: 100%;
-    background-color: #ffffff;
-    border-radius: 8px;
-    display: flex;
-    flex-direction: column;
-    box-shadow: 0 0 12px 0 rgb(0 0 0 / 10%);
-
-    .yaglBox_content_title{
-      padding: 8px 16px;
-      height: 43px;
-      display: flex;
-      justify-content: space-between;
-      border-bottom: 1px solid #f1f1f1;
-      .txt{
-        color: #050505;
-        font-size: 14px;
-        letter-spacing: 1px;
-        font-weight: bold;
-        margin-left: 10px;
-        line-height: 25px;
-      }
-    }
-    .yaglBox_tree{
-      height: 100%;
-      border: 1px solid #eee;
-      border-radius: 4px;
-
-      margin: 10px 20px;  
-      .ant-input-wrapper{
-        border: 1px solid #eee;
-        .ant-input{
-          border: 0px;
-        }
-        .ant-input-group-addon{
-          .ant-btn{
-            border: 0px;
-          }
-        }
-
-      }
-    }
-    .fyyalbBox{
-      height: 100%;
-      overflow: hidden;
-      .rWaterBox{
-        margin:10px 16px;
-        height: 100%;
-        .smallTable{
-          height: 100%;
-            .ant-table-tbody tr:nth-child(2n-1) {
-              td{
-                background: #fafafa;
-              }
-          }
-          td,th{
-            padding: 6px 10px!important;
-          }
-        }
-      }
-    }
-    .yaylBox{
-      height: 100%;
-      overflow: hidden;
-    }
-  }
-  
-
-
-
-
-
-
-
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 55rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-
-  .drpBox{
-    .button-group span{
-      padding: 0 0.1rem;
-    }
-  }
-  .ellipsisDiv{
-    width:115px;
-    overflow: hidden;//溢出隐藏
-    white-space: nowrap;//禁止换行
-    text-overflow: ellipsis;//...
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/yagl/index.tsx b/src/views/Home/panels/earlyWarningPanels/yagl/index.tsx
deleted file mode 100644
index 81c61a4..0000000
--- a/src/views/Home/panels/earlyWarningPanels/yagl/index.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import {Collapse, Image, Radio, Input, Button} from 'antd'
-import React, {useEffect, useState} from 'react'
-import {
-  CloseOutlined,
-  VerticalAlignBottomOutlined
-} from '@ant-design/icons';
-import "./index.less"
-import moment from "moment";
-import useCrud from "../../../../../components/crud/useCrud";
-import InformationPage from './Information';
-import MyTree from './tree'
-import DataTable from './DataTable';
-
-const { Panel } = Collapse;
-
-type IProps = {
-  activeKey: any;
-}
-
-const HoursPanelPage: React.FC<IProps> = ({ activeKey }) => {
-  const crud = useCrud();
-  const [previewPdf, setPreviewPdf] = useState("");
-  //console.log(21200001,previewPdf)
-
-
-  const onChange = (key: string | string[]) => {
-    console.log(key);
-  };
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <div className="yaglBox">
-      <div className='yaglBox_content' style={{width:'300px'}}>
-        <div className='yaglBox_content_title'>
-          <div>
-            <div className="lf">
-              {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">区域选择</span>
-          </div>
-        </div>
-        <div className='yaglBox_tree'>
-            <MyTree/>
-        </div>
-      </div>
-
-      <div className='yaglBox_content' style={{width:'646px'}}>
-        <div className='yaglBox_content_title'>
-          <div>
-            <div className="lf">
-              {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">防御预案列表</span>
-          </div>
-          <div>
-            <Input style={{ width: 240 }} allowClear placeholder="搜索预案"/>
-          </div>
-        </div>
-        <div className='fyyalbBox'>
-            <DataTable activeKey={activeKey} pdf={(e:any)=>{setPreviewPdf(e)}}/>
-        </div>
-      </div>
-
-      <div className='yaglBox_content' style={{flex:1}}>
-        <div className='yaglBox_content_title'>
-          <div>
-            <div className="lf">
-              {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">预案预览</span>
-          </div>
-          <div>
-            <Button size='small' type="primary" style={{width:'70px',background:'#409EFF',border:'0'}}>
-            <VerticalAlignBottomOutlined />
-              下载
-            </Button>
-          </div>
-        </div>
-        <div className='yaylBox'>
-          <iframe
-              src={previewPdf}
-              width="100%"
-              height="100%"
-              frameBorder={0}//边框设置
-              scrolling="no"//滚动设置
-            ></iframe>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default HoursPanelPage
\ No newline at end of file
diff --git a/src/views/Home/panels/earlyWarningPanels/yagl/tree.tsx b/src/views/Home/panels/earlyWarningPanels/yagl/tree.tsx
deleted file mode 100644
index 03e5d31..0000000
--- a/src/views/Home/panels/earlyWarningPanels/yagl/tree.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { Input, Tree } from 'antd';
-import { DataNode } from 'antd/es/tree';
-import { createNoSubstitutionTemplateLiteral } from 'typescript';
-
-const { Search } = Input;
-const { DirectoryTree } = Tree;
-
-const x = 3;
-const y = 2;
-const z = 1;
-const defaultData: DataNode[] = [];
-const myData:any = [
-  {
-    title: '湖北省',
-    key: '422000000000000',
-    children: [
-      { title: '恩施市', key: '422801000000000',  children: [
-        { title: '建始县', key: '422822000000000', children: [
-          { title: '业州镇', key: '422822100000000', children: [
-            { title: '猫儿坪村', key: '422822100221000', isLeaf: true },
-            { title: '二道桥社区', key: '422822100005000', isLeaf: true },
-            { title: '七里坪社区', key: '422822100011000', isLeaf: true },
-            { title: '红土坪社区', key: '422822100012000', isLeaf: true },
-            ], },
-          ],
-          },
-        ],
-      },
-    ],
-  },
-];
-
-const generateData = (_level: number, _preKey?: React.Key, _tns?: DataNode[]) => {
-  const preKey = _preKey || '0';
-  const tns = _tns || defaultData;
-
-  const children: React.Key[] = [];
-  for (let i = 0; i < x; i++) {
-    const key = `${preKey}-${i}`;
-    tns.push({ title: key, key });
-    if (i < y) {
-      children.push(key);
-    }
-  }
-  if (_level < 0) {
-    return tns;
-  }
-  const level = _level - 1;
-  children.forEach((key, index) => {
-    tns[index].children = [];
-    return generateData(level, key, tns[index].children);
-  });
-};
-generateData(z);
-
-const dataList: { key: React.Key; title: string }[] = [];
-const generateList = (data: DataNode[]) => {
-  for (let i = 0; i < data.length; i++) {
-    const node = data[i];
-    const { key } = node;
-    dataList.push({ key, title: key as string });
-    if (node.children) {
-      generateList(node.children);
-    }
-  }
-};
-generateList(defaultData);
-
-const getParentKey = (key: React.Key, tree: DataNode[]): React.Key => {
-  let parentKey: React.Key;
-  for (let i = 0; i < tree.length; i++) {
-    const node = tree[i];
-    if (node.children) {
-      if (node.children.some((item) => item.key === key)) {
-        parentKey = node.key;
-      } else if (getParentKey(key, node.children)) {
-        parentKey = getParentKey(key, node.children);
-      }
-    }
-  }
-  return parentKey!;
-};
-
-const App: React.FC = () => {
-  const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
-  const [searchValue, setSearchValue] = useState('');
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-
-  const onExpand = (newExpandedKeys: React.Key[]) => {
-    setExpandedKeys(newExpandedKeys);
-    setAutoExpandParent(false);
-  };
-
-  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const { value } = e.target;
-    const newExpandedKeys = dataList
-      .map((item) => {
-        if (item.title.indexOf(value) > -1) {
-          return getParentKey(item.key, defaultData);
-        }
-        return null;
-      })
-      .filter((item, i, self) => item && self.indexOf(item) === i);
-    setExpandedKeys(newExpandedKeys as React.Key[]);
-    setSearchValue(value);
-    setAutoExpandParent(true);
-  };
-
-  const treeData = useMemo(() => {
-    const loop = (data: DataNode[]): DataNode[] =>
-      data.map((item) => {
-        const strTitle = item.title as string;
-        const index = strTitle.indexOf(searchValue);
-        const beforeStr = strTitle.substring(0, index);
-        const afterStr = strTitle.slice(index + searchValue.length);
-        const title =
-          index > -1 ? (
-            <span>
-              {beforeStr}
-              <span className="site-tree-search-value">{searchValue}</span>
-              {afterStr}
-            </span>
-          ) : (
-            <span>{strTitle}</span>
-          );
-        if (item.children) {
-          return { title, key: item.key, children: loop(item.children) };
-        }
-
-        return {
-          title,
-          key: item.key,
-        };
-      });
-    return loop(myData);
-  }, [searchValue]);
-
-
-  return (
-    <div>
-      <Search style={{ marginBottom: 8 }} placeholder="关键字搜索" onChange={onChange} />
-      <DirectoryTree
-        onExpand={onExpand}
-        expandedKeys={expandedKeys}
-        autoExpandParent={autoExpandParent}
-        treeData={myData}
-      />
-    </div>
-  );
-};
-
-export default App;
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/ToolBar.tsx b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/ToolBar.tsx
deleted file mode 100644
index 14a39da..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/ToolBar.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Select, Checkbox, Radio, DatePicker, Button, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-import {getTimeRangeApi} from "../../../../../../service/flowAnalysis";
-
-const { RangePicker } = DatePicker;
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  activeKey: any;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, activeKey }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-  const [type, setType] = useState("按分析时刻");
-  const [timeOptions2, setTimeOptions2] = useState([]);
-
-  //按降雨时段 选择时段下拉框
-  const getTimeData = async () => {
-    const resData = await getTimeRangeApi();
-    if(resData.code === 200){
-      let optionsArray:any = [];
-      if(resData.data.length>0){
-        resData.data.map((item:any)=>{
-          optionsArray.push(
-            {
-              value:item.startTime+"至"+item.endTime,
-              label:item.startTime+"至"+item.endTime
-            }
-          );
-        });
-      }
-      setTimeOptions2(optionsArray);
-    }
-  };
-
-  useEffect(() => {
-    form.setFieldsValue({"tm": moment("2017-07-15 01:00")});
-    form.setFieldsValue({"type": "按分析时刻"});
-
-    getTimeData();
-
-    onSearchClick();
-  }, [activeKey]);
-
-  useEffect(() => {
-    //console.log("60++++",type);
-    if(type === "按分析时刻"){
-      form.setFieldsValue({"tm": moment("2017-07-15 01:00")});
-
-      search({
-        type:"按分析时刻",
-        tm:moment("2017-07-15 01:00")
-      });
-    }else{
-      form.setFieldsValue({"tm1": timeOptions2.length>0?timeOptions2[0]:[]});
-
-      search({
-        type:"按降雨时段",
-        tm:timeOptions2[0]
-      });
-    }
-  }, [type]);
-
-  const onSearchClick = () => {
-    const { ...rec } = form.getFieldsValue();
-    setType(rec.type);
-    search(rec);
-  };
-
-  const radioChange = () => {
-    const { ...rec } = form.getFieldsValue();
-    setType(rec.type);
-  };
-
-  return record ? (
-    <Form layout="inline" form={form} >
-      <Form.Item name="type" label="">
-        <Radio.Group onChange={radioChange}>
-          <Radio value={"按分析时刻"}>按分析时刻</Radio>
-          <Radio value={"按降雨时段"}>按降雨时段</Radio>
-        </Radio.Group>
-      </Form.Item>
-
-      {
-        type==="按分析时刻"?
-          <Form.Item name="tm" label="选择时刻">
-            <DatePicker format="YYYY-MM-DD HH:mm" allowClear={false} showTime style={{width:"185px"}} onChange={onSearchClick}/>
-          </Form.Item>:
-          <Form.Item name="tm1" label="选择时刻">
-            <Select
-              style={{ width: 238 }}
-              placeholder="请选择"
-              options={timeOptions2}
-              onChange={onSearchClick}
-            />
-          </Form.Item>
-      }
-
-      {
-        type==="按降雨时段"?
-          <>
-            {/*<Form.Item name="informantTime" label="新增时段" >
-              <RangePicker
-                showTime
-                format="YYYY-MM-DD HH:mm"
-                style={{width:"238px",padding:"4px"}}
-              />
-            </Form.Item>
-            <div style={{width:"98%",margin:"5px 0 0 0"}}>
-              <Button type="primary" block size="middle">
-                开始计算
-              </Button>
-            </div>*/}
-          </>:null
-      }
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/index.less b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/index.less
deleted file mode 100644
index 005ebb6..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/index.less
+++ /dev/null
@@ -1,187 +0,0 @@
-.flowAnalysisBox{
-  .panelTitle {
-    padding-left: 14px;
-    box-sizing: border-box;
-  }
-  .topQuery{
-    min-height: 30px;
-    line-height: 30px;
-    margin: 5px 15px;
-    .ant-checkbox-wrapper{
-      width:75px;
-    }
-    .ant-input{
-      padding: 2px 10px;
-    }
-  }
-  .subTitle{
-    position: relative;
-    padding-left:8px;
-    margin: 0 0 10px 10px;
-    font-weight:bold;
-    &:after{
-      content: "";
-      display: block;
-      position: absolute;
-      width: 3px;
-      height: 16px;
-      background: #0068F4;
-      left: -2px;
-      top: 3px;
-      border-radius: 4px;
-    }
-  }
-  .table th{
-    padding: 2px 0 !important;
-    line-height: 16px !important;
-    font-size: 12px !important;
-  }
-  .listBox{
-    .ant-collapse-header{
-      padding:4px 6px;
-      background: #F2F3F5;
-      font-weight: bold;
-      font-size: 12px;
-    }
-    .txtBox{
-      margin: 2px 0;
-      border-bottom: 1px solid #eee;
-      cursor:pointer;
-    }
-    .txt{
-      font-size: 12px;
-      &:nth-child(1){
-        width: 64px;
-        word-wrap: break-word;
-        white-space:pre-wrap;
-        line-height: 14px;
-      }
-      &:nth-child(2){
-        width: 64px;
-        overflow: hidden;//溢出隐藏
-        white-space: nowrap;//禁止换行
-        text-overflow: ellipsis;//...
-        padding-left:4px;
-      }
-      &:nth-child(2), &:nth-child(3),&:nth-child(4){
-        line-height: 30px;
-      }
-      &:nth-child(3),&:nth-child(4){
-        width: 62px;
-        text-align: center;
-      }
-      &:nth-child(5){
-        width: 64px;
-        line-height: 14px;
-      }
-    }
-  }
-  .ant-picker-input, .ant-picker-active-bar,.ant-select-selection-item{
-    zoom: 0.83;
-  }
-  .ant-select-selector{
-    height: 28px !important;
-  }
-
-  .rightDetails1{
-    position: absolute;
-    width: 860px;
-    //height: calc(100vh - 160px);
-    height: 620px;
-    background: #fff;
-    z-index: 111;
-    left: calc((100vw - 860px)/2);
-    //top: 5px;
-    top: calc((100vh - 680px)/2);
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding: 10px 0;
-    box-sizing: border-box;
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    .contentBox{
-      padding: 0 20px;
-    }
-  }
-  .maskBox{
-    position: fixed;
-    left:0;
-    right:0;
-    bottom:0;
-    top:0;
-    background:rgba(0,0,0,0.5);
-    z-index:110;
-  }
-
-  .playBox{
-    position:absolute;
-    width:36vw;
-    background: #fff;
-    z-index: 101;
-    left: 26vw;
-    bottom:-5px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding: 10px 30px 0 10px;
-    box-sizing: border-box;
-
-    .legendBox{
-      position:absolute;
-      top:0;
-      left:37vw;
-      width:180px;
-      height:60px;
-      background: #fff;
-      box-shadow: 1px 2px 10px #bdbaba;
-      padding: 2px 0 0 8px;
-      box-sizing: border-box;
-      p{
-        margin:0;
-        font-size:12px;
-        font-weight:bold;
-      }
-      .txt{
-        width:46px;
-        font-size:12px;
-      }
-      .color1, .color2, .color3, .color4{
-        width:30px;
-        height:6px;
-        border: 1px solid #333;
-        margin: 6px 6px 0 0;
-      }
-      .color1{
-        background: #02B8FA;
-      }
-      .color2{
-        background: #FFD186;
-      }
-      .color3{
-        background: #F99A00;
-      }
-      .color4{
-        background: #C13022;
-      }
-    }
-  }
-
-  .titleBox{
-    position:absolute;
-    min-width:16vw;
-    background: linear-gradient(90deg,#58a5ff,rgba(122,188,250,.49) 46%,rgba(155,210,245,0));
-    z-index: 101;
-    left: 26vw;
-    top: 0;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding: 3px 5px 3px 10px;
-    box-sizing: border-box;
-    p{
-      margin:0;
-      color: #fff;
-      font-weight:bold;
-      font-size: 16px;
-      white-space: nowrap;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/index.tsx b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/index.tsx
deleted file mode 100644
index 8b22b6f..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/index.tsx
+++ /dev/null
@@ -1,560 +0,0 @@
-import {
-  EditOutlined, CloseOutlined
-} from '@ant-design/icons';
-import {Collapse, Table, Tabs, Segmented, Spin,} from 'antd';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-import ToolBar from './ToolBar';
-import moment from "moment";
-import apiurl from "../../../../../../service/apiurl";
-import staticData from '../../../../../staticData';
-import appconsts from "../../../../../../service/appconsts";
-import {useDispatch, useSelector} from "react-redux";
-import FloodAnalysis from './modalPage/floodAnalysis';
-import VillagesAlongRiver from './modalPage/villagesAlongRiver';
-import PlayPage from './player/player';
-
-import "./index.less"
-import { getByTimeRangeApi, getByAnalysisTimeApi } from "../../../../../../service/flowAnalysis";
-import VectorLayer from "ol/layer/Vector";
-import {Vector as VectorSource} from "ol/source";
-import {Point, LineString} from 'ol/geom';
-import Feature from "ol/Feature";
-import Style from "ol/style/Style";
-import Stroke from "ol/style/Stroke";
-import * as proj from "ol/proj";
-import FillStyle from "ol/style/Fill";
-import Circle from 'ol/style/Circle';
-import Text from 'ol/style/Text';
-import {getDistance} from 'ol/sphere';
-import { transform } from 'ol/proj';
-
-const { Panel } = Collapse;
-
-type IProps = {
-  activeKey: any;
-}
-
-const DataTable: React.FC<IProps> = ({ activeKey }) => {
-  let mapObj = useSelector((s:any) => s.map.map);
-  const transformFn = proj.getTransform('EPSG:4326', 'EPSG:900913');
-
-  const [showDetails, setShowDetails] = useState(false);
-  const [detailsData, setDetailsData] = useState<any>({});
-
-  const [hlName, setHlName] = useState<any>("");
-  const [fxskTimeParams, setFxskTimeParams] = useState("2017-07-15 01:00");
-
-  const [modalTimeParams, setModalTimeParams] = useState({
-    "startTime": "2017-07-15 01:00",
-    "endTime": "2017-07-15 01:00",
-  });
-
-  const getClosestPointData = (point:any, rvcd:any) => {
-    if (mapObj) {
-      let pointLoopLayer:any = {};
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "pointLoop"){
-          pointLoopLayer = layer;
-        }
-      });
-
-      let closestLine:any = null;
-      let dashedLine:any = null;
-      let closestPoint:any = null;
-      let closestDistance = Infinity;
-
-      let point1:any = new Point(point);
-      let features = pointLoopLayer.getSource().getFeatures();
-
-      if(features.length>0){
-        features.map((feature:any)=>{
-          const path = feature.get('data');
-
-          let line = new LineString(path);
-          // 获取点和折线中的两个相邻的点的坐标
-          const p1 = line.getClosestPoint(point1.getCoordinates());
-
-          let dashed = new LineString([point,p1]);
-
-          let point2 = p1;
-          let point3:any = new Point(point2);
-
-          let distance = getDistance(point1.getCoordinates(), point3.getCoordinates());
-
-          if (distance < closestDistance) {
-            closestDistance = distance;
-            closestLine = line;
-            dashedLine = dashed;
-            closestPoint = point2
-          }
-        });
-      }
-
-      //console.log(closestLine);
-      if(closestLine){
-        closestLine.applyTransform(transformFn);
-        var closestLineFeature = new Feature({
-          geometry: closestLine,
-        });
-        var vectorSource = new VectorSource({
-          features: [closestLineFeature]
-        });
-
-        var closestLineLayer = new VectorLayer({
-          // @ts-ignore
-          name:"closestLine",
-          source: vectorSource,
-          style: feature => new Style({
-            stroke: new Stroke({
-              color: "#00FFFF",
-              width: 6,
-            })
-          })
-        });
-
-        mapObj.addLayer(closestLineLayer);
-      }
-
-      if(dashedLine){
-        dashedLine.applyTransform(transformFn);
-        var dashedLineFeature = new Feature({
-          geometry: dashedLine,
-        });
-        var vectorSource = new VectorSource({
-          features: [dashedLineFeature]
-        });
-
-        var dashedLineLayer = new VectorLayer({
-          // @ts-ignore
-          name:"dashedLine",
-          source: vectorSource,
-          style: feature => new Style({
-            stroke: new Stroke({
-              color: "#03B7FC",
-              width: 3,
-              lineDash: [12, 12] // 设置虚线样式
-            })
-          })
-        });
-
-        mapObj.addLayer(dashedLineLayer);
-      }
-
-      return closestPoint;
-    }
-  };
-
-  const showDetailsFun = (val:any) => {
-    //console.log("showDetailsFun 139++++",val);
-
-    if(mapObj){
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "dashedLine"){
-          layer.getSource().clear();
-        }
-        if(layer.values_.name === "closestLine"){
-          layer.getSource().clear();
-        }
-      });
-    }
-
-    const closestPoints = val.villagePoint.map((item:any) => getClosestPointData(item, val.rvcd));
-    //console.log('closestPoints:', closestPoints);
-
-    if(closestPoints.length>0){
-      mapObj.getView().setCenter(proj.fromLonLat(closestPoints[0]));
-      mapObj.getView().setZoom(16);
-    }
-
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name:"closestPoints",
-      source: new VectorSource(),
-      style: feature => new Style({
-        image: new Circle({
-          radius: 9,
-          fill: new FillStyle({ color: 'rgba(0,149,255,0.7)' }),
-          stroke: new Stroke({ color: 'rgba(0,149,255,0.7)', width: 1 })
-        }),
-        zIndex:8
-      }),
-    });
-
-    closestPoints.forEach((point:any) => {
-      const point2 = transform(point, 'EPSG:4326', 'EPSG:3857');
-      const feature = new Feature({
-        geometry: new Point(point2),
-        rvcd: val.rvcd,
-        eventId: val.eventId,
-      });
-
-      // @ts-ignore
-      layer.getSource().addFeature(feature);
-    });
-
-    mapObj.getLayers().getArray().forEach((layer:any)=> {
-      if(layer.values_.name === "closestPoints"){
-        layer.getSource().clear();
-      }
-    });
-
-    mapObj.addLayer(layer);
-  };
-
-  useEffect(() => {
-    mapObj.on('click', function(evt:any) {
-      var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function(feature:any) {
-        return feature;
-      });
-      if (feature) {
-        let rvcd = feature.get('rvcd');
-        let eventId = feature.get('eventId');
-        if(rvcd){
-          setShowDetails(true);
-          if(eventId){
-            setDetailsData({rvcd: rvcd, eventId: eventId, "startTime": "", "endTime": ""});
-          }else{//按分析时刻
-            setDetailsData({rvcd: rvcd, eventId: null, ...modalTimeParams});
-          }
-        }
-      }
-    });
-  }, [mapObj]);
-
-  useEffect(() => {
-    setShowDetails(false);
-  }, [activeKey]);
-
-  const [loading, setLoading] = useState(true);
-
-  const [listData, setListData] = useState([]);
-
-  const [searchType1, setSearchType1] = useState("按分析时刻");
-
-  const doSearch = (val:any) => {
-    //console.log("doSearch",val);
-    setLoading(true);
-
-    setSearchType1(val.type?val.type:"");
-
-    if(mapObj){
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "closestPoints"){
-          layer.getSource().clear();
-        }
-        if(layer.values_.name === "dashedLine"){
-          layer.getSource().clear();
-        }
-        if(layer.values_.name === "closestLine"){
-          layer.getSource().clear();
-        }
-      });
-    }
-
-    if(val.type === "按分析时刻"){
-      setModalTimeParams({
-        "startTime": moment(val.tm).format("YYYY-MM-DD HH:mm"),
-        "endTime": moment(val.tm).format("YYYY-MM-DD HH:mm"),
-      });
-
-      setFxskTimeParams(moment(val.tm).format("YYYY-MM-DD HH:mm"));
-
-      let params = {
-        //2017-07-15 01:00
-        time:moment(val.tm).format("YYYY-MM-DD HH:mm")
-      };
-      getFxskData(params);
-    }else{
-      let params1:any = {
-        startTime:val&&val.tm?val.tm.value.substring(0,19):val&&val.tm1?val.tm1.substring(0,19):"2016-07-19 00:00:00",
-        endTime:val&&val.tm?val.tm.value.substring(20):val&&val.tm1?val.tm1.substring(20):"2016-07-20 00:00:00",
-        type: 8
-      };
-      setModalTimeParams({
-        "startTime": params1.startTime,
-        "endTime": params1.endTime,
-      });
-
-      getData(params1);
-    }
-  };
-
-  const getData = async (params:any) => {
-    const resData = await getByTimeRangeApi(params);
-    if(resData.code === 200){
-      setLoading(false);
-      setListData(resData.data.length>0?resData.data:[]);
-    }
-  };
-
-  const getFxskData = async (params:any) => {
-    const resData = await getByAnalysisTimeApi(params);
-    if(resData.code === 200){
-      setLoading(false);
-      setListData(resData.data.length>0?resData.data:[]);
-    }
-  };
-
-  useEffect(() => {
-    // @ts-ignore
-    let hlArray = JSON.parse(localStorage.getItem('watershedData'));
-    setHlName(hlArray && hlArray[0]?hlArray[0].name:"");
-
-    if(searchType1 === "按分析时刻"){
-      let params = {
-        //2017-07-15 01:00
-        time:fxskTimeParams
-      };
-      getFxskData(params);
-    }
-  }, []);
-
-  const columns:any = useMemo(() => [
-    { title: '河段编码', key: 'rvcd', dataIndex: 'rvcd', align: 'center', },
-    { title: '影响村庄', key: '', dataIndex: '', align: 'center'},
-    { title: '村庄人口(人)', key: 'villagePeople', dataIndex: 'villagePeople', align: 'center'},
-    { title: '洪峰流量(m³/s)', key: 'flow', dataIndex: 'flow', align: 'center', },
-    { title: '峰现时间', key: 'time', dataIndex: 'time', align: 'center', }
-  ], []);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-
-    }};
-
-  const [segmentedVal, setSegmentedVal] = useState(0);
-
-  const segmentedChange = (val:any) => {
-    setSegmentedVal(val);
-  };
-
-  useEffect(() => {
-    //console.log("listData 106+++",listData);
-    if(mapObj){
-      let mapPointData:any = [];
-
-      if(listData.length>0){
-        listData.map((item:any)=>{
-          if(item.flowDetails.length>0){
-            item.flowDetails.map((item1:any)=>{
-              if(item1.village.length>0){
-                item1.village.map((item2:any,index2:any)=>{
-                  mapPointData.push({
-                    "name":item2,
-                    "lgtd":item1.villagePoint[index2][0],
-                    "lttd":item1.villagePoint[index2][1],
-                  })
-                });
-              }
-            });
-          }
-        });
-      }
-
-      //console.log("mapPointData",mapPointData);
-
-      var layer = new VectorLayer({
-        // @ts-ignore
-        name:"pointAnalysis",
-      })
-      var source = new VectorSource({ wrapX: false })
-      layer.setSource(source);
-
-      const featuresDefalut:any = mapPointData.map((point:any, index:any) => {
-        const geom1 = new Point([point.lgtd,point.lttd]);
-        geom1.applyTransform(transformFn);
-
-        let feature = new Feature({
-          geometry: geom1,
-          data:point,
-        });
-
-        feature.setStyle([
-          new Style({
-            image: new Circle({
-              radius: 6,
-              fill: new FillStyle({ color: '#FFA500' }),
-              stroke: new Stroke({ color: '#D69017', width: 1 })
-            }),
-            text: new Text({
-              text: point.name,
-              offsetY: 20,
-              font: '12px 微软雅黑',
-              backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: '#000' }),
-              //stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true,
-            })
-          })
-        ]);
-
-        return feature
-      });
-      //console.log("featuresDefalut",featuresDefalut);
-      // @ts-ignore
-      featuresDefalut.forEach(feature => layer.getSource().addFeature(feature));
-
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "pointAnalysis"){
-          layer.getSource().clear();
-        }
-      });
-
-      mapObj.addLayer(layer);
-    }
-
-    if(activeKey !== "5"){
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "pointAnalysis"){
-          layer.getSource().clear();
-        }
-        if(layer.values_.name === "dashedLine"){
-          layer.getSource().clear();
-        }
-        if(layer.values_.name === "closestPoints"){
-          layer.getSource().clear();
-        }
-        if(layer.values_.name === "closestLine"){
-          layer.getSource().clear();
-        }
-      });
-    }
-  }, [listData, mapObj]);
-
-  return (
-    <div className="flowAnalysisBox" style={{width:"92%",marginLeft:"4%"}}>
-      <div className="subTitle" style={{marginBottom:0}}>
-        分析维度
-      </div>
-      <div style={{margin:"0 0 10px 6px"}}>
-        <ToolBar params={{ ...options1.search }} search={doSearch} activeKey={activeKey}/>
-      </div>
-      {/*<div className="card-h-margin" />*/}
-      <div className="subTitle">
-        详情
-      </div>
-      <div className="table">
-        <Table rowKey="adcd" bordered
-               columns={columns}
-               pagination={false}
-               dataSource={[]}
-               scroll={{ y: 0 }}
-               defaultExpandAllRows={true}
-               expandable={
-                 {
-                   indentSize: 10,
-                 }
-               }
-        />
-      </div>
-
-      <div className="listBox">
-        {
-          loading?
-            <div style={{position:"absolute",top:"270px",left:"110px",background:"#fff",padding:"20px 30px",borderRadius:"10px", zIndex:10}}>
-              <Spin tip="正在加载..." size="large" spinning={loading} />
-            </div>:null
-        }
-        {
-          listData.length>0?listData.map((item:any,index:any)=>(
-            <>
-              <div key={item.type}>
-                {/*// @ts-ignore*/}
-                <Collapse size="small" defaultActiveKey={index}>
-                  <Panel header={item.typeName} key={index}>
-                    {
-                      item.flowDetails.length>0&&item.flowDetails.map((item1:any)=><div>
-                        <div className="clearFloat txtBox" onClick={()=>showDetailsFun(item1)}>
-                          <div className="lf txt">{item1.rvcd}</div>
-                          <div className="lf txt" title={item1.village} style={{textAlign:"center"}}>{item1.village.length}</div>
-                          <div className="lf txt">{item1.villagePeople}</div>
-                          <div className="lf txt">{item1.flow?(item1.flow).toFixed(1):"-"}</div>
-                          <div className="lf txt">{item1.time}</div>
-                        </div>
-                      </div>)
-                    }
-                  </Panel>
-                </Collapse>
-              </div>
-            </>
-          )):<div style={{textAlign:"center", margin:"10%"}}>
-            <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt="" width={170}/>
-          </div>
-        }
-      </div>
-
-      {/*详情*/}
-      {
-        showDetails?<>
-          <div className="rightDetails1">
-            <div className="clearFloat panelTitle">
-              <span className="lf txt">{detailsData.rvcd}</span>
-              <div className="rf closeBtn" onClick={()=>setShowDetails(false)}>
-                <CloseOutlined />
-              </div>
-            </div>
-
-            <div className="contentBox">
-              <Segmented
-                options={[{value:0,label:"洪水分析"},{value:1,label:"沿河村庄"}]}
-                style={{margin:"10px 0"}}
-                value={segmentedVal}
-                onChange={segmentedChange}
-              />
-
-              {
-                segmentedVal===0?<FloodAnalysis record={detailsData}/>:<VillagesAlongRiver record={detailsData}/>
-              }
-            </div>
-          </div>
-          <div className="maskBox"></div>
-        </>:null
-      }
-
-      <div className="titleBox">
-        {
-          searchType1==="按分析时刻"?
-            <p>{hlName}小流域-流量分析（{fxskTimeParams}）</p>:
-            <p>{hlName}小流域-流量分析（{modalTimeParams.startTime} 至 {modalTimeParams.endTime}）</p>
-        }
-      </div>
-
-      {/*时间轴*/}
-      {
-        listData.length>0?<div className="playBox">
-          <PlayPage type={searchType1} modalTimeParams={modalTimeParams} activeKey={activeKey} showDetails={showDetails}/>
-          <div className="legendBox">
-            <p>河段流量图例(m³/s)</p>
-            <div>
-              <div className="clearFloat">
-                <div className="lf">
-                  <div className="lf color1"></div>
-                  <div className="lf txt">0-10</div>
-                </div>
-                <div className="lf">
-                  <div className="lf color2"></div>
-                  <div className="lf txt">10-50</div>
-                </div>
-              </div>
-              <div className="clearFloat">
-                <div className="lf">
-                  <div className="lf color3"></div>
-                  <div className="lf txt">50-100</div>
-                </div>
-                <div className="lf">
-                  <div className="lf color4"></div>
-                  <div className="lf txt">100以上</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>:null
-      }
-
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/floodAnalysis/index.js b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/floodAnalysis/index.js
deleted file mode 100644
index 0645a88..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/floodAnalysis/index.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import {DatePicker, Descriptions} from 'antd';
-import { normalizeSearchTmRange } from '../../../../../../../../utils/tools';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import { getPreViewWaterAnalyzeApi, getWaterAnalyzeApi, getWaterAnalyzeForecastApi } from "../../../../../../../../service/flowAnalysis";
-import rzOption from './rzOption';
-
-function RzSearch({ record }) {
-  const [data, setData] = useState({});
-
-  const getHsfxData = async (rec) => {
-    if(record.eventId){//按降雨时段
-      let params = {
-        "startTime": "",
-        "endTime": "",
-        "rvcd": rec.rvcd,
-        "eventId": rec.eventId,
-        "type": "8"
-      };
-      const resData = await getPreViewWaterAnalyzeApi(params);
-      if(resData.code === 200){
-        setData(resData.data);
-      }
-    }else{//按分析时刻
-      if(rec.rvcd){
-        let params = {
-          "startTime": rec.startTime,
-          "endTime": rec.endTime,
-          "rvcd": rec.rvcd,
-          "eventId": null,
-          "type": "8"
-        };
-        const resData = await getWaterAnalyzeApi(params);
-        if(resData.code === 200){
-          setData(resData.data);
-        }
-      }else{
-        let params = {
-          "startTime": rec.startTime,
-          "endTime": rec.endTime,
-          "villageCode": rec.villageCode,
-        };
-        const resData = await getWaterAnalyzeForecastApi(params);
-        if(resData.code === 200){
-          setData(resData.data);
-        }
-      }
-    }
-  };
-
-  useEffect(() => {
-    //console.log("floodAnalysis",record);
-    //rvcd
-    getHsfxData(record);
-  }, [record]);
-
-  const option = useMemo(() => {
-    //console.log("option 48++++",data);
-    if(data && Object.keys(data).length>0){
-      return rzOption(data)
-    }
-  }, [data])
-
-  return (
-    <div style={{ width:"96%", height: '52vh', paddingLeft:"20px" }}>
-      {
-        data && Object.keys(data).length>0?
-          <div style={{ display: 'flex', flexDirection: 'column', width:"100%", height: '100%' }} className="RzSearchBox">
-            <div >
-              <Descriptions column={{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 2 }}>
-                <Descriptions.Item label="河段编码"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>{data.riverCode}</span></Descriptions.Item>
-                <Descriptions.Item label="洪峰流量(m³/s)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>{data.maxWaterFlowCount}</span></Descriptions.Item>
-                <Descriptions.Item label="累计雨量(mm)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>{data.sumRain}</span></Descriptions.Item>
-                <Descriptions.Item label="河段以上流域面积(km²)"><span style={{fontWeight:"bold",fontSize:"15px", color:"#0000EE"}}>{data.riverArea}</span></Descriptions.Item>
-              </Descriptions>
-            </div>
-
-            <div>
-              <p style={{textAlign:"center", margin:"10px 0 20px 0", fontWeight:"bold"}}>{data.riverCode}所在河段洪水过程</p>
-              <ReactEcharts
-                option={option}
-                style={{ width:"100%", height: '370px', overflow:"hidden" }}
-              />
-            </div>
-          </div>:null
-      }
-    </div>
-  )
-}
-
-export default RzSearch
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/floodAnalysis/rzOption.js b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/floodAnalysis/rzOption.js
deleted file mode 100644
index e9f2b8f..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/floodAnalysis/rzOption.js
+++ /dev/null
@@ -1,372 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { hdyjColor } from '../../../../../../../../utils/renutils';
-
-export default function rzOption(data) {
-  //console.log("rzOption 5++++",data);
-
-  let timeArr = data.timeArr;
-  let waterFlowCount = data.waterFlowCount;
-  let rainArr = data.rainArr;
-  let lineObject = {
-    year5: data.noticeValue,
-    year20: data.warningValue,
-    year50: data.dangerValue,
-  };
-
-  let m = [];
-  let d = new Array(waterFlowCount.length).fill(lineObject.year5 || 0)
-    , c = new Array(waterFlowCount.length).fill(lineObject.year20 || 0)
-    , A = new Array(waterFlowCount.length).fill(lineObject.year50 || 0)
-  let C = null;
-  let g = {
-    datas_line: {
-      colors: ["rgba(13, 125, 245", "rgba(255, 255, 0", "rgba(240, 146, 61", "rgba(246, 66, 66"],
-      lineX: timeArr,
-      names: ["预报流量", "关注(2年一遇)", "警戒(5年一遇)", "危险(20年一遇)"],
-      danwei: ["m³/s", "m³/s", "m³/s", "m³/s", "m³/s"],
-      value: [waterFlowCount, d, c, A],
-      isDot: ["dotted", "solid", "solid", "solid"]
-    },
-    datas_bar: {
-      colors: ["#007BFF", "rgba(125, 56, 238, 1)"],
-      lineX: timeArr,
-      names: ["雨量"],
-      value: [rainArr]
-    }
-  };
-  g.datas_line.value.forEach((function(t, e) {
-      m.push({
-        name: g.datas_line.names[e],
-        type: "line",
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        color: g.datas_line.colors[e] + ",1)",
-        symbolSize: 0,
-        symbol: "circle",
-        smooth: !1,
-        lineStyle: {
-          type: g.datas_line.isDot[e]
-        },
-        markLine: {
-          symbol: ["none", "none"],
-          silent: !0,
-          itemStyle: {
-            color: "#555",
-            opacity: .3,
-            type: [5, 10],
-            dashOffset: 5,
-            width: "5px"
-          },
-          label: {
-            show: !0,
-            textStyle: {
-              color: "#555"
-            }
-          },
-          data: [{
-            xAxis: ""
-          }]
-        },
-        markArea: {
-          silent: !0,
-          itemStyle: {
-            color: "#555",
-            opacity: .07
-          },
-          data: [[{
-            xAxis:""
-          }, {
-            xAxis: ""
-          }]]
-        },
-        data: g.datas_line.value[e],
-        label: {
-          show: !0,
-          position: "top",
-          textStyle: {
-            color: "#555"
-          },
-          formatter: function(t) {
-            return ""
-          }
-        }
-      })
-    }
-  ));
-  g.datas_bar.value.forEach((function(t, e) {
-      m.push({
-        name: g.datas_bar.names[e],
-        type: "bar",
-        barWidth: "15",
-        barGap: "-100%",
-        itemStyle: {
-          normal: {
-            color: g.datas_bar.colors[e],
-            barBorderRadius: [0, 0, 0, 0]
-          }
-        },
-        markLine: {
-          symbol: ["none", "none"],
-          silent: !0,
-          itemStyle: {
-            color: "#555",
-            opacity: .3
-          },
-          label: {
-            show: !1
-          },
-          data: [{
-            xAxis: ""
-          }]
-        },
-        markArea: {
-          silent: !0,
-          itemStyle: {
-            color: "#555",
-            opacity: .3
-          },
-          data: [[{
-            xAxis: ""
-          }, {
-            xAxis: ""
-          }]]
-        },
-        data: t,
-        label: {
-          show: !0,
-          position: "bottom",
-          textStyle: {
-            color: "#555"
-          },
-          formatter: function(t) {
-            return ""
-          }
-        }
-      })
-    }
-  ));
-
-  let legendData = [];
-  legendData.push({
-    top: "0%",
-    textStyle: {
-      fontSize: 14,
-      color: "#555"
-    },
-    left: "70",
-    itemWidth: 10,
-    itemHeight: 10,
-    data: [{
-      name: g.datas_line.names[0],
-      icon: "path://M112 420h160v-72H112z m320 0h160v-72H432z m320 0h160v-72H752z"
-    }, {
-      name: g.datas_line.names[1],
-      icon: "path://M802.59 363.24H221.4c-11.47 0-20.76 9.3-20.76 20.76s9.29 20.76 20.76 20.76h581.19c11.47 0 20.76-9.3 20.76-20.76s-9.29-20.76-20.76-20.76z"
-    }, {
-      name: g.datas_line.names[2],
-      icon: "path://M802.59 363.24H221.4c-11.47 0-20.76 9.3-20.76 20.76s9.29 20.76 20.76 20.76h581.19c11.47 0 20.76-9.3 20.76-20.76s-9.29-20.76-20.76-20.76z"
-    }, {
-      name: g.datas_line.names[3],
-      icon: "path://M802.59 363.24H221.4c-11.47 0-20.76 9.3-20.76 20.76s9.29 20.76 20.76 20.76h581.19c11.47 0 20.76-9.3 20.76-20.76s-9.29-20.76-20.76-20.76z"
-    }, {
-      name: g.datas_line.names[4],
-      icon: "path://M802.59 363.24H221.4c-11.47 0-20.76 9.3-20.76 20.76s9.29 20.76 20.76 20.76h581.19c11.47 0 20.76-9.3 20.76-20.76s-9.29-20.76-20.76-20.76z"
-    }]
-  });
-  legendData.push({
-    top: "0%",
-    data: g.datas_bar.names,
-    textStyle: {
-      fontSize: 14,
-      color: "#555"
-    },
-    left: "10",
-    itemWidth: 10,
-    itemHeight: 10,
-  })
-
-  let u = {
-    backgroundColor: "transparent",
-    tooltip: {
-      trigger: "axis",
-      axisPointer: {
-        type: "shadow"
-      },
-      backgroundColor: "#FFF",
-      textStyle: {
-        color: "#555"
-      },
-      borderWidth: 1,
-      formatter: function(t) {
-        let e = "";
-        e += t[0].name + "\n";
-        for (let a = 0; a < g.datas_line.names.length; a++)
-          e += "<div style='text-align: left'>" + g.datas_line.names[a] + ": " + (g.datas_line.value[a][t[0].dataIndex] + g.datas_line.danwei[a] || 0) + "</div>";
-        e += "<div style='margin-top:10px'></div>";
-        for (let a = 0; a < g.datas_bar.names.length; a++)
-          e += "<div style='text-align: left'>" + g.datas_bar.names[a] + ": " + g.datas_bar.value[a][t[0].dataIndex] + "mm</div>";
-        return C = t[0].dataIndex, e
-      }
-    },
-    axisPointer: {
-      link: [{
-        xAxisIndex: [0, 1],
-        yAxisName: "someName"
-      }]
-    },
-    legend: legendData,
-    grid: [{
-      top: "50",
-      left: "14%",
-      right: "4%",
-      bottom: "50%",
-      containLabel: !1
-    }, {
-      top: "55%",
-      left: "14%",
-      right: "4%",
-      bottom: "25",
-      //containLabel: !1
-    }],
-    xAxis: [
-      {
-        type: "category",
-        data: timeArr,
-        position: "top",
-        axisLabel: {
-          show: false,
-          textStyle: {
-            color: "#555",
-            fontSize: 12
-          },
-          interval: "auto"
-        },
-        boundaryGap: !0,
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: "#555"
-          }
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: "#E5E5E5"
-          }
-        }
-      }, {
-        type: "category",
-        gridIndex: 1,
-        data: timeArr,
-        axisLabel: {
-          textStyle: {
-            color: "#555",
-            fontSize: 12
-          },
-          interval: "auto"
-        },
-        boundaryGap: !0,
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: "#555"
-          }
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: "#E5E5E5"
-          }
-        }
-      }],
-    yAxis: [
-      {
-        type: "value",
-        name: "雨量(mm)",
-        nameLocation: 'start',
-        inverse: true,
-        nameTextStyle: {
-          show: false,
-          color: "#555",
-          padding: [0, 0, -20, -120]
-        },
-        axisLabel: {
-          textStyle: {
-            color: "#555",
-            fontSize: 12
-          }
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: "#E5E5E5"
-          }
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: "#E5E5E5"
-          }
-        }
-      },
-      {
-        type: "value",
-        name: "流量(m³/s)",
-        nameTextStyle: {
-          color: "#555",
-          padding: [0, 0, -20, -150]
-        },
-        gridIndex: 1,
-        axisLabel: {
-          textStyle: {
-            color: "#555",
-            fontSize: 12
-          }
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: "#555"
-          }
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: "#E5E5E5"
-          }
-        }
-      },
-      {
-        type: "value",
-        name: "水位(m) ",
-        position: "right",
-        gridIndex: 1,
-        nameTextStyle: {
-          color: "#555",
-          padding: [0, 0, 0, 30]
-        },
-        axisLabel: {
-          formatter: "{value}",
-          textStyle: {
-            color: "#555",
-            fontSize: 12
-          }
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: "#555"
-          }
-        },
-        axisLine: {
-          show: !0,
-          lineStyle: {
-            color: "#555"
-          }
-        }
-      }],
-    series: m
-  };
-
-  return u
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/villagesAlongRiver/index.less b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/villagesAlongRiver/index.less
deleted file mode 100644
index 3cf70ad..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/villagesAlongRiver/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.villagesAlongRiverBox{
-  padding:5px 10px 0 20px;
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/villagesAlongRiver/index.tsx b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/villagesAlongRiver/index.tsx
deleted file mode 100644
index d003972..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/modalPage/villagesAlongRiver/index.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React, {useEffect, useMemo, useRef, useState} from 'react';
-import { useDispatch, useSelector } from "react-redux";
-import {Button, message, Input, Table, Tooltip} from 'antd';
-import "./index.less"
-import {ColumnsType} from "antd/lib/table";
-import staticData from '../../../../../../../staticData';
-import {getAroundVillageApi} from "../../../../../../../../service/flowAnalysis";
-
-const { TextArea } = Input;
-
-type IProps = {
-  record:any;
-}
-
-const DescriptionsPage: React.FC<IProps> = ({ record }) => {
-  const columns = useMemo<ColumnsType<any>>(() => [
-    { title: '县名', key: 'city', width:100, dataIndex: 'city', fixed:"left", align:"center", ellipsis: true},
-    { title: '乡镇名', key: 'town', width:90, dataIndex: 'town', fixed:"left", align:"center", ellipsis: true},
-    { title: '村庄名称', key: 'village', width:90, dataIndex: 'village' , fixed:"left", align:"center", ellipsis: true},
-    { title: '人口(人)', key: 'pcount', width:70, dataIndex: 'pcount' , align:"center"},
-    { title: '户籍(户)', key: 'htcount', width:70, dataIndex: 'htcount' , align:"center", ellipsis: true},
-    { title: '防洪能力', key: 'floodCtlAbility', width:120, dataIndex: 'floodCtlAbility' , align:"center", ellipsis: true},
-    { title: '防汛责任人', key: 'riskContactList', width:120, dataIndex: 'riskContactList' , align:"center", ellipsis: true, render: (text)=><div>
-        {text && text.length>0?
-          text.map((item:any)=><div>{item.name}</div>):<></>
-        }
-      </div>
-    },
-    { title: '防汛责任人电话', key: 'riskContactList', width:120, dataIndex: 'riskContactList' , align:"center", ellipsis: true, render: (text)=><div>
-        {text && text.length>0?
-          text.map((item:any)=><div>{item.phone}</div>):<></>
-        }
-      </div>
-    },
-    { title: '预警指标', key: 'riskRainList', width:240, dataIndex: 'riskRainList' , align:"center", ellipsis: true, render: (text)=><div>
-        {text && text.length>0?
-          text.map((item:any)=><div>{item.timeBucket}h:准备转移{item.prepareTransfer}mm,立即转移{item.immediateTransfer}mm</div>):<></>
-        }
-      </div>
-    },
-    { title: '预案', key: '', width:100, dataIndex: '' , fixed:"right", align:"center", render:(rec)=><div style={{padding:"5px 0"}}>
-        <Button type="primary" ghost size="small" onClick={()=>{
-          if(!rec.plan){
-            message.info("请先上传预案！")
-          }else{
-            message.info("后续上传了预案需要做应用的查看页面！")
-          }
-        }}>查看</Button>
-      </div>
-    },
-  ], []);
-
-  const [data, setData] = useState([]);
-
-  const getYhczData = async (rec:any) => {
-    let params = {
-      "rvcd": rec.rvcd,
-    };
-    const resData = await getAroundVillageApi(params);
-    if(resData.code === 200){
-      setData(resData.data.villageList);
-    }
-  };
-
-  useEffect(() => {
-    getYhczData(record);
-  }, [record]);
-
-  return (
-    <div className="villagesAlongRiverBox">
-      <div >
-        <Table
-            rowKey="key"
-            columns={columns}
-            // @ts-ignore
-            dataSource={data}
-            scroll={{ y: 180 }}
-            pagination={false}
-        />
-      </div>
-    </div>
-  )
-};
-
-export default DescriptionsPage
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/player/player.less b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/player/player.less
deleted file mode 100644
index 73bfb43..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/player/player.less
+++ /dev/null
@@ -1,22 +0,0 @@
-.flowSlider{
-  .ant-slider-disabled .ant-slider-track{
-    background-color: #7abaff !important;
-  }
-  .ant-slider-disabled .ant-slider-handle, .ant-slider-disabled .ant-slider-dot{
-    border-color: #0052D9 !important;
-  }
-}
-
-.ant-slider-tooltip{
-  padding:2px 0;
-  .ant-tooltip-inner{
-    padding:2px 5px;
-    border-radius: 4px;
-  }
-  .ant-tooltip-inner{
-    min-height:24px;
-  }
-  .ant-tooltip-arrow{
-    height:15px;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/player/player.tsx b/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/player/player.tsx
deleted file mode 100644
index 7fc60ff..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/analysis/player/player.tsx
+++ /dev/null
@@ -1,317 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import {Collapse, Slider , Button, Spin, Modal} from 'antd'
-import {
-  PlayCircleOutlined, PauseCircleOutlined
-} from '@ant-design/icons';
-import {useDispatch, useSelector} from 'react-redux';
-import { getProcessByAnalysisTimeApi, getProcessByTimeRangeApi } from "../../../../../../../service/flowAnalysis";
-import Style from 'ol/style/Style';
-import Stroke from 'ol/style/Stroke';
-import VectorLayer from 'ol/layer/Vector';
-import { Vector as VectorSource } from 'ol/source';
-import Feature from 'ol/Feature';
-import {Point, LineString} from 'ol/geom';
-import * as proj from "ol/proj";
-import FillStyle from "ol/style/Fill";
-import "./player.less"
-
-
-const transformFn = proj.getTransform('EPSG:4326', 'EPSG:900913');
-
-type IProps = {
-  type: any;
-  modalTimeParams: any;
-  activeKey: any;
-  showDetails: any;
-}
-
-const Player: React.FC<IProps> = ({ type, modalTimeParams, activeKey, showDetails }) => {
-  const dispatch = useDispatch();
-
-  let mapObj = useSelector((s:any) => s.map.map);
-
-  const [flowData, setFlowData] = useState([]);
-  const [timeData, setTimeData] = useState([]);
-  const [play, setPlay] = useState(false);
-
-  const [num, setNum] = useState(0);
-  const [minNum, setMinNum] = useState(0);
-  const [maxNum, setMaxNum] = useState(0);
-
-  const [tooltipOpen, setTooltipOpen] = useState(true);
-
-  const getData = async (val:any, time:any) => {
-    setTooltipOpen(true);
-    if(val === "按分析时刻"){
-      let params = {
-        time:time.startTime
-      };
-      const resData = await getProcessByAnalysisTimeApi(params);
-      if(resData.code === 200){
-        setFlowData(resData.data);
-
-        if(resData.data.length>0){
-          setMaxNum(resData.data[0].flowDetils.length);
-        }
-      }
-    }else if(val === "按降雨时段"){
-      let params = {
-        "startTime": time.startTime,
-        "endTime": time.endTime,
-        "type": 8
-      };
-      const resData = await getProcessByTimeRangeApi(params);
-      if(resData.code === 200){
-        setFlowData(resData.data);
-
-        if(resData.data.length>0){
-          setMaxNum(resData.data[0].flowDetils.length);
-        }
-      }
-    }
-  };
-
-  useEffect(() => {
-    getData(type, modalTimeParams);
-
-    setNum(0);
-    setPlay(false);
-
-    if(mapObj){
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "flowLoop"){
-          layer.getSource().clear();
-        }
-      });
-    }
-
-  }, [type, modalTimeParams]);
-
-  useEffect(() => {
-    if(showDetails){
-      setTooltipOpen(false);
-    }else{
-      setTooltipOpen(true);
-    }
-  }, [showDetails]);
-
-  useEffect(() => {
-    if (play) {
-      let n = num;
-      const h = setInterval(() => {
-        n = n+1;
-
-        let flowLayer:any = null;
-        mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if(layer.values_.name === "flowLoop"){
-            flowLayer = layer;
-          }
-        });
-
-        let features = flowLayer.getSource().getFeatures();
-        features.forEach((feature:any) => {
-          feature.setStyle([
-            new Style({
-              stroke: new Stroke({
-                color: feature.values_.data.flowDetils[num].color,
-                width: 4,
-              }),
-              fill: new FillStyle({ color: feature.values_.data.flowDetils[num].color }),
-            })
-          ]);
-        });
-
-        if(n>=maxNum){
-          n = 0;
-        }
-
-        setNum(n);
-
-      }, 1000);
-
-      return () => {
-        clearInterval(h);
-      }
-    }
-  }, [play,num]);
-
-  const setIndex = (index:any) => {
-    setNum(index);
-
-    let flowLayer:any = null;
-    mapObj.getLayers().getArray().forEach((layer:any)=> {
-      if(layer.values_.name === "flowLoop"){
-        flowLayer = layer;
-      }
-    });
-
-    let features = flowLayer.getSource().getFeatures();
-    features.forEach((feature:any) => {
-      feature.setStyle([
-        new Style({
-          stroke: new Stroke({
-            color: feature.values_.data.flowDetils[index].color,
-            width: 4,
-          }),
-          fill: new FillStyle({ color: feature.values_.data.flowDetils[index].color }),
-        })
-      ]);
-    });
-  };
-
-  const marks = {
-    [minNum]: {
-      style: {
-        color: '#333',
-      },
-      label: <span style={{width:"110px",fontSize:"12px"}}>{timeData[0]}</span>,
-    },
-    [maxNum-1]: {
-      style: {
-        color: '#333',
-      },
-      label: <div style={{width:"110px",fontSize:"12px",marginLeft:"-32px"}}>{timeData[maxNum-1]}</div>,
-    }
-  };
-
-  const formatTooltip = (value:any) => {
-    //return timeData[value];
-    return <div className="formatTooltip">{timeData[value]}</div>
-  };
-
-  useEffect(() => {
-    if(mapObj){
-      let hlLayer:any = null;
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "HLLayer"){
-          hlLayer = layer;
-        }
-      });
-
-      let features = hlLayer.getSource().getFeatures();
-
-      if(flowData.length>0){
-        if(features.length>0){
-          flowData.map((item:any)=>{
-            features.map((item1:any)=>{
-              if(item1.values_.data.RVCD === item.rvcd){
-                item.path = item1.values_.data.geometry.coordinates;
-              }
-            });
-          });
-        }
-      }
-
-      //console.log("flowData 115+++++",flowData);
-
-      let timeArray:any = [];
-      if(flowData.length>0){
-        flowData.map((item:any)=>{
-          if(item.flowDetils.length>0){
-            item.flowDetils.map((item1:any)=>{
-              if(item1.type === 1){
-                item1.color = "#02B8FA"
-              }else if(item1.type === 2 || item1.type === 3){
-                item1.color = "#FFD186"
-              }else if(item1.type === 4){
-                item1.color = "#F99A00"
-              }else if(item1.type === 5 || item1.type === 6 || item1.type === 7 || item1.type === 8){
-                item1.color = "#C13022"
-              }
-
-              timeArray.push(item1.tm);
-            });
-          }
-        });
-
-        setTimeData(timeArray);
-
-        /**
-         * 创建线 linestiring
-         */
-        var layer = new VectorLayer({
-          // @ts-ignore
-          name:"flowLoop",
-          source: new VectorSource(),
-        });
-        console.log("237 flowData+++",flowData);
-        let featuresDefalut = flowData.map((point:any, index:any) => {
-          if(point && point.path){
-            const geom1 = new LineString(point.path);
-
-            if(geom1){
-              geom1.applyTransform(transformFn);
-
-              let feature = new Feature({
-                geometry: geom1,
-                data:point,
-                time: index,
-              });
-
-              feature.setStyle([
-                new Style({
-                  stroke: new Stroke({
-                    //color: "#84B3E8",
-                    color: point.flowDetils[0].color,
-                    width: 4
-                  }),
-                  fill: new FillStyle({ color: point.flowDetils[0].color }),
-                })
-              ]);
-
-              return feature;
-            }
-          }
-        });
-
-        // @ts-ignore
-        featuresDefalut.forEach(feature => layer.getSource().addFeature(feature));
-
-        layer.setZIndex(100); // 设置层级为100
-
-        mapObj.addLayer(layer);
-      }
-    }
-
-    if(activeKey !== "5"){
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if(layer.values_.name === "flowLoop"){
-          layer.getSource().clear();
-        }
-      });
-      setTooltipOpen(false);
-    }
-
-  }, [flowData, mapObj]);
-
-  return (
-
-    <div className="clearFloat" style={{ padding: '0 1rem' }}>
-      <div className="lf" style={{width:"40px", margin:"-11px 5px 0px 0px"}}>
-        <Button
-          icon={play?<PauseCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />:<PlayCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />}
-          style={{border:0, outline:"none !important", background:"none"}}
-          onClick={() => setPlay(!play)}
-        />
-      </div>
-      <div className="lf flowSlider" style={{width:"calc( 100% - 45px )"}}>
-        {
-          maxNum>0?
-            <Slider
-              disabled={play}
-              min={minNum}
-              max={maxNum-1}
-              marks={marks}
-              value={num}
-              //tooltip={{open:true}}
-              tooltip={{open:tooltipOpen}}
-              tipFormatter={formatTooltip}
-              onChange={(val)=>setIndex(val)}
-            />:null
-        }
-      </div>
-    </div>
-  )
-}
-
-export default Player;
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/index.less b/src/views/Home/panels/forecastPanels/flowAnalysis/index.less
deleted file mode 100644
index b5e88f4..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/index.less
+++ /dev/null
@@ -1,91 +0,0 @@
-.riskBox{
-  margin-top:-10px;
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 55rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-
-  .drpBox{
-    .button-group span{
-      padding: 0 0.1rem;
-    }
-  }
-  .ellipsisDiv{
-    width:115px;
-    overflow: hidden;//溢出隐藏
-    white-space: nowrap;//禁止换行
-    text-overflow: ellipsis;//...
-  }
-}
-
-
-.animated-arrows {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100px;  height: 100px;  pointer-events: none;
-}
-
-.arrow1, .arrow2 {
-  width: 10px;
-  height: 10px;
-  border-top: 2px solid red;
-  border-right: 2px solid red;
-  transform: rotateZ(-45deg);
-  animation: arrow-move 1s linear infinite;
-}
-.arrow1::after, .arrow2::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100px;  height: 100px;  transform: rotateZ(90deg);
-  border-top: 2px solid black;
-  border-right: 2px solid black;
-}
-.arrow1 {
-  left: 50px;  top: 0;
-}
-.arrow2 {
-  left: 0;
-  top: 50px;}
-.arrow2::after {
-  transform: rotateZ(0deg);
-}
-
-/*
-@keyframes arrow-move {
-  0 {
-    transform: translate(-5px, -5px) rotateZ(-45deg);
-  }
-  100 {
-    transform: translate(5px, 5px) rotateZ(-45deg);
-  }
-}*/
diff --git a/src/views/Home/panels/forecastPanels/flowAnalysis/index.tsx b/src/views/Home/panels/forecastPanels/flowAnalysis/index.tsx
deleted file mode 100644
index d8a09a0..0000000
--- a/src/views/Home/panels/forecastPanels/flowAnalysis/index.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import {Collapse, Image, Radio} from 'antd'
-import React, {useEffect, useState, useRef} from 'react'
-import "./index.less"
-import AnalysisPage from './analysis';
-import {useSelector} from "react-redux";
-
-
-
-const { Panel } = Collapse;
-
-type IProps = {
-  activeKey: any;
-}
-
-const HoursPanelPage: React.FC<IProps> = ({ activeKey }) => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const onChange = (key: string | string[]) => {
-    console.log(key);
-  };
-
-  return (
-    <div className="riskBox" style={{height: hasAlertBox?"calc(100vh - 110px)":"calc(100vh - 90px)"}}>
-      <Collapse defaultActiveKey={['1', '2', '3']} onChange={onChange} expandIconPosition="end" >
-        <Panel header={<div className="clearFloat panelTitle">
-          <div className="lf">
-            {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-            <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-          </div>
-          <span className="lf txt">流量分析</span>
-        </div>} key="1">
-          <AnalysisPage activeKey={activeKey}/>
-        </Panel>
-
-      </Collapse>
-    </div>
-  )
-}
-
-export default HoursPanelPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/arealRainfTm/index.js b/src/views/Home/panels/forecastPanels/meteorology/arealRainfTm/index.js
deleted file mode 100644
index c383892..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/arealRainfTm/index.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import {Slider, Button, message, DatePicker, Spin} from 'antd'
-import {useDispatch, useSelector} from 'react-redux';
-import YsgzqTuli from '../../../../img/ysgzqTuli.png'
-
-
-
-
-
-
-const Index = ({tm,ts}) => {
-  const abort = useRef(false);//不首次渲染
-  const [loading, setLoading] = useState(false);
-
-  const dispatch = useDispatch();
-  let mapObj = useSelector((s) => s.map.map);
-
-
-
-  useEffect(() => {
-    if (abort.current) {
-      abort.current = false;
-      return;
-    }
-
-      mapObj.getLayers().getArray().forEach((layer)=> {
-        if(layer.values_.name === "ContourLayer"){
-          layer.getSource().clear();
-        }
-      });
-
-      if(tm&&ts){
-        const myTm = tm.format('YYYYMMDD')+ts
-        dispatch.shyjview.showWeatherRadar({myTm:myTm});  
-      }
-
-
-    return ()=>{
-
-        dispatch.runtime.setLayerSetting({ contour: null, dem: undefined });
-        dispatch.map.setLayerVisible({ ContourLayer: false });
-    
-        //不这样清除会有残留
-        mapObj.getLayers().getArray().forEach((layer)=> {
-          if(layer.values_.name && (layer.values_.name === 'ContourLayer' || layer.values_.name === 'ContourLayerLoop')){
-            layer.getSource().clear();
-          }
-        });
-    }
-  }, [tm,ts,mapObj]);
-
-
-  return (
-    <>
-        {
-          loading?
-            <div style={{position:"absolute",top:"38vh",left:"48vw",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-              <Spin tip="正在加载降雨等值面..." size="large" spinning={loading} />
-            </div>:null
-        }
-
-        <div  style={{position: "absolute",zIndex: 100,left: 'calc(100vw - 500px)', top: "calc(100vh - 300px)"}}>
-            <img src={YsgzqTuli} alt="" width={150}/>
-        </div> 
-    </>
-  )
-}
-
-export default Index;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/arealRainfall/index.js b/src/views/Home/panels/forecastPanels/meteorology/arealRainfall/index.js
deleted file mode 100644
index 8241417..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/arealRainfall/index.js
+++ /dev/null
@@ -1,309 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import {Slider, Button, message, DatePicker, Spin} from 'antd'
-import {useDispatch, useSelector} from 'react-redux';
-import {
-  PlayCircleOutlined, PauseCircleOutlined
-} from '@ant-design/icons';
-import {
-  getListFileRadarReflectionWaveApi, getRadarReflectionWavePicApi
-} from "../../../../../../service/meteorology";
-import { httppost2, httpget2 } from '../../../../../../utils/request';
-import { WeatherSetTm24h1 } from '../../../../../../models/_/shqxjs';
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import StrokeStyle from "ol/style/Stroke";
-import { Text } from 'ol/style';
-import Stroke from "ol/style/Stroke";
-import {unByKey} from 'ol/Observable.js';
-import {easeOut} from 'ol/easing.js';
-import {getVectorContext} from 'ol/render.js';
-import Circle from "ol/style/Circle";
-import GeoJSONFormat from "ol/format/GeoJSON";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import { Fill } from "ol/style.js";
-import * as proj from "ol/proj";
-import moment from 'moment';
-import { ShqxYjhisGet } from '../../../../../../models/_/shqxjs';
-import YsgzqTuli from '../../../../img/ysgzqTuli.png'
-
-
-
-
-
-const Index = ({tm,ts}) => {
-  const abort = useRef(false);//首次渲染
-  const [play, setPlay] = useState(false);
-  const [maxNum, setMaxNum] = useState(24);
-  const [showRainfallForecast, setShowRainfallForecast] = useState(false);
-  const [currentTime, setCurrentTime] = useState("");
-  const [rightTime, setRightTime] = useState([]);
-  const [loading, setLoading] = useState(false);
-  const dispatch = useDispatch();
-  let contour = useSelector((s) => s.runtime.layerSettingLoop.contour);
-  let mapObj = useSelector((s) => s.map.map);
-
-
-
-  useEffect(() => {
-    if (abort.current) {
-      abort.current = false;
-      return;
-    }
-
-      mapObj.getLayers().getArray().forEach((layer)=> {
-        if(layer.values_.name === "ContourLayerLoop"){
-          layer.getSource().clear();
-        }
-      });
-      dispatch.runtime.setLayerSettingLoop({ contour: null })
-
-
-      getCurrentTime(tm)
-      const myTm = tm.format('YYYYMMDD')+ts
-      dispatch.shyjview.showWeather24h1h({myTm:myTm});  
-      dispatch.map.setLayerVisible({ ContourLayerLoop: true });
-
-
-    return ()=>{
-        dispatch.runtime.closeFeaturePopAll()
-        dispatch.runtime.setLayerSettingLoop({ contour: null })
-        dispatch.runtime.setLayerSetting({ contour: null, dem: undefined });
-        dispatch.map.setLayerVisible({ ContourLayer: false });
-    
-        const a = []
-        //不这样清除会有残留
-        mapObj.getLayers().getArray().forEach((layer)=> {
-          a.push(layer.values_.name)
-          if(layer.values_.name && (layer.values_.name === 'ContourLayer' || layer.values_.name === 'ContourLayerLoop')){
-            layer.getSource().clear();
-          }
-        });
-    }
-  }, [tm,ts,mapObj]);
-  
-
-  useEffect(() => {
-    if (play) {
-      setLoading(true);
-
-      const h = setInterval(() => {
-        if(mapObj){
-          mapObj.getLayers().getArray().forEach((layer)=> {
-            if(layer.values_.name === "ContourLayerLoop"){
-              layer.getSource().clear();
-            }
-          });
-          dispatch.runtime.addContourIndexLoop({ startIndex: 0 });
-        }
-      }, 1000);
-
-      return () => {
-        clearInterval(h);
-      }
-    }
-  }, [play, mapObj]); 
-
-  useEffect(() => {
-    if(contour && contour.index){
-      setLoading(false);
-    }
-  }, [contour]); // eslint-disable-line
-
-  const getCurrentTime = async (tm) => {
-    // let paramsTm = "";
-    // let defalut1 = moment().format("YYYY-MM-DD 08:15");
-    // let defalut2 = moment().format("YYYY-MM-DD 20:00");
-    // let currentHM = moment().format("YYYY-MM-DD HH:mm");
-
-    // if(moment(currentHM).isBefore(defalut1)){
-    //   paramsTm = moment().add(-1, 'day').format("YYYYMMDD20");
-    // }else{
-    //   if(moment(currentHM).isBefore(defalut2)){
-    //     paramsTm = moment().format("YYYYMMDD08");
-    //   }else{
-    //     paramsTm = moment().format("YYYYMMDD20");
-    //   }
-    // }
-    // paramsTm = '2024041008'
-    const paramsTm = tm.format('YYYYMMDD08')
-    const latest = await ShqxYjhisGet(paramsTm);
-    if (!latest) {
-      return null;
-    }
-    //let lastH = latest.tm.substring(12,13);
-    let lastH = latest.tm.substring(11,13);
-    let currentH = moment().format("H");
-    let currentM = moment().format("m");
-    // let currentD = moment().format("MM-DD");
-    let currentD = tm.format("MM-DD");
-    // let currentD1 = moment().add(1,"d").format("MM-DD");
-    let currentD1 = moment(tm).add(1,"d").format("MM-DD");
-
-    let currentT = null;
-    if(Number(currentM)>15){
-      currentT = currentH;
-    }else{
-      currentT = Number(currentH) - 1;
-    }
-    console.log("currentTime",currentT);
-    setCurrentTime(lastH+":00");
-
-    //偏移量
-    let pylNum = 0//Number(currentT) - Number(lastH);
-
-    let times = [];
-    for (let ii = 1; ii <= 24 - pylNum; ii++) {
-      times.push( (Number(currentT)+ii>=24?
-        ((Number(currentT)+ii-24)>=10?currentD+" "+(Number(currentT)+ii-24):(currentD1+" "+"0"+(Number(currentT)+ii-24))):
-        (Number(currentT)+ii)>=10?(Number(currentT)+ii):("0"+Number(currentT)+ii)) +":00");
-    }
-    //console.log("113@@@@++++",times);
-    setRightTime(times);
-    setMaxNum(times.length);
-
-    //console.log("maxNum",23+times.length+1);
-  };
-
-  const setIndex = (index) => {
-    dispatch.map.setClickLoopBtn(true);
-
-    const newContour = { ...contour };
-    newContour.index = index + 1;
-    //console.log("newContour",newContour);
-
-    //console.log("mapObj 71++++",mapObj);
-
-    if(mapObj){
-      mapObj.getLayers().getArray().forEach((layer)=> {
-        if(layer.values_.name === "ContourLayerLoop"){
-          layer.getSource().clear();
-        }
-      });
-    }
-
-    dispatch.runtime.setLayerSettingLoop({ contour: newContour })
-  };
-
-  const marks = {
-    0: {
-      style: {
-        color: '#333',
-      },
-      label: <span>{tm.format('MM-DD')+" "+ts+':00'}</span>,
-    },
-    6: {
-      style: {
-        color: '#333',
-      },
-      label: <span>未来6小时</span>,
-    },
-    12: {
-      style: {
-        color: '#333',
-      },
-      label: <span>未来12小时</span>,
-    },
-    18: {
-      style: {
-        color: '#333',
-      },
-      label: <span>未来18小时</span>,
-    },
-    /*25:rightTime[1],*/
-    23:{
-      style: {
-        color: '#333',
-        width:'100px',
-        marginLeft:'-15px'
-      },
-      //label: <span>{rightTime[2]}</span>,
-      label: <span>{moment(tm).add(1,"d").format('MM-DD')+" "+(Number(ts)-1)+':00'}</span>,
-    },
-  };
-
-  const clickPlayBtn = () => {
-    setPlay(!play);
-    dispatch.map.setLayerVisible({ ContourLayer: false });
-    dispatch.map.setClickLoopBtn(true);
-  };
-
-
-  return (
-    <>
-        <div className="timeLineBox clearFloat">
-            {
-              loading?
-                <div style={{position:"absolute",top:"-50vh",left:"35%",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-                  <Spin tip="正在加载降雨等值面..." size="large" spinning={loading} />
-                </div>:null
-            }
-
-            <div className="lf">
-              {/* onClick={() => setPlay(!play)}  */}
-              <Button
-                icon={play?<PauseCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />:<PlayCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />}
-                style={{border:0, outline:"none !important", background:"none"}}
-                onClick={clickPlayBtn}
-              />
-            </div>
-            <div className="lf" style={{width:"680px"}}>
-              <div className="topLabelBox clearFloat">
-                {/* <span className="lf">落地雨</span> */}
-                {/* <span className="lf" style={{left: 24*(650/maxNum)+15+"px"}}>当前</span> */}
-                {/* <span className="lf" style={{left: 27*(650/maxNum)+5+"px"}}>测雨雷达</span> */}
-                {/* <span className="lf">气象预报</span> */}
-                {/* <div className="btnBg" onClick={()=>setShowRainfallForecast(true)} style={{left: 24*(650/maxNum)+6+"px"}}></div> */}
-              </div>
-              {/*disabled={!play?false:true}*/}{/*tooltip={{open:false}}*/}
-              <Slider
-                min={0}
-                max={23}
-                marks={marks}
-                included={false}
-                tooltip={{open:false}}
-                range={false}
-                disabled={play}
-                value={contour?.index}
-                onChange={(val)=>setIndex(val)}
-              />
-              <div className="labelBox clearFloat">
-                {/*<span className="lf">过去24小时</span>
-            <span className="lf">过去12小时</span>
-            <span className="lf">过去6小时</span>
-            <span className="lf">过去3小时</span>
-            <span className="lf">过去1小时</span>*/}
-
-                {/*<span className="lf">{currentTime}</span>*/}
-
-                {/*{
-              rightTime.length>0?
-                rightTime.map((item:any,index:any)=>
-                  <span className="lf" key={index}>{item}</span>
-                ):null
-            }*/}
-
-                {/*<span className="lf">{rightTime[1]}</span>
-            <span className="lf">{rightTime[3]}</span>
-            <span className="lf">{rightTime[6]}</span>
-            <span className="lf">{rightTime[rightTime.length-2]}</span>
-            <span className="lf">{rightTime[rightTime.length-1]}</span>*/}
-
-                {/*<span className="lf">{moment(currentTime).add(1, 'hour').format("HH:00")}</span>
-            <span className="lf">{moment(currentTime).add(3, 'hour').format("HH:00")}</span>
-            <span className="lf">{moment(currentTime).add(6, 'hour').format("HH:00")}</span>
-            <span className="lf">{moment(currentTime).add(16, 'hour').format("HH:00")}</span>
-            <span className="lf">未来24小时</span>*/}
-              </div>
-            </div>
-          </div>
-
-        <div  style={{position: "absolute",zIndex: -1,left: 'calc(100vw - 500px)', top: "calc(100vh - 300px)"}}>
-            <img src={YsgzqTuli} alt="" width={150}/>
-        </div> 
-    </>
-  )
-}
-
-export default Index;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/gridRainfall/index.js b/src/views/Home/panels/forecastPanels/meteorology/gridRainfall/index.js
deleted file mode 100644
index fe1a8a1..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/gridRainfall/index.js
+++ /dev/null
@@ -1,193 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import {Slider, Button, message, DatePicker} from 'antd'
-import {useDispatch, useSelector} from 'react-redux';
-import {
-  getListFileRadarReflectionWaveApi, getRadarReflectionWavePicApi
-} from "../../../../../../service/meteorology";
-import { httppost2, httpget2 } from '../../../../../../utils/request';
-import { WeatherSetTm24h2 } from '../../../../../../models/_/shqxjs';
-
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import StrokeStyle from "ol/style/Stroke";
-import { Text } from 'ol/style';
-import Stroke from "ol/style/Stroke";
-import {unByKey} from 'ol/Observable.js';
-import {easeOut} from 'ol/easing.js';
-import {getVectorContext} from 'ol/render.js';
-import Circle from "ol/style/Circle";
-import GeoJSONFormat from "ol/format/GeoJSON";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import { Fill } from "ol/style.js";
-import * as proj from "ol/proj";
-import YsgzqTuli from '../../../../img/ysgzqTuli.png'
-
-
-
-
-
-
-const Index = ({tm,ts}) => {
-    const transformFn = proj.getTransform('EPSG:4326', 'EPSG:900913');
-    let mapObj = useSelector((s) => s.map.map);
-    const dispatch = useDispatch();
-    
-
-    const abort = useRef(false);//首次渲染
-    useEffect(()=>{
-        if (abort.current) {
-                abort.current = false;
-                return;
-          }
-
-        mapObj.getLayers().getArray().forEach((layer)=> {
-            if(layer.values_.name && (layer.values_.name === 'ContourLayer' || layer.values_.name === 'ContourLayerLoop')){
-                layer.getSource().clear();
-            }
-        });
-        getData(tm,ts)
-        return ()=>{
-            dispatch.runtime.closeFeaturePopAll()
-            mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-                if( (layer.values_.name) && ((layer.values_.name).indexOf("Grid_") !== -1 || (layer.values_.name).indexOf("girdRainText") !== -1) ){
-                    layer.getSource().clear();
-                }
-            })
-        }
-    },[mapObj, tm, ts])
-
-
-    const getData = async(tm,ts)=>{
-        const time = tm.format('YYYYMMDD')+ts
-        const weatherSet = await WeatherSetTm24h2(time)
-        if(weatherSet&&weatherSet[0]){
-            setGrid(weatherSet[0])
-        }     
-    }
-
-    const setGrid = (data)=>{
-        const x1 = data.x1
-        const dw = data.dw
-        const nw = data.nw 
-        const x2 = data.x2
-
-        const y1 = data.y1
-        const dh = data.dh
-        const nh = data.nh
-        const y2 = data.y2
-
-        for (let row=0; row<=nh ;row++){
-            const rowArr = [[x1-(dw/2),y1+(row-0.5)*dh],[x2+(dw/2),y1+(row-0.5)*dh]]
-            addLayer({type:"LineString",coordinates:rowArr},'Grid_'+row,'#8c8c8c')
-        }
-        for (let col=0; col<=nw ; col++){
-            const colArr = [[x1+(col-0.5)*dw,y1-(dh/2)],[x1+(col-0.5)*dw,y2+(dh/2)]]
-            addLayer({type:"LineString",coordinates:colArr},'Grid_'+col,'#8c8c8c')
-        }
-
-
-
-        //网格雨量文字图层
-        var layer2 = new VectorLayer({
-            // @ts-ignore
-            name:"girdRainText",
-            zIndex:200,
-        });
-        var source2 = new VectorSource({ wrapX: false })
-        layer2.setSource(source2);
-        const features2 = []
-        data.data?.map((col,index)=>{
-            col?.map((row, index2)=>{
-                const geom1 = new Point([x1+(index2*dw),y1+(index*dh)]);
-                geom1.applyTransform(transformFn);
-
-                let feature = new Feature({
-                    geometry: geom1,
-                  });
-                
-                feature.setStyle(new Style({
-                    text: new Text(({
-                      // 位置
-                      textAlign: 'center',
-                      // 基准线
-                      textBaseline: 'middle',
-                      // 文字样式
-                      font: 'bold 12px 微软雅黑',
-                      // 文本内容
-                      text: `${Number(row.toFixed(2))}`,
-                      // 文字颜色
-                      fill: new Fill({ color: getColor(row) }),
-                      // 文字背景
-                      // stroke: new Stroke({ color: '#ffcc33', width: 10 })
-                    }))
-                  }))
-                features2.push(feature)
-            })
-        })
-        features2.forEach(feature => layer2.getSource().addFeature(feature));
-        mapObj.addLayer(layer2);
-    }
-
-
-    const addLayer = (geojsonrv,name,color)=>{
-        if(!geojsonrv){
-            return
-        }
-        const geojsonFormat = new GeoJSONFormat();
-        let geometry = geojsonFormat.readGeometry(geojsonrv, {
-        featureProjection: 'EPSG:3857',
-        });
-        const feature = new Feature({
-            geometry
-        });
-
-        var vectorSource = new VectorSource({
-            features: [feature]
-        });
-
-        const vectorLayer = new VectorLayer({
-            // @ts-ignore
-            name: name,
-            source: vectorSource,
-            style: new Style({
-                stroke: new StrokeStyle({
-                    color: color||'#eee',
-                    width: 1,
-                }),
-            }),
-            zIndex:202
-        });
-
-        mapObj.addLayer(vectorLayer);
-    }   
-
-    const getColor = (val)=>{
-        if(val<0.1){
-            return '#8c8c8c'
-        }else if(val>=0.1 && val<10){
-            return 'rgb(167, 240, 143)';
-        }else if(val>=10 && val<25){
-            return 'rgb(64, 215, 255)';
-        }else if(val>=25 && val<50){
-            return 'rgb(32, 143, 238)';
-        }else if(val>=50 && val<100){
-            return 'rgb(85, 86, 255)';
-        }else if(val>=100 && val<250){
-            return 'rgb(191, 90, 252)';
-        }else{
-            return 'rgb(246, 66, 66)';
-        }
-    }
-
-  return (
-    <>
-        <div  style={{position: "absolute",zIndex: -1,left: 'calc(100vw - 500px)', top: "calc(100vh - 300px)"}}>
-            <img src={YsgzqTuli} alt="" width={150}/>
-        </div> 
-    </>
-  )
-}
-
-export default Index;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/gridRainfall2h/index.js b/src/views/Home/panels/forecastPanels/meteorology/gridRainfall2h/index.js
deleted file mode 100644
index f6c8730..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/gridRainfall2h/index.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import {Slider, Button, message, DatePicker} from 'antd'
-import {useDispatch, useSelector} from 'react-redux';
-import {
-  getListFileRadarReflectionWaveApi, getRadarReflectionWavePicApi
-} from "../../../../../../service/meteorology";
-import { httppost2, httpget2 } from '../../../../../../utils/request';
-import { WeatherSetTm2h } from '../../../../../../models/_/shqxjs';
-
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import StrokeStyle from "ol/style/Stroke";
-import { Text } from 'ol/style';
-import Stroke from "ol/style/Stroke";
-import {unByKey} from 'ol/Observable.js';
-import {easeOut} from 'ol/easing.js';
-import {getVectorContext} from 'ol/render.js';
-import Circle from "ol/style/Circle";
-import GeoJSONFormat from "ol/format/GeoJSON";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import { Fill } from "ol/style.js";
-import * as proj from "ol/proj";
-
-
-
-
-
-const Index = ({tm}) => {
-    const transformFn = proj.getTransform('EPSG:4326', 'EPSG:900913');
-    let mapObj = useSelector((s) => s.map.map);
-    
-
-    useEffect(()=>{
-        getData(tm)
-        return ()=>{
-            mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-                if( (layer.values_.name) && ((layer.values_.name).indexOf("Grid_") !== -1 || (layer.values_.name).indexOf("girdRainText") !== -1) ){
-                    layer.getSource().clear();
-                }
-            })
-        }
-    },[mapObj, tm])
-
-
-    const getData = async(tm)=>{
-        const time = tm.format('YYYYMMDDHH30')
-        const weatherSet = await WeatherSetTm2h(time)
-        if(weatherSet){
-            setGrid(weatherSet)
-        }     
-    }
-
-    const setGrid = (data)=>{
-        const x1 = data.x1
-        const dw = data.dw
-        const nw = data.nw 
-        const x2 = data.x2
-
-        const y1 = data.y1
-        const dh = data.dh
-        const nh = data.nh
-        const y2 = data.y2
-
-        for (let row=0; row<=nh ;row++){
-            const rowArr = [[x1-(dw/2),y1+(row-0.5)*dh],[x2+(dw/2),y1+(row-0.5)*dh]]
-            addLayer({type:"LineString",coordinates:rowArr},'Grid_'+row,'#8c8c8c')
-        }
-        for (let col=0; col<=nw ; col++){
-            const colArr = [[x1+(col-0.5)*dw,y1-(dh/2)],[x1+(col-0.5)*dw,y2+(dh/2)]]
-            addLayer({type:"LineString",coordinates:colArr},'Grid_'+col,'#8c8c8c')
-        }
-
-
-
-        //网格雨量文字图层
-        var layer2 = new VectorLayer({
-            // @ts-ignore
-            name:"girdRainText",
-            zIndex:200,
-        });
-        var source2 = new VectorSource({ wrapX: false })
-        layer2.setSource(source2);
-        const features2 = []
-        data.data?.map((col,index)=>{
-            col?.map((row, index2)=>{
-                const geom1 = new Point([x1+(index2*dw),y1+(index*dh)]);
-                geom1.applyTransform(transformFn);
-
-                let feature = new Feature({
-                    geometry: geom1,
-                  });
-                
-                feature.setStyle(new Style({
-                    text: new Text(({
-                      // 位置
-                      textAlign: 'center',
-                      // 基准线
-                      textBaseline: 'middle',
-                      // 文字样式
-                      font: 'bold 12px 微软雅黑',
-                      // 文本内容
-                      text: `${Number(row.toFixed(2))}`,
-                      // 文字颜色
-                      fill: new Fill({ color: getColor(row) }),
-                      // 文字背景
-                      // stroke: new Stroke({ color: '#ffcc33', width: 10 })
-                    }))
-                  }))
-                features2.push(feature)
-            })
-        })
-        features2.forEach(feature => layer2.getSource().addFeature(feature));
-        mapObj.addLayer(layer2);
-    }
-
-
-    const addLayer = (geojsonrv,name,color)=>{
-        if(!geojsonrv){
-            return
-        }
-        const geojsonFormat = new GeoJSONFormat();
-        let geometry = geojsonFormat.readGeometry(geojsonrv, {
-        featureProjection: 'EPSG:3857',
-        });
-        const feature = new Feature({
-            geometry
-        });
-
-        var vectorSource = new VectorSource({
-            features: [feature]
-        });
-
-        const vectorLayer = new VectorLayer({
-            // @ts-ignore
-            name: name,
-            source: vectorSource,
-            style: new Style({
-                stroke: new StrokeStyle({
-                    color: color||'#eee',
-                    width: 1,
-                }),
-            }),
-            zIndex:202
-        });
-
-        mapObj.addLayer(vectorLayer);
-    }   
-
-    const getColor = (val)=>{
-        if(val<0.1){
-            return '#8c8c8c'
-        }else if(val>=0.1 && val<10){
-            return 'rgb(167, 240, 143)';
-        }else if(val>=10 && val<25){
-            return 'rgb(64, 215, 255)';
-        }else if(val>=25 && val<50){
-            return 'rgb(32, 143, 238)';
-        }else if(val>=50 && val<100){
-            return 'rgb(85, 86, 255)';
-        }else if(val>=100 && val<250){
-            return 'rgb(191, 90, 252)';
-        }else{
-            return 'rgb(246, 66, 66)';
-        }
-    }
-
-  return (
-    <></>
-  )
-}
-
-export default Index;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/ToolBar.tsx b/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/ToolBar.tsx
deleted file mode 100644
index 690efb8..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/ToolBar.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Button, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-
-const { RangePicker } = DatePicker;
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  search: (value: any) => void;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ search }) => {
-  const [form] = Form.useForm();
-
-  useEffect(() => {
-    form.setFieldsValue({"tm":[moment().add(-1, 'day'), moment()]});
-  }, []);
-
-  const onSearchClick = () => {
-    const { tm,tm1, ...rec } = form.getFieldsValue();
-
-    if (tm) {
-      if (tm[0]) {
-        rec.startTime = tm[0].format('YYYY-MM-DD HH:mm:ss');
-      }
-      if (tm[1]) {
-        rec.endTime = tm[1].format('YYYY-MM-DD HH:mm:ss');
-      }
-    }else{
-      rec.startTime = 1;
-      rec.endTime = 1;
-    }
-
-    console.log("正在生效预警 查询参数 50++++++",rec);
-
-    search(rec);
-  };
-
-  const reset = () => {
-    form.resetFields();
-  };
-
-  return (
-    <Form
-      labelCol={{ span: 4 }}
-      wrapperCol={{ span: 20 }}
-      layout="inline"
-      form={form}
-    >
-      <Form.Item name="tm" label="日期" style={{marginLeft:"-30px"}}>
-        <RangePicker
-          showTime
-          //defaultValue={[moment().add(-1, 'day'), moment()]}
-          format="YYYY-MM-DD HH:mm:ss"
-          onChange={onSearchClick}
-        />
-      </Form.Item>
-      {/*<FormItem label="" name="publishUnit">
-        <Input style={{ width: 100 }} allowClear placeholder="发布单位" onChange={onSearchClick}/>
-      </FormItem>*/}
-      <FormItem label="类型" name="warnSignalType">
-        <Input allowClear placeholder="类型" onChange={onSearchClick}/>
-      </FormItem>
-      <FormItem label="级别" name="warnSignalLevel">
-        <Input allowClear placeholder="级别" onChange={onSearchClick}/>
-      </FormItem>
-
-      {/*<FormItem style={{margin:"0 0 0 5px"}}>
-        <Button type="primary" icon={<SearchOutlined />} onClick={onSearchClick}>查询</Button>
-      </FormItem>*/}
-      <FormItem style={{margin:"0 0 0 5px"}}>
-        <Button type="primary" icon={<RedoOutlined />} onClick={reset}>重置</Button>
-      </FormItem>
-    </Form>
-  );
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/index.less b/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/index.less
deleted file mode 100644
index 6c25b5b..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/index.less
+++ /dev/null
@@ -1,55 +0,0 @@
-.inEffectWarnListBox{
-  position: fixed;
-  width: calc(100vw - 102px);
-  height: calc(100vh - 80px);
-  background: #fff;
-  margin: 10px 0 0 0;
-  top:60px;
-  padding: 70px 10px 0 30px;
-  box-sizing: border-box;
-
-  .totalBox{
-    margin: 20px 0 0 0;
-    span{
-      margin:0 20px 0 0;
-      font-weight:bold;
-    }
-  }
-
-  .listPanel{
-    position: absolute;
-    top:80px;
-    width: calc(100vw - 145px);
-    height: calc( 100% - 85px );
-    //box-shadow: 1px 2px 10px #e8ecf1;
-    background: #fff;
-    .ant-input-affix-wrapper{
-      padding: 6px 11px !important;
-    }
-
-    .imgBox{
-      width: 108px;
-      height:92px;
-      margin:20px 30px 0 50px;
-    }
-    .txtBox{
-      width: calc( 100% - 190px );
-      margin-top:15px;
-    }
-
-    .txt1,.txt2{
-      font-size:16px;
-      letter-spacing: 1px;
-    }
-    .txt2{
-      margin-top:20px;
-    }
-  }
-
-  .ant-table table, .ant-table.ant-table-bordered > .ant-table-container, .ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table > tbody > tr > td {
-    border: 1px solid #f0f0f0;
-  }
-  .ant-table-tbody > tr > td{
-    padding: 6px !important;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/index.tsx b/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/index.tsx
deleted file mode 100644
index f02cf4b..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/inEffectWarn/index.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import {Descriptions, Table} from 'antd';
-import React, {useEffect, useMemo, useState} from "react";
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  CaretUpOutlined,PushpinFilled
-} from '@ant-design/icons';
-import "./index.less"
-import ToolBarPage from './ToolBar';
-import { ColumnsType } from 'antd/es/table';
-import { getGroupWarningApi } from "../../../../../../service/meteorology";
-import moment from 'moment';
-import appconsts from '../../../../../../service/appconsts';
-
-interface DataType {
-  key: React.Key;
-  name: string;
-  age: number;
-  address: string;
-  description: string;
-}
-
-type IProps = {
-  activeKey:any;
-}
-
-const InEffectWarnPage: React.FC<IProps> = ({ activeKey }) => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  let publishUnit = localStorage.getItem('address')?(localStorage.getItem('address')==="wufeng"?"五峰":"建始"):'建始';
-
-  const [tableData,setTableData] = useState<any>([]);
-  const [rightTableData,setRightTableData] = useState<any>([]);
-
-  const columns: ColumnsType<DataType> = [
-    { title: '发布单位', dataIndex: 'publishUnit', key: 'publishUnit', align: 'center' },
-    { title: '类型', dataIndex: 'warnSignalType', key: 'warnSignalType', align: 'center' },
-    { title: '级别', dataIndex: 'warnSignalLevel', key: 'warnSignalLevel', align: 'center' },
-    { title: '开始时间', dataIndex: 'startTime', key: 'startTime', align: 'center'},
-    { title: '结束时间', dataIndex: 'endTime', key: 'endTime', align: 'center' },
-  ];
-
-  const getData = async (searchParams?:any) => {
-    let params = {
-      "startTime": searchParams&&searchParams.startTime?searchParams.startTime===1?"":searchParams.startTime:moment().add(-1, 'day').format("YYYY-MM-DD HH:mm:ss"),//:"2023-06-15 00:00:00",
-      "endTime": searchParams&&searchParams.endTime?searchParams.endTime===1?"":searchParams.endTime:moment().format("YYYY-MM-DD HH:mm:ss"),//:"2023-06-16 23:59:59",
-      "filter": [
-        {
-          "name": "publishUnit",//查询列名 (发布单位)
-          "condition": "like",
-          "value": "%"+publishUnit+"%"
-        },
-        {
-          "name": "warnSignalType",//(类型)
-          "condition": "like",
-          "value": searchParams&&searchParams.warnSignalType?"%"+searchParams.warnSignalType+"%":"%%"
-        },
-        {
-          "name": "warnSignalLevel",//(级别)
-          "condition": "like",
-          "value": searchParams&&searchParams.warnSignalLevel?"%"+searchParams.warnSignalLevel+"%":"%%"
-        }
-      ]
-    };
-    const resData = await getGroupWarningApi(params);
-    //console.log("72+++",resData);
-    if(resData.code===200){
-      let leftData:any = [];
-      if(resData.data.length>0){
-        resData.data.map((item:any, index:any)=>{
-          if(item.typeList.length>0){
-            leftData.push({
-              effectArea: item.effectArea,
-              data: [],
-              type: []
-            });
-
-            item.typeList.map((item1:any)=>{
-              leftData[index].type.push(`${item1.type}${item1.warnList.length}`);
-
-              if(item1.warnList.length>0){
-                item1.warnList.map((item2:any)=>{
-                  leftData[index].data.push(item2);
-                });
-              }
-            });
-          }
-        });
-
-        //console.log("leftData 511+++",leftData);
-        setTableData(leftData);
-      }else{
-        setTableData([]);
-      }
-    }
-  };
-
-  useEffect(() => {
-    getData();
-  }, []);
-
-  useEffect(() => {
-    //console.log("524+++",tableData);
-    if(tableData.length>0 && tableData[0].data.length>0){
-      tableData[0].data.map((item:any)=>{
-        item.description = item.content
-      });
-
-      tableData[0].data.sort(function(a:any, b:any) {
-        let aTimeString = a.startTime;
-        let bTimeString = b.startTime;
-        let aTime = new Date(aTimeString).getTime();
-        let bTime = new Date(bTimeString).getTime();
-        return bTime - aTime;
-      });
-
-      setRightTableData(tableData[0].data);
-    }else{
-      setRightTableData([]);
-    }
-  }, [tableData]);
-
-  return (
-    <div className="inEffectWarnListBox" style={{height:hasAlertBox?"calc(100vh - 100px)":"calc(100vh - 80px)", top:hasAlertBox?"80px":"60px"}}>
-      <div className="listPanel">
-        <ToolBarPage search={getData}/>
-
-        <div className="clearFloat totalBox">
-          <div className="lf">预警信号统计：</div>
-          <div className="lf">
-            {
-              tableData.length>0?
-                <>{tableData[0].type.length>0?tableData[0].type.map((item:any)=><span>{item}</span>):""}</>:
-                "-"
-            }
-          </div>
-        </div>
-
-        <div style={{padding:"16px 10px 0 0"}}>
-          <Table
-            rowKey="id"
-            //bordered
-            columns={columns}
-            pagination={false}
-            expandable={{
-              expandedRowRender: (record:any) =>
-                <div key={record.id} style={{ margin: 0 }} className="clearFloat">
-                  <div className="lf imgBox">
-                    {/*// @ts-ignore*/}
-                    <img width={108} height={92} src={`${process.env.PUBLIC_URL}/assets/yjImages/`+appconsts.warningImgMap[record.warnSignalType+record.warnSignalLevel]} alt=""/>
-                  </div>
-                  <div className="lf txtBox">
-                    <div className="txt1">
-                      {record.publishUnit + record.startTime + "发布" + record.warnSignalType+record.warnSignalLevel+"预警信号：" + record.description}
-                    </div>
-                    <div className="txt2">
-                      <div>防御指南：</div>
-                      {/*// @ts-ignore*/}
-                      <div dangerouslySetInnerHTML={{ __html: (appconsts.warningSuggestMap[record.warnSignalType+record.warnSignalLevel]).replace(/\n/g, '<br>') }} />
-                    </div>
-                  </div>
-                </div>,
-              //defaultExpandedRowKeys:[rightTableData[0].id],
-              defaultExpandAllRows: true
-            }}
-            defaultExpandAllRows={true}
-            key={rightTableData}
-            dataSource={rightTableData}
-            scroll={{y:hasAlertBox?"calc( 100vh - 320px )":"calc( 100vh - 300px )"}}
-          />
-        </div>
-
-      </div>
-    </div>
-  )
-};
-
-export default InEffectWarnPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/index.less b/src/views/Home/panels/forecastPanels/meteorology/index.less
deleted file mode 100644
index 907bab2..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/index.less
+++ /dev/null
@@ -1,79 +0,0 @@
-.meteorologyBox{
-  width: 580px;
-  position: relative;
-  background: rgba(255,255,255,0.8);
-  border-radius: 6px;
-  overflow: hidden;
-  z-index: 100;
-
-  >div{
-    height:40px;
-    cursor:pointer;
-    margin:10px 10px 0 20px;
-
-    &:nth-child(1),&:nth-child(2){
-      width: 68px;
-    }
-    &:nth-child(3),&:nth-child(4){
-      width: 100px;
-    }
-    &:nth-child(5){
-      width: 84px;
-    }
-    .ant-ribbon{
-      height:28px;
-      line-height:27px;
-      top:0;
-      right:0;
-    }
-  }
-  .activeBadge{
-    position: absolute;
-    //top:40px;
-    top: -12px;
-  }
-  .activeBadge0{
-    //left:53px;
-    left:61px;
-  }
-  .activeBadge1{
-    //left:144px;
-    left:158px;
-  }
-  .activeBadge2{
-    //left:247px;
-    left:289px;
-  }
-  .activeBadge3{
-    //left:367px;
-    left:418px;
-  }
-  .activeBadge4{
-    left:530px;
-  }
-
-  .sateCloudPageBox,.radarPageBox{
-    position:fixed;
-    height:60px;
-    background: #fff;
-    z-index: 101;
-    bottom:13px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    box-sizing: border-box;
-    border-radius:6px;
-    >div{
-      background: #fff;
-    }
-  }
-
-  .sateCloudPageBox{
-    width:50vw;
-    padding: 10px 30px 0 10px;
-    left: 20vw;
-  }
-  .radarPageBox{
-    width:70vw;
-    padding: 10px 10px 0 10px;
-    left: 12vw;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/index.tsx b/src/views/Home/panels/forecastPanels/meteorology/index.tsx
deleted file mode 100644
index f392c4c..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/index.tsx
+++ /dev/null
@@ -1,205 +0,0 @@
-import { Badge } from 'antd';
-import React, {useEffect, useState} from "react";
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  PushpinFilled
-} from '@ant-design/icons';
-import "./index.less"
-
-import SateCloudPage from './sateCloud/player';
-import RadarPage from './radar/player';
-import ProductionPage from './production';
-import InEffectWarnPage from './inEffectWarn';
-import RadarReflectionWavePage from './radarReflectionWave';
-
-import {Vector as VectorSource} from 'ol/source.js';
-import GeoJSONFormat from "ol/format/GeoJSON";
-import Feature from "ol/Feature";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import StrokeStyle from "ol/style/Stroke";
-import FillStyle from "ol/style/Fill";
-
-
-type IProps = {
-  activeKey:any;
-}
-
-const MteorologyPage: React.FC<IProps> = ({ activeKey }) => {
-  let mapObj = useSelector((s:any) => s.map.map);
-
-  const [badgeType, setBadgeType] = useState(0);
-
-  const dispatch = useDispatch();
-
-  const clickBadge = (type:number) => {
-    setBadgeType(type);
-    if(mapObj){
-      if(type!==0){
-        mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if( (layer.values_.name) && (layer.values_.name).indexOf("cloudLayer") !== -1 ){
-            layer.dispose();
-          }
-        })
-
-        mapObj.getView().setZoom(8.6);
-      }
-      if(type!==1){
-        mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if( (layer.values_.name) && (layer.values_.name).indexOf("radarImage") !== -1 ){
-            layer.dispose();
-          }
-        })
-      }
-      if(type!==4){
-        mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if( (layer.values_.name) && (layer.values_.name).indexOf("radarWLayer") !== -1 ){
-            layer.dispose();
-          }
-        })
-      }
-
-      if(type===0){
-        dispatch.map.setLayerVisible({"RadarLayer":  false});
-      }
-
-      if(type===1){
-        dispatch.map.setLayerVisible({"RadarLayer":  true});
-      }
-    }
-  };
-
-  useEffect(() => {
-    setBadgeType(0);
-  }, [activeKey]);
-
-  const getGeoJsonData = async () => {
-    const radarRangeData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/${localStorage.getItem('address')}/radarRange.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .catch(() => []);
-
-    return [...radarRangeData];
-  };
-
-  useEffect(() => {
-    if(mapObj && activeKey === "0"){
-      if(badgeType === 1){
-        dispatch.map.setLayerVisible({"RadarLayer": true});
-
-        mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if( (layer.values_.name) && (layer.values_.name).indexOf("radarRange") !== -1 ){
-            mapObj.removeLayer(layer);
-          }
-        })
-      }
-
-      if(badgeType === 4){
-        dispatch.map.setLayerVisible({"RadarLayer": true});
-
-        getGeoJsonData().then((data) => {
-          const geojsonFormat = new GeoJSONFormat();
-          let geometry = geojsonFormat.readGeometry(data[0].geometry, {
-            featureProjection: 'EPSG:3857',
-          });
-          const feature = new Feature({
-            geometry
-          });
-
-          var vectorSource = new VectorSource({
-            features: [feature]
-          });
-
-          var layer =  new VectorLayer({
-            // @ts-ignore
-            name:"radarRange",
-            source: vectorSource,
-            style: new Style({
-              stroke: new StrokeStyle({
-                color: '#11B7CD',
-                width: 1,
-              }),
-              fill: new FillStyle({
-                color: 'transparent',
-              }),
-            })
-          });
-          mapObj.addLayer(layer);
-        });
-      }
-    }else{
-      dispatch.map.setLayerVisible({"RadarLayer": false});
-
-      mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if( (layer.values_.name) && (layer.values_.name).indexOf("radarRange") !== -1 ){
-          mapObj.removeLayer(layer);
-        }
-      })
-    }
-  }, [mapObj, badgeType]);
-
-  return (
-    <>
-      <div className="meteorologyBox clearFloat">
-        <div className="lf" onClick={()=>clickBadge(0)}>
-          {/*#3B5999*/}
-          <Badge.Ribbon color="#3B5999" text={<>&nbsp;&nbsp;云&nbsp;&nbsp;图&nbsp;&nbsp;</>}></Badge.Ribbon>
-        </div>
-        <div className="lf" onClick={()=>clickBadge(1)}>
-          {/*#13C2C2*/}
-          <Badge.Ribbon color="#11B7CD" text={<>&nbsp;&nbsp;雷&nbsp;&nbsp;达&nbsp;&nbsp;</>}></Badge.Ribbon>
-        </div>
-        <div className="lf" onClick={()=>clickBadge(2)}>
-          {/*#55ACEE*/}
-          <Badge.Ribbon color="#55ACEE" text={<>图文预报产品</>}></Badge.Ribbon>
-        </div>
-        <div className="lf" onClick={()=>clickBadge(3)}>
-          {/*#52C41A*/}
-          <Badge.Ribbon color="#52C41A" text={<>正在生效预警</>}></Badge.Ribbon>
-        </div>
-        <div className="lf" onClick={()=>clickBadge(4)}>
-          {/*#52C41A*/}
-          <Badge.Ribbon color="#7D74ED" text={<>雷达反射波</>}></Badge.Ribbon>
-        </div>
-        <div className={`activeBadge activeBadge${badgeType}`}><PushpinFilled style={{color:"#FA541C",fontSize:"20px"}}/></div>
-
-        {
-          badgeType === 0?
-            <div className="sateCloudPageBox">
-              <SateCloudPage activeKey={activeKey} badgeType={badgeType}/>
-            </div>:null
-        }
-
-        {
-          badgeType === 1?
-            <div className="radarPageBox">
-              <RadarPage activeKey={activeKey} badgeType={badgeType}/>
-            </div>:null
-        }
-      </div>
-
-      {
-        badgeType === 2?
-          <div className="productionBox">
-            <ProductionPage activeKey={activeKey} />
-          </div>:null
-      }
-
-      {
-        badgeType === 3?
-          <div className="inEffectWarnBox">
-            <InEffectWarnPage activeKey={activeKey} />
-          </div>:null
-      }
-
-      {
-        badgeType === 4?
-          <div className="radarReflectionWaveBox">
-            <RadarReflectionWavePage activeKey={activeKey} badgeType={badgeType}/>
-          </div>:null
-      }
-    </>
-  )
-};
-
-export default MteorologyPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/production/ToolBar.tsx b/src/views/Home/panels/forecastPanels/meteorology/production/ToolBar.tsx
deleted file mode 100644
index 68a9119..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/production/ToolBar.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Button, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-
-const { RangePicker } = DatePicker;
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  search: (value: any) => void;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ search }) => {
-  const [form] = Form.useForm();
-
-  const onSearchClick = () => {
-    const { tm,tm1, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.startTime = tm[0].format('YYYY-MM-DD HH:mm:ss');
-      }
-      if (tm[1]) {
-        rec.endTime = tm[1].format('YYYY-MM-DD HH:mm:ss');
-      }
-    }
-
-
-    console.log("查询参数 50++++++",rec);
-
-    search(rec);
-  };
-
-  return (
-    <Form
-      labelCol={{ span: 6 }}
-      wrapperCol={{ span: 18 }}
-      layout="inline"
-      form={form}
-    >
-      <FormItem label="标题" name="name">
-        <Input style={{ width: 200 }} allowClear placeholder="请输入" onChange={onSearchClick}/>
-      </FormItem>
-      <Form.Item name="tm" label="日期" style={{marginBottom: 10}}>
-        <RangePicker
-          showTime
-          format="YYYY-MM-DD HH:mm:ss"
-          style={{width:"320px",padding:"6px 4px"}}
-          onChange={onSearchClick}
-        />
-      </Form.Item>
-      <FormItem style={{marginLeft:"60px"}}>
-        <Button type="primary" icon={<SearchOutlined />} onClick={onSearchClick}>查询</Button>
-      </FormItem>
-    </Form>
-  );
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/production/index.less b/src/views/Home/panels/forecastPanels/meteorology/production/index.less
deleted file mode 100644
index 890c378..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/production/index.less
+++ /dev/null
@@ -1,89 +0,0 @@
-.productionListBox{
-  position: fixed;
-  width: calc(100vw - 102px);
-  height: calc(100vh - 80px);
-  background: #fff;
-  margin: 10px 0 0 0;
-  top:60px;
-  padding: 70px 10px 0 30px;
-  box-sizing: border-box;
-
-  .subTabs{
-
-    .ant-tabs-nav-wrap{
-      background: #fff;
-    }
-    .ant-tabs-tab{
-      height:36px;
-      border-bottom: 0;
-      padding: 12px 0 !important;
-    }
-    .ant-tabs-tab-active{
-      background: #fff;
-    }
-
-    .ant-tabs-content-holder{
-      margin-top:-8px;
-    }
-
-    .ant-input-affix-wrapper{
-      padding: 6px 11px !important;
-    }
-
-    .newestProductBox{
-      height:calc( 100vh - 220px );
-      //overflow: auto;
-      .ant-list{
-        height:calc( 100vh - 290px );
-        overflow: auto;
-        padding-left:20px;
-        box-sizing: border-box;
-      }
-    }
-    .regionProductBox{
-      height:calc( 100vh - 220px );
-      //overflow: auto;
-      .ant-list{
-        height:calc( 100vh - 325px );
-        overflow: auto;
-        padding-left:20px;
-        box-sizing: border-box;
-      }
-    }
-
-    .totalNum{
-      line-height:35px;
-      margin:0 30px;
-      span{
-        color: #0B81FF;
-        font-size:16px;
-      }
-    }
-
-    .tabSpan{
-      margin:0 20px;
-      cursor: pointer;
-    }
-    .tabActive{
-      color: #0B81FF;
-    }
-  }
-}
-
-.viewProductionModal{
-  //width: calc( 100vw - 100px ) !important;
-  //left: 49px !important;
-  width:90vw !important;
-  background: #fff;
-  padding:0;
-  .ant-modal-body{
-    height: calc( 100vh - 150px ) !important;
-    padding:0 !important;
-  }
-}
-
-.pdfBox{
-  .react-pdf__Page__canvas{
-    margin: -40px auto;
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/production/index.tsx b/src/views/Home/panels/forecastPanels/meteorology/production/index.tsx
deleted file mode 100644
index 136b7f4..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/production/index.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Tabs } from 'antd';
-import React, {useEffect, useState} from "react";
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  CaretUpOutlined,PushpinFilled
-} from '@ant-design/icons';
-import "./index.less"
-import NewestProductPage from './newestProduct';
-import RegionProductPage from './regionProduct';
-
-type IProps = {
-  activeKey:any;
-}
-
-const MteorologyPage: React.FC<IProps> = ({ activeKey }) => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const address = localStorage.getItem('address')?localStorage.getItem('address'):'jianshi';
-
-  let mapObj = useSelector((s:any) => s.map.map);
-
-  const dispatch = useDispatch();
-
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <div className="productionListBox clearFloat" style={{height:hasAlertBox?"calc(100vh - 100px)":"calc(100vh - 80px)", top:hasAlertBox?"80px":"60px"}}>
-      <Tabs defaultActiveKey="1" className="subTabs">
-        <Tabs.TabPane tab="最新产品" key="1">
-          <NewestProductPage />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="湖北省" key="2">
-          <RegionProductPage />
-        </Tabs.TabPane>
-      </Tabs>
-    </div>
-  )
-};
-
-export default MteorologyPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/production/newestProduct.tsx b/src/views/Home/panels/forecastPanels/meteorology/production/newestProduct.tsx
deleted file mode 100644
index 94554d5..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/production/newestProduct.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import {List, Modal} from 'antd';
-import React, {useEffect, useState} from "react";
-import {
-  FilePdfTwoTone
-} from '@ant-design/icons';
-import "./index.less"
-import ToolBar from './ToolBar';
-import ViewProductionModal from './viewProductionModal';
-import { productionApi } from "../../../../../../service/meteorology";
-
-type IProps = {
-
-}
-
-const NewestProductPage: React.FC<IProps> = ({  }) => {
-  const [data, setData] = useState([]);
-  const [total,setTotal] = useState(0);
-  const [pageNumber,setPageNumber] = useState(1);
-  const [pageSize,setPageSize] = useState(10);
-
-  const [visible, setVisible] = useState(false);
-  const [viewItem, setViewItem] = useState<any>({});
-
-  const getData = async (searchParams?:any) => {
-    let params = {
-      "pageNumber": pageNumber,
-      "pageSize": pageSize,
-      "filter": [
-        {
-          "name": "name",//标题
-          "condition": "like",
-          "value": searchParams&&searchParams.name?searchParams.name:""
-        },
-        {
-          "name": "startTime",//开始时间
-          "condition": "like",
-          "value": searchParams&&searchParams.startTime?searchParams.startTime:""
-        },
-        {
-          "name": "endTime",//结束时间
-          "condition": "like",
-          "value": searchParams&&searchParams.endTime?searchParams.endTime:""
-        },
-      ]
-    };
-    const resData = await productionApi(params);
-    if(resData.code === 200){
-      setData(resData.data.content);
-      setTotal(resData.data.totalElements);
-    }
-  };
-
-  useEffect(() => {
-    getData();
-  }, [pageNumber, pageSize]);
-
-  return (
-    <div className="newestProductBox clearFloat">
-      <div className="clearFloat">
-        <div className="lf totalNum">合计：<span>{total}</span></div>
-        <div className="lf"><ToolBar search={getData}/></div>
-      </div>
-
-      {
-        total>0?
-          <List
-            pagination={{
-              onChange: (page,pageSize) => {
-                setPageNumber(page);
-                setPageSize(pageSize);
-              },
-              pageSize: pageSize,
-              total: total,
-              size: "small",
-              //position:"top"
-            }}
-            size="small"
-            dataSource={data}
-            renderItem={(item:any, index) => (
-              <List.Item
-                style={{cursor:"pointer"}}
-                onClick={()=>{
-                  setVisible(true);
-                  setViewItem(item);
-                }}
-                actions={item.name.indexOf("滚动预报")===-1?[<a style={{marginRight:"50px"}}
-                  key="list-loadmore-edit"
-                  onClick={(event)=>{
-                    event.stopPropagation();
-                    let parts = item.docpath.split("/");
-                    let content = parts.slice(2).join("/");
-                    window.open("service2/shzh/met/zyqxfw/api/productoffice/doc/product/pdf/download/"+content);
-                  }}
-                >下载</a>]:[]}
-              >
-                <List.Item.Meta
-                  avatar={
-                    <FilePdfTwoTone style={{fontSize:"33px"}}/>
-                  }
-                  title={<>{item.name?item.name:"-"}</>}
-                  description={<>{item.createTime?item.createTime:"-"}</>}
-                />
-              </List.Item>
-            )}
-          />:null
-      }
-
-      <Modal
-        visible={visible}
-        footer={null}
-        style={{top:"40px"}}
-        title={viewItem.name}
-        className="viewProductionModal"
-        onCancel={()=>setVisible(false)}
-        //mask={false}
-        //maskClosable={false}
-        //closable={false}
-      >
-        <ViewProductionModal viewItem={viewItem}/>
-      </Modal>
-    </div>
-  )
-};
-
-export default NewestProductPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/production/regionProduct.tsx b/src/views/Home/panels/forecastPanels/meteorology/production/regionProduct.tsx
deleted file mode 100644
index 7d9713a..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/production/regionProduct.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import {List, Modal} from 'antd';
-import React, {useEffect, useState} from "react";
-import {
-  FilePdfTwoTone
-} from '@ant-design/icons';
-import "./index.less"
-import ToolBar from './ToolBar';
-import { productionApi } from "../../../../../../service/meteorology";
-import ViewProductionModal from "./viewProductionModal";
-
-type IProps = {
-
-}
-
-const RregionProductPage: React.FC<IProps> = ({  }) => {
-  const [data, setData] = useState([]);
-  const [total,setTotal] = useState(0);
-  const [pageNumber,setPageNumber] = useState(1);
-  const [pageSize,setPageSize] = useState(10);
-
-  const [type,setType] = useState("3d49f42716a6d168a820715c246f3b8f");
-
-  const [visible, setVisible] = useState(false);
-  const [viewItem, setViewItem] = useState<any>({});
-
-  const getData = async (searchParams?:any) => {
-    let params = {
-      "pageNumber": pageNumber,
-      "pageSize": pageSize,
-      "filter": [
-        {
-          "name": "name",//标题
-          "condition": "like",
-          "value": searchParams&&searchParams.name?searchParams.name:""
-        },
-        {
-          "name": "startTime",//开始时间
-          "condition": "like",
-          "value": searchParams&&searchParams.startTime?searchParams.startTime:""
-        },
-        {
-          "name": "endTime",//结束时间
-          "condition": "like",
-          "value": searchParams&&searchParams.endTime?searchParams.endTime:""
-        },
-        {
-          "name": "type",//类型
-          "condition": "equal",
-          "value": type
-        },
-      ]
-    };
-    const resData = await productionApi(params);
-    if(resData.code === 200){
-      setData(resData.data.content);
-      setTotal(resData.data.totalElements);
-    }
-  };
-
-  useEffect(() => {
-    getData();
-  }, [pageNumber, pageSize, type]);
-
-  const tabs = [
-    {name:"湖北省中短期天气公报", key:"3d49f42716a6d168a820715c246f3b8f"},
-    {name:"湖北旬预报", key:"a7628cc1654aa35ac6d9baae53f79976"},
-    {name:"湖北省月预测", key:"232d9d5ff0108b462135412ff53bf6a1"},
-    {name:"湖北省重要天气报告", key:"3cf4c4308bd579d4821abd438fb714dd"},
-    {name:"湖北省延伸期趋势预测", key:"3fe36f7919a93cc789284df399a12a3e"},
-    {name:"湖北季预测", key:"d8669e03ef707a9d522e403986a8a924"},
-    {name:"4 - 10 天滚动预报", key:"44a6310b0d6d1be5c8f46878aacfb6da"}
-  ];
-
-  return (
-    <div className="regionProductBox clearFloat">
-      <div style={{marginBottom:"20px"}}>
-        {
-          tabs.map(item => (
-            <span
-              key={item.key}
-              className={type === item.key?"tabSpan tabActive":"tabSpan"}
-              onClick={()=>{
-                setType(item.key);
-                setPageNumber(1);
-                setPageSize(10);
-              }}
-            >{item.name}</span>
-          ))
-        }
-      </div>
-
-      <div className="clearFloat">
-        <div className="lf totalNum">合计：<span>{total}</span></div>
-        <div className="lf"><ToolBar search={getData}/></div>
-      </div>
-
-      {
-        total>0?
-          <List
-            pagination={{
-              onChange: (page,pageSize) => {
-                setPageNumber(page);
-                setPageSize(pageSize);
-              },
-              pageSize: pageSize,
-              current: pageNumber,
-              total: total,
-              size: "small",
-              //position:"top"
-            }}
-            size="small"
-            dataSource={data}
-            renderItem={(item:any, index) => (
-              <List.Item
-                style={{cursor:"pointer"}}
-                onClick={()=>{
-                  setVisible(true);
-                  setViewItem(item);
-                }}
-                actions={item.name.indexOf("滚动预报")===-1?[<a style={{marginRight:"50px"}}
-                             key="list-loadmore-edit"
-                             onClick={(event)=>{
-                               event.stopPropagation();
-                               let parts = item.docpath.split("/");
-                               let content = parts.slice(2).join("/");
-                               window.open("service2/shzh/met/zyqxfw/api/productoffice/doc/product/pdf/download/"+content);
-                             }}
-                >下载</a>]:[]}
-              >
-                <List.Item.Meta
-                  avatar={
-                    <FilePdfTwoTone style={{fontSize:"33px"}}/>
-                  }
-                  title={<>{item.name?item.name:"-"}</>}
-                  description={<>{item.createTime?item.createTime:"-"}</>}
-                />
-              </List.Item>
-            )}
-          />:null
-      }
-
-      <Modal
-        visible={visible}
-        footer={null}
-        style={{top:"40px"}}
-        title={viewItem.name}
-        className="viewProductionModal"
-        onCancel={()=>setVisible(false)}
-        //mask={false}
-        //maskClosable={false}
-        //closable={false}
-      >
-        <ViewProductionModal viewItem={viewItem}/>
-      </Modal>
-    </div>
-  )
-};
-
-export default RregionProductPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/production/viewProductionModal.tsx b/src/views/Home/panels/forecastPanels/meteorology/production/viewProductionModal.tsx
deleted file mode 100644
index 884c021..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/production/viewProductionModal.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Spin, List } from 'antd';
-import React, {useEffect, useState} from "react";
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  FilePdfTwoTone, PushpinFilled
-} from '@ant-design/icons';
-import "./index.less"
-import { viewProductionPdfApi } from "../../../../../../service/meteorology";
-import { Document, Page, pdfjs } from 'react-pdf';
-
-pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
-
-type IProps = {
-  viewItem: any;
-}
-
-const NewestProductPage: React.FC<IProps> = ({ viewItem }) => {
-  //viewItem.docpath.split("/").slice(2).join("/")
-  const [loading, setLoading] = useState(true);
-
-  const [numPages, setNumPages] = useState(null);
-  const [pageNumber, setPageNumber] = useState(1);
-  const [pdfBlob, setPdfBlob] = useState(null);
-
-  const getViewData = async () => {
-    let parts = viewItem.docpath.split("/");
-    let content = parts.slice(2).join("/");
-    const response = await fetch("service2/shzh/met/zyqxfw/api/productoffice/doc/product/pdf/"+content);
-    response.blob().then((v: any) => {
-      let blob = new Blob([v], {type: 'application/pdf'})
-      const url = URL.createObjectURL(blob);
-      // @ts-ignore
-      setPdfBlob(url);
-
-      setTimeout(() => {
-        setLoading(false);
-      }, 300);
-    })
-  };
-
-  useEffect(() => {
-    //console.log("42+++",viewItem);
-    if(viewItem.name.indexOf("滚动预报")===-1){
-      setPdfBlob(null);
-      setLoading(true);
-      getViewData();
-    }else{
-      setPdfBlob(null);
-      setLoading(false);
-    }
-  }, [viewItem]);
-
-  // @ts-ignore
-  const onDocumentLoadSuccess = ({ numPages }) => {
-    setNumPages(numPages);
-  };
-
-  return (
-    <div className="newestProductBox clearFloat" style={{position:"relative"}}>
-      {
-        viewItem.name.indexOf("滚动预报")!==-1?
-          <iframe style={{width:"100%",height:"calc( 100vh - 150px )", border:0}}
-                  src={"service2/shzh/met/zyqxfw/api/productoffice/doc/product/"+viewItem.docpath.split("/").slice(2).join("/")}
-          ></iframe>:
-          <div style={{width:"100%",height:"calc( 100vh - 150px )", overflowY:"auto",position:"relative"}}>
-            <div style={{position:"absolute", top: 0,zIndex:100,width:"100%",height:"40px",background:"#fff"}}></div>
-            {pdfBlob && (
-              <Document
-                file={pdfBlob}
-                onLoadSuccess={onDocumentLoadSuccess}
-              >
-                {/*<Page
-                  key={`page_${pageNumber}`}
-                  pageNumber={pageNumber}
-                  renderAnnotationLayer={false}
-                  renderTextLayer={false}
-                />*/}
-                {
-                  /*// @ts-ignore*/
-                  new Array(numPages).fill('').map((_item, index) => {
-                    return <Page
-                      className="pdfBox"
-                      scale={1.5}
-                      key={index}
-                      pageNumber={index+1}
-                      renderAnnotationLayer={false}
-                      renderTextLayer={false}
-                      renderForms={true}
-                    />
-                  })
-                }
-              </Document>
-            )}
-            {/*<p style={{position:"sticky", top: 0,zIndex:100}}>
-              Page {pageNumber} of {numPages}
-            </p>*/}
-          </div>
-      }
-
-      {
-        loading?
-          <div className="spinBox" style={{position:"absolute",top:"35vh",left:"45%",zIndex:100,padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-    </div>
-  )
-};
-
-export default NewestProductPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/radar/player.less b/src/views/Home/panels/forecastPanels/meteorology/radar/player.less
deleted file mode 100644
index d383a86..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/radar/player.less
+++ /dev/null
@@ -1,76 +0,0 @@
-.flowSlider{
-  .ant-slider-disabled .ant-slider-track{
-    background-color: #7abaff !important;
-  }
-  .ant-slider-disabled .ant-slider-handle, .ant-slider-disabled .ant-slider-dot{
-    border-color: #0052D9 !important;
-  }
-}
-
-.ant-slider-tooltip{
-  padding:2px 0;
-  .ant-tooltip-inner{
-    padding:2px 5px;
-    border-radius: 4px;
-  }
-  .ant-tooltip-inner{
-    min-height:24px;
-  }
-  .ant-tooltip-arrow{
-    height:15px;
-  }
-}
-
-#coordinates{
-  width:200px;
-  height:30px;
-  position: fixed;
-  background:#fff;
-  color:#333;
-  z-index:10000;
-  top: 111px;
-  right: 20px;
-}
-
-.radarColorBox{
-  width:300px;
-  >div{
-    width:30px;
-    height:7px;
-    margin-top:12px;
-    span{
-      display:inline-block;
-      margin:5px 0 0 -5px;
-    }
-    &:nth-child(1){
-      background:#02EA02;
-    }
-    &:nth-child(2){
-      background:#0F9015;
-    }
-    &:nth-child(3){
-      background:#FFF562;
-    }
-    &:nth-child(4){
-      background:#CFCD00;
-    }
-    &:nth-child(5){
-      background:#858B59;
-    }
-    &:nth-child(6){
-      background:#FFACAA;
-    }
-    &:nth-child(7){
-      background:#FE655C;
-    }
-    &:nth-child(8){
-      background:#ED0130;
-    }
-    &:nth-child(9){
-      background:#D98BFC;
-    }
-    &:nth-child(10){
-      background:#AB25F9;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/radar/player.tsx b/src/views/Home/panels/forecastPanels/meteorology/radar/player.tsx
deleted file mode 100644
index 6de0ed1..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/radar/player.tsx
+++ /dev/null
@@ -1,287 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import {Slider, Button, message, DatePicker} from 'antd'
-import {
-  PlayCircleOutlined, PauseCircleOutlined
-} from '@ant-design/icons';
-import {useDispatch, useSelector} from 'react-redux';
-import {
-  getImgNamesRadarApi
-} from "../../../../../../service/meteorology";
-import ImageLayer from 'ol/layer/Image.js';
-import {Raster as RasterSource, Stamen, ImageStatic} from 'ol/source.js';
-import moment from "moment";
-
-import "./player.less"
-
-type IProps = {
-  activeKey:any;
-  badgeType:any;
-  tm?:any;
-  ts?:any;
-}
-
-const Player: React.FC<IProps> = ({ activeKey, badgeType, tm, ts }) => {
-  const dispatch = useDispatch();
-
-  let mapObj = useSelector((s:any) => s.map.map);
-
-  const [radarImgData, setRadarImgData] = useState([]);
-  const [timeData, setTimeData] = useState([]);
-  const [play, setPlay] = useState(false);
-
-  const [num, setNum] = useState(0);
-  const [minNum, setMinNum] = useState(0);
-  const [maxNum, setMaxNum] = useState(0);
-
-  const [tooltipOpen, setTooltipOpen] = useState(true);
-
-  const [selectTime, setSelectTime] = useState(moment().format("YYYYMMDD"));
-
-  const onSearchClick = (val:any) => {
-    setSelectTime(moment(val).format("YYYYMMDD"));
-    mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-      if( (layer.values_.name) && (layer.values_.name).indexOf("radarImage") !== -1 ){
-        layer.setOpacity(0);
-        layer.setSource(null);
-      }
-    });
-  };
-
-  useEffect(()=>{
-    onSearchClick(tm)
-  },[tm,ts])
-
-  const getData = async () => {
-    setTooltipOpen(true);
-
-    const resData = await getImgNamesRadarApi(selectTime);
-    if(resData.code === 200){
-      setRadarImgData(resData.data);
-
-      setMaxNum(resData.data.length);
-
-      let timeArray:any = [];
-      if(resData.data.length>0){
-        resData.data.map((item:any)=>{
-          const regex = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\.png/;
-          const match = item.match(regex);
-
-          if (match) {
-            const year = match[1];
-            const month = match[2];
-            const day = match[3];
-            const hours = match[4];
-            const minutes = match[5];
-            const seconds = match[6];
-            timeArray.push(year+"-"+month+"-"+day+" "+hours+":"+minutes+":"+seconds);
-          }
-        });
-      }
-
-      setTimeData(timeArray);
-
-      setNum(timeArray.length-1);
-    }
-  };
-
-  useEffect(() => {
-    if(selectTime){
-      getData();
-
-      //setNum(0);
-      setNum(timeData.length-1);
-      setPlay(false);
-    }
-  }, [selectTime]);
-
-  useEffect(() => {
-    if(activeKey !== "0" || badgeType !== 1){
-      setTooltipOpen(false);
-      setPlay(false);
-      //setNum(0);
-      setNum(timeData.length-1);
-    }
-
-    return ()=>{
-      dispatch.runtime.closeFeaturePopAll()
-
-      mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if( (layer?.values_.name) && (layer?.values_.name)?.indexOf("radarImage") !== -1 ){
-          layer.dispose();
-        }
-      })
-    }
-    
-  }, [activeKey, badgeType]);
-
-
-  useEffect(() => {
-    if (play) {
-      let n = num;
-      const h = setInterval(() => {
-        n = n+1;
-
-        if(n>=maxNum){
-          n = 0;
-        }
-
-        setNum(n);
-
-      }, 1000);
-
-      return () => {
-        clearInterval(h);
-      }
-    }
-  }, [play,num]);
-
-  useEffect(() => {
-    //console.log("110",badgeType);
-    if(badgeType === 1){
-      mapObj && mapObj.getView().setZoom(9);
-      setTooltipOpen(true);
-    }
-  }, [badgeType]);
-
-  const setIndex = (index:any) => {
-    setNum(index);
-
-    mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-      if( (layer.values_.name) && (layer.values_.name).indexOf("radarImage") !== -1 ){
-        layer.dispose();
-      }
-    })
-  };
-
-  const marks = {
-    [minNum]: {
-      style: {
-        color: '#333',
-      },
-      label: <span style={{width:"110px",fontSize:"12px"}}>{timeData[0]}</span>,
-    },
-    [maxNum-1]: {
-      style: {
-        color: '#333',
-      },
-      label: <div style={{width:"150px",fontSize:"12px",marginLeft:"-32px"}}>{timeData[maxNum-1]}</div>,
-    }
-  };
-
-  const formatTooltip = (value:any) => {
-    //return timeData[value];
-    return <div className="formatTooltip">{timeData[value]}</div>
-  };
-
-  // @ts-ignore
-  const deleteLayer = (layerId) => {
-    // @ts-ignore
-    var layer = mapObj && mapObj.getLayers().getArray().find(function(layer) {
-      return layer.get('id') === layerId;
-    });
-    if (layer) {
-      mapObj && mapObj.removeLayer(layer);
-    }
-  };
-
-  useEffect(() => {
-    if(mapObj && activeKey === "0"){
-      setTooltipOpen(true);
-
-      if(radarImgData.length>0) {
-        const dateString:any = timeData[num];
-        const regex = /(\d{4})-(\d{2})-(\d{2})/;
-        const match = dateString.match(regex);
-
-        let result = "";
-        if (match) {
-          const year = match[1];
-          const month = match[2];
-          const day = match[3];
-
-          result = year + month + day;
-        }
-
-        let sourcesObj = new ImageStatic({
-            //http://223.75.53.141:8000/zyqxfw/api/radar/sateCloud/getImg/20230713/FY4A_C013_20230713161500.png
-            // @ts-ignore
-            // url:"service81/zyqxfw/api/radar/getImg/"+ result + "/" + radarImgData[num],
-            url:"http://223.75.53.141:81/zyqxfw/api/radar/getImg/"+ result + "/" + radarImgData[num],
-            projection: 'EPSG:4326',
-            imageExtent: [107, 27, 117, 35],
-            imageSize:[1000,800],
-            interpolate: false
-          });
-
-        const sateCloudLayer = new ImageLayer({
-          source: sourcesObj,
-          opacity:0.65,
-          // @ts-ignore  "radarImage"+num
-          name: "radarImage"+num,
-          id:"radarImage",
-        });
-
-        deleteLayer("radarImage");
-
-        mapObj && mapObj.addLayer(sateCloudLayer);
-      }
-    }
-  }, [radarImgData, mapObj, num, activeKey]);//radarImgData, mapObj, channelVariables, num
-
-
-  return (
-    <div className="clearFloat" style={{ padding: '0 2rem' }}>
-      {/* <div className="lf datePickerBox" style={{width:"185px"}}>
-        <span className="lf" style={{lineHeight:"35px"}}>时间：</span>
-        <div className="lf" style={{width:"140px"}}>
-          <DatePicker
-            format="YYYY-MM-DD"
-            placement="topLeft"
-            onChange={onSearchClick}
-            allowClear={false}
-            defaultValue={moment()}
-            disabledDate={current => current > moment().endOf('day')}
-          />
-        </div>
-      </div> */}
-      <div className="lf" style={{width:"40px", margin:"-11px 5px 0px 30px"}}>
-        <Button
-          icon={play?<PauseCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />:<PlayCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />}
-          style={{border:0, outline:"none !important", background:"none"}}
-          onClick={() => setPlay(!play)}
-        />
-      </div>
-      <div className="lf flowSlider" style={{width:"calc( 100% - 440px )"}}>
-        {
-          maxNum>0?
-            <Slider
-              disabled={play}
-              min={minNum}
-              max={maxNum-1}
-              marks={marks}
-              value={num}
-              //tooltip={{open:true}}
-              tooltip={{open:tooltipOpen}}
-              tipFormatter={formatTooltip}
-              onChange={(val)=>setIndex(val)}
-            />:null
-        }
-      </div>
-
-      <div className="radarColorBox rf">
-        <div className="lf"><span>20</span></div>
-        <div className="lf"><span>25</span></div>
-        <div className="lf"><span>30</span></div>
-        <div className="lf"><span>35</span></div>
-        <div className="lf"><span>40</span></div>
-        <div className="lf"><span>45</span></div>
-        <div className="lf"><span>50</span></div>
-        <div className="lf"><span>55</span></div>
-        <div className="lf"><span>60</span></div>
-        <div className="lf"><span>65(dBz)</span></div>
-      </div>
-    </div>
-  )
-}
-
-export default Player;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/radarReflectionWave/index.less b/src/views/Home/panels/forecastPanels/meteorology/radarReflectionWave/index.less
deleted file mode 100644
index 7a1edec..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/radarReflectionWave/index.less
+++ /dev/null
@@ -1,106 +0,0 @@
-.radarReflectionWaveBox{
-  width:70vw;
-  padding: 10px 10px 0 10px;
-  left: 12vw;
-  position:fixed;
-  height:60px;
-  background: #fff;
-  z-index: 101;
-  bottom:13px;
-  box-shadow: 1px 2px 10px #bdbaba;
-  box-sizing: border-box;
-  border-radius:6px;
-  >div{
-    background: #fff;
-  }
-
-  .flowSlider{
-    .ant-slider-disabled .ant-slider-track{
-      background-color: #7abaff !important;
-    }
-    .ant-slider-disabled .ant-slider-handle, .ant-slider-disabled .ant-slider-dot{
-      border-color: #0052D9 !important;
-    }
-  }
-
-  .ant-slider-tooltip{
-    padding:2px 0;
-    .ant-tooltip-inner{
-      padding:2px 5px;
-      border-radius: 4px;
-    }
-    .ant-tooltip-inner{
-      min-height:24px;
-    }
-    .ant-tooltip-arrow{
-      height:15px;
-    }
-  }
-
-  #coordinates{
-    width:200px;
-    height:30px;
-    position: fixed;
-    background:#fff;
-    color:#333;
-    z-index:10000;
-    top: 111px;
-    right: 20px;
-  }
-
-  .radarReflectionWaveBoxColorBox{
-    width:330px;
-    >div{
-      width:22px;
-      height:7px;
-      margin-top:12px;
-      span{
-        display:inline-block;
-        margin:5px 0 0 -5px;
-      }
-      &:nth-child(1){
-        background:#C2C1FD;
-      }
-      &:nth-child(2){
-        background:#7D74ED;
-      }
-      &:nth-child(3){
-        background:#2128CF;
-      }
-      &:nth-child(4){
-        background:#A6FCA9;
-      }
-      &:nth-child(5){
-        background:#0DDD0A;
-      }
-      &:nth-child(6){
-        background:#079509;
-      }
-      &:nth-child(7){
-        background:#FDF55F;
-      }
-      &:nth-child(8){
-        background:#C6C72B;
-      }
-      &:nth-child(9){
-        background:#838C58;
-      }
-      &:nth-child(10){
-        background:#FFABAB;
-      }
-      &:nth-child(11){
-        background:#FF685E;
-      }
-      &:nth-child(12){
-        background:#F10031;
-      }
-      &:nth-child(13){
-        background:#DD89FE;
-      }
-      &:nth-child(14){
-        background:#AB27F9;
-      }
-    }
-  }
-}
-
diff --git a/src/views/Home/panels/forecastPanels/meteorology/radarReflectionWave/index.tsx b/src/views/Home/panels/forecastPanels/meteorology/radarReflectionWave/index.tsx
deleted file mode 100644
index 4bc4faf..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/radarReflectionWave/index.tsx
+++ /dev/null
@@ -1,352 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import {Slider, Button, message, DatePicker} from 'antd'
-import {
-  PlayCircleOutlined, PauseCircleOutlined
-} from '@ant-design/icons';
-import {useDispatch, useSelector} from 'react-redux';
-import {
-  getListFileRadarReflectionWaveApi, getRadarReflectionWavePicApi
-} from "../../../../../../service/meteorology";
-import ImageLayer from 'ol/layer/Image.js';
-import { ImageStatic } from 'ol/source.js';
-import moment from "moment";
-import "./index.less";
-import * as proj from "ol/proj";
-
-type IProps = {
-  activeKey:any;
-  badgeType:any;
-}
-
-const Index: React.FC<IProps> = ({ activeKey, badgeType }) => {
-  let mapObj = useSelector((s:any) => s.map.map);
-
-  const [radarImgData, setRadarImgData] = useState("");
-  const [imageExtentData, setImageExtentData] = useState([]);
-  const [timeData, setTimeData] = useState([]);
-  const [play, setPlay] = useState(false);
-
-  const [num, setNum] = useState(0);
-  const [minNum, setMinNum] = useState(0);
-  const [maxNum, setMaxNum] = useState(0);
-
-  const [tooltipOpen, setTooltipOpen] = useState(true);
-
-  const [selectTime, setSelectTime] = useState(moment().format("YYYYMMDD"));
-
-  const onSearchClick = (val:any) => {
-    setSelectTime(moment(val).format("YYYYMMDD"));
-    mapObj.getLayers().getArray().forEach((layer:any)=> {
-      if( (layer.values_.name) && (layer.values_.name).indexOf("radarWLayer") !== -1 ){
-        layer.setOpacity(0);
-        layer.setSource(null);
-      }
-    });
-  };
-
-  // @ts-ignore
-  const getPicFun = async (time) => {
-    //getRadarReflectionWavePicApi  2023-11-02 00:04:18
-    let picTm = moment(time).format("YYYYMMDDHHmmss");
-    const picData = await getRadarReflectionWavePicApi({tm:picTm});
-    setRadarImgData(picData.data?picData.data?.url:"");
-    setImageExtentData(picData.data?picData?.data.extent:[]);
-  };
-
-  const getData = async () => {
-    setTooltipOpen(true);
-    console.log("50 雷达反射波",selectTime);
-    const resData = await getListFileRadarReflectionWaveApi({tm:selectTime});
-    if(resData.code === 200){
-      setMaxNum(resData.data?resData.data.length:0);
-
-      let timeArray:any = [];
-      if(resData.data && resData.data.length>0){
-        resData.data.map((item:any)=>{
-          timeArray.push(item.tm);
-        });
-      }
-
-      setTimeData(timeArray);
-
-      setNum(timeArray.length-1);
-
-      //getPicFun(timeArray[timeArray.length-1]);
-    }
-  };
-
-  useEffect(() => {
-    if(selectTime){
-      getData();
-
-      //setNum(0);
-      setNum(timeData.length-1);
-      setPlay(false);
-    }
-  }, [selectTime]);
-
-  useEffect(() => {
-    if(activeKey !== "0" || badgeType !== 1){
-      setTooltipOpen(false);
-      setPlay(false);
-      //setNum(0);
-      setNum(timeData.length-1);
-    }
-
-    if(activeKey !== "0"){
-      if( badgeType !== 1 || badgeType !== 4 ){
-        mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if( (layer.values_.name) && (layer.values_.name).indexOf("radarRange") !== -1 ){
-            mapObj.removeLayer(layer);
-          }
-        })
-      }
-    }
-  }, [activeKey, badgeType]);
-
-
-  useEffect(() => {
-    if (play) {
-      let n = num;
-      const h = setInterval(() => {
-        n = n+1;
-
-        if(n>=maxNum){
-          n = 0;
-        }
-
-        setNum(n);
-
-      }, 1000);
-
-      return () => {
-        clearInterval(h);
-      }
-    }
-  }, [play,num]);
-
-  useEffect(() => {
-    //console.log("110",badgeType);
-    if(badgeType === 1){
-      mapObj.getView().setZoom(9);
-      setTooltipOpen(true);
-    }
-  }, [badgeType]);
-
-  const setIndex = (index:any) => {
-    setNum(index);
-
-    mapObj.getLayers().getArray().forEach((layer:any)=> {
-      if( (layer.values_.name) && (layer.values_.name).indexOf("radarWLayer") !== -1 ){
-        layer.dispose();
-      }
-    })
-  };
-
-  const marks = {
-    [minNum]: {
-      style: {
-        color: '#333',
-      },
-      label: <span style={{width:"110px",fontSize:"12px"}}>{timeData[0]}</span>,
-    },
-    [maxNum-1]: {
-      style: {
-        color: '#333',
-      },
-      label: <div style={{width:"110px",fontSize:"12px",marginLeft:"-32px"}}>{timeData[maxNum-1]}</div>,
-    }
-  };
-
-  const formatTooltip = (value:any) => {
-    //return timeData[value];
-    return <div className="formatTooltip">{timeData[value]}</div>
-  };
-
-  useEffect(() => {
-    if(timeData.length>0){
-      console.log("getPicFun",num);
-      getPicFun(timeData[num]);
-    }
-  }, [num]);
-
-  useEffect(() => {
-    if(mapObj && activeKey === "0"){
-      setTooltipOpen(true);
-      console.log("156+++",radarImgData);
-      if(radarImgData) {
-        let tifObj:any = null;
-        let beforeTifObj:any = null;
-
-        //console.log("num169",num);
-        mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if(layer.values_.name === "radarWLayer"+num){
-            tifObj = layer;
-          }
-        });
-
-        let sourcesObj = new ImageStatic({
-            // @ts-ignore
-            url:"serviceRadar/radarpic/" + radarImgData,
-            projection: 'EPSG:4326',
-            imageExtent: imageExtentData,
-            interpolate: false
-          });
-
-        const sateCloudLayer = new ImageLayer({
-          source: sourcesObj,
-          opacity:0.65,
-          // @ts-ignore  "radarWLayer"+num
-          name: "radarWLayer"+num,
-          id:"radarWLayer",
-        });
-
-        let layerList = mapObj.getLayers().array_;
-        //避免重复添加imagestatic
-        //@ts-ignore
-        mapObj.getLayers().array_.forEach((item, index) => {
-          if (item instanceof ImageLayer) {
-            layerList.splice(index, 1);
-          }
-        });
-        mapObj.getLayers().array_ = layerList;
-
-        mapObj.addLayer(sateCloudLayer);
-
-        /*mapObj.getLayers().getArray().forEach((layer:any)=> {
-          if(layer.values_.name === "radarWLayer"+num){
-            tifObj = layer;
-
-            if(beforeTifObj && tifObj){
-              //console.log("beforeTifObj",beforeTifObj);
-              //console.log("tifObj",tifObj);
-
-              if(num===0){
-                setTimeout(() => {
-                  //tifObj.setOpacity(0.7);
-
-                  if(tifObj.sourceReady_){
-                    beforeTifObj.setOpacity(0);
-                    beforeTifObj.setSource(null);
-                  }
-                }, 1000);
-              }else{
-                setTimeout(() => {
-                  if(tifObj.sourceReady_){
-                    beforeTifObj.setOpacity(0);
-                    beforeTifObj.setSource(null);
-                  }
-                }, 1000);
-              }
-
-            }else{
-              //console.log("点击++++",num, layer.values_.name);
-              setTimeout(() => {
-                mapObj.getLayers().getArray().forEach((layer:any)=> {
-                  //console.log("195++++",layer);
-                  let layerNum = (layer.values_.name) && (layer.values_.name).substring(11);
-                  //console.log(layerNum,num,layer.sourceReady_,Number(layerNum) !== num && layer.sourceReady_);
-
-                  if( Number(layerNum) !== num ){//不是当前图层
-                    if( (layer.values_.name) && (layer.values_.name).indexOf("radarWLayer") !== -1 ){
-                      if(tifObj && tifObj.sourceReady_){
-                        layer.setOpacity(0);
-                        layer.setSource(null);
-                      }
-                    }
-                  }
-                });
-              }, 1000);
-            }
-          }
-
-          if(layer.values_.name === (num>0?"radarWLayer"+(num-1):"radarWLayer"+(timeData.length-1))){
-            //console.log("layer  259++++",tifObj);
-            beforeTifObj = layer;
-
-            if(tifObj && tifObj.sourceReady_){
-              if(num===0){
-                setTimeout(() => {
-                  beforeTifObj.setOpacity(0);
-                  beforeTifObj.setSource(null);
-                }, 100);
-              }else{
-                mapObj.getLayers().getArray().forEach((layer:any)=> {
-                  let layerNum = (layer.values_.name) && (layer.values_.name).substring(11);
-                  if( Number(layerNum) !== num){
-                    if( (layer.values_.name) && (layer.values_.name).indexOf("radarWLayer") !== -1 ){
-                      layer.setOpacity(0);
-                      layer.setSource(null);
-                    }
-                  }
-                });
-              }
-            }
-          }
-
-        });*/
-
-      }
-    }
-  }, [radarImgData, mapObj, activeKey]);//radarImgData, mapObj, channelVariables, num
-
-  return (
-    <div className="clearFloat" style={{ padding: '0 1rem' }}>
-      <div className="lf datePickerBox" style={{width:"185px"}}>
-        <span className="lf" style={{lineHeight:"35px"}}>时间：</span>
-        <div className="lf" style={{width:"140px"}}>
-          <DatePicker
-            format="YYYY-MM-DD"
-            placement="topLeft"
-            onChange={onSearchClick}
-            allowClear={false}
-            defaultValue={moment()}
-            disabledDate={current => current > moment().endOf('day')}
-          />
-        </div>
-      </div>
-      <div className="lf" style={{width:"40px", margin:"-11px 5px 0px 30px"}}>
-        <Button
-          icon={play?<PauseCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />:<PlayCircleOutlined style={{color:"#007AFF", fontSize:"25px", marginTop:"10px"}} />}
-          style={{border:0, outline:"none !important", background:"none"}}
-          onClick={() => setPlay(!play)}
-        />
-      </div>
-      <div className="lf flowSlider" style={{width:"calc( 100% - 670px )"}}>
-        {
-          maxNum>0?
-            <Slider
-              disabled={play}
-              min={minNum}
-              max={maxNum-1}
-              marks={marks}
-              value={num}
-              //tooltip={{open:true}}
-              tooltip={{open:tooltipOpen}}
-              tipFormatter={formatTooltip}
-              onChange={(val)=>setIndex(val)}
-            />:null
-        }
-      </div>
-
-      <div className="radarReflectionWaveBoxColorBox rf">
-        <div className="lf"><span>0</span></div>
-        <div className="lf"><span>5</span></div>
-        <div className="lf"><span>10</span></div>
-        <div className="lf"><span>15</span></div>
-        <div className="lf"><span>20</span></div>
-        <div className="lf"><span>25</span></div>
-        <div className="lf"><span>30</span></div>
-        <div className="lf"><span>35</span></div>
-        <div className="lf"><span>40</span></div>
-        <div className="lf"><span>45</span></div>
-        <div className="lf"><span>50</span></div>
-        <div className="lf"><span>55</span></div>
-        <div className="lf"><span>60</span></div>
-        <div className="lf"><span>65(dBz)</span></div>
-      </div>
-    </div>
-  )
-}
-
-export default Index;
diff --git a/src/views/Home/panels/forecastPanels/meteorology/sateCloud/player.less b/src/views/Home/panels/forecastPanels/meteorology/sateCloud/player.less
deleted file mode 100644
index 457f925..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/sateCloud/player.less
+++ /dev/null
@@ -1,33 +0,0 @@
-.flowSlider{
-  .ant-slider-disabled .ant-slider-track{
-    background-color: #7abaff !important;
-  }
-  .ant-slider-disabled .ant-slider-handle, .ant-slider-disabled .ant-slider-dot{
-    border-color: #0052D9 !important;
-  }
-}
-
-.ant-slider-tooltip{
-  padding:2px 0;
-  .ant-tooltip-inner{
-    padding:2px 5px;
-    border-radius: 4px;
-  }
-  .ant-tooltip-inner{
-    min-height:24px;
-  }
-  .ant-tooltip-arrow{
-    height:15px;
-  }
-}
-
-#coordinates{
-  width:200px;
-  height:30px;
-  position: fixed;
-  background:#fff;
-  color:#333;
-  z-index:10000;
-  top: 111px;
-  right: 20px;
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/meteorology/sateCloud/player.tsx b/src/views/Home/panels/forecastPanels/meteorology/sateCloud/player.tsx
deleted file mode 100644
index 2b94038..0000000
--- a/src/views/Home/panels/forecastPanels/meteorology/sateCloud/player.tsx
+++ /dev/null
@@ -1,350 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Slider, Button, message, DatePicker} from 'antd'
-import {
-  PlayCircleOutlined, PauseCircleOutlined
-} from '@ant-design/icons';
-import {useDispatch, useSelector} from 'react-redux';
-import {
-  getImgNamesApi
-} from "../../../../../../service/meteorology";
-import ImageLayer from 'ol/layer/Image.js';
-import {Raster as RasterSource, Stamen, ImageStatic} from 'ol/source.js';
-import moment from "moment";
-
-import "./player.less"
-
-type IProps = {
-  activeKey: any;
-  badgeType: any;
-  tm?:any;
-}
-
-const Player: React.FC<IProps> = ({activeKey, badgeType,tm}) => {
-  const dispatch = useDispatch();
-
-  let mapObj = useSelector((s: any) => s.map.map);
-  console.log(mapObj);
-
-  const [cloudImgData, setCloudImgData] = useState([]);
-  const [timeData, setTimeData] = useState([]);
-  const [play, setPlay] = useState(false);
-
-  const [num, setNum] = useState(0);
-  const [minNum, setMinNum] = useState(0);
-  const [maxNum, setMaxNum] = useState(0);
-
-  const [tooltipOpen, setTooltipOpen] = useState(true);
-
-  const [selectTime, setSelectTime] = useState(tm.format("YYYYMMDD"));
-
-  const onSearchClick = (val: any) => {
-    setSelectTime(moment(val).format("YYYYMMDD"));
-    mapObj.getLayers().getArray().forEach((layer: any) => {
-      if ((layer.values_.name) && (layer.values_.name).indexOf("cloudLayer") !== -1) {
-        layer.setOpacity(0);
-        layer.setSource(null);
-      }
-    });
-  };
-
-  useEffect(()=>{
-    onSearchClick(tm)
-  },[tm])
-
-
-  const getData = async () => {
-    setTooltipOpen(true);
-
-    const resData = await getImgNamesApi(selectTime);
-    if (resData.code === 200) {
-      console.log(resData);
-      setCloudImgData(resData.data);
-
-      setMaxNum(resData.data.length);
-
-      let timeArray: any = [];
-      if (resData.data.length > 0) {
-        resData.data.map((item: any) => {
-          const regex = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\.png/;
-          const match = item.match(regex);
-
-          if (match) {
-            const year = match[1];
-            const month = match[2];
-            const day = match[3];
-            const hours = match[4];
-            const minutes = match[5];
-            const seconds = match[6];
-            timeArray.push(year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds);
-          }
-        });
-      }
-
-      setTimeData(timeArray);
-
-      setNum(timeArray.length - 1);
-    }
-  };
-
-  useEffect(() => {
-    if (selectTime) {
-      getData();
-
-      //setNum(0);
-      setNum(timeData.length - 1);
-      setPlay(false);
-    }
-  }, [selectTime]);
-
-  useEffect(() => {
-    if (activeKey !== "0" || badgeType !== 0) {
-      setTooltipOpen(false);
-      setPlay(false);
-      //setNum(0);
-      setNum(timeData.length - 1);
-    }
-
-    return ()=>{
-      mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if( (layer?.values_.name) && (layer?.values_.name)?.indexOf("cloudLayer") !== -1 ){
-          layer.dispose();
-        }
-      })
-    }
-
-  }, [activeKey, badgeType]);
-
-  useEffect(()=>{
-    return ()=>{
-      dispatch.runtime.closeFeaturePopAll()
-    }
-  },[])
-
-  useEffect(() => {
-    if (play) {
-      let n = num;
-      const h = setInterval(() => {
-        n = n + 1;
-
-        if (n >= maxNum) {
-          n = 0;
-        }
-
-        setNum(n);
-
-      }, 1100);
-
-      return () => {
-        clearInterval(h);
-      }
-    }
-  }, [play, num]);
-
-  const setIndex = (index: any) => {
-    setNum(index);
-  };
-
-  const marks = {
-    [minNum]: {
-      style: {
-        color: '#333',
-      },
-      label: <span style={{width: "110px", fontSize: "12px"}}>{timeData[0]}</span>,
-    },
-    [maxNum - 1]: {
-      style: {
-        color: '#333',
-      },
-      label: <div style={{width: "130px", fontSize: "12px", marginLeft: "-32px"}}>{timeData[maxNum - 1]}</div>,
-    }
-  };
-
-  const formatTooltip = (value: any) => {
-    //return timeData[value];
-    return <div className="formatTooltip">{timeData[value]}</div>
-  };
-
-  useEffect(() => {
-    if (mapObj && activeKey === "0") {
-      setTooltipOpen(true);
-
-      if (cloudImgData.length > 0) {
-        let tifObj: any = null;
-        let beforeTifObj: any = null;
-
-        //console.log("num169",num);
-        mapObj.getLayers().getArray().forEach((layer: any) => {
-          if (layer.values_.name === "cloudLayer" + num) {
-            tifObj = layer;
-          }
-        });
-
-        const dateString: any = timeData[num];
-        const regex = /(\d{4})-(\d{2})-(\d{2})/;
-        const match = dateString.match(regex);
-
-        let result = "";
-        if (match) {
-          const year = match[1];
-          const month = match[2];
-          const day = match[3];
-
-          result = year + month + day;
-        }
-
-        if (activeKey === "0") {
-          mapObj.getView().setZoom(9);
-          setTooltipOpen(true);
-        }
-
-        let sourcesObj = new ImageStatic({
-          //http://223.75.53.141:8000/zyqxfw/api/radar/sateCloud/getImg/20230713/FY4A_C013_20230713161500.png
-          // @ts-ignore
-          // url: "service81/zyqxfw/api/radar/sateCloud/getImg/" + result + "/" + cloudImgData[num],
-          url: "http://223.75.53.141:81/zyqxfw/api/radar/sateCloud/getImg/" + result + "/" + cloudImgData[num],
-
-
-          projection: 'EPSG:4326',
-          imageExtent: [70, 15, 140, 55],
-          imageSize: [1751, 1001],
-          // url: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUEAAAC1CAYAAADBek2KAAAFyElEQVR42u3dWXLbOhBAUe//J8vI9rID5TelcABADA32OVWses6zbA3kFQBR8s8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwDS///z6uBeAtAEUQcAoEEAAAZJNgYUQSBlA8QPSjwKNBAEAso0E3QsAABghAsljd/RqsSAm3Ck86ODY8GB7sEm0rx+N/BwDdg4hJN2U+PvdI0fTZfdY0p0DMu3n3kqHtxORbsZzNAL8Pg5KwuiYeUHw/v3aA0qmqXBNKM+m0rXHjWNsQehatpbfseLZHJ5EsCSEZzG8G0ScTbs9ChsEsCQyqwMohPQ8PmpnSqVftz6p77hvh7nOvQJY8iw5M0ZPRqxwddBerftd7XcjT7Du/SLN6Bd9whyXvQPYe/osgkQaJFxNkc9GgXeXbVm2uZpq91w6GnnMhDg2VwZw9A1eHWDeGcKrUdzVyO9uv6s93aZ06r3TSPDoPp523GYLYI/fL6TWBGvCdHe51vCU/txd7tOl7bh7YHeJ4KzfL4IiWPNCSO3b7kpHmiWjwjcFcEoIZwxpZw+vRwTQtNqUeMVo5upV4as4lkx5V56xEfE1hcdXenYEZ9+BAph7JNgjgKWvFF+ddH03SmzZjyMsV4WOYNSKr3g2FkLT4aenjbVEp+exVLpGGSV8U0NYMpqLGsHS69xz7RRGzyx678dnI8qZTx4zlhSKv7fkVa/I9W69Y5/sPA5dVo4+ez8p99yna4+9US2pun9KznHa5ZXh2utsPZDoEdxpGab1uOvdk2731y7z+K0WWKFyBLPTflt77IVeE6y9IXeXi3TniyA7jQCPZiAR9923vfX2Z7cItj4IDjuiRuRuySdzBJfdwJJnqwhXWATZMYBnIaz95GqjwEVhjBTBmgfG4Uf0gBytE5oKbzykB+oCGDmCUT6JKmRrBBDqpsBnS03WAdsCqUEQMHZHoatdSooyCooQOUtesPl0t3Y00+vDE94wAiy9HvZC2HSqePczzqbUWafAIggvGf0dTaHPpr+jPwRh9wCKIEyOXstaVe2pMG8a/R3dHhGEJNPd2g8EKAnj0xHhyj+zIYIggF0+ZLXHeXSzp6emw5A8gL3+xs/ZuuGT0eCska4IQqIA9pq63gWwZapc82c8e0VIBOElIbwaoY34WKySKWbLGuOI67MigCIIE0L4HZaSv0s8Msit1/9NSwsiCIli3BrDDAEUQUgaxdmXjRg/EQSqYvS2+IkgcDtljjL6GxlPewCI4NJI9ApfaxTtASB+zS+ejAjgzGm1vQAE8LPq06pHhkkAgUeh+Pd7dhoF1t4+gP+iMSOAZ1PymbdNEIHDWMwK4OrQiyBwGsGMI18A0QdEwe0FAAAAZs3Lzc0BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4KX+aA0gVvNrt7ue4V4HXBK9XJAG2CGGPaLqXAdNlgKwhdI8BIghgOgyQLIAiCMLx6fH9PSPTcjmnyACPRk0l33cWwyfR+f737/8eHUARBBEsjsTMk5ePvh4RQBEEESwKUbTNSBCYNhJsjcmsEIogMD2CR1PWmcH13mEgTARXjTxFEBgawbPLRZqCiyDQPYQll3tLAEUQAgdqxWVH/A5rgkBxVHocnCMP7trrFz2AIgjBpqI9DtSW01hGhVAEgW5BePI7zv7fVQi/z8W7+h27BlAEYcE0N8KJyaXXreZniyAwLQA1gS0ZBbZ876i3sYkgiN5n9/f2iiCIn21RzEQQBDDtCK5lOQEQv1fEzygQxC/1Gp41QUgYwIxxvnqMjAbB6C/9K7oiCAIogiII4mdtUARBAEVQBEEABVAEQfxEUARBBEVQBEEAXxTAHn9/2FGAANpEFQTQJoIggDYRBAG05Xqfs6MC8bMZCYLA2UQQhM4mgiCANhEEAbSJIIifTQRB4GwiCOJnE0EQQNsrt7+Sgxk+OWv2kQAAAABJRU5ErkJggg==",
-          // imageExtent: [108.25, 28.9, 116.25, 33.4],
-          // imageSize:[321,181],
-
-
-          interpolate: false
-        });
-        console.log(sourcesObj);
-
-        const sateCloudLayer = new ImageLayer({
-          source: sourcesObj,
-          //opacity:0.7,
-          // @ts-ignore
-          name: "cloudLayer" + num,
-          id: "cloudLayer" + num,
-        });
-
-        mapObj.addLayer(sateCloudLayer);
-
-        mapObj.getLayers().getArray().forEach((layer: any) => {
-          if (layer.values_.name === "cloudLayer" + num) {
-            tifObj = layer;
-
-            if (beforeTifObj && tifObj) {
-              //console.log("beforeTifObj",beforeTifObj);
-              //console.log("tifObj",tifObj);
-
-              if (num === 0) {
-                setTimeout(() => {
-                  //tifObj.setOpacity(0.7);
-
-                  if (tifObj.sourceReady_) {
-                    beforeTifObj.setOpacity(0);
-                    beforeTifObj.setSource(null);
-                  }
-                }, 1000);
-              } else {
-                setTimeout(() => {
-                  if (tifObj.sourceReady_) {
-                    beforeTifObj.setOpacity(0);
-                    beforeTifObj.setSource(null);
-                  }
-                }, 1000);
-              }
-
-            } else {
-              //console.log("点击++++",num, layer.values_.name);
-              setTimeout(() => {
-                mapObj.getLayers().getArray().forEach((layer: any) => {
-                  //console.log("195++++",layer);
-                  let layerNum = (layer.values_.name) && (layer.values_.name).substring(10);
-                  //console.log(layerNum,num,layer.sourceReady_,Number(layerNum) !== num && layer.sourceReady_);
-
-                  if (Number(layerNum) !== num) {//不是当前图层
-                    if ((layer.values_.name) && (layer.values_.name).indexOf("cloudLayer") !== -1) {
-                      if (tifObj && tifObj.sourceReady_) {
-                        layer.setOpacity(0);
-                        layer.setSource(null);
-                      }
-                    }
-                  }
-                });
-              }, 1000);
-            }
-          }
-
-          if (layer.values_.name === (num > 0 ? "cloudLayer" + (num - 1) : "cloudLayer" + (timeData.length - 1))) {
-            //console.log("layer  259++++",tifObj);
-            beforeTifObj = layer;
-
-            if (tifObj && tifObj.sourceReady_) {
-              if (num === 0) {
-                setTimeout(() => {
-                  beforeTifObj.setOpacity(0);
-                  beforeTifObj.setSource(null);
-                }, 100);
-              } else {
-                mapObj.getLayers().getArray().forEach((layer: any) => {
-                  let layerNum = (layer.values_.name) && (layer.values_.name).substring(10);
-                  if (Number(layerNum) !== num) {
-                    if ((layer.values_.name) && (layer.values_.name).indexOf("cloudLayer") !== -1) {
-                      layer.setOpacity(0);
-                      layer.setSource(null);
-                    }
-                  }
-                });
-              }
-            }
-          }
-
-        });
-
-      } 
-    }
-  }, [cloudImgData, mapObj, num, activeKey]);//cloudImgData, mapObj, channelVariables, num
-
-
-  return (
-    <div className="clearFloat" style={{padding: '0 1rem'}}>
-      {/* <div className="lf datePickerBox" style={{width: "185px"}}>
-        <span className="lf" style={{lineHeight: "35px"}}>时间：</span>
-        <div className="lf" style={{width: "140px"}}>
-          <DatePicker
-            format="YYYY-MM-DD"
-            placement="topLeft"
-            onChange={onSearchClick}
-            allowClear={false}
-            defaultValue={moment()}
-            disabledDate={current => current > moment().endOf('day')}
-          />
-        </div>
-      </div> */}
-      <div className="lf" style={{width: "40px", margin: "-11px 5px 0px 50px"}}>
-        <Button
-          icon={play ? <PauseCircleOutlined style={{color: "#007AFF", fontSize: "25px", marginTop: "10px"}}/> :
-            <PlayCircleOutlined style={{color: "#007AFF", fontSize: "25px", marginTop: "10px"}}/>}
-          style={{border: 0, outline: "none !important", background: "none"}}
-          onClick={() => setPlay(!play)}
-        />
-      </div>
-      <div className="lf flowSlider" style={{width: "calc( 100% - 160px )"}}>
-        {
-          maxNum > 0 ?
-            <Slider
-              disabled={play}
-              min={minNum}
-              max={maxNum - 1}
-              marks={marks}
-              value={num}
-              //tooltip={{open:true}}
-              tooltip={{open: tooltipOpen}}
-              tipFormatter={formatTooltip}
-              onChange={(val) => setIndex(val)}
-            /> : null
-        }
-      </div>
-    </div>
-  )
-}
-
-export default Player;
diff --git a/src/views/Home/panels/forecastPanels/video/ToolBar.tsx b/src/views/Home/panels/forecastPanels/video/ToolBar.tsx
deleted file mode 100644
index 12eaa30..0000000
--- a/src/views/Home/panels/forecastPanels/video/ToolBar.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Button, Select, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../components/crud/useCrud';
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  crudCtx: CrudContext;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, crudCtx }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  const onSearchClick = () => {
-    const { tm, ...rec } = form.getFieldsValue();
-    if (tm) {
-      if (tm[0]) {
-        rec.stm = tm[0].format('YYYY-MM-DD');
-      }
-      if (tm[1]) {
-        rec.etm = tm[1].format('YYYY-MM-DD');
-      }
-    }
-    search(rec);
-  };
-
-  const reset = () => {
-    form.resetFields();
-    form.setFieldsValue({"deptNames": undefined});
-  };
-
-
-  return record ? (
-    <Form layout="inline" form={form} initialValues={record}>
-      <FormItem label="" name="deptNames">
-        <Input placeholder="请输入水库名称" onChange={onSearchClick} style={{ width: 200 }} />
-      </FormItem>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/forecastPanels/video/index.less b/src/views/Home/panels/forecastPanels/video/index.less
deleted file mode 100644
index 7cbb1bb..0000000
--- a/src/views/Home/panels/forecastPanels/video/index.less
+++ /dev/null
@@ -1,88 +0,0 @@
-.videoBox{
-  .panelTitle {
-    padding-left: 14px;
-    box-sizing: border-box;
-  }
-  .topQuery{
-    min-height: 30px;
-    line-height: 30px;
-    margin: 15px 25px;
-  }
-  .listDiv{
-    height:calc( 100vh - 210px );
-    overflow: hidden auto;
-    .item{
-      padding: 10px 26px 0 20px;
-      box-sizing: border-box;
-      border-top: 1px solid #ECF2F9;
-    }
-    .nameSpan{
-      padding: 0 8px;
-      background: #0893FF;
-      color: #fff;
-      letter-spacing: 1px;
-      border-radius: 4px;
-      margin-right:10px;
-      line-height:26px;
-      cursor:pointer;
-    }
-    .time{
-      color:#333;
-      font-weight:bold;
-      font-size:13px;
-      line-height:26px;
-    }
-    .imgBox{
-      text-align: center;
-      margin: 20px 0;
-    }
-    .text{
-      margin-bottom:20px;
-      >div{
-        padding: 0 25px 0 10px;
-        span{
-          color:#333;
-          font-size:15px;
-          line-height: 26px;
-        }
-        .linkTxt{
-          color:#0083FE;
-          text-decoration: underline;
-          text-decoration-color: #0083FE;
-          font-weight:bold;
-        }
-      }
-    }
-  }
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/video/index.tsx b/src/views/Home/panels/forecastPanels/video/index.tsx
deleted file mode 100644
index a5bd2f5..0000000
--- a/src/views/Home/panels/forecastPanels/video/index.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { Image, Radio } from 'antd'
-import React, {useEffect, useState} from 'react'
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import "./index.less"
-import ToolBar from './ToolBar';
-import moment from "moment";
-import {SearchOption} from "../../../../../service/def";
-import useCrud from "../../../../../components/crud/useCrud";
-
-const HoursPanelPage = () => {
-  const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-
-  const crud = useCrud();
-
-  const [showDetails, setShowDetails] = useState(false);
-  const [detailsData, setDetailsData] = useState({});
-
-  const showDetailsFun = (val:any) => {
-    setShowDetails(true);
-    setDetailsData({name: val});
-  };
-
-  useEffect(() => {
-
-  }, []);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-      deptNames: null,
-    }};
-
-  const doSearch = (params:any) => {
-
-  };
-
-  return (
-    <div className="videoBox">
-      <div className="clearFloat panelTitle">
-        <div className="lf">
-          <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-        </div>
-        <span className="lf txt">视频监测（数据总条数：<span style={{color: "#0083FE", fontSize:"20px"}}>2</span>）</span>
-      </div>
-      <div className="content">
-        {/*上方查询条件*/}
-        <div className="topQuery">
-          <ToolBar params={{ ...options1.search }} search={doSearch} crudCtx={crud}/>
-        </div>
-        {/*下方内容区域*/}
-        <div className="listDiv">
-          <div className="item">
-            <div className="clearFloat">
-              <span className="lf nameSpan" onClick={()=>showDetailsFun(systemSwitchType?"秦家湾水库":"四十二坝水库")}>{systemSwitchType?"秦家湾水库":"四十二坝水库"}</span>
-              <div className="rf time">
-                抓图时间：<span>2022-11-14 14:10</span>
-              </div>
-            </div>
-            <div className="imgBox">
-              <video width="320" height="240" controls>
-                <source src="" type="video/mp4" />
-                  <source src="" type="video/ogg" />
-                    您的浏览器不支持 video 标签。
-              </video>
-            </div>
-            <div className="text">
-              <div className="clearFloat">
-                <span className="lf labelSpan">水位(m)：</span>
-                <span className="rf txtSpan">-</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">关联站点名称：</span>
-                <span className="rf txtSpan linkTxt">-</span>
-              </div>
-            </div>
-          </div>
-
-          <div className="item">
-            <div className="clearFloat">
-              <span className="lf nameSpan" onClick={()=>showDetailsFun(systemSwitchType?"南河水库":"五一水库")}>{systemSwitchType?"南河水库":"五一水库"}</span>
-              <div className="rf time">
-                抓图时间：<span>2022-11-14 14:10</span>
-              </div>
-            </div>
-            <div className="imgBox">
-              <video width="320" height="240" controls>
-                <source src="" type="video/mp4" />
-                <source src="" type="video/ogg" />
-                您的浏览器不支持 video 标签。
-              </video>
-            </div>
-            <div className="text">
-              <div className="clearFloat">
-                <span className="lf labelSpan">水位(m)：</span>
-                <span className="rf txtSpan">-</span>
-              </div>
-              <div className="clearFloat">
-                <span className="lf labelSpan">关联站点名称：</span>
-                <span className="rf txtSpan linkTxt">-</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-
-    </div>
-  )
-}
-
-export default HoursPanelPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/water/index.less b/src/views/Home/panels/forecastPanels/water/index.less
deleted file mode 100644
index 5b938a2..0000000
--- a/src/views/Home/panels/forecastPanels/water/index.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.waterBox{
-  height:calc( 100vh - 90px );
-
-  overflow:hidden auto;
-
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/water/index.tsx b/src/views/Home/panels/forecastPanels/water/index.tsx
deleted file mode 100644
index 9c3e0d5..0000000
--- a/src/views/Home/panels/forecastPanels/water/index.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import {Collapse, Image, Modal, Radio} from 'antd'
-import React, {useEffect, useState} from 'react'
-import {
-  CloseOutlined,
-} from '@ant-design/icons';
-import "./index.less"
-import moment from "moment";
-import useCrud from "../../../../../components/crud/useCrud";
-import RiverWaterLevelPage from './riverWaterLevel';
-import ReservoirLevelPage from './reservoirLevel';
-import SummarizeRiverWaterRegime from "../../../../../components/summarizeRiverWaterRegime";
-import SummarizeReservoirWaterRegime from "../../../../../components/summarizeReservoirWaterRegime";
-import {useSelector} from "react-redux";
-
-const { Panel } = Collapse;
-
-const HoursPanelPage = () => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const onChange = (key: string | string[]) => {
-    console.log(key);
-  };
-
-  const [hzhdsqVisible, setHzhdsqVisible] = useState(false);
-  const [hzsksqVisible, setHzsksqVisible] = useState(false);
-
-  const handleCancel = () => {
-    setHzhdsqVisible(false); 
-  }
-
-  const handleCancelSksq = () => {
-    setHzsksqVisible(false);
-  }
-
-  return (
-    <div className="waterBox" style={{height: hasAlertBox?"calc(100vh - 102px)":"calc(100vh - 82px)"}}>
-      <Collapse defaultActiveKey={['1', '2', '3']} onChange={onChange} expandIconPosition="end" >
-        <Panel header={<div className="clearFloat panelTitle" >
-            <div className="lf">
-              {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">河道水位</span>
-            <span className="rf" onClick={(e)=>{e.stopPropagation();setHzhdsqVisible(true); }} style={{fontSize:"12px", margin:"2px 34px 0 0", color:"#0068F4"}}>汇总河道水情</span>
-          </div>} key="1">
-          <RiverWaterLevelPage />
-        </Panel>
-        <Panel header={<div className="clearFloat panelTitle">
-            <div className="lf">
-              {/*<BlockOutlined style={{fontSize:"22px", color:"#007BFF", fontWeight:"bold"}}/>*/}
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">水库水位</span>
-            <span className="rf" onClick={(e)=>{e.stopPropagation();setHzsksqVisible(true); }} style={{fontSize:"12px", margin:"2px 34px 0 0", color:"#0068F4"}}>汇总水库水情</span>
-          </div>} key="2">
-          <ReservoirLevelPage />
-        </Panel>
-      </Collapse>
-
-      {/*汇总河道水情弹窗*/}
-      <Modal
-        visible={hzhdsqVisible}
-        title="汇总河道水情"
-        footer={null}
-        onCancel={handleCancel}
-        width="99vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        <SummarizeRiverWaterRegime />
-      </Modal>
-
-      {/*汇总水库水情弹窗*/}
-      <Modal
-        visible={hzsksqVisible}
-        title="汇总水库水情"
-        footer={null}
-        onCancel={handleCancelSksq}
-        width="99vw"
-        className="hzyqModal"
-        style={{top:"15px", height:"98vh"}}
-      >
-        <SummarizeReservoirWaterRegime />
-      </Modal>
-    </div>
-  )
-}
-
-export default HoursPanelPage
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/water/reservoirLevel/DataTable.tsx b/src/views/Home/panels/forecastPanels/water/reservoirLevel/DataTable.tsx
deleted file mode 100644
index 9df723b..0000000
--- a/src/views/Home/panels/forecastPanels/water/reservoirLevel/DataTable.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import {Table, Select} from 'antd';
-import React, {useEffect, useMemo, useState} from 'react';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-import appconsts from '../../../../../../service/appconsts';
-import ToolBar from './ToolBar';
-import moment from "moment";
-import {SkRealPromiseWX} from "../../../../../../models/_/real";
-import {useDispatch, useSelector} from "react-redux";
-import "./index.less"
-
-const { Option } = Select;
-
-type IProps = {
-  crudCtx: CrudContext;
-}
-
-const DataTable: React.FC<IProps> = ({ crudCtx }) => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const dispatch = useDispatch();
-
-  const [selectedTr, setSelectedTr] = useState("");
-
-  const [searchType1, setSearchType1] = useState("SK");
-  const [searchType2, setSearchType2] = useState("SW");
-  const [searchName, setSearchName] = useState("");
-  const [searchCode, setSearchCode] = useState("");
-
-  const [tableData, setTableData] = useState([]);
-
-  const doSearch = (params:any) => {
-    setSearchName(params.stnm?params.stnm:"");
-    setSearchCode(params.stcd?params.stcd:"");
-    setSearchType1(params.type1?params.type1:"");
-    setSearchType2(params.type2?params.type2:"");
-  };
-
-  const getTableData = async () => {
-    let resData = await SkRealPromiseWX.get();
-    const data = (resData || []).sort((a:any, b:any) => (b.aRz - a.aRz));
-
-    if(data&&data.length>0){
-      const ret = data.filter((o:any) => {
-        //测站名称
-        if (searchName) {
-          if (o.stnm.indexOf(searchName) < 0) {
-            return false;
-          }
-        }
-        //测站编码
-        if(searchCode){
-          if (o.stcd.indexOf(searchCode) < 0) {
-            return false;
-          }
-        }
-
-        return true;
-      });
-
-      let typeData:any = [];
-      if(ret.length>0){
-        ret.map((item:any)=>{
-          if(searchType1){
-            if(item.source.indexOf(searchType1) !== -1){
-              typeData.push(item);
-            }
-          }
-          if(searchType2){
-            if(item.source.indexOf(searchType2) !== -1){
-              typeData.push(item);
-            }
-          }
-        });
-      }
-      //console.log("78 typeData+++",typeData);
-      //console.log("79 ret+++",ret);
-
-      typeData = typeData.sort((a:any, b:any) => {
-        if (a.rz === null && b.rz === null) return 0;
-        if (a.rz === null) return 1;
-        if (b.rz === null) return -1;
-        return b.rz - a.rz;
-      });
-
-      setTableData(typeData)
-    }
-  };
-
-  useEffect(() => {
-    getTableData();
-  }, []);
-
-  useEffect(() => {
-    getTableData();
-  }, [searchName, searchCode, searchType1, searchType2]);
-
-  const flyTo = (record:any) => {
-    setSelectedTr(record.stcd);
-
-    dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-
-    const { lgtd, lttd, elev } = record;
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          ShuiKuLayer: [record.id],
-        }
-      });
-
-      dispatch.runtime.setFeaturePop({ type: "shuiku", data: record, lgtd: record.lgtd, lttd: record.lttd, });
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-    }
-  };
-
-  const renderSkRz = (item:any) => {
-    //rzState !== 1 水库-离线；   rzWarning===1 水库-超汛限
-    /*if (!item.rz || item.rzState !== 1) {
-      return <span>-</span>;
-    }*/
-    if (!item.rz) {
-      return <span>-</span>;
-    }
-    if (item.rzWarning === 1) {
-      return <span style={{ color: 'red' }}>{item.rz.toFixed(2)}</span>;
-    }
-    return item.rz.toFixed(2)
-  }
-
-  const columns:any = useMemo(() => [
-    /*{ title: '序号', key: 'inx', dataIndex: 'inx', align: 'center', width: 80, render: (val:any, rec:any, inx:any) => inx + 1 },*/
-    { title: '站点名称', key: '', dataIndex: '', align: 'left',
-      render: (rec:any)=><div className="ellipsisDiv" onClick={() => flyTo(rec)} style={{cursor:"pointer", paddingLeft:"10px"}} title={rec.stnm}>{rec.stnm}</div>
-    },
-    { title: '站点编码', key: 'stcd', dataIndex: 'stcd', align: 'center', },
-    // @ts-ignore
-    { title: '来源', key: '', dataIndex: '', align: 'center', width:50,render: (rec:any)=><span>{rec.source?appconsts.sttype[rec.source.toUpperCase()]:"-"}</span>},
-    { title: '实时水位', key: '', dataIndex: '', align: 'center', render: (rec:any)=>renderSkRz(rec)
-    },
-  ], [crudCtx]);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-      deptNames: null,
-      stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-      etm:  moment().format("YYYY-MM-DD"),
-    }};
-
-  return (
-    <div className="rWaterBox">
-      <div style={{margin:"0 0 10px 12px"}}>
-        <ToolBar params={{ ...options1.search }} search={doSearch} crudCtx={crudCtx}/>
-      </div>
-      {/*<div className="card-h-margin" />*/}
-      <div className="smallTable" style={{minHeight:"140px"}}>
-        <Table rowKey={rec => rec.source + rec.stcd} bordered rowClassName={(record:any) => record.stcd === selectedTr?"selectedTr":""}
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               //scroll={{ y: 200 }}
-               scroll={{ y: hasAlertBox?"calc((100vh - 370px)/2)":"calc((100vh - 350px)/2)" }}
-        />
-      </div>
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/forecastPanels/water/reservoirLevel/ToolBar.tsx b/src/views/Home/panels/forecastPanels/water/reservoirLevel/ToolBar.tsx
deleted file mode 100644
index f44f85f..0000000
--- a/src/views/Home/panels/forecastPanels/water/reservoirLevel/ToolBar.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Select, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  crudCtx: CrudContext;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, crudCtx }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-  const plainOptions = ["水文", "水库"];//["水文", "水库", "县城外", "县城内"]
-
-  useEffect(() => {
-    form.setFieldsValue({type:[ "水文", "水库" ]})
-  }, []);
-
-  const onSearchClick = () => {
-    const { ...rec } = form.getFieldsValue();
-    let type1:any = "";
-    let type2:any = "";
-    if(rec.type.length>0){
-      rec.type.map((item:any)=>{
-        if(item==="水库"){
-          type1 = "SK"
-        }else if(item==="水文"){
-          type2 = "SW"
-        }
-      });
-    }
-    rec.type1 = type1;
-    rec.type2 = type2;
-    search(rec);
-  };
-
-
-  return record ? (
-    <Form layout="inline" form={form} initialValues={record}>
-      <div style={{width:"100%"}}>
-        <FormItem label="" name="type">
-          <CheckboxGroup options={plainOptions} onChange={onSearchClick} />
-        </FormItem>
-      </div>
-      <FormItem label="" name="stnm">
-        <Input style={{ width: 140 }} allowClear placeholder="站点名称" onChange={onSearchClick}/>
-      </FormItem>
-      <FormItem label="" name="stcd">
-        <Input style={{ width: 140 }} allowClear placeholder="站点编号" onChange={onSearchClick}/>
-      </FormItem>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/forecastPanels/water/reservoirLevel/index.less b/src/views/Home/panels/forecastPanels/water/reservoirLevel/index.less
deleted file mode 100644
index 44cbd01..0000000
--- a/src/views/Home/panels/forecastPanels/water/reservoirLevel/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.rWaterBox{
-
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/water/reservoirLevel/index.tsx b/src/views/Home/panels/forecastPanels/water/reservoirLevel/index.tsx
deleted file mode 100644
index bb44887..0000000
--- a/src/views/Home/panels/forecastPanels/water/reservoirLevel/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, {useState} from 'react';
-import useCrud from '../../../../../../components/crud/useCrud';
-import DataTable from './DataTable';
-import './index.less';
-
-const ReservoirLevelPage: React.FC = () => {
-
-  const crud = useCrud();
-
-  return (
-    <div style={{padding:"0 10px",boxSizing:"border-box"}}>
-      <DataTable crudCtx={crud} />
-    </div>
-  )
-};
-
-export default ReservoirLevelPage
diff --git a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/DataTable.tsx b/src/views/Home/panels/forecastPanels/water/riverWaterLevel/DataTable.tsx
deleted file mode 100644
index 29b6e49..0000000
--- a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/DataTable.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import {Table,Select} from 'antd';
-import React, {useEffect, useMemo, useState} from 'react';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-import ToolBar from './ToolBar';
-import moment from "moment";
-import { HDRealPromiseWX } from "../../../../../../models/_/real";
-import {useDispatch, useSelector} from "react-redux";
-import "./index.less"
-
-type IProps = {
-  crudCtx: CrudContext;
-}
-
-const DataTable: React.FC<IProps> = ({ crudCtx }) => {
-  const dispatch = useDispatch();
-
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const [selectedTr, setSelectedTr] = useState("");
-
-  const [searchType1, setSearchType1] = useState("SH");
-  const [searchType2, setSearchType2] = useState("SW");
-  const [searchName, setSearchName] = useState("");
-  const [searchCode, setSearchCode] = useState("");
-
-  const [tableData, setTableData] = useState([]);
-
-  const doSearch = (params:any) => {
-    setSearchName(params.stnm?params.stnm:"");
-    setSearchCode(params.stcd?params.stcd:"");
-    setSearchType1(params.type1?params.type1:"");
-    setSearchType2(params.type2?params.type2:"");
-  };
-
-  const getTableData = async () => {
-    let data = await HDRealPromiseWX.get();
-
-    if(data&&data.length>0){
-      const ret = data.filter((o:any) => {
-        //测站名称
-        if (searchName) {
-          if (o.stnm.indexOf(searchName) < 0) {
-            return false;
-          }
-        }
-        //测站编码
-        if(searchCode){
-          if (o.stcd.indexOf(searchCode) < 0) {
-            return false;
-          }
-        }
-
-        return true;
-      });
-
-      let typeData:any = [];
-      if(ret.length>0){
-        ret.map((item:any)=>{
-          if(searchType1){
-            if(item.source.indexOf(searchType1) !== -1){
-              typeData.push(item);
-            }
-          }
-          if(searchType2){
-            if(item.source.indexOf(searchType2) !== -1){
-              typeData.push(item);
-            }
-          }
-        });
-      }
-      //console.log("78 typeData+++",typeData);
-      //console.log("79 ret+++",ret);
-
-      typeData = typeData.sort((a:any, b:any) => {
-        if (a.z === null && b.z === null) return 0;
-        if (a.z === null) return 1;
-        if (b.z === null) return -1;
-        return b.z - a.z;
-      });
-
-      setTableData(typeData)
-    }
-  };
-
-  useEffect(() => {
-    getTableData();
-  }, []);
-
-  useEffect(() => {
-    getTableData();
-  }, [searchName, searchCode, searchType1, searchType2]);
-
-  const flyTo = (record:any) => {
-    setSelectedTr(record.stcd);
-
-    dispatch.map.setLayerVisible({'HdswLayer': true});
-
-    const { lgtd, lttd, elev } = record;
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          HdswLayer: [record.id],
-        }
-      });
-
-      dispatch.runtime.setFeaturePop({ type: "hdsw", data: record, lgtd: record.lgtd, lttd: record.lttd, });
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-    }
-  }
-
-  const columns:any = useMemo(() => [
-    /*{ title: '序号', key: 'inx', dataIndex: 'inx', align: 'center', width: 80, render: (val:any, rec:any, inx:any) => inx + 1 },*/
-    { title: '站点名称', key: '', dataIndex: '', align: 'left',
-    render: (rec:any)=><div className="ellipsisDiv" onClick={() => flyTo(rec)} style={{cursor:"pointer", paddingLeft:"10px"}} title={rec.stnm}>{rec.stnm}</div>
-  },
-    { title: '站点编码', key: 'stcd', dataIndex: 'stcd', align: 'center', },
-    /*{ title: '实时水位', key: '', dataIndex: '', align: 'center', render: (rec:any)=>(rec.z!==null?rec.z.toFixed(2):"-")},*/
-    { title: '实时水位', key: '', dataIndex: '', align: 'center', render: (rec:any)=>(rec.z!==null?rec.z.toFixed(2):"-")},
-  ], [crudCtx]);
-
-  // 初始接收默认查询参数
-  const options1 = {
-    search: {
-      deptNames: null,
-      stm:  moment().subtract(0, 'day').format("YYYY-MM-DD"),
-      etm:  moment().format("YYYY-MM-DD"),
-    }};
-
-  return (
-    <div className="rWaterBox">
-      <div style={{margin:"0 0 10px 12px"}}>
-        <ToolBar params={{ ...options1.search }} search={doSearch} crudCtx={crudCtx}/>
-      </div>
-      {/*<div className="card-h-margin" />*/}
-      <div className="smallTable" style={{minHeight:"140px"}}>
-        <Table rowKey={rec => rec.source + rec.stcd} bordered rowClassName={(record:any) => record.stcd === selectedTr?"selectedTr":""}
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               //scroll={{ y: 200 }}
-               scroll={{ y: hasAlertBox?"calc((100vh - 370px)/2)":"calc((100vh - 350px)/2)" }}
-        />
-      </div>
-    </div>
-  )
-};
-
-export default DataTable
diff --git a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/ToolBar.tsx b/src/views/Home/panels/forecastPanels/water/riverWaterLevel/ToolBar.tsx
deleted file mode 100644
index e14a073..0000000
--- a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/ToolBar.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import moment from "moment";
-import {Form, Input, Checkbox, Select, DatePicker, InputNumber, Space} from 'antd';
-import { SearchOutlined, RedoOutlined, PlusOutlined } from '@ant-design/icons';
-import { CrudContext } from '../../../../../../components/crud/useCrud';
-
-const CheckboxGroup = Checkbox.Group;
-
-const FormItem = Form.Item;
-
-type ToolBarProps = {
-  params: any;
-  search: (value: any) => void;
-  crudCtx: CrudContext;
-}
-
-const ToolBar: React.FC<ToolBarProps> = ({ params, search, crudCtx }) => {
-  const [form] = Form.useForm();
-
-  const { stm, etm, ...record } = params;
-  if (stm && etm) {
-    record.tm = [moment(stm), moment(etm)]
-  }
-
-//11111
-  //222
-  const plainOptions = [ "山洪", "水文" ];//["山洪", "水文", "县城外", "县城内"]
-
-  useEffect(() => {
-    form.setFieldsValue({type:[ "山洪", "水文" ]})
-  }, []);
-
-  const onSearchClick = () => {
-    const { ...rec } = form.getFieldsValue();
-    let type1:any = "";
-    let type2:any = "";
-    if(rec.type.length>0){
-      rec.type.map((item:any)=>{
-        if(item==="山洪"){
-          type1 = "SH"
-        }else if(item==="水文"){
-          type2 = "SW"
-        }
-      });
-    }
-    rec.type1 = type1;
-    rec.type2 = type2;
-    search(rec);
-  };
-
-
-  return record ? (
-    <Form layout="inline" form={form} initialValues={record}>
-      <div style={{width:"100%"}}>
-        <FormItem label="" name="type">
-          <CheckboxGroup options={plainOptions} onChange={onSearchClick} />
-        </FormItem>
-      </div>
-      <FormItem label="" name="stnm">
-        <Input style={{ width: 140 }} allowClear placeholder="站点名称" onChange={onSearchClick}/>
-      </FormItem>
-      <FormItem label="" name="stcd">
-        <Input style={{ width: 140 }} allowClear placeholder="站点编号" onChange={onSearchClick}/>
-      </FormItem>
-    </Form>
-  ) : null;
-};
-
-export default ToolBar;
diff --git a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/index.less b/src/views/Home/panels/forecastPanels/water/riverWaterLevel/index.less
deleted file mode 100644
index 44cbd01..0000000
--- a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.rWaterBox{
-
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/index.tsx b/src/views/Home/panels/forecastPanels/water/riverWaterLevel/index.tsx
deleted file mode 100644
index 8319e01..0000000
--- a/src/views/Home/panels/forecastPanels/water/riverWaterLevel/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, {useState} from 'react';
-import useCrud from '../../../../../../components/crud/useCrud';
-import DataTable from './DataTable';
-import './index.less';
-
-const RiverWaterLevelPage: React.FC = () => {
-
-  const crud = useCrud();
-
-  return (
-    <div style={{padding:"0 10px",boxSizing:"border-box",marginBottom:"16px"}}>
-      <DataTable crudCtx={crud} />
-    </div>
-  )
-};
-
-export default RiverWaterLevelPage
diff --git a/src/views/Home/panels/homePanels/rightPanels/AreaDrp/chart.js b/src/views/Home/panels/homePanels/rightPanels/AreaDrp/chart.js
deleted file mode 100644
index 74957d1..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/AreaDrp/chart.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import React, { useMemo } from 'react';
-import echarts from 'echarts/lib/echarts';
-import ReactEcharts from 'echarts-for-react';
-
-
-const pallete = [
-  ['#177ab3', '#51c3e7'],
-  ['#9976dc', '#c792ee'],
-  ['#94a1eb', '#a7caf8'],
-  ['#7ae5c3', '#c9f4ea'],
-  ['#c7dca5', '#f5fcd5'],
-  ['#7988d9', '#9dc6f1'],
-  ['#d9ed8f', '#d3f89b'],
-];
-
-const palleteLen = pallete.length;
-
-
-const AreaDrpChart = ({ data, areaDrpTmType }) => {
-  const { max, sdata } = useMemo(() => {
-    let max = 0;
-    data.forEach(o => {
-      max = Math.max(max, o.av)
-    });
-    max = [10, 20, 50, 100, 200, 300, 400].find(i => i >= max);
-
-    return {
-      max,
-      sdata: data.map(o => ({ ...o, name: o.NAME.split('').join('\n') })),
-    }
-  }, [data]);
-
-  /*const xData = [{NAME:"区域1"}, {NAME:"区域2"},{NAME:"区域3"},{NAME:"区域4"},{NAME:"区域5"},
-    {NAME:"区域6"}, {NAME:"区域7"},{NAME:"区域8"},{NAME:"区域9"},{NAME:"区域A"},{NAME:"区域B"}
-  ];*/
-
-  var option = {
-    tooltip: {
-      trigger: 'item',
-      formatter: function (params) {
-        var res = `${areaDrpTmType.substring(1)}小时${params.name.replace(/\n/g, '')}`+"<br />"+`平均降雨：${params.data}mm`;
-        return res;
-      }
-    },
-    grid: {
-      x: 18,
-      y: 24,
-      x2: 28,
-      y2: 43,
-      borderWidth: 0
-    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        data: sdata.map(o => o.name),
-        //data: xData.map(o => ({ ...o, name: o.NAME.split('').join('\n') })).map(o => o.name),
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#DCDCDC',
-            width: 1,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          fontWeight:"bold",
-          //textShadowBlur: 4,
-          //textShadowColor: '#6ab',
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        }
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'right',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#DCDCDC',
-            width: 1,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#0893FF',
-          fontSize: 12,
-          fontWeight:"bold",
-          //textShadowBlur: 4,
-          //textShadowColor: '#6ab',
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: 0,
-        max,
-      }
-    ],
-    series: [
-      {
-        name: '降雨',
-        type: 'bar',
-        barWidth: '60%',
-        data: sdata.map(o => o.av),
-        //data: [0, 0.5, 0.4, 0, 0, 0.2, 0.1, 0.1, 0.8, 0.7, 0.4],
-        itemStyle: {
-          normal: {
-            color: (params) => {
-              return new echarts.graphic.LinearGradient(
-                0, 0, 0, 1,
-                [
-                  { offset: 0, color: pallete[params.dataIndex % palleteLen][0] },
-                  { offset: 1, color: pallete[params.dataIndex % palleteLen][1] }
-                ]
-              )
-            },
-          },
-        },
-        label: {
-          show: true,
-          position: 'top',
-          color: '#333',
-          fontSize: 12,
-          //textShadowBlur: 4,
-          //textShadowColor: '#6ab',
-        },
-      }
-    ]
-  };
-
-  return (
-    <ReactEcharts
-      option={option}
-      style={{ height: '150px', width: '100%' }}
-    />
-  )
-}
-
-export default React.memo(AreaDrpChart);
diff --git a/src/views/Home/panels/homePanels/rightPanels/AreaDrp/index.js b/src/views/Home/panels/homePanels/rightPanels/AreaDrp/index.js
deleted file mode 100644
index 20ef8e5..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/AreaDrp/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import clsx from 'clsx';
-import React, { useMemo } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { ZhenDataPromise } from '../../../../../../models/_/adcd';
-import { DrpRealPromiseWX } from '../../../../../../models/_/real';
-import useRefresh from '../../../../../../utils/useRefresh';
-import useRequest from '../../../../../../utils/useRequest';
-import AreaDrpChart from './chart';
-
-export default function AreaDrp() {
-  const t = useRefresh(60 * 1000);
-  const { data: adcdList } = useRequest(ZhenDataPromise.get);
-  const { data: drpList } = useRequest(DrpRealPromiseWX.get, t);
-  const areaDrpTmType = useSelector(s => s.overallview.areaDrpTmType);
-  const dispatch = useDispatch();
-
-  const data = useMemo(() => {
-    if (!adcdList) {
-      return [];
-    }
-
-    const resMap = {};
-    adcdList.forEach(({ ADCD, NAME }) => {
-      resMap[ADCD.substr(0, 9)] = {
-        ADCD,
-        NAME,
-        drp: 0,
-        cnt: 0,
-        av: 0,
-      }
-    });
-    //console.log("32 resMap+++",resMap);
-    drpList?.forEach(o => {
-      const adcd = o?.adcd?.substr(0, 9);
-      if (resMap[adcd]) {
-        resMap[adcd].drp += o[areaDrpTmType] || 0;
-        resMap[adcd].cnt += 1;
-      }
-    });
-
-    const ret = Object.values(resMap);
-    ret.forEach(o => {
-      if (o.cnt) {
-        o.av = parseFloat((o.drp / o.cnt).toFixed(1));
-      }
-    })
-
-    return Object.values(resMap);
-  }, [adcdList, drpList, areaDrpTmType]);
-
-  return (
-    <div>
-      <div className="clearFloat" style={{position:"relative",top:"-10px"}}>
-        <div className="button-group rf" style={{marginRight:"20px"}}>
-          {
-            ['h1', 'h3', 'h6', 'h12', 'h24', 'h48'].map(key => (
-              <span key={key} className={clsx({ active: areaDrpTmType === key })} onClick={() => dispatch.overallview.setAreaDrpTmType(key)}>{key}</span>
-            ))
-          }
-        </div>
-      </div>
-      <div style={{position:"relative",top:"-10px"}}>
-        <AreaDrpChart data={data} areaDrpTmType={areaDrpTmType}/>
-      </div>
-    </div>
-  )
-}
diff --git a/src/views/Home/panels/homePanels/rightPanels/HD24H/DrpChart24H.js b/src/views/Home/panels/homePanels/rightPanels/HD24H/DrpChart24H.js
deleted file mode 100644
index a6534f4..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/HD24H/DrpChart24H.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, {useMemo, useEffect, useState} from 'react';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment';
-import { normalizeSearchTmRange } from '../../../../../../utils/tools';
-import { queryImportantStStbprpBAndStPptnRApi } from '../../../../../../service/homePage';
-import drpOption from './drpOption';
-
-const DrpChart24H = ({ st }) => {
-  const [data24h, setData24h] = useState([]);
-  //console.log("11+++",st);
-  const getData24h = async() => {
-    //console.log("13+++",st);
-    if (!st) {
-      return [];
-    }
-    const tm = [moment().add(-24, 'hour'), moment()];
-    const resultTm = normalizeSearchTmRange(tm, 'h');
-
-    let params = {
-      "etm": moment().format('YYYY-MM-DD HH:mm:ss'),
-      "source": st.type,
-      "stcds": [st.stcd],
-      "stm": moment().add(-24, 'hour').format('YYYY-MM-DD HH:mm:ss'),
-      "type": ""
-    };
-
-    /*const ret = await drpSearch(st.type, st.stcd, 'h', resultTm, st.adcd) || [];
-    setData24h(ret);*/
-
-    const ret = await queryImportantStStbprpBAndStPptnRApi(params);
-    if(ret.code === 200){
-      setData24h(ret.data);
-    }
-  };
-
-  useEffect(() => {
-    getData24h();
-  }, [st]);
-
-  const option = useMemo(() => {
-    const data = data24h || [];
-    return drpOption({ data });
-  }, [data24h, st]);
-
-  return (
-    <ReactEcharts
-      option={option}
-      style={{ height: '100%', width: '100%', overflow: 'hidden' }}
-    />
-  )
-}
-
-export default React.memo(DrpChart24H);
diff --git a/src/views/Home/panels/homePanels/rightPanels/HD24H/LabelDrp.js b/src/views/Home/panels/homePanels/rightPanels/HD24H/LabelDrp.js
deleted file mode 100644
index a83a22e..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/HD24H/LabelDrp.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import clsx from 'clsx';
-import React from 'react'
-import { useDispatch } from 'react-redux';
-import { drpShColor } from '../../../../../../utils/renutils';
-
-function LabelDrp({ st, activest }) {
-  const dispatch = useDispatch();
-
-  const active = st.stcd === activest?.stcd;
-  const hasAction = !active && st.type !== 'pub';
-
-  return (
-    <span
-      key={'drp' + st.stcd}
-      className={clsx({
-        active,
-        'cursor-pointer': hasAction
-      })}
-      onClick={hasAction ? (() => dispatch.overallview.setActiveSt24H({ type: 'drp', stcd: st.stcd })) : undefined}
-    >
-      <span title={st.stnm} style={{display:"inline-block",width: "80px", whiteSpace:"nowrap", overflow: "hidden", textOverflow:"ellipsis"}}>{st.stnm}</span>
-      {
-        st.state === 1 ? (
-          <span
-            className="value"
-            style={{ marginLeft: 8, color: drpShColor(st.h24) }}
-          >⚪</span>
-        ) : null
-      }
-    </span>
-  )
-}
-
-export default LabelDrp
diff --git a/src/views/Home/panels/homePanels/rightPanels/HD24H/LabelRz.js b/src/views/Home/panels/homePanels/rightPanels/HD24H/LabelRz.js
deleted file mode 100644
index 9f78785..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/HD24H/LabelRz.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import clsx from 'clsx';
-import React from 'react'
-import { useDispatch } from 'react-redux';
-
-function LabelRz({ st, activest }) {
-  const dispatch = useDispatch();
-
-  const active = st.stcd === activest?.stcd;
-  const hasAction = !active && st.type !== 'pub';
-
-  return (
-    <span
-      key={'rz' + st.stcd}
-      className={clsx({
-        active,
-        'cursor-pointer': hasAction
-      })}
-      onClick={hasAction ? (() => dispatch.overallview.setActiveSt24H({ type: 'rz', stcd: st.stcd })) : undefined}
-    >
-      <span title={st.stnm} style={{display:"inline-block",width: "80px", whiteSpace:"nowrap", overflow: "hidden", textOverflow:"ellipsis"}}>{st.stnm}</span>
-      <span
-        className={clsx({
-          value: true,
-          red: st.trend > 0,
-          green: st.trend < 0,
-          white: st.trend === 0,
-        })}
-        style={{ marginLeft: 8 }}
-      >{st.rz}</span>
-      <span>m</span>
-    </span>
-  )
-}
-
-export default LabelRz
diff --git a/src/views/Home/panels/homePanels/rightPanels/HD24H/drpOption.js b/src/views/Home/panels/homePanels/rightPanels/HD24H/drpOption.js
deleted file mode 100644
index 4093709..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/HD24H/drpOption.js
+++ /dev/null
@@ -1,160 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-
-export default function drpOption({ data, grid, title }) {
-  let totalDrp = 0;
-  const data2 = data.reduce((pre, cur) => {
-    totalDrp += cur.drp;
-    pre.push({
-      ...cur,
-      totalDrp,
-    });
-    return pre;
-  }, []);
-
-  const DRPLEVEL = [10, 25, 50, 100, 250];
-  const maxVal = DRPLEVEL.find(o => o > totalDrp);
-
-  return {
-    title: title ? {
-      text: title,
-      textStyle: {
-        color: '#333',
-        fontSize: 14,
-        fontWeight: 'normal'
-      },
-      left: 8,
-      top: 16,
-    } : null,
-    tooltip: {
-      trigger: 'axis',
-      formatter: function (params) {
-        var res = `${params[0].name.substr(0, 16)}时<br />降雨: ${params[0].data}mm<br />累计降雨: ${params[1].data}mm`;
-        return res;
-      }
-    },
-    grid: grid || {
-      top: "11%",
-      left: "8%",
-      right: "7%",
-      bottom: "3%",
-      containLabel: !0,
-      borderWidth: 0
-    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        data: data2.map(o => o.tm),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 9,
-          //textShadowBlur: 4,
-          //textShadowColor: '#6ab',
-          formatter: val => val.substr('2020-'.length, 11)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'right',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 10,
-          //textShadowBlur: 4,
-          //textShadowColor: '#6ab',
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: 0,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        name: '降雨',
-        type: 'bar',
-        barWidth: '60%',
-        data: data2.map(o => o.drp),
-        itemStyle: {
-          normal: {
-            barBorderRadius: [3, 3, 0, 0],
-            color: new echarts.graphic.LinearGradient(
-              0, 0, 0, 1,
-              [
-                { offset: 0, color: '#3876cd' },
-                { offset: 0.5, color: '#45b4e7' },
-                { offset: 1, color: '#54ffff' }
-              ]
-            ),
-          },
-        },
-        label: {
-          show: false,
-        },
-        markPoint: {
-          data: [
-            { type: 'max', name: '最大值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, -12] },
-          ]
-        },
-      },
-      {
-        name: '累计降雨',
-        type: 'line',
-        showSymbol: false,
-        label: {
-          show: false,
-        },
-        data: data2.map(o => o.totalDrp),
-        lineStyle: {
-          normal: {
-            width: 1,
-          }
-        },
-        areaStyle: {
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-              offset: 0,
-              color: 'rgba(3, 194, 236, 0.3)'
-            }, {
-              offset: 0.8,
-              color: 'rgba(3, 194, 236, 0)'
-            }
-            ], false),
-            shadowColor: 'rgba(0, 0, 0, 0.1)',
-            shadowBlur: 10
-          }
-        },
-        itemStyle: {
-          normal: {
-            color: '#03C2EC'
-          }
-        },
-      }
-    ]
-  };
-}
diff --git a/src/views/Home/panels/homePanels/rightPanels/HD24H/index.js b/src/views/Home/panels/homePanels/rightPanels/HD24H/index.js
deleted file mode 100644
index 2f58e00..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/HD24H/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, {useEffect, useState} from 'react'
-import {useDispatch, useSelector} from 'react-redux';
-import LabelDrp from './LabelDrp';
-import DrpChart24H from './DrpChart24H';
-
-export default function HD24H({data} ) {
-  const dispatch = useDispatch();
-
-  const activeSt24H = useSelector(s => s.overallview.activeSt24H);
-  //const { data } = useRequest(OverallPromise.get, t);
-
-  const [rzst, setRzst] = useState(null);
-  const [drpst, setDrpst] = useState(null);
-
-  const [hasSt, setHasSt] = useState({});
-
-  useEffect(() => {
-    if(Object.keys(data).length>0){
-      if (activeSt24H?.type === 'rz') {
-        let rzst = data?.drpInfo?.importantRz?.find(o => o.stcd === activeSt24H.stcd && o.type != 'pub');
-        setRzst(rzst);
-      } else if (activeSt24H?.type === 'drp') {
-        let drpst = data?.drpInfo?.importantDrp?.find(o => o.stcd === activeSt24H.stcd && o.type != 'pub');
-        setDrpst(drpst);
-      }
-
-      setHasSt(rzst || drpst);
-    }
-  }, [data, activeSt24H]);
-
-  //console.log("23+++++",data);
-
-  useEffect(() => {
-    dispatch.overallview.setActiveSt24H({ type: 'rz', stcd: data?.drpInfo?.importantRz[0]?.stcd })
-  }, [data?.drpInfo?.importantRz]);
-
-  useEffect(() => {
-    dispatch.overallview.setActiveSt24H({ type: 'drp', stcd: data?.drpInfo?.importantDrp[0]?.stcd })
-  }, [data?.drpInfo?.importantDrp]);
-
-  return (
-    <div style={{height:"150px",padding:"0 10px 0 20px"}}>
-      <div>
-        <span className="card-group">
-          {
-            data?.drpInfo?.importantDrp?.map(o => <LabelDrp  key={o.stcd} st={o} activest={drpst} />)
-          }
-        </span>
-      </div>
-
-      {/*{
-        !hasSt ? (
-          <div style={{ color: '#333', height: '99%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-            未选择测站
-          </div>
-        ) : null
-      }*/}
-      {
-        drpst ? (<DrpChart24H st={drpst} />) : null
-      }
-    </div>
-  )
-}
diff --git a/src/views/Home/panels/homePanels/rightPanels/WsRz/ExportData.js b/src/views/Home/panels/homePanels/rightPanels/WsRz/ExportData.js
deleted file mode 100644
index 34dbfd4..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/WsRz/ExportData.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import moment from 'moment';
-import React from 'react';
-
-
-export default class ExportData extends React.Component {
-
-  test = () => {
-    this.refs.iframe.contentWindow.test();
-  }
-
-  exportXlsx = (tm, data) => {
-    const title = '数据' + tm.format('YYYY-MM-DD HH:00:00');
-
-    const obj = {};
-    const trendE = (val) => {
-      if (val > 0) { return '涨'; }
-      if (val < 0) { return '降'; }
-      if (val === 0) { return '平'; }
-    }
-    for (const cat in data) {
-      const catdata = data[cat];
-
-      const curdata2 = catdata.map(st => ({
-        测站: st.stnm,
-        上报时间: moment(st.tm).format('YYYY-MM-DD HH:mm'),
-        水位: st.rz,
-        水势: trendE(st.trend)
-      }));
-
-      if (curdata2.length) {
-        obj[cat] = {
-          data: curdata2,
-          cols: ['测站', '上报时间', '水位', '水势']
-        };
-      }
-    }
-
-    this.refs.iframe.contentWindow.exportXlsx(title, JSON.stringify(obj));
-  }
-
-  render() {
-    return (
-      <div style={{ position: 'absolute', top: 0, left: 0 }}>
-        {/*<iframe
-          title="exportexcel"
-          style={{ width: 1, height: 1, overflow: 'visible' }}
-          ref="iframe"
-          src="/iframe/exportexcel.html"
-          width="100%"
-          height={8}
-          scrolling="no"
-          frameBorder="0"
-        />*/}
-      </div>
-    );
-  }
-}
diff --git a/src/views/Home/panels/homePanels/rightPanels/WsRz/_.js b/src/views/Home/panels/homePanels/rightPanels/WsRz/_.js
deleted file mode 100644
index 0afab04..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/WsRz/_.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import moment from "moment";
-import { queryTitleApi, queryDetailsApi } from "../../../../../../service/homePage.js";
-
-//外协接口
-export async function realWX() {
-  const tm = moment();
-
-  const { data } = await queryTitleApi() || [];
-  //console.log("39+++",data);
-
-  let objData = {};
-
-  if (!data) {
-    return null;
-  }
-
-  if(data.length>0){
-    data.map((item)=>{
-      objData[item.rvnm] = item.list;
-    });
-  }
-
-  const ret = {};
-  //console.log("objData 54+++",objData);
-  const reals = await queryDetailsApi() || [];
-  const rzMap = reals.reduce((total, cur) => { total[cur.stcd + cur.source] = cur; return total; }, {});
-  //console.log("rzMap 57++++",rzMap);
-  for (const ws in objData) {
-    const rzlist = objData[ws]?.map(({ stcd, source }) => rzMap[stcd + source]).filter(Boolean);
-
-    if (rzlist?.length > 0) {
-      ret[ws] = rzlist;
-    }
-  }
-
-  return {
-    tm,
-    data: ret
-  };
-}
\ No newline at end of file
diff --git a/src/views/Home/panels/homePanels/rightPanels/WsRz/index.tsx b/src/views/Home/panels/homePanels/rightPanels/WsRz/index.tsx
deleted file mode 100644
index f8b6e80..0000000
--- a/src/views/Home/panels/homePanels/rightPanels/WsRz/index.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import React, {useMemo, useState, useRef, useEffect} from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import clsx from 'clsx';
-import {Table, Button, message} from 'antd';
-import {
-  DownloadOutlined,
-} from '@ant-design/icons';
-import { ColumnsType } from 'antd/lib/table';
-import useRefresh from '../../../../../../utils/useRefresh';
-import useRequest from '../../../../../../utils/useRequest';
-import { realWX } from './_';
-import ExportData from './ExportData';
-import {config} from "../../../../../../config";
-import moment from "moment"
-import {divIcon} from "leaflet";
-
-type kqInfo={
-  stnm:string;
-  tm:string;
-  rz:string;
-  trend:number;
-}
-
-type IProps = {}
-
-const WsRzPage: React.FC<IProps> = () => {
-
-  const t = useRefresh(60 * 1000);
-  // @ts-ignore
-  const { data } = useRequest(realWX, t);
-  const [cat, setCat] = useState(0);
-  const downloadRef = useRef();
-  const dispatch = useDispatch();
-  //console.log("31+++++",data);
-  const TrendRender = (data:any) => {
-    if (typeof data.WPTN !== 'number') {
-      return null;
-    }
-
-    if (data.trend > 0) {
-      return <span style={{ color: '#f00', fontSize:"20px", fontWeight:"bold" }}>⇧</span>
-    } else if (data.trend < 0) {
-      return <span style={{ color: '#0f0', fontSize:"20px", fontWeight:"bold" }}>⇩</span>
-    } else if (data.trend === 0) {
-      return <span style={{ color: '#333', fontSize:"20px", fontWeight:"bold" }}>-</span>
-    }
-  };
-
-  const download = () => {
-    if (!data?.data) {
-      message.info("暂无可下载数据！");
-      return;
-    }
-    // @ts-ignore
-    downloadRef.current.exportXlsx(data.tm, data.data);
-  }
-
-  const [tableData, setTableData] = useState([]);
-  const showWs = (idx:any) => {
-    if (cat !== idx) {
-      setCat(idx);
-    }
-
-    const ws = Object.keys(data?.data || {})[idx];
-    //console.log("showWs",data);
-    if (!ws) {
-      return;
-    }
-    // @ts-ignore
-    const stlist = data.data[ws];
-    if (!stlist) {
-      return;
-    }
-    //console.log("stlist",stlist);
-    setTableData(stlist);
-
-    /*dispatch.map.highlightFeatures(stlist.map((o:any) => ({
-      type: 'RealHDPop',
-      props: o,
-    })));*/
-  };
-
-  useEffect(() => {
-    showWs(0);
-  }, [data]);
-
-  const columns = useMemo<ColumnsType<kqInfo>>(() => [
-    { title: '测站', key: 'stnm', width:100, dataIndex: 'stnm', ellipsis: true, align:"center" },
-    { title: '上报时间', key: '', width:75, dataIndex: '', ellipsis: true, align:"center", render: rec=> <div title={moment(rec.tm).format('YYYY-MM-DD HH:mm')}>{moment(rec.tm).format('MM-DD HH:mm')}</div> },
-    { title: '水位', key: 'z', width:60, dataIndex: 'z' , align:"center"},
-    { title: '水势', key: '', width:60, dataIndex: '' , align:"center", render: rec=> TrendRender(rec)},
-  ], []);
-
-  return (
-    <div style={{width:"92%",marginLeft:"4%", position:"relative"}}>
-      <div style={{marginBottom:"6px"}}>
-        <span className="card-group">
-          {
-            Object.keys(data?.data || {}).map((wsnm, index) => (
-              <span
-                key={wsnm}
-                className={clsx({
-                  active: index === cat,
-                  'cursor-pointer': true,
-                })}
-                onClick={() => showWs(index)}
-              >
-                <span>{wsnm}</span>
-              </span>
-            ))
-          }
-        </span>
-      </div>
-
-      <div className="smallTable" style={{cursor:"pointer"}}>
-        <Table
-          rowKey="stcd"
-          columns={columns}
-          // @ts-ignore
-          dataSource={tableData}
-          scroll={{ y: data?.data?100:130 }}
-          pagination={false}
-          onRow={
-            (record:any)=>({
-              onClick:()=>{
-                dispatch.map.setLayerVisible({"HdswLayer":true});
-                dispatch.runtime.setCameraTarget({
-                  center: [record.lgtd, record.lttd],
-                  zoom: 15,
-                  pitch: config.poiPitch,
-                });
-              }
-            })
-          }
-        />
-      </div>
-    </div>
-  )
-};
-
-export default WsRzPage
diff --git a/src/views/Home/rainfallForecastLatest/index.less b/src/views/Home/rainfallForecastLatest/index.less
deleted file mode 100644
index 3be910a..0000000
--- a/src/views/Home/rainfallForecastLatest/index.less
+++ /dev/null
@@ -1,73 +0,0 @@
-.rainfallForecastIndexPageBox{
-  width: 530px;
-  padding: 10px 0 0 10px;
-  //left: 32.2vw;
-  right: 49.5vw;
-  position: fixed;
-  height: 60px;
-  background: #fff;
-  z-index: 101;
-  //top: 115px;
-  bottom: 13px;
-  box-shadow: 1px 2px 10px #bdbaba;
-  box-sizing: border-box;
-  border-radius:6px;
-  zoom: 0.8;
-  >div{
-    background: #fff;
-  }
-  .topTab{
-    height: 50px;
-    padding: 5px 10px 0 10px;
-    border-radius: 6px;
-  }
-
-  .rainfallForecastBoxColorBox{
-    width:290px;
-    >div{
-      width:26px;
-      height:15px;
-      margin-top:8px;
-      text-align: center;
-      span{
-        display:inline-block;
-        margin:5px 0 0 0;
-        line-height: 40px;
-        width:26px;
-        text-align: center;
-        font-size: 12px;
-      }
-      &:nth-child(1){
-        background:#A3A8AF;
-      }
-      &:nth-child(2){
-        background:#81CD71;
-      }
-      &:nth-child(3){
-        background:#6EC569;
-      }
-      &:nth-child(4){
-        background:#68C19A;
-      }
-      &:nth-child(5){
-        background:#5DB7C6;
-      }
-      &:nth-child(6){
-        background:#5FABD9;
-      }
-      &:nth-child(7){
-        background:#6199DC;
-      }
-      &:nth-child(8){
-        background:#6488E0;
-      }
-      &:nth-child(9){
-        background:#6973E4;
-      }
-      &:nth-child(10){
-        background:#B24A97;
-      }
-    }
-  }
-}
-
diff --git a/src/views/Home/rainfallForecastLatest/index.tsx b/src/views/Home/rainfallForecastLatest/index.tsx
deleted file mode 100644
index 466d022..0000000
--- a/src/views/Home/rainfallForecastLatest/index.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import {Slider, Button, message, DatePicker, Radio, Select} from 'antd'
-import {
-  PlayCircleOutlined, PauseCircleOutlined, RollbackOutlined
-} from '@ant-design/icons';
-import {useDispatch, useSelector} from 'react-redux';
-import {
-  getListFileRainfallForecastApi, getRealTimeRainfallForecastPicApi
-} from "../../../service/meteorology";
-import ImageLayer from 'ol/layer/Image.js';
-import moment from "moment";
-import "./index.less"
-import {Raster as RasterSource, Stamen, ImageStatic, Vector as VectorSource} from 'ol/source.js';
-import GeoJSONFormat from "ol/format/GeoJSON";
-import Feature from "ol/Feature";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import StrokeStyle from "ol/style/Stroke";
-import FillStyle from "ol/style/Fill";
-
-const { Option } = Select;
-
-type IProps = {
-
-}
-
-const Index: React.FC<IProps> = ({ }) => {
-  const dispatch = useDispatch();
-
-  let mapObj = useSelector((s:any) => s.map.map);
-
-  const [radarImgAllData, setRadarImgAllData] = useState([]);
-  const [imageExtentData, setImageExtentData] = useState([]);
-  const [timeData, setTimeData] = useState("");
-
-  //"20231105"
-  const [selectTime, setSelectTime] = useState(moment().format("YYYYMMDD"));
-
-  // @ts-ignore
-  const getPicFun = async (time) => {
-    //getRadarReflectionWavePicApi  2023-11-02 00:04:18
-    const picData = await getRealTimeRainfallForecastPicApi({tm:time});
-
-    let picArray:any = [];
-    if(picData.data){
-      if(picData.data.layers && picData.data.layers.length>0){
-        // @ts-ignore
-        picData.data.layers.map((item)=>{
-          picArray.push(item.url);
-        });
-      }
-    }
-    setRadarImgAllData(picArray);
-
-    setImageExtentData(picData.data?picData?.data.extent:[]);
-  };
-
-  const getData = async () => {
-    console.log("60 雨量预报",selectTime);
-    const resData = await getListFileRainfallForecastApi({tm:selectTime});
-    if(resData.code === 200){
-      if(resData.data && resData.data.length>0){
-        let lastItem = resData.data[resData.data.length-1];
-        setTimeData(lastItem.tm.substring(11));
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectTime){
-      getData();
-    }
-  }, [selectTime]);
-
-  useEffect(() => {
-    if(timeData){
-      // @ts-ignore
-      getPicFun(selectTime + timeData.replace(/:/g, ''));
-    }
-  }, [timeData]);
-
-  useEffect(() => {
-    if(mapObj){
-      //console.log("156+++",radarImgAllData);
-      if(radarImgAllData.length>0) {
-        //console.log("210+++",num, radarImgAllData[(num/10)-1]);
-        let sourcesObj = new ImageStatic({
-            // @ts-ignore
-            url:"serviceRadar/radarpic/" + radarImgAllData[17],
-            projection: 'EPSG:4326',
-            imageExtent: imageExtentData,
-            interpolate: false
-          });
-
-        const sateCloudLayer = new ImageLayer({
-          source: sourcesObj,
-          opacity:0.65,
-          // @ts-ignore  "radarFLayerIndex"
-          name: "radarFLayerIndex",
-          id:"radarFLayerIndex",
-        });
-
-        mapObj.addLayer(sateCloudLayer);
-      }
-    }
-  }, [radarImgAllData, mapObj]);//radarImgData, mapObj
-
-  const getGeoJsonData = async () => {
-    const radarRangeData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/${localStorage.getItem('address')}/radarRange.geojson`)
-      .then(resp => resp.json())
-      .then(data => data.features)
-      .catch(() => []);
-
-    return [...radarRangeData];
-  };
-
-  useEffect(() => {
-    if(mapObj){
-      dispatch.map.setLayerVisible({"RadarLayer": true});
-
-      getGeoJsonData().then((data) => {
-        const geojsonFormat = new GeoJSONFormat();
-        let geometry = geojsonFormat.readGeometry(data[0].geometry, {
-          featureProjection: 'EPSG:3857',
-        });
-        const feature = new Feature({
-          geometry
-        });
-
-        var vectorSource = new VectorSource({
-          features: [feature]
-        });
-
-        var layer =  new VectorLayer({
-          // @ts-ignore
-          name:"radarRange",
-          source: vectorSource,
-          style: new Style({
-            stroke: new StrokeStyle({
-              color: '#11B7CD',
-              width: 1,
-            }),
-            fill: new FillStyle({
-              color: 'transparent',
-            }),
-          })
-        });
-        mapObj.addLayer(layer);
-      });
-    }else{
-      dispatch.map.setLayerVisible({"RadarLayer": false});
-
-      mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> {
-        if( (layer.values_.name) && (layer.values_.name).indexOf("radarRange") !== -1 ){
-          mapObj.removeLayer(layer);
-        }
-      })
-    }
-  }, [mapObj]);
-
-  return (
-    <>
-      {/*<div className="rainfallForecastIndexPageBox">
-        <div className="topTab">
-          <div className="lf datePickerBox" style={{width:"185px"}}>
-            <span className="lf" style={{lineHeight:"35px"}}>日期：</span>
-            <div className="lf" style={{lineHeight:"35px"}}>
-              {moment().format('YYYY-MM-DD HH:mm:ss')}
-            </div>
-          </div>
-          <div className="rainfallForecastBoxColorBox lf" style={{margin:"0 0 0 20px"}}>
-            <div className="lf"><span>0.1</span></div>
-            <div className="lf"><span>5</span></div>
-            <div className="lf"><span>10</span></div>
-            <div className="lf"><span>17.5</span></div>
-            <div className="lf"><span>25</span></div>
-            <div className="lf"><span>37.5</span></div>
-            <div className="lf"><span>50</span></div>
-            <div className="lf"><span>75</span></div>
-            <div className="lf"><span>90</span></div>
-            <div className="lf"><span>100</span></div>
-            <div className="lf"><span style={{fontSize:"16px", lineHeight:"34px"}}> mm </span></div>
-          </div>
-        </div>
-      </div>*/}
-    </>
-  )
-}
-
-export default Index;
diff --git a/src/views/Home/setMapStation/drp.js b/src/views/Home/setMapStation/drp.js
deleted file mode 100644
index a8cbe9c..0000000
--- a/src/views/Home/setMapStation/drp.js
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
-import React, { useEffect, useState } from "react";
-import {useDispatch, useSelector} from "react-redux";
-import { message } from 'antd';
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import Icon from "ol/style/Icon";
-import Text from "ol/style/Text";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import Circle from 'ol/style/Circle';
-import Stroke from "ol/style/Stroke";
-import FillStyle from "ol/style/Fill";
-import { transform } from 'ol/proj';
-import { httppost2 } from "../../../utils/request";
-import apiurl from "../../../service/apiurl";
-
-export default function SetDrpStation({tms, setTableData}) {
-    const dispatch = useDispatch();
-    let mapObj = useSelector(s => s.map.map)
-
-    const getData = async (tms) =>{
-        const { data, code, msg } = await httppost2(apiurl.home.yq,{
-            "stm": tms[0],
-            "etm": tms[1]
-        })
-        if (code !== 200) {
-            message.error(msg || '请求失败');
-        }
-        const list = data.map((i)=>{
-          return {
-            id : i.stcd,
-            ...i,
-            drp : i.drp ,//i.v,
-          }
-        })
-        addLayer(list||[],tms||[])
-        setTableData(list||[])
-
-    }
-    useEffect(()=>{
-        getData(tms)
-
-        return ()=>{
-            mapObj && mapObj.getLayers().getArray().forEach(layer => {
-            if ( layer.values_.name && (layer.values_.name.indexOf('ZHZS_YQ') > -1)) {
-                    layer.getSource().clear()
-                }
-            })
-        }
-    },[tms])
-
-    const getColor = (val)=>{
-        if(val===null){
-          return '#8c8c8c'
-        }else if(val<0.1){
-            return '#ffffff'
-        }else if(val>=0.1 && val<10){
-            return 'rgb(167, 240, 143)';
-        }else if(val>=10 && val<25){
-            return 'rgb(64, 215, 255)';
-        }else if(val>=25 && val<50){
-            return 'rgb(32, 143, 238)';
-        }else if(val>=50 && val<100){
-            return 'rgb(85, 86, 255)';
-        }else if(val>=100 && val<250){
-            return 'rgb(191, 90, 252)';
-        }else{
-            return 'rgb(246, 66, 66)';
-        }
-    }
-
-
-    const addLayer = (arr,tms)=>{
-        var layer = new VectorLayer({
-          // @ts-ignore 
-          name:"ZHZS_YQ",
-          source: new VectorSource(),
-          style: (feature,zIndex) =>{
-            const drp = feature.values_.data.drp
-            const stnm = feature.values_.data.stnm
-              return [new Style({
-                image: new Circle({
-                  radius: 5,
-                  fill: new FillStyle({ color: getColor(drp) }),
-                  stroke: new Stroke({ color: getColor(drp), width: 2 })
-                }),
-                text: new Text({
-                  text: zIndex<50?`${stnm}`:'',
-                  offsetY: 24,
-                  font: '12px 微软雅黑',
-                  //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-                  fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-                  stroke: new Stroke({ color: '#fff', width: 1 }),
-                  overflow: true,
-                }),
-                zIndex: drp===0?0.01:drp*10
-              })]
-            },
-            zIndex:200,
-        })
-    
-        var layerDrp = new VectorLayer({
-          // @ts-ignore
-          name:"ZHZS_YQ_DRP",
-          visible:true,
-          source: new VectorSource(),
-          style: (feature,zIndex) =>{
-            const drp = feature.values_.data.drp
-              return [new Style({
-                text: new Text({
-                  text: drp===null?'-':String(drp),
-                  offsetY: 12,
-                  font: '12px 微软雅黑',
-                  //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-                  fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-                  stroke: new Stroke({ color: '#fff', width: 1 }),
-                  overflow: true,
-                })
-              })]
-            },
-            zIndex:200,
-        })
-    
-      
-    
-        const features = arr.map((item)=>{
-          const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857');
-          const feature = new Feature({
-            geometry: new Point(point2),
-            data:{...item,myParams:tms,myLayerType:'drp'}
-          });
-    
-          return feature
-        })
-        features.forEach(feature => layer.getSource().addFeature(feature));
-        features.forEach(feature => layerDrp.getSource().addFeature(feature));
-        mapObj && mapObj.addLayer(layer);
-        mapObj && mapObj.addLayer(layerDrp);
-        
-        mapObj && mapObj.on('click', function(evt) {
-    
-          //console.log("271++++",postmessageData);
-    
-          var feature = mapObj && mapObj.forEachFeatureAtPixel(evt.pixel, function(feature) {
-            return feature;
-          });
-          if (feature) {
-            const data = feature.values_.data
-            if(data && data.myLayerType==='drp'){
-              dispatch.runtime.setFeaturePop({
-                id: data.stcd,
-                data:{...data,myParams:tms},
-                type: 'drp',
-                lgtd: data.lgtd,
-                lttd: data.lttd,
-              })
-            }
-          }
-        });
-      }
-
-}
-
-
diff --git a/src/views/Home/setMapStation/wxq.js b/src/views/Home/setMapStation/wxq.js
deleted file mode 100644
index dbc49c3..0000000
--- a/src/views/Home/setMapStation/wxq.js
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-import React, { useEffect, useState } from "react";
-import {useDispatch, useSelector} from "react-redux";
-import { message } from 'antd';
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import Icon from "ol/style/Icon";
-import Text from "ol/style/Text";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import Circle from 'ol/style/Circle';
-import Stroke from "ol/style/Stroke";
-import FillStyle from "ol/style/Fill";
-import GeoJSONFormat from 'ol/format/GeoJSON';
-import StrokeStyle from "ol/style/Stroke";
-
-import { transform } from 'ol/proj';
-import { httppost2 } from "../../../utils/request";
-import { geometryCenter } from '../../../utils/tools'
-import apiurl from "../../../service/apiurl";
-
-export default function SetDrpStation({tms}) {
-    const dispatch = useDispatch();
-    let mapObj = useSelector(s => s.map.map)
-
-    const getData = async (tms) =>{
-        const { data, code, msg } = await httppost2(apiurl.home.wxq)
-        if (code !== 200) {
-            message.error(msg || '请求失败');
-        }
-    }
-    useEffect(()=>{
-        addLayer()
-        return ()=>{
-            mapObj && mapObj.getLayers().getArray().forEach(layer => {
-            if ( layer.values_.name && (layer.values_.name.indexOf('ZHZS_WXQ') > -1)) {
-                    layer.getSource().clear()
-                }
-            })
-        }
-    },[])
-
-    const getGeoJsonData = async () => {
-      const radarRangeData = await fetch(`${process.env.PUBLIC_URL}/data/geojson/macheng/wxq.geojson`)
-        .then(resp => resp.json())
-        .then(data => data.features)
-        .catch(() => []);
-
-      const wxq = {}
-      radarRangeData.map((item)=>{
-        wxq[item.properties.ADCD] = item
-      })
-      sessionStorage.setItem('wxq',JSON.stringify(wxq))
-      return [...radarRangeData];
-    };
-
-
-
-    const addLayer = ()=>{
-      getGeoJsonData().then((data) => {
-        var layer =  new VectorLayer({
-          // @ts-ignore
-          name:"ZHZS_WXQ",
-          source: new VectorSource(),
-          style: new Style({
-            stroke: new StrokeStyle({
-              color: 'rgba(255,0,0,0.9)',
-              width: 2,
-            }),
-            fill: new FillStyle({
-              color: 'rgba(255,0,0,0.3)',
-            }),
-          })
-        });
-
-        const features = data.map((item)=>{
-          // debugger
-          const geojsonFormat = new GeoJSONFormat();
-          let geometry = geojsonFormat.readGeometry(item.geometry, {
-            featureProjection: 'EPSG:3857',
-          });
-          const feature = new Feature({
-            geometry,
-            data:{...item.properties,geometry:item.geometry,myLayerType:'wxq'},
-          });
-    
-          return feature
-        })
-
-        features.forEach(feature => layer.getSource().addFeature(feature));
-        mapObj && mapObj.addLayer(layer);
-
-        mapObj && mapObj.on('click', function(evt) {
-    
-          //console.log("271++++",postmessageData);
-    
-          var feature = mapObj && mapObj.forEachFeatureAtPixel(evt.pixel, function(feature) {
-            return feature;
-          });
-          if (feature) {
-            const data = feature.values_.data
-
-            const center = geometryCenter(data.geometry);
-            if(data && data.myLayerType==='wxq'){
-
-              dispatch.runtime.setCameraTarget({
-                center: [center[0], center[1]],
-                zoom: 18,
-                pitch: 60
-              })
-              dispatch.runtime.setFeaturePop({
-                id: data.PID,
-                data:{...data},
-                type: 'wxq',
-                lgtd: center[0],
-                lttd: center[1],
-              })
-            }
-          }
-        });
-
-      });
-      }
-
-}
-
-
diff --git a/src/views/Home/staticData.js b/src/views/Home/staticData.js
deleted file mode 100644
index 9ea36ed..0000000
--- a/src/views/Home/staticData.js
+++ /dev/null
@@ -1,4043 +0,0 @@
-const systemSwitchType = localStorage.getItem('address') && localStorage.getItem('address')==="wufeng";
-
-const staticData = {
-  //首页情况介绍
-  qkjsData: systemSwitchType?
-    {
-      jbqk:"五峰土家族自治县位于东经 110°15′～111°25′，北纬29°56′～30°25′之间，居湖北省西南部，东距省会武汉市 481km，东邻宜都市、松滋市，西倚鹤峰县、南交湖南石门县，北与长阳土家族自治县毗连，县城是五峰镇...",
-      sdly:"湾潭河位于五峰土家族自治县西南部，流域所属行政区划为湾潭镇，界于北纬 29°56'至 30°9'，东经 110°17'至 110°35'。湾潭镇东邻五峰镇，东南与湖南省石门县毗邻，南与鹤峰县五里乡相邻，西与鹤峰县燕子乡接壤，北与采花乡、牛庄乡相连，行政区域面积 338.89km2..."
-    }:
-    {
-      jbqk:"建始县位于鄂西南山区北部，跨北纬 30°06′~30°54′，东经 109°32′~110°12′，东连巴东县，以野三河为界；西接恩施市，以太阳河为界；南邻鹤峰县，以长河、茶寮河为界；北与重庆市巫山县毗连；西北与重庆市奉节、巫山两县接壤。县城业州镇沿 318 国道距省会武汉市 615km，沿 209 国道距州府所在地恩施市区59km...",
-      sdly:"广润河流域主要位于县域西北部的业州镇境内，流域地处东经109°32′～110°12′，北纬 30°06′～30°54′。业州镇北与重庆市巫山县、奉节县接壤，西南面与恩施州为邻，东与长梁乡、三里乡相通。辖区总面积 372km2。地势呈西北向东南倾斜，境内中部、中南部低山与丘陵地带大部分海拔在 410～800m 之间；镇西北太平峰是全县的最高点，海拔 2090m..."
-    },
-  //首页情况介绍-调查评价
-  dcpjData: systemSwitchType?
-    [
-      {adcd:"420529000000000", adnm:"五峰县", fzqmj:"0",}
-    ]:
-    [
-      {adcd:"422822000000000", adnm:"建始县", fzqmj:"0",}
-    ],
-  /*首页-24小时综述-待处理预警信息弹窗数据*/
-  warnInfo: systemSwitchType?
-    [
-      {
-        id:1,
-        "name": "湾潭镇龙桥村准备转移预警",
-        "administrativeVillage": "湾潭镇龙桥村",
-        "adcd":"420529115201",
-        "lgtd":110.434708,
-        "lttd":30.046162,
-        "tm": "2022-10-20 09:05:00",
-        "status": 0,// 预警状态：//0 新产生 10 已内部告警 20 已外部告警 30 关闭预警 40灾情上报
-        yjdj: 0,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 0, // 预警类型：0 雨量监测预警   1 水位监测预警
-        "sjly": "sh", // 数据来源：sh 山洪 sw 水文 qx 气象 sk 水库
-      },
-      {
-        id:2,
-        "name": "湾潭镇九门村立即转移预警",
-        "administrativeVillage": "湾潭镇九门村",
-        "adcd":"420529115202",
-        "lgtd":110.440804,
-        "lttd":30.011232,
-        "tm": "2022-10-20 09:15:00",
-        "status": 0,
-        yjdj: 1,// 水位监测预警只有立即转移
-        "yjlx": 1,
-        "sjly": "sh",
-      },
-      {
-        id:3,
-        "name": "湾潭镇红旗坪村准备转移预警",
-        "administrativeVillage": "湾潭镇红旗坪村",
-        "adcd":"420529115206",
-        "lgtd":110.402603,
-        "lttd":30.00428,
-        "tm": "2022-10-20 08:05:00",
-        "status": 10,
-        yjdj: 0,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 0,
-        "sjly": "sw",
-      },
-      {
-        id:4,
-        "name": "湾潭镇三台坡村准备转移预警",
-        "administrativeVillage": "湾潭镇三台坡村",
-        "adcd":"420529115207",
-        "lgtd":110.370171,
-        "lttd":30.078951,
-        "tm": "2022-10-20 08:05:00",
-        "status": 10,
-        yjdj: 0,
-        "yjlx": 0,
-        "sjly": "sw",
-      },
-      {
-        id:5,
-        "name": "湾潭镇小凤池村立即转移预警",
-        "administrativeVillage": "湾潭镇小凤池村",
-        "adcd":"420529115203",
-        "lgtd":110.415924,
-        "lttd":30.028696,
-        "tm": "2022-10-20 09:00:00",
-        "status": 20,
-        yjdj: 1,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 0,
-        "sjly": "sk",
-      },
-      {
-        id:6,
-        "name": "湾潭镇茶园村立即转移预警",
-        "administrativeVillage": "湾潭镇茶园村",
-        "adcd":"420529115209",
-        "lgtd":110.326927,
-        "lttd":30.007462,
-        "tm": "2022-10-20 08:05:00",
-        "status": 20,
-        yjdj: 1,// 水位监测预警只有立即转移
-        "yjlx": 1,
-        "sjly": "sk",
-      }
-    ]:
-    [
-      {
-        id:1,
-        "name": "猫儿坪村10组准备转移预警",
-        "administrativeVillage": "猫儿坪村",
-        "adcd":"422822100221000",
-        "level":6,
-        "lgtd":109.649268,
-        "lttd":30.580936,
-        "tm": "2022-10-20 09:05:00",
-        "status": 0,
-        yjdj: 0,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 1,
-        "sjly": "sh",
-      },
-      {
-        id:2,
-        "name": "大堰社区1组准备转移预警",
-        "administrativeVillage": "大堰社区",
-        "adcd":"422822100017000",
-        "level":6,
-        "lgtd":109.68355508,
-        "lttd":30.56274252,
-        "tm": "2022-10-20 09:15:00",
-        "status": 0,
-        yjdj: 0,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 0,
-        "sjly": "sh",
-      },
-      {
-        id:3,
-        "name": "柏腊树社区3组准备转移预警",
-        "administrativeVillage": "柏腊树社区",
-        "adcd":"422822100014000",
-        "level":6,
-        "lgtd":109.728304,
-        "lttd":30.613019,
-        "tm": "2022-10-20 08:05:00",
-        "status": 1,
-        yjdj: 1,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 1,
-        "sjly": "qx",
-      },
-      {
-        id:4,
-        "name": "马栏溪社区4组准备转移预警",
-        "administrativeVillage": "马栏溪社",
-        "adcd":"422822100013103",
-        "level":7,
-        "lgtd":109.706555,
-        "lttd":30.5843321,
-        "tm": "2022-10-20 08:05:00",
-        "status": 1,
-        yjdj: 1,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 0,
-        "sjly": "qx",
-      },
-      {
-        id:5,
-        "name": "野韭池村8组立即转移预警",
-        "administrativeVillage": "野韭池村",
-        "adcd":"422822100222107",
-        "level":7,
-        "lgtd":109.666744,
-        "lttd":30.5692089,
-        "tm": "2022-10-20 09:00:00",
-        "status": 2,
-        yjdj: 1,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 1,
-        "sjly": "sk",
-      },
-      {
-        id:6,
-        "name": "代陈沟村7组准备转移预警",
-        "administrativeVillage": "代陈沟村7组",
-        "adcd":"422822100223106",
-        "level":7,
-        "lgtd":109.65131957,
-        "lttd":30.60700224,
-        "tm": "2022-10-20 08:05:00",
-        "status": 2,
-        yjdj: 1,// 预警等级：0 准备转移   1 立即转移
-        "yjlx": 0,
-        "sjly": "sk",
-      },
-    ],
-  //首页-监测预警-小水库风险预警
-  smallReservoirRisk: systemSwitchType?
-    {
-      "stcd": "61009010",
-      "type": "sw",
-      "type2": "swsk",
-      "hasRz": true,
-      "stnm": "马渡河水库",
-      "adcd": "420525104206000",
-      "wscd": null,
-      "importancy": 0,
-      "lgtd": 110.541,
-      "lttd": 30.376,
-      "elev": null,
-      "damel": 304,
-      "dsflz": 300,
-      "fsltdz": 300,
-      "ddz": 270,
-      "zcxsw": 300,
-      "yuwai": false,
-      "drpTm": "2023-02-13T02:00:00.000Z",
-      "today": 0,
-      "h1": 0,
-      "h3": 0,
-      "h6": 0,
-      "h12": 0,
-      "h24": 2.5,
-      "h48": 2.5,
-      "drpState": 1,
-      "rz": 283.47,
-      "a_fsltdz": null,
-      "rzTm": "2023-02-13T02:00:00.000Z",
-      "rzWarning": 0,
-      "rzState": 1
-    }:
-    {
-      "stcd": "61007480",
-      "type": "sw",
-      "type2": "swsk",
-      "hasRz": true,
-      "stnm": "闸木水水库",
-      "adcd": null,
-      "wscd": null,
-      "importancy": 0,
-      "lgtd": 109.68136,
-      "lttd": 30.61984,
-      "elev": null,
-      "damel": 659,
-      "dsflz": 656.33,
-      "fsltdz": 0,
-      "ddz": 633,
-      "zcxsw": 655,
-      "yuwai": false,
-      "drpTm": "2022-12-06T03:00:00.000Z",
-      "today": 0,
-      "h1": 0,
-      "h3": 0,
-      "h6": 0,
-      "h12": 0,
-      "h24": 0,
-      "h48": 0,
-      "drpState": 1,
-      "rz": 642.53,
-      "a_fsltdz": null,
-      "rzTm": "2022-12-06T03:00:00.000Z",
-      "rzWarning": 0,
-      "rzState": 1,
-      "aRz": 642.53
-    },
-  //首页-监测预警-风险预警
-  riskInfo: systemSwitchType?
-    [
-      {
-        name:"长乐坪镇",
-        drp:"56.5",
-        veryLikely:[
-          {
-            name:"长乐坪社区",
-            drp:"61.03",
-          },
-          {
-            name:"苏家河村",
-            drp:"59.55",
-          }
-        ]
-      },
-      {
-        name:"牛庄乡",
-        drp:"79.5",
-        veryLikely:[
-          {
-            name:"集镇社区",
-            drp:"61.03",
-          },
-          {
-            name:"牛庄村",
-            drp:"59.55",
-          }
-        ]
-      }
-    ]:
-    [
-      {
-        name:"高坪镇",
-        drp:"56.5",
-        veryLikely:[
-          {
-            name:"桑园社区",
-            drp:"61.03",
-          },
-          {
-            name:"八角杜区",
-            drp:"59.55",
-          }
-        ]
-      },
-      {
-        name:"红岩寺镇",
-        drp:"79.5",
-        veryLikely:[
-          {
-            name:"桑园社区",
-            drp:"61.03",
-          },
-          {
-            name:"八角杜区",
-            drp:"59.55",
-          }
-        ]
-      }
-    ],
-  //首页-今日值班
-  duty: systemSwitchType?
-    {
-      "值班领导": "张韦-副局长-15071726767",
-      "值班人员": "顾劲松-群测群防员-13872672905",
-      "值班司机": "史红兵-职工-13872670955",
-    }:
-    {
-      "值班领导": "马友浩-副局长-13986863808",
-      "值班人员": "黄林-群测群防员-13581218166",
-      "值班司机": "/",
-    },
-  //预警核实-基础信息-预警防灾对象清单
-  yjfzdxData: systemSwitchType?
-    [
-      {name:"牛庄乡池南村一组", yjyl:"66", yjyzls:"", yyyz:"60"},
-      {name:"牛庄乡池南村二组", yjyl:"56", yjyzls:"", yyyz:"50"}
-    ]:
-    [
-      {name:"猫儿坪村一组", yjyl:"66", yjyzls:"", yyyz:"60"},
-      {name:"猫儿坪村二组", yjyl:"56", yjyzls:"", yyyz:"50"}
-    ],
-  //预警核实-基础信息、水位监测预警-关联站点
-  swGlzdData: systemSwitchType?
-    {stnm: "七道水（湾潭）", stcd: "61402050", place: "湖北省宜昌市五峰土家族自治县湾潭镇七道水"}:
-    {stnm: "桑园坝", stcd: "61008300", place: "湖北省恩施州建始县高坪镇桑园坝"},
-  //预警核实-基础信息、水位监测预警-关联站点、站点实时降雨数据
-  realDrpData: systemSwitchType?
-    [
-      // {
-      //   "stcd": "61009300",
-      //   "stnm": "石梁司（五峰镇）",
-      //   "adcd": "420529000000000",
-      //   "wscd": null,
-      //   "importancy": 0,
-      //   "lgtd": 110.6625,
-      //   "lttd": 30.1745,
-      //   "elev": null,
-      //   "hasRz": true,
-      //   "yuwai": false,
-      //   "type": "sh",
-      //   "today": 0,
-      //   "h1": 0,
-      //   "h3": 0,
-      //   "h6": 0,
-      //   "h12": 0,
-      //   "h24": 1.5,
-      //   "h48": 2,
-      //   "tm": "2023-03-01 06:00:00",
-      //   "state": 1,
-      //   "warning": 0,
-      //   place:"湖北省宜昌市五峰土家族自治县五峰镇石梁司"
-      // },
-      // {
-      //   "stcd": "61040420",
-      //   "stnm": "太平河（牛庄池南村）",
-      //   "adcd": "420529000000000",
-      //   "wscd": null,
-      //   "importancy": 0,
-      //   "lgtd": 110.3336111,
-      //   "lttd": 30.20694444,
-      //   "elev": null,
-      //   "hasRz": false,
-      //   "yuwai": false,
-      //   "type": "sh",
-      //   "today": 0.5,
-      //   "h1": 0,
-      //   "h3": 0,
-      //   "h6": 0.5,
-      //   "h12": 0.5,
-      //   "h24": 1,
-      //   "h48": 1.5,
-      //   "tm": "2023-03-01 06:00:00",
-      //   "state": 1,
-      //   "warning": 0,
-      //   place:"湖北省宜昌市五峰土家族自治县五峰镇太平河（牛庄池南村）"
-      // },
-
-      {
-        "stcd": "61402050",
-        "stnm": "七道水（湾潭）",
-        "adcd": "420529000000000",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 110.3897,
-        "lttd": 30.0561,
-        "elev": null,
-        "hasRz": true,
-        "yuwai": false,
-        "type": "sh",
-        "today": 3,
-        "h1": 0.5,
-        "h3": 1.5,
-        "h6": 3,
-        "h12": 5.5,
-        "h24": 6,
-        "h48": 12.5,
-        "tm": "2023-03-23 06:00:00",
-        "state": 1,
-        "warning": 0,
-        place:"湖北省宜昌市五峰土家族自治县湾潭镇七道水"
-    },
-    /*{
-      "stcd": "61423860",
-      "stnm": "土坪（湾潭）",
-      "adcd": "420529000000000",
-      "wscd": null,
-      "importancy": 0,
-      "lgtd": 110.5030556,
-      "lttd": 30.12166667,
-      "elev": null,
-      "hasRz": false,
-      "yuwai": false,
-      "type": "sh",
-      "today": 3.5,
-      "h1": 0.5,
-      "h3": 1.5,
-      "h6": 3.5,
-      "h12": 6,
-      "h24": 6,
-      "h48": 17.5,
-      "tm": "2023-03-23 06:20:00",
-      "state": 1,
-      "warning": 0,
-      place:"湖北省宜昌市五峰土家族自治县湾潭镇土坪"
-  },*/
-    ]:
-    [
-      {
-        "stcd": "60536950",
-        "stnm": "百股水",
-        "adcd": "422822000000000",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 109.8578033,
-        "lttd": 30.85300064,
-        "elev": null,
-        "hasRz": false,
-        "yuwai": false,
-        "type": "sh",
-        "today": 1,
-        "h1": 0,
-        "h3": 0,
-        "h6": 1,
-        "h12": 1,
-        "h24": 1,
-        "h48": 2,
-        "tm": "2023-03-01 05:50:00",
-        "state": 1,
-        "warning": 0,
-        place:"湖北省恩施州建始县百股水"
-      },
-      {
-        "stcd": "60536960",
-        "stnm": "天生",
-        "adcd": "422822000000000",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 109.854447,
-        "lttd": 30.813875,
-        "elev": null,
-        "hasRz": false,
-        "yuwai": false,
-        "type": "sh",
-        "today": 0.5,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0.5,
-        "h12": 0.5,
-        "h24": 1,
-        "h48": 2.5,
-        "tm": "2023-03-01 05:00:00",
-        "state": 1,
-        "warning": 0,
-        place:"湖北省恩施州建始县天生"
-      }
-    ],
-  //预警核实-基础信息、入户报警器列表
-  rhbjqData: systemSwitchType?
-    [{name:"防汛报警器", azwz:"牛庄乡池南村一组", zrr:"吕世斌", tel:"18971555555"}]:
-    [{name:"防汛报警器", azwz:"柏腊树社区一组", zrr:"吕世斌", tel:"18971555555"}],
-  realDrpTabsTitleData: systemSwitchType?
-    [{value:0,label:"七道水（湾潭）"},/*{value:1,label:"土坪（湾潭）"}*/]:
-    [{value:0,label:"百股水"},{value:1,label:"天生"}],
-  //预警核实-预警发送记录
-  yjfsjlData: systemSwitchType?
-    {
-      "status": null,
-      "warngradeid": 6,
-      "warnetm": "2022-08-09 19:26:28",
-      "warndesc": "长乐坪镇1个防灾对象超警，详情如下：长乐坪镇1个测站超警菖蒲溪（长乐坪镇菖蒲溪村）(19:7)6小时雨量66.5毫米,超警戒雨量值(65.00)1.5毫米",
-      "warnstatusid": 30,
-      "warnstm": "2022-08-09 19:06:00",
-      "tempcolumn": 0,
-      "warnid": 867,
-      "isauto": "0",
-      "warnnm": "长乐坪镇山洪立即转移",
-      "adnm": "长乐坪镇",
-      // "adcd": "420529000000000",
-      "adcd": "420529105000000",
-      "warntypeid": 10,
-      "temprownumber": 1
-    }:
-    {
-      "status": null,
-      "warngradeid": 6,
-      "warnetm": "2022-08-09 19:26:28",
-      "warndesc": "高坪镇2个防灾对象超警，详情如下：高坪镇八角社区八角社区1组(8月9日19:6)前1小时面雨量27.0毫米,超准备转移值1.0毫米；高坪镇桑园社区桑园社区5组(8月9日19:6)前1小时面雨量27.0毫米,超准备转移值1.0毫米",
-      "warnstatusid": 30,
-      "warnstm": "2022-08-09 19:06:00",
-      "tempcolumn": 0,
-      "warnid": 534,
-      "isauto": "0",
-      "warnnm": "高坪镇山洪立即转移",
-      "adnm": "高坪镇",
-      "adcd": "422822101000000",
-      "warntypeid": 10,
-      "temprownumber": 1
-    },
-  //预警核实-预警配置信息-预警人员
-  yjryData: systemSwitchType?
-    [
-      {type:"", yjdj:"", status:"", yjfsbm:"", yjdxfsry:""}
-    ]:
-    [],
-  //预警核实-预警指标
-  yjzbData: systemSwitchType?
-    [
-      {code:"420529101203100",type:"重点防治区",gdmj:"0",zbzy:"20",ljzy:"26", vName:"", fzdxName:"", rk:"258", hs:"42", fhnl:"10年以下(≤10年)", ylyjzb:["1h；准备转移57mm，立即转移72mm", "3h；准备转移72mm，立即转移90mm", "6h；准备转移95mm，立即转移118mm"], swyjzb:"850米"}
-    ]:
-    [
-      {code:"",type:"",gdmj:"",zbzy:"",ljzy:"", vName:"", fzdxName:"", rk:"358", hs:"48", fhnl:"10年以下(≤10年)", ylyjzb:["1h；准备转移57mm，立即转移72mm", "3h；准备转移72mm，立即转移90mm", "6h；准备转移95mm，立即转移118mm"], swyjzb:"850米"}
-    ],
-  //汇总雨情
-  hzyqData: systemSwitchType?
-    [
-      {
-        "stcd": "61042380",
-        "stnm": "太平庄（五峰镇小河村）",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 110.6172222,
-        "lttd": 30.20861111,
-        "elev": null,
-        "hasRz": false,
-        "yuwai": false,
-        "type": "sh",
-        "today": 0,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0,
-        "h12": 0,
-        "h24": 0.5,
-        "h48": 0.5,
-        "tm": "2023-03-02 01:00:00",
-        "state": 1,
-        "warning": 0
-      },
-      {
-        "stcd": "90017776",
-        "stnm": "秦家湾水库",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 110.6885,
-        "lttd": 30.13459,
-        "elev": 0,
-        "hasRz": true,
-        "yuwai": false,
-        "type": "sk",
-        "tm": "2023-03-02 01:00:00",
-        "today": 0,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0,
-        "h12": 0,
-        "h24": 0,
-        "h48": 0.8,
-        "state": 1,
-        "warning": 0
-      }
-    ]:
-    [
-      {
-        "stcd": "60536950",
-        "stnm": "百股水",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 109.8578033,
-        "lttd": 30.85300064,
-        "elev": null,
-        "hasRz": false,
-        "yuwai": false,
-        "type": "sh",
-        "today": 0.5,
-        "h1": 0.5,
-        "h3": 0.5,
-        "h6": 0.5,
-        "h12": 0.5,
-        "h24": 0.5,
-        "h48": 1.5,
-        "tm": "2023-03-02 01:25:00",
-        "state": 1,
-        "warning": 0
-      },
-      {
-        "stcd": "60536960",
-        "stnm": "天生",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 109.854447,
-        "lttd": 30.813875,
-        "elev": null,
-        "hasRz": false,
-        "yuwai": false,
-        "type": "sh",
-        "today": 0,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0,
-        "h12": 0,
-        "h24": 0.5,
-        "h48": 1,
-        "tm": "2023-03-02 01:00:00",
-        "state": 1,
-        "warning": 0
-      }
-    ],
-  //汇总河道水情
-  hzhdsqData: systemSwitchType?
-    [
-      {
-        "stcd": "61009300",
-        "stnm": "石梁司（五峰镇）",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 110.6625,
-        "lttd": 30.1745,
-        "elev": null,
-        "hasRz": true,
-        "wrz": null,
-        "wrq": null,
-        "grz": null,
-        "grq": null,
-        "sfz": null,
-        "sfq": null,
-        "yuwai": false,
-        "type": "sh",
-        "tm": "2023-03-02 05:00:00",
-        "rz": 605.71,
-        "trend": 0,
-        "state": 1,
-        "warning": 0,
-        "maxRz": 605.71,
-        "maxDate": "2023-03-02 05:00:00",
-        "warndes": null
-      },
-      {
-        "stcd": "61010300",
-        "stnm": "陆家台（松林坪）",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 111.0393,
-        "lttd": 30.1551,
-        "elev": null,
-        "hasRz": true,
-        "wrz": null,
-        "wrq": null,
-        "grz": null,
-        "grq": null,
-        "sfz": null,
-        "sfq": null,
-        "yuwai": false,
-        "type": "sh",
-        "tm": "2023-03-02 05:25:00",
-        "rz": 207.995,
-        "trend": 0,
-        "state": 1,
-        "warning": 0,
-        "maxRz": 207.995,
-        "maxDate": "2023-03-01 17:00:00",
-        "warndes": null
-      }
-    ]:
-    [
-      {
-        "stcd": "61006080",
-        "stnm": "粟谷坝",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 1,
-        "lgtd": 110.0742035,
-        "lttd": 30.34639931,
-        "elev": null,
-        "hasRz": true,
-        "wrz": null,
-        "wrq": null,
-        "grz": null,
-        "grq": null,
-        "sfz": null,
-        "sfq": null,
-        "yuwai": false,
-        "type": "sh",
-        "tm": "2023-03-02 02:00:00",
-        "rz": 326.82,
-        "trend": 0,
-        "state": 1,
-        "warning": 0,
-        "maxRz": 326.82,
-        "maxDate": "2023-03-01 17:05:00",
-        "warndes": null
-      },
-      {
-        "stcd": "61007980",
-        "stnm": "平阳二号",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 109.9315033,
-        "lttd": 30.46360016,
-        "elev": null,
-        "hasRz": true,
-        "wrz": null,
-        "wrq": null,
-        "grz": null,
-        "grq": null,
-        "sfz": null,
-        "sfq": null,
-        "yuwai": false,
-        "type": "sh",
-        "tm": "2023-03-02 02:00:00",
-        "rz": 1276.852,
-        "trend": 0,
-        "state": 1,
-        "warning": 0,
-        "maxRz": 1276.852,
-        "maxDate": "2023-03-01 21:50:00",
-        "warndes": null
-      }
-    ],
-  //汇总水库水情
-  hzsksqData: systemSwitchType?
-    [
-      {
-        "stcd": "90017776",
-        "type": "sk",
-        "hasRz": true,
-        "stnm": "秦家湾水库",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 110.6885,
-        "lttd": 30.13459,
-        "elev": 0,
-        "damel": 1111.82,
-        "dsflz": 1111.24,
-        "fsltdz": 1110.26,
-        "ddz": 1102.5,
-        "zcxsw": 1110.26,
-        "yuwai": false,
-        "drpTm": "2023-03-02T05:00:00.000Z",
-        "today": 0,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0,
-        "h12": 0,
-        "h24": 0,
-        "h48": 0.8,
-        "drpState": 1,
-        "rz": 1106.85,
-        "w": 0.058,
-        "a_fsltdz": -3.410000000000082,
-        "rzTm": "2023-03-0117:00:00",
-        "rzWarning": 0,
-        "rzState": 2,
-        "pic": [
-          {
-            "stcd": "90017776",
-            "tm": "2023-03-02T04:02:01.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90017776/20230302120201.jpg"
-          },
-          {
-            "stcd": "90017776",
-            "tm": "2023-03-02T02:02:05.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90017777/20230302100205.jpg"
-          }
-        ]
-      },
-      {
-        "stcd": "90006513",
-        "type": "sk",
-        "hasRz": true,
-        "stnm": "南河水库",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 111.005503,
-        "lttd": 30.082441,
-        "elev": 0,
-        "damel": 589.3,
-        "dsflz": 586.26,
-        "fsltdz": 582.8,
-        "ddz": 565.3,
-        "zcxsw": 582.8,
-        "yuwai": false,
-        "drpTm": "2023-03-02T05:00:00.000Z",
-        "today": 0,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0,
-        "h12": 0,
-        "h24": 0,
-        "h48": 0,
-        "drpState": 1,
-        "rz": 573.23,
-        "w": 0.571,
-        "a_fsltdz": -9.569999999999936,
-        "rzTm": "2023-03-02 05:00:00",
-        "rzWarning": 0,
-        "rzState": 1,
-        "pic": [
-          {
-            "stcd": "90006513",
-            "tm": "2023-03-02T04:02:00.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90006513/20230302120200.jpg"
-          },
-          {
-            "stcd": "90006513",
-            "tm": "2023-03-02T02:02:02.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90006514/20230302100202.jpg"
-          }
-        ]
-      }
-    ]:
-    [
-      {
-        "stcd": "90012103",
-        "type": "sk",
-        "hasRz": true,
-        "stnm": "四十二坝水库",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 109.576389,
-        "lttd": 30.667778,
-        "elev": 0,
-        "damel": 1729.32,
-        "dsflz": 1727.15,
-        "fsltdz": 1725.62,
-        "ddz": 1704.5,
-        "zcxsw": 1725.62,
-        "yuwai": false,
-        "drpTm": "2022-12-28T00:00:00.000Z",
-        "today": 0,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0,
-        "h12": 0,
-        "h24": 0,
-        "h48": 0,
-        "drpState": 2,
-        "rz": 1717.46,
-        "w": 5.018,
-        "a_fsltdz": -8.159999999999854,
-        "rzTm": "2022-12-28 00:00:00",
-        "rzWarning": 0,
-        "rzState": 2,
-        "pic": [
-          {
-            "stcd": "90012103",
-            "tm": "2022-12-24T21:47:10.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2022/1225/90012103/20221225054710.jpg"
-          },
-          {
-            "stcd": "90012103",
-            "tm": "2022-12-27T23:02:03.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2022/1228/90012104/20221228070203.jpg"
-          }
-        ]
-      },
-      {
-        "stcd": "90019738",
-        "type": "sk",
-        "hasRz": true,
-        "stnm": "五一水库",
-        "adcd": "",
-        "wscd": null,
-        "importancy": 0,
-        "lgtd": 109.654444,
-        "lttd": 30.550556,
-        "elev": 0,
-        "damel": 743.6,
-        "dsflz": 741.1,
-        "fsltdz": 740,
-        "ddz": 735.5,
-        "zcxsw": 740,
-        "yuwai": false,
-        "drpTm": "2023-03-02 05:00:00",
-        "today": 0,
-        "h1": 0,
-        "h3": 0,
-        "h6": 0,
-        "h12": 0,
-        "h24": 0,
-        "h48": 0,
-        "drpState": 1,
-        "rz": 735.02,
-        "w": 0.018,
-        "a_fsltdz": -4.980000000000018,
-        "rzTm": "2023-03-02 05:00:00",
-        "rzWarning": 0,
-        "rzState": 1,
-        "pic": [
-          {
-            "stcd": "90019738",
-            "tm": "2023-03-02T02:02:02.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90019738/20230302100202.jpg"
-          },
-          {
-            "stcd": "90019738",
-            "tm": "2023-03-02T04:02:01.000Z",
-            "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90019739/20230302120201.jpg"
-          }
-        ]
-      }
-    ],
-  //小流域面雨量
-  xlymylData: systemSwitchType?
-    [
-      {
-      stnm:'白果湾',
-      stcd:'ACF0000000',
-      r:0.3,
-      id:0
-    },
-      {
-        stnm:'横河',
-        stcd:'ACF0000001',
-        r:0,
-        id:1
-      },
-      {
-        stnm:'黄家湾',
-        stcd:'ACF0000001',
-        r:0.4,
-        id:1
-      },
-      {
-        stnm:'横渡口河',
-        stcd:'ACF0000002',
-        r:0.1,
-        id:2
-      }
-    ]:
-    [],
-  //短临降雨预警
-  dljyyjData: systemSwitchType?
-    [
-      {
-        "maxLv": 1,
-        "children": [
-          {
-            "maxLv": 1,
-            "children": [
-              {
-                "drp1": 15.7,
-                "maxLv": 1,
-                "av": 4.9,
-                "adcd": "422822100013100",
-                "lgtd": 109.712939,
-                "lttd": 30.5890132,
-                "drp2": 74.9,
-                "adnm": "九门村1组"
-              }
-            ],
-            "av": 15.71,
-            "fzdx": 1,
-            "adcd": "422822100013000",
-            "lgtd": 109.70959,
-            "lttd": 30.586454,
-            "cun": 1,
-            "personels": null,
-            "adnm": "九门村"
-          },
-          {
-            "maxLv": 1,
-            "children": [
-              {
-                "drp1": 20.04,
-                "maxLv": 1,
-                "av": 3.35,
-                "adcd": "422822100017100",
-                "lgtd": 109.66074,
-                "lttd": 30.5738892,
-                "drp2": 63.35,
-                "adnm": "龙桥村1组"
-              }
-            ],
-            "av": 6.35,
-            "fzdx": 1,
-            "adcd": "422822100017000",
-            "lgtd": 109.68355508,
-            "lttd": 30.56274252,
-            "cun": 1,
-            "personels": null,
-            "adnm": "龙桥村"
-          }
-        ],
-        "av": 19.69,
-        "fzdx": 2,
-        "adcd": "422822100000000",
-        "lgtd": 109.716677,
-        "lttd": 30.60279,
-        "cun": 2,
-        "personels": [
-          {
-            "phone": "13477216590",
-            "name": "陈明福",
-            "adcd": "422822100000000",
-            "id": 22877
-          },
-          {
-            "phone": "13997795803",
-            "name": "李万崇",
-            "adcd": "422822100000000",
-            "id": 22878
-          },
-          {
-            "phone": "13197238417",
-            "name": "余厚成",
-            "adcd": "422822100000000",
-            "id": 22879
-          },
-          {
-            "phone": "15172838291",
-            "name": "余裕灯",
-            "adcd": "422822100000000",
-            "id": 22880
-          },
-          {
-            "phone": "13886797498",
-            "name": "刘永照",
-            "adcd": "422822100000000",
-            "id": 22881
-          },
-          {
-            "phone": "13997757926",
-            "name": "陈元军",
-            "adcd": "422822100000000",
-            "id": 22882
-          },
-          {
-            "phone": "13593611669",
-            "name": "张北平",
-            "adcd": "422822100000000",
-            "id": 22883
-          },
-          {
-            "phone": "15172808899",
-            "name": "张昌松",
-            "adcd": "422822100000000",
-            "id": 22884
-          },
-          {
-            "phone": "15327047517",
-            "name": "陈义龙",
-            "adcd": "422822100000000",
-            "id": 22885
-          },
-          {
-            "phone": "15307262528",
-            "name": "杨启平",
-            "adcd": "422822100000000",
-            "id": 22886
-          },
-          {
-            "phone": "13581227766",
-            "name": "刘华平",
-            "adcd": "422822100000000",
-            "id": 22887
-          },
-          {
-            "phone": "13972444479",
-            "name": "丁顺学",
-            "adcd": "422822100000000",
-            "id": 22888
-          },
-          {
-            "phone": "15707273168",
-            "name": "邱珍媛",
-            "adcd": "422822100000000",
-            "id": 22889
-          },
-          {
-            "phone": "15549221480",
-            "name": "邱桂英",
-            "adcd": "422822100000000",
-            "id": 22890
-          },
-          {
-            "phone": "13597809991",
-            "name": "刘孝义",
-            "adcd": "422822100000000",
-            "id": 22891
-          },
-          {
-            "phone": "13635763587",
-            "name": "陈明润",
-            "adcd": "422822100000000",
-            "id": 22892
-          },
-          {
-            "phone": "13872718208",
-            "name": "杨世美",
-            "adcd": "422822100000000",
-            "id": 22893
-          },
-          {
-            "phone": "13872720882",
-            "name": "杨洪",
-            "adcd": "422822100000000",
-            "id": 22894
-          },
-          {
-            "phone": "15071872128",
-            "name": "苏祥顺",
-            "adcd": "422822100000000",
-            "id": 22895
-          },
-          {
-            "phone": "15587622998",
-            "name": "向光梅",
-            "adcd": "422822100000000",
-            "id": 22896
-          },
-          {
-            "phone": "15926111496",
-            "name": "高用平",
-            "adcd": "422822100000000",
-            "id": 22897
-          },
-          {
-            "phone": "13197210006",
-            "name": "贺开毅",
-            "adcd": "422822100000000",
-            "id": 22898
-          },
-          {
-            "phone": "13235595993",
-            "name": "王怀翠",
-            "adcd": "422822100000000",
-            "id": 22899
-          },
-          {
-            "phone": "18671826578",
-            "name": "范正波",
-            "adcd": "422822100000000",
-            "id": 22900
-          },
-          {
-            "phone": "13581218881",
-            "name": "李秀斌",
-            "adcd": "422822100000000",
-            "id": 22901
-          },
-          {
-            "phone": "15926140848",
-            "name": "朱光全",
-            "adcd": "422822100000000",
-            "id": 22902
-          },
-          {
-            "phone": "18727683848",
-            "name": "孙朝清",
-            "adcd": "422822100000000",
-            "id": 22903
-          },
-          {
-            "phone": "18871838788",
-            "name": "陈静",
-            "adcd": "422822100000000",
-            "id": 22904
-          },
-          {
-            "phone": "13593632259",
-            "name": "龙克松",
-            "adcd": "422822100000000",
-            "id": 22905
-          },
-          {
-            "phone": "13477930633",
-            "name": "刘志龙",
-            "adcd": "422822100000000",
-            "id": 22906
-          },
-          {
-            "phone": "15335820059",
-            "name": "施兴菊",
-            "adcd": "422822100000000",
-            "id": 22907
-          },
-          {
-            "phone": "18672450652",
-            "name": "付彩艳",
-            "adcd": "422822100000000",
-            "id": 22908
-          },
-          {
-            "phone": "13517188516",
-            "name": "王毅",
-            "adcd": "422822100000000",
-            "id": 22909
-          },
-          {
-            "phone": "13451037924",
-            "name": "施维高",
-            "adcd": "422822100000000",
-            "id": 22910
-          },
-          {
-            "phone": "13697182283",
-            "name": "廖利国",
-            "adcd": "422822100000000",
-            "id": 22911
-          },
-          {
-            "phone": "15587622653",
-            "name": "陈柱翠",
-            "adcd": "422822100000000",
-            "id": 22912
-          },
-          {
-            "phone": "15171086777",
-            "name": "邱军",
-            "adcd": "422822100000000",
-            "id": 22913
-          },
-          {
-            "phone": "18963907353",
-            "name": "谭明清",
-            "adcd": "422822100000000",
-            "id": 22914
-          },
-          {
-            "phone": "13986842705",
-            "name": "周诗英",
-            "adcd": "422822100000000",
-            "id": 22915
-          },
-          {
-            "phone": "15587626538",
-            "name": "唐建妮",
-            "adcd": "422822100000000",
-            "id": 22916
-          },
-          {
-            "phone": "13317261633",
-            "name": "段承勇",
-            "adcd": "422822100000000",
-            "id": 22917
-          },
-          {
-            "phone": "13403025297",
-            "name": "段小平",
-            "adcd": "422822100000000",
-            "id": 22918
-          },
-          {
-            "phone": "13402755328",
-            "name": "康才梅",
-            "adcd": "422822100000000",
-            "id": 22919
-          },
-          {
-            "phone": "13402793389",
-            "name": "易礼寿",
-            "adcd": "422822100000000",
-            "id": 22920
-          },
-          {
-            "phone": "13197238188",
-            "name": "刘诗清",
-            "adcd": "422822100000000",
-            "id": 22921
-          },
-          {
-            "phone": "13872748417",
-            "name": "秦大华",
-            "adcd": "422822100000000",
-            "id": 22922
-          },
-          {
-            "phone": "13886788355",
-            "name": "刘猛",
-            "adcd": "422822100000000",
-            "id": 22923
-          },
-          {
-            "phone": "13403022400",
-            "name": "朱孝玲",
-            "adcd": "422822100000000",
-            "id": 22924
-          },
-          {
-            "phone": "13593619980",
-            "name": "罗启斌",
-            "adcd": "422822100000000",
-            "id": 22925
-          },
-          {
-            "phone": "13367182003",
-            "name": "罗晓红",
-            "adcd": "422822100000000",
-            "id": 22926
-          },
-          {
-            "phone": "13469740931",
-            "name": "李宏松",
-            "adcd": "422822100000000",
-            "id": 22927
-          },
-          {
-            "phone": "15972421734",
-            "name": "易恭梅",
-            "adcd": "422822100000000",
-            "id": 22928
-          },
-          {
-            "phone": "13403008191",
-            "name": "袁作寿",
-            "adcd": "422822100000000",
-            "id": 22929
-          },
-          {
-            "phone": "18672455480",
-            "name": "苏福艳",
-            "adcd": "422822100000000",
-            "id": 22930
-          },
-          {
-            "phone": "18010388769",
-            "name": "胡南平",
-            "adcd": "422822100000000",
-            "id": 22931
-          },
-          {
-            "phone": "13093255758",
-            "name": "熊康梅",
-            "adcd": "422822100000000",
-            "id": 22932
-          },
-          {
-            "phone": "13227431868",
-            "name": "袁友太",
-            "adcd": "422822100000000",
-            "id": 22933
-          },
-          {
-            "phone": "15587623717",
-            "name": "樊玉梅",
-            "adcd": "422822100000000",
-            "id": 22934
-          },
-          {
-            "phone": "15971782959",
-            "name": "谭文玉",
-            "adcd": "422822100000000",
-            "id": 22935
-          },
-          {
-            "phone": "18671859500",
-            "name": "文孝森",
-            "adcd": "422822100000000",
-            "id": 22936
-          },
-          {
-            "phone": "13593642598",
-            "name": "龙世余",
-            "adcd": "422822100000000",
-            "id": 22937
-          },
-          {
-            "phone": "13972407968",
-            "name": "冉建忠",
-            "adcd": "422822100000000",
-            "id": 22938
-          },
-          {
-            "phone": "13403029370",
-            "name": "周远斌",
-            "adcd": "422822100000000",
-            "id": 22939
-          },
-          {
-            "phone": "15071898168",
-            "name": "高功英",
-            "adcd": "422822100000000",
-            "id": 22940
-          },
-          {
-            "phone": "15587438802",
-            "name": "朱祖明",
-            "adcd": "422822100000000",
-            "id": 22941
-          },
-          {
-            "phone": "13377966955",
-            "name": "向斌",
-            "adcd": "422822100000000",
-            "id": 22942
-          },
-          {
-            "phone": "13477223317",
-            "name": "余以秀",
-            "adcd": "422822100000000",
-            "id": 22943
-          },
-          {
-            "phone": "13907260660",
-            "name": "张来",
-            "adcd": "422822100000000",
-            "id": 22944
-          },
-          {
-            "phone": "13886764121",
-            "name": "谭绍清",
-            "adcd": "422822100000000",
-            "id": 22945
-          },
-          {
-            "phone": "15629200010",
-            "name": "谭儒孝",
-            "adcd": "422822100000000",
-            "id": 22946
-          },
-          {
-            "phone": "13617180798",
-            "name": "陈光国",
-            "adcd": "422822100000000",
-            "id": 22947
-          },
-          {
-            "phone": "15587620255",
-            "name": "解维娟",
-            "adcd": "422822100000000",
-            "id": 22948
-          },
-          {
-            "phone": "13636288333",
-            "name": "龙玉才",
-            "adcd": "422822100000000",
-            "id": 22949
-          },
-          {
-            "phone": "15570551228",
-            "name": "邱良轩",
-            "adcd": "422822100000000",
-            "id": 22950
-          },
-          {
-            "phone": "13235467637",
-            "name": "肖明兵",
-            "adcd": "422822100000000",
-            "id": 22951
-          },
-          {
-            "phone": "18907260886",
-            "name": "谢昌国",
-            "adcd": "422822100000000",
-            "id": 22952
-          },
-          {
-            "phone": "13477218047",
-            "name": "齐正松",
-            "adcd": "422822100000000",
-            "id": 22953
-          },
-          {
-            "phone": "13477270806",
-            "name": "王建军",
-            "adcd": "422822100000000",
-            "id": 22954
-          },
-          {
-            "phone": "13402728661",
-            "name": "王大江",
-            "adcd": "422822100000000",
-            "id": 22955
-          },
-          {
-            "phone": "18672449840",
-            "name": "黄永华",
-            "adcd": "422822100000000",
-            "id": 22956
-          },
-          {
-            "phone": "15587620689",
-            "name": "周静萍",
-            "adcd": "422822100000000",
-            "id": 22957
-          },
-          {
-            "phone": "15697268725",
-            "name": "刘凯",
-            "adcd": "422822100000000",
-            "id": 22958
-          },
-          {
-            "phone": "15272949288",
-            "name": "魏森林",
-            "adcd": "422822100000000",
-            "id": 22959
-          },
-          {
-            "phone": "15570508856",
-            "name": "魏凡庆",
-            "adcd": "422822100000000",
-            "id": 22960
-          },
-          {
-            "phone": "13403014285",
-            "name": "黄仁林",
-            "adcd": "422822100000000",
-            "id": 22961
-          },
-          {
-            "phone": "18963925173",
-            "name": "黄军",
-            "adcd": "422822100000000",
-            "id": 22962
-          },
-          {
-            "phone": "15707268360",
-            "name": "彭祖建",
-            "adcd": "422822100000000",
-            "id": 22963
-          },
-          {
-            "phone": "13972405555",
-            "name": "彭滔",
-            "adcd": "422822100000000",
-            "id": 22964
-          },
-          {
-            "phone": "15971826241",
-            "name": "彭明今",
-            "adcd": "422822100000000",
-            "id": 22965
-          },
-          {
-            "phone": "18671145285",
-            "name": "吴学妙",
-            "adcd": "422822100000000",
-            "id": 22966
-          },
-          {
-            "phone": "15327000333",
-            "name": "李来喜",
-            "adcd": "422822100000000",
-            "id": 22967
-          },
-          {
-            "phone": "18972409878",
-            "name": "龙燊",
-            "adcd": "422822100000000",
-            "id": 22968
-          },
-          {
-            "phone": "18972403356",
-            "name": "刘修平",
-            "adcd": "422822100000000",
-            "id": 22969
-          },
-          {
-            "phone": "15671899114",
-            "name": "向泽旺",
-            "adcd": "422822100000000",
-            "id": 22970
-          },
-          {
-            "phone": "13197201222",
-            "name": "罗家华",
-            "adcd": "422822100000000",
-            "id": 22971
-          },
-          {
-            "phone": "13972407350",
-            "name": "龙小青",
-            "adcd": "422822100000000",
-            "id": 22972
-          },
-          {
-            "phone": "13997764216",
-            "name": "李玉芝",
-            "adcd": "422822100000000",
-            "id": 22973
-          },
-          {
-            "phone": "18972403286",
-            "name": "黄柳",
-            "adcd": "422822100000000",
-            "id": 22974
-          },
-          {
-            "phone": "15971798398",
-            "name": "周光平",
-            "adcd": "422822100000000",
-            "id": 22975
-          },
-          {
-            "phone": "13402763815",
-            "name": "邹仕香",
-            "adcd": "422822100000000",
-            "id": 22976
-          },
-          {
-            "phone": "18972403388",
-            "name": "易礼鑫",
-            "adcd": "422822100000000",
-            "id": 22977
-          },
-          {
-            "phone": "18986851131",
-            "name": "于祥根",
-            "adcd": "422822100000000",
-            "id": 22978
-          },
-          {
-            "phone": "18972403368",
-            "name": "黄建军",
-            "adcd": "422822100000000",
-            "id": 22979
-          },
-          {
-            "phone": "13177113903",
-            "name": "舒绪东",
-            "adcd": "422822100000000",
-            "id": 22980
-          },
-          {
-            "phone": "18972403287",
-            "name": "孙桃章",
-            "adcd": "422822100000000",
-            "id": 22981
-          },
-          {
-            "phone": "13597758056",
-            "name": "冉茂勇",
-            "adcd": "422822100000000",
-            "id": 22982
-          },
-          {
-            "phone": "13997795803",
-            "name": "李万崇",
-            "adcd": "422822100000000",
-            "id": 22983
-          },
-          {
-            "phone": "13197238417",
-            "name": "余厚成",
-            "adcd": "422822100000000",
-            "id": 22984
-          },
-          {
-            "phone": "13403008122",
-            "name": "刘爱萍",
-            "adcd": "422822100000000",
-            "id": 22985
-          },
-          {
-            "phone": "13367188080",
-            "name": "陈晓玲",
-            "adcd": "422822100000000",
-            "id": 22986
-          },
-          {
-            "phone": "15307262528",
-            "name": "杨启平",
-            "adcd": "422822100000000",
-            "id": 22987
-          },
-          {
-            "phone": "13177138769",
-            "name": "杨正华",
-            "adcd": "422822100000000",
-            "id": 22988
-          },
-          {
-            "phone": "15335837626",
-            "name": "邱贤生",
-            "adcd": "422822100000000",
-            "id": 22989
-          },
-          {
-            "phone": "13597809991",
-            "name": "刘孝义",
-            "adcd": "422822100000000",
-            "id": 22990
-          },
-          {
-            "phone": "13872720882",
-            "name": "杨  洪",
-            "adcd": "422822100000000",
-            "id": 22991
-          },
-          {
-            "phone": "15071872128",
-            "name": "苏祥顺",
-            "adcd": "422822100000000",
-            "id": 22992
-          },
-          {
-            "phone": "15926111496",
-            "name": "高用平",
-            "adcd": "422822100000000",
-            "id": 22993
-          },
-          {
-            "phone": "18727743331",
-            "name": "廖文静",
-            "adcd": "422822100000000",
-            "id": 22994
-          },
-          {
-            "phone": "18727758023",
-            "name": "高杰",
-            "adcd": "422822100000000",
-            "id": 22995
-          },
-          {
-            "phone": "18727683848",
-            "name": "孙朝清",
-            "adcd": "422822100000000",
-            "id": 22996
-          },
-          {
-            "phone": "13636282288",
-            "name": "朱安全",
-            "adcd": "422822100000000",
-            "id": 22997
-          },
-          {
-            "phone": "15335820059",
-            "name": "施兴菊",
-            "adcd": "422822100000000",
-            "id": 22998
-          },
-          {
-            "phone": "13517188516",
-            "name": "王毅",
-            "adcd": "422822100000000",
-            "id": 22999
-          },
-          {
-            "phone": "13697182283",
-            "name": "廖利国",
-            "adcd": "422822100000000",
-            "id": 23000
-          },
-          {
-            "phone": "15171086777",
-            "name": "邱军",
-            "adcd": "422822100000000",
-            "id": 23001
-          },
-          {
-            "phone": "15587626538",
-            "name": "唐建妮",
-            "adcd": "422822100000000",
-            "id": 23002
-          },
-          {
-            "phone": "13402755328",
-            "name": "康才梅",
-            "adcd": "422822100000000",
-            "id": 23003
-          },
-          {
-            "phone": "13197238188",
-            "name": "刘诗清",
-            "adcd": "422822100000000",
-            "id": 23004
-          },
-          {
-            "phone": "13886788355",
-            "name": "刘猛",
-            "adcd": "422822100000000",
-            "id": 23005
-          },
-          {
-            "phone": "13593619980",
-            "name": "罗启斌",
-            "adcd": "422822100000000",
-            "id": 23006
-          },
-          {
-            "phone": "13469740931",
-            "name": "李宏松",
-            "adcd": "422822100000000",
-            "id": 23007
-          },
-          {
-            "phone": "15587632631",
-            "name": "苏福艳",
-            "adcd": "422822100000000",
-            "id": 23008
-          },
-          {
-            "phone": "18971891177",
-            "name": "袁小军",
-            "adcd": "422822100000000",
-            "id": 23009
-          },
-          {
-            "phone": "13227431868",
-            "name": "袁友太",
-            "adcd": "422822100000000",
-            "id": 23010
-          },
-          {
-            "phone": "18671859500",
-            "name": "文孝森",
-            "adcd": "422822100000000",
-            "id": 23011
-          },
-          {
-            "phone": "13972407968",
-            "name": "冉建忠",
-            "adcd": "422822100000000",
-            "id": 23012
-          },
-          {
-            "phone": "13277543843",
-            "name": "周信平",
-            "adcd": "422822100000000",
-            "id": 23013
-          },
-          {
-            "phone": "13377966955",
-            "name": "向斌",
-            "adcd": "422822100000000",
-            "id": 23014
-          },
-          {
-            "phone": "13477223317",
-            "name": "余以秀",
-            "adcd": "422822100000000",
-            "id": 23015
-          },
-          {
-            "phone": "13886764121",
-            "name": "谭绍清",
-            "adcd": "422822100000000",
-            "id": 23016
-          },
-          {
-            "phone": "15502757758",
-            "name": "邓芳",
-            "adcd": "422822100000000",
-            "id": 23017
-          },
-          {
-            "phone": "13636288333",
-            "name": "龙玉才",
-            "adcd": "422822100000000",
-            "id": 23018
-          },
-          {
-            "phone": "13235467037",
-            "name": "肖明兵",
-            "adcd": "422822100000000",
-            "id": 23019
-          },
-          {
-            "phone": "18007260908",
-            "name": "杨龙",
-            "adcd": "422822100000000",
-            "id": 23020
-          },
-          {
-            "phone": "13597772632",
-            "name": "孙宗林",
-            "adcd": "422822100000000",
-            "id": 23021
-          },
-          {
-            "phone": "15587620689",
-            "name": "周静萍",
-            "adcd": "422822100000000",
-            "id": 23022
-          },
-          {
-            "phone": "18071929282",
-            "name": "胡  魏",
-            "adcd": "422822100000000",
-            "id": 23023
-          },
-          {
-            "phone": "18963925173",
-            "name": "黄军",
-            "adcd": "422822100000000",
-            "id": 23024
-          },
-          {
-            "phone": "15707268360",
-            "name": "彭祖建",
-            "adcd": "422822100000000",
-            "id": 23025
-          },
-          {
-            "phone": "18671145285",
-            "name": "吴学妙",
-            "adcd": "422822100000000",
-            "id": 23026
-          },
-          {
-            "phone": "18571228118",
-            "name": "涂才喜",
-            "adcd": "422822100000000",
-            "id": 23027
-          },
-          {
-            "phone": "18972403356",
-            "name": "刘修平",
-            "adcd": "422822100000000",
-            "id": 23028
-          },
-          {
-            "phone": "13197201222",
-            "name": "罗家华",
-            "adcd": "422822100000000",
-            "id": 23029
-          },
-          {
-            "phone": "15571861826",
-            "name": "石兰",
-            "adcd": "422822100000000",
-            "id": 23030
-          },
-          {
-            "phone": "15971798398",
-            "name": "周光平",
-            "adcd": "422822100000000",
-            "id": 23031
-          },
-          {
-            "phone": "13593649868",
-            "name": "向初东",
-            "adcd": "422822100000000",
-            "id": 23032
-          },
-          {
-            "phone": "18972403368",
-            "name": "黄建军",
-            "adcd": "422822100000000",
-            "id": 23033
-          },
-          {
-            "phone": "18972403287",
-            "name": "孙涛章",
-            "adcd": "422822100000000",
-            "id": 23034
-          },
-          {
-            "phone": "15571884111",
-            "name": "周和平",
-            "adcd": "422822100000000",
-            "id": 23035
-          },
-          {
-            "phone": "13886797791",
-            "name": "苏国顺",
-            "adcd": "422822100000000",
-            "id": 23036
-          },
-          {
-            "phone": "13402722345",
-            "name": "姚永红",
-            "adcd": "422822100000000",
-            "id": 23037
-          },
-          {
-            "phone": "13477934800",
-            "name": "冉云峰",
-            "adcd": "422822100000000",
-            "id": 23038
-          },
-          {
-            "phone": "13647188286",
-            "name": "朱祖倚",
-            "adcd": "422822100000000",
-            "id": 23039
-          },
-          {
-            "phone": "13971883788",
-            "name": "张金彪",
-            "adcd": "422822100000000",
-            "id": 23040
-          },
-          {
-            "phone": "18972403378",
-            "name": "邱昌松",
-            "adcd": "422822100000000",
-            "id": 23041
-          },
-          {
-            "phone": "13886797791",
-            "name": "苏国顺",
-            "adcd": "422822100000000",
-            "id": 23042
-          },
-          {
-            "phone": "15587640709",
-            "name": "彭斌",
-            "adcd": "422822100000000",
-            "id": 23043
-          },
-          {
-            "phone": "13402722345",
-            "name": "姚永红",
-            "adcd": "422822100000000",
-            "id": 23044
-          },
-          {
-            "phone": "13477934800",
-            "name": "冉云峰",
-            "adcd": "422822100000000",
-            "id": 23045
-          },
-          {
-            "phone": "18807261555",
-            "name": "李宗斌",
-            "adcd": "422822100000000",
-            "id": 23046
-          },
-          {
-            "phone": "13971883788",
-            "name": "张金彪",
-            "adcd": "422822100000000",
-            "id": 23047
-          },
-          {
-            "phone": "18972403378",
-            "name": "邱昌松",
-            "adcd": "422822100000000",
-            "id": 23048
-          }
-        ],
-        "adnm": "湾潭镇"
-      }
-    ]:
-    [
-      {
-        "maxLv": 1,
-        "children": [
-          {
-            "maxLv": 1,
-            "children": [
-              {
-                "drp1": 15.7,
-                "maxLv": 1,
-                "av": 74.9,
-                "adcd": "422822100013100",
-                "lgtd": 109.712939,
-                "lttd": 30.5890132,
-                "drp2": 74.9,
-                "adnm": "马栏溪社区1组"
-              }
-            ],
-            "av": 75.71,
-            "fzdx": 1,
-            "adcd": "422822100013000",
-            "lgtd": 109.70959,
-            "lttd": 30.586454,
-            "cun": 1,
-            "personels": null,
-            "adnm": "马栏溪社区"
-          },
-          {
-            "maxLv": 1,
-            "children": [
-              {
-                "drp1": 20.04,
-                "maxLv": 1,
-                "av": 63.35,
-                "adcd": "422822100017100",
-                "lgtd": 109.66074,
-                "lttd": 30.5738892,
-                "drp2": 63.35,
-                "adnm": "大堰社区1组"
-              }
-            ],
-            "av": 63.35,
-            "fzdx": 1,
-            "adcd": "422822100017000",
-            "lgtd": 109.68355508,
-            "lttd": 30.56274252,
-            "cun": 1,
-            "personels": null,
-            "adnm": "大堰社区"
-          }
-        ],
-        "av": 59.69,
-        "fzdx": 2,
-        "adcd": "422822100000000",
-        "lgtd": 109.716677,
-        "lttd": 30.60279,
-        "cun": 2,
-        "personels": [
-          {
-            "phone": "13477216590",
-            "name": "陈明福",
-            "adcd": "422822100000000",
-            "id": 22877
-          },
-          {
-            "phone": "13997795803",
-            "name": "李万崇",
-            "adcd": "422822100000000",
-            "id": 22878
-          },
-          {
-            "phone": "13197238417",
-            "name": "余厚成",
-            "adcd": "422822100000000",
-            "id": 22879
-          },
-          {
-            "phone": "15172838291",
-            "name": "余裕灯",
-            "adcd": "422822100000000",
-            "id": 22880
-          },
-          {
-            "phone": "13886797498",
-            "name": "刘永照",
-            "adcd": "422822100000000",
-            "id": 22881
-          },
-          {
-            "phone": "13997757926",
-            "name": "陈元军",
-            "adcd": "422822100000000",
-            "id": 22882
-          },
-          {
-            "phone": "13593611669",
-            "name": "张北平",
-            "adcd": "422822100000000",
-            "id": 22883
-          },
-          {
-            "phone": "15172808899",
-            "name": "张昌松",
-            "adcd": "422822100000000",
-            "id": 22884
-          },
-          {
-            "phone": "15327047517",
-            "name": "陈义龙",
-            "adcd": "422822100000000",
-            "id": 22885
-          },
-          {
-            "phone": "15307262528",
-            "name": "杨启平",
-            "adcd": "422822100000000",
-            "id": 22886
-          },
-          {
-            "phone": "13581227766",
-            "name": "刘华平",
-            "adcd": "422822100000000",
-            "id": 22887
-          },
-          {
-            "phone": "13972444479",
-            "name": "丁顺学",
-            "adcd": "422822100000000",
-            "id": 22888
-          },
-          {
-            "phone": "15707273168",
-            "name": "邱珍媛",
-            "adcd": "422822100000000",
-            "id": 22889
-          },
-          {
-            "phone": "15549221480",
-            "name": "邱桂英",
-            "adcd": "422822100000000",
-            "id": 22890
-          },
-          {
-            "phone": "13597809991",
-            "name": "刘孝义",
-            "adcd": "422822100000000",
-            "id": 22891
-          },
-          {
-            "phone": "13635763587",
-            "name": "陈明润",
-            "adcd": "422822100000000",
-            "id": 22892
-          },
-          {
-            "phone": "13872718208",
-            "name": "杨世美",
-            "adcd": "422822100000000",
-            "id": 22893
-          },
-          {
-            "phone": "13872720882",
-            "name": "杨洪",
-            "adcd": "422822100000000",
-            "id": 22894
-          },
-          {
-            "phone": "15071872128",
-            "name": "苏祥顺",
-            "adcd": "422822100000000",
-            "id": 22895
-          },
-          {
-            "phone": "15587622998",
-            "name": "向光梅",
-            "adcd": "422822100000000",
-            "id": 22896
-          },
-          {
-            "phone": "15926111496",
-            "name": "高用平",
-            "adcd": "422822100000000",
-            "id": 22897
-          },
-          {
-            "phone": "13197210006",
-            "name": "贺开毅",
-            "adcd": "422822100000000",
-            "id": 22898
-          },
-          {
-            "phone": "13235595993",
-            "name": "王怀翠",
-            "adcd": "422822100000000",
-            "id": 22899
-          },
-          {
-            "phone": "18671826578",
-            "name": "范正波",
-            "adcd": "422822100000000",
-            "id": 22900
-          },
-          {
-            "phone": "13581218881",
-            "name": "李秀斌",
-            "adcd": "422822100000000",
-            "id": 22901
-          },
-          {
-            "phone": "15926140848",
-            "name": "朱光全",
-            "adcd": "422822100000000",
-            "id": 22902
-          },
-          {
-            "phone": "18727683848",
-            "name": "孙朝清",
-            "adcd": "422822100000000",
-            "id": 22903
-          },
-          {
-            "phone": "18871838788",
-            "name": "陈静",
-            "adcd": "422822100000000",
-            "id": 22904
-          },
-          {
-            "phone": "13593632259",
-            "name": "龙克松",
-            "adcd": "422822100000000",
-            "id": 22905
-          },
-          {
-            "phone": "13477930633",
-            "name": "刘志龙",
-            "adcd": "422822100000000",
-            "id": 22906
-          },
-          {
-            "phone": "15335820059",
-            "name": "施兴菊",
-            "adcd": "422822100000000",
-            "id": 22907
-          },
-          {
-            "phone": "18672450652",
-            "name": "付彩艳",
-            "adcd": "422822100000000",
-            "id": 22908
-          },
-          {
-            "phone": "13517188516",
-            "name": "王毅",
-            "adcd": "422822100000000",
-            "id": 22909
-          },
-          {
-            "phone": "13451037924",
-            "name": "施维高",
-            "adcd": "422822100000000",
-            "id": 22910
-          },
-          {
-            "phone": "13697182283",
-            "name": "廖利国",
-            "adcd": "422822100000000",
-            "id": 22911
-          },
-          {
-            "phone": "15587622653",
-            "name": "陈柱翠",
-            "adcd": "422822100000000",
-            "id": 22912
-          },
-          {
-            "phone": "15171086777",
-            "name": "邱军",
-            "adcd": "422822100000000",
-            "id": 22913
-          },
-          {
-            "phone": "18963907353",
-            "name": "谭明清",
-            "adcd": "422822100000000",
-            "id": 22914
-          },
-          {
-            "phone": "13986842705",
-            "name": "周诗英",
-            "adcd": "422822100000000",
-            "id": 22915
-          },
-          {
-            "phone": "15587626538",
-            "name": "唐建妮",
-            "adcd": "422822100000000",
-            "id": 22916
-          },
-          {
-            "phone": "13317261633",
-            "name": "段承勇",
-            "adcd": "422822100000000",
-            "id": 22917
-          },
-          {
-            "phone": "13403025297",
-            "name": "段小平",
-            "adcd": "422822100000000",
-            "id": 22918
-          },
-          {
-            "phone": "13402755328",
-            "name": "康才梅",
-            "adcd": "422822100000000",
-            "id": 22919
-          },
-          {
-            "phone": "13402793389",
-            "name": "易礼寿",
-            "adcd": "422822100000000",
-            "id": 22920
-          },
-          {
-            "phone": "13197238188",
-            "name": "刘诗清",
-            "adcd": "422822100000000",
-            "id": 22921
-          },
-          {
-            "phone": "13872748417",
-            "name": "秦大华",
-            "adcd": "422822100000000",
-            "id": 22922
-          },
-          {
-            "phone": "13886788355",
-            "name": "刘猛",
-            "adcd": "422822100000000",
-            "id": 22923
-          },
-          {
-            "phone": "13403022400",
-            "name": "朱孝玲",
-            "adcd": "422822100000000",
-            "id": 22924
-          },
-          {
-            "phone": "13593619980",
-            "name": "罗启斌",
-            "adcd": "422822100000000",
-            "id": 22925
-          },
-          {
-            "phone": "13367182003",
-            "name": "罗晓红",
-            "adcd": "422822100000000",
-            "id": 22926
-          },
-          {
-            "phone": "13469740931",
-            "name": "李宏松",
-            "adcd": "422822100000000",
-            "id": 22927
-          },
-          {
-            "phone": "15972421734",
-            "name": "易恭梅",
-            "adcd": "422822100000000",
-            "id": 22928
-          },
-          {
-            "phone": "13403008191",
-            "name": "袁作寿",
-            "adcd": "422822100000000",
-            "id": 22929
-          },
-          {
-            "phone": "18672455480",
-            "name": "苏福艳",
-            "adcd": "422822100000000",
-            "id": 22930
-          },
-          {
-            "phone": "18010388769",
-            "name": "胡南平",
-            "adcd": "422822100000000",
-            "id": 22931
-          },
-          {
-            "phone": "13093255758",
-            "name": "熊康梅",
-            "adcd": "422822100000000",
-            "id": 22932
-          },
-          {
-            "phone": "13227431868",
-            "name": "袁友太",
-            "adcd": "422822100000000",
-            "id": 22933
-          },
-          {
-            "phone": "15587623717",
-            "name": "樊玉梅",
-            "adcd": "422822100000000",
-            "id": 22934
-          },
-          {
-            "phone": "15971782959",
-            "name": "谭文玉",
-            "adcd": "422822100000000",
-            "id": 22935
-          },
-          {
-            "phone": "18671859500",
-            "name": "文孝森",
-            "adcd": "422822100000000",
-            "id": 22936
-          },
-          {
-            "phone": "13593642598",
-            "name": "龙世余",
-            "adcd": "422822100000000",
-            "id": 22937
-          },
-          {
-            "phone": "13972407968",
-            "name": "冉建忠",
-            "adcd": "422822100000000",
-            "id": 22938
-          },
-          {
-            "phone": "13403029370",
-            "name": "周远斌",
-            "adcd": "422822100000000",
-            "id": 22939
-          },
-          {
-            "phone": "15071898168",
-            "name": "高功英",
-            "adcd": "422822100000000",
-            "id": 22940
-          },
-          {
-            "phone": "15587438802",
-            "name": "朱祖明",
-            "adcd": "422822100000000",
-            "id": 22941
-          },
-          {
-            "phone": "13377966955",
-            "name": "向斌",
-            "adcd": "422822100000000",
-            "id": 22942
-          },
-          {
-            "phone": "13477223317",
-            "name": "余以秀",
-            "adcd": "422822100000000",
-            "id": 22943
-          },
-          {
-            "phone": "13907260660",
-            "name": "张来",
-            "adcd": "422822100000000",
-            "id": 22944
-          },
-          {
-            "phone": "13886764121",
-            "name": "谭绍清",
-            "adcd": "422822100000000",
-            "id": 22945
-          },
-          {
-            "phone": "15629200010",
-            "name": "谭儒孝",
-            "adcd": "422822100000000",
-            "id": 22946
-          },
-          {
-            "phone": "13617180798",
-            "name": "陈光国",
-            "adcd": "422822100000000",
-            "id": 22947
-          },
-          {
-            "phone": "15587620255",
-            "name": "解维娟",
-            "adcd": "422822100000000",
-            "id": 22948
-          },
-          {
-            "phone": "13636288333",
-            "name": "龙玉才",
-            "adcd": "422822100000000",
-            "id": 22949
-          },
-          {
-            "phone": "15570551228",
-            "name": "邱良轩",
-            "adcd": "422822100000000",
-            "id": 22950
-          },
-          {
-            "phone": "13235467637",
-            "name": "肖明兵",
-            "adcd": "422822100000000",
-            "id": 22951
-          },
-          {
-            "phone": "18907260886",
-            "name": "谢昌国",
-            "adcd": "422822100000000",
-            "id": 22952
-          },
-          {
-            "phone": "13477218047",
-            "name": "齐正松",
-            "adcd": "422822100000000",
-            "id": 22953
-          },
-          {
-            "phone": "13477270806",
-            "name": "王建军",
-            "adcd": "422822100000000",
-            "id": 22954
-          },
-          {
-            "phone": "13402728661",
-            "name": "王大江",
-            "adcd": "422822100000000",
-            "id": 22955
-          },
-          {
-            "phone": "18672449840",
-            "name": "黄永华",
-            "adcd": "422822100000000",
-            "id": 22956
-          },
-          {
-            "phone": "15587620689",
-            "name": "周静萍",
-            "adcd": "422822100000000",
-            "id": 22957
-          },
-          {
-            "phone": "15697268725",
-            "name": "刘凯",
-            "adcd": "422822100000000",
-            "id": 22958
-          },
-          {
-            "phone": "15272949288",
-            "name": "魏森林",
-            "adcd": "422822100000000",
-            "id": 22959
-          },
-          {
-            "phone": "15570508856",
-            "name": "魏凡庆",
-            "adcd": "422822100000000",
-            "id": 22960
-          },
-          {
-            "phone": "13403014285",
-            "name": "黄仁林",
-            "adcd": "422822100000000",
-            "id": 22961
-          },
-          {
-            "phone": "18963925173",
-            "name": "黄军",
-            "adcd": "422822100000000",
-            "id": 22962
-          },
-          {
-            "phone": "15707268360",
-            "name": "彭祖建",
-            "adcd": "422822100000000",
-            "id": 22963
-          },
-          {
-            "phone": "13972405555",
-            "name": "彭滔",
-            "adcd": "422822100000000",
-            "id": 22964
-          },
-          {
-            "phone": "15971826241",
-            "name": "彭明今",
-            "adcd": "422822100000000",
-            "id": 22965
-          },
-          {
-            "phone": "18671145285",
-            "name": "吴学妙",
-            "adcd": "422822100000000",
-            "id": 22966
-          },
-          {
-            "phone": "15327000333",
-            "name": "李来喜",
-            "adcd": "422822100000000",
-            "id": 22967
-          },
-          {
-            "phone": "18972409878",
-            "name": "龙燊",
-            "adcd": "422822100000000",
-            "id": 22968
-          },
-          {
-            "phone": "18972403356",
-            "name": "刘修平",
-            "adcd": "422822100000000",
-            "id": 22969
-          },
-          {
-            "phone": "15671899114",
-            "name": "向泽旺",
-            "adcd": "422822100000000",
-            "id": 22970
-          },
-          {
-            "phone": "13197201222",
-            "name": "罗家华",
-            "adcd": "422822100000000",
-            "id": 22971
-          },
-          {
-            "phone": "13972407350",
-            "name": "龙小青",
-            "adcd": "422822100000000",
-            "id": 22972
-          },
-          {
-            "phone": "13997764216",
-            "name": "李玉芝",
-            "adcd": "422822100000000",
-            "id": 22973
-          },
-          {
-            "phone": "18972403286",
-            "name": "黄柳",
-            "adcd": "422822100000000",
-            "id": 22974
-          },
-          {
-            "phone": "15971798398",
-            "name": "周光平",
-            "adcd": "422822100000000",
-            "id": 22975
-          },
-          {
-            "phone": "13402763815",
-            "name": "邹仕香",
-            "adcd": "422822100000000",
-            "id": 22976
-          },
-          {
-            "phone": "18972403388",
-            "name": "易礼鑫",
-            "adcd": "422822100000000",
-            "id": 22977
-          },
-          {
-            "phone": "18986851131",
-            "name": "于祥根",
-            "adcd": "422822100000000",
-            "id": 22978
-          },
-          {
-            "phone": "18972403368",
-            "name": "黄建军",
-            "adcd": "422822100000000",
-            "id": 22979
-          },
-          {
-            "phone": "13177113903",
-            "name": "舒绪东",
-            "adcd": "422822100000000",
-            "id": 22980
-          },
-          {
-            "phone": "18972403287",
-            "name": "孙桃章",
-            "adcd": "422822100000000",
-            "id": 22981
-          },
-          {
-            "phone": "13597758056",
-            "name": "冉茂勇",
-            "adcd": "422822100000000",
-            "id": 22982
-          },
-          {
-            "phone": "13997795803",
-            "name": "李万崇",
-            "adcd": "422822100000000",
-            "id": 22983
-          },
-          {
-            "phone": "13197238417",
-            "name": "余厚成",
-            "adcd": "422822100000000",
-            "id": 22984
-          },
-          {
-            "phone": "13403008122",
-            "name": "刘爱萍",
-            "adcd": "422822100000000",
-            "id": 22985
-          },
-          {
-            "phone": "13367188080",
-            "name": "陈晓玲",
-            "adcd": "422822100000000",
-            "id": 22986
-          },
-          {
-            "phone": "15307262528",
-            "name": "杨启平",
-            "adcd": "422822100000000",
-            "id": 22987
-          },
-          {
-            "phone": "13177138769",
-            "name": "杨正华",
-            "adcd": "422822100000000",
-            "id": 22988
-          },
-          {
-            "phone": "15335837626",
-            "name": "邱贤生",
-            "adcd": "422822100000000",
-            "id": 22989
-          },
-          {
-            "phone": "13597809991",
-            "name": "刘孝义",
-            "adcd": "422822100000000",
-            "id": 22990
-          },
-          {
-            "phone": "13872720882",
-            "name": "杨  洪",
-            "adcd": "422822100000000",
-            "id": 22991
-          },
-          {
-            "phone": "15071872128",
-            "name": "苏祥顺",
-            "adcd": "422822100000000",
-            "id": 22992
-          },
-          {
-            "phone": "15926111496",
-            "name": "高用平",
-            "adcd": "422822100000000",
-            "id": 22993
-          },
-          {
-            "phone": "18727743331",
-            "name": "廖文静",
-            "adcd": "422822100000000",
-            "id": 22994
-          },
-          {
-            "phone": "18727758023",
-            "name": "高杰",
-            "adcd": "422822100000000",
-            "id": 22995
-          },
-          {
-            "phone": "18727683848",
-            "name": "孙朝清",
-            "adcd": "422822100000000",
-            "id": 22996
-          },
-          {
-            "phone": "13636282288",
-            "name": "朱安全",
-            "adcd": "422822100000000",
-            "id": 22997
-          },
-          {
-            "phone": "15335820059",
-            "name": "施兴菊",
-            "adcd": "422822100000000",
-            "id": 22998
-          },
-          {
-            "phone": "13517188516",
-            "name": "王毅",
-            "adcd": "422822100000000",
-            "id": 22999
-          },
-          {
-            "phone": "13697182283",
-            "name": "廖利国",
-            "adcd": "422822100000000",
-            "id": 23000
-          },
-          {
-            "phone": "15171086777",
-            "name": "邱军",
-            "adcd": "422822100000000",
-            "id": 23001
-          },
-          {
-            "phone": "15587626538",
-            "name": "唐建妮",
-            "adcd": "422822100000000",
-            "id": 23002
-          },
-          {
-            "phone": "13402755328",
-            "name": "康才梅",
-            "adcd": "422822100000000",
-            "id": 23003
-          },
-          {
-            "phone": "13197238188",
-            "name": "刘诗清",
-            "adcd": "422822100000000",
-            "id": 23004
-          },
-          {
-            "phone": "13886788355",
-            "name": "刘猛",
-            "adcd": "422822100000000",
-            "id": 23005
-          },
-          {
-            "phone": "13593619980",
-            "name": "罗启斌",
-            "adcd": "422822100000000",
-            "id": 23006
-          },
-          {
-            "phone": "13469740931",
-            "name": "李宏松",
-            "adcd": "422822100000000",
-            "id": 23007
-          },
-          {
-            "phone": "15587632631",
-            "name": "苏福艳",
-            "adcd": "422822100000000",
-            "id": 23008
-          },
-          {
-            "phone": "18971891177",
-            "name": "袁小军",
-            "adcd": "422822100000000",
-            "id": 23009
-          },
-          {
-            "phone": "13227431868",
-            "name": "袁友太",
-            "adcd": "422822100000000",
-            "id": 23010
-          },
-          {
-            "phone": "18671859500",
-            "name": "文孝森",
-            "adcd": "422822100000000",
-            "id": 23011
-          },
-          {
-            "phone": "13972407968",
-            "name": "冉建忠",
-            "adcd": "422822100000000",
-            "id": 23012
-          },
-          {
-            "phone": "13277543843",
-            "name": "周信平",
-            "adcd": "422822100000000",
-            "id": 23013
-          },
-          {
-            "phone": "13377966955",
-            "name": "向斌",
-            "adcd": "422822100000000",
-            "id": 23014
-          },
-          {
-            "phone": "13477223317",
-            "name": "余以秀",
-            "adcd": "422822100000000",
-            "id": 23015
-          },
-          {
-            "phone": "13886764121",
-            "name": "谭绍清",
-            "adcd": "422822100000000",
-            "id": 23016
-          },
-          {
-            "phone": "15502757758",
-            "name": "邓芳",
-            "adcd": "422822100000000",
-            "id": 23017
-          },
-          {
-            "phone": "13636288333",
-            "name": "龙玉才",
-            "adcd": "422822100000000",
-            "id": 23018
-          },
-          {
-            "phone": "13235467037",
-            "name": "肖明兵",
-            "adcd": "422822100000000",
-            "id": 23019
-          },
-          {
-            "phone": "18007260908",
-            "name": "杨龙",
-            "adcd": "422822100000000",
-            "id": 23020
-          },
-          {
-            "phone": "13597772632",
-            "name": "孙宗林",
-            "adcd": "422822100000000",
-            "id": 23021
-          },
-          {
-            "phone": "15587620689",
-            "name": "周静萍",
-            "adcd": "422822100000000",
-            "id": 23022
-          },
-          {
-            "phone": "18071929282",
-            "name": "胡  魏",
-            "adcd": "422822100000000",
-            "id": 23023
-          },
-          {
-            "phone": "18963925173",
-            "name": "黄军",
-            "adcd": "422822100000000",
-            "id": 23024
-          },
-          {
-            "phone": "15707268360",
-            "name": "彭祖建",
-            "adcd": "422822100000000",
-            "id": 23025
-          },
-          {
-            "phone": "18671145285",
-            "name": "吴学妙",
-            "adcd": "422822100000000",
-            "id": 23026
-          },
-          {
-            "phone": "18571228118",
-            "name": "涂才喜",
-            "adcd": "422822100000000",
-            "id": 23027
-          },
-          {
-            "phone": "18972403356",
-            "name": "刘修平",
-            "adcd": "422822100000000",
-            "id": 23028
-          },
-          {
-            "phone": "13197201222",
-            "name": "罗家华",
-            "adcd": "422822100000000",
-            "id": 23029
-          },
-          {
-            "phone": "15571861826",
-            "name": "石兰",
-            "adcd": "422822100000000",
-            "id": 23030
-          },
-          {
-            "phone": "15971798398",
-            "name": "周光平",
-            "adcd": "422822100000000",
-            "id": 23031
-          },
-          {
-            "phone": "13593649868",
-            "name": "向初东",
-            "adcd": "422822100000000",
-            "id": 23032
-          },
-          {
-            "phone": "18972403368",
-            "name": "黄建军",
-            "adcd": "422822100000000",
-            "id": 23033
-          },
-          {
-            "phone": "18972403287",
-            "name": "孙涛章",
-            "adcd": "422822100000000",
-            "id": 23034
-          },
-          {
-            "phone": "15571884111",
-            "name": "周和平",
-            "adcd": "422822100000000",
-            "id": 23035
-          },
-          {
-            "phone": "13886797791",
-            "name": "苏国顺",
-            "adcd": "422822100000000",
-            "id": 23036
-          },
-          {
-            "phone": "13402722345",
-            "name": "姚永红",
-            "adcd": "422822100000000",
-            "id": 23037
-          },
-          {
-            "phone": "13477934800",
-            "name": "冉云峰",
-            "adcd": "422822100000000",
-            "id": 23038
-          },
-          {
-            "phone": "13647188286",
-            "name": "朱祖倚",
-            "adcd": "422822100000000",
-            "id": 23039
-          },
-          {
-            "phone": "13971883788",
-            "name": "张金彪",
-            "adcd": "422822100000000",
-            "id": 23040
-          },
-          {
-            "phone": "18972403378",
-            "name": "邱昌松",
-            "adcd": "422822100000000",
-            "id": 23041
-          },
-          {
-            "phone": "13886797791",
-            "name": "苏国顺",
-            "adcd": "422822100000000",
-            "id": 23042
-          },
-          {
-            "phone": "15587640709",
-            "name": "彭斌",
-            "adcd": "422822100000000",
-            "id": 23043
-          },
-          {
-            "phone": "13402722345",
-            "name": "姚永红",
-            "adcd": "422822100000000",
-            "id": 23044
-          },
-          {
-            "phone": "13477934800",
-            "name": "冉云峰",
-            "adcd": "422822100000000",
-            "id": 23045
-          },
-          {
-            "phone": "18807261555",
-            "name": "李宗斌",
-            "adcd": "422822100000000",
-            "id": 23046
-          },
-          {
-            "phone": "13971883788",
-            "name": "张金彪",
-            "adcd": "422822100000000",
-            "id": 23047
-          },
-          {
-            "phone": "18972403378",
-            "name": "邱昌松",
-            "adcd": "422822100000000",
-            "id": 23048
-          }
-        ],
-        "adnm": "业州镇"
-      }
-    ],
-  //短临河道预警
-  dlhdyjData: systemSwitchType?
-    [
-      {name:"河道断面1", adnm:"湾潭镇", warnGrade_TYPE: "高", tm:"2022-11-10 10:30:12", },
-      {name:"河道断面2", adnm:"湾潭镇", warnGrade_TYPE: "高", tm:"2022-11-10 10:30:12", }
-    ]:
-    [
-      {name:"河道断面1", adnm:"业州镇", warnGrade_TYPE: "高", tm:"2022-11-10 10:30:12", },
-      {name:"河道断面2", adnm:"业州镇", warnGrade_TYPE: "高", tm:"2022-11-10 10:30:12", }
-    ],
-  //小水库风险预警预警信息
-  xskfxyjData: systemSwitchType?
-    {
-      "stcd": "90017776",
-      "type": "sk",
-      "hasRz": true,
-      "stnm": "秦家湾水库",
-      "adcd": "420529101000",
-      "wscd": null,
-      "importancy": 0,
-      "lgtd": 109.921667,
-      "lttd": 29.936667,
-      "elev": 0,
-      "damel": 596.3,
-      "dsflz": 595.35,
-      "fsltdz": 594.77,
-      "ddz": 589,
-      "zcxsw": 594.77,
-      "yuwai": false,
-      "drpTm": "2022-12-07T06:00:00.000Z",
-      "today": 0,
-      "h1": 0,
-      "h3": 0,
-      "h6": 0,
-      "h12": 0,
-      "h24": 0.3,
-      "h48": 2,
-      "drpState": 1,
-      "rz": 590.51,
-      "w": 0.001,
-      "a_fsltdz": -4.259999999999991,
-      "rzTm": "2022-12-07T06:00:00.000Z",
-      "rzWarning": 0,
-      "rzState": 1,
-      "pic": [
-        {
-          "stcd": "90017776",
-          "tm": "2022-12-07T06:02:03.000Z",
-          "url": "http://223.75.53.106:8891/skjgimages/2022/1207/90017776/20221207140203.jpg"
-        },
-        {
-          "stcd": "90017776",
-          "tm": "2022-12-07T04:02:03.000Z",
-          "url": "http://223.75.53.106:8891/skjgimages/2022/1207/90012059/20221207120203.jpg"
-        }
-      ],
-      "aRz": -4.26,
-      "strarz": "-4.26",
-      "id": "90017776",
-      "name": "秦家湾水库"
-    }:
-    {
-      "stcd": "90012058",
-      "type": "sk",
-      "hasRz": true,
-      "stnm": "太平水库",
-      "adcd": "422822100000",
-      "wscd": null,
-      "importancy": 0,
-      "lgtd": 109.686111,
-      "lttd": 30.595833,
-      "elev": 0,
-      "damel": 596.3,
-      "dsflz": 595.35,
-      "fsltdz": 594.77,
-      "ddz": 589,
-      "zcxsw": 594.77,
-      "yuwai": false,
-      "drpTm": "2022-12-07T06:00:00.000Z",
-      "today": 0,
-      "h1": 0,
-      "h3": 0,
-      "h6": 0,
-      "h12": 0,
-      "h24": 0,
-      "h48": 0,
-      "drpState": 1,
-      "rz": 590.51,
-      "w": 0.001,
-      "a_fsltdz": -4.259999999999991,
-      "rzTm": "2022-12-07T06:00:00.000Z",
-      "rzWarning": 0,
-      "rzState": 1,
-      "pic": [
-        {
-          "stcd": "90012058",
-          "tm": "2022-12-07T06:02:03.000Z",
-          "url": "http://223.75.53.106:8891/skjgimages/2022/1207/90012058/20221207140203.jpg"
-        },
-        {
-          "stcd": "90012058",
-          "tm": "2022-12-07T04:02:03.000Z",
-          "url": "http://223.75.53.106:8891/skjgimages/2022/1207/90012059/20221207120203.jpg"
-        }
-      ],
-      "aRz": -4.26,
-      "strarz": "-4.26",
-      "id": "90012058",
-      "name": "太平水库"
-    },
-  xc_xskfxyjData: systemSwitchType?
-  {
-    "stcd": "90006513",
-    "type": "sk",
-    "hasRz": true,
-    "stnm": "南河水库",
-    "adcd": "",
-    "wscd": null,
-    "importancy": 0,
-    "lgtd": 111.005503,
-    "lttd": 30.082441,
-    "elev": 0,
-    "damel": 589.3,
-    "dsflz": 586.26,
-    "fsltdz": 582.8,
-    "ddz": 565.3,
-    "zcxsw": 582.8,
-    "yuwai": false,
-    "drpTm": "2023-03-02T05:00:00.000Z",
-    "today": 0,
-    "h1": 0,
-    "h3": 0,
-    "h6": 0,
-    "h12": 0,
-    "h24": 0,
-    "h48": 0,
-    "drpState": 1,
-    "rz": 573.23,
-    "w": 0.571,
-    "a_fsltdz": -9.569999999999936,
-    "rzTm": "2023-03-02 05:00:00",
-    "rzWarning": 0,
-    "rzState": 1,
-    "pic": [
-      {
-        "stcd": "90006513",
-        "tm": "2023-03-02T04:02:00.000Z",
-        "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90006513/20230302120200.jpg"
-      },
-      {
-        "stcd": "90006513",
-        "tm": "2023-03-02T02:02:02.000Z",
-        "url": "http://223.75.53.106:8891/skjgimages/2023/0302/90006514/20230302100202.jpg"
-      }
-    ],
-      "aRz": -4.26,
-      "strarz": "-4.26",
-      "id": "90006513",
-      "name": "太平水库"
-  }:{
-    "stcd": "90012058",
-    "type": "sk",
-    "hasRz": true,
-    "stnm": "太平水库",
-    "adcd": "422822100000",
-    "wscd": null,
-    "importancy": 0,
-    "lgtd": 109.686111,
-    "lttd": 30.595833,
-    "elev": 0,
-    "damel": 596.3,
-    "dsflz": 595.35,
-    "fsltdz": 594.77,
-    "ddz": 589,
-    "zcxsw": 594.77,
-    "yuwai": false,
-    "drpTm": "2022-12-07T06:00:00.000Z",
-    "today": 0,
-    "h1": 0,
-    "h3": 0,
-    "h6": 0,
-    "h12": 0,
-    "h24": 0,
-    "h48": 0,
-    "drpState": 1,
-    "rz": 590.51,
-    "w": 0.001,
-    "a_fsltdz": -4.259999999999991,
-    "rzTm": "2022-12-07T06:00:00.000Z",
-    "rzWarning": 0,
-    "rzState": 1,
-    "pic": [
-      {
-        "stcd": "90012058",
-        "tm": "2022-12-07T06:02:03.000Z",
-        "url": "http://223.75.53.106:8891/skjgimages/2022/1207/90012058/20221207140203.jpg"
-      },
-      {
-        "stcd": "90012058",
-        "tm": "2022-12-07T04:02:03.000Z",
-        "url": "http://223.75.53.106:8891/skjgimages/2022/1207/90012059/20221207120203.jpg"
-      }
-    ],
-    "aRz": -4.26,
-    "strarz": "-4.26",
-    "id": "90012058",
-    "name": "太平水库"
-  },
-  //调查评价详情 C02-行政区划总体情况表
-  dcpjTableC: systemSwitchType?
-    [
-      {ADCD:"420529101001000", ZHEN:"五峰镇", ADNM:"北门社区", PCOUNT: "3164", HTCOUNT:"1536", LDAREA:"1.5", PLAREA:"230", formateFangzhiquType:"非防治区",},
-      {ADCD:"422822100011101", ZHEN:"五峰镇", ADNM:"北门社区中", PCOUNT: "1054", HTCOUNT:"512", LDAREA:"2.5", PLAREA:"10", formateFangzhiquType:"重点防治区",},
-    ]:
-    [
-      {ADCD:"422822100005000", ZHEN:"业州镇", ADNM:"二道桥社区", PCOUNT: "1854", HTCOUNT:"350", LDAREA:"1.37", PLAREA:"20.55", formateFangzhiquType:"非防治区",},
-      {ADCD:"422822100011101", ZHEN:"业州镇", ADNM:"七里坪社区2组", PCOUNT: "318", HTCOUNT:"186", LDAREA:"0.2", PLAREA:"197.95", formateFangzhiquType:"重点防治区",},
-    ],
-  //调查评价详情 防治区基本情况调查成果汇总表
-  dcpjTableHzb: systemSwitchType?
-    [
-      {ADCD:"420529101001000", ZHEN:"五峰镇", ADNM:"北门社区上", PCOUNT: "1055", HTCOUNT:"512", LDAREA:"2.5", PLAREA:"10", ECOUNT1:"0",ECOUNT2:"7",ECOUNT3:"10",},
-      {ADCD:"422822100011101", ZHEN:"五峰镇", ADNM:"北门社区中", PCOUNT: "1054", HTCOUNT:"512", LDAREA:"2.5", PLAREA:"10", ECOUNT1:"0",ECOUNT2:"5",ECOUNT3:"12",},
-    ]:
-    [
-      {ADCD:"422822100005000", ZHEN:"业州镇", ADNM:"二道桥社区1组", PCOUNT: "556", HTCOUNT:"102", LDAREA:"0.42", PLAREA:"6.2", ECOUNT1:"10",ECOUNT2:"50",ECOUNT3:"27",},
-      {ADCD:"422822100011101", ZHEN:"业州镇", ADNM:"二道桥社区2组", PCOUNT: "371", HTCOUNT:"72", LDAREA:"0.27", PLAREA:"5.5", ECOUNT1:"10",ECOUNT2:"21",ECOUNT3:"25",},
-    ],
-  //预报-流量分析-详情
-  flowAnalysisTableData: systemSwitchType?
-    [
-      {
-        "type": 7,
-        "typeName": "超历史最大",
-        "flowSign": null,
-        "flowDetails": []
-      }, {
-      "type": 6,
-      "typeName": "超100年一遇",
-      "flowSign": null,
-      "flowDetails": []
-    }, {
-      "type": 5,
-      "typeName": "超50年一遇",
-      "flowSign": null,
-      "flowDetails": []
-    }, {
-      "type": 4,
-      "typeName": "超20年一遇",
-      "flowSign": null,
-      "flowDetails": [{
-        "rvcd": "AFF1320101W00000",
-        "village": ["三组(幺牌）"],
-        "villagePoint": [
-          [110.4079470, 30.0139430]
-        ],
-        "villagePeople": 318,
-        "flow": 48.62,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 1,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }, {
-        "rvcd": "AFF1320101X00000",
-        "village": ["二组（红旗2）"],
-        "villagePoint": [
-          [110.4037660, 30.0166410]
-        ],
-        "villagePeople": 100,
-        "flow": 50.45,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 1,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 4,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }]
-    }, {
-      "type": 3,
-      "typeName": "超10年一遇",
-      "flowSign": null,
-      "flowDetails": []
-    }, {
-      "type": 2,
-      "typeName": "超5年一遇",
-      "flowSign": null,
-      "flowDetails": [{
-        "rvcd": "AFF1320101I00000",
-        "village": ["三组（关岔口）"],
-        "villagePoint": [
-          [110.4786600, 30.0809960]
-        ],
-        "villagePeople": 197,
-        "flow": 30.69,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 1,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }, {
-        "rvcd": "AFF1320101K00000",
-        "village": ["一组（八里铺）"],
-        "villagePoint": [
-          [110.4589630, 30.0748370]
-        ],
-        "villagePeople": 295,
-        "flow": 33.24,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 1,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }, {
-        "rvcd": "AFF1320101P00000",
-        "village": ["四组", "二组（胡家坪）"],
-        "villagePoint": [
-          [110.4351040, 30.0577280],
-          [110.4397220, 30.0555510]
-        ],
-        "villagePeople": 686,
-        "flow": 35.24,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 2,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }, {
-        "rvcd": "AFF1320101R00000",
-        "village": ["下街", "四组（覃家坪）"],
-        "villagePoint": [
-          [110.4270070, 30.0411870],
-          [110.4304040, 30.0367250]
-        ],
-        "villagePeople": 631,
-        "flow": 42.09,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 2,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }, {
-        "rvcd": "AFF1320101T00000",
-        "village": ["五组（田家坪）"],
-        "villagePoint": [
-          [110.4251860, 30.0307050]
-        ],
-        "villagePeople": 424,
-        "flow": 42.89,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 1,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }]
-    }, {
-      "type": 1,
-      "typeName": "超2年一遇",
-      "flowSign": null,
-      "flowDetails": [{
-        "rvcd": "AFF1320101G00000",
-        "village": ["二组（横河）"],
-        "villagePoint": [
-          [110.4750100, 30.0978440]
-        ],
-        "villagePeople": 214,
-        "flow": 22.67,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 1,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }, {
-        "rvcd": "AFF1320101GW0000",
-        "village": ["一组（龚家坪）"],
-        "villagePoint": [
-          [110.3704460, 30.0496100]
-        ],
-        "villagePeople": 89,
-        "flow": 23.44,
-        "time": "2017-07-15 00:00:00",
-        "villageCount": 1,
-        "eventId": "eecb648a-d228-462a-b5a1-5235a3699248",
-        "type": 3,
-        "riverMapCenter": null,
-        "town": null,
-        "riverArea": null,
-        "totalDrp": null
-      }]
-    }
-    ]:
-    [],
-  //预报-流量分析-沿河村庄
-  villagesAlongRiverData: systemSwitchType?
-    {
-      "stcd": null,
-      "stationName": null,
-      "belongRegion": null,
-      "address": null,
-      "villageList": [{
-        "villageCode": "420529105201100",
-        "level": null,
-        "superiorCode": null,
-        "lgtd": null,
-        "lttd": null,
-        "city": "五峰土家族自治县",
-        "town": "湾潭镇",
-        "village": "五组（田家坪）",
-        "floodCtlAbility": null,
-        "riskContactList": null,
-        "distance": "0.31",
-        "riskRainList": null,
-        "plan": null,
-        "htcount": 124,
-        "pcount": 424
-      }]
-    }:
-    {},
-  //预报-淹没分析-详情
-  inundationAnalysisData: systemSwitchType?
-    [
-      {
-      "type": 3,
-      "typeName": "1m以上",
-      "villageCount": 0,
-      "submergeDetails": []
-    }, {
-      "type": 2,
-      "typeName": "0.5m到1m",
-      "villageCount": 1,
-      "submergeDetails": [{
-        "adcd": "420529105001100",
-        "village": "二组（红旗2）",
-        "town": "湾潭镇",
-        "forecastTime": "2017-07-15 03:00:00",
-        "floodDeep": 0.8396,
-        "peakTime": "2017-07-15 04:00:00",
-        "riskLevel": 2,
-        "lgtd": 110.4257850,
-        "lttd": 30.0530440,
-        "eventId": "d45799b9-b5a1-4352-8846-45f0b66b3ba7",
-        "hcount": 74,
-        "pcount": 249,
-        "floodRange": 11,
-        "transLeader": null,
-        "patrolLeader": null,
-        "adminLeader": "许岳文",
-        "riskContactList": [],
-        "dangerPoint": [],
-        "house": 74
-      }]
-    }, {
-      "type": 1,
-      "typeName": "0.5m以下",
-      "villageCount": 1,
-      "submergeDetails": [{
-        "adcd": "420529105203102",
-        "village": "二组（小凤池上）",
-        "town": "湾潭镇",
-        "forecastTime": "2017-07-15 03:00:00",
-        "floodDeep": 0.04,
-        "peakTime": "2017-07-15 03:10:00",
-        "riskLevel": 1,
-        "lgtd": 110.4115400,
-        "lttd": 30.0328230,
-        "eventId": "d45799b9-b5a1-4352-8846-45f0b66b3ba7",
-        "hcount": 56,
-        "pcount": 186,
-        "floodRange": 11,
-        "transLeader": null,
-        "patrolLeader": null,
-        "adminLeader": "向青松(小凤池村)",
-        "riskContactList": [],
-        "dangerPoint": [],
-        "house": 56
-      }]
-    }]:
-    [],
-  //预报-淹没分析-村庄详情
-  villagesDetails: systemSwitchType?
-    {
-      "adcd": "420529105001100",
-      "adnm": "上街",
-      "pcount": 249,
-      "htcount": 74,
-      "house": 74,
-      "plarea": 225.00,
-      "prepareTransfer": [],
-      "transferNow": [],
-      "watershedArea": 236.83,
-      "avgSlope": 0.0000,
-      "autoStation": 0,
-      "simpleRainStation": 0,
-      "bridgeCnt": 0,
-      "culvert": 0,
-      "simpleWaterStation": 0,
-      "radioStation": 0,
-      "barrages": 0,
-      "img": "http://223.75.53.141:8000/village/420529105001100.jpg"
-    }:
-    {},
-  //预报-淹没分析-通讯录
-  mailListData: systemSwitchType?
-    {
-      "village": [{
-        "name": "余学愚(居委会)",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "13972570038"
-      }],
-      "town": [
-        {
-        "name": "王兴虹",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "13872663188"
-      }, {
-        "name": "陈也",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "15171757460"
-      }, {
-        "name": "鲍  繁",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "18727290521"
-      }, {
-        "name": "赵金霞",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "15271515515"
-      }, {
-        "name": "周云",
-        "adcdNameAndJob": "湾潭镇/分管负责人",
-        "tphoneAndMPhone": "15997679238"
-      }, {
-        "name": "向文锋",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "15171740777"
-      }, {
-        "name": "康  健",
-        "adcdNameAndJob": "湾潭镇/镇党委书记",
-        "tphoneAndMPhone": "13997659808"
-      }, {
-        "name": "刘芃池",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "13872613268"
-      }, {
-        "name": "徐雷",
-        "adcdNameAndJob": "湾潭镇/镇长",
-        "tphoneAndMPhone": "15071766557"
-      }, {
-        "name": "向丹丽",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "15997515025"
-      }, {
-        "name": "邵  波",
-        "adcdNameAndJob": "湾潭镇/",
-        "tphoneAndMPhone": "13972019960"
-      }],
-      "county": [
-        {
-        "name": "李星宇",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "19164204427"
-      }, {
-        "name": "史红兵",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "18164177959"
-      }, {
-        "name": "杨映红",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "13872613888"
-      }, {
-        "name": "李沐",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "15807201166"
-      }, {
-        "name": "顾劲松",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "13872672905"
-      }, {
-        "name": "刘传会",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "13886721798"
-      }, {
-        "name": "叶敬文",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "13343549555"
-      }, {
-        "name": "李佳鑫",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "15342466613"
-      }, {
-        "name": "李绪东",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "15307202126"
-      }, {
-        "name": "汪汝强",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "18827088825"
-      }, {
-        "name": "陈  力",
-        "adcdNameAndJob": "/",
-        "tphoneAndMPhone": "15171899777"
-      }]
-    }:
-    {},
-  //预警-预报预警
-  ybyjData: systemSwitchType?
-    [
-      {
-        "type": 1,
-        "typeName": "危险",
-        "villageCount": 1,
-        "submergeDetails": [
-          {
-            // "county": "宜昌市",
-            "county": "五峰县",
-
-            townList:[
-              {id:1, name:"五峰县", town:"湾潭镇", village: "红烈村", "lgtd": 110.392784,"lttd": 30.014833,tm:"2017-07-15 00:00:00", type: 0},
-              {id:2, name:"五峰县", town:"湾潭镇", village: "金山村", "lgtd": 110.430634,"lttd": 30.04808,tm:"2017-07-15 00:00:00", type: 0},
-              {id:3, name:"五峰县", town:"湾潭镇 ", village: "锁金山村", "lgtd": 110.347061,"lttd": 29.978741,tm:"2017-07-15 00:00:00", type: 0},
-              {id:4, name:"五峰县", town:"湾潭镇 ", village: "鹿耳庄村", "lgtd": 110.36763,"lttd": 29.993582,tm:"2017-07-15 00:00:00", type: 0},
-            ],
-            "adcd": "",
-          }
-        ]
-      },
-      {
-        "type": 2,
-        "typeName": "警戒",
-        "villageCount": 1,
-        "submergeDetails": []
-      },
-      {
-        "type": 3,
-        "typeName": "关注",
-        "villageCount": 0,
-        "submergeDetails": []
-      }
-    ]:
-    [],
-  //预案-预演预案-预演方案
-  yyfaData: systemSwitchType?
-    [
-      {
-        "id": 11,
-        "planName": "湾潭河历史降雨-降雨放大150%-无隐患",
-        "customWatershedCode": "HBWS000000002",
-        "status": 1,
-        "createBy": null,
-        "createTime": "2023-03-16 14:18:11",
-        "updateBy": null,
-        "updateTime": "2023-03-16 14:55:24",
-        "previewUuid": "488937ca-3a82-4528-88be-701c0c2e3ea1",
-        "fid": 61,
-        "previewType": "3",
-        "rainfallTimeStart": "2023-03-14 00:00:00",
-        "rainfallTimeStop": "2023-03-15 00:00:00",
-        "dangerType": "实测降雨+无隐患",
-        "dangerName": "湾潭河无隐患",
-        "dangerPoint": null
-      }, {
-      "id": 1,
-      "planName": "2022年鹰潭河-降雨放大50%-白果湾桥梁01溃决",
-      "customWatershedCode": "HBWS000000002",
-      "status": 1,
-      "createBy": null,
-      "createTime": "2022-10-08 23:09:34",
-      "updateBy": 1,
-      "updateTime": "2022-12-13 15:21:43",
-      // "previewUuid": "1001",
-      "fid": 19,
-      // "previewType": "3",
-
-      "previewType": "现在时",
-      "previewUuid": "6f5cd2e6-573c-4788-b6f3-5292f95c1ae5",
-
-      "rainfallTimeStart": "2022-11-27 10:00:00",
-      "rainfallTimeStop": "2022-11-28 09:00:00",
-      "dangerType": "实测降雨+堵塞",
-      "dangerName": "白果湾桥梁01溃决",
-      "dangerPoint": null
-    }]:
-    [],
-  //加载方案
-  loadSchemeData: systemSwitchType?
-    {
-      "createBy": null,
-      "createTime": "2023-03-16 14:18:11",
-      "updateBy": null,
-      "updateTime": "2023-03-16 14:55:24",
-      "status": 1,
-      "id": 11,
-      "planName": "湾潭河历史降雨-降雨放大150%-无隐患",
-      "customWatershedCode": "HBWS000000002",
-      // "previewUuid": "488937ca-3a82-4528-88be-701c0c2e3ea1",
-      // "previewType": 3,
-      // 新配置
-      "previewType": "现在时",
-      "previewUuid": "6f5cd2e6-573c-4788-b6f3-5292f95c1ae5",
-    
-      "rainfallTimeStart": "2023-03-14 00:00:00",
-      "rainfallTimeStop": "2023-03-15 00:00:00",
-      "dangerPoint": "湾潭河无隐患",
-      "dangerType": "无隐患",
-      "fid": 61,
-      "createByName": null
-    }:
-    {},
-  //预演预案-雨水情
-  rainConditionData: systemSwitchType?
-    {
-      "pointStatisticsList": [
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<53.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<64.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<72.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<83.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<97.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        }
-      ],
-      "faceStatisticsList": [
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<53.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<64.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<72.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<83.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        },
-        {
-          "hour": null,
-          "rainDrp": 0,
-          "rainfallStandard": "<97.0",
-          "rainfallRate": "小于5年一遇",
-          "colorSign": 1
-        }
-      ],
-      "currentForecastVOList": null,
-      "futureForecastVOList": null,
-      "presentRainDistributeVO": null,
-      "historyDrpDTOList": null
-    }:
-    {},
-  //预演预案-对照信息
-  comparisonInforData: systemSwitchType?
-    [
-      {
-        "adcd": "420529105201100",
-        "adcdName": "五组（田家坪）",
-        "riskTime": "2023-03-15 00:00:00",
-        "previewLevel": 1,
-        "previewRiskLevel": "危险",
-        "forecastLevel": null,
-        "forecastRiskLevel": null,
-        "forecastRiskTime": null,
-        "lgtd": 110.42518615722656,
-        "lttd": 30.030704498291016,
-        "padcd": null,
-        "padcdName": "湾潭镇"
-      }, {
-      "adcd": "420529105201103",
-      "adcdName": "四组（覃家坪）",
-      "riskTime": "2023-03-15 00:00:00",
-      "previewLevel": 1,
-      "previewRiskLevel": "危险",
-      "forecastLevel": null,
-      "forecastRiskLevel": null,
-      "forecastRiskTime": null,
-      "lgtd": 110.43040466308594,
-      "lttd": 30.036724090576172,
-      "padcd": null,
-      "padcdName": "湾潭镇"
-    }, {
-      "adcd": "420529105205102",
-      "adcdName": "三组(幺牌）",
-      "riskTime": "2023-03-15 00:00:00",
-      "previewLevel": 1,
-      "previewRiskLevel": "危险",
-      "forecastLevel": null,
-      "forecastRiskLevel": null,
-      "forecastRiskTime": null,
-      "lgtd": 110.40794372558594,
-      "lttd": 30.01394271850586,
-      "padcd": null,
-      "padcdName": "湾潭镇"
-    }, {
-      "adcd": "420529105001102",
-      "adcdName": "下街",
-      "riskTime": "2023-03-15 00:00:00",
-      "previewLevel": 1,
-      "previewRiskLevel": "危险",
-      "forecastLevel": null,
-      "forecastRiskLevel": null,
-      "forecastRiskTime": null,
-      "lgtd": 110.42700958251953,
-      "lttd": 30.041187286376953,
-      "padcd": null,
-      "padcdName": "湾潭镇"
-    }]:
-    [],
-};
-
-export default staticData;
\ No newline at end of file
diff --git a/src/views/Home/tqyb/drpOption.js b/src/views/Home/tqyb/drpOption.js
deleted file mode 100644
index cd86d71..0000000
--- a/src/views/Home/tqyb/drpOption.js
+++ /dev/null
@@ -1,136 +0,0 @@
-export default function drpOption(data) {
-  console.log("data",data);
-  const maxVal = 0//Math.max(...data.map(obj => obj.drp))
-  const maxSw = Math.max(...data.map(obj => obj.ll))
-  const minSw = Math.min(...data.map(obj => obj.ll))
-  const maxLl = Math.max(...data.map(obj => obj.sl))
-  const minLl = Math.min(...data.map(obj => obj.sl))
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-
-    },
-    grid: [
-      {
-        top: "12%",
-        left: "10%",
-        right: "8%",
-        width: '80%',
-        height: '75%'
-      },
-    ],
-    legend: {
-      // 显示图例
-      show: true,
-      // 图例的位置
-      data: ["水位", "流量"],
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.yl),
-        inverse: true,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.substr('2020-'.length, 11)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'left',
-        name: "水位(m)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        // min: minSw,
-        // max: maxSw
-      },
-      {
-        // gridIndex: 1,
-        type: 'value',
-        position: 'right',
-        name: "流量(m³/s)",
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        // min: minLl,
-        // max: maxLl
-      }
-    ],
-    series: [
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 0,
-        name: '水位',
-        type: 'line',
-        color: "#D9001B",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => o.ll),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-      {
-        // xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '流量',
-        type: 'line',
-        color: "#D9001B",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => o.sl),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5 
-      },
-    ]
-  };
-}
diff --git a/src/views/Home/tqyb/h2.js b/src/views/Home/tqyb/h2.js
deleted file mode 100644
index 64c96a1..0000000
--- a/src/views/Home/tqyb/h2.js
+++ /dev/null
@@ -1,178 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Form, Input, DatePicker, Select, Button, message, Table, Space} from 'antd';
-import {
-  CaretUpOutlined,
-  CaretDownOutlined,
-  LeftOutlined,
-  RightOutlined
-} from '@ant-design/icons'
-import {useDispatch, useSelector} from "react-redux";
-import moment from 'moment';
-import SetDrpStation from '../setMapStation/drp.js'
-import { httppost2 } from '../../../utils/request.js';
-import apiurl from '../../../service/apiurl.js';
-import { isNumber } from '@turf/turf';
-
-
-const options = []
-const optionsToday = []
-
-for(let i=0;i<24;i++){
-  const tm = i<10?'0'+i:i+''
-  options.push({
-    label:tm+':00',
-    value:tm+'00'
-  })
-  options.push({
-    label:tm+':30',
-    value:tm+'30'
-  })
-}
-
-const hh = Number(moment().format('HH'))
-
-for(let i=0;i<=hh;i++){
-  const tm = i<10?'0'+i:i+''
-  optionsToday.push({
-    label:tm+':00',
-    value:tm+'00'
-  })
-  if(i<hh){
-    optionsToday.push({
-      label:tm+':30',
-      value:tm+'30'
-    })
-  }
-}
-
-
-
-const Page = ({showPanels}) => {  
-  const dispatch = useDispatch();
-  const [tm, setTm] = useState(moment())
-  const [hours, setHours] = useState(moment().format('HH00'))
-  const [tableData, setTableData ] = useState([])
-
-  const columns = [
-    { title: '站名', key: 'stnm', dataIndex: 'stnm',align: "center", ellipsis: true },
-    { title: '2h', key: 'h2', dataIndex: 'h2',align: "center", render:(v)=>isNumber(v)?v:'-' },
-  ];
-  const getData = async(tmStr)=>{
-    const { code, data } = await httppost2(apiurl.fxdd_xyt.tqyb.get2h,{tm:tmStr})
-    setTableData(data)
-  }
-  useEffect(()=>{
-    const tmStr = moment(tm).format('YYYYMMDD')+hours
-    getData(tmStr)
-  },[tm,hours])
-
-  const getShow = ()=>{
-    if(moment().isSame(moment(tm), 'day')){
-      if(hours===optionsToday[optionsToday.length-1].value){
-        return true
-      }else{
-        return false
-      }
-    }else{
-      return false
-    }
-  }
-
-  return (
-    <div className='fxdd_fhxs_jyxx'>
-         <Form
-          className='toolbarBox'
-        >
-          <Form.Item label='预报时间选择' name='tm' style={{ margin: '0 0 8px 5px' }}>
-            <Space>
-              <Button
-                value='small'
-                icon={<LeftOutlined />}
-                onClick={() => {
-                  if(hours==='0000'){
-                    setHours('2330')
-                    setTm(moment(tm).add(-1,'days'))
-                  }else{
-                    let nextHH = ''
-                    options.map((item,index)=>{
-                      if(item.value===hours){
-                        nextHH = options[index-1].value
-                      }
-                    })
-                    setHours(nextHH)
-                  }
-                }}
-              />
-              <DatePicker
-                allowClear
-                value={tm}
-                onChange={(e)=>{
-                  if(moment().isSame(moment(e), 'day')){
-                    setHours(optionsToday[optionsToday.length-1].value)
-                  }
-                  setTm(e)
-                }}
-                format='YYYY-MM-DD'
-                disabledDate={current=>current > moment().endOf('day')}
-              />
-              <Select
-                style={{ width: 80 }}
-                value={hours}
-                onChange={(e)=>setHours(e)}
-                options={
-                  moment().isSame(moment(tm), 'day')?
-                  optionsToday:
-                  options
-                }
-              />
-              <Button
-                value='small'
-                icon={<RightOutlined />}
-                disabled={getShow()}
-                onClick={() => {
-                  if(hours==='2330'){
-                    setHours('0000')
-                    setTm(moment(tm).add(1,'days'))
-                  }else{
-                    let nextHH = ''
-                    options.map((item,index)=>{
-                      if(item.value===hours){
-                        nextHH = options[index+1].value
-                      }
-                    })
-                    setHours(nextHH)
-                  }
-                }}
-              />
-            </Space>
-          </Form.Item>
-        </Form>
-        <div className="ant-card-body" style={{padding:"10px"}}>
-            <Table rowKey="adcd"
-                sticky
-                columns={columns}
-                pagination={false}
-                dataSource={tableData}
-                scroll={{ y: "300px"}}
-                onRow={
-                    (data)=>({
-                        onClick:()=>{
-                        // dispatch.map.setLayerVisible({"HdswLayer":true});
-                        // dispatch.runtime.setFeaturePop({
-                        //     id: data.stcd,
-                        //     data:{...data,myParams:tms},
-                        //     type: 'drp',
-                        //     lgtd: data.lgtd,
-                        //     lttd: data.lttd,
-                        // })
-                        }
-                    })
-                }
-            />
-        </div>
-        {/* <SetDrpStation tms={tms} setTableData={setTableData}/> */}
-    </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/Home/tqyb/h24.js b/src/views/Home/tqyb/h24.js
deleted file mode 100644
index 4587d7b..0000000
--- a/src/views/Home/tqyb/h24.js
+++ /dev/null
@@ -1,178 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Form, Radio, DatePicker, Select, Button, message, Table, Space} from 'antd';
-import {
-  LeftOutlined,
-  RightOutlined
-} from '@ant-design/icons'
-import {useDispatch, useSelector} from "react-redux";
-import moment from 'moment';
-import { httppost2 } from '../../../utils/request.js';
-import apiurl from '../../../service/apiurl.js';
-import { isNumber } from '@turf/turf';
-
-const Page = ({showPanels, setBadgeType, setTmObj}) => {  
-  const [tm, setTm] = useState(moment().format('HH')<8?moment().add(-1,'days'):moment())
-  const [hours, setHours] = useState(moment().format('HH')<8?'20':moment().format('HH')<20?'08':'20')
-  const [tableData, setTableData ] = useState([])
-
-  const columns = [
-    { title: '站名', key: 'stnm', dataIndex: 'stnm',align: "center", ellipsis: true },
-    { title: '1h', key: 'h1', dataIndex: 'h1',align: "center", render:(v)=>isNumber(v)?v:'-' },
-    // { title: '2h', key: 'h2', dataIndex: 'h2',align: "center", render:(v)=>isNumber(v)?v:'-' },
-    { title: '3h', key: 'h3', dataIndex: 'h3',align: "center", render:(v)=>isNumber(v)?v:'-' },
-    { title: '6h', key: 'h6', dataIndex: 'h6',align: "center", render:(v)=>isNumber(v)?v:'-' },
-    { title: '12h', key: 'h12', dataIndex: 'h12',align: "center", render:(v)=>isNumber(v)?v:'-' },
-    { title: '24h', key: 'h24', dataIndex: 'h24',align: "center", render:(v)=>isNumber(v)?v:'-' },
-  ];
-
-  const getData = async(tmStr)=>{
-    const { code, data } = await httppost2(apiurl.fxdd_xyt.tqyb.get24h,{tm:tmStr})
-    if(code!==200){
-      return
-    }
-    setTableData(data)
-  }
-  useEffect(()=>{
-    const tmStr = moment(tm).format('YYYYMMDD')+hours
-    getData(tmStr)
-    setTmObj({
-      tm,hours
-    })
-  },[tm,hours])
-  
-  const getShow = ()=>{
-    if(moment().format('HH')<8){
-      if(hours==='20'){
-        return moment(tm).isAfter(moment().add(-2,'days'))
-      }else{
-        return moment(tm).isAfter(moment().add(-1,'days'))
-      }
-    }else if(moment().format('HH')<20){
-      return moment(tm).isAfter(moment().add(-1,'days'))
-    }else{
-      return hours==='08'?false:moment(tm).isAfter(moment().add(-1,'days'))
-    }
-  }
-
-
-  return (
-    <div className='fxdd_fhxs_jyxx fxdd_tqyb_h24'>
-         <Form
-          className='toolbarBox'
-        >
-          <Form.Item label='预报时间选择' name='tm' style={{ margin: '0 0 8px 5px' }}>
-            <Space>
-              <Button
-                value='small'
-                icon={<LeftOutlined />}
-                onClick={() => {
-                  if(hours==='08'){
-                    setHours('20')
-                    setTm(moment(tm).add(-1,'days'))
-                  }else{
-                    setHours('08')
-                  }
-                }}
-              />
-              <DatePicker
-                allowClear
-                value={tm}
-                onChange={(e)=>{
-                  if(moment().format('HH')<20 && moment().format('HH')>8){
-                    setHours('08')
-                  }
-                  setTm(e)
-                }}
-                disabledDate={current => {
-                    if(moment().format('HH')<8){
-                      return current > moment().add(-1,'days').endOf('day')
-                    }else{
-                      return current > moment().endOf('day')
-                    }
-                  }
-                }
-                format='YYYY-MM-DD'
-              />
-              <Select
-                style={{ width: 80 }}
-                value={hours}
-                onChange={(e)=>setHours(e)}
-                options={
-                  moment().isSame(moment(tm), 'day')?
-                    moment().format('HH')<20?
-                    [
-                      {label:'08:00',value:'08'},
-                    ]:
-                    [
-                      {label:'08:00',value:'08'},
-                      {label:'20:00',value:'20'},
-                    ]:
-                  [
-                    {label:'08:00',value:'08'},
-                    {label:'20:00',value:'20'},
-                  ]
-                }
-              />
-              <Button
-                value='small'
-                icon={<RightOutlined />}
-                disabled={getShow()}
-                onClick={() => {
-                  if(hours==='08'){
-                    setHours('20')
-                  }else{
-                    setHours('08')
-                    setTm(moment(tm).add(1,'days'))
-                  }
-                }}
-              />
-            </Space>
-          </Form.Item>
-        </Form>
-        <div className="ant-card-body" style={{padding:"10px"}}>
-            <Table rowKey="adcd"
-                sticky
-                columns={columns}
-                pagination={false}
-                dataSource={tableData}
-                scroll={{ y: "300px"}}
-                onRow={
-                    (data)=>({
-                        onClick:()=>{
-                        // dispatch.map.setLayerVisible({"HdswLayer":true});
-                        // dispatch.runtime.setFeaturePop({
-                        //     id: data.stcd,
-                        //     data:{...data,myParams:tms},
-                        //     type: 'drp',
-                        //     lgtd: data.lgtd,
-                        //     lttd: data.lttd,
-                        // })
-                        }
-                    })
-                }
-            />
-        </div>
-
-        {/* <SetDrpStation tms={tms} setTableData={setTableData}/> */}
-
-        <div
-          style={{
-            position: 'absolute',
-            top: 5,
-            left: 'calc(100vw - 600px)',
-            width: '200px'
-          }}
-        >
-          <Radio.Group
-            defaultValue='雷达回波'
-            onChange={e => setBadgeType(e.target.value)}
-          >
-            <Radio.Button value='雷达回波'>雷达回波</Radio.Button>
-            <Radio.Button value='卫星云图'>卫星云图</Radio.Button>
-          </Radio.Group>
-        </div>
-    </div>
-  );
-}
-
-export default Page;
\ No newline at end of file
diff --git a/src/views/Home/tqyb/index.js b/src/views/Home/tqyb/index.js
deleted file mode 100644
index 9ce110d..0000000
--- a/src/views/Home/tqyb/index.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Collapse } from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import H24 from './h24'
-import H2 from './h2'
-import moment from 'moment';
-import RadarPage from '../../Home/panels/forecastPanels/meteorology/radar/player'
-import SateCloudPage from '../../Home/panels/forecastPanels/meteorology/sateCloud/player'
-import './index.less'
-const { Panel } = Collapse;
-
-const Page = ({showPanels}) => {  
-    const dispatch = useDispatch();
-    const [myKey, setMyKey] = useState('1')
-    const [badgeType, setBadgeType] = useState('')
-    const [tmObj,setTmObj] = useState({
-        tm:moment(),
-        hours:'08'
-    }) 
-    useEffect(()=>{
-      setBadgeType('雷达回波')
-      dispatch.runtime.setCameraTarget({
-        center: [115.2, 31.18],
-        zoom: 9,
-        pitch: 60
-      })
-      dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-      return ()=>{
-          dispatch.map.setLayerVisible({ ShuiKuLayer: false })
-      }
-    },[])
-
-  return (
-    <div className='fxdd_fhxs' style={{display:!showPanels?'none':'block'}}>
-        <div className='homePage_leftBox'>
-            <Collapse 
-                // ghost 
-                // onChange={(e)=>setMyKey(e)} 
-                // expandIconPosition="end" 
-                // accordion={true} 
-                // bordered={false}
-                // defaultActiveKey={['1']}
-                // destrInactivePanel
-                defaultActiveKey={['1']}
-                expandIconPosition='end'
-                destrInactivePanel
-                accordion
-                onChange={e => {
-                    setMyKey(e)
-                  }}
-                >
-                <Panel  
-                    key={'1'}
-                    header={<div className='homePage_Panel'><img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>未来24小时</div>}
-                >
-                    {/* { myKey==='1'?<H24 setBadgeType={setBadgeType} setTmObj={setTmObj}/>:null } */}
-                    <H24 setBadgeType={setBadgeType} setTmObj={setTmObj}/>
-                </Panel>
-                <Panel  
-                    key={'2'}
-                    header={<div className='homePage_Panel'><img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>短临预报</div>}
-                >
-                    {/* { myKey==='2'?<H2/>:null } */}
-                    <H2/>
-                </Panel>
-            </Collapse>
-        </div>
-
-        {
-        (badgeType === '雷达回波'&&myKey==='1') ? (
-          <div className='radarPageBox'>
-            <RadarPage
-              activeKey={'0'}
-              badgeType={1}
-              tm={tmObj.tm}
-              ts={tmObj.hours}
-            />
-          </div>
-        ) : null}
-
-        {(badgeType === '卫星云图'&&myKey==='1') ? (
-          <div className='sateCloudPageBox'>
-            <SateCloudPage
-              activeKey={'0'}
-              badgeType={0}
-              tm={tmObj.tm}
-            />
-          </div>
-        ) : null}
-    </div>
-  );
-}
-
-export default Page;
\ No newline at end of file
diff --git a/src/views/Home/tqyb/index.less b/src/views/Home/tqyb/index.less
deleted file mode 100644
index 8874e0f..0000000
--- a/src/views/Home/tqyb/index.less
+++ /dev/null
@@ -1,329 +0,0 @@
-.fxdd_fhxs{
-    width: 100%;
-    position: relative;
-    z-index: 9999;
-
-
-    .fxdd_fhxs_jyxx{
-        padding: 5px;
-        
-        .fxdd_fhxs_jyxx_cyxx{
-            padding: 5px;
-            background: #007afd;
-        }
-        .fxdd_fhxs_jyxx_cyxx:hover{
-            background: red;
-        }
-    }
-    .fxdd_fhxs_xq{
-        position: absolute;
-        right: 10px;
-        color: #0079FE;
-        cursor: pointer;
-        margin-right: 50px;
-        font-weight: 500;
-    }
-
-    .homePage_leftBox{
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 470px;
-        border: 1px solid rgba(215, 215, 215, 1);
-
-        .homePage_head{
-            padding-left: 20px;
-            background-color: rgba(0, 122, 253, 1);
-            height: 40px;
-            line-height: 40px;
-            font-size: 14px;
-            font-weight: 500;
-            color: #ffffff;
-        }
-        .ant-collapse-header{
-            height: 40px;
-            background-color: rgba(233, 245, 254, 1);
-            border-bottom: 1px solid rgba(215, 215, 215, 1);
-        }
-        .ant-collapse-content{
-            border-bottom: 1px solid rgba(215, 215, 215, 1);
-            .ant-collapse-content-box{
-                padding: 0;
-                // padding: 5px;
-                background-color: #ffffff;
-            }
-        }
-        .homePage_Panel{
-            display: flex;
-            font-size: 14px;
-            font-weight: 500;
-            color: #333333;
-            align-items: center;
-
-            img{
-                margin-right: 10px;
-            }
-            .homePage_Panel_icon{
-                width: 5px;
-                height: 14px;
-                background-color: #007afd;
-                margin-right: 10px;
-            }
-        }
-        .homePage_Panel_item{
-            display: flex;
-            background-color: #ffffff;
-            width: 100%;
-            height: 40px;
-            align-items: center;
-            font-size: 14px;
-            font-weight: 500;
-            padding-left: 15px;
-            cursor: pointer;
-        }
-        .homePage_Panel_item_acitve{
-            flex: 1;
-            display: flex;
-
-            
-        }
-    }
-
-    .homePage_rightBox{
-        position: absolute;
-        right: 50px;
-        top: 0;
-        width: 390px;
-        padding: 10px;
-        border-radius: 10px;
-        background: #ffffff;
-
-        .homePage_head2{
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            margin-top: -5px;
-
-            .homePage_head2_Bg{
-                width: 175px; 
-                height: 46px;
-                color: #ffffff;
-                font-weight: 500;
-                background: url(../../../../public/assets/xyt/homeImg/titleBg.png) 0 0 no-repeat;
-                background-size:100% 95%;
-                display: flex;
-                align-items: center;
-            }
-        }
-
-    
-
-        .yujing{
-            .title{
-                width: 100%;
-                height: 35px;
-                line-height: 35px;
-                padding: 0 10px;
-                background-color: #f2f2f2;
-                letter-spacing: -0.5px;
-                font-size: 14px;
-                font-weight: 500;
-                margin-bottom: 10px;
-            }
-            .bodyBox{
-                width: 100%;
-                display: flex;
-                flex-wrap: wrap;
-                .bodyBoxItem{
-                    width: calc( 33% - 10px);
-                    margin: 5px;
-                    height: 90px;
-                    background-color: rgba(234, 244, 254, 1);
-                    border-radius: 5px;
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-                    justify-content: center;
-                    text-align: center;
-                    cursor: pointer;
-                    .num{
-                        height: 45%;
-                        font-weight: 500;
-                        font-size: 22px;
-                        color: #D9001B;
-                    }
-                    .sw{
-                        color: #04D919;
-                    }
-                    .content{
-                        display: block;
-                        font-size: 17px;
-                        color: #409EFF;
-                        font-weight: 500;
-                    }
-                }
-            }
-        }
-
-        .home_gongshui{
-            width: 100%;
-            padding: 5px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            .home_gongshui_item{
-                width: 49%;
-                .home_gongshui_item_title{
-                    width: 100%;
-                    height: 75px;
-                    display: flex;
-                    justify-content: center;
-                    margin-bottom: 20px;
-                    align-items: center;
-                    border-radius: 10px;
-                    background-color: rgba(234, 244, 254, 1);
-                    font-size: 20px;
-                    font-weight: 500;
-                    img{
-                        margin: 0 15px 0 0;
-                    }
-                }
-                .home_gongshui_item_text{
-                    display: flex;
-                    padding-left: 10px;
-                    
-                    .lf, .rf{
-                        height: 50px;
-                        font-size: 14px;
-                        color: #000000;
-                        font-weight: 400;
-                    }
-                    .lf2, .rf2{
-                        height: 20px;
-                        font-size: 12px;
-                        color: #000000;
-                    }
-
-                    .rf{
-                        flex: 1;
-                        margin-left: 5px;
-                    }
-                }
-            }
-        }
-        .home_yuqing{
-            min-height: 400px;
-         
-            .home_yuqing_header{
-                width: 100%;
-                background-color: #eaf4fe;
-                border-radius: 5px;
-                display: flex;
-                flex-wrap: wrap;
-                padding-top: 10px;
-
-                div{
-                    width: 33%;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-
-                    .home_yuqing_header_item{
-                        margin-bottom: 10px;
-                        width: 7rem;
-                        height: 2rem;
-                        font-size: 14px;
-                        font-weight: 500;
-                        color: #999999;
-                        cursor: pointer;
-                    }
-                    .avtive{
-                        border-radius: 2rem;
-                        border: 1px solid #409EFF;
-                        color: #409EFF;
-                    }
-                }
-            }
-        }
-        .home_shuizhi{
-
-            .home_shuizhi_title1{
-                width: 100%;
-                padding: 5px 10px;
-                background-color: #F2F2F2;
-            }
-            .home_shuizhi_title2{
-                display: flex;
-                height: 80px;
-                margin: 8px 5px 0 5px;
-                border-radius: 5px;
-                background: #EAF4FE;
-                div{
-                    width: 50%;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                }
-                .lf{
-                    font-size: 17px;
-                    color: #409EFF;
-                    font-weight: 500;
-                }
-                .rf{
-                    font-size: 22px;
-                    color: #333333;
-                    font-weight: 500;
-                    .icon{
-                        margin: -5px 0 0 10px;
-                        width: 12px;
-                        height: 12px;
-                        color: #7F7F7F;
-                        cursor: pointer;
-                    }
-                }
-            }
-            .home_shuizhi_item{
-                display: flex;
-                padding: 5px 10px;
-                margin-top: 10px;
-                border-radius: 10px;
-                background: linear-gradient(to right, #e8effd, rgba(255, 0, 0, 0));
-
-                .home_shuizhi_item_box1{
-                    width: 46%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    text-align: left;
-                }
-                .home_shuizhi_item_box2{
-                    width: 18%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    color: #3749C7;
-                    text-align: center;
-                }
-                .home_shuizhi_item_box3{
-                    width: 18%;
-                    text-align: center;
-                }
-                .home_shuizhi_item_box4{
-                    width: 18%;
-                    font-size: 14px;
-                    font-weight: 500;
-                    color: #3749C7;
-                    text-align: center;
-                }
-            }
-            .home_shuizhi_item2{
-                display: flex;
-                padding: 5px 10px;
-                margin-top: 10px;
-                border-radius: 10px;
-                font-size: 14px;
-                font-weight: 500;
-                background: linear-gradient(to right, #e8effd, rgba(255, 0, 0, 0));
-                justify-content: space-between;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/Home/tqyb/sksw.js b/src/views/Home/tqyb/sksw.js
deleted file mode 100644
index 7d6c2ad..0000000
--- a/src/views/Home/tqyb/sksw.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { Descriptions, Form, Button, Input, DatePicker } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import ReactEcharts from 'echarts-for-react';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import moment from "moment"
-import drpOption from './drpOption';
-
-const Page = ({data}) => {  
-  const [ tableData, setTableData ] = useState([])
-  const option = useMemo(() => drpOption(tableData), [tableData])
-
-  const getData = async(resCode)=>{
-    const { code, data} = await httppost2(apiurl.fxdd_xyt.fhxs.getSk,{resCode:resCode})
-    if(code!==200){
-        return
-    }
-    setTableData(
-      data.list
-      // [
-      //   { name1:'name1',tm:'2021-01-01',ll:100,sl:120*0.2 },
-      //   { name1:'name1',tm:'2021-01-02',ll:110,sl:110*0.2 },
-      //   { name1:'name1',tm:'2021-01-03',ll:120,sl:100*0.2 },
-      //   { name1:'name1',tm:'2021-01-04',ll:110,sl:130*0.2 },
-      //   { name1:'name1',tm:'2021-01-05',ll:130,sl:110*0.2 },
-      //   { name1:'name1',tm:'2021-01-06',ll:110,sl:110*0.2 },
-      // ]
-    )
-  }
-
-  useEffect(()=>{
-    if(data.resCode){
-      getData(data.resCode)
-    }
-  },[data])
-
-  return (
-    <>
-      {
-        tableData.length>0?
-        <ReactEcharts option={option} style={{width: "100%", height: '300px'}}/>
-        :<div style={{textAlign: "center", margin: "10%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-      }
-    </>
-  )
-}
-
-export default Page;
diff --git a/src/views/Iframe/index.less b/src/views/Iframe/index.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/Iframe/index.tsx b/src/views/Iframe/index.tsx
deleted file mode 100644
index 6036d50..0000000
--- a/src/views/Iframe/index.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {useLocation, useNavigate} from "react-router";
-import { useDispatch, useSelector } from 'react-redux';
-import { Radio, RadioChangeEvent, Drawer  } from 'antd';
-import {
-  DatabaseFilled,
-} from '@ant-design/icons';
-import "./index.less"
-
-const HomePage = () => {
-  const hasAlertBox = useSelector((s:any) => s.runtime.hasAlertBox);
-
-  const customWatershedCode = localStorage.getItem('address')==="wufeng"?'HBWS000000002':'HBWS000000001'
-
-  const location = useLocation();
-
-  const pathname = location.pathname;
-
-  const [iframeUrl, setIframeUrl] = useState("");
-
-  useEffect(() => {
-    if(pathname === '/mgr/preview'){
-      setIframeUrl("http://223.75.53.141:8000/preview?init=iframe&customWatershedCode="+customWatershedCode);
-    }else if(pathname === '/mgr/plan/1'){//防御预案
-      setIframeUrl("http://223.75.53.141:8000/preplan/defense?init=iframe");
-    }else if(pathname === '/mgr/plan/2'){//预演预案
-      setIframeUrl("http://223.75.53.141:8000/preplan/preview?init=iframe");
-    }
-  }, [pathname]);
-
-  return (
-    <div style={{ height: '100%', background: '#fbfbfb', margin: hasAlertBox?"22px 0 0 -0px":'-10px 0 0 0', }}>
-      <iframe
-        style={{ width: '100%', border: 0, height: hasAlertBox?"calc(100vh - 100px)":"calc(100vh - 70px)" }}
-        src={iframeUrl}
-        title="navigation"
-      />
-    </div>
-  )
-};
-
-export default HomePage
\ No newline at end of file
diff --git a/src/views/KrLine/drpOption.js b/src/views/KrLine/drpOption.js
deleted file mode 100644
index 90beeb4..0000000
--- a/src/views/KrLine/drpOption.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../utils/tools' 
-
-export default function drpOption({data}) {
-  const maxVal = Math.ceil(Math.max(...data.map(obj => obj.rz)))
-  const minVal = Math.floor(Math.min(...data.map(obj => obj.rz)))
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-  
-
-
-  let arr =[]
-  data.forEach(item=>{
-    console.log(data);
-    arr.push([item.w,item.rz])
-  })
-  // console.log(GetInterval(minValX,maxValX),'jhsdjkashdjkahjk');
-  return {
-    toolbox: {
-      show: true,
-      feature: {
-        saveAsImage: {
-          show: true,
-          excludeComponents: ['toolbox'],
-          pixelRatio: 2,
-          name:"库容曲线图"
-        }
-      },
-      right: "14%",
-      top:"5%"
-    },
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "15%",
-        right: "15%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "库容(万m³)",
-        nameGap: 5,
-        type: 'value',
-        min:Math.floor(minValX / 5)  *5,
-        max:Math.ceil(maxValX / 5)  *5,
-        interval:GetInterval(minValX,maxValX),
-        data: data.map(o => o.w),
-        splitLine: {
-          show: false
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        minInterval:1,
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: true
-        },
-        axisTick: {
-          show: true,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        smooth: true
-      },
-    ]
-  };
-}
diff --git a/src/views/KrLine/form.js b/src/views/KrLine/form.js
deleted file mode 100644
index 5e099e1..0000000
--- a/src/views/KrLine/form.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col} from 'antd';
-import { formItemLayout, btnItemLayout } from '../../components/crud/FormLayoutProps';
-import apiurl from '../../service/apiurl';
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const onFinish = async (values) => {
-    values.resCode = "42120250085"
-    values.id = record?.id
-    if (mode === 'edit') {
-      const params = {
-        ...record,
-        rz: Number(values?.rz),
-        w: Number(values?.w),
-      }
-      onEdit(apiurl.krline.update,params)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.krline.save,values)
-    }
-  }
-  
-  return (
-    <>
-      <Form
-        form={form}
-        // {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="水位(m)"
-                name="rz"
-                labelCol={{ span: 5, offset: 0 }}
-                wrapperCol={{span:19,offset:0}}
-                rules={[{ required: true }]}
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="库容(万m³)"
-                name="w"
-                labelCol={{ span: 5, offset: 0 }}
-                wrapperCol={{span:19,offset:0}}
-                rules={[{ required: true }]}
-              >
-               <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col> 
-      </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/KrLine/index.js b/src/views/KrLine/index.js
deleted file mode 100644
index 4949067..0000000
--- a/src/views/KrLine/index.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React,{useEffect,useState,useRef,useMemo} from 'react'
-import { Table, Button } from 'antd'
-import ModalForm from './form';
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption'
-import apiurl from '../../service/apiurl';
-import { httppost2 } from '../../utils/request';
-import { CrudOpRender_text } from '../../components/crud/CrudOpRender';
-import BasicCrudModal from '../../components/crud/BasicCrudModal2';
-export default function Zrtx() {
-    const refModal = useRef();
-    const columns = [
-        {
-            title: '序号', dataIndex: 'index', key: 'index', align: "center",
-            render: (r, c,i) => <span>{i + 1}</span>
-         },
-        { title: '水位(m)', dataIndex: 'rz', key: 'rz',align:"center" },
-        { title: '库容(万m³)', dataIndex: 'w', key: 'w',align:"center" },
-        {
-            title: '操作', dataIndex: 'op', key: 'op', align: "center",width:200,
-            render: (value, row, index) => (<CrudOpRender_text  del={true} edit={true} command={(cmd) => () => command(cmd)(row)} />)
-         },
-    ];
-    const [data, setData] = useState([])
-    const option = useMemo(() => {
-      return drpOption({data});
-    }, [data])
-    const getData = async () => {
-        try {
-            const res = await httppost2(apiurl.krline.list)
-            setData(res.data.map((item,i) => ({...item,inx:i + 1})))
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-
-    const command = (type) => (params) => {
-        if (type === 'save') {
-          refModal.current.showSave({});
-        } else if (type === 'edit') {
-          refModal.current.showEdit(params)
-        } else if (type === 'view') {
-          refModal.current.showView(params);
-        } else if (type === 'del') {
-          refModal.current.onDeletePost(apiurl.krline.delete,params);
-        } 
-      }
-    useEffect(() => {
-      getData();
-    }, [])
-    
-  return (
-      <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-         <h1><Button type='primary' onClick={() => {refModal.current.showSave({})}}>新增</Button></h1>
-         <div style={{display:"flex",columnGap:10,width:"100%",height:"calc(100% - 36px)"}}>
-          <div style={{width:500,height:"100%"}}>
-          <Table
-              rowKey="inx"
-              columns={columns}
-              dataSource={data}
-              pagination={false}
-              scroll={{ y:"calc( 100vh - 300px )"}}
-          />
-          </div>
-          <div className='right-echarts' style={{ flex: 1,height:"100%" }}>
-              {
-                  data.length > 0 ?
-                  <ReactEcharts
-                    option={option}
-                    style={{width: "100%", height: '100%'}}
-                  /> : <div style={{textAlign: "center", margin: "10%"}}>
-                    <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                  </div>
-              }
-          </div>
-         </div>
-
-        <BasicCrudModal
-          width={550}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={getData}
-        />
-    </div>
-  )
-}
diff --git a/src/views/fxdd/ddjc/ddzl/BasicCrudModal.js b/src/views/fxdd/ddjc/ddzl/BasicCrudModal.js
deleted file mode 100644
index 99dcd0c..0000000
--- a/src/views/fxdd/ddjc/ddzl/BasicCrudModal.js
+++ /dev/null
@@ -1,187 +0,0 @@
-import React from 'react';
-import { Modal, message } from 'antd';
-import { createCrudService } from '../../../../components/crud/_';
-
-class BasicCrudModal extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      record: null,
-      open: false,
-      mode: null,
-    };
-  }
-
-  showEdit(record) {
-    this.setState({ record, open: true, mode: 'edit' });
-  }
-
-  showSave(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'save' });
-  }
-  showSimilarSave(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'similarSave' });
-  }
-  show(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'show' });
-  }
-
-  showView(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'view' });
-    
-  }
-  
-  showReView(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'review' });
-    
-  }
-
-  showAdd(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'add' });
-  }
-
-  showImp() {
-    this.setState({ open: true, mode: 'imp' });
-  }
-
-  onEdit = (path,values) => {
-    createCrudService(path).edit(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('修改成功');
-        this.setState({ open: false });
-
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'修改失败');
-      }
-    })
-  }
-
-  onSave = (path,values) => {
-    createCrudService(path).save(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('保存成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'保存失败');
-      }
-    })
-  }
-
-  onDelete = (path, values) => {
-    createCrudService(path).del(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('删除成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'删除失败');
-      }
-    })
-  }
-
-  onDeleteGet = (path,values) => {
-    createCrudService(path).delGet(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('删除成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'删除失败');
-      }
-    })
-  }
-
-  onSimilarSave = (path, values) => {
-    createCrudService(path).delGet(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('类似新增成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'类似新增失败');
-      }
-    })
-  }
-  onFileGet = (path,values) => {
-    createCrudService(path).delGet(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('删除成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'删除失败');
-      }
-    })
-  }
-  
-  whichMod = (value) => {
-    if(value === 'save'){
-      return '调度指令'
-    }else if (value === 'add' || value === ''){
-      return '新增'
-    }else if (value === 'edit'){
-      return '编辑'
-    }else if (value === 'view'){
-      return '查看'
-    }else if (value === 'show' || value === 'review'){
-      return ''
-    } else {
-      return '新增'
-    }
-  }
-
-  render() {
-    const { record, open, mode } = this.state;
-    const { width, title, style, wrapClassName, formProps, component: Component } = this.props;
-    if (!record || !open) {
-      return null;
-    }
-
-    return (
-      <Modal
-        width={width || 600}
-        style={style || { top: 10 }}
-        wrapClassName={wrapClassName}
-        visible
-        title={`${this.whichMod(mode)}${title}`}
-        footer={null}
-        destroyOnClose
-        onCancel={() => { this.setState({ open: false }) }}
-      >
-        <Component
-          mode={mode}
-          close={()=>{this.setState({ open: false })}}
-          onCrudSuccess={this.props.onCrudSuccess}
-          record={record}
-          onEdit={this.onEdit}
-          onSave={this.onSave}
-          onSimilarSave={this.onSimilarSave}
-          formProps={formProps}
-        />
-      </Modal>
-    );
-  }
-}
-
-export default BasicCrudModal;
diff --git a/src/views/fxdd/ddjc/ddzl/form.js b/src/views/fxdd/ddjc/ddzl/form.js
deleted file mode 100644
index 565f443..0000000
--- a/src/views/fxdd/ddjc/ddzl/form.js
+++ /dev/null
@@ -1,510 +0,0 @@
-import React, { useEffect, useState,useMemo } from 'react';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { Form, Button, Upload,message, Input,Image, Modal,Descriptions, Row, Col, DatePicker, InputNumber,Table } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd, validlttd } from '../../../../utils/validators';
-import { createCrudService } from '../../../../components/crud/_';
-import apiurl from '../../../../service/apiurl';
-import { httpget6 } from "../../../../utils/request";
-import { mobile } from '../../../../utils/validators'
-// import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import moment from 'moment';
-import clsx from "clsx"
-// import "./index.less"
-const { YearPicker } = DatePicker;
-const importancy = [
-  {
-    "label": "水库调洪",
-    "value": 0
-  },
-  {
-    "label": "人员转移",
-    "value": 1
-  }
-]
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record, onEdit, onSave }) => {
-  console.log(record);
-  const columns1 = [
-    { title: '反馈时间', key: 'tm', dataIndex: 'tm', width: 200, align: "center" },
-    { title: '反馈人员', key: 'feedbackUserName', dataIndex: 'feedbackUserName', width: 150, ellipsis: true,align: "center" },
-    { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true,align: "center" },
-    { title: '执行内容', key: 'content', dataIndex: 'content', width: 250, ellipsis: true,align: "center" },
-  ]
-  const width = useMemo(() => columns1.reduce((total, cur) => total + (cur.width), 0), [columns1]);
-  
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-  const [unitData, setUnitData] = useState([])
-  const [btn, setBtn] = useState(1)
-  const [dispatchStatus, setDispatchStatus] = useState(0)
-
-  const getUnitData = async() => {
-  const res = await httpget6(apiurl.ddjc.ddjz.unitList,{});
-    if (res.code == 200) {
-      let newData = res.data.map(item => ({...item, value: item.adcd, label: item.userName }))
-      setUnitData(newData)
-    }
-  } 
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.fkList).find_nopage);
-
-  const onFinish = (values) => {
-    console.log("vali", values);
-    // 
-    if (values.adcd) {
-      values.executeOrgName = unitData.find(item => item.adcd == values.adcd).userName
-    }
-    values.year = values.year ? moment(values.year).format("YYYY") : null
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-      values.attachList = oldFiles;
-      values.status = record.status
-      values.createTm = record.createTm
-      values.id = record.id
-      if (values.startTm || values.endTm) {
-        values.startTm = values.startTm ? moment(values.startTm).format('YYYY-MM-DD HH:mm:ss') : null
-        values.endTm = values.endTm ? moment(values.endTm).format('YYYY-MM-DD HH:mm:ss') : null
-        // delete values.startTm;
-        // delete values.endTm;
-        onEdit(apiurl.ddjc.ddjz.edit, values)
-      } else {
-        onEdit(apiurl.ddjc.ddjz.edit, values)
-      }
-    }
-    if (mode === 'save') {
-      values.attachList = fileIds
-      values.status = dispatchStatus
-      if (values.startTm || values.endTm) {
-        values.startTm = values.startTm ? moment(values.startTm).format('YYYY-MM-DD HH:mm:ss') :null
-        values.endTm = values.endTm ? moment(values.endTm).format('YYYY-MM-DD HH:mm:ss') :null
-        // delete values.startTm;
-        // delete values.endTm;
-        onSave(apiurl.ddjc.ddjz.save, values)
-      } else {
-        onSave(apiurl.ddjc.ddjz.save, values)
-      }
-    }
-  }
-
-  
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-   console.log(info);
-   if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-  }
-  let fileIds = info.fileList.map(file => {
-    return {fileId: file.response?.data?.fileId}
-  })
-  console.log(fileIds);
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-  setFlag(false)
-}
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-  }
-     /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-      let fetchArr = params?.attachList.map(item => {
-        return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-          .delGet()
-      }
-      );
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId: item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-    }
-    /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-    const download = (params) => {
-      let downloadLink = document.createElement("a");
-      downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfEmerDispatchR/file/download/${params}`;
-      downloadLink.download = `${params.fileName}`;
-      downloadLink.style.display = "none";
-      // 将链接添加到页面中
-      document.body.appendChild(downloadLink);
-
-      // 模拟点击事件，开始下载
-      downloadLink.click();
-    }
-
-    /**
-     * @description pdf文件预览
-     * @param {String} params 文件预览url
-     */
-    const viewPdf = (params) => {
-      setIframeSrc(params)
-      setPdfViewOPen(true)
-    }
-  useEffect(() => {
-    if (mode === "view" || mode === "edit") {
-      getFileInfo(record)
-      form.setFieldsValue({
-        ...record,
-        dispatchType: Number(record.dispatchType),
-        startTm: record.startTm ? moment(record.startTm) : null,
-        endTm: record.endTm ? moment(record.endTm) : null,
-        year: record.year ? moment(String(record.year)) : null,
-      })
-    } else {
-      form.setFieldValue("year",moment())
-    }
-    }, [record,mode])
-    useEffect(() => {
-      getUnitData()
-    }, [])
-  useEffect(() => {
-    if (mode == "view" && record.id ) {
-      let params = {
-        search: {
-          dispatchId:record.id
-        }
-      }
-      search(params)
-    }
-  }, [mode,record])
-  
-    
-  return (
-    <div className='detail-box'>
-      <div className='left-title'>
-          <div className='detail-label'>
-          <div className="title" style={btn == 1 ? { border: "1px solid #409eff", color: "#409eff", fontWeight: 700 } : {}} onClick={() => setBtn(1)}>指令编发</div>
-          {
-            mode  === "view" ? 
-            <div className="title" style={btn ==2 ? {border:"1px solid #409eff",color:"#409eff",fontWeight:700}:{}} onClick={()=>setBtn(2)}>执行反馈</div>:null
-          }
-          </div>
-          <div className='sperate-line'>
-        <img
-          src={`${process.env.PUBLIC_URL}/assets/fxdd/line_icon.png`}
-          style={{
-            position: 'absolute',
-            top: "-3px",
-            left:"-17px",
-            width: "40px",
-            height:"35px"
-          }}
-          />
-          {
-            mode === "view" ? 
-            <img
-           src={`${process.env.PUBLIC_URL}/assets/fxdd/line_icon.png`}
-           style={{
-             position: 'absolute',
-             top: "88px",
-             left:"-17px",
-             width: "40px",
-             height:"35px"
-           }}
-         />
-              :null
-          }
-      </div>
-      </div>
-      <div className='right-content'>
-        {btn == 1 ? 
-      <Form form={form} {...formItemLayout} onFinish={onFinish}>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="调度令编号"
-              name="serial"
-              rules={[{ required: true }]}
-            >
-              <Input  disabled={mode === "view"} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="调度令年度"
-              name="year"
-              rules={[{ required: true }]}
-            >
-                <YearPicker 
-                  // format={'YYYY'}
-                  // mode="year"
-                  style={{ width: '100%' }}
-                  allowClear
-                  disabled={mode === "view"} 
-                />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="执行单位"
-              name="adcd"
-              rules={[{ required: true }]}
-            >
-                {/* <Input disabled={mode === "view"} style={{ width: '100%' }} allowClear /> */}
-              <NormalSelect disabled={mode === "view"} options={unitData} allowClear={false} />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="调度类型"
-              name="dispatchType"
-              rules={[{ required: true }]}
-            >
-              <NormalSelect disabled={mode === "view"} options={importancy} allowClear={false} />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="抄送单位"
-              name="forwardOrgName"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-            >
-              <Input disabled={mode === "view"} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="计划执行时间"
-              name="startTm"
-              rules={[{ required: true }]}
-            >
-                <DatePicker
-                  disabled={mode === "view"}
-                  style={{ width: '100%' }}
-                  allowClear
-                  showTime
-                />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="计划结束时间"
-              name="endTm"
-            >
-                <DatePicker
-                  disabled={mode === "view"}
-                  style={{ width: '100%' }}
-                  allowClear
-                  showTime
-                  placeholder=''
-                />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row>
-          <Col span={24}>
-            <Form.Item
-                label="指令内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-              <Input.TextArea disabled={mode === "view"} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-          <Row>
-            <Col span={24}>
-            <Descriptions>
-                <Descriptions.Item label="日期" span={2} labelStyle={{marginLeft:"57px"}}>
-                  {/* {moment().format("YYYY-MM-DD HH:mm:ss")} */}
-                  {record.createTm}
-                </Descriptions.Item>
-                <Descriptions.Item label="指令发起人" span={2}>
-                {record.createUserName || ''}
-                </Descriptions.Item>
-            </Descriptions>
-            </Col>
-          </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-                label="指令文件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {
-                  mode !== "view" &&
-                  <Dragger
-                    name='file'
-                    // multiple
-                    action="/gunshiApp/xfflood/xfEmerDispatchR/file/upload/singleSimple"
-                    onChange={fileChange}
-                    onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                      fileList={fileList}
-                      disabled={loading}
-                      
-                    // onSuccess={handleSuccess}
-                  >
-                      <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                      <p className="ant-upload-hint">
-                        支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                    </p>
-                </Dragger>
-               }
-                <Row gutter={[16]}>
-                    {
-                      fileList.length > 0 && fileList.map(file => {
-                        return (
-                          <Col span={12}>
-                            <div className={mode == "view" ? 'file-item view-file' : 'file-item'}>
-                              <div className='file-description'>
-                                {file.name.indexOf('.docx') > -1 ?
-                                  <div
-                                    onClick={() => { download(file.response?.data?.fileId) }}
-                                    style={{ cursor: 'pointer' }}
-                                  >
-                                    <FileWordOutlined
-                                      style={{ fontSize: 40 }}
-                                    />
-                                  </div>
-                                  :
-                                  file.name.indexOf('.pdf') > -1 ?
-                                    <div
-                                      onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                      style={{ cursor: 'pointer' }}
-                                    >
-                                      <FilePdfOutlined style={{ fontSize: 40 }} />
-                                    </div>
-                                    :
-                                    file.name.indexOf('.zip') > -1 ?
-                                      <div
-                                        onClick={() => { download(file.response?.data?.fileId) }}
-                                        style={{ cursor: 'pointer' }}
-                                      >
-                                        <FileZipOutlined style={{ fontSize: 40 }} />
-                                      </div>
-                                      :
-                                      file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                      file.name.indexOf('.xlsx') > -1 ?
-                                        <div
-                                          onClick={() => { download(file.response?.data?.fileId) }}
-                                          style={{ cursor: 'pointer' }}
-                                        >
-                                          <FileExcelOutlined style={{ fontSize: 40 }} />
-                                        </div>
-                                        :
-                                        <Image width={60} src={url + file.response?.data?.filePath} alt='' />
-                                }
-                                <span>{file.name}</span>
-                              </div>
-                              <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() => deleteFile(file.response?.data?.fileId)}>
-                                <DeleteOutlined />
-                              </div>
-                            </div>
-                          </Col>
-                        )
-                      })
-                    }
-                  </Row>
-            </Form.Item>
-          </Col>
-        </Row>
-        {
-          mode === 'view' ? null : (
-            <>
-                  <Form.Item wrapperCol={ {span: 1, offset: 19} } >
-                    <div style={{display:'flex',columnGap:10}}>
-                <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '保存' : '修改'}
-                </Button>
-                  {
-                    mode === "save" ?   
-                          <Button type="primary" onClick={() => { setDispatchStatus(1); }} htmlType="submit">
-                      直接下发
-                    </Button> :null
-                
-              }
-                      
-                   </div>
-                  </Form.Item>
-            </>
-          )
-        }
-      </Form>
-          :
-          <Table columns={columns1} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-        }
-      </div>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfEmerDispatchR/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxdd/ddjc/ddzl/index.js b/src/views/fxdd/ddjc/ddzl/index.js
deleted file mode 100644
index 7826f8a..0000000
--- a/src/views/fxdd/ddjc/ddzl/index.js
+++ /dev/null
@@ -1,332 +0,0 @@
-import React, { lazy, useRef, useEffect, useMemo, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { Collapse, message, Button, Spin, Modal, Table } from 'antd'
-import echarts from 'echarts/lib/echarts';
-import ReactEcharts from 'echarts-for-react/lib/index';
-import "./index.less"
-import apiurl from '../../../../service/apiurl';
-import ModalForm from './form';
-import BasicCrudModal from './BasicCrudModal';
-// import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-import ToolBar from './toolbar';
-import ToolBar2 from './toolbar2';
-import moment from 'moment';
-const { Panel } = Collapse;
-const Page = () => {
- 
-  const refModal = useRef();
-  const hasAlertBox = useSelector((s) => s.runtime.hasAlertBox);
-  const [searchVal, setSearchVal] = useState({})
-  const [searchVal1, setSearchVal1] = useState()
-  const [echartsData, setEchartsData] = useState([])
-  const myChart2Ref = useRef()
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '调度令编号', key: 'serial', dataIndex: 'serial', width: 200, ellipsis: true },
-    { title: '调度令年度', key: 'year', dataIndex: 'year', width: 140 },
-    { title: '计划执行时间', key: 'startTm', dataIndex: 'startTm', width: 250 },
-    {
-      title: '调度类型', key: 'dispatchType', dataIndex: 'dispatchType', width: 150, ellipsis: true,
-      render: (_, record) => <span>{ record.dispatchType === "1" ? "人员转移" : "水库调洪"}</span>
-    },
-    { title: '执行单位', key: 'executeOrgName', dataIndex: 'executeOrgName', width: 200, ellipsis: true },
-    { title: '抄送单位', key: 'forwardOrgName', dataIndex: 'forwardOrgName', width: 200, ellipsis: true },
-    {
-      title: '调令状态', key: 'status', dataIndex: 'status', width: 200,
-      render: (rec) => {
-        return (
-          <>
-            {
-              rec === 0 ? <span className='wait'>待下发</span> :
-                rec === 1 ? <span className='doing'>执行中</span> :
-                rec === 2 ? <span className='finish'>完成</span> :''
-                  
-            }
-          </>
-        )
-      }},
-    { title: '创建时间', key: 'createTm', dataIndex: 'createTm', width: 250, ellipsis: true },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right', align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text detail={true} edit={row.status == 0 ? true : false} dispatch={row.status == 0 ? true : false} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({});
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === "dispatch") {
-      createCrudService(apiurl.ddjc.ddjz.change + `/${params.id}/` + 1).delGet().then(res => {
-        if (res.code === 200) { 
-          message.success("下发成功")
-          
-          refresh()
-        }
-      })
-    }
-  }
-
-  // 页面初始默认查询参数
-  const options = {
-    search: {
-      adcd: ''
-    },
-  };
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.ddjc.ddjz.page).find_noCode);
-
-  const domRef = useRef()
-  const domRef2 = useRef()
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-        ...searchVal1
-      }
-    };
-    if (searchVal && searchVal1) {
-      console.log(searchVal1);
-      search(params)
-    }
-
-  }, [searchVal, searchVal1])
-  
-  useEffect(() => {
-    chartTnit()
-  }, [])
-  useEffect(() => {
-    let waitData = 0;
-    let doingData = 0;
-    let finishData = 0;
-    if (echartsData) {
-      echartsData.forEach((data) => { 
-        if (data.status === 0) {
-          waitData += 1 
-        } else if (data.status === 1) {
-          doingData += 1
-        } else if (data.status === 2) {
-          finishData += 1
-        }
-      })
-
-      let resData =  [
-        {
-          name: "待下发",
-          value: waitData,
-          itemStyle: {
-            color:'#52c1f5'
-          }
-        },
-        {
-          name: "执行中",
-          value: doingData,
-          itemStyle: {
-            color:'#8167f5'
-          }
-        },
-        {
-          name: "已完成",
-          value: finishData,
-          itemStyle: {
-            color: '#ff7a8c',
-          }
-        }
-      ]
-      let options = myChart2Ref.current.getOption();
-      options.series[0].data = resData
-      options.legend[0].formatter = (name) => {
-        let item = resData.find(item => item?.name === name)
-          return item?.name + '       ' + item?.value
-      }
-      myChart2Ref.current.setOption(options)
-    } 
-  }, [echartsData])
-  const chartTnit = () => {
-    // 基于准备好的dom，初始化echarts实例
-    // const myChart = echarts.init(domRef.current)
-    const myChart2 = echarts.init(domRef2.current)
-    myChart2Ref.current = myChart2
-    const datas1 = [
-      { name: '坪坝营镇', value: 2 },
-      { name: '朝阳市水库管理所', value: 1 },
-      { name: '小河水库管理所', value: 1 },
-      { name: '高乐山镇', value: 1 }
-    ];
-    const option1 = {
-      legend: {
-        orient: 'vertical',
-        icon: 'rect',
-        x: '50%',
-        y: 'center',
-        itemWidth: 15,
-        itemHeight: 15,
-        itemGap: 20,
-        align: 'left',
-        formatter: (name) => {
-        let item = datas1.find(item => item.name === name)
-          return item.name + '       ' + item.value
-        }
-      },
-      title: {
-        text: '调度执行单位',
-        x: '11%',
-        y: 'center',
-        textStyle: {
-          fontSize: 18,
-          fontWeight: 'normal',
-        }
-      },
-      series: [{
-        type: 'pie',
-        radius: ['65%', '85%'],// 设置内外半径，第一个值是内半径
-        top: '1%',
-        height: '100%',
-        // left: 'center',
-        left:"-50%",
-        width: 750,
-        label: { show: false },
-        labelLine: { show: false },
-        // label: {
-        //   // alignTo: 'edge',
-        //   formatter: '{name|{b}}\n{time|{c} 次}',
-        //   // minMargin: 5,
-        //   edgeDistance: 10,
-        //   lineHeight: 15,
-        //   rich: {
-        //     time: {
-        //       fontSize: 10,
-        //       color: '#999'
-        //     }
-        //   }
-        // },
-        // labelLine: {
-        //   length: 15,
-        //   length2: 16,
-        //   maxSurfaceAngle: 80
-        // },
-        // labelLayout: function (params) {
-        //   const isLeft = params.labelRect.x < myChart.getWidth() / 2;
-        //   const points = params.labelLinePoints;
-        //   // Update the end point.
-        //   points[2][0] = isLeft
-        //     ? params.labelRect.x
-        //     : params.labelRect.x + params.labelRect.width;
-        //   return {
-        //     labelLinePoints: points
-        //   };
-        // },
-        data: datas1
-      }]
-    };
-
-    const option2 = {
-      legend: {
-        orient: 'vertical',
-        icon: 'rect',
-        x: '50%',
-        y: 'center',
-        itemWidth: 15,
-        itemHeight: 15,
-        itemGap: 20,
-        align: 'left',
-        // formatter: (name) => {
-        // let item = dispatchData.find(item => item?.name === name)
-        //   return item?.name + '       ' + item?.value
-        // }
-      },
-      title: {
-        text: '调令状态',
-        x: '16%',
-        y: 'center',
-        textStyle: {
-          fontSize: 18,
-          fontWeight: 'normal',
-        }
-      },
-      series: [{
-        type: 'pie',
-        radius: ['65%', '85%'],// 设置内外半径，第一个值是内半径
-        top: '1%',
-        height: '100%',
-        right: '50%',
-        // width: 720,
-        label: { show: false },
-        labelLine: { show: false },
-        // data: dispatchData
-      }]
-
-    };
-    // 绘制图表
-    // myChart.setOption(option1)
-    myChart2.setOption(option2)
-  }
-  const getData = () => {
-    let params = {
-      pageSo: {
-        "pageSize": 10,
-        "pageNumber": 1
-      },
-      year:searchVal1?.year
-    }
-    createCrudService(apiurl.ddjc.ddjz.page).save(params).then(res => {
-      if (res.code === 200) { 
-        setEchartsData(res.data.records)
-      }
-    })
-  }
-  useEffect(() => {
-    getData()
-  }, [searchVal1])
-  
-  return (
-    <div className='ddzl_container'>
-      <div className="ant-card-body" style={{ padding: "5px 0 0 0" }}>
-        <div style={{ marginLeft: '10px' }}>
-          <ToolBar setSearchVal1={setSearchVal1} onSave={command('save')} />
-          <div style={{ display: 'flex', alignItems: 'center' }}>
-            <div className='l_content' style={{width:"25%"}}>
-              <div className='l_panel'>
-                <div><img src={`${process.env.PUBLIC_URL}/assets/fxdd/dlzs.png`} alt="" /></div>
-                <div className='l_num'>{ echartsData?.length}</div>
-                <div className='l_unit'>次</div>
-              </div>
-              <div className='b_panel1'>年度调令总数</div>
-            </div>
-            {/* <div className='l_content' style={{width:"37%"}}>
-              <div ref={domRef} style={{ display: 'flex', alignItems: 'center', width: '100%', height: '200px' }}></div>
-            </div> */}
-            <div className='l_content' style={{ width: "37%" }}>
-              <div ref={domRef2} style={{ display: 'flex', alignItems: 'center', width: '100%', height: '200px' }}></div>
-            </div>
-          </div>
-          <ToolBar2
-            setSearchVal1={setSearchVal}
-            onSave={command('save')}
-          />
-        </div>
-        <div>
-          <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width, y: "calc( 100vh - 600px )" }} />
-        </div>
-      </div>
-      <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-    </div>
-
-
-  );
-}
-
-export default Page;
diff --git a/src/views/fxdd/ddjc/ddzl/index.less b/src/views/fxdd/ddjc/ddzl/index.less
deleted file mode 100644
index 782ef82..0000000
--- a/src/views/fxdd/ddjc/ddzl/index.less
+++ /dev/null
@@ -1,110 +0,0 @@
-.ddzl_container {
-  background-color: #fff;
-  height: 100%;
-
-  .l_content {
-    display: flex;
-    align-items: center;
-    width: 30%;
-    flex-direction: column;
-
-    .l_panel {
-      width: 200px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      .l_num {
-        display: flex;
-        justify-content: center;
-        width: 50px;
-        color: #3773c5;
-        font-size: 28px;
-      }
-
-      .l_unit {
-        padding-top: 10px;
-      }
-    }
-
-    .b_panel1 {
-      width: 200px;
-      height: 50px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      font-size: 16px;
-    }
-  }
-  .wait,.doing,.finish{
-    padding-left: 20px;
-    position: relative;
-    &::before{
-      position: absolute;
-      top:4px;
-      left: 0;
-      display: inline-block;
-      content: "";
-      width: 10px;
-      height: 10px;
-      border-radius: 50%;
-      background-color: #aaaaaa;
-    }
-  }
-  .wait{
-    color: #f59a23;
-    &::before{
-      background-color: #f59a23;
-    }
-  }
-  .doing{
-    color: #039d12;
-    &::before{
-      background-color: #039d12;
-    }
-  }
-  .finish{
-    color: #aaaaaa;
-    &::before{
-      background-color: #aaaaaa;
-    }}
-  .detail-box{
-    display: flex;
-    column-gap: 40px;
-    .left-title{
-      display: flex;
-      column-gap: 20px;
-      .detail-label{
-        display: flex;
-        flex-direction: column;
-        // row-gap: 100px;
-        .title{
-          padding: 4px 16px;
-          // border: 1px solid #000;
-          border-radius: 14px;
-          text-align: center;
-          &:hover{
-            cursor: pointer;
-          }
-        }
-        .selectDiv{
-          // padding: 4px 16px;
-          border: 1px solid #409eff;
-          // border-radius: 14px;
-          color: #409eff;
-          font-weight: 700;
-        }
-      }
-      .sperate-line{
-        position: relative;
-        width: 1px;
-        min-height: 500px;
-        background-color: #d7d7d7;
-        margin-right: 20px;
-      }
-    }
-    .right-content{
-      flex: 1;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxdd/ddjc/ddzl/toolbar.js b/src/views/fxdd/ddjc/ddzl/toolbar.js
deleted file mode 100644
index dc9336e..0000000
--- a/src/views/fxdd/ddjc/ddzl/toolbar.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const ToolBar = ({ setSearchVal1, onSave }) => {
-  const [form] = Form.useForm();
-  const [source, setSource] = useState([])
-  const [sttp, setSttp] = useState([])
-
-  const onFinish = (val) => {
-    //if(!val.addvcd)val.addvcd = config.ADCD6
-    val.buildYear = val.buildYear ? moment(val.buildYear).format('YYYY') : undefined
-    // val.sts = val.stcd?[val.stcd]:undefined
-    // delete val.stcd
-    // setSearchVal(val);
-  }
-  const handleFormChange = (changedValues, allValues) => {
-    setSearchVal1(changedValues)
-  };
-
-
-  const getSelect = async () => {
-    // 获取最近5年
-    const lastFiveYears = [];
-    for (let i = 0; i < 5; i++) {
-      const year = moment().subtract(i, 'years').year();
-      lastFiveYears.push({
-        label: year,
-        value: year
-      });
-    }
-    setSource(lastFiveYears)
-  }
-  useEffect(() => {
-    getSelect()
-    setSearchVal1({ year: moment().year() })
-    form.setFieldValue('year', moment().year())
-  }, [])
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          layout="inline"
-          onValuesChange={handleFormChange}
-          onFinish={onFinish}>
-          <Form.Item label="调度令年度" name="year">
-            <NormalSelect options={source} style={{ width: '180px' }} />
-          </Form.Item>
-          {/* <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> */}
-          {/* {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          } */}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxdd/ddjc/ddzl/toolbar2.js b/src/views/fxdd/ddjc/ddzl/toolbar2.js
deleted file mode 100644
index 6f8e116..0000000
--- a/src/views/fxdd/ddjc/ddzl/toolbar2.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { SearchOutlined, UndoOutlined, PlusOutlined } from '@ant-design/icons';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const ToolBar = ({ setSearchVal1, onSave }) => {
-  const [form] = Form.useForm();
-  const [source, setSource] = useState([])
-  const [source2, setSource2] = useState([
-    {
-      label: '待下发',
-      value: 0
-    },
-    {
-      label: '执行中',
-      value: 1
-    },
-    {
-      label: '完成',
-      value: 2
-    }
-  ])
-  const [sttp, setSttp] = useState([])
-
-  const onFinish = (val) => {
-    setSearchVal1({...val,serial:val.serial || undefined});
-  }
-
-  const dispatchOrder = () => {
-    onSave()
-  }
-  const onReset = () => {
-    form.resetFields();
-  };
-
-  useEffect(() => {
-    getSelect()
-  }, [])
-
-  const getSelect = async () => {
-    // 获取最近5年
-    const lastFiveYears = [];
-    for (let i = 0; i < 5; i++) {
-      const year = moment().subtract(i, 'years').year();
-      lastFiveYears.push({
-        label: year,
-        value: year
-      });
-    }
-    setSource(lastFiveYears)
-  }
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="调度令编号" name="serial">
-          <Input type='text' style={{width: '180px'}} allowClear />
-          </Form.Item>
-          <Form.Item label="调令状态" name="status">
-            <NormalSelect options={source2} style={{ width: '180px' }} />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" icon={<SearchOutlined />} htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button htmlType="button" onClick={onReset} icon={<UndoOutlined />}>
-              重置
-            </Button>
-          </Form.Item>
-          <Form.Item>
-            <Button
-              icon={<PlusOutlined />}
-              onClick={() => dispatchOrder()}
-            >
-              调令下发
-            </Button>
-          </Form.Item>
-          {/* {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          } */}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxdd/ddjc/yjxy/BasicCrudModal.js b/src/views/fxdd/ddjc/yjxy/BasicCrudModal.js
deleted file mode 100644
index 8f0ea71..0000000
--- a/src/views/fxdd/ddjc/yjxy/BasicCrudModal.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import React from 'react';
-import { Modal, message } from 'antd';
-import { createCrudService } from '../../../../components/crud/_';
-
-class BasicCrudModal extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      record: null,
-      open: false,
-      mode: null,
-    };
-  }
-
-  showEdit(record) {
-    this.setState({ record, open: true, mode: 'edit' });
-  }
-
-  showSave(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'save' });
-  }
-
-  show(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'show' });
-  }
-
-  showView(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'view' });
-    
-  }
-  
-  showReView(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'review' });
-    
-  }
-
-  showAdd(record) {
-    record = record || {};
-    this.setState({ record, open: true, mode: 'add' });
-  }
-
-  showImp() {
-    this.setState({ open: true, mode: 'imp' });
-  }
-
-  onEdit = (path,values) => {
-    createCrudService(path).edit(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('修改成功');
-        this.setState({ open: false });
-
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'修改失败');
-      }
-    })
-  }
-
-  onSave = (path,values) => {
-    createCrudService(path).save(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('保存成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'保存失败');
-      }
-    })
-  }
-
-  onDelete = (path,values) => {
-    createCrudService(path).del(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('删除成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'删除失败');
-      }
-    })
-  }
-
-  onDeleteGet = (path,values) => {
-    createCrudService(path).delGet(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('删除成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'删除失败');
-      }
-    })
-  }
-  onFileGet = (path,values) => {
-    createCrudService(path).delGet(values).then((result) => {
-      if (result?.code === 200) {
-        message.success('删除成功');
-        this.setState({ open: false });
-        if (this.props.onCrudSuccess) {
-          this.props.onCrudSuccess();
-        }
-      } else {
-        message.error(result?.msg||'删除失败');
-      }
-    })
-  }
-  
-  
-  whichMod = (value,record) => {
-    if(value === 'save'){
-      return ''
-    }else if (value === 'add'){
-      return '新增'
-    }else if (value === 'edit'){
-      return '修改'
-    }else if (value === 'view'){
-      return  record.idx === 1 ? 'Ⅰ级' :
-      record.idx === 2 ? 'Ⅱ级' : 
-      record.idx === 3 ? "Ⅲ级" :
-      record.idx === 4 ? "Ⅳ级" :''
-    }else if (value === 'show' || value === 'review'){
-      return ''
-    }
-  }
-
-  render() {
-    const { record, open, mode } = this.state;
-    const { width, title, style, wrapClassName, formProps, component: Component,data } = this.props;
-    if (!record || !open) {
-      return null;
-    }
-
-    return (
-      <Modal
-        width={width || 600}
-        style={style || { top: 10 }}
-        wrapClassName={wrapClassName}
-        visible
-        title={`${this.whichMod(mode,record)}${title}`}
-        footer={null}
-        destroyOnClose
-        onCancel={() => { this.setState({ open: false }) }}
-      >
-        <Component
-          mode={mode}
-          close={()=>{this.setState({ open: false })}}
-          onCrudSuccess={this.props.onCrudSuccess}
-          record={record}
-          onEdit={this.onEdit}
-          onSave={this.onSave}
-          formProps={formProps}
-          data={data}
-        />
-      </Modal>
-    );
-  }
-}
-
-export default BasicCrudModal;
diff --git a/src/views/fxdd/ddjc/yjxy/emergDetail.js b/src/views/fxdd/ddjc/yjxy/emergDetail.js
deleted file mode 100644
index b46830b..0000000
--- a/src/views/fxdd/ddjc/yjxy/emergDetail.js
+++ /dev/null
@@ -1,177 +0,0 @@
-import React,{useState,useEffect} from 'react'
-import { Divider, Descriptions, Rol, Col, Modal,Image } from "antd"
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import { createCrudService } from '../../../../components/crud/_';
-export default function Page({ selectDiv1, detail }) {
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const [selectDiv, setSelectDiv] = useState(selectDiv1)
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const handleClickTitle = (e) => {
-    setSelectDiv(e.target.textContent)
-  }
-
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfEmerRespR/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.ddjc.yjxy.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-  useEffect(()=>{
-    if (detail?.attachList && detail.attachList.length > 0) {
-        getFileInfo(detail)
-      }
-  },[detail])
-  return (
-    <div className='detail-box'>
-      <div className='left-title'>
-          <div className='detail-label' onClick={handleClickTitle}>
-        <div className={selectDiv === "启动响应" ? "title select-Div" : "title"}>启动响应</div>
-        <div className={selectDiv === "消息发送记录" ? "title select-Div" : "title"}>消息发送记录</div>
-          </div>
-          <div className='sperate-line'>
-        <img
-          src={`${process.env.PUBLIC_URL}/assets/fxdd/line_icon.png`}
-          style={{
-            position: 'absolute',
-            top: "-3px",
-            left:"-17px",
-            width: "40px",
-            height:"35px"
-          }}
-        />
-        <img
-          src={`${process.env.PUBLIC_URL}/assets/fxdd/line_icon.png`}
-          style={{
-            position: 'absolute',
-            top: "90px",
-            left:"-17px",
-            width: "40px",
-            height:"35px"
-          }}
-        />
-      </div>
-      </div>
-      <div className='right-content'>
-      {selectDiv === "启动响应" ? 
-        <div className='start-response'>
-            <Descriptions >
-            <Descriptions.Item label={<span><span style={{color:"red"}}>*</span>原因</span>} span={6}>{detail?.reason}</Descriptions.Item>
-            <Descriptions.Item label="响应开始时间" span={2}>{detail?.stm}</Descriptions.Item>
-            <Descriptions.Item label="执行人" span={3}>{detail?.person || "---"}</Descriptions.Item>
-            <Descriptions.Item label="附件" span={6}>
-            {
-                fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item">
-                        <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-            </Descriptions.Item>
-           </Descriptions>
-        </div> : null
-      }
-
-      </div>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfEmerRespR/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/views/fxdd/ddjc/yjxy/form.js b/src/views/fxdd/ddjc/yjxy/form.js
deleted file mode 100644
index 72d3d8a..0000000
--- a/src/views/fxdd/ddjc/yjxy/form.js
+++ /dev/null
@@ -1,282 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd, validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import { mobile } from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import { createCrudService } from '../../../../components/crud/_';
-import moment from 'moment';
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record, onEdit, onSave,data }) => {
-
-console.log("data",data);
-  const [form] = Form.useForm();
-  const [sttp, setSttp] = useState([])
-  const [frgrd, setFrgrd] = useState([])
-  const [stbk, setStbk] = useState([])
-  const [usfl, setUsfl] = useState([])
-  const [locality, setLocality] = useState([])
-
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-
-
-
-  const onFinish = (values) => {
-    let params = {
-      etm: moment().format("YYYY-MM-DD HH:00:00"),
-      id:data[0]?.id
-    }
-    console.log("values", values);
-    values.stm = moment(values.tm).format("YYYY-MM-DD HH:00:00")
-    values.level = record.idx;
-    values.year = record.year
-    if (mode === 'save') {
-      values.attachList = fileIds
-      // 先解除响应
-      if (data[0]?.status == 1) {
-        createCrudService(apiurl.ddjc.yjxy.stop).edit(params).then(res => {
-          if (res.code === 200) {
-            // 再启动响应
-            onSave(apiurl.ddjc.yjxy.save, values)
-          }
-        })
-      } else {
-        onSave(apiurl.ddjc.yjxy.save, values)
-      }
-    }
-  }
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-  }
-
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    console.log(info);
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return {fileId: file.response?.data?.fileId}
-    })
-    console.log(fileIds);
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfEmerRespR/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-
-  return (
-    <>
-      {!record.isShow ? 
-        <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="启动响应时间"
-              name="tm"
-              rules={[{ required: true }]}
-            >
-               <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD HH:00:00"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-        <Col span={24}>
-            <Form.Item
-              label="原因"
-              name="reason"
-              rules={[{ required: true }]}
-            >
-               <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/xfEmerRespR/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                    fileList={fileList}
-                  disabled={loading}
-                    
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                  {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-        {
-          mode === 'view' ? null : (
-            <>
-              <Form.Item {...btnItemLayout}>
-                <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '提交' : '修改'}
-                </Button>
-              </Form.Item>
-            </>
-          )
-        }
-        </Form>
-        : <img
-            src={`${process.env.PUBLIC_URL}/assets/fxdd/流程图.png`}
-          alt=""
-          style={{
-            width: '100%',
-            height: '100%',
-          }}
-        />
-      }
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfEmerRespR/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxdd/ddjc/yjxy/index.js b/src/views/fxdd/ddjc/yjxy/index.js
deleted file mode 100644
index 3a377e9..0000000
--- a/src/views/fxdd/ddjc/yjxy/index.js
+++ /dev/null
@@ -1,257 +0,0 @@
-import React, { lazy, useRef, useEffect, useMemo, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { Collapse, Slider, Button, message, Modal, Table, Form,DatePicker } from 'antd'
-import "./index.less"
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import ModalForm from './form';
-import BasicCrudModal from './BasicCrudModal';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-import ToolBar from './toolbar';
-import EmrgeDetail from "./emergDetail"
-import moment from 'moment';
-const { Panel } = Collapse;
-
-
-const Page = () => {
-  const refModal = useRef();
-  const hasAlertBox = useSelector((s) => s.runtime.hasAlertBox);
-  const [searchVal, setSearchVal] = useState({ year: '' })
-  const [emrgeOpen, setEmrgeOpen] = useState(false)
-  const [switchPage, setSwitchPage] = useState(1)
-  const [selectDiv, setSelectDiv] = useState("启动响应")
-  const [detail, setDetail] = useState({})
-  const [items, setTableData] = useState([{
-    idx: 4
-  }, {
-    idx: 3
-  }, {
-    idx: 2
-  }, {
-    idx: 1
-  }])
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '原因', key: 'reason', dataIndex: 'reason', width: 300, ellipsis: true },
-    { title: '响应开始时间', key: 'stm', dataIndex: 'stm', width: 200 },
-    { title: '响应结束时间', key: 'etm', dataIndex: 'etm', width: 200 },
-    {
-      title: '启动响应级别', key: 'level', dataIndex: 'level', width: 150,
-      render: (value, row, index) => (<span>{
-        row.level === 1 ? 'Ⅰ级' :
-          row.level === 2 ? 'Ⅱ级' : 
-            row.level === 3 ? "Ⅲ级" :
-              row.level === 4 ? "Ⅳ级" :''
-          }</span>)
-    },
-    {
-      title: '是否解除', key: 'status', dataIndex: 'status', width: 150, ellipsis: true,
-      render: (value, row, index) => (<span>{row.status === 1? '否' : '是'}</span>)
-    },
-    { title: '执行人员', key: 'person', dataIndex: 'person', width: 200, ellipsis: true },
-    {
-      title: '操作', key: 'operation', width: 150, fixed: 'right', align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const command = (type) => (params) => {
-    if (type === 'view') {
-      setEmrgeOpen(true)
-      setSwitchPage(2)
-      // refModal.current.showView(params);
-      setDetail(params)
-    }
-    if (type === 'save') {
-      refModal.current.showSave(params);
-    }
-  }
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          year:searchVal.year || moment().subtract(0, 'years').year()
-        }
-      };
-      search(params)
-    }
-  }, [searchVal])
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.ddjc.yjxy.page).find_noCode);
-  /**
-   * @description 解除响应
-   * @param {Object} val  表单值
-   */
-  const onFinish = (values) => {
-    let params = {
-      etm: moment(values.etm).format("YYYY-MM-DD HH:00:00"),
-      id:tableProps.dataSource[0].id
-    }
-    createCrudService(apiurl.ddjc.yjxy.stop).edit(params).then(res => {
-      if (res.code == 200) {
-        message.success('解除成功')
-        setEmrgeOpen(false)
-        refresh()
-      }
-    })
-  }
-
-  /**
-   * @description 解除响应
-   * 
-   */
-  const removeResp = () => {
-    setEmrgeOpen(true)
-    setSwitchPage(1)
-  }
-  return (
-    <>
-      <div className='yjxy_container'>
-        <div className="yjxy_waterBox" style={{ height: hasAlertBox ? "calc(100vh - 110px)" : "calc(100vh - 90px)", width: "20rem" }}>
-          <Collapse defaultActiveKey={['1', '2', '3']} expandIconPosition="end">
-            <Panel header={<div className="clearFloat panelTitle">
-              <div className="lf">
-                <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt="" />
-              </div>
-              <span className="lf txt">当前响应级别</span>
-            </div>} key="1">
-              {tableProps?.dataSource[0]?.status ? 
-                 <div className='dqxy_level'>
-                 <img src={`${process.env.PUBLIC_URL}/assets/fxdd/level_${tableProps?.dataSource[0]?.level}.png`} alt="" />
-                 <div>
-                    <Button
-                      type="primary"
-                      shape="round"
-                      style={{ backgroundColor: '#0084ff', borderColor: '#0084ff' }}
-                      size={'small'}
-                      onClick={() => {removeResp()}}
-                    >
-                     解除
-                   </Button>
-                 </div>
-                 </div>
-                : <div className='dqxy_level'>
-                   <img src={`${process.env.PUBLIC_URL}/assets/fxdd/无.png`} alt="" />
-                  </div>
-              }
-             
-            </Panel>
-            <Panel header={<div className="clearFloat panelTitle">
-              <div className="lf">
-                <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt="" />
-              </div>
-              <span className="lf txt">启动响应</span>
-            </div>} key="2">
-              <div className="tq_panel">
-                {items.map((item, index) => (
-                  <div className="tq_pnode" key={index}>
-                    <div className="tq_item"><img src={`${process.env.PUBLIC_URL}/assets/fxdd/level_${item.idx}.png`} alt="" /></div>
-                    <div className="tq_item2">
-                      <div>
-                        <Button
-                          type="primary"
-                          shape="round"
-                          style={{ backgroundColor: '#0084ff', borderColor: '#0084ff' }}
-                          size={'small'}
-                          onClick={() => command('save')({ idx: item.idx, year: searchVal.year || moment().subtract(0, 'years').year() })}
-                        >
-                          启动
-                        </Button>
-                      </div>
-                      {/* <div className='lct_view' onClick={() => command('view')({ idx: item.idx, isShow: true })}>查看流程图</div> */}
-                      <div className='lct_view' onClick={() => { refModal.current.showView({ idx: item.idx, isShow: true })}}>查看流程图</div>
-                    </div>
-                  </div>
-                ))}
-              </div>
-            </Panel>
-
-          </Collapse>
-        </div>
-        <div className='right_box'>
-          <div className="ant-card-body" style={{ padding: "5px 0 0 0" }}>
-            <div style={{ marginLeft: '10px' }}>
-              <ToolBar setSearchVal={setSearchVal} onSave={command('save')} />
-            </div>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-        <BasicCrudModal
-          width={900}
-          ref={refModal}
-          title="启动响应"
-          component={ModalForm}
-          onCrudSuccess={refresh}
-          data={tableProps?.dataSource}  
-          // onCrudSuccess={() => { refresh({ addvcd: localStorage.getItem('ADCD6') }) }}
-        />
-        <Modal
-          title={switchPage === 1 ? "解除响应" :"应急响应详情"}
-          open={emrgeOpen}
-          footer={null}
-          onCancel={() => {
-            setEmrgeOpen(false);
-            setSelectDiv("启动响应")
-          }}
-          width={switchPage === 1 ? "800px" : "1000px"}
-          className="remove-resp-modal"
-          destroyOnClose
-        >
-          {switchPage === 1 ? 
-            <div className='remove-resp'>
-            <div className='remove-descrip'>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/fxdd/问号.png`}
-                style={{
-                  width: '30px',
-                  height: '30px',
-                }}
-              />
-               <div className='remove-text'>
-                 是否确认解除当前应急响应？如需解除，请选择解除响应时间并点击“提交”，系统将向各级防汛值班人员发送解除响应的消息；如选择“关闭”则取消当前操作。
-               </div>
-            </div>
-            <Form
-              labelCol={10}
-              wrapperCol={14} 
-              onFinish={onFinish}
-            >
-              <Form.Item
-                label="解除响应时间"
-                name="etm"
-                labelCol={{ span: 5 }}
-                wrapperCol={{ span: 18 }}
-                rules={[{ required: true }]}
-              >
-                <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD HH:00:00"  
-                  style={{width:'80%',marginLeft: 'auto' }}
-                />
-                </Form.Item>
-                 <Form.Item wrapperCol={{ span: 24 }} >
-                  <div style={{ display: 'flex', justifyContent: 'flex-end', gap: '16px' }}>
-                    <Button  onClick={() => setEmrgeOpen(false)}>关闭</Button>
-                    <Button type="primary" htmlType="submit">提交</Button>
-                 </div>
-                 </Form.Item>
-              </Form>
-            </div> : 
-            <EmrgeDetail
-              selectDiv1={selectDiv}
-              detail={detail}
-            />
-          }
-
-        </Modal>
-      </div>
-    </>
-
-  );
-}
-
-export default Page;
diff --git a/src/views/fxdd/ddjc/yjxy/index.less b/src/views/fxdd/ddjc/yjxy/index.less
deleted file mode 100644
index 6e12e68..0000000
--- a/src/views/fxdd/ddjc/yjxy/index.less
+++ /dev/null
@@ -1,104 +0,0 @@
-.yjxy_container {
-  display: flex;
-
-  .yjxy_waterBox {
-    display: inline-block;
-    background: #fff;
-
-    .dqxy_level {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-    }
-
-    .tq_panel {
-
-      .tq_pnode {
-        border: 1px solid lightgray;
-        border-radius: 0.4rem;
-        margin-bottom: 1rem;
-        display: flex;
-        height: 8rem;
-        justify-content: center;
-
-        .tq_item {
-          width: 50%;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-        }
-
-        .tq_item2 {
-          width: 50%;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-
-          .lct_view {
-            margin-top: 0.4rem;
-            color: #5dc4ff;
-            cursor: pointer;
-          }
-        }
-      }
-    }
-  }
-
-  .right_box {
-    background: #fff;
-    margin-left: 12px;
-    height: calc(-90px + 100vh);
-    width: calc(-618px + 100vw);
-    border-radius: 0.2rem;
-  }
-}
-.remove-resp-modal{
-  .remove-descrip{
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-    column-gap: 20px;
-    margin-bottom: 20px;
-  }
-}
-.detail-box{
-  display: flex;
-  column-gap: 40px;
-  .left-title{
-    display: flex;
-    column-gap: 20px;
-    .detail-label{
-      display: flex;
-      flex-direction: column;
-      row-gap: 60px;
-      .title{
-        padding: 4px 16px;
-        // border: 1px solid #000;
-        border-radius: 14px;
-        text-align: center;
-        &:hover{
-          cursor: pointer;
-        }
-      }
-    }
-    .select-Div{
-      // padding: 4px 16px;
-      border: 1px solid #409eff;
-      // border-radius: 14px;
-      color: #409eff;
-      font-weight: 700;
-    }
-    .sperate-line{
-      position: relative;
-      width: 1px;
-      min-height: 500px;
-      background-color: #d7d7d7;
-      margin-right: 20px;
-    }
-  }
-  .right-content{
-    flex: 1;
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxdd/ddjc/yjxy/toolbar.js b/src/views/fxdd/ddjc/yjxy/toolbar.js
deleted file mode 100644
index 080176a..0000000
--- a/src/views/fxdd/ddjc/yjxy/toolbar.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const ToolBar = ({ setSearchVal, onSave }) => {
-  const [form] = Form.useForm();
-  const [source, setSource] = useState([])
-  const [sttp, setSttp] = useState([])
-
-  const onFinish = (val) => {
-    //if(!val.addvcd)val.addvcd = config.ADCD6
-    val.buildYear = val.buildYear ? moment(val.buildYear).format('YYYY') : undefined
-    // val.sts = val.stcd?[val.stcd]:undefined
-    // delete val.stcd
-    setSearchVal(val);
-  }
-
-  useEffect(() => {
-    getSelect()
-  }, [])
-
-  const getSelect = async () => {
-    // 获取最近5年
-    const lastFiveYears = [];
-    for (let i = 0; i < 5; i++) {
-      const year = moment().subtract(i, 'years').year();
-      lastFiveYears.push({
-        label: year,
-        value: year
-      });
-    }
-    setSource(lastFiveYears)
-    form.setFieldsValue({
-      year:lastFiveYears[0]
-    })
-  }
-  const handleFormChange = (changedValues, allValues) => {
-    setSearchVal(changedValues)
-  };
-  // useEffect(() => {
-  //   let initalVal = form.getFieldsValue()?.value;
-  //   setSearchVal(initalVal)
-  // }, [])
-  
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form}
-          className='toolbarBox'
-          layout="inline"
-          onFinish={onFinish}
-          onValuesChange={handleFormChange}
-        >
-          <Form.Item label="年度" name="year">
-            <NormalSelect options={source} style={{ width: '180px' }} />
-          </Form.Item>
-          {/* <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> */}
-          {/* {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          } */}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxdd/dqxsfx/hdyj/dataConfig.js b/src/views/fxdd/dqxsfx/hdyj/dataConfig.js
deleted file mode 100644
index cdc3f4c..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/dataConfig.js
+++ /dev/null
@@ -1,213 +0,0 @@
-export default {
-  tableData: [
-    {
-      type: 2,
-      typeName: '超危险水位',
-      flowSign: null,
-      flowDetails: [
-        // {
-        //   "rvcd": "AFF1320101W00000",
-        //   "village": [
-        //     "三组(幺牌）"
-        //   ],
-        //   "villagePoint": [
-        //     [
-        //       110.407947,
-        //       30.013943
-        //     ]
-        //   ],
-        //   "villagePeople": 318,
-        //   "flow": 466.972,
-        //   "time": "2017-07-15 01:00:00",
-        //   "villageCount": 1,
-        //   "eventId": null,
-        //   "type": 6,
-        //   "riverMapCenter": null,
-        //   "town": null,
-        //   "riverArea": null,
-        //   "totalDrp": null
-        // },
-        // {
-        //   "rvcd": "AFF1320101T00000",
-        //   "village": [
-        //     "五组（田家坪）"
-        //   ],
-        //   "villagePoint": [
-        //     [
-        //       110.425186,
-        //       30.030705
-        //     ]
-        //   ],
-        //   "villagePeople": 424,
-        //   "flow": 422.697,
-        //   "time": "2017-07-15 01:00:00",
-        //   "villageCount": 1,
-        //   "eventId": null,
-        //   "type": 6,
-        //   "riverMapCenter": null,
-        //   "town": null,
-        //   "riverArea": null,
-        //   "totalDrp": null
-        // },
-        // {
-        //   "rvcd": "AFF1320101R00000",
-        //   "village": [
-        //     "下街",
-        //     "四组（覃家坪）"
-        //   ],
-        //   "villagePoint": [
-        //     [
-        //       110.427007,
-        //       30.041187
-        //     ],
-        //     [
-        //       110.430404,
-        //       30.036725
-        //     ]
-        //   ],
-        //   "villagePeople": 631,
-        //   "flow": 417.836,
-        //   "time": "2017-07-15 01:00:00",
-        //   "villageCount": 2,
-        //   "eventId": null,
-        //   "type": 6,
-        //   "riverMapCenter": null,
-        //   "town": null,
-        //   "riverArea": null,
-        //   "totalDrp": null
-        // },
-        // {
-        //   "rvcd": "AFF1320101P00000",
-        //   "village": [
-        //     "四组",
-        //     "二组（胡家坪）"
-        //   ],
-        //   "villagePoint": [
-        //     [
-        //       110.435104,
-        //       30.057728
-        //     ],
-        //     [
-        //       110.439722,
-        //       30.055551
-        //     ]
-        //   ],
-        //   "villagePeople": 686,
-        //   "flow": 294.871,
-        //   "time": "2017-07-15 01:00:00",
-        //   "villageCount": 2,
-        //   "eventId": null,
-        //   "type": 6,
-        //   "riverMapCenter": null,
-        //   "town": null,
-        //   "riverArea": null,
-        //   "totalDrp": null
-        // },
-        // {
-        //   "rvcd": "AFF1320101X00000",
-        //   "village": [
-        //     "二组（红旗2）"
-        //   ],
-        //   "villagePoint": [
-        //     [
-        //       110.403766,
-        //       30.016641
-        //     ]
-        //   ],
-        //   "villagePeople": 100,
-        //   "flow": 481.41,
-        //   "time": "2017-07-15 01:00:00",
-        //   "villageCount": 1,
-        //   "eventId": null,
-        //   "type": 6,
-        //   "riverMapCenter": null,
-        //   "town": null,
-        //   "riverArea": null,
-        //   "totalDrp": null
-        // }
-      ]
-    },
-    {
-      type: 1,
-      typeName: '超警戒水位',
-      flowSign: null,
-      flowDetails: [
-        // {
-        //   rvcd: 'AFF1320101K00000',
-        //   village: ['一组（八里铺）'],
-        //   villagePoint: [[110.458963, 30.074837]],
-        //   villagePeople: 295,
-        //   flow: 247.457,
-        //   time: '2017-07-15 01:00:00',
-        //   villageCount: 1,
-        //   eventId: null,
-        //   type: 6,
-        //   riverMapCenter: null,
-        //   town: null,
-        //   riverArea: null,
-        //   totalDrp: null
-        // },
-        // {
-        //   rvcd: 'AFF1320101I00000',
-        //   village: ['三组（关岔口）'],
-        //   villagePoint: [[110.47866, 30.080996]],
-        //   villagePeople: 197,
-        //   flow: 218.73,
-        //   time: '2017-07-15 01:00:00',
-        //   villageCount: 1,
-        //   eventId: null,
-        //   type: 6,
-        //   riverMapCenter: null,
-        //   town: null,
-        //   riverArea: null,
-        //   totalDrp: null
-        // },
-        // {
-        //   rvcd: 'AFF1320101G00000',
-        //   village: ['二组（横河）'],
-        //   villagePoint: [[110.47501, 30.097844]],
-        //   villagePeople: 214,
-        //   flow: 159.271,
-        //   time: '2017-07-15 01:00:00',
-        //   villageCount: 1,
-        //   eventId: null,
-        //   type: 5,
-        //   riverMapCenter: null,
-        //   town: null,
-        //   riverArea: null,
-        //   totalDrp: null
-        // },
-        // {
-        //   rvcd: 'AFF13201018N0000',
-        //   village: ['二组（白果湾）'],
-        //   villagePoint: [[110.436559, 30.051893]],
-        //   villagePeople: 193,
-        //   flow: 72.42,
-        //   time: '2017-07-15 00:00:00',
-        //   villageCount: 1,
-        //   eventId: null,
-        //   type: 4,
-        //   riverMapCenter: null,
-        //   town: null,
-        //   riverArea: null,
-        //   totalDrp: null
-        // },
-        // {
-        //   rvcd: 'AFF13201015N0000',
-        //   village: ['三组'],
-        //   villagePoint: [[110.457203, 30.049073]],
-        //   villagePeople: 361,
-        //   flow: 50.667,
-        //   time: '2017-07-15 00:00:00',
-        //   villageCount: 1,
-        //   eventId: null,
-        //   type: 4,
-        //   riverMapCenter: null,
-        //   town: null,
-        //   riverArea: null,
-        //   totalDrp: null
-        // }
-      ]
-    }
-  ]
-}
diff --git a/src/views/fxdd/dqxsfx/hdyj/index.css b/src/views/fxdd/dqxsfx/hdyj/index.css
deleted file mode 100644
index d472a85..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/index.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-}
-.waterLevelBox .listBox1 .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.waterLevelBox .smallTable {
-  height: calc(100% - 190px);
-}
-.search-timeline .label {
-  display: flex;
-  justify-content: space-between;
-  width: 280px;
-  height: 30px;
-  border-radius: 2px;
-  border: 1px solid gray;
-}
-.search-timeline .label .h_item {
-  width: 50px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background-color: #fff;
-  cursor: pointer;
-}
-.search-timeline .label .h_item.active {
-  width: 50px;
-  color: #fff;
-  background-color: #409eff;
-}
diff --git a/src/views/fxdd/dqxsfx/hdyj/index.js b/src/views/fxdd/dqxsfx/hdyj/index.js
deleted file mode 100644
index b664b16..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-
-import "./index.less"
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import Toolbar from './toolbar'
-
-const Page = ({activeKey}) => {
-  const doSearch = (params) => {
-
-
-  };
-  return (
-    <div className="monitor-rainfall waterLevelBox" >
-      <div style={{margin:"0 0 0 6px"}} className="topQuery">
-        <Toolbar search={doSearch} />
-      </div>
-    </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxdd/dqxsfx/hdyj/index.less b/src/views/fxdd/dqxsfx/hdyj/index.less
deleted file mode 100644
index 63bc4e6..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/index.less
+++ /dev/null
@@ -1,39 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-  .listBox1 .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-}
-
-.search-timeline {
-  .label {
-    display: flex;
-    justify-content: space-between;
-    width: 280px;
-    height: 30px;
-    border-radius: 2px;
-    border: 1px solid gray;
-
-    .h_item {
-      width: 50px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #fff;
-      cursor: pointer;
-    }
-
-    .h_item.active {
-      width: 50px;
-      color: #fff;
-      background-color: #409eff;
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/hdyj/ljtj/index.css b/src/views/fxdd/dqxsfx/hdyj/ljtj/index.css
deleted file mode 100644
index 61bba44..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/ljtj/index.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.listBox1 .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.listBox1 .ant-collapse-content-box {
-  max-height: 350px;
-  overflow-y: scroll;
-}
-.listBox1 .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-  padding: 0 10px;
-}
-.listBox1 .txt {
-  font-size: 12px;
-  line-height: 32px;
-}
-.listBox1 .txt:nth-child(1) {
-  width: 26%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.listBox1 .txt:nth-child(2) {
-  width: 24%;
-  text-align: center;
-}
-.listBox1 .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.listBox1 .txt:nth-child(4) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/src/views/fxdd/dqxsfx/hdyj/ljtj/index.js b/src/views/fxdd/dqxsfx/hdyj/ljtj/index.js
deleted file mode 100644
index 8349ac4..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/ljtj/index.js
+++ /dev/null
@@ -1,286 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { Vector as VectorSource } from 'ol/source'
-import VectorLayer from 'ol/layer/Vector'
-import Style from 'ol/style/Style'
-import Icon from 'ol/style/Icon'
-import Feature from 'ol/Feature'
-import Point from 'ol/geom/Point.js'
-import FillStyle from 'ol/style/Fill'
-import Text from 'ol/style/Text'
-import Stroke from 'ol/style/Stroke'
-import { transform } from 'ol/proj'
-import data from '../dataConfig'
-import './index.less'
-import { hdWarn } from '../../../../../service/fxdd'
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons'
-const { Panel } = Collapse
-const Page = ({ checkVal }) => {
-  const [loading, setLoading] = useState(true)
-  let mapObj = useSelector(s => s.map.map)
-  const dispatch = useDispatch()
-  const columns = [
-    { title: '站名', key: 'stnm', dataIndex: 'stnm', ellipsis: true },
-    {
-      title: '水位(m)',
-      key: 'z',
-      dataIndex: 'z',
-      width: 120
-    },
-    { title: '所属政区', key: 'adnm', dataIndex: 'adnm', ellipsis: true },
-    { title: '所属流域', key: 'lyname', dataIndex: 'lyname', ellipsis: true }
-  ]
-  const [tableData, setTableData] = useState(data.tableData)
-  let _tbArr = [...tableData]
-
-  useEffect(() => {
-    getData(checkVal)
-  }, [checkVal])
-
-  const getData = async arr => {
-    const res = await hdWarn({
-      sources: arr,
-      args: ''
-    })
-
-    if (res.grzList && res.grzList.length > 0) {
-      _tbArr[0].flowDetails = res.grzList.map(item => {
-        item.z = item?.z ? item?.z.toFixed(2) : ''
-        return item
-      })
-    } else {
-      _tbArr[0].flowDetails = []
-    }
-
-    if (res.wrzList && res.wrzList.length > 0) {
-      _tbArr[1].flowDetails = res.wrzList.map(item => {
-        item.z = item?.z ? item?.z.toFixed(2) : ''
-        return item
-      })
-    } else {
-      _tbArr[1].flowDetails = []
-    }
-    setTableData(_tbArr)
-    const list = [...res.grzList, ...res.wrzList]
-    addLayer(list)
-  }
-
-  useEffect(() => {
-    return () => {
-      dispatch.runtime.closeFeaturePopAll()
-      mapObj &&
-        mapObj
-          .getLayers()
-          .getArray()
-          .forEach(layer => {
-            if (
-              layer.values_.name &&
-              layer.values_.name.indexOf('YSGZQ_SSSQ_HD') > -1
-            ) {
-              layer.getSource().clear()
-            }
-          })
-    }
-  }, [])
-
-  const addLayer = arr => {
-    mapObj &&
-      mapObj
-        .getLayers()
-        .getArray()
-        .forEach(layer => {
-          if (
-            layer.values_.name &&
-            layer.values_.name.indexOf('YSGZQ_SSSQ_HD') > -1
-          ) {
-            layer.getSource().clear()
-          }
-        })
-
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name: 'YSGZQ_SSSQ_HD',
-      source: new VectorSource(),
-      style: feature => {
-        const type = feature.values_.data
-        const z = feature.values_.data.z
-        return [
-          new Style({
-            image: new Icon({
-              src: `${process.env.PUBLIC_URL}/assets/sanjiao3.png`,
-              // anchor: [0.5, 0.5],
-              opacity: 1,
-              // scale: 0.9,
-              // rotation:(90),
-              width: 12,
-              hieght: 12
-            }),
-            text: new Text({
-              text: String(z) + 'm',
-              offsetY: 15,
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: 'rgba(0,0,0,0.5)' }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true
-            }),
-            zIndex: 20
-          })
-        ]
-      },
-      zIndex: 200
-    })
-
-    const features = arr.map(item => {
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857')
-      const feature = new Feature({
-        geometry: new Point(point2),
-        data: item
-      })
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature))
-    mapObj.addLayer(layer)
-
-    mapObj.on('click', function (evt) {
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function (feature) {
-        return feature
-      })
-      if (feature) {
-        const data = feature.values_.data
-        if (data) {
-          dispatch.runtime.setFeaturePop({
-            id: data.stcd,
-            data: data,
-            type: 'hdsw',
-            lgtd: data.lgtd,
-            lttd: data.lttd
-          })
-        }
-      }
-    })
-  }
-
-  const flyTo = record => {
-    const { lgtd, lttd, elev } = record
-    if (lgtd && lttd) {
-      dispatch.runtime.setFeaturePop({
-        type: 'hdsw',
-        data: record,
-        lgtd: record.lgtd,
-        lttd: record.lttd
-      })
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60
-      })
-    }
-  }
-
-  return (
-    <>
-      <div className='table'>
-        <Table
-          rowKey='adcd'
-          bordered
-          columns={columns}
-          pagination={false}
-          dataSource={[]}
-          scroll={{ y: 0 }}
-          defaultExpandAllRows={true}
-          expandable={{
-            indentSize: 10
-          }}
-        />
-      </div>
-      <div
-        className='listBox1'
-        style={{ paddingBottom: '10px', overflow: 'auto' }}
-      >
-        {/*{*/}
-        {/*  loading ?*/}
-        {/*    <div style={{*/}
-        {/*      position: "absolute",*/}
-        {/*      top: "270px",*/}
-        {/*      left: "110px",*/}
-        {/*      background: "#fff",*/}
-        {/*      padding: "20px 30px",*/}
-        {/*      borderRadius: "10px",*/}
-        {/*      zIndex: 10*/}
-        {/*    }}>*/}
-        {/*      <Spin tip="正在加载..." size="large" spinning={loading}/>*/}
-        {/*    </div> : null*/}
-        {/*}*/}
-        {tableData.length > 0 ? (
-          tableData.map((item, index) => (
-            <>
-              <div key={item.type} className='bgColor2'>
-                {/*// @ts-ignore*/}
-                <Collapse
-                  size='small'
-                  // defaultActiveKey={index}
-                  expandIcon={({ isActive }) =>
-                    isActive ? (
-                      // <PlusOutlined rotate={isActive ? 90 : 0} />
-                      <MinusOutlined rotate={isActive ? 0 : 0} />
-                    ) : (
-                      // <MinusOutlined rotate={isActive ? 90 : 0} />
-                      <PlusOutlined rotate={isActive ? 90 : 0} />
-                    )
-                  }
-                >
-                  <Panel
-                    header={item.typeName + '(' + item.flowDetails.length + ')'}
-                    key={index}
-                  >
-                    {/* {item.flowDetails.length > 0 &&
-                      item.flowDetails.map(item1 => (
-                        <div onClick={() => flyTo(item1)}>
-                          <div className='clearFloat txtBox'>
-                            <div className='lf txt'>{item1.stnm}</div>
-                            <div className='lf txt'>{item1.grz}</div>
-                            <div className='lf txt'>{item1.adnm}</div>
-                            <div className='lf txt'>{item1.lyname}</div>
-                          </div>
-                        </div>
-                      ))} */}
-                    {item.flowDetails.length > 0 ? (
-                      <Table
-                        columns={columns}
-                        showHeader={false}
-                        pagination={false}
-                        dataSource={item.flowDetails}
-                        scroll={{ y: 200 }}
-                        onRow={record => ({
-                          onClick: () => {
-                            flyTo(record)
-                          }
-                        })}
-                      />
-                    ) : null}
-                  </Panel>
-                </Collapse>
-              </div>
-            </>
-          ))
-        ) : (
-          <div style={{ textAlign: 'center', margin: '10%' }}>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-              alt=''
-              width={170}
-            />
-          </div>
-        )}
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/hdyj/ljtj/index.less b/src/views/fxdd/dqxsfx/hdyj/ljtj/index.less
deleted file mode 100644
index f2be743..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/ljtj/index.less
+++ /dev/null
@@ -1,57 +0,0 @@
-.listBox1 {
-  // height: calc(100vh - 500px);
-  // overflow: auto;
-  .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-  .ant-collapse-content-box {
-    max-height: 350px;
-    overflow-y: scroll;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-    padding: 0 10px;
-  }
-
-  .txt {
-    font-size: 12px;
-    line-height: 32px;
-    &:nth-child(1) {
-      width: 26%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      // &:hover {
-      //   // width: 200px;
-      //   overflow: visible;
-      //   white-space: pre-line;
-      //   cursor: pointer;
-      // }
-    }
-    &:nth-child(2) {
-      width: 24%;
-      text-align: center;
-    }
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    &:nth-child(4) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/hdyj/toolbar.js b/src/views/fxdd/dqxsfx/hdyj/toolbar.js
deleted file mode 100644
index 1cb6060..0000000
--- a/src/views/fxdd/dqxsfx/hdyj/toolbar.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Button, DatePicker, Checkbox } from 'antd'
-import moment from 'moment'
-import Ljtj from '../hdyj/ljtj'
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-const formItemLayout = {
-  labelCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 3
-    }
-  },
-  wrapperCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 16
-    }
-  }
-}
-const ToolBar = ({ onSearch, downLoad }) => {
-  const [form] = Form.useForm()
-  const [checked, setChecked] = useState(['SH', 'SW'])
-  const onSearchClick = val => {
-    val.tm = val.tm ? moment(val.tm).format('YYYY-MM-DD') : ''
-    onSearch(val)
-  }
-
-
-  const typeOptions = [
-    { label: '山洪', value: 'SH' },
-    { label: '水文', value: 'SW' }
-  ]
-
-  const onChange = checkedValues => {
-    console.log(checkedValues)
-
-    const { ...rec } = form.getFieldsValue()
-    // console.log('ffff', rec)
-
-    setChecked(checkedValues)
-  }
-
-  return (
-    <>
-      <div
-        style={{
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'space-between'
-        }}
-      >
-        <Form
-          form={form}
-          className='toolbarBox'
-          {...formItemLayout}
-          initialValues={{ types: ['SH', 'SW', 'QX', 'SK'], tm: moment() }}
-        >
-          <Form.Item label='类型' name='types'>
-            <CheckboxGroup options={typeOptions} onChange={onChange} />
-          </Form.Item>
-          <div
-            className='dqxsfxTable '
-            //  style={{ width: '25rem' }}
-          >
-            <Ljtj checkVal={checked} />
-          </div>
-        </Form>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/fxdd/dqxsfx/index.css b/src/views/fxdd/dqxsfx/index.css
deleted file mode 100644
index 833e3d6..0000000
--- a/src/views/fxdd/dqxsfx/index.css
+++ /dev/null
@@ -1,210 +0,0 @@
-.waterBox1 {
-  display: inline-block;
-  position: relative;
-  z-index: 999;
-  background-color: #fff;
-  width: 28rem;
-}
-.waterBox1 .rightDetails {
-  position: absolute;
-  width: 330px;
-  height: calc(100vh - 90px);
-  background: #fff;
-  z-index: 101;
-  right: calc((100vw - 46rem) * -1);
-  top: -8px;
-  box-shadow: 1px 2px 10px #bdbaba;
-  padding: 10px 0;
-  box-sizing: border-box;
-}
-.waterBox1 .rightDetails .closeBtn {
-  font-size: 20px;
-  cursor: pointer;
-  margin: -3px 14px 0 0;
-}
-.waterBox1 .rightDetails .listDiv {
-  padding: 20px 0 20px 20px;
-  box-sizing: border-box;
-  height: calc(100vh - 135px);
-  overflow: hidden;
-}
-.waterBox1 .rightDetails .imgDiv {
-  height: calc(100vh - 175px);
-  overflow: hidden auto;
-}
-.waterBox1 .rightDetails .imgDiv .imgBox {
-  padding-right: 20px;
-}
-.waterBox1 .drpBox .button-group span {
-  padding: 0 0.1rem;
-}
-.waterBox1 .ellipsisDiv {
-  width: 115px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-/*.legendBox{
-  background:#fff;
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width:132px;
-  left:82vw;
-  bottom:16px;
-  border-radius:6px;
-  padding:10px 10px 0 20px;
-  ul,li{
-    list-style: none;
-    padding:0;
-  }
-  span{
-    font-size:1rem;
-    height:20px;
-    line-height: 20px;
-  }
-  .colorSpan1,.colorSpan2,.colorSpan3,.colorSpan4,.colorSpan5,.colorSpan6,.colorSpan7{
-    width:16px;
-    height:9px;
-    border:1px solid #ddd;
-    margin:5px 10px 0 0;
-  }
-  .colorSpan1{
-    background:#781D4F;
-  }
-  .colorSpan2{
-    background:#EB20F7;
-  }
-  .colorSpan3{
-    background:#1E1ACA;
-  }
-  .colorSpan4{
-    background:#6EC2FA;
-  }
-  .colorSpan5{
-    background:#59B666;
-  }
-  .colorSpan6{
-    background:#BDEF9A;
-  }
-  .colorSpan7{
-    background:#fff;
-  }
-}*/
-.timeLineBox {
-  background: rgba(255, 255, 255, 0.8);
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width: 755px;
-  height: 68px;
-  left: calc((100vw - 840px) / 2);
-  bottom: 12px;
-  border-radius: 6px;
-  padding: 2px 0 0 5px;
-  cursor: pointer;
-}
-.timeLineBox .ant-slider {
-  margin: 5px 0 0 30px;
-}
-.timeLineBox .ant-slider .ant-slider-rail {
-  background-color: #b4bccc;
-  height: 3px;
-}
-.timeLineBox .ant-slider .ant-slider-handle {
-  background-color: #b2d7ff;
-}
-.timeLineBox .ant-slider-disabled .ant-slider-track {
-  background-color: #007bff !important;
-}
-.timeLineBox .ant-slider-disabled .ant-slider-rail {
-  background-color: #b4bccc !important;
-}
-.timeLineBox .topLabelBox {
-  position: relative;
-  height: 15px;
-}
-.timeLineBox .topLabelBox span {
-  font-size: 12px;
-  color: #007bff;
-  position: absolute;
-  font-weight: bold;
-  letter-spacing: 1px;
-}
-.timeLineBox .topLabelBox span:first-child {
-  left: 36px;
-  top: 3px;
-}
-.timeLineBox .topLabelBox span:nth-child(2) {
-  left: 417px;
-  top: 3px;
-}
-.timeLineBox .topLabelBox span:nth-child(3) {
-  left: 455px;
-  top: 3px;
-}
-.timeLineBox .topLabelBox span:nth-child(4) {
-  right: 0;
-  top: 5px;
-}
-.timeLineBox .topLabelBox .btnBg {
-  position: absolute;
-  background: rgba(0, 132, 231, 0.2);
-  width: 100px;
-  height: 23px;
-  border-radius: 6px;
-}
-.timeLineBox .labelBox {
-  width: 785px;
-}
-.timeLineBox .labelBox span {
-  margin-right: 11px;
-  font-size: 12px;
-  width: 61px;
-  text-align: center;
-  position: relative;
-}
-.timeLineBox .labelBox span:first-child:after,
-.timeLineBox .labelBox span:last-child:after,
-.timeLineBox .labelBox span:nth-child(6):after,
-.timeLineBox .labelBox span:nth-child(8):after {
-  content: '';
-  display: block;
-  position: absolute;
-  width: 2px;
-  height: 8px;
-  background: #007bff;
-  left: 29px;
-  top: -17px;
-}
-.timeLineBox .labelBox span:last-child {
-  margin-right: 0;
-}
-.timeLineBox .labelBox span:before {
-  content: '';
-  display: block;
-  position: absolute;
-  left: 27px;
-  top: -9px;
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background: #007bff;
-  pointer-events: none;
-}
-.hzyqModal {
-  padding-bottom: 10px;
-}
-.hzyqModal .ant-modal-body {
-  padding: 12px 14px;
-}
-.hzyqModal .ant-modal-content {
-  height: 100%;
-}
-@media screen and (max-width: 1549px) {
-  .timeLineBox {
-    left: 36.5rem;
-  }
-  .legendBox {
-    bottom: 70px;
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/index.js b/src/views/fxdd/dqxsfx/index.js
deleted file mode 100644
index 977af8d..0000000
--- a/src/views/fxdd/dqxsfx/index.js
+++ /dev/null
@@ -1,169 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-// import { useDispatch, useSelector } from 'react-redux'
-import { Collapse, Slider, Button, Spin, Modal, Badge } from 'antd'
-import { hdWarn, skWarn, floodWarn } from '../../../service/fxdd'
-import moment from 'moment'
-import './index.less'
-import Jyfx from './jyfx'
-import Shyj from './shyj'
-import Skyj from './skyj'
-import Hdyj from './hdyj'
-const { Panel } = Collapse
-
-const Page = () => {
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  const badgeBool = useSelector(s => s.runtime.badgeBool)
-  const badgejy = useSelector(s => s.runtime.badgejy)
-  const [myKey, setMyKey] = useState('1')
-  const dispatch = useDispatch()
-  const getData = async arr => {
-    let bool = {
-      hd: false,
-      sk: false,
-      sh: false
-    }
-    // 河道
-    const res = await hdWarn({
-      sources: ['SH', 'SW'],
-      args: ''
-    })
-    console.log('res', res)
-    if (res.grzList.length > 0 || res.wrzList.length > 0) {
-      bool.hd = true
-    }
-
-    // 水库
-    const res1 = await skWarn({ sources: ['SW', 'SK'], args: '' })
-    console.log('res1', res1)
-    if (res1.calFloodLevList || res1.desFloodLevList || res1.afsltdzList) {
-      bool.sk = true
-    }
-
-    // 山洪
-    let t = [moment().add(-1, 'day'), moment()]
-    const res2 = await floodWarn({
-      sources: ['SH', 'SW', 'QX', 'SK'],
-      stm: t[0].format('YYYY-MM-DD HH:mm:ss'),
-      etm: t[1].format('YYYY-MM-DD HH:mm:ss')
-    })
-
-    if (res2.immediatelyList || res2.readyList) {
-      bool.sh = true
-    }
-
-    dispatch.runtime.setBadgeBool({
-      jy: badgeBool.jy,
-      sh: bool.sh,
-      sk: bool.sk,
-      hd: bool.hd
-    })
-  }
-  useEffect(() => {
-    getData()
-  }, [])
-  return (
-    <div
-      className='waterBox1'
-      // style={{
-      //   height: hasAlertBox ? 'calc(100vh - 110px)' : 'calc(100vh - 90px)'
-      // }}
-    >
-      <Collapse
-        defaultActiveKey={['1']}
-        expandIconPosition='end'
-        accordion
-        onChange={e => setMyKey(e)}
-      >
-        <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <Badge dot={badgejy} offset={[6, 10]}>
-                <span className='lf txt'>降雨分析</span>
-              </Badge>
-            </div>
-          }
-          key='1'
-        >
-          {myKey === '1' ? <Jyfx /> : null}
-        </Panel>
-        <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <Badge dot={badgeBool.sh} offset={[6, 10]}>
-                <span className='lf txt'>山洪预警</span>
-              </Badge>
-            </div>
-          }
-          key='2'
-        >
-          {myKey === '2' ? <Shyj /> : null}
-        </Panel>
-        <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <Badge dot={badgeBool.sk} offset={[6, 10]}>
-                <span className='lf txt'>水库预警</span>
-              </Badge>
-            </div>
-          }
-          key='3'
-        >
-          {myKey === '3' ? <Skyj /> : null}
-        </Panel>
-        <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <Badge dot={badgeBool.hd} offset={[6, 10]}>
-                <span className='lf txt'>河道预警</span>
-              </Badge>
-            </div>
-          }
-          key='4'
-        >
-          {myKey === '4' ? <Hdyj /> : null}
-        </Panel>
-        {/* <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <span className='lf txt'>地灾预警</span>
-            </div>
-          }
-          key='5'
-        ></Panel> */}
-      </Collapse>
-    </div>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/index.less b/src/views/fxdd/dqxsfx/index.less
deleted file mode 100644
index 16cd0c0..0000000
--- a/src/views/fxdd/dqxsfx/index.less
+++ /dev/null
@@ -1,259 +0,0 @@
-.waterBox1 {
-  display: inline-block;
-  position: relative;
-  z-index: 999;
-  background-color: #fff;
-  width: 28rem;
-
-  .rightDetails {
-    .closeBtn {
-      font-size: 20px;
-      cursor: pointer;
-      margin: -3px 14px 0 0;
-    }
-
-    position: absolute;
-    width: 330px;
-    height: calc(100vh - 90px);
-    background: #fff;
-    z-index: 101;
-    right: calc((100vw - 46rem) * (-1));
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding: 10px 0;
-    box-sizing: border-box;
-
-    .listDiv {
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow: hidden;
-    }
-
-    .imgDiv {
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-
-      .imgBox {
-        padding-right: 20px;
-      }
-    }
-  }
-
-  .drpBox {
-    .button-group span {
-      padding: 0 0.1rem;
-    }
-  }
-
-  .ellipsisDiv {
-    width: 115px;
-    overflow: hidden; //溢出隐藏
-    white-space: nowrap; //禁止换行
-    text-overflow: ellipsis; //...
-  }
-}
-
-/*.legendBox{
-  background:#fff;
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width:132px;
-  left:82vw;
-  bottom:16px;
-  border-radius:6px;
-  padding:10px 10px 0 20px;
-  ul,li{
-    list-style: none;
-    padding:0;
-  }
-  span{
-    font-size:1rem;
-    height:20px;
-    line-height: 20px;
-  }
-  .colorSpan1,.colorSpan2,.colorSpan3,.colorSpan4,.colorSpan5,.colorSpan6,.colorSpan7{
-    width:16px;
-    height:9px;
-    border:1px solid #ddd;
-    margin:5px 10px 0 0;
-  }
-  .colorSpan1{
-    background:#781D4F;
-  }
-  .colorSpan2{
-    background:#EB20F7;
-  }
-  .colorSpan3{
-    background:#1E1ACA;
-  }
-  .colorSpan4{
-    background:#6EC2FA;
-  }
-  .colorSpan5{
-    background:#59B666;
-  }
-  .colorSpan6{
-    background:#BDEF9A;
-  }
-  .colorSpan7{
-    background:#fff;
-  }
-}*/
-
-.timeLineBox {
-  background: rgba(255, 255, 255, 0.8);
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width: 755px;
-  height: 68px;
-  //left:480px;
-  left: calc((100vw - 840px) / 2);
-  bottom: 12px;
-  border-radius: 6px;
-  padding: 2px 0 0 5px;
-  cursor: pointer;
-
-  .ant-slider {
-    margin: 5px 0 0 30px;
-
-    //width:720px;
-    .ant-slider-rail {
-      background-color: #b4bccc;
-      height: 3px;
-    }
-
-    .ant-slider-handle {
-      background-color: #b2d7ff;
-    }
-  }
-
-  .ant-slider-disabled .ant-slider-track {
-    background-color: #007bff !important;
-  }
-
-  .ant-slider-disabled .ant-slider-rail {
-    background-color: #b4bccc !important;
-  }
-
-  .topLabelBox {
-    position: relative;
-    height: 15px;
-
-    span {
-      font-size: 12px;
-      color: #007bff;
-      position: absolute;
-      font-weight: bold;
-      letter-spacing: 1px;
-
-      &:first-child {
-        left: 36px;
-        top: 3px;
-      }
-
-      &:nth-child(2) {
-        //left: 363px;
-        left: 417px;
-        top: 3px;
-        //font-size: 13px;
-      }
-
-      &:nth-child(3) {
-        //left: 395px;
-        left: 455px;
-        top: 3px;
-      }
-
-      &:nth-child(4) {
-        right: 0;
-        top: 5px;
-      }
-    }
-
-    .btnBg {
-      position: absolute;
-      background: rgba(0, 132, 231, 0.2);
-      width: 100px;
-      height: 23px;
-      //right: 170px;
-      border-radius: 6px;
-    }
-  }
-
-  .labelBox {
-    width: 785px;
-
-    span {
-      margin-right: 11px;
-      font-size: 12px;
-      width: 61px;
-      text-align: center;
-      position: relative;
-
-      &:first-child,
-      &:last-child,
-      &:nth-child(6),
-      &:nth-child(8) {
-        &:after {
-          content: '';
-          display: block;
-          position: absolute;
-          width: 2px;
-          height: 8px;
-          background: #007bff;
-          left: 29px;
-          top: -17px;
-        }
-      }
-
-      &:last-child {
-        margin-right: 0;
-      }
-
-      &:before {
-        content: '';
-        display: block;
-        position: absolute;
-        left: 27px;
-        top: -9px;
-        width: 6px;
-        height: 6px;
-        border-radius: 50%;
-        background: #007bff;
-        pointer-events: none;
-      }
-    }
-  }
-}
-
-.hzyqModal {
-  padding-bottom: 10px;
-
-  .ant-modal-body {
-    padding: 12px 14px;
-  }
-
-  .ant-modal-content {
-    height: 100%;
-  }
-}
-
-@media screen and (max-width: 1549px) {
-  .timeLineBox {
-    //zoom: 0.86;
-    left: 36.5rem;
-  }
-
-  .legendBox {
-    bottom: 70px;
-  }
-}
-
-@media screen and (max-width: 1399px) {
-  .indexBox .tipsBox {
-    //zoom: 0.76;
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/jyfx/dataConfig.js b/src/views/fxdd/dqxsfx/jyfx/dataConfig.js
deleted file mode 100644
index c216a04..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/dataConfig.js
+++ /dev/null
@@ -1,56 +0,0 @@
-export default {
-  tableData: [
-    {
-      type: 5,
-      typeName: '历史极值站点',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 4,
-      typeName: '100年一遇以上站点',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '50年一遇以上站点',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 2,
-      typeName: '特大暴雨站点',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 1,
-      typeName: '大暴雨站点',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 0,
-      typeName: '暴雨站点',
-      flowSign: null,
-      flowDetails: [
-        // {
-        //   stnm: '野猫河水库',
-        //   adnm: ['三组(幺牌）'],
-        //   villagePoint: [[110.407947, 30.013943]],
-        //   villagePeople: 766.03,
-        //   basName: 466.972,
-        //   time: '2017-07-15 01:00:00',
-        //   villageCount: 1,
-        //   eventId: null,
-        //   type: 6,
-        //   riverMapCenter: null,
-        //   drp: null,
-        //   riverArea: null,
-        //   totalDrp: null
-        // }
-      ]
-    }
-  ]
-}
diff --git a/src/views/fxdd/dqxsfx/jyfx/index.css b/src/views/fxdd/dqxsfx/jyfx/index.css
deleted file mode 100644
index 94d5688..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/index.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-}
-.waterLevelBox .smallTable {
-  height: calc(100% - 190px);
-}
-.waterLevelBox .dqxsfx .label {
-  border: 1px solid #ccc !important;
-  line-height: 32px !important;
-}
-.dqxsfxTable {
-  width: 27rem;
-  margin-left: 2px;
-}
-.dqxs_Panel .ant-collapse-content-box {
-  max-height: 270px;
-  overflow-y: scroll;
-}
-.bgcolor:nth-child(1) .ant-collapse-header:nth-child(1) {
-  background-color: #ffd5d5 !important;
-}
-.bgcolor:nth-child(2) .ant-collapse-header:nth-child(1) {
-  background-color: #f2defe !important;
-}
-.bgcolor:nth-child(3) .ant-collapse-header:nth-child(1) {
-  background-color: #ddddff !important;
-}
-.bgcolor:nth-child(4) .ant-collapse-header:nth-child(1) {
-  background-color: #d2e9fc !important;
-}
-.bgcolor:nth-child(5) .ant-collapse-header:nth-child(1) {
-  background-color: #d9f7ff !important;
-}
-.bgcolor:nth-child(6) .ant-collapse-header:nth-child(1) {
-  background-color: #edfce9 !important;
-}
-.waterLevelBox .search-timeline .label {
-  display: flex;
-  justify-content: space-between;
-  width: 280px;
-  height: 34px;
-  border-radius: 2px;
-  border: 1px solid #ccc;
-}
-.waterLevelBox .search-timeline .label .h_item {
-  width: 52px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background-color: #fff;
-  cursor: pointer;
-}
-.waterLevelBox .search-timeline .label .h_item:last-child {
-  padding-right: 3px;
-}
-.waterLevelBox .search-timeline .label .h_item:last-child.active {
-  width: 52px;
-}
-.waterLevelBox .search-timeline .label .h_item.active {
-  width: 52px;
-  color: #fff;
-  background-color: #409eff;
-}
diff --git a/src/views/fxdd/dqxsfx/jyfx/index.js b/src/views/fxdd/dqxsfx/jyfx/index.js
deleted file mode 100644
index a6968c8..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-
-const Page = ({ activeKey }) => {
-  // const [params, setParams] = useState({})
-  const doSearch = params => {
-    // setParams(params)
-    // getData(params)
-  }
-
-  const getData = async params => {}
-
-  return (
-    <div className='monitor-rainfall waterLevelBox'>
-      <div style={{ margin: '0 0 0 6px' }} className='topQuery'>
-        <Toolbar search={doSearch} />
-      </div>
-    </div>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/jyfx/index.less b/src/views/fxdd/dqxsfx/jyfx/index.less
deleted file mode 100644
index db79bca..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/index.less
+++ /dev/null
@@ -1,101 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-  .dqxsfx {
-    .label {
-      border: 1px solid #ccc !important;
-      line-height: 32px !important;
-    }
-  }
-}
-.dqxsfxTable {
-  width: 27rem;
-  margin-left: 2px;
-}
-.dqxs_Panel {
-  .ant-collapse-content-box {
-    max-height: 270px;
-    overflow-y: scroll;
-  }
-}
-.bgcolor {
-  &:nth-child(1) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #ffd5d5 !important;
-      }
-    }
-  }
-  &:nth-child(2) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #f2defe !important;
-      }
-    }
-  }
-  &:nth-child(3) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #ddddff !important;
-      }
-    }
-  }
-  &:nth-child(4) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #d2e9fc !important;
-      }
-    }
-  }
-  &:nth-child(5) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #d9f7ff !important;
-      }
-    }
-  }
-  &:nth-child(6) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #edfce9 !important;
-      }
-    }
-  }
-}
-.waterLevelBox .search-timeline {
-  .label {
-    display: flex;
-    justify-content: space-between;
-    width: 280px;
-    height: 34px;
-    border-radius: 2px;
-    border: 1px solid #ccc;
-
-    .h_item {
-      width: 52px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #fff;
-      cursor: pointer;
-      &:last-child {
-        padding-right: 3px;
-        // margin-right: 6px;
-      }
-      &:last-child.active {
-        // padding-right: 6px;
-        width: 52px;
-      }
-    }
-
-    .h_item.active {
-      width: 52px;
-      color: #fff;
-      background-color: #409eff;
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/jyfx/ljtj/index.css b/src/views/fxdd/dqxsfx/jyfx/ljtj/index.css
deleted file mode 100644
index e3bd1f4..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/ljtj/index.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.dqxs_listBox .bgcolor .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.dqxs_listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-}
-.dqxs_listBox .txt {
-  font-size: 12px;
-  line-height: 32px;
-}
-.dqxs_listBox .txt:nth-child(1) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.dqxs_listBox .txt:nth-child(2) {
-  width: 25%;
-  text-align: center;
-}
-.dqxs_listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.dqxs_listBox .txt:nth-child(4) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/src/views/fxdd/dqxsfx/jyfx/ljtj/index.js b/src/views/fxdd/dqxsfx/jyfx/ljtj/index.js
deleted file mode 100644
index da5a052..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/ljtj/index.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons'
-import data from '../../jyfx/dataConfig'
-import { rainfallAnalysis } from '../../../../../service/fxdd'
-import './index.less'
-const { Panel } = Collapse
-const Page = ({ params, list }) => {
-  const [loading, setLoading] = useState(true)
-  const columns = [
-    { title: '站名', key: 'rvcd', dataIndex: 'rvcd', align: 'center' },
-    {
-      title: '累计雨量(mm)',
-      key: 'villagePeople',
-      dataIndex: 'villagePeople',
-      align: 'center'
-    },
-    { title: '所属政区', key: 'flow', dataIndex: 'flow', align: 'center' },
-    { title: '所属流域', key: 'time', dataIndex: 'time', align: 'center' }
-  ]
-  const [tableData, setTableData] = useState(data.tableData)
-
-  const [lyList, setLylist] = useState([])
-
-  console.log(tableData)
-  console.log(list, 'dddddddddd')
-
-  useEffect(() => {
-    getData(params)
-  }, [params])
-
-  const getData = async params => {
-    // let obj = {
-    //   timeType: timeType,
-    //   source: source.map(item => item.value)
-    // }
-    console.log('params', params)
-
-    setLylist(await rainfallAnalysis(params))
-  }
-
-  return (
-    <>
-      <div className='table'>
-        <Table
-          rowKey='adcd'
-          bordered
-          columns={columns}
-          pagination={false}
-          dataSource={[]}
-          scroll={{ y: 0 }}
-          defaultExpandAllRows={true}
-          expandable={{
-            indentSize: 10
-          }}
-        />
-      </div>
-      <div className='dqxs_listBox'>
-        {/*{*/}
-        {/*  loading ?*/}
-        {/*    <div style={{*/}
-        {/*      position: "absolute",*/}
-        {/*      top: "270px",*/}
-        {/*      left: "110px",*/}
-        {/*      background: "#fff",*/}
-        {/*      padding: "20px 30px",*/}
-        {/*      borderRadius: "10px",*/}
-        {/*      zIndex: 10*/}
-        {/*    }}>*/}
-        {/*      <Spin tip="正在加载..." size="large" spinning={loading}/>*/}
-        {/*    </div> : null*/}
-        {/*}*/}
-        {tableData.length > 0 ? (
-          tableData.map((item, index) => (
-            <>
-              <div key={item.type}>
-                {/*// @ts-ignore*/}
-                <Collapse
-                  size='small'
-                  defaultActiveKey={index}
-                  expandIcon={({ isActive }) =>
-                    isActive ? (
-                      <PlusOutlined rotate={isActive ? 90 : 0} />
-                    ) : (
-                      <MinusOutlined rotate={isActive ? 90 : 0} />
-                    )
-                  }
-                >
-                  <Panel header={item.typeName} key={index}>
-                    {item.flowDetails.length > 0 &&
-                      item.flowDetails.map(item1 => (
-                        <div>
-                          <div className='clearFloat txtBox'>
-                            <div className='lf txt'>{item1.rvcd}</div>
-                            <div className='lf txt'>{item1.villagePeople}</div>
-                            <div className='lf txt'>
-                              {item1.flow ? item1.flow.toFixed(1) : '-'}
-                            </div>
-                            <div className='lf txt'>{item1.time}</div>
-                          </div>
-                        </div>
-                      ))}
-                  </Panel>
-                </Collapse>
-              </div>
-            </>
-          ))
-        ) : (
-          <div style={{ textAlign: 'center', margin: '10%' }}>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-              alt=''
-              width={170}
-            />
-          </div>
-        )}
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/jyfx/ljtj/index.less b/src/views/fxdd/dqxsfx/jyfx/ljtj/index.less
deleted file mode 100644
index 1e3a090..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/ljtj/index.less
+++ /dev/null
@@ -1,47 +0,0 @@
-.dqxs_listBox {
-  .bgcolor .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-  }
-
-  .txt {
-    font-size: 12px;
-    line-height: 32px;
-    &:nth-child(1) {
-      width: 25%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      // line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 25%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      // line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/jyfx/toolbar.js b/src/views/fxdd/dqxsfx/jyfx/toolbar.js
deleted file mode 100644
index e15df44..0000000
--- a/src/views/fxdd/dqxsfx/jyfx/toolbar.js
+++ /dev/null
@@ -1,429 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons'
-import { Form, Button, DatePicker, Checkbox, Collapse, Table } from 'antd'
-import { getDictService } from '../../../../service/SelectValue'
-import { rainfallAnalysis } from '../../../../service/fxdd'
-import { Vector as VectorSource } from 'ol/source'
-import VectorLayer from 'ol/layer/Vector'
-import Style from 'ol/style/Style'
-import Text from 'ol/style/Text'
-import Feature from 'ol/Feature'
-import Point from 'ol/geom/Point.js'
-import Circle from 'ol/style/Circle'
-import Stroke from 'ol/style/Stroke'
-import FillStyle from 'ol/style/Fill'
-import { transform } from 'ol/proj'
-
-import moment from 'moment'
-import Ljtj from '../jyfx/ljtj'
-import './ljtj/index.less'
-import data from './dataConfig'
-const { Panel } = Collapse
-
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-const formItemLayout = {
-  labelCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 4
-    }
-  },
-  wrapperCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 16
-    }
-  }
-}
-
-const ToolBar = ({ doSearch, downLoad }) => {
-  const [form] = Form.useForm()
-  const [lyList, setLylist] = useState([])
-  const [params, setParams] = useState({})
-  const [timeType, setTimeType] = useState(24)
-  const [tableData, setTableData] = useState(data.tableData)
-  const [list, setList] = useState(1)
-  const [activeTab, setActiveTab] = useState(4)
-  const dispatch = useDispatch()
-  const badgeBool = useSelector(s => s.runtime.badgeBool)
-  let mapObj = useSelector(s => s.map.map)
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-
-    setParams({ source: rec.types, timeType })
-  }
-  const handleTabClick = (o, index) => {
-    const { ...rec } = form.getFieldsValue()
-    setActiveTab(index)
-    setParams({ source: rec.types, timeType: o.key })
-    setTimeType(o.key)
-  }
-
-  const getData = async params => {
-    let obj = {
-      timeType: params.timeType ? params.timeType : '',
-      source: params.source ? params.source : ''
-    }
-    const list = await rainfallAnalysis(obj)
-    let arr = [],
-      bool = false
-    for (const [key, value] of Object.entries(list)) {
-      console.log(key, value)
-      arr = data.tableData.map(item => {
-        if (item.type === Number(key)) {
-          item.flowDetails = value
-          if (value.length > 0) {
-            bool = true
-          }
-        }
-        return item
-      })
-    }
-    console.log('badgeBool', bool)
-    dispatch.runtime.setBadgejy(bool)
-
-    setLylist(list)
-    setTableData(arr)
-
-    const arr2 = []
-    arr.map(item => {
-      item.flowDetails.map(i => {
-        arr2.push(i)
-      })
-    })
-    addLayer(arr2)
-  }
-
-  useEffect(() => {
-    if (params.source) {
-      getData(params)
-    }
-  }, [params])
-
-  useEffect(() => {
-    setParams({
-      source: typeOptions.map(item => item.value),
-      timeType: timeType
-    })
-  }, [])
-
-  useEffect(() => {
-    return () => {
-      dispatch.runtime.closeFeaturePopAll()
-      mapObj &&
-        mapObj
-          .getLayers()
-          .getArray()
-          .forEach(layer => {
-            if (
-              layer.values_.name &&
-              layer.values_.name.indexOf('YSGZQ_SSYQ_JYXX') > -1
-            ) {
-              layer.getSource().clear()
-            }
-          })
-    }
-  }, [])
-
-  const addLayer = arr => {
-    mapObj &&
-      mapObj
-        .getLayers()
-        .getArray()
-        .forEach(layer => {
-          if (
-            layer.values_.name &&
-            layer.values_.name.indexOf('YSGZQ_SSYQ_JYXX') > -1
-          ) {
-            layer.getSource().clear()
-          }
-        })
-
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name: 'YSGZQ_SSYQ_JYXX',
-      source: new VectorSource(),
-      style: feature => {
-        const drp = feature.values_.data.drp
-        return [
-          new Style({
-            image: new Circle({
-              radius: 5,
-              fill: new FillStyle({ color: getColor(drp) }),
-              stroke: new Stroke({ color: getColor(drp), width: 2 })
-            }),
-            text: new Text({
-              text: String(drp) + 'mm',
-              offsetY: 15,
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: 'rgba(0,0,0,0.5)' }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true
-            }),
-            zIndex: drp===0?0.01:drp*10
-          })
-        ]
-      },
-      zIndex: 200
-    })
-
-    const features = arr.map(item => {
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857')
-      const feature = new Feature({
-        geometry: new Point(point2),
-        data: { ...item, myParams: params }
-      })
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature))
-    mapObj.addLayer(layer)
-
-    mapObj.on('click', function (evt) {
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function (feature) {
-        return feature
-      })
-      if (feature) {
-        const data = feature.values_.data
-        if (data) {
-          dispatch.runtime.setFeaturePop({
-            id: data.stcd,
-            data: { ...data, myParams: params },
-            type: 'drp',
-            lgtd: data.lgtd,
-            lttd: data.lttd
-          })
-        }
-      }
-    })
-  }
-
-  const flyTo = record => {
-    const { lgtd, lttd, elev } = record
-    record.stm = params.stm
-    record.etm = params.etm
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          ShuiKuLayer: [record.id]
-        }
-      })
-      dispatch.runtime.setFeaturePop({
-        type: 'drp',
-        data: { ...record, 
-                myParams: {...params,
-                            stm:moment().subtract((params.timeType||0), "hours").format('YYYY-MM-DD HH:mm:ss'),
-                            etm:moment().format('YYYY-MM-DD HH:mm:ss')
-                          }
-              },
-        lgtd: record.lgtd,
-        lttd: record.lttd
-      })
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60
-      })
-    }
-  }
-
-  const getColor = val => {
-    if(val===null){
-      return '#8c8c8c'
-    }else if(val<0.1){
-        return '#ffffff'
-    }else if(val>=0.1 && val<10){
-        return 'rgb(167, 240, 143)';
-    }else if(val>=10 && val<25){
-        return 'rgb(64, 215, 255)';
-    }else if(val>=25 && val<50){
-        return 'rgb(32, 143, 238)';
-    }else if(val>=50 && val<100){
-        return 'rgb(85, 86, 255)';
-    }else if(val>=100 && val<250){
-        return 'rgb(191, 90, 252)';
-    }else{
-        return 'rgb(246, 66, 66)';
-    }
-  }
-
-  const typeOptions = [
-    { label: '山洪', value: 'SH' },
-    { label: '水文', value: 'SW' },
-    { label: '气象', value: 'QX' },
-    { label: '水库', value: 'SK' }
-  ]
-
-  const columns = [
-    { title: '站名', key: 'stnm', dataIndex: 'stnm', ellipsis: true },
-    {
-      title: '累计雨量(mm)',
-      key: 'drp',
-      dataIndex: 'drp',
-      width: 120
-    },
-    { title: '所属政区', key: 'adnm', dataIndex: 'adnm', ellipsis: true },
-    { title: '所属流域', key: 'basName', dataIndex: 'basName', ellipsis: true }
-  ]
-
-  const tabItems = [
-    {
-      label: '1小时',
-      key: 1
-    },
-    {
-      label: '3小时',
-      key: 3
-    },
-    {
-      label: '6小时',
-      key: 6
-    },
-    {
-      label: '12小时',
-      key: 12
-    },
-    {
-      label: '24小时',
-      key: 24
-    }
-  ]
-
-  return (
-    <>
-      <div
-        style={{
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'space-between'
-        }}
-      >
-        <Form
-          form={form}
-          {...formItemLayout}
-          className='toolbarBox'
-          initialValues={{ types: ['SH', 'SW', 'QX', 'SK'], tm: moment() }}
-        >
-          <Form.Item label='类型' name='types'>
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick} />
-          </Form.Item>
-          <Form.Item label='最近时段' name='tm'>
-            <div className='search-timeline dqxsfx'>
-              <div className='label' activeKey={activeTab}>
-                {tabItems.map((i, idx) => (
-                  <span
-                    className={`h_item ${activeTab === idx ? 'active' : ''}`}
-                    key={i.key}
-                    // style={{ padding: '18px 0' }}
-                    onClick={() => handleTabClick(i, idx)}
-                  >
-                    {i.label}
-                  </span>
-                ))}
-              </div>
-            </div>
-          </Form.Item>
-          <div
-            // style={{ width: '25rem' }}
-            className='dqxsfxTable'
-          >
-            {/* <Ljtj list={tableData} params={params} /> */}
-            <div className='table' style={{ marginTop: '8px' }}>
-              <Table
-                rowKey='adcddd'
-                bordered
-                columns={columns}
-                pagination={false}
-                dataSource={[]}
-                scroll={{ y: 0 }}
-                defaultExpandAllRows={true}
-                expandable={{
-                  indentSize: 10
-                }}
-              />
-            </div>
-            <div className='dqxs_listBox'>
-              {tableData.length > 0 ? (
-                tableData.map((item, index) => (
-                  <>
-                    <div key={item.type} className='bgcolor'>
-                      {/*// @ts-ignore*/}
-                      <Collapse
-                        size='small'
-                        // defaultActiveKey={index}
-                        expandIcon={({ isActive }) =>
-                          isActive ? (
-                            // <PlusOutlined rotate={isActive ? 90 : 0} />
-                            <MinusOutlined rotate={isActive ? 0 : 0} />
-                          ) : (
-                            // <MinusOutlined rotate={isActive ? 90 : 0} />
-                            <PlusOutlined rotate={isActive ? 90 : 0} />
-                          )
-                        }
-                      >
-                        <Panel
-                          header={
-                            item.typeName + '(' + item.flowDetails.length + ')'
-                          }
-                          key={index}
-                          className='dqxs_Panel'
-                        >
-                          {/* {item.flowDetails.length > 0 &&
-                            item.flowDetails.map(item1 => (
-                              <div onClick={() => flyTo(item1)}>
-                                <div className='clearFloat txtBox'>
-                                  <div className='lf txt'>{item1.stnm}</div>
-                                  <div className='lf txt'>{item1.drp}</div>
-                                  <div className='lf txt'>{item1.adnm}</div>
-                                  <div className='lf txt'>{item1.basName}</div>
-                                </div>
-                              </div>
-                            ))} */}
-                          {item.flowDetails.length > 0 ? (
-                            <Table
-                              columns={columns}
-                              showHeader={false}
-                              pagination={false}
-                              dataSource={item.flowDetails}
-                              scroll={{ y: 200 }}
-                              onRow={record => ({
-                                onClick: () => {
-                                  flyTo(record)
-                                }
-                              })}
-                            />
-                          ) : null}
-                        </Panel>
-                      </Collapse>
-                    </div>
-                  </>
-                ))
-              ) : (
-                <div style={{ textAlign: 'center', margin: '10%' }}>
-                  <img
-                    src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-                    alt=''
-                    width={170}
-                  />
-                </div>
-              )}
-            </div>
-          </div>
-        </Form>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/fxdd/dqxsfx/shtj/dataConfig.js b/src/views/fxdd/dqxsfx/shtj/dataConfig.js
deleted file mode 100644
index e4ab0c3..0000000
--- a/src/views/fxdd/dqxsfx/shtj/dataConfig.js
+++ /dev/null
@@ -1,41 +0,0 @@
-export default {
-  tableData: [
-    {
-      "type": 1,
-      "typeName": "立即转移",
-      "describe": "0个乡镇",
-      "flowSign": null,
-      "flowDetails": []
-    },
-    {
-      "type": 1,
-      "typeName": "准备转移",
-      "describe": "1个乡镇",
-      "flowSign": null,
-      "flowDetails": [
-        {
-          "rvcd": "野猫河水库",
-          "village": [
-            "三组(幺牌）"
-          ],
-          "villagePoint": [
-            [
-              110.407947,
-              30.013943
-            ]
-          ],
-          "villagePeople": 766.03,
-          "flow": 466.972,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/views/fxdd/dqxsfx/shtj/index.css b/src/views/fxdd/dqxsfx/shtj/index.css
deleted file mode 100644
index 2a4140a..0000000
--- a/src/views/fxdd/dqxsfx/shtj/index.css
+++ /dev/null
@@ -1,39 +0,0 @@
-.shtj_listBox .bgColor1 .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.shtj_listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-}
-.shtj_listBox .txt {
-  font-size: 12px;
-  line-height: 32px;
-}
-.shtj_listBox .txt:nth-child(1) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  padding: 0 10px;
-}
-.shtj_listBox .txt:nth-child(2) {
-  width: 50%;
-  text-align: center;
-}
-.shtj_listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.shtj_listBox .txt:nth-child(4) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/src/views/fxdd/dqxsfx/shtj/index.js b/src/views/fxdd/dqxsfx/shtj/index.js
deleted file mode 100644
index ea7629a..0000000
--- a/src/views/fxdd/dqxsfx/shtj/index.js
+++ /dev/null
@@ -1,202 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons'
-import { useDispatch, useSelector } from 'react-redux'
-import React, { useEffect, useState } from 'react'
-import data from '../../../fxdd/dqxsfx/shtj/dataConfig'
-import { Vector as VectorSource } from 'ol/source'
-import VectorLayer from 'ol/layer/Vector'
-import Style from 'ol/style/Style'
-import Icon from 'ol/style/Icon'
-import StrokeStyle from 'ol/style/Stroke'
-import { Text } from 'ol/style'
-import Stroke from 'ol/style/Stroke'
-import { unByKey } from 'ol/Observable.js'
-import { easeOut } from 'ol/easing.js'
-import { getVectorContext } from 'ol/render.js'
-import Circle from 'ol/style/Circle'
-import GeoJSONFormat from 'ol/format/GeoJSON'
-import Feature from 'ol/Feature'
-import Point from 'ol/geom/Point.js'
-import { Fill } from 'ol/style.js'
-import { transform } from 'ol/proj'
-
-import './index.less'
-import { shWarn } from '../../../../service/fxdd'
-const { Panel } = Collapse
-const Page = () => {
-  const [loading, setLoading] = useState(true)
-  const dispatch = useDispatch()
-
-  const columns = [
-    { title: '乡镇1', key: 'rvcd', dataIndex: 'rvcd', align: 'center' },
-    { title: '预警时间', key: 'flow', dataIndex: 'flow', align: 'center' },
-    { title: '预警状态', key: 'time', dataIndex: 'time', align: 'center' }
-  ]
-  const [tableData, setTableData] = useState(data.tableData)
-  let mapObj = useSelector(s => s.map.map)
-
-  useEffect(() => {
-    getData()
-    // addLayer()
-  }, [])
-
-  const getData = async () => {
-    const res = await shWarn({
-      stm: '2023-09-20 00:00:00',
-      etm: '2023-09-23 00:00:00'
-    })
-    addLayer(res.immediatelyList, 1)
-    addLayer(res.readyList, 2)
-  }
-
-  const addLayer = (arr, type) => {
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name: 'ShWarn',
-      source: new VectorSource(),
-      style: feature => {
-        return [
-          new Style({
-            image: new Icon({
-              src:
-                feature.get('type') === '危险'
-                  ? `${process.env.PUBLIC_URL}/assets/redwarn.png`
-                  : feature.get('type') === '警戒'
-                  ? `${process.env.PUBLIC_URL}/assets/orangewarn.png`
-                  : feature.get('type') === '关注'
-                  ? `${process.env.PUBLIC_URL}/assets/yellowwarn.png`
-                  : '',
-              anchor: [0.5, 0.5],
-              opacity: 1,
-              scale: 0.9
-            }),
-            zIndex: 20
-          })
-        ]
-      },
-      zIndex: 200
-    })
-
-    const features = arr.map(item => {
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857')
-      const feature = new Feature({
-        geometry: new Point(point2),
-        type: type === 1 ? '危险' : '警戒',
-        data: item
-      })
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature))
-    mapObj.addLayer(layer)
-
-    mapObj.on('click', function (evt) {
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function (feature) {
-        return feature
-      })
-      if (feature) {
-        let adcd = feature.get('adcd')
-        let lgtd = feature.get('lgtd')
-        let lttd = feature.get('lttd')
-        const data = feature.values_.data
-        data.myType = feature.values_.type === '危险' ? '立即转移' : '准备转移'
-        if (data.adcd) {
-          dispatch.runtime.setFeaturePop({
-            id: data.adcd + data.lgtd + data.lttd,
-            data: data,
-            type: 'shanhongyujing',
-            lgtd: data.lgtd,
-            lttd: data.lttd
-          })
-        }
-      }
-    })
-  }
-
-  return (
-    <>
-      <div className='table'>
-        <Table
-          rowKey='adcd'
-          bordered
-          columns={columns}
-          pagination={false}
-          dataSource={[]}
-          scroll={{ y: 0 }}
-          defaultExpandAllRows={true}
-          expandable={{
-            indentSize: 10
-          }}
-        />
-      </div>
-      <div className='shtj_listBox'>
-        {/*{*/}
-        {/*  loading ?*/}
-        {/*    <div style={{*/}
-        {/*      position: "absolute",*/}
-        {/*      top: "270px",*/}
-        {/*      left: "110px",*/}
-        {/*      background: "#fff",*/}
-        {/*      padding: "20px 30px",*/}
-        {/*      borderRadius: "10px",*/}
-        {/*      zIndex: 10*/}
-        {/*    }}>*/}
-        {/*      <Spin tip="正在加载..." size="large" spinning={loading}/>*/}
-        {/*    </div> : null*/}
-        {/*}*/}
-        {tableData.length > 0 ? (
-          tableData.map((item, index) => (
-            <>
-              <div key={item.type}>
-                {/*// @ts-ignore*/}
-                <Collapse
-                  size='small'
-                  defaultActiveKey={index}
-                  expandIcon={({ isActive }) =>
-                    isActive ? (
-                      <PlusOutlined rotate={isActive ? 90 : 0} />
-                    ) : (
-                      <MinusOutlined rotate={isActive ? 90 : 0} />
-                    )
-                  }
-                >
-                  <Panel
-                    header={item.typeName}
-                    extra={item.describe}
-                    key={index}
-                  >
-                    {item.flowDetails.length > 0 &&
-                      item.flowDetails.map(item1 => (
-                        <div>
-                          <div className='clearFloat txtBox'>
-                            <div className='lf txt'>{item1.rvcd}</div>
-                            <div className='lf txt'>{item1.villagePeople}</div>
-                            <div className='lf txt'>
-                              {item1.flow ? item1.flow.toFixed(1) : '-'}
-                            </div>
-                            <div className='lf txt'>{item1.time}</div>
-                          </div>
-                        </div>
-                      ))}
-                  </Panel>
-                </Collapse>
-              </div>
-            </>
-          ))
-        ) : (
-          <div style={{ textAlign: 'center', margin: '10%' }}>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-              alt=''
-              width={170}
-            />
-          </div>
-        )}
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/shtj/index.less b/src/views/fxdd/dqxsfx/shtj/index.less
deleted file mode 100644
index 6f1d118..0000000
--- a/src/views/fxdd/dqxsfx/shtj/index.less
+++ /dev/null
@@ -1,48 +0,0 @@
-.shtj_listBox {
-  .bgColor1 .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-  }
-
-  .txt {
-    font-size: 12px;
-    line-height: 32px;
-    &:nth-child(1) {
-      width: 25%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      // line-height: 14px;
-      padding: 0 10px;
-    }
-
-    &:nth-child(2) {
-      width: 50%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      // line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/shyj/dataConfig.js b/src/views/fxdd/dqxsfx/shyj/dataConfig.js
deleted file mode 100644
index 2f6b5cb..0000000
--- a/src/views/fxdd/dqxsfx/shyj/dataConfig.js
+++ /dev/null
@@ -1,4639 +0,0 @@
-export default {
-  xzqh: [
-    {
-      "adcd": "420529000000000",
-      "adnm": "五峰土家族自治县",
-      "pcount": 200000,
-      "htcount": 63880,
-      "ldarea": 2372,
-      "plarea": 28.8,
-      "prevtp": "0",
-      "lgtd": 110.670293,
-      "lttd": 30.201663,
-      "children": [
-        {
-          "adcd": "420529101000000",
-          "adnm": "五峰镇",
-          "pcount": 39881,
-          "htcount": 13699,
-          "ldarea": 456,
-          "prevtp": "0",
-          "lgtd": 110.64161,
-          "lttd": 30.184073,
-          "children": [
-            {
-              "adcd": "420529101001000",
-              "adnm": "北门社区",
-              "pcount": 3164,
-              "htcount": 1536,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.661896,
-              "lttd": 30.204225,
-              "children": [
-                {
-                  "adcd": "420529101001100",
-                  "adnm": "北门社区上",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.667857,
-                  "lttd": 30.204172
-                },
-                {
-                  "adcd": "420529101001101",
-                  "adnm": "北门社区中",
-                  "pcount": 1054,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.663659,
-                  "lttd": 30.205619
-                },
-                {
-                  "adcd": "420529101001102",
-                  "adnm": "北门社区下",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.662192,
-                  "lttd": 30.207136
-                }
-              ]
-            },
-            {
-              "adcd": "420529101002000",
-              "adnm": "正街社区",
-              "pcount": 4725,
-              "htcount": 2340,
-              "ldarea": 3.5,
-              "prevtp": "2",
-              "lgtd": 110.670643,
-              "lttd": 30.200895,
-              "children": []
-            },
-            {
-              "adcd": "420529101003000",
-              "adnm": "长坪社区",
-              "pcount": 5725,
-              "htcount": 2226,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.665503,
-              "lttd": 30.190297,
-              "children": [
-                {
-                  "adcd": "420529101003100",
-                  "adnm": "长坪上",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.66546,
-                  "lttd": 30.187869
-                },
-                {
-                  "adcd": "420529101003101",
-                  "adnm": "长坪下",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.670436,
-                  "lttd": 30.196018
-                }
-              ]
-            },
-            {
-              "adcd": "420529101201000",
-              "adnm": "石梁司村",
-              "pcount": 3012,
-              "htcount": 890,
-              "ldarea": 44,
-              "prevtp": "0",
-              "lgtd": 110.656911,
-              "lttd": 30.175933,
-              "children": [
-                {
-                  "adcd": "420529101201100",
-                  "adnm": "十三组(铁厂湾）",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18.05,
-                  "prevtp": "2",
-                  "lgtd": 110.606521,
-                  "lttd": 30.14701
-                },
-                {
-                  "adcd": "420529101201101",
-                  "adnm": "三组上（小汊湾）",
-                  "pcount": 536,
-                  "htcount": 145,
-                  "ldarea": 9.4,
-                  "prevtp": "2",
-                  "lgtd": 110.653196,
-                  "lttd": 30.171942
-                },
-                {
-                  "adcd": "420529101201102",
-                  "adnm": "二组（杨腊岭）",
-                  "pcount": 691,
-                  "htcount": 187,
-                  "ldarea": 10.5,
-                  "prevtp": "2",
-                  "lgtd": 110.660371,
-                  "lttd": 30.180565
-                },
-                {
-                  "adcd": "420529101201103",
-                  "adnm": "十二组",
-                  "pcount": 148,
-                  "htcount": 40,
-                  "ldarea": 6,
-                  "prevtp": "0",
-                  "lgtd": 110.623533,
-                  "lttd": 30.147948
-                },
-                {
-                  "adcd": "420529101201104",
-                  "adnm": "十五组",
-                  "pcount": 270,
-                  "htcount": 73,
-                  "ldarea": 8.05,
-                  "prevtp": "2",
-                  "lgtd": 110.647408,
-                  "lttd": 30.1812815
-                },
-                {
-                  "adcd": "420529101201105",
-                  "adnm": "三组下",
-                  "pcount": 520,
-                  "htcount": 140,
-                  "ldarea": 7.2,
-                  "prevtp": "2",
-                  "lgtd": 110.655473,
-                  "lttd": 30.176246
-                }
-              ]
-            },
-            {
-              "adcd": "420529101202000",
-              "adnm": "香东村",
-              "pcount": 2100,
-              "htcount": 625,
-              "ldarea": 14.6,
-              "prevtp": "0",
-              "lgtd": 110.684722,
-              "lttd": 30.195305,
-              "children": [
-                {
-                  "adcd": "420529101202100",
-                  "adnm": "七组（口子泉）",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 110.664549,
-                  "lttd": 30.208265
-                },
-                {
-                  "adcd": "420529101202101",
-                  "adnm": "八组（砂坪）",
-                  "pcount": 114,
-                  "htcount": 31,
-                  "ldarea": 10.3,
-                  "prevtp": "2",
-                  "lgtd": 110.677247,
-                  "lttd": 30.207814
-                },
-                {
-                  "adcd": "420529101202102",
-                  "adnm": "七组（天池河）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.658039,
-                  "lttd": 30.213228
-                }
-              ]
-            },
-            {
-              "adcd": "420529101203000",
-              "adnm": "小河村",
-              "pcount": 3446,
-              "htcount": 961,
-              "ldarea": 36,
-              "prevtp": "0",
-              "lgtd": 110.648435,
-              "lttd": 30.221484,
-              "children": [
-                {
-                  "adcd": "420529101203100",
-                  "adnm": "一组",
-                  "pcount": 620,
-                  "htcount": 167,
-                  "ldarea": 10,
-                  "prevtp": "1",
-                  "lgtd": 110.628695,
-                  "lttd": 30.218468
-                },
-                {
-                  "adcd": "420529101203101",
-                  "adnm": "十一组（前坪）",
-                  "pcount": 407,
-                  "htcount": 110,
-                  "ldarea": 14,
-                  "prevtp": "2",
-                  "lgtd": 110.593009,
-                  "lttd": 30.2113403
-                },
-                {
-                  "adcd": "420529101203102",
-                  "adnm": "七组",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18,
-                  "prevtp": "1",
-                  "lgtd": 110.606354,
-                  "lttd": 30.207401
-                }
-              ]
-            },
-            {
-              "adcd": "420529101204000",
-              "adnm": "楠木河村",
-              "pcount": 1526,
-              "htcount": 442,
-              "ldarea": 19.8,
-              "prevtp": "0",
-              "lgtd": 110.464955,
-              "lttd": 30.174449,
-              "children": [
-                {
-                  "adcd": "420529101204100",
-                  "adnm": "一组",
-                  "pcount": 220,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.661256,
-                  "lttd": 30.2369128
-                },
-                {
-                  "adcd": "420529101204101",
-                  "adnm": "三组",
-                  "pcount": 195,
-                  "htcount": 53,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.679309,
-                  "lttd": 30.2514761
-                }
-              ]
-            },
-            {
-              "adcd": "420529101205000",
-              "adnm": "水浕司村",
-              "pcount": 3320,
-              "htcount": 1045,
-              "ldarea": 36.6,
-              "prevtp": "0",
-              "lgtd": 110.627483,
-              "lttd": 30.248739,
-              "children": [
-                {
-                  "adcd": "420529101205100",
-                  "adnm": "二组（渡糟）",
-                  "pcount": 240,
-                  "htcount": 65,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.61626,
-                  "lttd": 30.2579
-                },
-                {
-                  "adcd": "420529101205101",
-                  "adnm": "四组",
-                  "pcount": 296,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.625852,
-                  "lttd": 30.238361
-                },
-                {
-                  "adcd": "420529101205102",
-                  "adnm": "六组",
-                  "pcount": 258,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.626089,
-                  "lttd": 30.249254
-                },
-                {
-                  "adcd": "420529101205103",
-                  "adnm": "三组",
-                  "pcount": 249,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.62251,
-                  "lttd": 30.249145
-                },
-                {
-                  "adcd": "420529101205104",
-                  "adnm": "一组（水浕司）",
-                  "pcount": 270,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.607703,
-                  "lttd": 30.266896
-                }
-              ]
-            },
-            {
-              "adcd": "420529101206000",
-              "adnm": "油菜坪",
-              "pcount": 650,
-              "htcount": 163,
-              "ldarea": 2.8,
-              "prevtp": "0",
-              "lgtd": 110.622123,
-              "lttd": 30.276306,
-              "children": [
-                {
-                  "adcd": "420529101206100",
-                  "adnm": "一组",
-                  "pcount": 340,
-                  "htcount": 87,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.611682,
-                  "lttd": 30.269515
-                }
-              ]
-            },
-            {
-              "adcd": "420529101207000",
-              "adnm": "黄粮坪村",
-              "pcount": 1217,
-              "htcount": 352,
-              "ldarea": 24.3,
-              "prevtp": "0",
-              "lgtd": 110.652169,
-              "lttd": 30.2798,
-              "children": [
-                {
-                  "adcd": "420529101207100",
-                  "adnm": "一组",
-                  "pcount": 302,
-                  "htcount": 95,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.642672,
-                  "lttd": 30.280247
-                }
-              ]
-            },
-            {
-              "adcd": "420529101208000",
-              "adnm": "谢家坪村",
-              "pcount": 2302,
-              "htcount": 644,
-              "ldarea": 23.2,
-              "prevtp": "0",
-              "lgtd": 110.58412,
-              "lttd": 30.299189,
-              "children": [
-                {
-                  "adcd": "420529101208100",
-                  "adnm": "三组",
-                  "pcount": 215,
-                  "htcount": 67,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592951,
-                  "lttd": 30.3194646
-                },
-                {
-                  "adcd": "420529101208101",
-                  "adnm": "五组",
-                  "pcount": 112,
-                  "htcount": 38,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.580078,
-                  "lttd": 30.279418
-                },
-                {
-                  "adcd": "420529101208102",
-                  "adnm": "八组",
-                  "pcount": 132,
-                  "htcount": 46,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.581833,
-                  "lttd": 30.298807
-                }
-              ]
-            },
-            {
-              "adcd": "420529101209000",
-              "adnm": "麦庄村",
-              "pcount": 2564,
-              "htcount": 729,
-              "ldarea": 30.5,
-              "prevtp": "0",
-              "lgtd": 110.552111,
-              "lttd": 30.292016,
-              "children": []
-            },
-            {
-              "adcd": "420529101210000",
-              "adnm": "怀抱窝村",
-              "pcount": 1764,
-              "htcount": 529,
-              "ldarea": 26.1,
-              "prevtp": "0",
-              "lgtd": 110.606024,
-              "lttd": 30.32805,
-              "children": [
-                {
-                  "adcd": "420529101210100",
-                  "adnm": "一组(竹桥）",
-                  "pcount": 83,
-                  "htcount": 25,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.595765,
-                  "lttd": 30.33814
-                },
-                {
-                  "adcd": "420529101210101",
-                  "adnm": "三组",
-                  "pcount": 129,
-                  "htcount": 35,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592862,
-                  "lttd": 30.3195735
-                }
-              ]
-            },
-            {
-              "adcd": "420529101211000",
-              "adnm": "茅坪村",
-              "pcount": 2711,
-              "htcount": 833,
-              "ldarea": 0,
-              "prevtp": "0",
-              "lgtd": 110.674183,
-              "lttd": 30.138689,
-              "children": [
-                {
-                  "adcd": "420529101211100",
-                  "adnm": "二组（万家田）",
-                  "pcount": 44,
-                  "htcount": 18,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.597656,
-                  "lttd": 30.089048
-                },
-                {
-                  "adcd": "420529101211101",
-                  "adnm": "三组",
-                  "pcount": 68,
-                  "htcount": 21,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.56665,
-                  "lttd": 30.0911
-                },
-                {
-                  "adcd": "420529101211102",
-                  "adnm": "六组（晏家坪）",
-                  "pcount": 118,
-                  "htcount": 32,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.719605,
-                  "lttd": 30.138661
-                },
-                {
-                  "adcd": "420529101211104",
-                  "adnm": "十组（茅坪）",
-                  "pcount": 159,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.669315,
-                  "lttd": 30.153423
-                },
-                {
-                  "adcd": "420529101211105",
-                  "adnm": "九组（茅坪）",
-                  "pcount": 318,
-                  "htcount": 86,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.674523,
-                  "lttd": 30.139839
-                },
-                {
-                  "adcd": "420529101211106",
-                  "adnm": "二组（老屋场）",
-                  "pcount": 40,
-                  "htcount": 12,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.621323,
-                  "lttd": 30.080742
-                }
-              ]
-            },
-            {
-              "adcd": "420529101212000",
-              "adnm": "长坡村",
-              "pcount": 1221,
-              "htcount": 384,
-              "ldarea": 51.5,
-              "prevtp": "0",
-              "lgtd": 110.727382,
-              "lttd": 30.072334,
-              "children": [
-                {
-                  "adcd": "420529101212100",
-                  "adnm": "四组",
-                  "pcount": 221,
-                  "htcount": 112,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.685538,
-                  "lttd": 30.078245
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529102000000",
-          "adnm": "长乐坪镇",
-          "pcount": 24902,
-          "htcount": 6908,
-          "ldarea": 374,
-          "prevtp": "0",
-          "lgtd": 110.817333,
-          "lttd": 30.187285,
-          "children": [
-            {
-              "adcd": "420529102001000",
-              "adnm": "长乐坪社区",
-              "pcount": 1450,
-              "htcount": 412,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.950819,
-              "lttd": 30.266553,
-              "children": []
-            },
-            {
-              "adcd": "420529102201000",
-              "adnm": "洞口村",
-              "pcount": 1686,
-              "htcount": 525,
-              "ldarea": 18.57,
-              "prevtp": "0",
-              "lgtd": 110.862146,
-              "lttd": 30.17035,
-              "children": [
-                {
-                  "adcd": "420529102201100",
-                  "adnm": "三组（洞口）",
-                  "pcount": 423,
-                  "htcount": 146,
-                  "ldarea": 6.22,
-                  "prevtp": "2",
-                  "lgtd": 110.84918,
-                  "lttd": 30.172821
-                },
-                {
-                  "adcd": "420529102201101",
-                  "adnm": "四组（滴淋冲）",
-                  "pcount": 354,
-                  "htcount": 101,
-                  "ldarea": 7.15,
-                  "prevtp": "1",
-                  "lgtd": 110.852646,
-                  "lttd": 30.166916
-                },
-                {
-                  "adcd": "420529102201102",
-                  "adnm": "一组（龟坪）",
-                  "pcount": 427,
-                  "htcount": 122,
-                  "ldarea": 7.07,
-                  "prevtp": "2",
-                  "lgtd": 110.863379,
-                  "lttd": 30.172428
-                },
-                {
-                  "adcd": "420529102201103",
-                  "adnm": "二组（洞口）",
-                  "pcount": 482,
-                  "htcount": 156,
-                  "ldarea": 6.13,
-                  "prevtp": "2",
-                  "lgtd": 110.859648,
-                  "lttd": 30.170953
-                }
-              ]
-            },
-            {
-              "adcd": "420529102202000",
-              "adnm": "腰牌村",
-              "pcount": 1607,
-              "htcount": 484,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 110.898742,
-              "lttd": 30.183227,
-              "children": [
-                {
-                  "adcd": "420529102202100",
-                  "adnm": "二组（腰牌）",
-                  "pcount": 377,
-                  "htcount": 112,
-                  "ldarea": 5.74,
-                  "prevtp": "2",
-                  "lgtd": 110.900312,
-                  "lttd": 30.181927
-                },
-                {
-                  "adcd": "420529102202101",
-                  "adnm": "三组（腰牌）",
-                  "pcount": 429,
-                  "htcount": 129,
-                  "ldarea": 5.95,
-                  "prevtp": "2",
-                  "lgtd": 110.891906,
-                  "lttd": 30.182658
-                },
-                {
-                  "adcd": "420529102202102",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 355,
-                  "htcount": 92,
-                  "ldarea": 5.67,
-                  "prevtp": "2",
-                  "lgtd": 110.884063,
-                  "lttd": 30.178409
-                },
-                {
-                  "adcd": "420529102202103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 446,
-                  "htcount": 151,
-                  "ldarea": 5.81,
-                  "prevtp": "2",
-                  "lgtd": 110.878992,
-                  "lttd": 30.174009
-                }
-              ]
-            },
-            {
-              "adcd": "420529102203000",
-              "adnm": "白岩坪村",
-              "pcount": 2576,
-              "htcount": 767,
-              "ldarea": 31.35,
-              "prevtp": "0",
-              "lgtd": 110.894666,
-              "lttd": 30.159786,
-              "children": [
-                {
-                  "adcd": "420529102203100",
-                  "adnm": "一组",
-                  "pcount": 1242,
-                  "htcount": 379,
-                  "ldarea": 16.98,
-                  "prevtp": "1",
-                  "lgtd": 110.926374,
-                  "lttd": 30.172706
-                },
-                {
-                  "adcd": "420529102203101",
-                  "adnm": "二组（白岩坪）",
-                  "pcount": 1334,
-                  "htcount": 388,
-                  "ldarea": 18.37,
-                  "prevtp": "1",
-                  "lgtd": 110.91441,
-                  "lttd": 30.173227
-                }
-              ]
-            },
-            {
-              "adcd": "420529102204000",
-              "adnm": "月山村",
-              "pcount": 1515,
-              "htcount": 422,
-              "ldarea": 25.29,
-              "prevtp": "0",
-              "lgtd": 110.899558,
-              "lttd": 30.127007,
-              "children": [
-                {
-                  "adcd": "420529102204100",
-                  "adnm": "三组（小河）",
-                  "pcount": 258,
-                  "htcount": 73,
-                  "ldarea": 6.98,
-                  "prevtp": "2",
-                  "lgtd": 110.891944,
-                  "lttd": 30.128185
-                },
-                {
-                  "adcd": "420529102204101",
-                  "adnm": "二组（高桥）",
-                  "pcount": 289,
-                  "htcount": 81,
-                  "ldarea": 7.13,
-                  "prevtp": "2",
-                  "lgtd": 110.912641,
-                  "lttd": 30.136977
-                },
-                {
-                  "adcd": "420529102204102",
-                  "adnm": "一组（曹家河）",
-                  "pcount": 325,
-                  "htcount": 89,
-                  "ldarea": 7.05,
-                  "prevtp": "2",
-                  "lgtd": 110.944037,
-                  "lttd": 30.139595
-                },
-                {
-                  "adcd": "420529102204103",
-                  "adnm": "六组",
-                  "pcount": 323,
-                  "htcount": 90,
-                  "ldarea": 7.13,
-                  "prevtp": "1",
-                  "lgtd": 110.921658,
-                  "lttd": 30.140975
-                },
-                {
-                  "adcd": "420529102204104",
-                  "adnm": "一组（邵家河）",
-                  "pcount": 320,
-                  "htcount": 89,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.935464,
-                  "lttd": 30.135935
-                }
-              ]
-            },
-            {
-              "adcd": "420529102205000",
-              "adnm": "苏家河村",
-              "pcount": 1483,
-              "htcount": 419,
-              "ldarea": 22.89,
-              "prevtp": "0",
-              "lgtd": 110.7719,
-              "lttd": 30.160052,
-              "children": [
-                {
-                  "adcd": "420529102205100",
-                  "adnm": "二组（苏家河）",
-                  "pcount": 348,
-                  "htcount": 96,
-                  "ldarea": 7.38,
-                  "prevtp": "2",
-                  "lgtd": 110.758849,
-                  "lttd": 30.151386
-                },
-                {
-                  "adcd": "420529102205101",
-                  "adnm": "三组（金家湾）",
-                  "pcount": 375,
-                  "htcount": 107,
-                  "ldarea": 7.82,
-                  "prevtp": "2",
-                  "lgtd": 110.769432,
-                  "lttd": 30.146094
-                },
-                {
-                  "adcd": "420529102205102",
-                  "adnm": "四组",
-                  "pcount": 362,
-                  "htcount": 103,
-                  "ldarea": 7.78,
-                  "prevtp": "1",
-                  "lgtd": 110.749224,
-                  "lttd": 30.143833
-                },
-                {
-                  "adcd": "420529102205103",
-                  "adnm": "一组",
-                  "pcount": 398,
-                  "htcount": 113,
-                  "ldarea": 7.91,
-                  "prevtp": "1",
-                  "lgtd": 110.781997,
-                  "lttd": 30.15012
-                }
-              ]
-            },
-            {
-              "adcd": "420529102206000",
-              "adnm": "甘沟村",
-              "pcount": 1728,
-              "htcount": 530,
-              "ldarea": 26.69,
-              "prevtp": "0",
-              "lgtd": 110.792784,
-              "lttd": 30.164572,
-              "children": [
-                {
-                  "adcd": "420529102206100",
-                  "adnm": "二组（高家坪）",
-                  "pcount": 402,
-                  "htcount": 123,
-                  "ldarea": 8.52,
-                  "prevtp": "2",
-                  "lgtd": 110.792131,
-                  "lttd": 30.14632
-                },
-                {
-                  "adcd": "420529102206101",
-                  "adnm": "一组（甘沟）",
-                  "pcount": 418,
-                  "htcount": 129,
-                  "ldarea": 8.38,
-                  "prevtp": "2",
-                  "lgtd": 110.802311,
-                  "lttd": 30.164633
-                },
-                {
-                  "adcd": "420529102206102",
-                  "adnm": "三组",
-                  "pcount": 453,
-                  "htcount": 135,
-                  "ldarea": 8.92,
-                  "prevtp": "1",
-                  "lgtd": 110.802988,
-                  "lttd": 30.151881
-                },
-                {
-                  "adcd": "420529102206103",
-                  "adnm": "五组（剪槽沟）",
-                  "pcount": 455,
-                  "htcount": 143,
-                  "ldarea": 8.87,
-                  "prevtp": "1",
-                  "lgtd": 110.829652,
-                  "lttd": 30.1611865
-                }
-              ]
-            },
-            {
-              "adcd": "420529102207000",
-              "adnm": "百年关村",
-              "pcount": 1805,
-              "htcount": 540,
-              "ldarea": 21.95,
-              "prevtp": "0",
-              "lgtd": 110.953275,
-              "lttd": 30.179524,
-              "children": []
-            },
-            {
-              "adcd": "420529102208000",
-              "adnm": "三教庙村",
-              "pcount": 2267,
-              "htcount": 690,
-              "ldarea": 31.79,
-              "prevtp": "0",
-              "lgtd": 110.893176,
-              "lttd": 30.200651,
-              "children": []
-            },
-            {
-              "adcd": "420529102209000",
-              "adnm": "柴埠溪村",
-              "pcount": 376,
-              "htcount": 123,
-              "ldarea": 9.52,
-              "prevtp": "0",
-              "lgtd": 110.933963,
-              "lttd": 30.228582,
-              "children": [
-                {
-                  "adcd": "420529102209100",
-                  "adnm": "二组（梯子口）",
-                  "pcount": 71,
-                  "htcount": 21,
-                  "ldarea": 3.77,
-                  "prevtp": "2",
-                  "lgtd": 110.947618,
-                  "lttd": 30.2309287
-                },
-                {
-                  "adcd": "420529102209101",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 73,
-                  "htcount": 23,
-                  "ldarea": 3.75,
-                  "prevtp": "1",
-                  "lgtd": 110.961822,
-                  "lttd": 30.2315995
-                },
-                {
-                  "adcd": "420529102209102",
-                  "adnm": "一组（陆家台）",
-                  "pcount": 77,
-                  "htcount": 25,
-                  "ldarea": 3.95,
-                  "prevtp": "2",
-                  "lgtd": 110.91351,
-                  "lttd": 30.231454
-                },
-                {
-                  "adcd": "420529102209103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 79,
-                  "htcount": 28,
-                  "ldarea": 4.14,
-                  "prevtp": "2",
-                  "lgtd": 110.974717,
-                  "lttd": 30.2239784
-                },
-                {
-                  "adcd": "420529102209104",
-                  "adnm": "三组（岩板铺子）",
-                  "pcount": 76,
-                  "htcount": 26,
-                  "ldarea": 3.91,
-                  "prevtp": "2",
-                  "lgtd": 110.929226,
-                  "lttd": 30.229398
-                }
-              ]
-            },
-            {
-              "adcd": "420529102210000",
-              "adnm": "青岩冲村",
-              "pcount": 2002,
-              "htcount": 560,
-              "ldarea": 40.51,
-              "prevtp": "0",
-              "lgtd": 110.782404,
-              "lttd": 30.185819,
-              "children": [
-                {
-                  "adcd": "420529102210100",
-                  "adnm": "四组（小林口）",
-                  "pcount": 986,
-                  "htcount": 266,
-                  "ldarea": 20.85,
-                  "prevtp": "2",
-                  "lgtd": 110.820876,
-                  "lttd": 30.202646
-                },
-                {
-                  "adcd": "420529102210102",
-                  "adnm": "六组（青岩冲）",
-                  "pcount": 1016,
-                  "htcount": 294,
-                  "ldarea": 23.66,
-                  "prevtp": "1",
-                  "lgtd": 110.781604,
-                  "lttd": 30.187083
-                }
-              ]
-            },
-            {
-              "adcd": "420529102211000",
-              "adnm": "桥坪村",
-              "pcount": 1198,
-              "htcount": 331,
-              "ldarea": 24.77,
-              "prevtp": "0",
-              "lgtd": 110.766741,
-              "lttd": 30.231465,
-              "children": [
-                {
-                  "adcd": "420529102211100",
-                  "adnm": "四组（桥坪）",
-                  "pcount": 258,
-                  "htcount": 71,
-                  "ldarea": 7.81,
-                  "prevtp": "2",
-                  "lgtd": 110.745652,
-                  "lttd": 30.233487
-                },
-                {
-                  "adcd": "420529102211101",
-                  "adnm": "六组（曹家湾）",
-                  "pcount": 349,
-                  "htcount": 95,
-                  "ldarea": 8.74,
-                  "prevtp": "2",
-                  "lgtd": 110.772836,
-                  "lttd": 30.236809
-                },
-                {
-                  "adcd": "420529102211102",
-                  "adnm": "五组（桥坪）",
-                  "pcount": 314,
-                  "htcount": 89,
-                  "ldarea": 8.55,
-                  "prevtp": "2",
-                  "lgtd": 110.752264,
-                  "lttd": 30.235366
-                },
-                {
-                  "adcd": "420529102211103",
-                  "adnm": "六组（凉水井）",
-                  "pcount": 277,
-                  "htcount": 76,
-                  "ldarea": 7.67,
-                  "prevtp": "2",
-                  "lgtd": 110.765834,
-                  "lttd": 30.236687
-                }
-              ]
-            },
-            {
-              "adcd": "420529102212000",
-              "adnm": "菖蒲溪村",
-              "pcount": 911,
-              "htcount": 282,
-              "ldarea": 36.28,
-              "prevtp": "0",
-              "lgtd": 110.777564,
-              "lttd": 30.237061,
-              "children": [
-                {
-                  "adcd": "420529102212100",
-                  "adnm": "四组（将军洞）",
-                  "pcount": 189,
-                  "htcount": 62,
-                  "ldarea": 10.15,
-                  "prevtp": "1",
-                  "lgtd": 110.812549,
-                  "lttd": 30.235984
-                },
-                {
-                  "adcd": "420529102212101",
-                  "adnm": "三组（岩屋垴）",
-                  "pcount": 246,
-                  "htcount": 71,
-                  "ldarea": 10.98,
-                  "prevtp": "2",
-                  "lgtd": 110.797305,
-                  "lttd": 30.238971
-                },
-                {
-                  "adcd": "420529102212102",
-                  "adnm": "二组（骆家坪）",
-                  "pcount": 233,
-                  "htcount": 69,
-                  "ldarea": 10.29,
-                  "prevtp": "2",
-                  "lgtd": 110.788782,
-                  "lttd": 30.237532
-                },
-                {
-                  "adcd": "420529102212103",
-                  "adnm": "一组（菖蒲溪）",
-                  "pcount": 243,
-                  "htcount": 80,
-                  "ldarea": 12.86,
-                  "prevtp": "2",
-                  "lgtd": 110.778274,
-                  "lttd": 30.238085
-                }
-              ]
-            },
-            {
-              "adcd": "420529102213000",
-              "adnm": "大湾村",
-              "pcount": 1052,
-              "htcount": 298,
-              "ldarea": 20.31,
-              "prevtp": "0",
-              "lgtd": 110.707941,
-              "lttd": 30.186264,
-              "children": []
-            },
-            {
-              "adcd": "420529102214000",
-              "adnm": "白鹿庄村",
-              "pcount": 1518,
-              "htcount": 432,
-              "ldarea": 21.58,
-              "prevtp": "0",
-              "lgtd": 110.729787,
-              "lttd": 30.19293,
-              "children": [
-                {
-                  "adcd": "420529102214100",
-                  "adnm": "三组（白鹿庄下）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735589,
-                  "lttd": 30.198371
-                },
-                {
-                  "adcd": "420529102214101",
-                  "adnm": "三组（白鹿庄上）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735173,
-                  "lttd": 30.201783
-                }
-              ]
-            },
-            {
-              "adcd": "420529102215000",
-              "adnm": "石桥沟村",
-              "pcount": 1192,
-              "htcount": 357,
-              "ldarea": 12.93,
-              "prevtp": "0",
-              "lgtd": 110.712097,
-              "lttd": 30.204806,
-              "children": []
-            },
-            {
-              "adcd": "420529102216000",
-              "adnm": "红鱼潭村",
-              "pcount": 940,
-              "htcount": 243,
-              "ldarea": 14.87,
-              "prevtp": "0",
-              "lgtd": 110.722212,
-              "lttd": 30.221909,
-              "children": [
-                {
-                  "adcd": "420529102216100",
-                  "adnm": "二组（下红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 121,
-                  "ldarea": 11.4,
-                  "prevtp": "2",
-                  "lgtd": 110.712448,
-                  "lttd": 30.220817
-                },
-                {
-                  "adcd": "420529102216101",
-                  "adnm": "二组（上红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 122,
-                  "ldarea": 7.5,
-                  "prevtp": "2",
-                  "lgtd": 110.714051,
-                  "lttd": 30.228049
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529103000000",
-          "adnm": "渔洋关镇",
-          "pcount": 45920,
-          "htcount": 17817,
-          "ldarea": 356,
-          "prevtp": "0",
-          "lgtd": 111.045286,
-          "lttd": 30.160398,
-          "children": [
-            {
-              "adcd": "420529103001000",
-              "adnm": "曹家坪社区",
-              "pcount": 5666,
-              "htcount": 2376,
-              "ldarea": 16.08,
-              "prevtp": "0",
-              "lgtd": 111.071315,
-              "lttd": 30.174626,
-              "children": [
-                {
-                  "adcd": "420529103001100",
-                  "adnm": "五组（松林坪）",
-                  "pcount": 368,
-                  "htcount": 111,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.033933,
-                  "lttd": 30.1556506
-                },
-                {
-                  "adcd": "420529103001101",
-                  "adnm": "四组（松林坪）",
-                  "pcount": 238,
-                  "htcount": 63,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.040689,
-                  "lttd": 30.1503546
-                },
-                {
-                  "adcd": "420529103001103",
-                  "adnm": "六组（松林坪）",
-                  "pcount": 335,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.039322,
-                  "lttd": 30.160644
-                },
-                {
-                  "adcd": "420529103001105",
-                  "adnm": "二组（曹家坪）",
-                  "pcount": 572,
-                  "htcount": 158,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064373,
-                  "lttd": 30.166271
-                },
-                {
-                  "adcd": "420529103001106",
-                  "adnm": "九组（(簸箕山)）",
-                  "pcount": 431,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052448,
-                  "lttd": 30.176902
-                },
-                {
-                  "adcd": "420529103001107",
-                  "adnm": "三组（青岗岭）",
-                  "pcount": 203,
-                  "htcount": 69,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.057881,
-                  "lttd": 30.156
-                }
-              ]
-            },
-            {
-              "adcd": "420529103002000",
-              "adnm": "大房坪社区",
-              "pcount": 6224,
-              "htcount": 2839,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 111.074047,
-              "lttd": 30.169517,
-              "children": [
-                {
-                  "adcd": "420529103002106",
-                  "adnm": "六组（李家坪）",
-                  "pcount": 337,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.107587,
-                  "lttd": 30.172462
-                },
-                {
-                  "adcd": "420529103002107",
-                  "adnm": "大房坪",
-                  "pcount": 3742,
-                  "htcount": 1761,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.076431,
-                  "lttd": 30.170897
-                },
-                {
-                  "adcd": "420529103002108",
-                  "adnm": "四组（城墙口）",
-                  "pcount": 331,
-                  "htcount": 90,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.095059,
-                  "lttd": 30.146079
-                },
-                {
-                  "adcd": "420529103002109",
-                  "adnm": "七组（麻溪冲）",
-                  "pcount": 287,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.104708,
-                  "lttd": 30.176352
-                },
-                {
-                  "adcd": "420529103002110",
-                  "adnm": "八组（麻溪冲）",
-                  "pcount": 655,
-                  "htcount": 221,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.096686,
-                  "lttd": 30.184931
-                }
-              ]
-            },
-            {
-              "adcd": "420529103003000",
-              "adnm": "桥河社区",
-              "pcount": 7415,
-              "htcount": 3338,
-              "ldarea": 18.36,
-              "prevtp": "0",
-              "lgtd": 111.083223,
-              "lttd": 30.182641,
-              "children": [
-                {
-                  "adcd": "420529103003100",
-                  "adnm": "花桥",
-                  "pcount": 2035,
-                  "htcount": 945,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064716,
-                  "lttd": 30.178022
-                },
-                {
-                  "adcd": "420529103003101",
-                  "adnm": "桥河",
-                  "pcount": 1372,
-                  "htcount": 590,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.092056,
-                  "lttd": 30.190173
-                },
-                {
-                  "adcd": "420529103003102",
-                  "adnm": "刘家坪",
-                  "pcount": 676,
-                  "htcount": 192,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.068048,
-                  "lttd": 30.203047
-                }
-              ]
-            },
-            {
-              "adcd": "420529103201000",
-              "adnm": "汉马池村",
-              "pcount": 4363,
-              "htcount": 1476,
-              "ldarea": 43.92,
-              "prevtp": "0",
-              "lgtd": 111.010216,
-              "lttd": 30.145828,
-              "children": [
-                {
-                  "adcd": "420529103201100",
-                  "adnm": "五组（千山）",
-                  "pcount": 301,
-                  "htcount": 85,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.972477,
-                  "lttd": 30.1393608
-                },
-                {
-                  "adcd": "420529103201101",
-                  "adnm": "四组（桥板洞）",
-                  "pcount": 207,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.001791,
-                  "lttd": 30.15045
-                },
-                {
-                  "adcd": "420529103201102",
-                  "adnm": "三组（桂花树）",
-                  "pcount": 377,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991827,
-                  "lttd": 30.150599
-                },
-                {
-                  "adcd": "420529103201103",
-                  "adnm": "一组（杨家坝子）",
-                  "pcount": 538,
-                  "htcount": 153,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.015634,
-                  "lttd": 30.137185
-                },
-                {
-                  "adcd": "420529103201104",
-                  "adnm": "六组（阮家洞）",
-                  "pcount": 191,
-                  "htcount": 51,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 110.963332,
-                  "lttd": 30.138323
-                },
-                {
-                  "adcd": "420529103201105",
-                  "adnm": "九组",
-                  "pcount": 544,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018838,
-                  "lttd": 30.188615
-                },
-                {
-                  "adcd": "420529103201107",
-                  "adnm": "七组（长冲子)",
-                  "pcount": 471,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.977879,
-                  "lttd": 30.171188
-                },
-                {
-                  "adcd": "420529103201108",
-                  "adnm": "十组（穿心店）",
-                  "pcount": 619,
-                  "htcount": 98,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.008591,
-                  "lttd": 30.176473
-                },
-                {
-                  "adcd": "420529103201109",
-                  "adnm": "二组（汉马池）",
-                  "pcount": 560,
-                  "htcount": 171,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.011178,
-                  "lttd": 30.156577
-                },
-                {
-                  "adcd": "420529103201110",
-                  "adnm": "九组（杨家湾）",
-                  "pcount": 550,
-                  "htcount": 120,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991313,
-                  "lttd": 30.198529
-                }
-              ]
-            },
-            {
-              "adcd": "420529103202000",
-              "adnm": "三房坪村",
-              "pcount": 3822,
-              "htcount": 1327,
-              "ldarea": 20.39,
-              "prevtp": "0",
-              "lgtd": 111.070836,
-              "lttd": 30.148837,
-              "children": [
-                {
-                  "adcd": "420529103202100",
-                  "adnm": "八组（樱桃山)",
-                  "pcount": 407,
-                  "htcount": 126,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052614,
-                  "lttd": 30.133604
-                },
-                {
-                  "adcd": "420529103202101",
-                  "adnm": "九组（樱桃山）",
-                  "pcount": 273,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.047375,
-                  "lttd": 30.134426
-                },
-                {
-                  "adcd": "420529103202102",
-                  "adnm": "七组（赶子坪）",
-                  "pcount": 349,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.063756,
-                  "lttd": 30.130336
-                },
-                {
-                  "adcd": "420529103202103",
-                  "adnm": "四组（砂滩口）",
-                  "pcount": 239,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.06732,
-                  "lttd": 30.133277
-                },
-                {
-                  "adcd": "420529103202104",
-                  "adnm": "一组(青屋树)",
-                  "pcount": 433,
-                  "htcount": 160,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.066485,
-                  "lttd": 30.155661
-                },
-                {
-                  "adcd": "420529103202105",
-                  "adnm": "三组（小河）",
-                  "pcount": 400,
-                  "htcount": 131,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.072293,
-                  "lttd": 30.141717
-                },
-                {
-                  "adcd": "420529103202106",
-                  "adnm": "七组（灌沟）",
-                  "pcount": 230,
-                  "htcount": 103,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.071064,
-                  "lttd": 30.134573
-                }
-              ]
-            },
-            {
-              "adcd": "420529103203000",
-              "adnm": "火田坑村",
-              "pcount": 1785,
-              "htcount": 604,
-              "ldarea": 32.21,
-              "prevtp": "0",
-              "lgtd": 110.928335,
-              "lttd": 30.251524,
-              "children": [
-                {
-                  "adcd": "420529103203103",
-                  "adnm": "四组（余堰子）",
-                  "pcount": 206,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.923367,
-                  "lttd": 30.256976
-                },
-                {
-                  "adcd": "420529103203104",
-                  "adnm": "七组（漩涡埫）",
-                  "pcount": 202,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.872437,
-                  "lttd": 30.247461
-                },
-                {
-                  "adcd": "420529103203105",
-                  "adnm": "四组（大坑埫）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.935343,
-                  "lttd": 30.263216
-                }
-              ]
-            },
-            {
-              "adcd": "420529103204000",
-              "adnm": "鞍山村",
-              "pcount": 1709,
-              "htcount": 636,
-              "ldarea": 20.78,
-              "prevtp": "0",
-              "lgtd": 110.985901,
-              "lttd": 30.274849,
-              "children": []
-            },
-            {
-              "adcd": "420529103205000",
-              "adnm": "涨水坪村",
-              "pcount": 1709,
-              "htcount": 616,
-              "ldarea": 15.96,
-              "prevtp": "0",
-              "lgtd": 111.016591,
-              "lttd": 30.263112,
-              "children": [
-                {
-                  "adcd": "420529103205100",
-                  "adnm": "二组（涨水坪下）",
-                  "pcount": 323,
-                  "htcount": 105,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018725,
-                  "lttd": 30.257364
-                },
-                {
-                  "adcd": "420529103205101",
-                  "adnm": "四组（茅葫山）",
-                  "pcount": 264,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.037879,
-                  "lttd": 30.270009
-                },
-                {
-                  "adcd": "420529103205102",
-                  "adnm": "六组（小龙潭）",
-                  "pcount": 334,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.010953,
-                  "lttd": 30.28058
-                },
-                {
-                  "adcd": "420529103205103",
-                  "adnm": "七组（云龙山）",
-                  "pcount": 247,
-                  "htcount": 68,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.013247,
-                  "lttd": 30.285109
-                },
-                {
-                  "adcd": "420529103205104",
-                  "adnm": "二组（涨水坪上）",
-                  "pcount": 300,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.019735,
-                  "lttd": 30.255388
-                }
-              ]
-            },
-            {
-              "adcd": "420529103206000",
-              "adnm": "王家坪村",
-              "pcount": 2372,
-              "htcount": 887,
-              "ldarea": 21,
-              "prevtp": "0",
-              "lgtd": 111.012233,
-              "lttd": 30.244419,
-              "children": [
-                {
-                  "adcd": "420529103206100",
-                  "adnm": "王家坪（五组）",
-                  "pcount": 389,
-                  "htcount": 122,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.007657,
-                  "lttd": 30.243316
-                },
-                {
-                  "adcd": "420529103206103",
-                  "adnm": "碓臼坑（九组）",
-                  "pcount": 297,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.030894,
-                  "lttd": 30.231012
-                },
-                {
-                  "adcd": "420529103206104",
-                  "adnm": "陈家埫（八组）",
-                  "pcount": 193,
-                  "htcount": 55,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.999815,
-                  "lttd": 30.236805
-                },
-                {
-                  "adcd": "420529103206106",
-                  "adnm": "史家坪（四组）",
-                  "pcount": 389,
-                  "htcount": 125,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.020009,
-                  "lttd": 30.234829
-                }
-              ]
-            },
-            {
-              "adcd": "420529103207000",
-              "adnm": "枚二冲村",
-              "pcount": 2406,
-              "htcount": 904,
-              "ldarea": 20.72,
-              "prevtp": "0",
-              "lgtd": 111.048321,
-              "lttd": 30.224802,
-              "children": []
-            },
-            {
-              "adcd": "420529103208000",
-              "adnm": "清水湾村",
-              "pcount": 1775,
-              "htcount": 603,
-              "ldarea": 37.11,
-              "prevtp": "0",
-              "lgtd": 110.965572,
-              "lttd": 30.080175,
-              "children": [
-                {
-                  "adcd": "420529103208100",
-                  "adnm": "四组（龙潭湾）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.932338,
-                  "lttd": 30.085706
-                },
-                {
-                  "adcd": "420529103208101",
-                  "adnm": "四组（唐黄坪）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.939173,
-                  "lttd": 30.082635
-                },
-                {
-                  "adcd": "420529103208102",
-                  "adnm": "六组（玉占花）",
-                  "pcount": 185,
-                  "htcount": 48,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.927351,
-                  "lttd": 30.111314
-                },
-                {
-                  "adcd": "420529103208103",
-                  "adnm": "四组（翻水洞）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.941731,
-                  "lttd": 30.084026
-                },
-                {
-                  "adcd": "420529103208104",
-                  "adnm": "一组（清水堰））",
-                  "pcount": 178,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.963492,
-                  "lttd": 30.0893062
-                },
-                {
-                  "adcd": "420529103208105",
-                  "adnm": "一组（清水湾）",
-                  "pcount": 178,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.96647,
-                  "lttd": 30.080914
-                },
-                {
-                  "adcd": "420529103208106",
-                  "adnm": "二组（下坪）",
-                  "pcount": 390,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.98068,
-                  "lttd": 30.073403
-                },
-                {
-                  "adcd": "420529103208107",
-                  "adnm": "四组（洈水）",
-                  "pcount": 300,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.94587,
-                  "lttd": 30.082252
-                },
-                {
-                  "adcd": "420529103208108",
-                  "adnm": "二组（上坪）",
-                  "pcount": 280,
-                  "htcount": 52,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.968959,
-                  "lttd": 30.075928
-                }
-              ]
-            },
-            {
-              "adcd": "420529103209000",
-              "adnm": "三板桥村",
-              "pcount": 1584,
-              "htcount": 538,
-              "ldarea": 28.56,
-              "prevtp": "0",
-              "lgtd": 110.987244,
-              "lttd": 30.101781,
-              "children": [
-                {
-                  "adcd": "420529103209100",
-                  "adnm": "八组（三板桥）",
-                  "pcount": 223,
-                  "htcount": 56,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.990816,
-                  "lttd": 30.100481
-                },
-                {
-                  "adcd": "420529103209101",
-                  "adnm": "五组（跑马岭）",
-                  "pcount": 143,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.993049,
-                  "lttd": 30.105093
-                },
-                {
-                  "adcd": "420529103209102",
-                  "adnm": "三组（云台观）",
-                  "pcount": 200,
-                  "htcount": 57,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.980796,
-                  "lttd": 30.122885
-                },
-                {
-                  "adcd": "420529103209103",
-                  "adnm": "一组（横溪河）",
-                  "pcount": 156,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.002633,
-                  "lttd": 30.124493
-                },
-                {
-                  "adcd": "420529103209104",
-                  "adnm": "九组（高家岭）",
-                  "pcount": 204,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.006308,
-                  "lttd": 30.093283
-                }
-              ]
-            },
-            {
-              "adcd": "420529103210000",
-              "adnm": "石柱山村",
-              "pcount": 1232,
-              "htcount": 430,
-              "ldarea": 11.22,
-              "prevtp": "0",
-              "lgtd": 111.030437,
-              "lttd": 30.108528,
-              "children": [
-                {
-                  "adcd": "420529103210100",
-                  "adnm": "一组（石柱山）",
-                  "pcount": 344,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.026903,
-                  "lttd": 30.113098
-                },
-                {
-                  "adcd": "420529103210101",
-                  "adnm": "黄土包",
-                  "pcount": 240,
-                  "htcount": 66,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.01604,
-                  "lttd": 30.124506
-                },
-                {
-                  "adcd": "420529103210102",
-                  "adnm": "四组（横溪河）",
-                  "pcount": 329,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014129,
-                  "lttd": 30.128574
-                }
-              ]
-            },
-            {
-              "adcd": "420529103211000",
-              "adnm": "沙埫村",
-              "pcount": 2002,
-              "htcount": 674,
-              "ldarea": 23.24,
-              "prevtp": "0",
-              "lgtd": 111.082426,
-              "lttd": 30.115336,
-              "children": []
-            },
-            {
-              "adcd": "420529103212000",
-              "adnm": "南河村",
-              "pcount": 1794,
-              "htcount": 569,
-              "ldarea": 30.34,
-              "prevtp": "0",
-              "lgtd": 111.069873,
-              "lttd": 30.066705,
-              "children": [
-                {
-                  "adcd": "420529103212100",
-                  "adnm": "杨木洞",
-                  "pcount": 452,
-                  "htcount": 128,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.076144,
-                  "lttd": 30.071189
-                },
-                {
-                  "adcd": "420529103212101",
-                  "adnm": "田家坪",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.041095,
-                  "lttd": 30.078329
-                },
-                {
-                  "adcd": "420529103212102",
-                  "adnm": "谦敬坪",
-                  "pcount": 326,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014608,
-                  "lttd": 30.077743
-                },
-                {
-                  "adcd": "420529103212103",
-                  "adnm": "郑家台",
-                  "pcount": 220,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.026223,
-                  "lttd": 30.082011
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529104000000",
-          "adnm": "仁和坪镇",
-          "pcount": 16117,
-          "htcount": 5069,
-          "ldarea": 199.46,
-          "prevtp": "0",
-          "lgtd": 111.242259,
-          "lttd": 30.104032,
-          "children": [
-            {
-              "adcd": "420529104001000",
-              "adnm": "仁和坪社区",
-              "pcount": 1247,
-              "htcount": 487,
-              "ldarea": 5,
-              "prevtp": "0",
-              "lgtd": 111.238323,
-              "lttd": 30.104003,
-              "children": []
-            },
-            {
-              "adcd": "420529104201000",
-              "adnm": "仁和坪村",
-              "pcount": 1653,
-              "htcount": 499,
-              "ldarea": 17.46,
-              "prevtp": "0",
-              "lgtd": 111.235606,
-              "lttd": 30.098939,
-              "children": [
-                {
-                  "adcd": "420529104201100",
-                  "adnm": "五组（檀木岗）",
-                  "pcount": 610,
-                  "htcount": 186,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.251975,
-                  "lttd": 30.099848
-                },
-                {
-                  "adcd": "420529104201101",
-                  "adnm": "五组（洋线沟）",
-                  "pcount": 40,
-                  "htcount": 6,
-                  "ldarea": 2.23,
-                  "prevtp": "2",
-                  "lgtd": 111.258799,
-                  "lttd": 30.094674
-                },
-                {
-                  "adcd": "420529104201102",
-                  "adnm": "六组（松林坑）",
-                  "pcount": 480,
-                  "htcount": 145,
-                  "ldarea": 7,
-                  "prevtp": "1",
-                  "lgtd": 111.267794,
-                  "lttd": 30.085327
-                },
-                {
-                  "adcd": "420529104201103",
-                  "adnm": "四组（杉林子）",
-                  "pcount": 493,
-                  "htcount": 155,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.250484,
-                  "lttd": 30.111344
-                },
-                {
-                  "adcd": "420529104201104",
-                  "adnm": "一组（王家湾）",
-                  "pcount": 30,
-                  "htcount": 7,
-                  "ldarea": 2.23,
-                  "prevtp": "1",
-                  "lgtd": 111.235377,
-                  "lttd": 30.089216
-                }
-              ]
-            },
-            {
-              "adcd": "420529104202000",
-              "adnm": "杨家埫村",
-              "pcount": 361,
-              "htcount": 128,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.224634,
-              "lttd": 30.10431,
-              "children": []
-            },
-            {
-              "adcd": "420529104203000",
-              "adnm": "枫香坪村",
-              "pcount": 718,
-              "htcount": 193,
-              "ldarea": 4.9,
-              "prevtp": "0",
-              "lgtd": 111.228783,
-              "lttd": 30.0674,
-              "children": [
-                {
-                  "adcd": "420529104203100",
-                  "adnm": "六组（水井坪）",
-                  "pcount": 351,
-                  "htcount": 85,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.260666,
-                  "lttd": 30.073385
-                },
-                {
-                  "adcd": "420529104203101",
-                  "adnm": "四组（简家坪）",
-                  "pcount": 82,
-                  "htcount": 25,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.209618,
-                  "lttd": 30.076108
-                },
-                {
-                  "adcd": "420529104203102",
-                  "adnm": "四组（枫香坪）",
-                  "pcount": 198,
-                  "htcount": 56,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.222942,
-                  "lttd": 30.0692433
-                },
-                {
-                  "adcd": "420529104203103",
-                  "adnm": "三组（剪刀溪）",
-                  "pcount": 87,
-                  "htcount": 27,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.216989,
-                  "lttd": 30.08405
-                }
-              ]
-            },
-            {
-              "adcd": "420529104204000",
-              "adnm": "罗汉淌",
-              "pcount": 300,
-              "htcount": 140,
-              "ldarea": 3,
-              "prevtp": "0",
-              "lgtd": 111.221815,
-              "lttd": 30.052427,
-              "children": []
-            },
-            {
-              "adcd": "420529104205000",
-              "adnm": "船山坪村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 111.266407,
-              "lttd": 30.057388,
-              "children": []
-            },
-            {
-              "adcd": "420529104206000",
-              "adnm": "梅坪村",
-              "pcount": 350,
-              "htcount": 128,
-              "ldarea": 1.76,
-              "prevtp": "0",
-              "lgtd": 111.301527,
-              "lttd": 30.064403,
-              "children": []
-            },
-            {
-              "adcd": "420529104207000",
-              "adnm": "业产坪村",
-              "pcount": 298,
-              "htcount": 285,
-              "ldarea": 5.8,
-              "prevtp": "0",
-              "lgtd": 111.292338,
-              "lttd": 30.111742,
-              "children": [
-                {
-                  "adcd": "420529104207100",
-                  "adnm": "四组（多竹溪）",
-                  "pcount": 85,
-                  "htcount": 22,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.304219,
-                  "lttd": 30.088104
-                },
-                {
-                  "adcd": "420529104207101",
-                  "adnm": "七组（杨树坳）",
-                  "pcount": 88,
-                  "htcount": 21,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.32324,
-                  "lttd": 30.119831
-                },
-                {
-                  "adcd": "420529104207102",
-                  "adnm": "四组（百担淌）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.316391,
-                  "lttd": 30.094219
-                },
-                {
-                  "adcd": "420529104207103",
-                  "adnm": "一组（业产坪）",
-                  "pcount": 85,
-                  "htcount": 75,
-                  "ldarea": 4.3,
-                  "prevtp": "1",
-                  "lgtd": 111.290478,
-                  "lttd": 30.109408
-                }
-              ]
-            },
-            {
-              "adcd": "420529104208000",
-              "adnm": "杨柳池村",
-              "pcount": 220,
-              "htcount": 82,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.281557,
-              "lttd": 30.126121,
-              "children": [
-                {
-                  "adcd": "420529104208100",
-                  "adnm": "四组（甘沟子）",
-                  "pcount": 220,
-                  "htcount": 82,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 111.318239,
-                  "lttd": 30.130386
-                }
-              ]
-            },
-            {
-              "adcd": "420529104209000",
-              "adnm": "林家坪村",
-              "pcount": 300,
-              "htcount": 85,
-              "ldarea": 2.1,
-              "prevtp": "0",
-              "lgtd": 111.229568,
-              "lttd": 30.136506,
-              "children": []
-            },
-            {
-              "adcd": "420529104210000",
-              "adnm": "大檀树村",
-              "pcount": 685,
-              "htcount": 206,
-              "ldarea": 12,
-              "prevtp": "0",
-              "lgtd": 111.169768,
-              "lttd": 30.128698,
-              "children": [
-                {
-                  "adcd": "420529104210100",
-                  "adnm": "四组（大堰）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.191456,
-                  "lttd": 30.140086
-                },
-                {
-                  "adcd": "420529104210102",
-                  "adnm": "二组（摊子坡）",
-                  "pcount": 280,
-                  "htcount": 83,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.178975,
-                  "lttd": 30.125395
-                },
-                {
-                  "adcd": "420529104210103",
-                  "adnm": "五组（余家坪）",
-                  "pcount": 195,
-                  "htcount": 58,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.181009,
-                  "lttd": 30.144807
-                }
-              ]
-            },
-            {
-              "adcd": "420529104211000",
-              "adnm": "升子坪村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 111.168879,
-              "lttd": 30.105211,
-              "children": []
-            },
-            {
-              "adcd": "420529104212000",
-              "adnm": "富裕冲村",
-              "pcount": 353,
-              "htcount": 121,
-              "ldarea": 1.62,
-              "prevtp": "0",
-              "lgtd": 111.143766,
-              "lttd": 30.117854,
-              "children": []
-            },
-            {
-              "adcd": "420529104213000",
-              "adnm": "桥梁村",
-              "pcount": 127,
-              "htcount": 31,
-              "ldarea": 2.7,
-              "prevtp": "0",
-              "lgtd": 111.101141,
-              "lttd": 30.108951,
-              "children": [
-                {
-                  "adcd": "420529104213100",
-                  "adnm": "一组（翻水坳）",
-                  "pcount": 11,
-                  "htcount": 3,
-                  "ldarea": 2.2,
-                  "prevtp": "1",
-                  "lgtd": 111.104619,
-                  "lttd": 30.115265
-                },
-                {
-                  "adcd": "420529104213101",
-                  "adnm": "六组（麒麟观）",
-                  "pcount": 20,
-                  "htcount": 4,
-                  "ldarea": 2.6,
-                  "prevtp": "1",
-                  "lgtd": 111.110327,
-                  "lttd": 30.08415
-                },
-                {
-                  "adcd": "420529104213102",
-                  "adnm": "一组（道家湾）",
-                  "pcount": 48,
-                  "htcount": 12,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.099774,
-                  "lttd": 30.118108
-                },
-                {
-                  "adcd": "420529104213103",
-                  "adnm": "四组（桥梁）",
-                  "pcount": 22,
-                  "htcount": 6,
-                  "ldarea": 2.5,
-                  "prevtp": "1",
-                  "lgtd": 111.102086,
-                  "lttd": 30.107225
-                },
-                {
-                  "adcd": "420529104213104",
-                  "adnm": "三组（流满沟)",
-                  "pcount": 26,
-                  "htcount": 6,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.082384,
-                  "lttd": 30.104546
-                }
-              ]
-            },
-            {
-              "adcd": "420529104214000",
-              "adnm": "大栗树村",
-              "pcount": 1680,
-              "htcount": 502,
-              "ldarea": 24,
-              "prevtp": "0",
-              "lgtd": 111.142519,
-              "lttd": 30.059065,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529105000000",
-          "adnm": "湾潭镇",
-          "pcount": 15721,
-          "htcount": 4650,
-          "ldarea": 295.53,
-          "plarea": 38929,
-          "prevtp": "0",
-          "lgtd": 110.425002,
-          "lttd": 30.050047,
-          "wscd": "HBWS000000002",
-          "children": [
-            {
-              "adcd": "420529105001000",
-              "adnm": "湾潭社区",
-              "pcount": 1313,
-              "htcount": 398,
-              "ldarea": 16.21,
-              "plarea": 1153,
-              "prevtp": "0",
-              "lgtd": 110.42388,
-              "lttd": 30.047864,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105001100",
-                  "adnm": "上街",
-                  "pcount": 249,
-                  "htcount": 74,
-                  "ldarea": 5.24,
-                  "plarea": 225,
-                  "prevtp": "2",
-                  "lgtd": 110.425785,
-                  "lttd": 30.053044,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001101",
-                  "adnm": "中街",
-                  "pcount": 285,
-                  "htcount": 86,
-                  "ldarea": 5.39,
-                  "plarea": 229,
-                  "prevtp": "2",
-                  "lgtd": 110.425614,
-                  "lttd": 30.048871,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001102",
-                  "adnm": "下街",
-                  "pcount": 291,
-                  "htcount": 88,
-                  "ldarea": 5.49,
-                  "plarea": 218,
-                  "prevtp": "2",
-                  "lgtd": 110.427007,
-                  "lttd": 30.041187,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001103",
-                  "adnm": "四组",
-                  "pcount": 300,
-                  "htcount": 94,
-                  "ldarea": 5.68,
-                  "plarea": 289,
-                  "prevtp": "2",
-                  "lgtd": 110.435104,
-                  "lttd": 30.057728,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001104",
-                  "adnm": "三组（黄家湾上）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.2,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.421384,
-                  "lttd": 30.061152,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001105",
-                  "adnm": "三组（黄家湾下）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.21,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.423788,
-                  "lttd": 30.052927,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105201000",
-              "adnm": "龙桥村",
-              "pcount": 1806,
-              "htcount": 524,
-              "ldarea": 21.15,
-              "plarea": 2719,
-              "prevtp": "0",
-              "lgtd": 110.427125,
-              "lttd": 30.034791,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105201100",
-                  "adnm": "五组（田家坪）",
-                  "pcount": 424,
-                  "htcount": 124,
-                  "ldarea": 6.96,
-                  "plarea": 632,
-                  "prevtp": "2",
-                  "lgtd": 110.425186,
-                  "lttd": 30.030705,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201101",
-                  "adnm": "二组（胡家坪）",
-                  "pcount": 386,
-                  "htcount": 113,
-                  "ldarea": 6.52,
-                  "plarea": 576,
-                  "prevtp": "2",
-                  "lgtd": 110.439722,
-                  "lttd": 30.055551,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201102",
-                  "adnm": "三组",
-                  "pcount": 361,
-                  "htcount": 106,
-                  "ldarea": 6.24,
-                  "plarea": 540,
-                  "prevtp": "1",
-                  "lgtd": 110.457203,
-                  "lttd": 30.049073,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201103",
-                  "adnm": "四组（覃家坪）",
-                  "pcount": 340,
-                  "htcount": 100,
-                  "ldarea": 6,
-                  "plarea": 510,
-                  "prevtp": "2",
-                  "lgtd": 110.430404,
-                  "lttd": 30.036725,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201104",
-                  "adnm": "一组（八里铺）",
-                  "pcount": 295,
-                  "htcount": 81,
-                  "ldarea": 5.43,
-                  "plarea": 461,
-                  "prevtp": "2",
-                  "lgtd": 110.458963,
-                  "lttd": 30.074837,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201105",
-                  "adnm": "二组（白果湾）",
-                  "pcount": 193,
-                  "htcount": 56,
-                  "ldarea": 4.26,
-                  "plarea": 288,
-                  "prevtp": "2",
-                  "lgtd": 110.436559,
-                  "lttd": 30.051893,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105202000",
-              "adnm": "九门村",
-              "pcount": 1191,
-              "htcount": 330,
-              "ldarea": 27.38,
-              "plarea": 3720,
-              "prevtp": "0",
-              "lgtd": 110.424995,
-              "lttd": 29.994538,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105202100",
-                  "adnm": "四组",
-                  "pcount": 187,
-                  "htcount": 52,
-                  "ldarea": 4.66,
-                  "prevtp": "1",
-                  "lgtd": 111.019734,
-                  "lttd": 30.038212
-                },
-                {
-                  "adcd": "420529105202101",
-                  "adnm": "三组（大岭）",
-                  "pcount": 170,
-                  "htcount": 46,
-                  "ldarea": 4.38,
-                  "prevtp": "1",
-                  "lgtd": 110.466198,
-                  "lttd": 30.017541
-                }
-              ]
-            },
-            {
-              "adcd": "420529105203000",
-              "adnm": "小凤池村",
-              "pcount": 1236,
-              "htcount": 362,
-              "ldarea": 17.03,
-              "plarea": 3512,
-              "prevtp": "0",
-              "lgtd": 110.39745,
-              "lttd": 30.054112,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105203100",
-                  "adnm": "三组（横渡口）",
-                  "pcount": 870,
-                  "htcount": 256,
-                  "ldarea": 14.12,
-                  "plarea": 2484,
-                  "prevtp": "2",
-                  "lgtd": 110.397542,
-                  "lttd": 30.052772,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203102",
-                  "adnm": "二组（小凤池上）",
-                  "pcount": 186,
-                  "htcount": 56,
-                  "ldarea": 4.51,
-                  "plarea": 528,
-                  "prevtp": "2",
-                  "lgtd": 110.41154,
-                  "lttd": 30.032823,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203103",
-                  "adnm": "二组（小凤池下）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 4.4,
-                  "plarea": 500,
-                  "prevtp": "2",
-                  "lgtd": 110.406546,
-                  "lttd": 30.024965,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105204000",
-              "adnm": "茅庄村",
-              "pcount": 1668,
-              "htcount": 489,
-              "ldarea": 65.77,
-              "plarea": 1947,
-              "prevtp": "0",
-              "lgtd": 110.481058,
-              "lttd": 30.081057,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105204100",
-                  "adnm": "五组（三板桥）",
-                  "pcount": 119,
-                  "htcount": 35,
-                  "ldarea": 6.69,
-                  "plarea": 138,
-                  "prevtp": "1",
-                  "lgtd": 110.385549,
-                  "lttd": 30.084092,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204101",
-                  "adnm": "四组（三峰岗）",
-                  "pcount": 139,
-                  "htcount": 41,
-                  "ldarea": 7.49,
-                  "plarea": 159,
-                  "prevtp": "1",
-                  "lgtd": 110.456626,
-                  "lttd": 30.106181,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204103",
-                  "adnm": "一组（土坪）",
-                  "pcount": 187,
-                  "htcount": 55,
-                  "ldarea": 9.37,
-                  "plarea": 214,
-                  "prevtp": "1",
-                  "lgtd": 110.510515,
-                  "lttd": 30.127021,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204104",
-                  "adnm": "二组（横河）",
-                  "pcount": 214,
-                  "htcount": 63,
-                  "ldarea": 10.44,
-                  "plarea": 246,
-                  "prevtp": "2",
-                  "lgtd": 110.47501,
-                  "lttd": 30.097844,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204105",
-                  "adnm": "三组（关岔口）",
-                  "pcount": 197,
-                  "htcount": 58,
-                  "ldarea": 9.77,
-                  "plarea": 226,
-                  "prevtp": "2",
-                  "lgtd": 110.47866,
-                  "lttd": 30.080996,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204106",
-                  "adnm": "二组（茅庄）",
-                  "pcount": 289,
-                  "htcount": 85,
-                  "ldarea": 13.39,
-                  "plarea": 332,
-                  "prevtp": "2",
-                  "lgtd": 110.487741,
-                  "lttd": 30.117695,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105205000",
-              "adnm": "红烈村",
-              "pcount": 1743,
-              "htcount": 545,
-              "ldarea": 18.88,
-              "plarea": 3378,
-              "prevtp": "0",
-              "lgtd": 110.402328,
-              "lttd": 30.018152,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105205100",
-                  "adnm": "二组（红旗1）",
-                  "pcount": 105,
-                  "htcount": 34,
-                  "ldarea": 3.18,
-                  "plarea": 200,
-                  "prevtp": "2",
-                  "lgtd": 110.403549,
-                  "lttd": 30.021536,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205101",
-                  "adnm": "二组（红旗2）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 3,
-                  "plarea": 190,
-                  "prevtp": "2",
-                  "lgtd": 110.403766,
-                  "lttd": 30.016641,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205102",
-                  "adnm": "三组(幺牌）",
-                  "pcount": 318,
-                  "htcount": 91,
-                  "ldarea": 5.09,
-                  "plarea": 555,
-                  "prevtp": "2",
-                  "lgtd": 110.407947,
-                  "lttd": 30.013943,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205103",
-                  "adnm": "一组（龚家坪）",
-                  "pcount": 89,
-                  "htcount": 23,
-                  "ldarea": 2.78,
-                  "plarea": 140,
-                  "prevtp": "1",
-                  "lgtd": 110.370446,
-                  "lttd": 30.04961,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105206000",
-              "adnm": "红旗坪村",
-              "pcount": 1006,
-              "htcount": 308,
-              "ldarea": 19,
-              "plarea": 1998,
-              "prevtp": "0",
-              "lgtd": 110.396358,
-              "lttd": 30.002951,
-              "wscd": "HBWS000000002",
-              "children": []
-            },
-            {
-              "adcd": "420529105207000",
-              "adnm": "三台坡村",
-              "pcount": 784,
-              "htcount": 240,
-              "ldarea": 33.06,
-              "plarea": 3637,
-              "prevtp": "0",
-              "lgtd": 110.348317,
-              "lttd": 30.078608,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105207100",
-                  "adnm": "三组",
-                  "pcount": 144,
-                  "htcount": 45,
-                  "ldarea": 9.68,
-                  "plarea": 675,
-                  "prevtp": "1",
-                  "lgtd": 110.348484,
-                  "lttd": 30.077671,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105207101",
-                  "adnm": "二组",
-                  "pcount": 381,
-                  "htcount": 118,
-                  "ldarea": 19.28,
-                  "plarea": 1770,
-                  "prevtp": "1",
-                  "lgtd": 110.353433,
-                  "lttd": 30.090529,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105208000",
-              "adnm": "锁山金村",
-              "pcount": 1944,
-              "htcount": 550,
-              "ldarea": 24.27,
-              "prevtp": "0",
-              "lgtd": 110.310285,
-              "lttd": 29.967872,
-              "children": [
-                {
-                  "adcd": "420529105208100",
-                  "adnm": "一组（岗坪）",
-                  "pcount": 196,
-                  "htcount": 56,
-                  "ldarea": 2.47,
-                  "prevtp": "0",
-                  "lgtd": 110.310224,
-                  "lttd": 29.966106
-                },
-                {
-                  "adcd": "420529105208101",
-                  "adnm": "四组（大树垭）",
-                  "pcount": 252,
-                  "htcount": 72,
-                  "ldarea": 2.69,
-                  "prevtp": "0",
-                  "lgtd": 110.335138,
-                  "lttd": 29.976205
-                },
-                {
-                  "adcd": "420529105208102",
-                  "adnm": "二组",
-                  "pcount": 161,
-                  "htcount": 46,
-                  "ldarea": 1.71,
-                  "prevtp": "0",
-                  "lgtd": 110.30384,
-                  "lttd": 29.960653
-                }
-              ]
-            },
-            {
-              "adcd": "420529105209000",
-              "adnm": "茶园村",
-              "pcount": 956,
-              "htcount": 445,
-              "ldarea": 22.25,
-              "prevtp": "0",
-              "lgtd": 110.321912,
-              "lttd": 30.00915,
-              "children": []
-            },
-            {
-              "adcd": "420529105210000",
-              "adnm": "鹿耳庄村",
-              "pcount": 1588,
-              "htcount": 462,
-              "ldarea": 22.5,
-              "plarea": 2025,
-              "prevtp": "0",
-              "lgtd": 110.362793,
-              "lttd": 29.995701,
-              "wscd": "HBWS000000002",
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529201000000",
-          "adnm": "付家堰乡",
-          "pcount": 17205,
-          "htcount": 5427,
-          "ldarea": 92.28,
-          "prevtp": "0",
-          "lgtd": 110.487421,
-          "lttd": 30.349922,
-          "children": [
-            {
-              "adcd": "420529201001000",
-              "adnm": "付家堰社区",
-              "pcount": 386,
-              "htcount": 168,
-              "ldarea": 5.68,
-              "prevtp": "2",
-              "lgtd": 110.478735,
-              "lttd": 30.3065179,
-              "children": []
-            },
-            {
-              "adcd": "420529201201000",
-              "adnm": "付家堰村",
-              "pcount": 2492,
-              "htcount": 775,
-              "ldarea": 5.84,
-              "prevtp": "0",
-              "lgtd": 110.480256,
-              "lttd": 30.307638,
-              "children": [
-                {
-                  "adcd": "420529201201101",
-                  "adnm": "一组（饶家湾）",
-                  "pcount": 410,
-                  "htcount": 122,
-                  "ldarea": 2.95,
-                  "prevtp": "2",
-                  "lgtd": 110.473528,
-                  "lttd": 30.3011483
-                },
-                {
-                  "adcd": "420529201201102",
-                  "adnm": "六组（排山）",
-                  "pcount": 392,
-                  "htcount": 131,
-                  "ldarea": 2.81,
-                  "prevtp": "1",
-                  "lgtd": 110.456762,
-                  "lttd": 30.2860972
-                },
-                {
-                  "adcd": "420529201201103",
-                  "adnm": "一组（段沟）",
-                  "pcount": 450,
-                  "htcount": 420,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.479115,
-                  "lttd": 30.304886
-                }
-              ]
-            },
-            {
-              "adcd": "420529201202000",
-              "adnm": "火山村",
-              "pcount": 1996,
-              "htcount": 605,
-              "ldarea": 11.46,
-              "prevtp": "0",
-              "lgtd": 110.469095,
-              "lttd": 30.319452,
-              "children": [
-                {
-                  "adcd": "420529201202100",
-                  "adnm": "二组",
-                  "pcount": 402,
-                  "htcount": 122,
-                  "ldarea": 4.33,
-                  "prevtp": "1",
-                  "lgtd": 110.469635,
-                  "lttd": 30.3418893
-                },
-                {
-                  "adcd": "420529201202101",
-                  "adnm": "三组",
-                  "pcount": 382,
-                  "htcount": 113,
-                  "ldarea": 4.2,
-                  "prevtp": "1",
-                  "lgtd": 110.463773,
-                  "lttd": 30.3235754
-                },
-                {
-                  "adcd": "420529201202102",
-                  "adnm": "五组（毛沟湾）",
-                  "pcount": 361,
-                  "htcount": 128,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.461409,
-                  "lttd": 30.307311
-                },
-                {
-                  "adcd": "420529201202103",
-                  "adnm": "五组（桂竹溪）",
-                  "pcount": 360,
-                  "htcount": 120,
-                  "ldarea": 4,
-                  "prevtp": "2",
-                  "lgtd": 110.463332,
-                  "lttd": 30.306439
-                }
-              ]
-            },
-            {
-              "adcd": "420529201203000",
-              "adnm": "马蹄井村",
-              "pcount": 1624,
-              "htcount": 458,
-              "ldarea": 14.07,
-              "prevtp": "0",
-              "lgtd": 110.443532,
-              "lttd": 30.3156,
-              "children": [
-                {
-                  "adcd": "420529201203100",
-                  "adnm": "张家池",
-                  "pcount": 310,
-                  "htcount": 92,
-                  "ldarea": 4.82,
-                  "prevtp": "1",
-                  "lgtd": 110.438819,
-                  "lttd": 30.3408115
-                },
-                {
-                  "adcd": "420529201203101",
-                  "adnm": "一组（岩板上）",
-                  "pcount": 330,
-                  "htcount": 112,
-                  "ldarea": 5.02,
-                  "prevtp": "2",
-                  "lgtd": 110.453829,
-                  "lttd": 30.336959
-                },
-                {
-                  "adcd": "420529201203102",
-                  "adnm": "一组（李家埫）",
-                  "pcount": 200,
-                  "htcount": 82,
-                  "ldarea": 4.35,
-                  "prevtp": "2",
-                  "lgtd": 110.449439,
-                  "lttd": 30.33028
-                },
-                {
-                  "adcd": "420529201203103",
-                  "adnm": "一组（陈家沟）",
-                  "pcount": 210,
-                  "htcount": 78,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.450861,
-                  "lttd": 30.32628
-                }
-              ]
-            },
-            {
-              "adcd": "420529201204000",
-              "adnm": "田家山村",
-              "pcount": 1326,
-              "htcount": 458,
-              "ldarea": 9.19,
-              "prevtp": "0",
-              "lgtd": 110.4688,
-              "lttd": 30.391132,
-              "children": [
-                {
-                  "adcd": "420529201204100",
-                  "adnm": "一组",
-                  "pcount": 420,
-                  "htcount": 130,
-                  "ldarea": 4.29,
-                  "prevtp": "1",
-                  "lgtd": 110.436456,
-                  "lttd": 30.350601
-                }
-              ]
-            },
-            {
-              "adcd": "420529201205000",
-              "adnm": "左泉洞村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 110.491354,
-              "lttd": 30.38796,
-              "children": [
-                {
-                  "adcd": "420529201205100",
-                  "adnm": "二组（莲蓬溪）",
-                  "pcount": 350,
-                  "htcount": 128,
-                  "ldarea": 3.76,
-                  "prevtp": "2",
-                  "lgtd": 110.485923,
-                  "lttd": 30.404639
-                },
-                {
-                  "adcd": "420529201205101",
-                  "adnm": "五组（炉子坡）",
-                  "pcount": 282,
-                  "htcount": 110,
-                  "ldarea": 3.56,
-                  "prevtp": "1",
-                  "lgtd": 110.503146,
-                  "lttd": 30.3823
-                }
-              ]
-            },
-            {
-              "adcd": "420529201206000",
-              "adnm": "大龙坪村",
-              "pcount": 1784,
-              "htcount": 545,
-              "ldarea": 7.41,
-              "prevtp": "0",
-              "lgtd": 110.471902,
-              "lttd": 30.36017,
-              "children": [
-                {
-                  "adcd": "420529201206100",
-                  "adnm": "三组（刘家湾)",
-                  "pcount": 412,
-                  "htcount": 154,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.468727,
-                  "lttd": 30.357258
-                },
-                {
-                  "adcd": "420529201206101",
-                  "adnm": "二组（大龙坪）",
-                  "pcount": 421,
-                  "htcount": 160,
-                  "ldarea": 3.83,
-                  "prevtp": "2",
-                  "lgtd": 110.470463,
-                  "lttd": 30.363806
-                },
-                {
-                  "adcd": "420529201206102",
-                  "adnm": "三组（冲门沟）",
-                  "pcount": 364,
-                  "htcount": 155,
-                  "ldarea": 3.65,
-                  "prevtp": "2",
-                  "lgtd": 110.469068,
-                  "lttd": 30.365667
-                }
-              ]
-            },
-            {
-              "adcd": "420529201207000",
-              "adnm": "白庙村",
-              "pcount": 1685,
-              "htcount": 532,
-              "ldarea": 11.54,
-              "prevtp": "0",
-              "lgtd": 110.50056,
-              "lttd": 30.31767,
-              "children": [
-                {
-                  "adcd": "420529201207100",
-                  "adnm": "五组（八坪）",
-                  "pcount": 282,
-                  "htcount": 89,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.505149,
-                  "lttd": 30.306069
-                },
-                {
-                  "adcd": "420529201207101",
-                  "adnm": "六组（八坪）",
-                  "pcount": 281,
-                  "htcount": 105,
-                  "ldarea": 1.78,
-                  "prevtp": "0",
-                  "lgtd": 110.507719,
-                  "lttd": 30.30555
-                },
-                {
-                  "adcd": "420529201207102",
-                  "adnm": "一组（白庙聚宝石）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 3.1,
-                  "prevtp": "2",
-                  "lgtd": 110.517796,
-                  "lttd": 30.34481
-                },
-                {
-                  "adcd": "420529201207103",
-                  "adnm": "四组（果坪埫2）",
-                  "pcount": 168,
-                  "htcount": 48,
-                  "ldarea": 3.04,
-                  "prevtp": "2",
-                  "lgtd": 110.495698,
-                  "lttd": 30.315614
-                },
-                {
-                  "adcd": "420529201207105",
-                  "adnm": "三组（白庙）",
-                  "pcount": 150,
-                  "htcount": 48,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.503506,
-                  "lttd": 30.319506
-                },
-                {
-                  "adcd": "420529201207106",
-                  "adnm": "一组（白庙黑潭河）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 3.05,
-                  "prevtp": "2",
-                  "lgtd": 110.500862,
-                  "lttd": 30.32349
-                },
-                {
-                  "adcd": "420529201207107",
-                  "adnm": "四组（果坪埫1）",
-                  "pcount": 100,
-                  "htcount": 40,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.496291,
-                  "lttd": 30.295625
-                }
-              ]
-            },
-            {
-              "adcd": "420529201208000",
-              "adnm": "鸭儿坪村",
-              "pcount": 2458,
-              "htcount": 810,
-              "ldarea": 14.48,
-              "prevtp": "0",
-              "lgtd": 110.523218,
-              "lttd": 30.37112,
-              "children": [
-                {
-                  "adcd": "420529201208100",
-                  "adnm": "一组（廖家湾）",
-                  "pcount": 512,
-                  "htcount": 162,
-                  "ldarea": 5.06,
-                  "prevtp": "2",
-                  "lgtd": 110.522115,
-                  "lttd": 30.369879
-                },
-                {
-                  "adcd": "420529201208101",
-                  "adnm": "三组",
-                  "pcount": 525,
-                  "htcount": 170,
-                  "ldarea": 5.24,
-                  "prevtp": "1",
-                  "lgtd": 110.535948,
-                  "lttd": 30.387679
-                }
-              ]
-            },
-            {
-              "adcd": "420529201209000",
-              "adnm": "桥料村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 110.543481,
-              "lttd": 30.369273,
-              "children": [
-                {
-                  "adcd": "420529201209100",
-                  "adnm": "四组（蒿坪）",
-                  "pcount": 353,
-                  "htcount": 121,
-                  "ldarea": 3.62,
-                  "prevtp": "2",
-                  "lgtd": 110.548285,
-                  "lttd": 30.358664
-                },
-                {
-                  "adcd": "420529201209101",
-                  "adnm": "六组（柞房湾）",
-                  "pcount": 386,
-                  "htcount": 116,
-                  "ldarea": 3.61,
-                  "prevtp": "2",
-                  "lgtd": 110.533869,
-                  "lttd": 30.358174
-                },
-                {
-                  "adcd": "420529201209102",
-                  "adnm": "五组（赛宝）",
-                  "pcount": 319,
-                  "htcount": 110,
-                  "ldarea": 3.52,
-                  "prevtp": "1",
-                  "lgtd": 110.546802,
-                  "lttd": 30.3667211
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529202000000",
-          "adnm": "牛庄乡",
-          "pcount": 7383,
-          "htcount": 2182,
-          "ldarea": 154,
-          "prevtp": "0",
-          "lgtd": 110.353576,
-          "lttd": 30.226665,
-          "children": [
-            {
-              "adcd": "420529202201000",
-              "adnm": "牛庄村",
-              "pcount": 1425,
-              "htcount": 401,
-              "ldarea": 27.81,
-              "prevtp": "0",
-              "lgtd": 110.351812,
-              "lttd": 30.223849,
-              "children": [
-                {
-                  "adcd": "420529202201100",
-                  "adnm": "一组",
-                  "pcount": 132,
-                  "htcount": 43,
-                  "ldarea": 3.73,
-                  "prevtp": "0",
-                  "lgtd": 110.359446,
-                  "lttd": 30.234513
-                },
-                {
-                  "adcd": "420529202201101",
-                  "adnm": "七组",
-                  "pcount": 88,
-                  "htcount": 31,
-                  "ldarea": 1.96,
-                  "prevtp": "0",
-                  "lgtd": 110.342555,
-                  "lttd": 30.228869
-                },
-                {
-                  "adcd": "420529202201102",
-                  "adnm": "二组",
-                  "pcount": 105,
-                  "htcount": 36,
-                  "ldarea": 2.01,
-                  "prevtp": "0",
-                  "lgtd": 110.291595,
-                  "lttd": 30.214394
-                },
-                {
-                  "adcd": "420529202201103",
-                  "adnm": "三组",
-                  "pcount": 182,
-                  "htcount": 52,
-                  "ldarea": 3.92,
-                  "prevtp": "0",
-                  "lgtd": 110.350574,
-                  "lttd": 30.22323
-                }
-              ]
-            },
-            {
-              "adcd": "420529202202000",
-              "adnm": "池南村",
-              "pcount": 734,
-              "htcount": 223,
-              "ldarea": 16.79,
-              "prevtp": "0",
-              "lgtd": 110.337422,
-              "lttd": 30.206523,
-              "children": [
-                {
-                  "adcd": "420529202202100",
-                  "adnm": "六组",
-                  "pcount": 51,
-                  "htcount": 15,
-                  "ldarea": 3.21,
-                  "prevtp": "1",
-                  "lgtd": 110.32757,
-                  "lttd": 30.222412
-                },
-                {
-                  "adcd": "420529202202101",
-                  "adnm": "二组（池南）",
-                  "pcount": 153,
-                  "htcount": 48,
-                  "ldarea": 3.7,
-                  "prevtp": "2",
-                  "lgtd": 110.337412,
-                  "lttd": 30.206112
-                },
-                {
-                  "adcd": "420529202202102",
-                  "adnm": "四组",
-                  "pcount": 106,
-                  "htcount": 29,
-                  "ldarea": 3.37,
-                  "prevtp": "1",
-                  "lgtd": 110.330964,
-                  "lttd": 30.2055751
-                }
-              ]
-            },
-            {
-              "adcd": "420529202203000",
-              "adnm": "凌云村",
-              "pcount": 704,
-              "htcount": 201,
-              "ldarea": 14.63,
-              "prevtp": "0",
-              "lgtd": 110.335722,
-              "lttd": 30.187676,
-              "children": [
-                {
-                  "adcd": "420529202203100",
-                  "adnm": "六组（弭坪）",
-                  "pcount": 85,
-                  "htcount": 15,
-                  "ldarea": 4.33,
-                  "prevtp": "2",
-                  "lgtd": 110.287151,
-                  "lttd": 30.190698
-                },
-                {
-                  "adcd": "420529202203101",
-                  "adnm": "八组（大埫）",
-                  "pcount": 65,
-                  "htcount": 19,
-                  "ldarea": 3.45,
-                  "prevtp": "1",
-                  "lgtd": 110.278841,
-                  "lttd": 30.185058
-                },
-                {
-                  "adcd": "420529202203102",
-                  "adnm": "五组（下土鱼河）",
-                  "pcount": 112,
-                  "htcount": 22,
-                  "ldarea": 5.39,
-                  "prevtp": "2",
-                  "lgtd": 110.302724,
-                  "lttd": 30.184629
-                },
-                {
-                  "adcd": "420529202203103",
-                  "adnm": "大花坪林场",
-                  "pcount": 185,
-                  "htcount": 57,
-                  "ldarea": 8.54,
-                  "prevtp": "2",
-                  "lgtd": 110.318371,
-                  "lttd": 30.154748
-                },
-                {
-                  "adcd": "420529202203104",
-                  "adnm": "五组（上土鱼河）",
-                  "pcount": 98,
-                  "htcount": 45,
-                  "ldarea": 5.32,
-                  "prevtp": "2",
-                  "lgtd": 110.312979,
-                  "lttd": 30.183736
-                }
-              ]
-            },
-            {
-              "adcd": "420529202204000",
-              "adnm": "沙河村",
-              "pcount": 403,
-              "htcount": 111,
-              "ldarea": 11.57,
-              "prevtp": "0",
-              "lgtd": 110.36442,
-              "lttd": 30.238031,
-              "children": [
-                {
-                  "adcd": "420529202204100",
-                  "adnm": "一组（沙河)",
-                  "pcount": 86,
-                  "htcount": 23,
-                  "ldarea": 3.93,
-                  "prevtp": "2",
-                  "lgtd": 110.364422,
-                  "lttd": 30.237765
-                }
-              ]
-            },
-            {
-              "adcd": "420529202205000",
-              "adnm": "松木坪村",
-              "pcount": 644,
-              "htcount": 169,
-              "ldarea": 14.99,
-              "prevtp": "0",
-              "lgtd": 110.306926,
-              "lttd": 30.229545,
-              "children": []
-            },
-            {
-              "adcd": "420529202206000",
-              "adnm": "金山村",
-              "pcount": 1321,
-              "htcount": 383,
-              "ldarea": 21.99,
-              "prevtp": "0",
-              "lgtd": 110.288519,
-              "lttd": 30.229658,
-              "children": [
-                {
-                  "adcd": "420529202206100",
-                  "adnm": "二组（罗家湾）",
-                  "pcount": 69,
-                  "htcount": 12,
-                  "ldarea": 3.01,
-                  "prevtp": "2",
-                  "lgtd": 110.293487,
-                  "lttd": 30.2124449
-                },
-                {
-                  "adcd": "420529202206101",
-                  "adnm": "三组（任家河）",
-                  "pcount": 113,
-                  "htcount": 28,
-                  "ldarea": 5.38,
-                  "prevtp": "1",
-                  "lgtd": 110.281083,
-                  "lttd": 30.223695
-                },
-                {
-                  "adcd": "420529202206102",
-                  "adnm": "一组（李家屋场）",
-                  "pcount": 84,
-                  "htcount": 19,
-                  "ldarea": 2.34,
-                  "prevtp": "0",
-                  "lgtd": 110.311067,
-                  "lttd": 30.219306
-                },
-                {
-                  "adcd": "420529202206103",
-                  "adnm": "五组（金山坪）",
-                  "pcount": 284,
-                  "htcount": 52,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.283955,
-                  "lttd": 30.233378
-                },
-                {
-                  "adcd": "420529202206104",
-                  "adnm": "九组（鹰嘴山）",
-                  "pcount": 220,
-                  "htcount": 47,
-                  "ldarea": 6.88,
-                  "prevtp": "1",
-                  "lgtd": 110.277328,
-                  "lttd": 30.235023
-                }
-              ]
-            },
-            {
-              "adcd": "420529202207000",
-              "adnm": "九里坪村",
-              "pcount": 734,
-              "htcount": 213,
-              "ldarea": 16.16,
-              "prevtp": "0",
-              "lgtd": 110.381023,
-              "lttd": 30.278049,
-              "children": [
-                {
-                  "adcd": "420529202207100",
-                  "adnm": "六组（黄家坳）",
-                  "pcount": 75,
-                  "htcount": 16,
-                  "ldarea": 3.95,
-                  "prevtp": "1",
-                  "lgtd": 110.377058,
-                  "lttd": 30.290256
-                },
-                {
-                  "adcd": "420529202207101",
-                  "adnm": "三组（阳坡坪）",
-                  "pcount": 123,
-                  "htcount": 29,
-                  "ldarea": 5.51,
-                  "prevtp": "2",
-                  "lgtd": 110.3784,
-                  "lttd": 30.2772
-                }
-              ]
-            },
-            {
-              "adcd": "420529202208000",
-              "adnm": "横茅湖村",
-              "pcount": 1238,
-              "htcount": 411,
-              "ldarea": 23.89,
-              "prevtp": "0",
-              "lgtd": 110.39574,
-              "lttd": 30.304549,
-              "children": [
-                {
-                  "adcd": "420529202208100",
-                  "adnm": "四组（倒洞坳）",
-                  "pcount": 82,
-                  "htcount": 16,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.369113,
-                  "lttd": 30.294094
-                },
-                {
-                  "adcd": "420529202208101",
-                  "adnm": "五组（红岩沟）",
-                  "pcount": 74,
-                  "htcount": 21,
-                  "ldarea": 3.26,
-                  "prevtp": "2",
-                  "lgtd": 110.376422,
-                  "lttd": 30.305973
-                }
-              ]
-            },
-            {
-              "adcd": "420529202209000",
-              "adnm": "沙湾村",
-              "pcount": 180,
-              "htcount": 70,
-              "ldarea": 4.98,
-              "prevtp": "0",
-              "lgtd": 110.405011,
-              "lttd": 30.334473,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529203000000",
-          "adnm": "采花乡",
-          "pcount": 27228,
-          "htcount": 8128,
-          "ldarea": 285.47,
-          "prevtp": "0",
-          "lgtd": 110.450562,
-          "lttd": 30.214214,
-          "children": [
-            {
-              "adcd": "420529203001000",
-              "adnm": "采花社区",
-              "pcount": 1323,
-              "htcount": 358,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.449803,
-              "lttd": 30.213941,
-              "children": [
-                {
-                  "adcd": "420529203001106",
-                  "adnm": "中街",
-                  "pcount": 406,
-                  "htcount": 116,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450705,
-                  "lttd": 30.214687
-                },
-                {
-                  "adcd": "420529203001107",
-                  "adnm": "下街",
-                  "pcount": 315,
-                  "htcount": 89,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450165,
-                  "lttd": 30.216293
-                },
-                {
-                  "adcd": "420529203001108",
-                  "adnm": "上街",
-                  "pcount": 602,
-                  "htcount": 153,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.445732,
-                  "lttd": 30.205698
-                }
-              ]
-            },
-            {
-              "adcd": "420529203201000",
-              "adnm": "长茂司村",
-              "pcount": 750,
-              "htcount": 231,
-              "ldarea": 13.7,
-              "prevtp": "0",
-              "lgtd": 110.452802,
-              "lttd": 30.217673,
-              "children": [
-                {
-                  "adcd": "420529203201100",
-                  "adnm": "三组（胡家台）",
-                  "pcount": 350,
-                  "htcount": 101,
-                  "ldarea": 6.53,
-                  "prevtp": "2",
-                  "lgtd": 110.452846,
-                  "lttd": 30.225834
-                },
-                {
-                  "adcd": "420529203201101",
-                  "adnm": "二组（茶丘）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 6.61,
-                  "prevtp": "2",
-                  "lgtd": 110.45266,
-                  "lttd": 30.218348
-                },
-                {
-                  "adcd": "420529203201102",
-                  "adnm": "一组（长茂司）",
-                  "pcount": 300,
-                  "htcount": 100,
-                  "ldarea": 6.57,
-                  "prevtp": "1",
-                  "lgtd": 110.451124,
-                  "lttd": 30.208181
-                }
-              ]
-            },
-            {
-              "adcd": "420529203202000",
-              "adnm": "黄家台村",
-              "pcount": 595,
-              "htcount": 190,
-              "ldarea": 17.75,
-              "prevtp": "0",
-              "lgtd": 110.456985,
-              "lttd": 30.238609,
-              "children": [
-                {
-                  "adcd": "420529203202100",
-                  "adnm": "四组（彭家屋场）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.458927,
-                  "lttd": 30.237277
-                },
-                {
-                  "adcd": "420529203202101",
-                  "adnm": "二组（黄家台）",
-                  "pcount": 119,
-                  "htcount": 43,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.462367,
-                  "lttd": 30.241478
-                },
-                {
-                  "adcd": "420529203202102",
-                  "adnm": "七组（白水）",
-                  "pcount": 196,
-                  "htcount": 65,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.431701,
-                  "lttd": 30.255427
-                },
-                {
-                  "adcd": "420529203202103",
-                  "adnm": "一组（小河湾）",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.456722,
-                  "lttd": 30.248939
-                }
-              ]
-            },
-            {
-              "adcd": "420529203203000",
-              "adnm": "白鹤村",
-              "pcount": 470,
-              "htcount": 183,
-              "ldarea": 7.57,
-              "prevtp": "0",
-              "lgtd": 110.439468,
-              "lttd": 30.196909,
-              "children": [
-                {
-                  "adcd": "420529203203101",
-                  "adnm": "三组（沙坝子）",
-                  "pcount": 160,
-                  "htcount": 55,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.439307,
-                  "lttd": 30.1976174
-                },
-                {
-                  "adcd": "420529203203102",
-                  "adnm": "二组（撒花溪）",
-                  "pcount": 210,
-                  "htcount": 83,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.441227,
-                  "lttd": 30.2078615
-                },
-                {
-                  "adcd": "420529203203103",
-                  "adnm": "一组(沙坝子）",
-                  "pcount": 100,
-                  "htcount": 45,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.444088,
-                  "lttd": 30.2049066
-                },
-                {
-                  "adcd": "420529203203104",
-                  "adnm": "三组（周家岭）",
-                  "pcount": 200,
-                  "htcount": 73,
-                  "ldarea": 3.9,
-                  "prevtp": "2",
-                  "lgtd": 110.441688,
-                  "lttd": 30.20215
-                }
-              ]
-            },
-            {
-              "adcd": "420529203204000",
-              "adnm": "大村",
-              "pcount": 803,
-              "htcount": 235,
-              "ldarea": 19.77,
-              "prevtp": "0",
-              "lgtd": 110.43015,
-              "lttd": 30.220485,
-              "children": [
-                {
-                  "adcd": "420529203204100",
-                  "adnm": "一组（大村）",
-                  "pcount": 238,
-                  "htcount": 70,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.427983,
-                  "lttd": 30.218539
-                },
-                {
-                  "adcd": "420529203204101",
-                  "adnm": "七组（廖叶池）",
-                  "pcount": 355,
-                  "htcount": 100,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.411043,
-                  "lttd": 30.2063821
-                },
-                {
-                  "adcd": "420529203204102",
-                  "adnm": "八组",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 8.59,
-                  "prevtp": "1",
-                  "lgtd": 110.404746,
-                  "lttd": 30.2028926
-                }
-              ]
-            },
-            {
-              "adcd": "420529203205000",
-              "adnm": "万里村",
-              "pcount": 363,
-              "htcount": 125,
-              "ldarea": 25,
-              "prevtp": "0",
-              "lgtd": 110.394666,
-              "lttd": 30.195858,
-              "children": [
-                {
-                  "adcd": "420529203205100",
-                  "adnm": "三组（二龙坪）",
-                  "pcount": 100,
-                  "htcount": 31,
-                  "ldarea": 10.34,
-                  "prevtp": "2",
-                  "lgtd": 110.390243,
-                  "lttd": 30.196587
-                },
-                {
-                  "adcd": "420529203205101",
-                  "adnm": "七组（地龙坪）",
-                  "pcount": 93,
-                  "htcount": 37,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.398801,
-                  "lttd": 30.1891199
-                },
-                {
-                  "adcd": "420529203205102",
-                  "adnm": "一组",
-                  "pcount": 170,
-                  "htcount": 57,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.406986,
-                  "lttd": 30.1996586
-                }
-              ]
-            },
-            {
-              "adcd": "420529203206000",
-              "adnm": "前坪村",
-              "pcount": 1272,
-              "htcount": 373,
-              "ldarea": 20.24,
-              "prevtp": "0",
-              "lgtd": 110.43581,
-              "lttd": 30.165766,
-              "children": [
-                {
-                  "adcd": "420529203206100",
-                  "adnm": "一组（苦竹园）",
-                  "pcount": 320,
-                  "htcount": 85,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423108,
-                  "lttd": 30.153465
-                },
-                {
-                  "adcd": "420529203206101",
-                  "adnm": "七组（严家河）",
-                  "pcount": 140,
-                  "htcount": 36,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423214,
-                  "lttd": 30.1728369
-                },
-                {
-                  "adcd": "420529203206102",
-                  "adnm": "二组（莫家溪）",
-                  "pcount": 322,
-                  "htcount": 89,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.419841,
-                  "lttd": 30.1590782
-                },
-                {
-                  "adcd": "420529203206103",
-                  "adnm": "六组（前坪）",
-                  "pcount": 190,
-                  "htcount": 65,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423714,
-                  "lttd": 30.167981
-                },
-                {
-                  "adcd": "420529203206104",
-                  "adnm": "三组",
-                  "pcount": 200,
-                  "htcount": 71,
-                  "ldarea": 7,
-                  "prevtp": "0",
-                  "lgtd": 110.423373,
-                  "lttd": 30.166645
-                },
-                {
-                  "adcd": "420529203206105",
-                  "adnm": "七组（关门岩）",
-                  "pcount": 100,
-                  "htcount": 35,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.424368,
-                  "lttd": 30.175888
-                }
-              ]
-            },
-            {
-              "adcd": "420529203207000",
-              "adnm": "采花台村",
-              "pcount": 835,
-              "htcount": 247,
-              "ldarea": 27.8,
-              "prevtp": "0",
-              "lgtd": 110.404831,
-              "lttd": 30.134315,
-              "children": [
-                {
-                  "adcd": "420529203207100",
-                  "adnm": "八组（堰坪）",
-                  "pcount": 115,
-                  "htcount": 32,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.387513,
-                  "lttd": 30.148693
-                },
-                {
-                  "adcd": "420529203207101",
-                  "adnm": "二组（覃家台）",
-                  "pcount": 200,
-                  "htcount": 55,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.408039,
-                  "lttd": 30.140805
-                },
-                {
-                  "adcd": "420529203207102",
-                  "adnm": "七组（堰坪）",
-                  "pcount": 90,
-                  "htcount": 35,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.391524,
-                  "lttd": 30.147526
-                },
-                {
-                  "adcd": "420529203207103",
-                  "adnm": "三组（覃家台）",
-                  "pcount": 220,
-                  "htcount": 65,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.397219,
-                  "lttd": 30.127049
-                },
-                {
-                  "adcd": "420529203207104",
-                  "adnm": "一组（采花台）",
-                  "pcount": 210,
-                  "htcount": 60,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.40784,
-                  "lttd": 30.133373
-                }
-              ]
-            },
-            {
-              "adcd": "420529203208000",
-              "adnm": "楠木桥村",
-              "pcount": 518,
-              "htcount": 148,
-              "ldarea": 35.4,
-              "prevtp": "0",
-              "lgtd": 110.464885,
-              "lttd": 30.173719,
-              "children": [
-                {
-                  "adcd": "420529203208100",
-                  "adnm": "一组（楠木桥）",
-                  "pcount": 305,
-                  "htcount": 88,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.464482,
-                  "lttd": 30.173049
-                },
-                {
-                  "adcd": "420529203208101",
-                  "adnm": "二组（后荒）",
-                  "pcount": 55,
-                  "htcount": 15,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.453234,
-                  "lttd": 30.164536
-                },
-                {
-                  "adcd": "420529203208102",
-                  "adnm": "三组",
-                  "pcount": 158,
-                  "htcount": 45,
-                  "ldarea": 13.8,
-                  "prevtp": "1",
-                  "lgtd": 110.527918,
-                  "lttd": 30.235771
-                }
-              ]
-            },
-            {
-              "adcd": "420529203209000",
-              "adnm": "星岩坪村",
-              "pcount": 1008,
-              "htcount": 295,
-              "ldarea": 21.9,
-              "prevtp": "0",
-              "lgtd": 110.472704,
-              "lttd": 30.257124,
-              "children": [
-                {
-                  "adcd": "420529203209100",
-                  "adnm": "一组（星岩坪公社湾）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.64,
-                  "prevtp": "2",
-                  "lgtd": 110.472441,
-                  "lttd": 30.255052
-                },
-                {
-                  "adcd": "420529203209101",
-                  "adnm": "七组（三渡水）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.65,
-                  "prevtp": "1",
-                  "lgtd": 110.48657,
-                  "lttd": 30.281577
-                },
-                {
-                  "adcd": "420529203209102",
-                  "adnm": "三组（张家湾）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.477373,
-                  "lttd": 30.269899
-                },
-                {
-                  "adcd": "420529203209103",
-                  "adnm": "白果坪",
-                  "pcount": 248,
-                  "htcount": 66,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.483562,
-                  "lttd": 30.291257
-                },
-                {
-                  "adcd": "420529203209104",
-                  "adnm": "五组",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.468164,
-                  "lttd": 30.2445375
-                },
-                {
-                  "adcd": "420529203209105",
-                  "adnm": "一组（褚家台）",
-                  "pcount": 190,
-                  "htcount": 55,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.472318,
-                  "lttd": 30.261083
-                }
-              ]
-            },
-            {
-              "adcd": "420529203210000",
-              "adnm": "苦竹坪村",
-              "pcount": 317,
-              "htcount": 92,
-              "ldarea": 5.1,
-              "prevtp": "0",
-              "lgtd": 110.511256,
-              "lttd": 30.267272,
-              "children": [
-                {
-                  "adcd": "420529203210100",
-                  "adnm": "八组（大沙坡）",
-                  "pcount": 222,
-                  "htcount": 65,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.514562,
-                  "lttd": 30.263478
-                },
-                {
-                  "adcd": "420529203210101",
-                  "adnm": "二组（陈家大坪）",
-                  "pcount": 50,
-                  "htcount": 15,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.515786,
-                  "lttd": 30.255662
-                },
-                {
-                  "adcd": "420529203210105",
-                  "adnm": "一组（渔泉河）",
-                  "pcount": 45,
-                  "htcount": 12,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.524606,
-                  "lttd": 30.241511
-                },
-                {
-                  "adcd": "420529203210106",
-                  "adnm": "八组（大沙坝）",
-                  "pcount": 210,
-                  "htcount": 55,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.510302,
-                  "lttd": 30.269807
-                }
-              ]
-            },
-            {
-              "adcd": "420529203211000",
-              "adnm": "珍珠头村",
-              "pcount": 248,
-              "htcount": 77,
-              "ldarea": 9.71,
-              "prevtp": "0",
-              "lgtd": 110.497443,
-              "lttd": 30.272249,
-              "children": [
-                {
-                  "adcd": "420529203211100",
-                  "adnm": "一组（二叉口）",
-                  "pcount": 98,
-                  "htcount": 32,
-                  "ldarea": 6.85,
-                  "prevtp": "2",
-                  "lgtd": 110.492167,
-                  "lttd": 30.294125
-                },
-                {
-                  "adcd": "420529203211102",
-                  "adnm": "五组（马家坡）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 6.86,
-                  "prevtp": "2",
-                  "lgtd": 110.516365,
-                  "lttd": 30.247835
-                }
-              ]
-            },
-            {
-              "adcd": "420529203212000",
-              "adnm": "红渔坪村",
-              "pcount": 1350,
-              "htcount": 428,
-              "ldarea": 18.1,
-              "prevtp": "0",
-              "lgtd": 110.496412,
-              "lttd": 30.222253,
-              "children": [
-                {
-                  "adcd": "420529203212100",
-                  "adnm": "二组（红渔坪）",
-                  "pcount": 340,
-                  "htcount": 108,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.494381,
-                  "lttd": 30.2221248
-                },
-                {
-                  "adcd": "420529203212101",
-                  "adnm": "四组（阳坡）",
-                  "pcount": 480,
-                  "htcount": 146,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.496759,
-                  "lttd": 30.228309
-                },
-                {
-                  "adcd": "420529203212102",
-                  "adnm": "三组",
-                  "pcount": 330,
-                  "htcount": 106,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.501227,
-                  "lttd": 30.22803
-                },
-                {
-                  "adcd": "420529203212103",
-                  "adnm": "五组（楠木）",
-                  "pcount": 200,
-                  "htcount": 68,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.516091,
-                  "lttd": 30.2269493
-                }
-              ]
-            },
-            {
-              "adcd": "420529203213000",
-              "adnm": "白溢坪村",
-              "pcount": 547,
-              "htcount": 169,
-              "ldarea": 19,
-              "prevtp": "0",
-              "lgtd": 110.556215,
-              "lttd": 30.248125,
-              "children": [
-                {
-                  "adcd": "420529203213100",
-                  "adnm": "二组（湖坪）",
-                  "pcount": 237,
-                  "htcount": 70,
-                  "ldarea": 6.75,
-                  "prevtp": "2",
-                  "lgtd": 110.542872,
-                  "lttd": 30.2415706
-                },
-                {
-                  "adcd": "420529203213101",
-                  "adnm": "三组（湖坪）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.545592,
-                  "lttd": 30.2411432
-                },
-                {
-                  "adcd": "420529203213102",
-                  "adnm": "七组（白溢坪）",
-                  "pcount": 108,
-                  "htcount": 32,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.552356,
-                  "lttd": 30.2441797
-                },
-                {
-                  "adcd": "420529203213103",
-                  "adnm": "一组",
-                  "pcount": 70,
-                  "htcount": 25,
-                  "ldarea": 6.75,
-                  "prevtp": "1",
-                  "lgtd": 110.528468,
-                  "lttd": 30.236548
-                }
-              ]
-            },
-            {
-              "adcd": "420529203214000",
-              "adnm": "宋家河村",
-              "pcount": 1023,
-              "htcount": 385,
-              "ldarea": 30.2,
-              "prevtp": "0",
-              "lgtd": 110.557717,
-              "lttd": 30.188565,
-              "children": [
-                {
-                  "adcd": "420529203214100",
-                  "adnm": "二组（宋家河）",
-                  "pcount": 182,
-                  "htcount": 120,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.558747,
-                  "lttd": 30.187884
-                },
-                {
-                  "adcd": "420529203214101",
-                  "adnm": "六组（唐家河）",
-                  "pcount": 139,
-                  "htcount": 45,
-                  "ldarea": 9.55,
-                  "prevtp": "1",
-                  "lgtd": 110.557433,
-                  "lttd": 30.204571
-                },
-                {
-                  "adcd": "420529203214102",
-                  "adnm": "七组（甘沟河）",
-                  "pcount": 486,
-                  "htcount": 150,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.545536,
-                  "lttd": 30.2194051
-                },
-                {
-                  "adcd": "420529203214103",
-                  "adnm": "五组（云山）",
-                  "pcount": 216,
-                  "htcount": 70,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.533849,
-                  "lttd": 30.1901553
-                }
-              ]
-            },
-            {
-              "adcd": "420529203215000",
-              "adnm": "栗子坪村",
-              "pcount": 951,
-              "htcount": 267,
-              "ldarea": 9.7,
-              "prevtp": "0",
-              "lgtd": 110.570566,
-              "lttd": 30.162327,
-              "children": []
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  waterList: [
-    {
-      "wscd": "11",
-      "wsnm": "百溪河"
-    },
-    {
-      "wscd": "61",
-      "wsnm": "沽洞溪"
-    },
-    {
-      "wscd": "71",
-      "wsnm": "二汊口河"
-    },
-    {
-      "wscd": "FA85W508610420000",
-      "wsnm": "泗洋河"
-    },
-    {
-      "wscd": "FA85X808780420000",
-      "wsnm": "天池河"
-    },
-    {
-      "wscd": "FF148801360420000",
-      "wsnm": "南河"
-    },
-    {
-      "wscd": "HBWS000000002",
-      "wsnm": "湾潭河"
-    },
-    {
-      "wscd": "HBWS000000003",
-      "wsnm": "渔阳河"
-    }
-  ],
-  tableData: [
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-  ]
-}
diff --git a/src/views/fxdd/dqxsfx/shyj/index.css b/src/views/fxdd/dqxsfx/shyj/index.css
deleted file mode 100644
index f211f1e..0000000
--- a/src/views/fxdd/dqxsfx/shyj/index.css
+++ /dev/null
@@ -1,107 +0,0 @@
-.fxdd_waterLevelBox {
-  height: 100%;
-}
-.fxdd_waterLevelBox .smallTable {
-  height: calc(100% - 190px);
-}
-.fxdd_waterLevelBox .subTitle {
-  position: relative;
-  padding-left: 8px;
-  margin: 0 0 10px 10px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-}
-.fxdd_waterLevelBox .subTitle:after {
-  content: '';
-  display: block;
-  position: absolute;
-  width: 3px;
-  height: 16px;
-  background: #0068f4;
-  left: -2px;
-  top: 5px;
-  border-radius: 4px;
-}
-.fxdd_waterLevelBox .summary {
-  display: flex;
-  justify-content: space-around;
-  text-align: center;
-}
-.fxdd_waterLevelBox .summary .sum-item {
-  display: flex;
-}
-.fxdd_waterLevelBox .summary .sum-item .l_panel {
-  display: flex;
-  flex-direction: column;
-}
-.fxdd_waterLevelBox .summary .sum-count {
-  font-size: 18px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  margin-left: 10px;
-}
-.fxdd_waterLevelBox .dqxsfx .label {
-  border: 1px solid #ccc !important;
-  line-height: 32px !important;
-}
-.dqxsfxTable {
-  width: 27rem;
-  margin-left: 2px;
-}
-.dqxs_Panel .ant-collapse-content-box {
-  max-height: 350px;
-  overflow-y: scroll;
-}
-.shyjTable,
-.shtj_listBox {
-  margin-left: 16px;
-  width: 25rem;
-}
-.shtj_listBox .ant-collapse-content-box {
-  max-height: 350px;
-  overflow-y: scroll;
-}
-.bgColor1:nth-child(1) .ant-collapse-header:nth-child(1) {
-  background-color: #bd3124 !important;
-  color: #fff;
-}
-.bgColor1:nth-child(2) .ant-collapse-header:nth-child(1) {
-  background-color: #ec8f3d !important;
-  color: #fff;
-}
-.shtj_listBox .bgColor1 .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.shtj_listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-  line-height: 32px;
-}
-.shtj_listBox .txt {
-  font-size: 12px;
-  padding: 0 12px;
-}
-.shtj_listBox .txt:nth-child(1) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.shtj_listBox .txt:nth-child(2) {
-  width: 44%;
-  text-align: center;
-}
-.shtj_listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/src/views/fxdd/dqxsfx/shyj/index.js b/src/views/fxdd/dqxsfx/shyj/index.js
deleted file mode 100644
index 1ae450e..0000000
--- a/src/views/fxdd/dqxsfx/shyj/index.js
+++ /dev/null
@@ -1,361 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-import { Table, Card, Collapse } from 'antd'
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons'
-import { useDispatch, useSelector } from 'react-redux'
-import Feature from 'ol/Feature'
-import Point from 'ol/geom/Point.js'
-import { Vector as VectorSource } from 'ol/source'
-import VectorLayer from 'ol/layer/Vector'
-import Style from 'ol/style/Style'
-import Icon from 'ol/style/Icon'
-import { transform } from 'ol/proj'
-
-import '../../dqxsfx/index.less'
-import { floodWarn } from '../../../../service/fxdd'
-import { shWarn } from '../../../../service/fxdd'
-import data from './mock'
-import moment from 'moment'
-
-const { Panel } = Collapse
-const Page = ({ activeKey }) => {
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  let mapObj = useSelector(s => s.map.map)
-  const dispatch = useDispatch()
-  const [tableData, setTableData] = useState(data.tableData)
-  const [params, setParams] = useState({})
-  const [ljNum, setLjNum] = useState(0)
-  const [zbNum, setZbNum] = useState(0)
-
-  const doSearch = params => {
-    console.log('params', params)
-    setParams(params)
-    getData(params)
-  }
-  const getData = async params => {
-    const list = await floodWarn(params)
-    let arr = []
-    arr = data.tableData.map((item, index, sel) => {
-      sel[0].flowDetails = list.immediatelyList ? list.immediatelyList : []
-      sel[1].flowDetails = list.readyList ? list.readyList : []
-
-      return item
-    })
-    setLjNum(list?.immediatelyList ? list.immediatelyList.length : 0)
-    setZbNum(list?.readyList ? list.readyList.length : 0)
-
-    mapObj &&
-      mapObj
-        .getLayers()
-        .getArray()
-        .forEach(layer => {
-          if (layer.values_.name && layer.values_.name.indexOf('ShWarn') > -1) {
-            layer.getSource().clear()
-          }
-        })
-
-    addLayer(list?.immediatelyList || [], 1)
-    addLayer(list?.readyList || [], 2)
-
-    setTableData(arr)
-  }
-  useEffect(() => {
-    let t = [moment().add(-1, 'day'), moment()]
-    getData({
-      sources: ['SH', 'SW', 'QX', 'SK'],
-      stm: t[0].format('YYYY-MM-DD HH:mm:ss'),
-      etm: t[1].format('YYYY-MM-DD HH:mm:ss')
-    })
-  }, [])
-  useEffect(() => {
-    return () => {
-      dispatch.runtime.closeFeaturePopAll()
-      mapObj &&
-        mapObj
-          .getLayers()
-          .getArray()
-          .forEach(layer => {
-            if (
-              layer.values_.name &&
-              layer.values_.name.indexOf('ShWarn') > -1
-            ) {
-              layer.getSource().clear()
-            }
-          })
-    }
-  }, [])
-  {
-    /* 预警状态id 0:新产生 10:已内部告警 20:已外部告警 30:关闭预警 70:灾情上报 */
-  }
-  const columns = [
-    { title: '乡镇', key: 'adnm', dataIndex: 'adnm', ellipsis: true },
-    {
-      title: '预警时间',
-      key: 'warnstm',
-      dataIndex: 'warnstm',
-
-      width: 130
-    },
-    {
-      title: '预警状态',
-      key: 'warnstatusid',
-      dataIndex: 'warnstatusid',
-      render: (alue, row, index) => (
-        <span>
-          {' '}
-          {row.warnstatusid == 0
-            ? '新产生'
-            : row.warnstatusid == 10
-            ? '已内部告警'
-            : row.warnstatusid == 20
-            ? '已外部告警'
-            : row.warnstatusid == 30
-            ? '关闭预警'
-            : '灾情上报'}
-        </span>
-      )
-    }
-  ]
-
-  const addLayer = (arr, type) => {
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name: 'ShWarn',
-      source: new VectorSource(),
-      style: feature => {
-        return [
-          new Style({
-            image: new Icon({
-              src:
-                feature.get('type') === '危险'
-                  ? `${process.env.PUBLIC_URL}/assets/redwarn.png`
-                  : feature.get('type') === '警戒'
-                  ? `${process.env.PUBLIC_URL}/assets/orangewarn.png`
-                  : feature.get('type') === '关注'
-                  ? `${process.env.PUBLIC_URL}/assets/yellowwarn.png`
-                  : '',
-              anchor: [0.5, 0.5],
-              opacity: 1,
-              scale: 0.9
-            }),
-            zIndex: 20
-          })
-        ]
-      },
-      zIndex: 200
-    })
-
-    const features = arr.map(item => {
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857')
-      const feature = new Feature({
-        geometry: new Point(point2),
-        type: type === 1 ? '危险' : '警戒',
-        data: item
-      })
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature))
-    mapObj.addLayer(layer)
-
-    mapObj.on('click', function (evt) {
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function (feature) {
-        return feature
-      })
-      if (feature) {
-        let adcd = feature.get('adcd')
-        let lgtd = feature.get('lgtd')
-        let lttd = feature.get('lttd')
-        const data = feature.values_.data
-        data.myType = feature.values_.type === '危险' ? '立即转移' : '准备转移'
-        if (data.adcd) {
-          dispatch.runtime.setFeaturePop({
-            id: data.adcd + data.lgtd + data.lttd,
-            data: data,
-            type: 'shanhongyujing',
-            lgtd: data.lgtd,
-            lttd: data.lttd
-          })
-        }
-      }
-    })
-  }
-
-  const flyTo = record => {
-    const { lgtd, lttd, elev } = record
-    if (lgtd && lttd) {
-      dispatch.runtime.setFeaturePop({
-        // id: data.adcd + data.lgtd + data.lttd,
-        data: record,
-        type: 'shanhongyujing',
-        lgtd: lgtd,
-        lttd: lttd
-      })
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60
-      })
-    }
-  }
-
-  return (
-    <div className='monitor-rainfall fxdd_waterLevelBox'>
-      <div style={{ margin: '0 0 0 6px' }} className='topQuery'>
-        <Toolbar doSearch={doSearch} />
-      </div>
-      <div
-        className='smallTable'
-        style={{ minHeight: '140px', width: '25rem' }}
-      >
-        {/* <Shtj /> */}
-        <div className='shyjTable'>
-          <Table
-            rowKey='adcd'
-            bordered
-            columns={columns}
-            pagination={false}
-            dataSource={[]}
-            scroll={{ y: 0 }}
-            defaultExpandAllRows={true}
-            expandable={{
-              indentSize: 10
-            }}
-          />
-        </div>
-        <div className='shtj_listBox'>
-          {/*{*/}
-          {/*  loading ?*/}
-          {/*    <div style={{*/}
-          {/*      position: "absolute",*/}
-          {/*      top: "270px",*/}
-          {/*      left: "110px",*/}
-          {/*      background: "#fff",*/}
-          {/*      padding: "20px 30px",*/}
-          {/*      borderRadius: "10px",*/}
-          {/*      zIndex: 10*/}
-          {/*    }}>*/}
-          {/*      <Spin tip="正在加载..." size="large" spinning={loading}/>*/}
-          {/*    </div> : null*/}
-          {/*}*/}
-          {tableData.length > 0 ? (
-            tableData.map((item, index) => (
-              <>
-                <div key={item.type} className='bgColor1'>
-                  {/*// @ts-ignore*/}
-                  <Collapse
-                    size='small'
-                    // defaultActiveKey={index}
-                    expandIcon={({ isActive }) =>
-                      isActive ? (
-                        // <PlusOutlined rotate={isActive ? 90 : 0} />
-                        <MinusOutlined rotate={isActive ? 0 : 0} />
-                      ) : (
-                        // <MinusOutlined rotate={isActive ? 90 : 0} />
-                        <PlusOutlined rotate={isActive ? 90 : 0} />
-                      )
-                    }
-                  >
-                    <Panel
-                      header={item.typeName}
-                      extra={item.flowDetails.length + item.describe}
-                      key={index}
-                    >
-                      {/* 预警状态id 0:新产生 10:已内部告警 20:已外部告警 30:关闭预警 70:灾情上报 */}
-                      {/* {item.flowDetails.length > 0 &&
-                        item.flowDetails.map(item1 => (
-                          <div onClick={() => flyTo(item1)}>
-                            <div className='clearFloat txtBox'>
-                              <div className='lf txt'>{item1.adnm}</div>
-                              <div className='lf txt'>{item1.warnstm}</div>
-
-                              <div className='lf txt'>
-                                {item1.warnstatusid === 0
-                                  ? '新产生'
-                                  : item1.warnstatusid === 10
-                                  ? '已内部告警'
-                                  : item1.warnstatusid === 20
-                                  ? '已外部告警'
-                                  : item1.warnstatusid === 70
-                                  ? '灾情上报'
-                                  : '关闭预警'}
-                              </div>
-                            </div>
-                          </div>
-                        ))} */}
-
-                      {item.flowDetails.length > 0 ? (
-                        <Table
-                          columns={columns}
-                          showHeader={false}
-                          pagination={false}
-                          dataSource={item.flowDetails}
-                          scroll={{ y: 200 }}
-                          onRow={record => ({
-                            onClick: () => {
-                              flyTo(record)
-                            }
-                          })}
-                        />
-                      ) : null}
-                    </Panel>
-                  </Collapse>
-                </div>
-              </>
-            ))
-          ) : (
-            <div style={{ textAlign: 'center', margin: '10%' }}>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-                alt=''
-                width={170}
-              />
-            </div>
-          )}
-        </div>
-      </div>
-      <div className='subTitle' style={{ marginTop: '15px' }}>
-        预警统计：共
-        <span
-          style={{
-            fontSize: '18px',
-            color: '#0B81FF',
-            marginLeft: '10px',
-            marginRight: '10px'
-          }}
-        >
-          {Number(ljNum) + Number(zbNum)}
-        </span>
-        条
-      </div>
-      <div className='summary'>
-        <div className='sum-item'>
-          <div className='l_panel'>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/fxdd/shyj/ljzy.png`}
-              alt=''
-            />
-            <div className='sum-num'>立即转移</div>
-          </div>
-          <div className='sum-count'>{ljNum}</div>
-        </div>
-        <div className='sum-item'>
-          <div className='l_panel'>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/fxdd/shyj/zbzy.png`}
-              alt=''
-            />
-            <div className='sum-num'>准备转移</div>
-          </div>
-          <div className='sum-count'>{zbNum}</div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/shyj/index.less b/src/views/fxdd/dqxsfx/shyj/index.less
deleted file mode 100644
index 45d8653..0000000
--- a/src/views/fxdd/dqxsfx/shyj/index.less
+++ /dev/null
@@ -1,136 +0,0 @@
-.fxdd_waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-
-  .subTitle {
-    position: relative;
-    padding-left: 8px;
-    margin: 0 0 10px 10px;
-    font-weight: bold;
-    display: flex;
-    align-items: center;
-    border-bottom: 1px solid #eee;
-
-    &:after {
-      content: '';
-      display: block;
-      position: absolute;
-      width: 3px;
-      height: 16px;
-      background: #0068f4;
-      left: -2px;
-      top: 5px;
-      border-radius: 4px;
-    }
-  }
-
-  .summary {
-    display: flex;
-    justify-content: space-around;
-    text-align: center;
-
-    .sum-item {
-      display: flex;
-
-      .l_panel {
-        display: flex;
-        flex-direction: column;
-      }
-    }
-
-    .sum-count {
-      font-size: 18px;
-      font-weight: bold;
-      display: flex;
-      align-items: center;
-      margin-left: 10px;
-    }
-  }
-
-  .dqxsfx {
-    .label {
-      border: 1px solid #ccc !important;
-      line-height: 32px !important;
-    }
-  }
-}
-.dqxsfxTable {
-  width: 27rem;
-  margin-left: 2px;
-}
-.dqxs_Panel {
-  .ant-collapse-content-box {
-    max-height: 350px;
-    overflow-y: scroll;
-  }
-}
-.shyjTable,
-.shtj_listBox {
-  margin-left: 16px;
-  width: 25rem;
-}
-.shtj_listBox .ant-collapse-content-box {
-  max-height: 350px;
-  overflow-y: scroll;
-}
-.bgColor1 {
-  &:nth-child(1) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #bd3124 !important;
-        color: #fff;
-      }
-    }
-  }
-  &:nth-child(2) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #ec8f3d !important;
-        color: #fff;
-      }
-    }
-  }
-}
-.shtj_listBox {
-  .bgColor1 .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-    line-height: 32px;
-  }
-
-  .txt {
-    font-size: 12px;
-    padding: 0 12px;
-    &:nth-child(1) {
-      width: 25%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      // line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 44%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/shyj/mock.js b/src/views/fxdd/dqxsfx/shyj/mock.js
deleted file mode 100644
index b290ba1..0000000
--- a/src/views/fxdd/dqxsfx/shyj/mock.js
+++ /dev/null
@@ -1,51 +0,0 @@
-export default {
-  tableData: [
-    {
-      type: 1,
-
-      typeName: '立即转移',
-      describe: '个乡镇',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 1,
-      typeName: '准备转移',
-      describe: '个乡镇',
-      flowSign: null,
-      flowDetails: [
-        // {
-        //   adnm: '野猫河水库',
-        //   village: ['三组(幺牌）'],
-        //   villagePoint: [[110.407947, 30.013943]],
-        //   villagePeople: 766.03,
-        //   flow: 466.972,
-        //   time: '2017-07-15 01:00:00',
-        //   villageCount: 1,
-        //   eventId: null,
-        //   type: 6,
-        //   riverMapCenter: null,
-        //   town: null,
-        //   riverArea: null,
-        //   totalDrp: null,
-        //   warngradeid: 5,
-        //   warnstatusid: 0,
-        //   warnstm: 'string',
-        //   adcd: 'string',
-        //   adnm: 'string',
-        //   warntypeid: 0,
-        //   tempcolumn: 0,
-        //   isauto: 'string',
-        //   warnnm: 'string',
-        //   warndesc: 'string',
-        //   warnid: 0,
-        //   warnetm: 'string',
-        //   temprownumber: 0,
-        //   status: 0,
-        //   lgtd: 0,
-        //   lttd: 0
-        // }
-      ]
-    }
-  ]
-}
diff --git a/src/views/fxdd/dqxsfx/shyj/toolbar.js b/src/views/fxdd/dqxsfx/shyj/toolbar.js
deleted file mode 100644
index bca9e27..0000000
--- a/src/views/fxdd/dqxsfx/shyj/toolbar.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Button, DatePicker, Checkbox, TreeSelect, Select } from 'antd'
-import moment from 'moment'
-import data from './dataConfig'
-
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-const formItemLayout = {
-  labelCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 5
-    }
-  },
-  wrapperCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 16
-    }
-  }
-}
-const ToolBar = ({ doSearch, downLoad }) => {
-  const [form] = Form.useForm()
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    // val.tm = val.tm ? moment(val.tm).format('YYYY-MM-DD') : ''
-
-    rec.stm = rec.tm[0].format('YYYY-MM-DD HH:mm:ss')
-    console.log(
-      'pppprrrrrrp',
-      rec.tm[1].format('YYYY-MM-DD'),
-      moment().format('YYYY-MM-DD')
-    )
-    if (rec.tm[1].format('YYYY-MM-DD') != moment().format('YYYY-MM-DD')) {
-      rec.etm = rec.tm[1].format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-      rec.etm = rec.tm[1].format('YYYY-MM-DD HH:mm:ss')
-    }
-    doSearch(rec)
-  }
-
-  const handleTreeData = val => {
-    if (val.length > 0) {
-      val.map(item => {
-        item.value = item.adcd + item.adnm
-        item.title = item.adnm
-        if (item.children && item.children.length > 0) {
-          handleTreeData(item.children)
-        }
-      })
-    }
-  }
-
-  const [treeData, setTreeData] = useState(data.xzqh)
-  const [waterList, setWaterList] = useState(data.waterList)
-
-  useEffect(() => {
-    handleTreeData(treeData)
-    setTreeData(treeData)
-
-    form.setFieldsValue({ tm: [moment().add(-1, 'day'), moment()] })
-  }, [])
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          {...formItemLayout}
-          initialValues={{ types: ['SH', 'SW', 'QX', 'SK'], tm: moment() }}
-        >
-          <Form.Item label='时段选择' name='tm' style={{ margin: '0 0 8px 0' }}>
-            <RangePicker
-              allowClear
-              style={{ width: '330px' }}
-              onChange={onSearchClick}
-              format='YYYY-MM-DD HH:mm'
-            />
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/fxdd/dqxsfx/skyj/dataConfig.js b/src/views/fxdd/dqxsfx/skyj/dataConfig.js
deleted file mode 100644
index d4b66b0..0000000
--- a/src/views/fxdd/dqxsfx/skyj/dataConfig.js
+++ /dev/null
@@ -1,45 +0,0 @@
-export default {
-  tableData: [
-    {
-      type: 0,
-      typeName: '超校核洪水位',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 1,
-      typeName: '超设计洪水位',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 2,
-      typeName: '超汛限水位',
-      flowSign: null,
-      flowDetails: [
-        // {
-        //   "rvcd": "野猫河水库",
-        //   "village": [
-        //     "三组(幺牌）"
-        //   ],
-        //   "villagePoint": [
-        //     [
-        //       110.407947,
-        //       30.013943
-        //     ]
-        //   ],
-        //   "villagePeople": 766.03,
-        //   "flow": 466.972,
-        //   "time": "2017-07-15 01:00:00",
-        //   "villageCount": 1,
-        //   "eventId": null,
-        //   "type": 6,
-        //   "riverMapCenter": null,
-        //   "town": null,
-        //   "riverArea": null,
-        //   "totalDrp": null
-        // }
-      ]
-    }
-  ]
-}
diff --git a/src/views/fxdd/dqxsfx/skyj/index.css b/src/views/fxdd/dqxsfx/skyj/index.css
deleted file mode 100644
index 357780a..0000000
--- a/src/views/fxdd/dqxsfx/skyj/index.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-}
-.waterLevelBox .smallTable {
-  height: calc(100% - 190px);
-}
-.waterLevelBox .ant-form-item {
-  margin-bottom: 0 !important;
-}
-.search-timeline .label {
-  display: flex;
-  justify-content: space-between;
-  width: 280px;
-  height: 30px;
-  border-radius: 2px;
-  border: 1px solid gray;
-}
-.search-timeline .label .h_item {
-  width: 50px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background-color: #fff;
-  cursor: pointer;
-}
-.search-timeline .label .h_item.active {
-  width: 50px;
-  color: #fff;
-  background-color: #409eff;
-}
diff --git a/src/views/fxdd/dqxsfx/skyj/index.js b/src/views/fxdd/dqxsfx/skyj/index.js
deleted file mode 100644
index d88620b..0000000
--- a/src/views/fxdd/dqxsfx/skyj/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-
-const Page = ({ activeKey }) => {
-  const doSearch = params => {}
-  return (
-    <div className='monitor-rainfall waterLevelBox'>
-      <div style={{ margin: '0 0 0 6px' }} className='topQuery'>
-        <Toolbar doSearch={doSearch} />
-      </div>
-    </div>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/skyj/index.less b/src/views/fxdd/dqxsfx/skyj/index.less
deleted file mode 100644
index addae3e..0000000
--- a/src/views/fxdd/dqxsfx/skyj/index.less
+++ /dev/null
@@ -1,39 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-}
-.waterLevelBox {
-  .ant-form-item {
-    margin-bottom: 0 !important;
-  }
-}
-
-.search-timeline {
-  .label {
-    display: flex;
-    justify-content: space-between;
-    width: 280px;
-    height: 30px;
-    border-radius: 2px;
-    border: 1px solid gray;
-
-    .h_item {
-      width: 50px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #fff;
-      cursor: pointer;
-    }
-
-    .h_item.active {
-      width: 50px;
-      color: #fff;
-      background-color: #409eff;
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/skyj/ljtj/index.css b/src/views/fxdd/dqxsfx/skyj/ljtj/index.css
deleted file mode 100644
index 82f699e..0000000
--- a/src/views/fxdd/dqxsfx/skyj/ljtj/index.css
+++ /dev/null
@@ -1,47 +0,0 @@
-.dqxs_listBox .bgColor2 .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.dqxs_listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-}
-.dqxs_listBox .txt {
-  font-size: 12px;
-  padding: 0 12px;
-}
-.dqxs_listBox .txt:nth-child(1) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.dqxs_listBox .txt:nth-child(2) {
-  width: 25%;
-  text-align: center;
-}
-.dqxs_listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.dqxs_listBox .txt:nth-child(4) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.bgColor2:nth-child(1) .ant-collapse-header:nth-child(1) {
-  background-color: #fed4db !important;
-}
-.bgColor2:nth-child(2) .ant-collapse-header:nth-child(1) {
-  background-color: #fceccf !important;
-}
-.bgColor2:nth-child(3) .ant-collapse-header:nth-child(1) {
-  background-color: #fcf4d9 !important;
-}
diff --git a/src/views/fxdd/dqxsfx/skyj/ljtj/index.js b/src/views/fxdd/dqxsfx/skyj/ljtj/index.js
deleted file mode 100644
index 2d806e4..0000000
--- a/src/views/fxdd/dqxsfx/skyj/ljtj/index.js
+++ /dev/null
@@ -1,277 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons'
-import { Vector as VectorSource } from 'ol/source'
-import VectorLayer from 'ol/layer/Vector'
-import Style from 'ol/style/Style'
-import Icon from 'ol/style/Icon'
-import Feature from 'ol/Feature'
-import Point from 'ol/geom/Point.js'
-import { transform } from 'ol/proj'
-import data from '../dataConfig'
-import './index.less'
-import { skWarn } from '../../../../../service/fxdd'
-const { Panel } = Collapse
-const Page = ({ checkVal }) => {
-  const [loading, setLoading] = useState(true)
-  const columns = [
-    { title: '站名', key: 'stnm', dataIndex: 'stnm', ellipsis: true },
-    {
-      title: '水位(m)',
-      key: 'rz1',
-      dataIndex: 'rz1'
-    },
-    {
-      title: '所属政区',
-      key: 'stlc',
-      dataIndex: 'stlc',
-      ellipsis: true,
-      width: 80
-    },
-    {
-      title: '所属流域',
-      key: 'lyname',
-      dataIndex: 'lyname',
-      width: 80,
-      ellipsis: true
-    }
-  ]
-  const [tableData, setTableData] = useState(data.tableData)
-  const [defaultKey, setdefaultKey] = useState([])
-  const dispatch = useDispatch()
-  let mapObj = useSelector(s => s.map.map)
-  console.log(tableData)
-
-  useEffect(() => {
-    getData({ sources: checkVal.types, args: '' })
-  }, [checkVal])
-
-  const getData = obj => {
-    skWarn(obj).then(res => {
-      let arr = []
-      arr = data.tableData.map((item, index, sel) => {
-        sel[0].flowDetails = res.calFloodLevList ? res.calFloodLevList : []
-        sel[1].flowDetails = res.desFloodLevList ? res.desFloodLevList : []
-        sel[2].flowDetails = res.afsltdzList ? res.afsltdzList : []
-        return item
-      })
-
-      arr.forEach(item => {
-        item.flowDetails = item.flowDetails.map(obj => {
-          console.log('obj', obj)
-          obj.rz1 = obj?.rz.toFixed(2) + '(' + obj?.afsltdz.toFixed(2) + ')'
-          return obj
-        })
-      })
-
-      setTableData(arr)
-      const arr2 = []
-      arr.map(item => {
-        item.flowDetails.map(i => {
-          arr2.push(i)
-        })
-      })
-      addLayer(arr2)
-    })
-  }
-
-  useEffect(() => {
-    return () => {
-      dispatch.runtime.closeFeaturePopAll()
-      mapObj &&
-        mapObj
-          .getLayers()
-          .getArray()
-          .forEach(layer => {
-            if (
-              layer.values_.name &&
-              layer.values_.name.indexOf('YSGZQ_SSSQ_SK') > -1
-            ) {
-              layer.getSource().clear()
-            }
-          })
-    }
-  }, [])
-
-  const flyTo = record => {
-    // dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-
-    const { lgtd, lttd, elev } = record
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          ShuiKuLayer: [record.id]
-        }
-      })
-
-      dispatch.runtime.setFeaturePop({
-        type: 'shuiku2',
-        data: record,
-        lgtd: record.lgtd,
-        lttd: record.lttd
-      })
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60
-      })
-    }
-  }
-
-  const addLayer = arr => {
-    mapObj &&
-      mapObj
-        .getLayers()
-        .getArray()
-        .forEach(layer => {
-          if (
-            layer.values_.name &&
-            layer.values_.name.indexOf('YSGZQ_SSSQ_SK') > -1
-          ) {
-            layer.getSource().clear()
-          }
-        })
-
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name: 'YSGZQ_SSSQ_SK',
-      source: new VectorSource(),
-      style: feature => {
-        return [
-          new Style({
-            image: new Icon({
-              src: `${process.env.PUBLIC_URL}/assets/wxsk.png`,
-              // anchor: [0.5, 0.5],
-              opacity: 1,
-              // scale: 0.9,
-              width: 12,
-              hieght: 12
-            }),
-            zIndex: 20
-          })
-        ]
-      },
-      zIndex: 200
-    })
-
-    const features = arr.map(item => {
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857')
-      const feature = new Feature({
-        geometry: new Point(point2),
-        data: item
-      })
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature))
-    mapObj.addLayer(layer)
-
-    mapObj.on('click', function (evt) {
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj.forEachFeatureAtPixel(evt.pixel, function (feature) {
-        return feature
-      })
-      if (feature) {
-        const data = feature.values_.data
-        if (data) {
-          dispatch.runtime.setFeaturePop({
-            id: data.stcd,
-            data: data,
-            type: 'shuiku2',
-            lgtd: data.lgtd,
-            lttd: data.lttd
-          })
-        }
-      }
-    })
-  }
-
-  return (
-    <>
-      <div className='table'>
-        <Table
-          rowKey='adcd'
-          bordered
-          columns={columns}
-          pagination={false}
-          dataSource={[]}
-          scroll={{ y: 0 }}
-          defaultExpandAllRows={true}
-          expandable={{
-            indentSize: 10
-          }}
-        />
-      </div>
-      <div className='dqxs_listBox'>
-        {/*{*/}
-        {/*  loading ?*/}
-        {/*    <div style={{*/}
-        {/*      position: "absolute",*/}
-        {/*      top: "270px",*/}
-        {/*      left: "110px",*/}
-        {/*      background: "#fff",*/}
-        {/*      padding: "20px 30px",*/}
-        {/*      borderRadius: "10px",*/}
-        {/*      zIndex: 10*/}
-        {/*    }}>*/}
-        {/*      <Spin tip="正在加载..." size="large" spinning={loading}/>*/}
-        {/*    </div> : null*/}
-        {/*}*/}
-        {tableData.length > 0 ? (
-          tableData.map((item, index) => (
-            <>
-              <div key={item.type} className='bgColor2'>
-                {/*// @ts-ignore*/}
-                <Collapse
-                  size='small'
-                  // defaultActiveKey={'2'}
-                  expandIcon={({ isActive }) =>
-                    isActive ? (
-                      <MinusOutlined rotate={isActive ? 0 : 0} />
-                    ) : (
-                      <PlusOutlined rotate={isActive ? 90 : 0} />
-                    )
-                  }
-                >
-                  <Panel
-                    header={item.typeName + '(' + item.flowDetails.length + ')'}
-                    key={index}
-                    className='dqxs_Panel'
-                  >
-                    {item.flowDetails.length > 0 ? (
-                      <Table
-                        columns={columns}
-                        showHeader={false}
-                        pagination={false}
-                        dataSource={item.flowDetails}
-                        scroll={{ y: 200 }}
-                        onRow={record => ({
-                          onClick: () => {
-                            flyTo(record)
-                          }
-                        })}
-                      />
-                    ) : null}
-                  </Panel>
-                </Collapse>
-              </div>
-            </>
-          ))
-        ) : (
-          <div style={{ textAlign: 'center', margin: '10%' }}>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-              alt=''
-              width={170}
-            />
-          </div>
-        )}
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/dqxsfx/skyj/ljtj/index.less b/src/views/fxdd/dqxsfx/skyj/ljtj/index.less
deleted file mode 100644
index 4d779ae..0000000
--- a/src/views/fxdd/dqxsfx/skyj/ljtj/index.less
+++ /dev/null
@@ -1,70 +0,0 @@
-.dqxs_listBox {
-  .bgColor2 .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-  }
-
-  .txt {
-    font-size: 12px;
-    padding: 0 12px;
-    &:nth-child(1) {
-      width: 25%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      // line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 25%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      // line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-.bgColor2 {
-  &:nth-child(1) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #fed4db !important;
-      }
-    }
-  }
-  &:nth-child(2) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #fceccf !important;
-      }
-    }
-  }
-  &:nth-child(3) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #fcf4d9 !important;
-      }
-    }
-  }
-}
diff --git a/src/views/fxdd/dqxsfx/skyj/toolbar.js b/src/views/fxdd/dqxsfx/skyj/toolbar.js
deleted file mode 100644
index 375d8df..0000000
--- a/src/views/fxdd/dqxsfx/skyj/toolbar.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Button, DatePicker, Checkbox } from 'antd'
-import { getDictService } from '../../../../service/SelectValue'
-import NormalSelect from '../../../../components/Form/NormalSelect'
-import moment from 'moment'
-import Ljtj from '../../dqxsfx/skyj/ljtj'
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-const formItemLayout = {
-  labelCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 3
-    }
-  },
-  wrapperCol: {
-    xs: {
-      span: 24
-    },
-    sm: {
-      span: 16
-    }
-  }
-}
-const ToolBar = ({ onSearch, downLoad }) => {
-  const [form] = Form.useForm()
-  const [checked, setChecked] = useState({ types: ['SW', 'SK'], args: '' })
-  const onSearchClick = val => {
-    val.tm = val.tm ? moment(val.tm).format('YYYY-MM-DD') : ''
-    onSearch(val)
-  }
-
-
-  const typeOptions = [
-    { label: '水文', value: 'SW' },
-    { label: '水库', value: 'SK' }
-  ]
-
-  const onChange = checkedValues => {
-    const { ...rec } = form.getFieldsValue()
-    console.log(' const { ...rec } = form.getFieldsValue()', rec)
-    setChecked(rec)
-  }
-
-  return (
-    <>
-      <div
-        style={{
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'space-between'
-        }}
-      >
-        <Form
-          form={form}
-          {...formItemLayout}
-          className='toolbarBox'
-          initialValues={{ types: ['SH', 'SW', 'QX', 'SK'], tm: moment() }}
-        >
-          <Form.Item label='类型' name='types'>
-            <CheckboxGroup options={typeOptions} onChange={onChange} />
-          </Form.Item>
-          <div style={{ width: '25rem' }} className='dqxsfxTable'>
-            <Ljtj checkVal={checked} />
-          </div>
-        </Form>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/fxdd/hsyb/hdhs/form.js b/src/views/fxdd/hsyb/hdhs/form.js
deleted file mode 100644
index 3ba8e3e..0000000
--- a/src/views/fxdd/hsyb/hdhs/form.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Modal,Image } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd, validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import { createCrudService } from '../../../../components/crud/_';
-import moment from 'moment';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record, onEdit, onSave }) => {
-  if (record.prodDate) {
-    record.myTm = moment(record.prodDate)
-  }
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [flag, setFlag] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const onFinish = (values) => {
-    if (values.myTm) {
-      values.prodDate = moment(values.myTm).format('YYYY-MM-DD')
-      delete values.myTm
-    }
-
-    if (mode === 'edit') {
-      values.id = record.id
-      onEdit(apiurl.fxzb.sxfd.fxtj.edit, values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.fxzb.sxfd.fxtj.save, values)
-    }
-  }
-
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzFldPred/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  useEffect(()=>{
-    if ((mode === "view" || mode === "edit") && record?.attachList?.length) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-  return (
-    <>
-      <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="预报单名称"
-              name="title"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="期数"
-              name="period"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="预报单位"
-              name="org"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="预报时间"
-              name="tmPred"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="接收时间"
-              name="tmRecv"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-              rules={[{ required: true }]}
-
-            >
-              <Input disabled={mode === 'view'} style={{ width: '37%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="附件"
-              name=""
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-            >
-                <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className='file-item '>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-            </Form.Item>
-          </Col>
-        </Row>
-        {
-          mode === 'view' ? null : (
-            <>
-              <Form.Item {...btnItemLayout}>
-                <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '增加' : '修改'}
-                </Button>
-              </Form.Item>
-            </>
-          )
-        }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxdd/hsyb/hdhs/index.js b/src/views/fxdd/hsyb/hdhs/index.js
deleted file mode 100644
index 86593cb..0000000
--- a/src/views/fxdd/hsyb/hdhs/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-import moment from 'moment';
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({})
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '预报单名称', key: 'title', dataIndex: 'title', width: 200 },
-    { title: '期数', key: 'period', dataIndex: 'period', width: 140 },
-    { title: '预报单位', key: 'org', dataIndex: 'org', width: 200},
-    { title: '预报时间', key: 'tmPred', dataIndex: 'tmPred', width: 150, },
-    { title: '接收时间', key: 'tmRecv', dataIndex: 'tmRecv', width: 150, },
-    {
-      title: '操作', key: 'operation', width: 150, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.sxfd.fxtj.del + params.id);
-    }
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.hsyb.skhs.page).find_noCode);
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          title: searchVal.title || undefined,
-          dateTimeRangeSo: searchVal.dateTimeRangeSo || undefined,
-          tp:2
-        }
-      };
-      console.log(searchVal);
-      search(params)
-    }
-  }, [searchVal])
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-        <div className='adcdTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          // onCrudSuccess={() => { refresh({ addvcd: localStorage.getItem('ADCD6') }) }}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxdd/hsyb/hdhs/toolbar.js b/src/views/fxdd/hsyb/hdhs/toolbar.js
deleted file mode 100644
index 9f4ed51..0000000
--- a/src/views/fxdd/hsyb/hdhs/toolbar.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { SearchOutlined, UndoOutlined, PlusOutlined } from '@ant-design/icons';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const ToolBar = ({ setSearchVal, onSave }) => {
-  const [form] = Form.useForm();
-  const [source, setSource] = useState([])
-
-
-  const itemLayout = {
-    labelCol: {
-      span: 5,
-    },
-    wrapperCol: {
-      span: 19,
-    },
-  };
-
-  const onFinish = (val) => {
-    if (val.dateTimeRangeSo) {
-      val.dateTimeRangeSo = {
-        start: moment(val.dateTimeRangeSo[0]).format("YYYY-MM-DD HH:mm:ss"),
-        end:moment(val.dateTimeRangeSo[1]).format("YYYY-MM-DD HH:mm:ss")
-      }
-    }
-    setSearchVal(val);
-  }
-
-  const { RangePicker } = DatePicker;
-
-
-  const onReset = () => {
-    form.resetFields();
-  };
-
-  useEffect(() => {
-    getSelect()
-  }, [])
-
-  const getSelect = async () => {
-    // 获取最近5年
-    const lastFiveYears = [];
-    for (let i = 0; i < 5; i++) {
-      const year = moment().subtract(i, 'years').year();
-      lastFiveYears.push({
-        label: year,
-        value: year
-      });
-    }
-    setSource(lastFiveYears)
-  }
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="预报单名称" name="title">
-            <Input allowClear placeholder='请输入预报单名称' style={{ width: '180px' }} />
-          </Form.Item>
-          <Form.Item name="dateTimeRangeSo" label="预报时间" {...itemLayout}>
-            <RangePicker
-              showTime={{ format: 'HH:mm' }}
-              format="YYYY-MM-DD HH:mm"
-            />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" icon={<SearchOutlined />} htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button htmlType="button" onClick={onReset} icon={<UndoOutlined />}>
-              重置
-            </Button>
-          </Form.Item>
-          {/* {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          } */}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxdd/hsyb/skhs/form.js b/src/views/fxdd/hsyb/skhs/form.js
deleted file mode 100644
index 3ba8e3e..0000000
--- a/src/views/fxdd/hsyb/skhs/form.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Modal,Image } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd, validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import { createCrudService } from '../../../../components/crud/_';
-import moment from 'moment';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record, onEdit, onSave }) => {
-  if (record.prodDate) {
-    record.myTm = moment(record.prodDate)
-  }
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [flag, setFlag] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const onFinish = (values) => {
-    if (values.myTm) {
-      values.prodDate = moment(values.myTm).format('YYYY-MM-DD')
-      delete values.myTm
-    }
-
-    if (mode === 'edit') {
-      values.id = record.id
-      onEdit(apiurl.fxzb.sxfd.fxtj.edit, values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.fxzb.sxfd.fxtj.save, values)
-    }
-  }
-
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzFldPred/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  useEffect(()=>{
-    if ((mode === "view" || mode === "edit") && record?.attachList?.length) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-  return (
-    <>
-      <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="预报单名称"
-              name="title"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="期数"
-              name="period"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="预报单位"
-              name="org"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="预报时间"
-              name="tmPred"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="接收时间"
-              name="tmRecv"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-              rules={[{ required: true }]}
-
-            >
-              <Input disabled={mode === 'view'} style={{ width: '37%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="附件"
-              name=""
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-            >
-                <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className='file-item '>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-            </Form.Item>
-          </Col>
-        </Row>
-        {
-          mode === 'view' ? null : (
-            <>
-              <Form.Item {...btnItemLayout}>
-                <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '增加' : '修改'}
-                </Button>
-              </Form.Item>
-            </>
-          )
-        }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxdd/hsyb/skhs/index.js b/src/views/fxdd/hsyb/skhs/index.js
deleted file mode 100644
index 4c1f71c..0000000
--- a/src/views/fxdd/hsyb/skhs/index.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-import moment from 'moment';
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({})
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '预报单名称', key: 'title', dataIndex: 'title', width: 200 },
-    { title: '期数', key: 'period', dataIndex: 'period', width: 140 },
-    { title: '预报单位', key: 'org', dataIndex: 'org', width: 200},
-    { title: '预报时间', key: 'tmPred', dataIndex: 'tmPred', width: 150, },
-    { title: '接收时间', key: 'tmRecv', dataIndex: 'tmRecv', width: 150, },
-    {
-      title: '操作', key: 'operation', width: 150, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.sxfd.fxtj.del + params.id);
-    }
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.hsyb.skhs.page).find_noCode);
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          title: searchVal.title || undefined,
-          dateTimeRangeSo: searchVal.dateTimeRangeSo || undefined,
-          tp:1
-        },
-      };
-      search(params)
-    }
-  }, [searchVal])
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-        <div className='adcdTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          // onCrudSuccess={() => { refresh({ addvcd: localStorage.getItem('ADCD6') }) }}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxdd/hsyb/skhs/toolbar.js b/src/views/fxdd/hsyb/skhs/toolbar.js
deleted file mode 100644
index 9f4ed51..0000000
--- a/src/views/fxdd/hsyb/skhs/toolbar.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { SearchOutlined, UndoOutlined, PlusOutlined } from '@ant-design/icons';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const ToolBar = ({ setSearchVal, onSave }) => {
-  const [form] = Form.useForm();
-  const [source, setSource] = useState([])
-
-
-  const itemLayout = {
-    labelCol: {
-      span: 5,
-    },
-    wrapperCol: {
-      span: 19,
-    },
-  };
-
-  const onFinish = (val) => {
-    if (val.dateTimeRangeSo) {
-      val.dateTimeRangeSo = {
-        start: moment(val.dateTimeRangeSo[0]).format("YYYY-MM-DD HH:mm:ss"),
-        end:moment(val.dateTimeRangeSo[1]).format("YYYY-MM-DD HH:mm:ss")
-      }
-    }
-    setSearchVal(val);
-  }
-
-  const { RangePicker } = DatePicker;
-
-
-  const onReset = () => {
-    form.resetFields();
-  };
-
-  useEffect(() => {
-    getSelect()
-  }, [])
-
-  const getSelect = async () => {
-    // 获取最近5年
-    const lastFiveYears = [];
-    for (let i = 0; i < 5; i++) {
-      const year = moment().subtract(i, 'years').year();
-      lastFiveYears.push({
-        label: year,
-        value: year
-      });
-    }
-    setSource(lastFiveYears)
-  }
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="预报单名称" name="title">
-            <Input allowClear placeholder='请输入预报单名称' style={{ width: '180px' }} />
-          </Form.Item>
-          <Form.Item name="dateTimeRangeSo" label="预报时间" {...itemLayout}>
-            <RangePicker
-              showTime={{ format: 'HH:mm' }}
-              format="YYYY-MM-DD HH:mm"
-            />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" icon={<SearchOutlined />} htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button htmlType="button" onClick={onReset} icon={<UndoOutlined />}>
-              重置
-            </Button>
-          </Form.Item>
-          {/* {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          } */}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxdd/tqyb/dataConfig.js b/src/views/fxdd/tqyb/dataConfig.js
deleted file mode 100644
index 3cf0911..0000000
--- a/src/views/fxdd/tqyb/dataConfig.js
+++ /dev/null
@@ -1,123 +0,0 @@
-export default {
-  tableData: [
-    {
-      type: 6,
-      typeName: '≥250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 5,
-      typeName: '100~250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 4,
-      typeName: '50~100',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '25~50',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 2,
-      typeName: '10~25',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 1,
-      typeName: '0.1~10',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 0,
-      typeName: '0~0.1',
-      flowSign: null,
-      flowDetails: []
-    }
-  ],
-
-  data: [
-    {
-      key: 1,
-      name: 'John Brown',
-      age: 32,
-      address: 'New York No. 1 Lake Park',
-      description: 'ddd'
-    },
-    {
-      key: 2,
-      name: 'Jim Green',
-      age: 42,
-      address: 'London No. 1 Lake Park',
-      description:
-        'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.'
-    },
-    {
-      key: 3,
-      name: 'Not Expandable',
-      age: 29,
-      address: 'Jiangsu No. 1 Lake Park',
-      description: 'This not expandable'
-    },
-    {
-      key: 4,
-      name: 'Joe Black',
-      age: 32,
-      address: 'Sydney No. 1 Lake Park',
-      description:
-        'My name is Joe Black, I am 32 years old, living in Sydney No. 1 Lake Park.'
-    }
-  ],
-  tqDate: [
-    {
-      type: 6,
-      typeName: '>250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 5,
-      typeName: '100~250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 4,
-      typeName: '50~100',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '25~50',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 2,
-      typeName: '10~25',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 1,
-      typeName: '0.1~10',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 0,
-      typeName: '0~0.1',
-      flowSign: null,
-      flowDetails: []
-    }
-  ]
-}
diff --git a/src/views/fxdd/tqyb/dataConfig2.js b/src/views/fxdd/tqyb/dataConfig2.js
deleted file mode 100644
index 6a4d2ee..0000000
--- a/src/views/fxdd/tqyb/dataConfig2.js
+++ /dev/null
@@ -1,210 +0,0 @@
-export default {
-  tableData: [
-    {
-      type: 7,
-      typeName: '朝阳市水库',
-      flowSign: null,
-      flowDetails: [
-        {
-          rvcd: 'AFF1320101W00000',
-          village: ['三组(幺牌）'],
-          villagePoint: [[110.407947, 30.013943]],
-          villagePeople: 318,
-          flow: 466.972,
-          time: '2017-07-15 01:00:00',
-          villageCount: 1,
-          eventId: null,
-          type: 6,
-          riverMapCenter: null,
-          town: null,
-          riverArea: null,
-          totalDrp: null
-        }
-      ]
-    },
-    {
-      type: 6,
-      typeName: '小河水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 5,
-      typeName: '田寨河水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 4,
-      typeName: '大河边水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '野猫河水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '巴西坝水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '白岩寨水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '板栗园水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '大山沟水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '龙潭司水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '东厢溪水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '朝阳红旗水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '红旗(唐崖)水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '老鸹泉水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '龙王庙水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '茅坪水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '青菜沟水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '狮子口水库',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '田沟水库',
-      flowSign: null,
-      flowDetails: []
-    }
-  ],
-  data: [
-    {
-      key: 1,
-      name: 'John Brown',
-      age: 32,
-      address: 'New York No. 1 Lake Park',
-      description: 'ddd'
-    },
-    {
-      key: 2,
-      name: 'Jim Green',
-      age: 42,
-      address: 'London No. 1 Lake Park',
-      description:
-        'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.'
-    },
-    {
-      key: 3,
-      name: 'Not Expandable',
-      age: 29,
-      address: 'Jiangsu No. 1 Lake Park',
-      description: 'This not expandable'
-    },
-    {
-      key: 4,
-      name: 'Joe Black',
-      age: 32,
-      address: 'Sydney No. 1 Lake Park',
-      description:
-        'My name is Joe Black, I am 32 years old, living in Sydney No. 1 Lake Park.'
-    }
-  ],
-  tqDate: [
-    {
-      type: 6,
-      typeName: '>250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 5,
-      typeName: '100~250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 4,
-      typeName: '50~100',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '25~50',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 2,
-      typeName: '10~25',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 1,
-      typeName: '0.1~10',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 0,
-      typeName: '0~0.1',
-      flowSign: null,
-      flowDetails: []
-    }
-  ]
-}
diff --git a/src/views/fxdd/tqyb/index.js b/src/views/fxdd/tqyb/index.js
deleted file mode 100644
index 09d1822..0000000
--- a/src/views/fxdd/tqyb/index.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, { lazy, useEffect, useState } from 'react'
-import { useSelector } from 'react-redux'
-import { Collapse, Slider, Button, Spin, Modal } from 'antd'
-import './index.less'
-import Tqxx from './tqxx'
-import Tqxx72 from './tqxx72'
-import Tqxx24 from './tqxx24'
-import Tqxx2 from './tqxx2/index.js'
-
-const { Panel } = Collapse
-const Page = () => {
-  const [myKey, setMyKey] = useState('1')
-
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  return (
-    <div
-      className='waterBox'
-      style={{
-        // height: hasAlertBox ? 'calc(100vh - 110px)' : 'calc(100vh - 90px)',
-        width: '28rem',
-        position: 'relative'
-      }}
-    >
-      <Collapse
-        defaultActiveKey={['1']}
-        expandIconPosition='end'
-        destrInactivePanel
-        accordion
-        onChange={e => {
-          setMyKey(e)
-        }}
-      >
-        <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <span className='lf txt'>未来7日</span>
-            </div>
-          }
-          key='1'
-        >
-          {myKey === '1' ? <Tqxx /> : null}
-        </Panel>
-        {/* <Panel header={<div className="clearFloat panelTitle">
-          <div className="lf">
-            <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt="" />
-          </div>
-          <span className="lf txt">未来72小时</span>
-        </div>} key="2">
-          <Tqxx72 />
-        </Panel> */}
-        <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <span className='lf txt'>未来24小时</span>
-            </div>
-          }
-          key='3'
-        >
-          {myKey === '3' ? <Tqxx24 /> : null}
-        </Panel>
-        <Panel
-          header={
-            <div className='clearFloat panelTitle'>
-              <div className='lf'>
-                <img
-                  src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`}
-                  alt=''
-                />
-              </div>
-              <span className='lf txt'>短临预报</span>
-            </div>
-          }
-          key='4'
-        >
-          {myKey === '4' ? <Tqxx2 /> : null}
-        </Panel>
-      </Collapse>
-    </div>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/index.less b/src/views/fxdd/tqyb/index.less
deleted file mode 100644
index e1d8a64..0000000
--- a/src/views/fxdd/tqyb/index.less
+++ /dev/null
@@ -1,255 +0,0 @@
-.waterBox {
-  display: inline-block;
-
-  .rightDetails {
-    .closeBtn {
-      font-size: 20px;
-      cursor: pointer;
-      margin: -3px 14px 0 0;
-    }
-
-    position: absolute;
-    width:330px;
-    height:calc(100vh - 90px);
-    background:#fff;
-    z-index:101;
-    right: calc((100vw - 46rem)*(-1));
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-
-    .listDiv {
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow: hidden;
-    }
-
-    .imgDiv {
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-
-      .imgBox {
-        padding-right: 20px;
-      }
-    }
-  }
-
-  .drpBox {
-    .button-group span {
-      padding: 0 0.1rem;
-    }
-  }
-
-  .ellipsisDiv {
-    width: 115px;
-    overflow: hidden; //溢出隐藏
-    white-space: nowrap; //禁止换行
-    text-overflow: ellipsis; //...
-  }
-}
-
-/*.legendBox{
-  background:#fff;
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width:132px;
-  left:82vw;
-  bottom:16px;
-  border-radius:6px;
-  padding:10px 10px 0 20px;
-  ul,li{
-    list-style: none;
-    padding:0;
-  }
-  span{
-    font-size:1rem;
-    height:20px;
-    line-height: 20px;
-  }
-  .colorSpan1,.colorSpan2,.colorSpan3,.colorSpan4,.colorSpan5,.colorSpan6,.colorSpan7{
-    width:16px;
-    height:9px;
-    border:1px solid #ddd;
-    margin:5px 10px 0 0;
-  }
-  .colorSpan1{
-    background:#781D4F;
-  }
-  .colorSpan2{
-    background:#EB20F7;
-  }
-  .colorSpan3{
-    background:#1E1ACA;
-  }
-  .colorSpan4{
-    background:#6EC2FA;
-  }
-  .colorSpan5{
-    background:#59B666;
-  }
-  .colorSpan6{
-    background:#BDEF9A;
-  }
-  .colorSpan7{
-    background:#fff;
-  }
-}*/
-
-.timeLineBox {
-  background: rgba(255, 255, 255, 0.8);
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width: 755px;
-  height: 68px;
-  //left:480px;
-  left: calc((100vw - 840px)/2);
-  bottom: 12px;
-  border-radius: 6px;
-  padding: 2px 0 0 5px;
-  cursor: pointer;
-
-  .ant-slider {
-    margin: 5px 0 0 30px;
-
-    //width:720px;
-    .ant-slider-rail {
-      background-color: #B4BCCC;
-      height: 3px;
-    }
-
-    .ant-slider-handle {
-      background-color: #B2D7FF;
-    }
-  }
-
-  .ant-slider-disabled .ant-slider-track {
-    background-color: #007BFF !important;
-  }
-
-  .ant-slider-disabled .ant-slider-rail {
-    background-color: #B4BCCC !important;
-  }
-
-  .topLabelBox {
-    position: relative;
-    height: 15px;
-
-    span {
-      font-size: 12px;
-      color: #007BFF;
-      position: absolute;
-      font-weight: bold;
-      letter-spacing: 1px;
-
-      &:first-child {
-        left: 36px;
-        top: 3px;
-      }
-
-      &:nth-child(2) {
-        //left: 363px;
-        left: 417px;
-        top: 3px;
-        //font-size: 13px;
-      }
-
-      &:nth-child(3) {
-        //left: 395px;
-        left: 455px;
-        top: 3px;
-      }
-
-      &:nth-child(4) {
-        right: 0;
-        top: 5px;
-      }
-    }
-
-    .btnBg {
-      position: absolute;
-      background: rgba(0, 132, 231, 0.2);
-      width: 100px;
-      height: 23px;
-      //right: 170px;
-      border-radius: 6px;
-    }
-  }
-
-  .labelBox {
-    width: 785px;
-
-    span {
-      margin-right: 11px;
-      font-size: 12px;
-      width: 61px;
-      text-align: center;
-      position: relative;
-
-      &:first-child,
-      &:last-child,
-      &:nth-child(6),
-      &:nth-child(8) {
-        &:after {
-          content: "";
-          display: block;
-          position: absolute;
-          width: 2px;
-          height: 8px;
-          background: #007BFF;
-          left: 29px;
-          top: -17px;
-        }
-      }
-
-      &:last-child {
-        margin-right: 0;
-      }
-
-      &:before {
-        content: "";
-        display: block;
-        position: absolute;
-        left: 27px;
-        top: -9px;
-        width: 6px;
-        height: 6px;
-        border-radius: 50%;
-        background: #007BFF;
-        pointer-events: none;
-      }
-    }
-  }
-}
-
-.hzyqModal {
-  padding-bottom: 10px;
-
-  .ant-modal-body {
-    padding: 12px 14px;
-  }
-
-  .ant-modal-content {
-    height: 100%;
-  }
-}
-
-@media screen and (max-width:1549px) {
-  .timeLineBox {
-    //zoom: 0.86;
-    left: 36.5rem;
-  }
-
-  .legendBox {
-    bottom: 70px;
-  }
-}
-
-@media screen and (max-width:1399px) {
-  .indexBox .tipsBox {
-    //zoom: 0.76;
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxdd/tqyb/ljtj/index.css b/src/views/fxdd/tqyb/ljtj/index.css
deleted file mode 100644
index c4dfed0..0000000
--- a/src/views/fxdd/tqyb/ljtj/index.css
+++ /dev/null
@@ -1,43 +0,0 @@
-.tqyb_table {
-  width: 100%;
-  height: 100%;
-}
-.listBox .bgcolor .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-}
-.listBox .txt {
-  font-size: 12px;
-}
-.listBox .txt:nth-child(1) {
-  width: 30%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  line-height: 14px;
-}
-.listBox .txt:nth-child(2) {
-  width: 20%;
-  text-align: center;
-}
-.listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.listBox .txt:nth-child(4) {
-  width: 25%;
-  line-height: 14px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/src/views/fxdd/tqyb/ljtj/index.js b/src/views/fxdd/tqyb/ljtj/index.js
deleted file mode 100644
index 34df0a4..0000000
--- a/src/views/fxdd/tqyb/ljtj/index.js
+++ /dev/null
@@ -1,198 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import data from '../../tqyb/dataConfig'
-import moment from 'moment'
-import './index.less'
-
-import { weatherLevel } from '../../../../service/fxdd'
-const { Panel } = Collapse
-
-const Page = ({ params, leg, rl }) => {
-  const [loading, setLoading] = useState(true)
-  const [dataTl, seDataTl] = useState(leg)
-  const [datarl, seDatarl] = useState(rl)
-  useEffect(() => {
-    seDataTl(leg)
-    seDatarl(rl)
-  }, [leg])
-
-  const columns = [
-    { title: '站名', key: 'stnm', dataIndex: 'stnm', ellipsis: true },
-    {
-      title: '累计雨量(mm)',
-      key: 'drp',
-      dataIndex: 'drp',
-      ellipsis: true
-    },
-    { title: '所属政区', key: 'adnm', dataIndex: 'adnm', ellipsis: true },
-    { title: '所属流域', key: 'basName', dataIndex: 'basName', ellipsis: true }
-  ]
-  const [tableData, setTableData] = useState(data.tableData)
-  // const [leg, setLeg] = useState([])
-  // const [rl, setrRl] = useState(0)
-  console.log(tableData)
-
-  useEffect(() => {
-    if (params.tm) {
-      setLoading(true)
-      getData(params)
-    }
-  }, [params])
-
-  const getData = async params => {
-    let obj = {
-      tm: params.tm
-        ? params.tm.format('YYYYMMDD') + params.ts
-        : moment().format('YYYYMMDD') + '08'
-    }
-    let list = await weatherLevel(obj)
-    let arr = []
-    for (const [key, value] of Object.entries(list)) {
-      console.log(key, value)
-      arr = data.tableData.map(item => {
-        if (item.type == key) {
-          console.log(key, item.type)
-
-          item.flowDetails = value
-        }
-        return item
-      })
-
-      const as = arr.map(item => {
-        return item.flowDetails.length
-      })
-      // setLeg(as)
-
-      // const rl = eval(as.join('+')) - as[as.length - 1]
-
-      // console.log('asasasas', rl)
-      // setrRl(rl)
-
-      setTableData(arr)
-      setLoading(false)
-    }
-  }
-  return (
-    <>
-      <div className='tqyb_table qy_table'>
-        <Table
-          rowKey='adcd'
-          bordered
-          columns={columns}
-          loading={loading}
-          pagination={false}
-          dataSource={[]}
-          scroll={{ y: 0 }}
-          defaultExpandAllRows={true}
-          expandable={{
-            indentSize: 10
-          }}
-        />
-      </div>
-      <div className='listBox'>
-        {tableData.length > 0 ? (
-          tableData.map((item, index) => (
-            <>
-              {item.type !== 0 ? (
-                <div key={item.type} className='bgcolor'>
-                  <Collapse size='small'>
-                    <Panel
-                      header={
-                        item.typeName + '(' + item.flowDetails.length + ')'
-                      }
-                      key={index}
-                    >
-                      {/* {item.flowDetails.length > 0 &&
-                        item.flowDetails.map(item1 => (
-                          <div>
-                            <div className='clearFloat txtBox'>
-                              <div className='lf txt'>{item1.stnm}</div>
-                              <div className='lf txt'>{item1.drp}</div>
-                              <div className='lf txt'>{item1.adnm}</div>
-                              <div className='lf txt'>{item1.basName}</div>
-                            </div>
-                          </div>
-                        ))} */}
-                      {item.flowDetails.length > 0 ? (
-                        <Table
-                          columns={columns}
-                          showHeader={false}
-                          pagination={false}
-                          dataSource={item.flowDetails}
-                          // scroll={{ y: 120 }}
-                        />
-                      ) : null}
-                    </Panel>
-                  </Collapse>
-                </div>
-              ) : null}
-            </>
-          ))
-        ) : (
-          <div style={{ textAlign: 'center', margin: '10%' }}>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-              alt=''
-              width={170}
-            />
-          </div>
-        )}
-      </div>
-      <div>
-        {/* <div className='listBox'></div> */}
-        <div className='subTitle' style={{ marginTop: '15px' }}>
-          站点统计(个)：
-          <span
-            style={{ fontSize: '18px', color: '#0B81FF', marginRight: '10px' }}
-          >
-            {dataTl.length > 0 ? eval(leg.join('+')) : 0}
-          </span>{' '}
-          其中有雨站点：
-          <span style={{ fontSize: '18px', color: '#0B81FF' }}>{datarl}</span>
-        </div>
-        <div className='summary'>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-            <div className='sum-num'>≥250</div>
-            <div className='sum-count'> {dataTl.length > 0 ? leg[0] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-            <div className='sum-num'>100~250</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[1] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/很多点.png`} alt='' />
-            <div className='sum-num'>50~100</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[2] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/五点.png`} alt='' />
-            <div className='sum-num'>25~50</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[3] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/三点.png`} alt='' />
-            <div className='sum-num'>10~25</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[4] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/fxdd/两点.png`}
-              alt=''
-            />
-            <div className='sum-num'>0.1~10</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[5] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt='' />
-            <div className='sum-num'>无雨</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[6] : '0'}</div>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/ljtj/index.less b/src/views/fxdd/tqyb/ljtj/index.less
deleted file mode 100644
index e098331..0000000
--- a/src/views/fxdd/tqyb/ljtj/index.less
+++ /dev/null
@@ -1,52 +0,0 @@
-.tqyb_table {
-  width: 100%;
-  height: 100%;
-}
-
-.listBox {
-  .bgcolor .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-  }
-
-  .txt {
-    font-size: 12px;
-
-    &:nth-child(1) {
-      width: 30%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 20%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
diff --git a/src/views/fxdd/tqyb/lsyl/index.css b/src/views/fxdd/tqyb/lsyl/index.css
deleted file mode 100644
index dd78d07..0000000
--- a/src/views/fxdd/tqyb/lsyl/index.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-.listBox2 .bgcolor .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.listBox2 .ant-collapse-content-box {
-  max-height: 300px;
-  overflow-y: scroll;
-}
-.listBox2 .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-  line-height: 32px;
-}
-.listBox2 .txt {
-  font-size: 12px;
-}
-.listBox2 .txt:nth-child(1) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.listBox2 .txt:nth-child(2) {
-  width: 25%;
-  text-align: center;
-}
-.listBox2 .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.listBox2 .txt:nth-child(4) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.bgColor3:nth-child(1) .ant-collapse-header:nth-child(1) {
-  background-color: #ffd5d5 !important;
-}
-.bgColor3:nth-child(2) .ant-collapse-header:nth-child(1) {
-  background-color: #f2defe !important;
-}
-.bgColor3:nth-child(3) .ant-collapse-header:nth-child(1) {
-  background-color: #ddddff !important;
-}
-.bgColor3:nth-child(4) .ant-collapse-header:nth-child(1) {
-  background-color: #d2e9fc !important;
-}
-.bgColor3:nth-child(5) .ant-collapse-header:nth-child(1) {
-  background-color: #d9f7ff !important;
-}
-.bgColor3:nth-child(6) .ant-collapse-header:nth-child(1) {
-  background-color: #edfce9 !important;
-}
diff --git a/src/views/fxdd/tqyb/lsyl/index.js b/src/views/fxdd/tqyb/lsyl/index.js
deleted file mode 100644
index 0e7c90d..0000000
--- a/src/views/fxdd/tqyb/lsyl/index.js
+++ /dev/null
@@ -1,231 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import data from '../dataConfig'
-import option from './mock'
-import moment from 'moment'
-import './index.less'
-
-import { short, weatherLevel } from '../../../../service/fxdd'
-const { Panel } = Collapse
-
-const Page = ({ params }) => {
-  const [loading, setLoading] = useState(true)
-
-  const columns = [
-    {
-      title: '站名',
-      key: 'stnm',
-      dataIndex: 'stnm',
-      width: 90,
-      ellipsis: true
-    },
-    {
-      title: '累计雨量(mm)',
-      key: 'drp',
-      dataIndex: 'drp',
-      width: 120
-    },
-    {
-      title: '所属政区',
-      key: 'adnm',
-      dataIndex: 'adnm',
-      width: 70,
-      ellipsis: true
-    },
-    {
-      title: '所属流域',
-      key: 'basName',
-      dataIndex: 'basName',
-      width: 70,
-      ellipsis: true
-    }
-  ]
-  const [tableData, setTableData] = useState(data.tableData)
-  const [leg, setLeg] = useState([])
-  const [rl, setrRl] = useState(0)
-  console.log(tableData)
-
-  useEffect(() => {
-    console.log('paramsparamsparams,', data.tableData)
-    if (params.dataForm) {
-      getData(params)
-    }
-  }, [params])
-
-  const getData = async params => {
-    let b = params?.dataForm?.ts?.split(':')
-    if (!b || b.length !== 2) {
-      return
-    }
-    // 重置
-    getResData()
-    await short({
-      tm: moment(params.tm).format('YYYYMMDD') + b[0] + b[1]
-    }).then(res => {
-      if (res.code == '200') {
-        let arr = []
-        for (const [key, value] of Object?.entries(res.data)) {
-          arr = tableData.map(item => {
-            if (item.type == key) {
-              item.flowDetails = value
-            }
-            return item
-          })
-
-          const as = arr.map(item => {
-            return item.flowDetails.length
-          })
-
-          setLeg(as)
-
-          const rl = eval(as.join('+')) - as[as.length - 1]
-          setrRl(rl)
-          setTableData(arr)
-        }
-      }
-    })
-  }
-  const getResData = () => {
-    const arr = data.tableData.map(item => {
-      item.flowDetails = []
-      return item
-    })
-
-    setrRl(0)
-    setLeg([])
-    setTableData(arr)
-  }
-  return (
-    <>
-      <div></div>
-      <div className='tqyb_table'>
-        <Table
-          rowKey='adcd'
-          bordered
-          columns={columns}
-          pagination={false}
-          dataSource={[]}
-          scroll={{ y: 0 }}
-          defaultExpandAllRows={true}
-          expandable={{
-            indentSize: 10
-          }}
-        />
-      </div>
-      <div className='listBox2'>
-        {tableData.length > 0 ? (
-          tableData.map((item, index) => (
-            <>
-              <div key={item.type} className='bgcolor'>
-                {/*// @ts-ignore*/}
-                <Collapse
-                  size='small'
-                  headerBg='rgba(0, 0, 0, 0.02)'
-                  // defaultActiveKey={index}
-                >
-                  {item.type != '0' ? (
-                    <Panel
-                      header={
-                        item.typeName + '(' + item.flowDetails.length + ')'
-                      }
-                      key={index}
-                    >
-                      {/* {item.flowDetails.length > 0 &&
-                        item.flowDetails.map(item1 => (
-                          <div>
-                            <div className='clearFloat txtBox'>
-                              <div className='lf txt'>{item1.stnm}</div>
-                              <div className='lf txt'>{item1.drp}</div>
-                              <div className='lf txt'>{item1.adnm}</div>
-                              <div className='lf txt'>{item1.basName}</div>
-                            </div>
-                          </div>
-                        ))} */}
-                      {item.flowDetails.length > 0 ? (
-                        <Table
-                          columns={columns}
-                          showHeader={false}
-                          pagination={false}
-                          dataSource={item.flowDetails}
-                          scroll={{ y: 200 }}
-                          // onRow={record => ({
-                          //   onClick: () => {
-                          //     flyTo(record)
-                          //   }
-                          // })}
-                        />
-                      ) : null}
-                    </Panel>
-                  ) : null}
-                </Collapse>
-              </div>
-            </>
-          ))
-        ) : (
-          <div style={{ textAlign: 'center', margin: '10%' }}>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-              alt=''
-              width={170}
-            />
-          </div>
-        )}
-
-        <></>
-        {/* <div className='listBox'></div> */}
-        <div className='subTitle' style={{ marginTop: '15px' }}>
-          站点统计(个)：
-          <span
-            style={{ fontSize: '18px', color: '#0B81FF', marginRight: '10px' }}
-          >
-            {leg.length > 0 ? eval(leg.join('+')) : 0}
-          </span>{' '}
-          其中有雨站点：
-          <span style={{ fontSize: '18px', color: '#0B81FF' }}>{rl}</span>
-        </div>
-        <div className='summary'>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-            <div className='sum-num'>≥250</div>
-            <div className='sum-count'> {leg.length > 0 ? leg[0] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-            <div className='sum-num'>100~250</div>
-            <div className='sum-count'>{leg.length > 0 ? leg[1] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/很多点.png`} alt='' />
-            <div className='sum-num'>50~100</div>
-            <div className='sum-count'>{leg.length > 0 ? leg[2] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/五点.png`} alt='' />
-            <div className='sum-num'>25~50</div>
-            <div className='sum-count'>{leg.length > 0 ? leg[3] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/三点.png`} alt='' />
-            <div className='sum-num'>10~25</div>
-            <div className='sum-count'>{leg.length > 0 ? leg[4] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/fxdd/两点.png`}
-              alt=''
-            />
-            <div className='sum-num'>0.1~10</div>
-            <div className='sum-count'>{leg.length > 0 ? leg[5] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt='' />
-            <div className='sum-num'>无雨</div>
-            <div className='sum-count'>{leg.length > 0 ? leg[6] : '0'}</div>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/lsyl/index.less b/src/views/fxdd/tqyb/lsyl/index.less
deleted file mode 100644
index 3b90e3d..0000000
--- a/src/views/fxdd/tqyb/lsyl/index.less
+++ /dev/null
@@ -1,100 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-
-.listBox2 {
-  .bgcolor .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-  .ant-collapse-content-box {
-    max-height: 300px;
-    overflow-y: scroll;
-  }
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-    line-height: 32px;
-  }
-
-  .txt {
-    font-size: 12px;
-
-    &:nth-child(1) {
-      width: 25%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      // line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 25%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      // line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-
-.bgColor3 {
-  &:nth-child(1) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #ffd5d5 !important;
-      }
-    }
-  }
-  &:nth-child(2) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #f2defe !important;
-      }
-    }
-  }
-  &:nth-child(3) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #ddddff !important;
-      }
-    }
-  }
-  &:nth-child(4) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #d2e9fc !important;
-      }
-    }
-  }
-  &:nth-child(5) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #d9f7ff !important;
-      }
-    }
-  }
-  &:nth-child(6) {
-    .ant-collapse-header {
-      &:nth-child(1) {
-        background-color: #edfce9 !important;
-      }
-    }
-  }
-}
diff --git a/src/views/fxdd/tqyb/lsyl/mock.js b/src/views/fxdd/tqyb/lsyl/mock.js
deleted file mode 100644
index c3fcb0f..0000000
--- a/src/views/fxdd/tqyb/lsyl/mock.js
+++ /dev/null
@@ -1,196 +0,0 @@
-export default {
-  option: [
-    {
-      key: '00:00',
-      value: '00:00'
-    },
-    {
-      key: '00:30',
-      value: '00:30'
-    },
-    {
-      key: '01:00',
-      value: '00:00'
-    },
-    {
-      key: '01:30',
-      value: '01:30'
-    },
-    {
-      key: '02:00',
-      value: '02:00'
-    },
-    {
-      key: '02:30',
-      value: '02:30'
-    },
-    {
-      key: '03:00',
-      value: '03:00'
-    },
-    {
-      key: '03:30',
-      value: '03:30'
-    },
-    {
-      key: '04:00',
-      value: '04:00'
-    },
-    {
-      key: '04:30',
-      value: '04:30'
-    },
-    {
-      key: '04:00',
-      value: '04:00'
-    },
-    {
-      key: '05:30',
-      value: '05:30'
-    },
-    {
-      key: '05:00',
-      value: '05:00'
-    },
-    {
-      key: '06:30',
-      value: '06:30'
-    },
-    {
-      key: '06:00',
-      value: '06:00'
-    },
-    {
-      key: '07:30',
-      value: '07:30'
-    },
-    {
-      key: '08:00',
-      value: '08:00'
-    },
-    {
-      key: '08:30',
-      value: '08:30'
-    },
-    {
-      key: '09:00',
-      value: '09:00'
-    },
-    {
-      key: '09:30',
-      value: '09:30'
-    },
-    {
-      key: '10:00',
-      value: '10:00'
-    },
-    {
-      key: '10:30',
-      value: '10:30'
-    },
-    {
-      key: '11:00',
-      value: '11:00'
-    },
-    {
-      key: '11:30',
-      value: '11:30'
-    },
-    {
-      key: '12:00',
-      value: '12:00'
-    },
-    {
-      key: '12:30',
-      value: '12:30'
-    },
-    {
-      key: '13:00',
-      value: '13:00'
-    },
-    {
-      key: '13:30',
-      value: '13:30'
-    },
-    {
-      key: '14:00',
-      value: '14:00'
-    },
-    {
-      key: '14:30',
-      value: '14:30'
-    },
-    {
-      key: '15:00',
-      value: '15:00'
-    },
-    {
-      key: '15:30',
-      value: '15:30'
-    },
-    {
-      key: '16:00',
-      value: '16:00'
-    },
-    {
-      key: '16:30',
-      value: '16:30'
-    },
-    {
-      key: '17:00',
-      value: '17:00'
-    },
-    {
-      key: '17:30',
-      value: '17:30'
-    },
-    {
-      key: '18:00',
-      value: '18:00'
-    },
-    {
-      key: '18:30',
-      value: '18:30'
-    },
-    {
-      key: '19:00',
-      value: '19:00'
-    },
-    {
-      key: '19:30',
-      value: '19:30'
-    },
-    {
-      key: '20:00',
-      value: '20:00'
-    },
-    {
-      key: '20:30',
-      value: '20:30'
-    },
-    {
-      key: '21:00',
-      value: '21:00'
-    },
-    {
-      key: '21:30',
-      value: '21:30'
-    },
-    {
-      key: '22:00',
-      value: '22:00'
-    },
-    {
-      key: '22:30',
-      value: '22:30'
-    },
-    {
-      key: '23:00',
-      value: '23:00'
-    },
-    {
-      key: '23:30',
-      value: '23:30'
-    }
-  ]
-}
diff --git a/src/views/fxdd/tqyb/pltj/index.css b/src/views/fxdd/tqyb/pltj/index.css
deleted file mode 100644
index 8ff1b05..0000000
--- a/src/views/fxdd/tqyb/pltj/index.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-.pltl_table {
-  overflow: hidden;
-  height: 100%;
-}
-.listBox .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-}
-.listBox .txt {
-  font-size: 12px;
-}
-.listBox .txt:nth-child(1) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  line-height: 14px;
-}
-.listBox .txt:nth-child(2) {
-  width: 25%;
-  text-align: center;
-}
-.listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.listBox .txt:nth-child(4) {
-  width: 25%;
-  line-height: 14px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.button-group {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 1px solid #eee;
-  border-top: 1px solid #eee;
-  border-radius: 5px;
-  overflow: hidden;
-}
-.button-group div {
-  font-size: 14px;
-  text-align: center;
-  flex: 1;
-  border-left: 1px solid #eee;
-  border-right: 1px solid #eee;
-  color: #333;
-}
diff --git a/src/views/fxdd/tqyb/pltj/index.js b/src/views/fxdd/tqyb/pltj/index.js
deleted file mode 100644
index 5e155b4..0000000
--- a/src/views/fxdd/tqyb/pltj/index.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import data from '../dataConfig'
-import clsx from 'clsx'
-import './index.less'
-import moment from 'moment'
-import { weatherasin } from '../../../../service/fxdd'
-import EchartsBar from '../../../../components/echarts/echartsBar'
-
-const { Panel } = Collapse
-
-const Page = ({ params, leg, rl }) => {
-  const dispatch = useDispatch()
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  const wscdDrpTmType = useSelector(s => s.overallview.wscdDrpTmType)
-  const [loading, setLoading] = useState(true)
-  const [dataTl, seDataTl] = useState(leg)
-  const [datarl, seDatarl] = useState(rl)
-
-  const [tableData, setTableData] = useState([])
-
-  useEffect(() => {
-    if (params.tm) {
-      setLoading(true)
-      getData(params)
-    }
-  }, [params])
-
-  useEffect(() => {
-    seDataTl(leg)
-    seDatarl(rl)
-  }, [leg])
-
-  const getData = async params => {
-    let obj = {
-      tm: params.tm
-        ? params.tm.format('YYYYMMDD') + params.ts
-        : moment().format('YYYYMMDD') + '08'
-    }
-    let list = await weatherasin(obj)
-    console.log('arrdd', list)
-    list.forEach((item, index) => {
-      item.key = index
-      item.dataTitle = item.timeRainVos.map(obj => {
-        return obj.tm.split(' ')[1].split(':')[0] + ':00'
-      })
-      // item.dataBar = item.timeRainVos.map(a => a.drp.toFixed(1))
-      item.dataBar = item.timeRainVos.map(a => [a.tm, a.drp.toFixed(1)])
-      item.drp = item.drp.toFixed(1) + 'mm'
-    })
-    setTableData(list)
-    setLoading(false)
-  }
-
-  const columns = [
-    {
-      // title: '水库统计',
-      dataIndex: 'name',
-      key: 'name',
-      ellipsis: true
-    },
-    {
-      // title: '流域降雨',
-      dataIndex: 'drp',
-      key: 'drp',
-      ellipsis: true
-    }
-  ]
-
-  return (
-    <>
-      <div className='tqyb_table pltl_table'>
-        {/* {tableData.length > 0 ? ( */}
-        <Table
-          columns={columns}
-          showHeader={false}
-          pagination={false}
-          loading={loading}
-          expandable={{
-            expandedRowRender: record => (
-              <div style={{ heigth: 550, marginTop: '10px' }}>
-                <EchartsBar
-                  data={record.dataBar}
-                  dataTl={record.dataTitle}
-                ></EchartsBar>
-              </div>
-            )
-          }}
-          dataSource={tableData}
-          // scroll={{ y: 'calc(100vh - 520px)' }}
-          scroll={{
-            y: hasAlertBox ? 'calc((100vh - 500px))' : 'calc((100vh - 480px))'
-          }}
-        />
-        {/* ) : null} */}
-      </div>
-      {/*  */}
-      {/* <div className='listBox'></div> */}
-      <div className='subTitle' style={{ marginTop: '15px' }}>
-        站点统计(个)：
-        <span
-          style={{ fontSize: '18px', color: '#0B81FF', marginRight: '10px' }}
-        >
-          {dataTl.length > 0 ? eval(leg.join('+')) : 0}
-        </span>{' '}
-        其中有雨站点：
-        <span style={{ fontSize: '18px', color: '#0B81FF' }}>{datarl}</span>
-      </div>
-      <div className='summary'>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>≥250</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[0] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>100~250</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[1] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/很多点.png`} alt='' />
-          <div className='sum-num'>50~100</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[2] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/五点.png`} alt='' />
-          <div className='sum-num'>25~50</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[3] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/三点.png`} alt='' />
-          <div className='sum-num'>10~25</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[4] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/fxdd/两点.png`} alt='' />
-          <div className='sum-num'>0.1~10</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[5] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt='' />
-          <div className='sum-num'>无雨</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[6] : '0'}</div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/pltj/index.less b/src/views/fxdd/tqyb/pltj/index.less
deleted file mode 100644
index ead8e57..0000000
--- a/src/views/fxdd/tqyb/pltj/index.less
+++ /dev/null
@@ -1,74 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-.pltl_table {
-  overflow: hidden;
-  height: 100%;
-}
-
-.listBox {
-  .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-  }
-
-  .txt {
-    font-size: 12px;
-
-    &:nth-child(1) {
-      width: 25%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 25%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-
-.button-group {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 1px solid #eee;
-  border-top: 1px solid #eee;
-  border-radius: 5px;
-  overflow: hidden;
-
-  div {
-    font-size: 14px;
-    text-align: center;
-    flex: 1;
-    border-left: 1px solid #eee;
-    border-right: 1px solid #eee;
-    color: #333;
-  }
-}
diff --git a/src/views/fxdd/tqyb/qltj/index.js b/src/views/fxdd/tqyb/qltj/index.js
deleted file mode 100644
index 066c4c8..0000000
--- a/src/views/fxdd/tqyb/qltj/index.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import data from '../dataConfig'
-import clsx from 'clsx'
-// import './index.less'
-import moment from 'moment'
-import { weatherasin } from '../../../../service/fxdd'
-import EchartsBar from '../../../../components/echarts/echartsBar'
-
-const { Panel } = Collapse
-
-const Page = ({ params }) => {
-  const dispatch = useDispatch()
-  const wscdDrpTmType = useSelector(s => s.overallview.wscdDrpTmType)
-  const [loading, setLoading] = useState(true)
-
-  const [tableData, setTableData] = useState([])
-  // console.log(tableData)
-  useEffect(() => {
-    // return () => {}
-    // 默认参数
-
-    getData({ tm: moment().format('YYYYMMDD') + '08' })
-  }, [])
-  const getData = async params => {
-    let list = await weatherasin(params)
-    console.log('arrddddddddddddd', list)
-
-    list.forEach((item, index) => {
-      item.key = index
-      item.dataTitle = item.timeRainVos.map(obj => {
-        return obj.tm.split(' ')[1].split(':')[0] + ':00'
-      })
-      item.dataBar = item.timeRainVos.map(a => a.drp)
-    })
-    setTableData(list)
-  }
-
-  const columns = [
-    {
-      // title: '水库统计',
-      dataIndex: 'name',
-      key: 'name'
-    },
-    {
-      // title: '流域降雨',
-      dataIndex: 'age',
-      key: 'age'
-    }
-  ]
-
-  return (
-    <>
-      <div className='tqyb_table'>
-        <Table
-          columns={columns}
-          showHeader={false}
-          pagination={false}
-          expandable={{
-            expandedRowRender: record => (
-              <div style={{ heigth: 550, marginTop: '10px' }}>
-                <EchartsBar
-                  data={record.dataBar}
-                  dataTl={record.dataTitle}
-                ></EchartsBar>
-              </div>
-            )
-          }}
-          dataSource={tableData}
-        />
-      </div>
-      {/*  */}
-      {/* <div className='listBox'></div> */}
-      <div className='subTitle' style={{ marginTop: '15px' }}>
-        站点统计(个)：
-        <span
-          style={{ fontSize: '18px', color: '#0B81FF', marginRight: '10px' }}
-        >
-          61
-        </span>{' '}
-        其中有雨站点：
-        <span style={{ fontSize: '18px', color: '#0B81FF' }}>5</span>
-      </div>
-      <div className='summary'>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>≥250</div>
-          <div className='sum-count'>0</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>100~250</div>
-          <div className='sum-count'>0</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>50~100</div>
-          <div className='sum-count'>1</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>25~50</div>
-          <div className='sum-count'>0</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>10~25</div>
-          <div className='sum-count'>0</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>0.1~10</div>
-          <div className='sum-count'>4</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt='' />
-          <div className='sum-num'>无雨</div>
-          <div className='sum-count'>56</div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/qyjy/index.css b/src/views/fxdd/tqyb/qyjy/index.css
deleted file mode 100644
index 24efc32..0000000
--- a/src/views/fxdd/tqyb/qyjy/index.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-.pltl_table {
-  overflow: hidden;
-  height: 100%;
-}
-.listBox .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-}
-.listBox .txt {
-  font-size: 12px;
-}
-.listBox .txt:nth-child(1) {
-  width: 28%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  line-height: 14px;
-}
-.listBox .txt:nth-child(2) {
-  width: 20%;
-  text-align: center;
-}
-.listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.listBox .txt:nth-child(4) {
-  width: 25%;
-  line-height: 14px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.button-group {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 1px solid #eee;
-  border-top: 1px solid #eee;
-  border-radius: 5px;
-  overflow: hidden;
-}
-.button-group div {
-  font-size: 14px;
-  text-align: center;
-  flex: 1;
-  border-left: 1px solid #eee;
-  border-right: 1px solid #eee;
-  color: #333;
-}
diff --git a/src/views/fxdd/tqyb/qyjy/index.js b/src/views/fxdd/tqyb/qyjy/index.js
deleted file mode 100644
index 9afdc4d..0000000
--- a/src/views/fxdd/tqyb/qyjy/index.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import data from '../dataConfig'
-import clsx from 'clsx'
-import './index.less'
-import moment from 'moment'
-import { weatherArea } from '../../../../service/fxdd'
-import EchartsBar from '../../../../components/echarts/echartsBar'
-
-const { Panel } = Collapse
-
-const Page = ({ params, leg, rl }) => {
-  const dispatch = useDispatch()
-
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  const wscdDrpTmType = useSelector(s => s.overallview.wscdDrpTmType)
-  const [loading, setLoading] = useState(true)
-  const [dataTl, seDataTl] = useState(leg)
-  const [datarl, seDatarl] = useState(rl)
-
-  const [tableData, setTableData] = useState([])
-  useEffect(() => {
-    seDataTl(leg)
-    seDatarl(rl)
-  }, [leg])
-  // console.log(tableData)
-  useEffect(() => {
-    // return () => {}
-    // 默认参数
-    if (params.tm) {
-      setLoading(true)
-      getData(params)
-    }
-  }, [params])
-  const getData = async params => {
-    let obj = {
-      tm: params.tm
-        ? params.tm.format('YYYYMMDD') + params.ts
-        : moment().format('YYYYMMDD') + '08'
-    }
-    let list = await weatherArea(obj)
-    console.log('arrdd', list)
-    list.forEach((item, index) => {
-      item.key = index
-      item.dataTitle = item.timeRainVos.map(obj => {
-        return obj.tm.split(' ')[1].split(':')[0] + ':00'
-      })
-      // item.dataBar = item.timeRainVos.map(a => a.drp.toFixed(1))
-      item.dataBar = item.timeRainVos.map(a => [a.tm, a.drp.toFixed(1)])
-      item.drp = item.drp.toFixed(1) + 'mm'
-    })
-    setTableData(list)
-    setLoading(false)
-  }
-
-  const columns = [
-    {
-      // title: '水库统计',
-      dataIndex: 'name',
-      key: 'name',
-      ellipsis: true
-    },
-    {
-      // title: '流域降雨',
-      dataIndex: 'drp',
-      key: 'drp',
-      ellipsis: true
-    }
-  ]
-
-  return (
-    <>
-      <div className='tqyb_table pltl_table'>
-        <Table
-          columns={columns}
-          showHeader={false}
-          pagination={false}
-          loading={loading}
-          expandable={{
-            expandedRowRender: record => (
-              <div style={{ heigth: 550, marginTop: '10px' }}>
-                <EchartsBar
-                  data={record.dataBar}
-                  dataTl={record.dataTitle}
-                ></EchartsBar>
-              </div>
-            )
-          }}
-          dataSource={tableData}
-          // scroll={{ y: 'calc(100vh - 520px)' }}
-          scroll={{
-            y: hasAlertBox ? 'calc((100vh - 500px))' : 'calc((100vh - 480px))'
-          }}
-        />
-      </div>
-      {/*  */}
-      {/* <div className='listBox'></div> */}
-      <div className='subTitle' style={{ marginTop: '15px' }}>
-        站点统计(个)：
-        <span
-          style={{ fontSize: '18px', color: '#0B81FF', marginRight: '10px' }}
-        >
-          {dataTl.length > 0 ? eval(leg.join('+')) : 0}
-        </span>{' '}
-        其中有雨站点：
-        <span style={{ fontSize: '18px', color: '#0B81FF' }}>{datarl}</span>
-      </div>
-      <div className='summary'>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>≥250</div>
-          <div className='sum-count'> {dataTl.length > 0 ? leg[0] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-          <div className='sum-num'>100~250</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[1] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/很多点.png`} alt='' />
-          <div className='sum-num'>50~100</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[2] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/五点.png`} alt='' />
-          <div className='sum-num'>25~50</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[3] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/三点.png`} alt='' />
-          <div className='sum-num'>10~25</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[4] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/fxdd/两点.png`} alt='' />
-          <div className='sum-num'>0.1~10</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[5] : '0'}</div>
-        </div>
-        <div className='sum-item'>
-          <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt='' />
-          <div className='sum-num'>无雨</div>
-          <div className='sum-count'>{dataTl.length > 0 ? leg[6] : '0'}</div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/qyjy/index.less b/src/views/fxdd/tqyb/qyjy/index.less
deleted file mode 100644
index 5086e32..0000000
--- a/src/views/fxdd/tqyb/qyjy/index.less
+++ /dev/null
@@ -1,74 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-.pltl_table {
-  overflow: hidden;
-  height: 100%;
-}
-
-.listBox {
-  .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-  }
-
-  .txt {
-    font-size: 12px;
-
-    &:nth-child(1) {
-      width: 28%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 20%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-
-.button-group {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 1px solid #eee;
-  border-top: 1px solid #eee;
-  border-radius: 5px;
-  overflow: hidden;
-
-  div {
-    font-size: 14px;
-    text-align: center;
-    flex: 1;
-    border-left: 1px solid #eee;
-    border-right: 1px solid #eee;
-    color: #333;
-  }
-}
diff --git a/src/views/fxdd/tqyb/sktj/index.css b/src/views/fxdd/tqyb/sktj/index.css
deleted file mode 100644
index 86414c7..0000000
--- a/src/views/fxdd/tqyb/sktj/index.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-.sktj_listBox {
-  height: 100%;
-}
-.sktj_listBox .ant-collapse-header {
-  padding: 4px 6px;
-  background: #f2f3f5;
-  font-weight: bold;
-  font-size: 12px;
-}
-.sktj_listBox .txtBox {
-  margin: 2px 0;
-  border-bottom: 1px solid #eee;
-  cursor: pointer;
-}
-.sktj_listBox .txt {
-  font-size: 12px;
-}
-.sktj_listBox .txt:nth-child(1) {
-  width: 25%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  line-height: 14px;
-}
-.sktj_listBox .txt:nth-child(2) {
-  width: 25%;
-  text-align: center;
-}
-.sktj_listBox .txt:nth-child(3) {
-  width: 25%;
-  text-align: center;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.sktj_listBox .txt:nth-child(4) {
-  width: 25%;
-  line-height: 14px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/src/views/fxdd/tqyb/sktj/index.js b/src/views/fxdd/tqyb/sktj/index.js
deleted file mode 100644
index 0cafa72..0000000
--- a/src/views/fxdd/tqyb/sktj/index.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import { Collapse, Table, Tabs, Segmented, Spin } from 'antd'
-import React, { useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import moment from 'moment'
-import data from '../dataConfig2'
-import './index.less'
-import EchartsBar from '../../../../components/echarts/echartsBar'
-
-import { weatherRes, weatherLevel } from '../../../../service/fxdd'
-const { Panel } = Collapse
-const Page = ({ params, leg, rl }) => {
-  const [loading, setLoading] = useState(true)
-  // const [tableData, setTableData] = useState(data.data)
-  const [tableData, setTableData] = useState([])
-  const [tqData, setTqData] = useState(data.tqDate)
-  const [dataTl, seDataTl] = useState(leg)
-  const [datarl, seDatarl] = useState(rl)
-  const [dataDt, setDataDt] = useState()
-
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-
-  useEffect(() => {
-    console.log('getDatagetDatagetData', params)
-    if (params.ts) {
-      setLoading(true)
-      getData(params)
-    }
-  }, [params])
-
-  useEffect(() => {
-    seDataTl(leg)
-    seDatarl(rl)
-  }, [leg])
-
-  const getData = async param => {
-    let obj = {
-      tm: param.ts
-        ? param.tm.format('YYYYMMDD') + params.ts
-        : moment().format('YYYYMMDD') + '08'
-    }
-    console.log('paramparamparamparamparam', param)
-    let dtt = param.ts
-      ? param.tm.format('YYYYMMDD')
-      : moment().format('YYYYMMDD')
-    setDataDt(dtt)
-    let list = await weatherRes(obj)
-    list.forEach((item, index) => {
-      item.key = index
-      item.dataTitle = item.timeRainVos.map(obj => {
-        return obj.tm.split(' ')[1].split(':')[0] + ':00'
-      })
-      // item.dataBar = item.timeRainVos.map(a => a.drp.toFixed(1))
-      item.dataBar = item.timeRainVos.map(a => [a.tm, a.drp.toFixed(1)])
-      item.drp = item.drp.toFixed(1) + 'mm'
-      item.dt = item.timeRainVos.map(a => a.tm)
-    })
-
-    setTableData(list)
-    setLoading(false)
-  }
-  const columns = [
-    {
-      title: '水库统计',
-      dataIndex: 'name',
-      key: 'name',
-      ellipsis: true
-    },
-    {
-      title: '流域降雨',
-      dataIndex: 'drp',
-      key: 'drp',
-      ellipsis: true
-    }
-  ]
-  return (
-    <>
-      <div className='sktj_listBox'>
-        {/* {tableData.length > 0 ? ( */}
-        <Table
-          columns={columns}
-          loading={loading}
-          showHeader={false}
-          pagination={false}
-          expandable={{
-            expandedRowRender: record => (
-              <div style={{ heigth: 550, marginTop: '10px' }}>
-                <EchartsBar
-                  data={record.dataBar}
-                  dataTl={record.dataTitle}
-                  name='雨量'
-                  dt={record.dt}
-                ></EchartsBar>
-              </div>
-            )
-            // rowExpandable: (record) => record.name !== 'Not Expandable',
-          }}
-          dataSource={tableData}
-          // scroll={{ y: 'calc(100vh - 520px)' }}
-          scroll={{
-            y: hasAlertBox ? 'calc((100vh - 500px))' : 'calc((100vh - 480px))'
-          }}
-        />
-        {/* ) : (
-          <div style={{ height: '350px' }}></div>  scroll={{y: hasAlertBox ? "calc((100vh - 370px)/2)" : "calc((100vh - 350px)/2)"}}/>
-        )} */}
-      </div>
-      <div>
-        {/*  */}
-        <div className='subTitle' style={{ marginTop: '15px' }}>
-          站点统计(个)：
-          <span
-            style={{ fontSize: '18px', color: '#0B81FF', marginRight: '10px' }}
-          >
-            {leg.length > 0 ? eval(leg.join('+')) : 0}
-          </span>{' '}
-          其中有雨站点：
-          <span style={{ fontSize: '18px', color: '#0B81FF' }}>{datarl}</span>
-        </div>
-        <div className='summary'>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-            <div className='sum-num'>≥250</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[0] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' />
-            <div className='sum-num'>100~250</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[1] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/很多点.png`} alt='' />
-            <div className='sum-num'>50~100</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[2] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/五点.png`} alt='' />
-            <div className='sum-num'>25~50</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[3] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/三点.png`} alt='' />
-            <div className='sum-num'>10~25</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[4] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img
-              src={`${process.env.PUBLIC_URL}/assets/fxdd/两点.png`}
-              alt=''
-            />
-            <div className='sum-num'>0.1~10</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[5] : '0'}</div>
-          </div>
-          <div className='sum-item'>
-            <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt='' />
-            <div className='sum-num'>无雨</div>
-            <div className='sum-count'>{dataTl.length > 0 ? leg[6] : '0'}</div>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/sktj/index.less b/src/views/fxdd/tqyb/sktj/index.less
deleted file mode 100644
index a719a19..0000000
--- a/src/views/fxdd/tqyb/sktj/index.less
+++ /dev/null
@@ -1,55 +0,0 @@
-.tqyb_table {
-  width: 100%;
-}
-
-.sktj_listBox {
-  // overflow: auto;
-  // height: 400px;
-  height: 100%;
-
-  .ant-collapse-header {
-    padding: 4px 6px;
-    background: #f2f3f5;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .txtBox {
-    margin: 2px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-  }
-
-  .txt {
-    font-size: 12px;
-
-    &:nth-child(1) {
-      width: 25%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      line-height: 14px;
-    }
-
-    &:nth-child(2) {
-      width: 25%;
-      text-align: center;
-    }
-
-    &:nth-child(3) {
-      width: 25%;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    &:nth-child(4) {
-      width: 25%;
-      line-height: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
diff --git a/src/views/fxdd/tqyb/tqxx/index.js b/src/views/fxdd/tqyb/tqxx/index.js
deleted file mode 100644
index a4184a1..0000000
--- a/src/views/fxdd/tqyb/tqxx/index.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-import { useDispatch, useSelector } from 'react-redux'
-import { sevenDays } from '../../../../service/fxdd'
-import { center } from '@turf/turf'
-import 'qweather-icons/font/qweather-icons.css'
-import { getIcon } from './tool'
-
-const Page = ({ activeKey }) => {
-  const dispatch = useDispatch()
-  const [items, setTableData] = useState([
-    // {
-    //   date: '11日',
-    //   discribe: '晴转多云',
-    //   wd: '23/35℃'
-    // },
-    // {
-    //   date: '12日',
-    //   discribe: '晴转多云',
-    //   wd: '23/35℃'
-    // },
-    // {
-    //   date: '13日',
-    //   discribe: '晴转多云',
-    //   wd: '23/35℃'
-    // },
-    // {
-    //   date: '14日',
-    //   discribe: '晴转多云',
-    //   wd: '23/35℃'
-    // },
-    // {
-    //   date: '15日',
-    //   discribe: '晴转多云',
-    //   wd: '23/35℃'
-    // },
-    // {
-    //   date: '16日',
-    //   discribe: '晴转多云',
-    //   wd: '23/35℃'
-    // },
-    // {
-    //   date: '17日',
-    //   discribe: '晴转多云',
-    //   wd: '23/35℃'
-    // }
-  ])
-  const [list, setList] = useState()
-
-  const getData = async params => {
-    let list = await sevenDays(params)
-
-    let arr = list.map(item => {
-      item.date = item.fxDate ? item.fxDate.split('-')[2] + '日' : ''
-      item.discribe =
-        item.textDay == item.textNight
-          ? item.textDay
-          : item.textDay + '转' + item.textNight
-      item.wd = item.tempMin + '/' + item.tempMax + '℃'
-      item.icon1 = getIcon(item.textDay)
-      item.icon2 = getIcon(item.textNight)
-
-      return item
-    })
-    setTableData(arr)
-  }
-
-  useEffect(() => {
-    getData()
-
-    return () => {
-      dispatch.runtime.closeFeaturePopAll()
-    }
-  }, [])
-
-  return (
-    <div className='monitor-rainfall waterLevelBox'>
-      <div className='tq_panel'>
-        {items.map((item, index) => (
-          <div className='tq_pnode' key={index}>
-            <div className='tq_item'>{item.date}</div>
-            <div className='tq_item'>
-              <div
-                style={{
-                  fontSize: '24px',
-                  textAlign: 'center',
-                  color: 'rgba(92, 133, 208,1)'
-                }}
-              >
-                <i className={item.icon1}></i>
-              </div>
-              {/* <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt='' /> */}
-            </div>
-            <div className='tq_item'>
-              {/* <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt='' /> */}
-              <div
-                style={{
-                  fontSize: '24px',
-                  textAlign: 'center',
-                  color: 'rgba(92, 133, 208,1)'
-                }}
-              >
-                <i className={item.icon2}></i>
-              </div>
-            </div>
-            <div className='tq_item'>{item.discribe}</div>
-            <div className='tq_item'>{item.wd}</div>
-          </div>
-        ))}
-      </div>
-    </div>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/tqxx/index.less b/src/views/fxdd/tqyb/tqxx/index.less
deleted file mode 100644
index a250226..0000000
--- a/src/views/fxdd/tqyb/tqxx/index.less
+++ /dev/null
@@ -1,32 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-
-  .tq_panel {
-    display: flex;
-
-    .tq_pnode {
-      height: 15rem;
-      width: 4rem;
-      background: #e9f5fe;
-      margin: 0.2rem;
-      border-radius: 0.2rem;
-      justify-content: center;
-      text-align: center;
-      display: flex;
-      flex-direction: column;
-
-      .tq_item {
-        height: 3rem;
-      }
-
-      .tq_item:nth-child(1) {
-        padding-top: 0.4rem;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxdd/tqyb/tqxx/tool.js b/src/views/fxdd/tqyb/tqxx/tool.js
deleted file mode 100644
index 35d967c..0000000
--- a/src/views/fxdd/tqyb/tqxx/tool.js
+++ /dev/null
@@ -1,57 +0,0 @@
-export function getIcon (data) {
-  let icons = null
-  switch (data) {
-    case '小雨':
-      icons = 'qi-305-fill'
-      break
-
-    case '中雨':
-      icons = 'qi-306-fill'
-      break
-
-    case '大雨':
-      icons = 'qi-307-fill'
-      break
-    case '暴雨':
-      icons = 'qi-308-fill'
-      break
-    case '阵雨':
-      icons = 'qi-300-fill'
-      break
-    case '晴':
-      icons = 'qi-100-fill'
-      break
-    case '多云':
-      icons = 'qi-101-fill'
-      break
-    case '阴天':
-      icons = 'qi-104-fill'
-      break
-    case '阴':
-      icons = 'qi-104-fill'
-      break
-    case '雪':
-      icons = 'qi-400-fill'
-      break
-    case '小雪':
-      icons = 'qi-400-fill'
-      break
-    case '中雪':
-      icons = 'qi-401-fill'
-      break
-    case '大雪':
-      icons = 'qi-402-fill'
-      break
-    case '暴雪':
-      icons = 'qi-403-fill'
-      break
-    case '雨夹雪':
-      icons = 'qi-1221-fill'
-      break
-
-    default:
-      // 语句体n+1;
-      break
-  }
-  return icons
-}
diff --git a/src/views/fxdd/tqyb/tqxx/toolbar.js b/src/views/fxdd/tqyb/tqxx/toolbar.js
deleted file mode 100644
index 6d42050..0000000
--- a/src/views/fxdd/tqyb/tqxx/toolbar.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Button, DatePicker, Checkbox } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import moment from 'moment';
-const CheckboxGroup = Checkbox.Group;
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ onSearch, downLoad }) => {
-  const [form] = Form.useForm();
-
-  const onSearchClick = (val) => {
-    val.tm = val.tm ? moment(val.tm).format('YYYY-MM-DD') : ''
-    onSearch(val);
-  }
-
-
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' initialValues={{ types: ["SH", "SW", "QX", "SK"], tm: moment() }}>
-
-        </Form>
-
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxdd/tqyb/tqxx2/dataConfig.js b/src/views/fxdd/tqyb/tqxx2/dataConfig.js
deleted file mode 100644
index 2f6b5cb..0000000
--- a/src/views/fxdd/tqyb/tqxx2/dataConfig.js
+++ /dev/null
@@ -1,4639 +0,0 @@
-export default {
-  xzqh: [
-    {
-      "adcd": "420529000000000",
-      "adnm": "五峰土家族自治县",
-      "pcount": 200000,
-      "htcount": 63880,
-      "ldarea": 2372,
-      "plarea": 28.8,
-      "prevtp": "0",
-      "lgtd": 110.670293,
-      "lttd": 30.201663,
-      "children": [
-        {
-          "adcd": "420529101000000",
-          "adnm": "五峰镇",
-          "pcount": 39881,
-          "htcount": 13699,
-          "ldarea": 456,
-          "prevtp": "0",
-          "lgtd": 110.64161,
-          "lttd": 30.184073,
-          "children": [
-            {
-              "adcd": "420529101001000",
-              "adnm": "北门社区",
-              "pcount": 3164,
-              "htcount": 1536,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.661896,
-              "lttd": 30.204225,
-              "children": [
-                {
-                  "adcd": "420529101001100",
-                  "adnm": "北门社区上",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.667857,
-                  "lttd": 30.204172
-                },
-                {
-                  "adcd": "420529101001101",
-                  "adnm": "北门社区中",
-                  "pcount": 1054,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.663659,
-                  "lttd": 30.205619
-                },
-                {
-                  "adcd": "420529101001102",
-                  "adnm": "北门社区下",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.662192,
-                  "lttd": 30.207136
-                }
-              ]
-            },
-            {
-              "adcd": "420529101002000",
-              "adnm": "正街社区",
-              "pcount": 4725,
-              "htcount": 2340,
-              "ldarea": 3.5,
-              "prevtp": "2",
-              "lgtd": 110.670643,
-              "lttd": 30.200895,
-              "children": []
-            },
-            {
-              "adcd": "420529101003000",
-              "adnm": "长坪社区",
-              "pcount": 5725,
-              "htcount": 2226,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.665503,
-              "lttd": 30.190297,
-              "children": [
-                {
-                  "adcd": "420529101003100",
-                  "adnm": "长坪上",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.66546,
-                  "lttd": 30.187869
-                },
-                {
-                  "adcd": "420529101003101",
-                  "adnm": "长坪下",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.670436,
-                  "lttd": 30.196018
-                }
-              ]
-            },
-            {
-              "adcd": "420529101201000",
-              "adnm": "石梁司村",
-              "pcount": 3012,
-              "htcount": 890,
-              "ldarea": 44,
-              "prevtp": "0",
-              "lgtd": 110.656911,
-              "lttd": 30.175933,
-              "children": [
-                {
-                  "adcd": "420529101201100",
-                  "adnm": "十三组(铁厂湾）",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18.05,
-                  "prevtp": "2",
-                  "lgtd": 110.606521,
-                  "lttd": 30.14701
-                },
-                {
-                  "adcd": "420529101201101",
-                  "adnm": "三组上（小汊湾）",
-                  "pcount": 536,
-                  "htcount": 145,
-                  "ldarea": 9.4,
-                  "prevtp": "2",
-                  "lgtd": 110.653196,
-                  "lttd": 30.171942
-                },
-                {
-                  "adcd": "420529101201102",
-                  "adnm": "二组（杨腊岭）",
-                  "pcount": 691,
-                  "htcount": 187,
-                  "ldarea": 10.5,
-                  "prevtp": "2",
-                  "lgtd": 110.660371,
-                  "lttd": 30.180565
-                },
-                {
-                  "adcd": "420529101201103",
-                  "adnm": "十二组",
-                  "pcount": 148,
-                  "htcount": 40,
-                  "ldarea": 6,
-                  "prevtp": "0",
-                  "lgtd": 110.623533,
-                  "lttd": 30.147948
-                },
-                {
-                  "adcd": "420529101201104",
-                  "adnm": "十五组",
-                  "pcount": 270,
-                  "htcount": 73,
-                  "ldarea": 8.05,
-                  "prevtp": "2",
-                  "lgtd": 110.647408,
-                  "lttd": 30.1812815
-                },
-                {
-                  "adcd": "420529101201105",
-                  "adnm": "三组下",
-                  "pcount": 520,
-                  "htcount": 140,
-                  "ldarea": 7.2,
-                  "prevtp": "2",
-                  "lgtd": 110.655473,
-                  "lttd": 30.176246
-                }
-              ]
-            },
-            {
-              "adcd": "420529101202000",
-              "adnm": "香东村",
-              "pcount": 2100,
-              "htcount": 625,
-              "ldarea": 14.6,
-              "prevtp": "0",
-              "lgtd": 110.684722,
-              "lttd": 30.195305,
-              "children": [
-                {
-                  "adcd": "420529101202100",
-                  "adnm": "七组（口子泉）",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 110.664549,
-                  "lttd": 30.208265
-                },
-                {
-                  "adcd": "420529101202101",
-                  "adnm": "八组（砂坪）",
-                  "pcount": 114,
-                  "htcount": 31,
-                  "ldarea": 10.3,
-                  "prevtp": "2",
-                  "lgtd": 110.677247,
-                  "lttd": 30.207814
-                },
-                {
-                  "adcd": "420529101202102",
-                  "adnm": "七组（天池河）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.658039,
-                  "lttd": 30.213228
-                }
-              ]
-            },
-            {
-              "adcd": "420529101203000",
-              "adnm": "小河村",
-              "pcount": 3446,
-              "htcount": 961,
-              "ldarea": 36,
-              "prevtp": "0",
-              "lgtd": 110.648435,
-              "lttd": 30.221484,
-              "children": [
-                {
-                  "adcd": "420529101203100",
-                  "adnm": "一组",
-                  "pcount": 620,
-                  "htcount": 167,
-                  "ldarea": 10,
-                  "prevtp": "1",
-                  "lgtd": 110.628695,
-                  "lttd": 30.218468
-                },
-                {
-                  "adcd": "420529101203101",
-                  "adnm": "十一组（前坪）",
-                  "pcount": 407,
-                  "htcount": 110,
-                  "ldarea": 14,
-                  "prevtp": "2",
-                  "lgtd": 110.593009,
-                  "lttd": 30.2113403
-                },
-                {
-                  "adcd": "420529101203102",
-                  "adnm": "七组",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18,
-                  "prevtp": "1",
-                  "lgtd": 110.606354,
-                  "lttd": 30.207401
-                }
-              ]
-            },
-            {
-              "adcd": "420529101204000",
-              "adnm": "楠木河村",
-              "pcount": 1526,
-              "htcount": 442,
-              "ldarea": 19.8,
-              "prevtp": "0",
-              "lgtd": 110.464955,
-              "lttd": 30.174449,
-              "children": [
-                {
-                  "adcd": "420529101204100",
-                  "adnm": "一组",
-                  "pcount": 220,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.661256,
-                  "lttd": 30.2369128
-                },
-                {
-                  "adcd": "420529101204101",
-                  "adnm": "三组",
-                  "pcount": 195,
-                  "htcount": 53,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.679309,
-                  "lttd": 30.2514761
-                }
-              ]
-            },
-            {
-              "adcd": "420529101205000",
-              "adnm": "水浕司村",
-              "pcount": 3320,
-              "htcount": 1045,
-              "ldarea": 36.6,
-              "prevtp": "0",
-              "lgtd": 110.627483,
-              "lttd": 30.248739,
-              "children": [
-                {
-                  "adcd": "420529101205100",
-                  "adnm": "二组（渡糟）",
-                  "pcount": 240,
-                  "htcount": 65,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.61626,
-                  "lttd": 30.2579
-                },
-                {
-                  "adcd": "420529101205101",
-                  "adnm": "四组",
-                  "pcount": 296,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.625852,
-                  "lttd": 30.238361
-                },
-                {
-                  "adcd": "420529101205102",
-                  "adnm": "六组",
-                  "pcount": 258,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.626089,
-                  "lttd": 30.249254
-                },
-                {
-                  "adcd": "420529101205103",
-                  "adnm": "三组",
-                  "pcount": 249,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.62251,
-                  "lttd": 30.249145
-                },
-                {
-                  "adcd": "420529101205104",
-                  "adnm": "一组（水浕司）",
-                  "pcount": 270,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.607703,
-                  "lttd": 30.266896
-                }
-              ]
-            },
-            {
-              "adcd": "420529101206000",
-              "adnm": "油菜坪",
-              "pcount": 650,
-              "htcount": 163,
-              "ldarea": 2.8,
-              "prevtp": "0",
-              "lgtd": 110.622123,
-              "lttd": 30.276306,
-              "children": [
-                {
-                  "adcd": "420529101206100",
-                  "adnm": "一组",
-                  "pcount": 340,
-                  "htcount": 87,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.611682,
-                  "lttd": 30.269515
-                }
-              ]
-            },
-            {
-              "adcd": "420529101207000",
-              "adnm": "黄粮坪村",
-              "pcount": 1217,
-              "htcount": 352,
-              "ldarea": 24.3,
-              "prevtp": "0",
-              "lgtd": 110.652169,
-              "lttd": 30.2798,
-              "children": [
-                {
-                  "adcd": "420529101207100",
-                  "adnm": "一组",
-                  "pcount": 302,
-                  "htcount": 95,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.642672,
-                  "lttd": 30.280247
-                }
-              ]
-            },
-            {
-              "adcd": "420529101208000",
-              "adnm": "谢家坪村",
-              "pcount": 2302,
-              "htcount": 644,
-              "ldarea": 23.2,
-              "prevtp": "0",
-              "lgtd": 110.58412,
-              "lttd": 30.299189,
-              "children": [
-                {
-                  "adcd": "420529101208100",
-                  "adnm": "三组",
-                  "pcount": 215,
-                  "htcount": 67,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592951,
-                  "lttd": 30.3194646
-                },
-                {
-                  "adcd": "420529101208101",
-                  "adnm": "五组",
-                  "pcount": 112,
-                  "htcount": 38,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.580078,
-                  "lttd": 30.279418
-                },
-                {
-                  "adcd": "420529101208102",
-                  "adnm": "八组",
-                  "pcount": 132,
-                  "htcount": 46,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.581833,
-                  "lttd": 30.298807
-                }
-              ]
-            },
-            {
-              "adcd": "420529101209000",
-              "adnm": "麦庄村",
-              "pcount": 2564,
-              "htcount": 729,
-              "ldarea": 30.5,
-              "prevtp": "0",
-              "lgtd": 110.552111,
-              "lttd": 30.292016,
-              "children": []
-            },
-            {
-              "adcd": "420529101210000",
-              "adnm": "怀抱窝村",
-              "pcount": 1764,
-              "htcount": 529,
-              "ldarea": 26.1,
-              "prevtp": "0",
-              "lgtd": 110.606024,
-              "lttd": 30.32805,
-              "children": [
-                {
-                  "adcd": "420529101210100",
-                  "adnm": "一组(竹桥）",
-                  "pcount": 83,
-                  "htcount": 25,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.595765,
-                  "lttd": 30.33814
-                },
-                {
-                  "adcd": "420529101210101",
-                  "adnm": "三组",
-                  "pcount": 129,
-                  "htcount": 35,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592862,
-                  "lttd": 30.3195735
-                }
-              ]
-            },
-            {
-              "adcd": "420529101211000",
-              "adnm": "茅坪村",
-              "pcount": 2711,
-              "htcount": 833,
-              "ldarea": 0,
-              "prevtp": "0",
-              "lgtd": 110.674183,
-              "lttd": 30.138689,
-              "children": [
-                {
-                  "adcd": "420529101211100",
-                  "adnm": "二组（万家田）",
-                  "pcount": 44,
-                  "htcount": 18,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.597656,
-                  "lttd": 30.089048
-                },
-                {
-                  "adcd": "420529101211101",
-                  "adnm": "三组",
-                  "pcount": 68,
-                  "htcount": 21,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.56665,
-                  "lttd": 30.0911
-                },
-                {
-                  "adcd": "420529101211102",
-                  "adnm": "六组（晏家坪）",
-                  "pcount": 118,
-                  "htcount": 32,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.719605,
-                  "lttd": 30.138661
-                },
-                {
-                  "adcd": "420529101211104",
-                  "adnm": "十组（茅坪）",
-                  "pcount": 159,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.669315,
-                  "lttd": 30.153423
-                },
-                {
-                  "adcd": "420529101211105",
-                  "adnm": "九组（茅坪）",
-                  "pcount": 318,
-                  "htcount": 86,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.674523,
-                  "lttd": 30.139839
-                },
-                {
-                  "adcd": "420529101211106",
-                  "adnm": "二组（老屋场）",
-                  "pcount": 40,
-                  "htcount": 12,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.621323,
-                  "lttd": 30.080742
-                }
-              ]
-            },
-            {
-              "adcd": "420529101212000",
-              "adnm": "长坡村",
-              "pcount": 1221,
-              "htcount": 384,
-              "ldarea": 51.5,
-              "prevtp": "0",
-              "lgtd": 110.727382,
-              "lttd": 30.072334,
-              "children": [
-                {
-                  "adcd": "420529101212100",
-                  "adnm": "四组",
-                  "pcount": 221,
-                  "htcount": 112,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.685538,
-                  "lttd": 30.078245
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529102000000",
-          "adnm": "长乐坪镇",
-          "pcount": 24902,
-          "htcount": 6908,
-          "ldarea": 374,
-          "prevtp": "0",
-          "lgtd": 110.817333,
-          "lttd": 30.187285,
-          "children": [
-            {
-              "adcd": "420529102001000",
-              "adnm": "长乐坪社区",
-              "pcount": 1450,
-              "htcount": 412,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.950819,
-              "lttd": 30.266553,
-              "children": []
-            },
-            {
-              "adcd": "420529102201000",
-              "adnm": "洞口村",
-              "pcount": 1686,
-              "htcount": 525,
-              "ldarea": 18.57,
-              "prevtp": "0",
-              "lgtd": 110.862146,
-              "lttd": 30.17035,
-              "children": [
-                {
-                  "adcd": "420529102201100",
-                  "adnm": "三组（洞口）",
-                  "pcount": 423,
-                  "htcount": 146,
-                  "ldarea": 6.22,
-                  "prevtp": "2",
-                  "lgtd": 110.84918,
-                  "lttd": 30.172821
-                },
-                {
-                  "adcd": "420529102201101",
-                  "adnm": "四组（滴淋冲）",
-                  "pcount": 354,
-                  "htcount": 101,
-                  "ldarea": 7.15,
-                  "prevtp": "1",
-                  "lgtd": 110.852646,
-                  "lttd": 30.166916
-                },
-                {
-                  "adcd": "420529102201102",
-                  "adnm": "一组（龟坪）",
-                  "pcount": 427,
-                  "htcount": 122,
-                  "ldarea": 7.07,
-                  "prevtp": "2",
-                  "lgtd": 110.863379,
-                  "lttd": 30.172428
-                },
-                {
-                  "adcd": "420529102201103",
-                  "adnm": "二组（洞口）",
-                  "pcount": 482,
-                  "htcount": 156,
-                  "ldarea": 6.13,
-                  "prevtp": "2",
-                  "lgtd": 110.859648,
-                  "lttd": 30.170953
-                }
-              ]
-            },
-            {
-              "adcd": "420529102202000",
-              "adnm": "腰牌村",
-              "pcount": 1607,
-              "htcount": 484,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 110.898742,
-              "lttd": 30.183227,
-              "children": [
-                {
-                  "adcd": "420529102202100",
-                  "adnm": "二组（腰牌）",
-                  "pcount": 377,
-                  "htcount": 112,
-                  "ldarea": 5.74,
-                  "prevtp": "2",
-                  "lgtd": 110.900312,
-                  "lttd": 30.181927
-                },
-                {
-                  "adcd": "420529102202101",
-                  "adnm": "三组（腰牌）",
-                  "pcount": 429,
-                  "htcount": 129,
-                  "ldarea": 5.95,
-                  "prevtp": "2",
-                  "lgtd": 110.891906,
-                  "lttd": 30.182658
-                },
-                {
-                  "adcd": "420529102202102",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 355,
-                  "htcount": 92,
-                  "ldarea": 5.67,
-                  "prevtp": "2",
-                  "lgtd": 110.884063,
-                  "lttd": 30.178409
-                },
-                {
-                  "adcd": "420529102202103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 446,
-                  "htcount": 151,
-                  "ldarea": 5.81,
-                  "prevtp": "2",
-                  "lgtd": 110.878992,
-                  "lttd": 30.174009
-                }
-              ]
-            },
-            {
-              "adcd": "420529102203000",
-              "adnm": "白岩坪村",
-              "pcount": 2576,
-              "htcount": 767,
-              "ldarea": 31.35,
-              "prevtp": "0",
-              "lgtd": 110.894666,
-              "lttd": 30.159786,
-              "children": [
-                {
-                  "adcd": "420529102203100",
-                  "adnm": "一组",
-                  "pcount": 1242,
-                  "htcount": 379,
-                  "ldarea": 16.98,
-                  "prevtp": "1",
-                  "lgtd": 110.926374,
-                  "lttd": 30.172706
-                },
-                {
-                  "adcd": "420529102203101",
-                  "adnm": "二组（白岩坪）",
-                  "pcount": 1334,
-                  "htcount": 388,
-                  "ldarea": 18.37,
-                  "prevtp": "1",
-                  "lgtd": 110.91441,
-                  "lttd": 30.173227
-                }
-              ]
-            },
-            {
-              "adcd": "420529102204000",
-              "adnm": "月山村",
-              "pcount": 1515,
-              "htcount": 422,
-              "ldarea": 25.29,
-              "prevtp": "0",
-              "lgtd": 110.899558,
-              "lttd": 30.127007,
-              "children": [
-                {
-                  "adcd": "420529102204100",
-                  "adnm": "三组（小河）",
-                  "pcount": 258,
-                  "htcount": 73,
-                  "ldarea": 6.98,
-                  "prevtp": "2",
-                  "lgtd": 110.891944,
-                  "lttd": 30.128185
-                },
-                {
-                  "adcd": "420529102204101",
-                  "adnm": "二组（高桥）",
-                  "pcount": 289,
-                  "htcount": 81,
-                  "ldarea": 7.13,
-                  "prevtp": "2",
-                  "lgtd": 110.912641,
-                  "lttd": 30.136977
-                },
-                {
-                  "adcd": "420529102204102",
-                  "adnm": "一组（曹家河）",
-                  "pcount": 325,
-                  "htcount": 89,
-                  "ldarea": 7.05,
-                  "prevtp": "2",
-                  "lgtd": 110.944037,
-                  "lttd": 30.139595
-                },
-                {
-                  "adcd": "420529102204103",
-                  "adnm": "六组",
-                  "pcount": 323,
-                  "htcount": 90,
-                  "ldarea": 7.13,
-                  "prevtp": "1",
-                  "lgtd": 110.921658,
-                  "lttd": 30.140975
-                },
-                {
-                  "adcd": "420529102204104",
-                  "adnm": "一组（邵家河）",
-                  "pcount": 320,
-                  "htcount": 89,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.935464,
-                  "lttd": 30.135935
-                }
-              ]
-            },
-            {
-              "adcd": "420529102205000",
-              "adnm": "苏家河村",
-              "pcount": 1483,
-              "htcount": 419,
-              "ldarea": 22.89,
-              "prevtp": "0",
-              "lgtd": 110.7719,
-              "lttd": 30.160052,
-              "children": [
-                {
-                  "adcd": "420529102205100",
-                  "adnm": "二组（苏家河）",
-                  "pcount": 348,
-                  "htcount": 96,
-                  "ldarea": 7.38,
-                  "prevtp": "2",
-                  "lgtd": 110.758849,
-                  "lttd": 30.151386
-                },
-                {
-                  "adcd": "420529102205101",
-                  "adnm": "三组（金家湾）",
-                  "pcount": 375,
-                  "htcount": 107,
-                  "ldarea": 7.82,
-                  "prevtp": "2",
-                  "lgtd": 110.769432,
-                  "lttd": 30.146094
-                },
-                {
-                  "adcd": "420529102205102",
-                  "adnm": "四组",
-                  "pcount": 362,
-                  "htcount": 103,
-                  "ldarea": 7.78,
-                  "prevtp": "1",
-                  "lgtd": 110.749224,
-                  "lttd": 30.143833
-                },
-                {
-                  "adcd": "420529102205103",
-                  "adnm": "一组",
-                  "pcount": 398,
-                  "htcount": 113,
-                  "ldarea": 7.91,
-                  "prevtp": "1",
-                  "lgtd": 110.781997,
-                  "lttd": 30.15012
-                }
-              ]
-            },
-            {
-              "adcd": "420529102206000",
-              "adnm": "甘沟村",
-              "pcount": 1728,
-              "htcount": 530,
-              "ldarea": 26.69,
-              "prevtp": "0",
-              "lgtd": 110.792784,
-              "lttd": 30.164572,
-              "children": [
-                {
-                  "adcd": "420529102206100",
-                  "adnm": "二组（高家坪）",
-                  "pcount": 402,
-                  "htcount": 123,
-                  "ldarea": 8.52,
-                  "prevtp": "2",
-                  "lgtd": 110.792131,
-                  "lttd": 30.14632
-                },
-                {
-                  "adcd": "420529102206101",
-                  "adnm": "一组（甘沟）",
-                  "pcount": 418,
-                  "htcount": 129,
-                  "ldarea": 8.38,
-                  "prevtp": "2",
-                  "lgtd": 110.802311,
-                  "lttd": 30.164633
-                },
-                {
-                  "adcd": "420529102206102",
-                  "adnm": "三组",
-                  "pcount": 453,
-                  "htcount": 135,
-                  "ldarea": 8.92,
-                  "prevtp": "1",
-                  "lgtd": 110.802988,
-                  "lttd": 30.151881
-                },
-                {
-                  "adcd": "420529102206103",
-                  "adnm": "五组（剪槽沟）",
-                  "pcount": 455,
-                  "htcount": 143,
-                  "ldarea": 8.87,
-                  "prevtp": "1",
-                  "lgtd": 110.829652,
-                  "lttd": 30.1611865
-                }
-              ]
-            },
-            {
-              "adcd": "420529102207000",
-              "adnm": "百年关村",
-              "pcount": 1805,
-              "htcount": 540,
-              "ldarea": 21.95,
-              "prevtp": "0",
-              "lgtd": 110.953275,
-              "lttd": 30.179524,
-              "children": []
-            },
-            {
-              "adcd": "420529102208000",
-              "adnm": "三教庙村",
-              "pcount": 2267,
-              "htcount": 690,
-              "ldarea": 31.79,
-              "prevtp": "0",
-              "lgtd": 110.893176,
-              "lttd": 30.200651,
-              "children": []
-            },
-            {
-              "adcd": "420529102209000",
-              "adnm": "柴埠溪村",
-              "pcount": 376,
-              "htcount": 123,
-              "ldarea": 9.52,
-              "prevtp": "0",
-              "lgtd": 110.933963,
-              "lttd": 30.228582,
-              "children": [
-                {
-                  "adcd": "420529102209100",
-                  "adnm": "二组（梯子口）",
-                  "pcount": 71,
-                  "htcount": 21,
-                  "ldarea": 3.77,
-                  "prevtp": "2",
-                  "lgtd": 110.947618,
-                  "lttd": 30.2309287
-                },
-                {
-                  "adcd": "420529102209101",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 73,
-                  "htcount": 23,
-                  "ldarea": 3.75,
-                  "prevtp": "1",
-                  "lgtd": 110.961822,
-                  "lttd": 30.2315995
-                },
-                {
-                  "adcd": "420529102209102",
-                  "adnm": "一组（陆家台）",
-                  "pcount": 77,
-                  "htcount": 25,
-                  "ldarea": 3.95,
-                  "prevtp": "2",
-                  "lgtd": 110.91351,
-                  "lttd": 30.231454
-                },
-                {
-                  "adcd": "420529102209103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 79,
-                  "htcount": 28,
-                  "ldarea": 4.14,
-                  "prevtp": "2",
-                  "lgtd": 110.974717,
-                  "lttd": 30.2239784
-                },
-                {
-                  "adcd": "420529102209104",
-                  "adnm": "三组（岩板铺子）",
-                  "pcount": 76,
-                  "htcount": 26,
-                  "ldarea": 3.91,
-                  "prevtp": "2",
-                  "lgtd": 110.929226,
-                  "lttd": 30.229398
-                }
-              ]
-            },
-            {
-              "adcd": "420529102210000",
-              "adnm": "青岩冲村",
-              "pcount": 2002,
-              "htcount": 560,
-              "ldarea": 40.51,
-              "prevtp": "0",
-              "lgtd": 110.782404,
-              "lttd": 30.185819,
-              "children": [
-                {
-                  "adcd": "420529102210100",
-                  "adnm": "四组（小林口）",
-                  "pcount": 986,
-                  "htcount": 266,
-                  "ldarea": 20.85,
-                  "prevtp": "2",
-                  "lgtd": 110.820876,
-                  "lttd": 30.202646
-                },
-                {
-                  "adcd": "420529102210102",
-                  "adnm": "六组（青岩冲）",
-                  "pcount": 1016,
-                  "htcount": 294,
-                  "ldarea": 23.66,
-                  "prevtp": "1",
-                  "lgtd": 110.781604,
-                  "lttd": 30.187083
-                }
-              ]
-            },
-            {
-              "adcd": "420529102211000",
-              "adnm": "桥坪村",
-              "pcount": 1198,
-              "htcount": 331,
-              "ldarea": 24.77,
-              "prevtp": "0",
-              "lgtd": 110.766741,
-              "lttd": 30.231465,
-              "children": [
-                {
-                  "adcd": "420529102211100",
-                  "adnm": "四组（桥坪）",
-                  "pcount": 258,
-                  "htcount": 71,
-                  "ldarea": 7.81,
-                  "prevtp": "2",
-                  "lgtd": 110.745652,
-                  "lttd": 30.233487
-                },
-                {
-                  "adcd": "420529102211101",
-                  "adnm": "六组（曹家湾）",
-                  "pcount": 349,
-                  "htcount": 95,
-                  "ldarea": 8.74,
-                  "prevtp": "2",
-                  "lgtd": 110.772836,
-                  "lttd": 30.236809
-                },
-                {
-                  "adcd": "420529102211102",
-                  "adnm": "五组（桥坪）",
-                  "pcount": 314,
-                  "htcount": 89,
-                  "ldarea": 8.55,
-                  "prevtp": "2",
-                  "lgtd": 110.752264,
-                  "lttd": 30.235366
-                },
-                {
-                  "adcd": "420529102211103",
-                  "adnm": "六组（凉水井）",
-                  "pcount": 277,
-                  "htcount": 76,
-                  "ldarea": 7.67,
-                  "prevtp": "2",
-                  "lgtd": 110.765834,
-                  "lttd": 30.236687
-                }
-              ]
-            },
-            {
-              "adcd": "420529102212000",
-              "adnm": "菖蒲溪村",
-              "pcount": 911,
-              "htcount": 282,
-              "ldarea": 36.28,
-              "prevtp": "0",
-              "lgtd": 110.777564,
-              "lttd": 30.237061,
-              "children": [
-                {
-                  "adcd": "420529102212100",
-                  "adnm": "四组（将军洞）",
-                  "pcount": 189,
-                  "htcount": 62,
-                  "ldarea": 10.15,
-                  "prevtp": "1",
-                  "lgtd": 110.812549,
-                  "lttd": 30.235984
-                },
-                {
-                  "adcd": "420529102212101",
-                  "adnm": "三组（岩屋垴）",
-                  "pcount": 246,
-                  "htcount": 71,
-                  "ldarea": 10.98,
-                  "prevtp": "2",
-                  "lgtd": 110.797305,
-                  "lttd": 30.238971
-                },
-                {
-                  "adcd": "420529102212102",
-                  "adnm": "二组（骆家坪）",
-                  "pcount": 233,
-                  "htcount": 69,
-                  "ldarea": 10.29,
-                  "prevtp": "2",
-                  "lgtd": 110.788782,
-                  "lttd": 30.237532
-                },
-                {
-                  "adcd": "420529102212103",
-                  "adnm": "一组（菖蒲溪）",
-                  "pcount": 243,
-                  "htcount": 80,
-                  "ldarea": 12.86,
-                  "prevtp": "2",
-                  "lgtd": 110.778274,
-                  "lttd": 30.238085
-                }
-              ]
-            },
-            {
-              "adcd": "420529102213000",
-              "adnm": "大湾村",
-              "pcount": 1052,
-              "htcount": 298,
-              "ldarea": 20.31,
-              "prevtp": "0",
-              "lgtd": 110.707941,
-              "lttd": 30.186264,
-              "children": []
-            },
-            {
-              "adcd": "420529102214000",
-              "adnm": "白鹿庄村",
-              "pcount": 1518,
-              "htcount": 432,
-              "ldarea": 21.58,
-              "prevtp": "0",
-              "lgtd": 110.729787,
-              "lttd": 30.19293,
-              "children": [
-                {
-                  "adcd": "420529102214100",
-                  "adnm": "三组（白鹿庄下）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735589,
-                  "lttd": 30.198371
-                },
-                {
-                  "adcd": "420529102214101",
-                  "adnm": "三组（白鹿庄上）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735173,
-                  "lttd": 30.201783
-                }
-              ]
-            },
-            {
-              "adcd": "420529102215000",
-              "adnm": "石桥沟村",
-              "pcount": 1192,
-              "htcount": 357,
-              "ldarea": 12.93,
-              "prevtp": "0",
-              "lgtd": 110.712097,
-              "lttd": 30.204806,
-              "children": []
-            },
-            {
-              "adcd": "420529102216000",
-              "adnm": "红鱼潭村",
-              "pcount": 940,
-              "htcount": 243,
-              "ldarea": 14.87,
-              "prevtp": "0",
-              "lgtd": 110.722212,
-              "lttd": 30.221909,
-              "children": [
-                {
-                  "adcd": "420529102216100",
-                  "adnm": "二组（下红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 121,
-                  "ldarea": 11.4,
-                  "prevtp": "2",
-                  "lgtd": 110.712448,
-                  "lttd": 30.220817
-                },
-                {
-                  "adcd": "420529102216101",
-                  "adnm": "二组（上红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 122,
-                  "ldarea": 7.5,
-                  "prevtp": "2",
-                  "lgtd": 110.714051,
-                  "lttd": 30.228049
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529103000000",
-          "adnm": "渔洋关镇",
-          "pcount": 45920,
-          "htcount": 17817,
-          "ldarea": 356,
-          "prevtp": "0",
-          "lgtd": 111.045286,
-          "lttd": 30.160398,
-          "children": [
-            {
-              "adcd": "420529103001000",
-              "adnm": "曹家坪社区",
-              "pcount": 5666,
-              "htcount": 2376,
-              "ldarea": 16.08,
-              "prevtp": "0",
-              "lgtd": 111.071315,
-              "lttd": 30.174626,
-              "children": [
-                {
-                  "adcd": "420529103001100",
-                  "adnm": "五组（松林坪）",
-                  "pcount": 368,
-                  "htcount": 111,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.033933,
-                  "lttd": 30.1556506
-                },
-                {
-                  "adcd": "420529103001101",
-                  "adnm": "四组（松林坪）",
-                  "pcount": 238,
-                  "htcount": 63,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.040689,
-                  "lttd": 30.1503546
-                },
-                {
-                  "adcd": "420529103001103",
-                  "adnm": "六组（松林坪）",
-                  "pcount": 335,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.039322,
-                  "lttd": 30.160644
-                },
-                {
-                  "adcd": "420529103001105",
-                  "adnm": "二组（曹家坪）",
-                  "pcount": 572,
-                  "htcount": 158,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064373,
-                  "lttd": 30.166271
-                },
-                {
-                  "adcd": "420529103001106",
-                  "adnm": "九组（(簸箕山)）",
-                  "pcount": 431,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052448,
-                  "lttd": 30.176902
-                },
-                {
-                  "adcd": "420529103001107",
-                  "adnm": "三组（青岗岭）",
-                  "pcount": 203,
-                  "htcount": 69,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.057881,
-                  "lttd": 30.156
-                }
-              ]
-            },
-            {
-              "adcd": "420529103002000",
-              "adnm": "大房坪社区",
-              "pcount": 6224,
-              "htcount": 2839,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 111.074047,
-              "lttd": 30.169517,
-              "children": [
-                {
-                  "adcd": "420529103002106",
-                  "adnm": "六组（李家坪）",
-                  "pcount": 337,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.107587,
-                  "lttd": 30.172462
-                },
-                {
-                  "adcd": "420529103002107",
-                  "adnm": "大房坪",
-                  "pcount": 3742,
-                  "htcount": 1761,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.076431,
-                  "lttd": 30.170897
-                },
-                {
-                  "adcd": "420529103002108",
-                  "adnm": "四组（城墙口）",
-                  "pcount": 331,
-                  "htcount": 90,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.095059,
-                  "lttd": 30.146079
-                },
-                {
-                  "adcd": "420529103002109",
-                  "adnm": "七组（麻溪冲）",
-                  "pcount": 287,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.104708,
-                  "lttd": 30.176352
-                },
-                {
-                  "adcd": "420529103002110",
-                  "adnm": "八组（麻溪冲）",
-                  "pcount": 655,
-                  "htcount": 221,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.096686,
-                  "lttd": 30.184931
-                }
-              ]
-            },
-            {
-              "adcd": "420529103003000",
-              "adnm": "桥河社区",
-              "pcount": 7415,
-              "htcount": 3338,
-              "ldarea": 18.36,
-              "prevtp": "0",
-              "lgtd": 111.083223,
-              "lttd": 30.182641,
-              "children": [
-                {
-                  "adcd": "420529103003100",
-                  "adnm": "花桥",
-                  "pcount": 2035,
-                  "htcount": 945,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064716,
-                  "lttd": 30.178022
-                },
-                {
-                  "adcd": "420529103003101",
-                  "adnm": "桥河",
-                  "pcount": 1372,
-                  "htcount": 590,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.092056,
-                  "lttd": 30.190173
-                },
-                {
-                  "adcd": "420529103003102",
-                  "adnm": "刘家坪",
-                  "pcount": 676,
-                  "htcount": 192,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.068048,
-                  "lttd": 30.203047
-                }
-              ]
-            },
-            {
-              "adcd": "420529103201000",
-              "adnm": "汉马池村",
-              "pcount": 4363,
-              "htcount": 1476,
-              "ldarea": 43.92,
-              "prevtp": "0",
-              "lgtd": 111.010216,
-              "lttd": 30.145828,
-              "children": [
-                {
-                  "adcd": "420529103201100",
-                  "adnm": "五组（千山）",
-                  "pcount": 301,
-                  "htcount": 85,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.972477,
-                  "lttd": 30.1393608
-                },
-                {
-                  "adcd": "420529103201101",
-                  "adnm": "四组（桥板洞）",
-                  "pcount": 207,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.001791,
-                  "lttd": 30.15045
-                },
-                {
-                  "adcd": "420529103201102",
-                  "adnm": "三组（桂花树）",
-                  "pcount": 377,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991827,
-                  "lttd": 30.150599
-                },
-                {
-                  "adcd": "420529103201103",
-                  "adnm": "一组（杨家坝子）",
-                  "pcount": 538,
-                  "htcount": 153,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.015634,
-                  "lttd": 30.137185
-                },
-                {
-                  "adcd": "420529103201104",
-                  "adnm": "六组（阮家洞）",
-                  "pcount": 191,
-                  "htcount": 51,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 110.963332,
-                  "lttd": 30.138323
-                },
-                {
-                  "adcd": "420529103201105",
-                  "adnm": "九组",
-                  "pcount": 544,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018838,
-                  "lttd": 30.188615
-                },
-                {
-                  "adcd": "420529103201107",
-                  "adnm": "七组（长冲子)",
-                  "pcount": 471,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.977879,
-                  "lttd": 30.171188
-                },
-                {
-                  "adcd": "420529103201108",
-                  "adnm": "十组（穿心店）",
-                  "pcount": 619,
-                  "htcount": 98,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.008591,
-                  "lttd": 30.176473
-                },
-                {
-                  "adcd": "420529103201109",
-                  "adnm": "二组（汉马池）",
-                  "pcount": 560,
-                  "htcount": 171,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.011178,
-                  "lttd": 30.156577
-                },
-                {
-                  "adcd": "420529103201110",
-                  "adnm": "九组（杨家湾）",
-                  "pcount": 550,
-                  "htcount": 120,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991313,
-                  "lttd": 30.198529
-                }
-              ]
-            },
-            {
-              "adcd": "420529103202000",
-              "adnm": "三房坪村",
-              "pcount": 3822,
-              "htcount": 1327,
-              "ldarea": 20.39,
-              "prevtp": "0",
-              "lgtd": 111.070836,
-              "lttd": 30.148837,
-              "children": [
-                {
-                  "adcd": "420529103202100",
-                  "adnm": "八组（樱桃山)",
-                  "pcount": 407,
-                  "htcount": 126,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052614,
-                  "lttd": 30.133604
-                },
-                {
-                  "adcd": "420529103202101",
-                  "adnm": "九组（樱桃山）",
-                  "pcount": 273,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.047375,
-                  "lttd": 30.134426
-                },
-                {
-                  "adcd": "420529103202102",
-                  "adnm": "七组（赶子坪）",
-                  "pcount": 349,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.063756,
-                  "lttd": 30.130336
-                },
-                {
-                  "adcd": "420529103202103",
-                  "adnm": "四组（砂滩口）",
-                  "pcount": 239,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.06732,
-                  "lttd": 30.133277
-                },
-                {
-                  "adcd": "420529103202104",
-                  "adnm": "一组(青屋树)",
-                  "pcount": 433,
-                  "htcount": 160,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.066485,
-                  "lttd": 30.155661
-                },
-                {
-                  "adcd": "420529103202105",
-                  "adnm": "三组（小河）",
-                  "pcount": 400,
-                  "htcount": 131,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.072293,
-                  "lttd": 30.141717
-                },
-                {
-                  "adcd": "420529103202106",
-                  "adnm": "七组（灌沟）",
-                  "pcount": 230,
-                  "htcount": 103,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.071064,
-                  "lttd": 30.134573
-                }
-              ]
-            },
-            {
-              "adcd": "420529103203000",
-              "adnm": "火田坑村",
-              "pcount": 1785,
-              "htcount": 604,
-              "ldarea": 32.21,
-              "prevtp": "0",
-              "lgtd": 110.928335,
-              "lttd": 30.251524,
-              "children": [
-                {
-                  "adcd": "420529103203103",
-                  "adnm": "四组（余堰子）",
-                  "pcount": 206,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.923367,
-                  "lttd": 30.256976
-                },
-                {
-                  "adcd": "420529103203104",
-                  "adnm": "七组（漩涡埫）",
-                  "pcount": 202,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.872437,
-                  "lttd": 30.247461
-                },
-                {
-                  "adcd": "420529103203105",
-                  "adnm": "四组（大坑埫）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.935343,
-                  "lttd": 30.263216
-                }
-              ]
-            },
-            {
-              "adcd": "420529103204000",
-              "adnm": "鞍山村",
-              "pcount": 1709,
-              "htcount": 636,
-              "ldarea": 20.78,
-              "prevtp": "0",
-              "lgtd": 110.985901,
-              "lttd": 30.274849,
-              "children": []
-            },
-            {
-              "adcd": "420529103205000",
-              "adnm": "涨水坪村",
-              "pcount": 1709,
-              "htcount": 616,
-              "ldarea": 15.96,
-              "prevtp": "0",
-              "lgtd": 111.016591,
-              "lttd": 30.263112,
-              "children": [
-                {
-                  "adcd": "420529103205100",
-                  "adnm": "二组（涨水坪下）",
-                  "pcount": 323,
-                  "htcount": 105,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018725,
-                  "lttd": 30.257364
-                },
-                {
-                  "adcd": "420529103205101",
-                  "adnm": "四组（茅葫山）",
-                  "pcount": 264,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.037879,
-                  "lttd": 30.270009
-                },
-                {
-                  "adcd": "420529103205102",
-                  "adnm": "六组（小龙潭）",
-                  "pcount": 334,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.010953,
-                  "lttd": 30.28058
-                },
-                {
-                  "adcd": "420529103205103",
-                  "adnm": "七组（云龙山）",
-                  "pcount": 247,
-                  "htcount": 68,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.013247,
-                  "lttd": 30.285109
-                },
-                {
-                  "adcd": "420529103205104",
-                  "adnm": "二组（涨水坪上）",
-                  "pcount": 300,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.019735,
-                  "lttd": 30.255388
-                }
-              ]
-            },
-            {
-              "adcd": "420529103206000",
-              "adnm": "王家坪村",
-              "pcount": 2372,
-              "htcount": 887,
-              "ldarea": 21,
-              "prevtp": "0",
-              "lgtd": 111.012233,
-              "lttd": 30.244419,
-              "children": [
-                {
-                  "adcd": "420529103206100",
-                  "adnm": "王家坪（五组）",
-                  "pcount": 389,
-                  "htcount": 122,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.007657,
-                  "lttd": 30.243316
-                },
-                {
-                  "adcd": "420529103206103",
-                  "adnm": "碓臼坑（九组）",
-                  "pcount": 297,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.030894,
-                  "lttd": 30.231012
-                },
-                {
-                  "adcd": "420529103206104",
-                  "adnm": "陈家埫（八组）",
-                  "pcount": 193,
-                  "htcount": 55,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.999815,
-                  "lttd": 30.236805
-                },
-                {
-                  "adcd": "420529103206106",
-                  "adnm": "史家坪（四组）",
-                  "pcount": 389,
-                  "htcount": 125,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.020009,
-                  "lttd": 30.234829
-                }
-              ]
-            },
-            {
-              "adcd": "420529103207000",
-              "adnm": "枚二冲村",
-              "pcount": 2406,
-              "htcount": 904,
-              "ldarea": 20.72,
-              "prevtp": "0",
-              "lgtd": 111.048321,
-              "lttd": 30.224802,
-              "children": []
-            },
-            {
-              "adcd": "420529103208000",
-              "adnm": "清水湾村",
-              "pcount": 1775,
-              "htcount": 603,
-              "ldarea": 37.11,
-              "prevtp": "0",
-              "lgtd": 110.965572,
-              "lttd": 30.080175,
-              "children": [
-                {
-                  "adcd": "420529103208100",
-                  "adnm": "四组（龙潭湾）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.932338,
-                  "lttd": 30.085706
-                },
-                {
-                  "adcd": "420529103208101",
-                  "adnm": "四组（唐黄坪）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.939173,
-                  "lttd": 30.082635
-                },
-                {
-                  "adcd": "420529103208102",
-                  "adnm": "六组（玉占花）",
-                  "pcount": 185,
-                  "htcount": 48,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.927351,
-                  "lttd": 30.111314
-                },
-                {
-                  "adcd": "420529103208103",
-                  "adnm": "四组（翻水洞）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.941731,
-                  "lttd": 30.084026
-                },
-                {
-                  "adcd": "420529103208104",
-                  "adnm": "一组（清水堰））",
-                  "pcount": 178,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.963492,
-                  "lttd": 30.0893062
-                },
-                {
-                  "adcd": "420529103208105",
-                  "adnm": "一组（清水湾）",
-                  "pcount": 178,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.96647,
-                  "lttd": 30.080914
-                },
-                {
-                  "adcd": "420529103208106",
-                  "adnm": "二组（下坪）",
-                  "pcount": 390,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.98068,
-                  "lttd": 30.073403
-                },
-                {
-                  "adcd": "420529103208107",
-                  "adnm": "四组（洈水）",
-                  "pcount": 300,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.94587,
-                  "lttd": 30.082252
-                },
-                {
-                  "adcd": "420529103208108",
-                  "adnm": "二组（上坪）",
-                  "pcount": 280,
-                  "htcount": 52,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.968959,
-                  "lttd": 30.075928
-                }
-              ]
-            },
-            {
-              "adcd": "420529103209000",
-              "adnm": "三板桥村",
-              "pcount": 1584,
-              "htcount": 538,
-              "ldarea": 28.56,
-              "prevtp": "0",
-              "lgtd": 110.987244,
-              "lttd": 30.101781,
-              "children": [
-                {
-                  "adcd": "420529103209100",
-                  "adnm": "八组（三板桥）",
-                  "pcount": 223,
-                  "htcount": 56,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.990816,
-                  "lttd": 30.100481
-                },
-                {
-                  "adcd": "420529103209101",
-                  "adnm": "五组（跑马岭）",
-                  "pcount": 143,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.993049,
-                  "lttd": 30.105093
-                },
-                {
-                  "adcd": "420529103209102",
-                  "adnm": "三组（云台观）",
-                  "pcount": 200,
-                  "htcount": 57,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.980796,
-                  "lttd": 30.122885
-                },
-                {
-                  "adcd": "420529103209103",
-                  "adnm": "一组（横溪河）",
-                  "pcount": 156,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.002633,
-                  "lttd": 30.124493
-                },
-                {
-                  "adcd": "420529103209104",
-                  "adnm": "九组（高家岭）",
-                  "pcount": 204,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.006308,
-                  "lttd": 30.093283
-                }
-              ]
-            },
-            {
-              "adcd": "420529103210000",
-              "adnm": "石柱山村",
-              "pcount": 1232,
-              "htcount": 430,
-              "ldarea": 11.22,
-              "prevtp": "0",
-              "lgtd": 111.030437,
-              "lttd": 30.108528,
-              "children": [
-                {
-                  "adcd": "420529103210100",
-                  "adnm": "一组（石柱山）",
-                  "pcount": 344,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.026903,
-                  "lttd": 30.113098
-                },
-                {
-                  "adcd": "420529103210101",
-                  "adnm": "黄土包",
-                  "pcount": 240,
-                  "htcount": 66,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.01604,
-                  "lttd": 30.124506
-                },
-                {
-                  "adcd": "420529103210102",
-                  "adnm": "四组（横溪河）",
-                  "pcount": 329,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014129,
-                  "lttd": 30.128574
-                }
-              ]
-            },
-            {
-              "adcd": "420529103211000",
-              "adnm": "沙埫村",
-              "pcount": 2002,
-              "htcount": 674,
-              "ldarea": 23.24,
-              "prevtp": "0",
-              "lgtd": 111.082426,
-              "lttd": 30.115336,
-              "children": []
-            },
-            {
-              "adcd": "420529103212000",
-              "adnm": "南河村",
-              "pcount": 1794,
-              "htcount": 569,
-              "ldarea": 30.34,
-              "prevtp": "0",
-              "lgtd": 111.069873,
-              "lttd": 30.066705,
-              "children": [
-                {
-                  "adcd": "420529103212100",
-                  "adnm": "杨木洞",
-                  "pcount": 452,
-                  "htcount": 128,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.076144,
-                  "lttd": 30.071189
-                },
-                {
-                  "adcd": "420529103212101",
-                  "adnm": "田家坪",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.041095,
-                  "lttd": 30.078329
-                },
-                {
-                  "adcd": "420529103212102",
-                  "adnm": "谦敬坪",
-                  "pcount": 326,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014608,
-                  "lttd": 30.077743
-                },
-                {
-                  "adcd": "420529103212103",
-                  "adnm": "郑家台",
-                  "pcount": 220,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.026223,
-                  "lttd": 30.082011
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529104000000",
-          "adnm": "仁和坪镇",
-          "pcount": 16117,
-          "htcount": 5069,
-          "ldarea": 199.46,
-          "prevtp": "0",
-          "lgtd": 111.242259,
-          "lttd": 30.104032,
-          "children": [
-            {
-              "adcd": "420529104001000",
-              "adnm": "仁和坪社区",
-              "pcount": 1247,
-              "htcount": 487,
-              "ldarea": 5,
-              "prevtp": "0",
-              "lgtd": 111.238323,
-              "lttd": 30.104003,
-              "children": []
-            },
-            {
-              "adcd": "420529104201000",
-              "adnm": "仁和坪村",
-              "pcount": 1653,
-              "htcount": 499,
-              "ldarea": 17.46,
-              "prevtp": "0",
-              "lgtd": 111.235606,
-              "lttd": 30.098939,
-              "children": [
-                {
-                  "adcd": "420529104201100",
-                  "adnm": "五组（檀木岗）",
-                  "pcount": 610,
-                  "htcount": 186,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.251975,
-                  "lttd": 30.099848
-                },
-                {
-                  "adcd": "420529104201101",
-                  "adnm": "五组（洋线沟）",
-                  "pcount": 40,
-                  "htcount": 6,
-                  "ldarea": 2.23,
-                  "prevtp": "2",
-                  "lgtd": 111.258799,
-                  "lttd": 30.094674
-                },
-                {
-                  "adcd": "420529104201102",
-                  "adnm": "六组（松林坑）",
-                  "pcount": 480,
-                  "htcount": 145,
-                  "ldarea": 7,
-                  "prevtp": "1",
-                  "lgtd": 111.267794,
-                  "lttd": 30.085327
-                },
-                {
-                  "adcd": "420529104201103",
-                  "adnm": "四组（杉林子）",
-                  "pcount": 493,
-                  "htcount": 155,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.250484,
-                  "lttd": 30.111344
-                },
-                {
-                  "adcd": "420529104201104",
-                  "adnm": "一组（王家湾）",
-                  "pcount": 30,
-                  "htcount": 7,
-                  "ldarea": 2.23,
-                  "prevtp": "1",
-                  "lgtd": 111.235377,
-                  "lttd": 30.089216
-                }
-              ]
-            },
-            {
-              "adcd": "420529104202000",
-              "adnm": "杨家埫村",
-              "pcount": 361,
-              "htcount": 128,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.224634,
-              "lttd": 30.10431,
-              "children": []
-            },
-            {
-              "adcd": "420529104203000",
-              "adnm": "枫香坪村",
-              "pcount": 718,
-              "htcount": 193,
-              "ldarea": 4.9,
-              "prevtp": "0",
-              "lgtd": 111.228783,
-              "lttd": 30.0674,
-              "children": [
-                {
-                  "adcd": "420529104203100",
-                  "adnm": "六组（水井坪）",
-                  "pcount": 351,
-                  "htcount": 85,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.260666,
-                  "lttd": 30.073385
-                },
-                {
-                  "adcd": "420529104203101",
-                  "adnm": "四组（简家坪）",
-                  "pcount": 82,
-                  "htcount": 25,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.209618,
-                  "lttd": 30.076108
-                },
-                {
-                  "adcd": "420529104203102",
-                  "adnm": "四组（枫香坪）",
-                  "pcount": 198,
-                  "htcount": 56,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.222942,
-                  "lttd": 30.0692433
-                },
-                {
-                  "adcd": "420529104203103",
-                  "adnm": "三组（剪刀溪）",
-                  "pcount": 87,
-                  "htcount": 27,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.216989,
-                  "lttd": 30.08405
-                }
-              ]
-            },
-            {
-              "adcd": "420529104204000",
-              "adnm": "罗汉淌",
-              "pcount": 300,
-              "htcount": 140,
-              "ldarea": 3,
-              "prevtp": "0",
-              "lgtd": 111.221815,
-              "lttd": 30.052427,
-              "children": []
-            },
-            {
-              "adcd": "420529104205000",
-              "adnm": "船山坪村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 111.266407,
-              "lttd": 30.057388,
-              "children": []
-            },
-            {
-              "adcd": "420529104206000",
-              "adnm": "梅坪村",
-              "pcount": 350,
-              "htcount": 128,
-              "ldarea": 1.76,
-              "prevtp": "0",
-              "lgtd": 111.301527,
-              "lttd": 30.064403,
-              "children": []
-            },
-            {
-              "adcd": "420529104207000",
-              "adnm": "业产坪村",
-              "pcount": 298,
-              "htcount": 285,
-              "ldarea": 5.8,
-              "prevtp": "0",
-              "lgtd": 111.292338,
-              "lttd": 30.111742,
-              "children": [
-                {
-                  "adcd": "420529104207100",
-                  "adnm": "四组（多竹溪）",
-                  "pcount": 85,
-                  "htcount": 22,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.304219,
-                  "lttd": 30.088104
-                },
-                {
-                  "adcd": "420529104207101",
-                  "adnm": "七组（杨树坳）",
-                  "pcount": 88,
-                  "htcount": 21,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.32324,
-                  "lttd": 30.119831
-                },
-                {
-                  "adcd": "420529104207102",
-                  "adnm": "四组（百担淌）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.316391,
-                  "lttd": 30.094219
-                },
-                {
-                  "adcd": "420529104207103",
-                  "adnm": "一组（业产坪）",
-                  "pcount": 85,
-                  "htcount": 75,
-                  "ldarea": 4.3,
-                  "prevtp": "1",
-                  "lgtd": 111.290478,
-                  "lttd": 30.109408
-                }
-              ]
-            },
-            {
-              "adcd": "420529104208000",
-              "adnm": "杨柳池村",
-              "pcount": 220,
-              "htcount": 82,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.281557,
-              "lttd": 30.126121,
-              "children": [
-                {
-                  "adcd": "420529104208100",
-                  "adnm": "四组（甘沟子）",
-                  "pcount": 220,
-                  "htcount": 82,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 111.318239,
-                  "lttd": 30.130386
-                }
-              ]
-            },
-            {
-              "adcd": "420529104209000",
-              "adnm": "林家坪村",
-              "pcount": 300,
-              "htcount": 85,
-              "ldarea": 2.1,
-              "prevtp": "0",
-              "lgtd": 111.229568,
-              "lttd": 30.136506,
-              "children": []
-            },
-            {
-              "adcd": "420529104210000",
-              "adnm": "大檀树村",
-              "pcount": 685,
-              "htcount": 206,
-              "ldarea": 12,
-              "prevtp": "0",
-              "lgtd": 111.169768,
-              "lttd": 30.128698,
-              "children": [
-                {
-                  "adcd": "420529104210100",
-                  "adnm": "四组（大堰）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.191456,
-                  "lttd": 30.140086
-                },
-                {
-                  "adcd": "420529104210102",
-                  "adnm": "二组（摊子坡）",
-                  "pcount": 280,
-                  "htcount": 83,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.178975,
-                  "lttd": 30.125395
-                },
-                {
-                  "adcd": "420529104210103",
-                  "adnm": "五组（余家坪）",
-                  "pcount": 195,
-                  "htcount": 58,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.181009,
-                  "lttd": 30.144807
-                }
-              ]
-            },
-            {
-              "adcd": "420529104211000",
-              "adnm": "升子坪村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 111.168879,
-              "lttd": 30.105211,
-              "children": []
-            },
-            {
-              "adcd": "420529104212000",
-              "adnm": "富裕冲村",
-              "pcount": 353,
-              "htcount": 121,
-              "ldarea": 1.62,
-              "prevtp": "0",
-              "lgtd": 111.143766,
-              "lttd": 30.117854,
-              "children": []
-            },
-            {
-              "adcd": "420529104213000",
-              "adnm": "桥梁村",
-              "pcount": 127,
-              "htcount": 31,
-              "ldarea": 2.7,
-              "prevtp": "0",
-              "lgtd": 111.101141,
-              "lttd": 30.108951,
-              "children": [
-                {
-                  "adcd": "420529104213100",
-                  "adnm": "一组（翻水坳）",
-                  "pcount": 11,
-                  "htcount": 3,
-                  "ldarea": 2.2,
-                  "prevtp": "1",
-                  "lgtd": 111.104619,
-                  "lttd": 30.115265
-                },
-                {
-                  "adcd": "420529104213101",
-                  "adnm": "六组（麒麟观）",
-                  "pcount": 20,
-                  "htcount": 4,
-                  "ldarea": 2.6,
-                  "prevtp": "1",
-                  "lgtd": 111.110327,
-                  "lttd": 30.08415
-                },
-                {
-                  "adcd": "420529104213102",
-                  "adnm": "一组（道家湾）",
-                  "pcount": 48,
-                  "htcount": 12,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.099774,
-                  "lttd": 30.118108
-                },
-                {
-                  "adcd": "420529104213103",
-                  "adnm": "四组（桥梁）",
-                  "pcount": 22,
-                  "htcount": 6,
-                  "ldarea": 2.5,
-                  "prevtp": "1",
-                  "lgtd": 111.102086,
-                  "lttd": 30.107225
-                },
-                {
-                  "adcd": "420529104213104",
-                  "adnm": "三组（流满沟)",
-                  "pcount": 26,
-                  "htcount": 6,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.082384,
-                  "lttd": 30.104546
-                }
-              ]
-            },
-            {
-              "adcd": "420529104214000",
-              "adnm": "大栗树村",
-              "pcount": 1680,
-              "htcount": 502,
-              "ldarea": 24,
-              "prevtp": "0",
-              "lgtd": 111.142519,
-              "lttd": 30.059065,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529105000000",
-          "adnm": "湾潭镇",
-          "pcount": 15721,
-          "htcount": 4650,
-          "ldarea": 295.53,
-          "plarea": 38929,
-          "prevtp": "0",
-          "lgtd": 110.425002,
-          "lttd": 30.050047,
-          "wscd": "HBWS000000002",
-          "children": [
-            {
-              "adcd": "420529105001000",
-              "adnm": "湾潭社区",
-              "pcount": 1313,
-              "htcount": 398,
-              "ldarea": 16.21,
-              "plarea": 1153,
-              "prevtp": "0",
-              "lgtd": 110.42388,
-              "lttd": 30.047864,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105001100",
-                  "adnm": "上街",
-                  "pcount": 249,
-                  "htcount": 74,
-                  "ldarea": 5.24,
-                  "plarea": 225,
-                  "prevtp": "2",
-                  "lgtd": 110.425785,
-                  "lttd": 30.053044,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001101",
-                  "adnm": "中街",
-                  "pcount": 285,
-                  "htcount": 86,
-                  "ldarea": 5.39,
-                  "plarea": 229,
-                  "prevtp": "2",
-                  "lgtd": 110.425614,
-                  "lttd": 30.048871,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001102",
-                  "adnm": "下街",
-                  "pcount": 291,
-                  "htcount": 88,
-                  "ldarea": 5.49,
-                  "plarea": 218,
-                  "prevtp": "2",
-                  "lgtd": 110.427007,
-                  "lttd": 30.041187,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001103",
-                  "adnm": "四组",
-                  "pcount": 300,
-                  "htcount": 94,
-                  "ldarea": 5.68,
-                  "plarea": 289,
-                  "prevtp": "2",
-                  "lgtd": 110.435104,
-                  "lttd": 30.057728,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001104",
-                  "adnm": "三组（黄家湾上）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.2,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.421384,
-                  "lttd": 30.061152,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001105",
-                  "adnm": "三组（黄家湾下）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.21,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.423788,
-                  "lttd": 30.052927,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105201000",
-              "adnm": "龙桥村",
-              "pcount": 1806,
-              "htcount": 524,
-              "ldarea": 21.15,
-              "plarea": 2719,
-              "prevtp": "0",
-              "lgtd": 110.427125,
-              "lttd": 30.034791,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105201100",
-                  "adnm": "五组（田家坪）",
-                  "pcount": 424,
-                  "htcount": 124,
-                  "ldarea": 6.96,
-                  "plarea": 632,
-                  "prevtp": "2",
-                  "lgtd": 110.425186,
-                  "lttd": 30.030705,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201101",
-                  "adnm": "二组（胡家坪）",
-                  "pcount": 386,
-                  "htcount": 113,
-                  "ldarea": 6.52,
-                  "plarea": 576,
-                  "prevtp": "2",
-                  "lgtd": 110.439722,
-                  "lttd": 30.055551,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201102",
-                  "adnm": "三组",
-                  "pcount": 361,
-                  "htcount": 106,
-                  "ldarea": 6.24,
-                  "plarea": 540,
-                  "prevtp": "1",
-                  "lgtd": 110.457203,
-                  "lttd": 30.049073,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201103",
-                  "adnm": "四组（覃家坪）",
-                  "pcount": 340,
-                  "htcount": 100,
-                  "ldarea": 6,
-                  "plarea": 510,
-                  "prevtp": "2",
-                  "lgtd": 110.430404,
-                  "lttd": 30.036725,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201104",
-                  "adnm": "一组（八里铺）",
-                  "pcount": 295,
-                  "htcount": 81,
-                  "ldarea": 5.43,
-                  "plarea": 461,
-                  "prevtp": "2",
-                  "lgtd": 110.458963,
-                  "lttd": 30.074837,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201105",
-                  "adnm": "二组（白果湾）",
-                  "pcount": 193,
-                  "htcount": 56,
-                  "ldarea": 4.26,
-                  "plarea": 288,
-                  "prevtp": "2",
-                  "lgtd": 110.436559,
-                  "lttd": 30.051893,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105202000",
-              "adnm": "九门村",
-              "pcount": 1191,
-              "htcount": 330,
-              "ldarea": 27.38,
-              "plarea": 3720,
-              "prevtp": "0",
-              "lgtd": 110.424995,
-              "lttd": 29.994538,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105202100",
-                  "adnm": "四组",
-                  "pcount": 187,
-                  "htcount": 52,
-                  "ldarea": 4.66,
-                  "prevtp": "1",
-                  "lgtd": 111.019734,
-                  "lttd": 30.038212
-                },
-                {
-                  "adcd": "420529105202101",
-                  "adnm": "三组（大岭）",
-                  "pcount": 170,
-                  "htcount": 46,
-                  "ldarea": 4.38,
-                  "prevtp": "1",
-                  "lgtd": 110.466198,
-                  "lttd": 30.017541
-                }
-              ]
-            },
-            {
-              "adcd": "420529105203000",
-              "adnm": "小凤池村",
-              "pcount": 1236,
-              "htcount": 362,
-              "ldarea": 17.03,
-              "plarea": 3512,
-              "prevtp": "0",
-              "lgtd": 110.39745,
-              "lttd": 30.054112,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105203100",
-                  "adnm": "三组（横渡口）",
-                  "pcount": 870,
-                  "htcount": 256,
-                  "ldarea": 14.12,
-                  "plarea": 2484,
-                  "prevtp": "2",
-                  "lgtd": 110.397542,
-                  "lttd": 30.052772,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203102",
-                  "adnm": "二组（小凤池上）",
-                  "pcount": 186,
-                  "htcount": 56,
-                  "ldarea": 4.51,
-                  "plarea": 528,
-                  "prevtp": "2",
-                  "lgtd": 110.41154,
-                  "lttd": 30.032823,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203103",
-                  "adnm": "二组（小凤池下）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 4.4,
-                  "plarea": 500,
-                  "prevtp": "2",
-                  "lgtd": 110.406546,
-                  "lttd": 30.024965,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105204000",
-              "adnm": "茅庄村",
-              "pcount": 1668,
-              "htcount": 489,
-              "ldarea": 65.77,
-              "plarea": 1947,
-              "prevtp": "0",
-              "lgtd": 110.481058,
-              "lttd": 30.081057,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105204100",
-                  "adnm": "五组（三板桥）",
-                  "pcount": 119,
-                  "htcount": 35,
-                  "ldarea": 6.69,
-                  "plarea": 138,
-                  "prevtp": "1",
-                  "lgtd": 110.385549,
-                  "lttd": 30.084092,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204101",
-                  "adnm": "四组（三峰岗）",
-                  "pcount": 139,
-                  "htcount": 41,
-                  "ldarea": 7.49,
-                  "plarea": 159,
-                  "prevtp": "1",
-                  "lgtd": 110.456626,
-                  "lttd": 30.106181,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204103",
-                  "adnm": "一组（土坪）",
-                  "pcount": 187,
-                  "htcount": 55,
-                  "ldarea": 9.37,
-                  "plarea": 214,
-                  "prevtp": "1",
-                  "lgtd": 110.510515,
-                  "lttd": 30.127021,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204104",
-                  "adnm": "二组（横河）",
-                  "pcount": 214,
-                  "htcount": 63,
-                  "ldarea": 10.44,
-                  "plarea": 246,
-                  "prevtp": "2",
-                  "lgtd": 110.47501,
-                  "lttd": 30.097844,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204105",
-                  "adnm": "三组（关岔口）",
-                  "pcount": 197,
-                  "htcount": 58,
-                  "ldarea": 9.77,
-                  "plarea": 226,
-                  "prevtp": "2",
-                  "lgtd": 110.47866,
-                  "lttd": 30.080996,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204106",
-                  "adnm": "二组（茅庄）",
-                  "pcount": 289,
-                  "htcount": 85,
-                  "ldarea": 13.39,
-                  "plarea": 332,
-                  "prevtp": "2",
-                  "lgtd": 110.487741,
-                  "lttd": 30.117695,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105205000",
-              "adnm": "红烈村",
-              "pcount": 1743,
-              "htcount": 545,
-              "ldarea": 18.88,
-              "plarea": 3378,
-              "prevtp": "0",
-              "lgtd": 110.402328,
-              "lttd": 30.018152,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105205100",
-                  "adnm": "二组（红旗1）",
-                  "pcount": 105,
-                  "htcount": 34,
-                  "ldarea": 3.18,
-                  "plarea": 200,
-                  "prevtp": "2",
-                  "lgtd": 110.403549,
-                  "lttd": 30.021536,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205101",
-                  "adnm": "二组（红旗2）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 3,
-                  "plarea": 190,
-                  "prevtp": "2",
-                  "lgtd": 110.403766,
-                  "lttd": 30.016641,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205102",
-                  "adnm": "三组(幺牌）",
-                  "pcount": 318,
-                  "htcount": 91,
-                  "ldarea": 5.09,
-                  "plarea": 555,
-                  "prevtp": "2",
-                  "lgtd": 110.407947,
-                  "lttd": 30.013943,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205103",
-                  "adnm": "一组（龚家坪）",
-                  "pcount": 89,
-                  "htcount": 23,
-                  "ldarea": 2.78,
-                  "plarea": 140,
-                  "prevtp": "1",
-                  "lgtd": 110.370446,
-                  "lttd": 30.04961,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105206000",
-              "adnm": "红旗坪村",
-              "pcount": 1006,
-              "htcount": 308,
-              "ldarea": 19,
-              "plarea": 1998,
-              "prevtp": "0",
-              "lgtd": 110.396358,
-              "lttd": 30.002951,
-              "wscd": "HBWS000000002",
-              "children": []
-            },
-            {
-              "adcd": "420529105207000",
-              "adnm": "三台坡村",
-              "pcount": 784,
-              "htcount": 240,
-              "ldarea": 33.06,
-              "plarea": 3637,
-              "prevtp": "0",
-              "lgtd": 110.348317,
-              "lttd": 30.078608,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105207100",
-                  "adnm": "三组",
-                  "pcount": 144,
-                  "htcount": 45,
-                  "ldarea": 9.68,
-                  "plarea": 675,
-                  "prevtp": "1",
-                  "lgtd": 110.348484,
-                  "lttd": 30.077671,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105207101",
-                  "adnm": "二组",
-                  "pcount": 381,
-                  "htcount": 118,
-                  "ldarea": 19.28,
-                  "plarea": 1770,
-                  "prevtp": "1",
-                  "lgtd": 110.353433,
-                  "lttd": 30.090529,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105208000",
-              "adnm": "锁山金村",
-              "pcount": 1944,
-              "htcount": 550,
-              "ldarea": 24.27,
-              "prevtp": "0",
-              "lgtd": 110.310285,
-              "lttd": 29.967872,
-              "children": [
-                {
-                  "adcd": "420529105208100",
-                  "adnm": "一组（岗坪）",
-                  "pcount": 196,
-                  "htcount": 56,
-                  "ldarea": 2.47,
-                  "prevtp": "0",
-                  "lgtd": 110.310224,
-                  "lttd": 29.966106
-                },
-                {
-                  "adcd": "420529105208101",
-                  "adnm": "四组（大树垭）",
-                  "pcount": 252,
-                  "htcount": 72,
-                  "ldarea": 2.69,
-                  "prevtp": "0",
-                  "lgtd": 110.335138,
-                  "lttd": 29.976205
-                },
-                {
-                  "adcd": "420529105208102",
-                  "adnm": "二组",
-                  "pcount": 161,
-                  "htcount": 46,
-                  "ldarea": 1.71,
-                  "prevtp": "0",
-                  "lgtd": 110.30384,
-                  "lttd": 29.960653
-                }
-              ]
-            },
-            {
-              "adcd": "420529105209000",
-              "adnm": "茶园村",
-              "pcount": 956,
-              "htcount": 445,
-              "ldarea": 22.25,
-              "prevtp": "0",
-              "lgtd": 110.321912,
-              "lttd": 30.00915,
-              "children": []
-            },
-            {
-              "adcd": "420529105210000",
-              "adnm": "鹿耳庄村",
-              "pcount": 1588,
-              "htcount": 462,
-              "ldarea": 22.5,
-              "plarea": 2025,
-              "prevtp": "0",
-              "lgtd": 110.362793,
-              "lttd": 29.995701,
-              "wscd": "HBWS000000002",
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529201000000",
-          "adnm": "付家堰乡",
-          "pcount": 17205,
-          "htcount": 5427,
-          "ldarea": 92.28,
-          "prevtp": "0",
-          "lgtd": 110.487421,
-          "lttd": 30.349922,
-          "children": [
-            {
-              "adcd": "420529201001000",
-              "adnm": "付家堰社区",
-              "pcount": 386,
-              "htcount": 168,
-              "ldarea": 5.68,
-              "prevtp": "2",
-              "lgtd": 110.478735,
-              "lttd": 30.3065179,
-              "children": []
-            },
-            {
-              "adcd": "420529201201000",
-              "adnm": "付家堰村",
-              "pcount": 2492,
-              "htcount": 775,
-              "ldarea": 5.84,
-              "prevtp": "0",
-              "lgtd": 110.480256,
-              "lttd": 30.307638,
-              "children": [
-                {
-                  "adcd": "420529201201101",
-                  "adnm": "一组（饶家湾）",
-                  "pcount": 410,
-                  "htcount": 122,
-                  "ldarea": 2.95,
-                  "prevtp": "2",
-                  "lgtd": 110.473528,
-                  "lttd": 30.3011483
-                },
-                {
-                  "adcd": "420529201201102",
-                  "adnm": "六组（排山）",
-                  "pcount": 392,
-                  "htcount": 131,
-                  "ldarea": 2.81,
-                  "prevtp": "1",
-                  "lgtd": 110.456762,
-                  "lttd": 30.2860972
-                },
-                {
-                  "adcd": "420529201201103",
-                  "adnm": "一组（段沟）",
-                  "pcount": 450,
-                  "htcount": 420,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.479115,
-                  "lttd": 30.304886
-                }
-              ]
-            },
-            {
-              "adcd": "420529201202000",
-              "adnm": "火山村",
-              "pcount": 1996,
-              "htcount": 605,
-              "ldarea": 11.46,
-              "prevtp": "0",
-              "lgtd": 110.469095,
-              "lttd": 30.319452,
-              "children": [
-                {
-                  "adcd": "420529201202100",
-                  "adnm": "二组",
-                  "pcount": 402,
-                  "htcount": 122,
-                  "ldarea": 4.33,
-                  "prevtp": "1",
-                  "lgtd": 110.469635,
-                  "lttd": 30.3418893
-                },
-                {
-                  "adcd": "420529201202101",
-                  "adnm": "三组",
-                  "pcount": 382,
-                  "htcount": 113,
-                  "ldarea": 4.2,
-                  "prevtp": "1",
-                  "lgtd": 110.463773,
-                  "lttd": 30.3235754
-                },
-                {
-                  "adcd": "420529201202102",
-                  "adnm": "五组（毛沟湾）",
-                  "pcount": 361,
-                  "htcount": 128,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.461409,
-                  "lttd": 30.307311
-                },
-                {
-                  "adcd": "420529201202103",
-                  "adnm": "五组（桂竹溪）",
-                  "pcount": 360,
-                  "htcount": 120,
-                  "ldarea": 4,
-                  "prevtp": "2",
-                  "lgtd": 110.463332,
-                  "lttd": 30.306439
-                }
-              ]
-            },
-            {
-              "adcd": "420529201203000",
-              "adnm": "马蹄井村",
-              "pcount": 1624,
-              "htcount": 458,
-              "ldarea": 14.07,
-              "prevtp": "0",
-              "lgtd": 110.443532,
-              "lttd": 30.3156,
-              "children": [
-                {
-                  "adcd": "420529201203100",
-                  "adnm": "张家池",
-                  "pcount": 310,
-                  "htcount": 92,
-                  "ldarea": 4.82,
-                  "prevtp": "1",
-                  "lgtd": 110.438819,
-                  "lttd": 30.3408115
-                },
-                {
-                  "adcd": "420529201203101",
-                  "adnm": "一组（岩板上）",
-                  "pcount": 330,
-                  "htcount": 112,
-                  "ldarea": 5.02,
-                  "prevtp": "2",
-                  "lgtd": 110.453829,
-                  "lttd": 30.336959
-                },
-                {
-                  "adcd": "420529201203102",
-                  "adnm": "一组（李家埫）",
-                  "pcount": 200,
-                  "htcount": 82,
-                  "ldarea": 4.35,
-                  "prevtp": "2",
-                  "lgtd": 110.449439,
-                  "lttd": 30.33028
-                },
-                {
-                  "adcd": "420529201203103",
-                  "adnm": "一组（陈家沟）",
-                  "pcount": 210,
-                  "htcount": 78,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.450861,
-                  "lttd": 30.32628
-                }
-              ]
-            },
-            {
-              "adcd": "420529201204000",
-              "adnm": "田家山村",
-              "pcount": 1326,
-              "htcount": 458,
-              "ldarea": 9.19,
-              "prevtp": "0",
-              "lgtd": 110.4688,
-              "lttd": 30.391132,
-              "children": [
-                {
-                  "adcd": "420529201204100",
-                  "adnm": "一组",
-                  "pcount": 420,
-                  "htcount": 130,
-                  "ldarea": 4.29,
-                  "prevtp": "1",
-                  "lgtd": 110.436456,
-                  "lttd": 30.350601
-                }
-              ]
-            },
-            {
-              "adcd": "420529201205000",
-              "adnm": "左泉洞村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 110.491354,
-              "lttd": 30.38796,
-              "children": [
-                {
-                  "adcd": "420529201205100",
-                  "adnm": "二组（莲蓬溪）",
-                  "pcount": 350,
-                  "htcount": 128,
-                  "ldarea": 3.76,
-                  "prevtp": "2",
-                  "lgtd": 110.485923,
-                  "lttd": 30.404639
-                },
-                {
-                  "adcd": "420529201205101",
-                  "adnm": "五组（炉子坡）",
-                  "pcount": 282,
-                  "htcount": 110,
-                  "ldarea": 3.56,
-                  "prevtp": "1",
-                  "lgtd": 110.503146,
-                  "lttd": 30.3823
-                }
-              ]
-            },
-            {
-              "adcd": "420529201206000",
-              "adnm": "大龙坪村",
-              "pcount": 1784,
-              "htcount": 545,
-              "ldarea": 7.41,
-              "prevtp": "0",
-              "lgtd": 110.471902,
-              "lttd": 30.36017,
-              "children": [
-                {
-                  "adcd": "420529201206100",
-                  "adnm": "三组（刘家湾)",
-                  "pcount": 412,
-                  "htcount": 154,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.468727,
-                  "lttd": 30.357258
-                },
-                {
-                  "adcd": "420529201206101",
-                  "adnm": "二组（大龙坪）",
-                  "pcount": 421,
-                  "htcount": 160,
-                  "ldarea": 3.83,
-                  "prevtp": "2",
-                  "lgtd": 110.470463,
-                  "lttd": 30.363806
-                },
-                {
-                  "adcd": "420529201206102",
-                  "adnm": "三组（冲门沟）",
-                  "pcount": 364,
-                  "htcount": 155,
-                  "ldarea": 3.65,
-                  "prevtp": "2",
-                  "lgtd": 110.469068,
-                  "lttd": 30.365667
-                }
-              ]
-            },
-            {
-              "adcd": "420529201207000",
-              "adnm": "白庙村",
-              "pcount": 1685,
-              "htcount": 532,
-              "ldarea": 11.54,
-              "prevtp": "0",
-              "lgtd": 110.50056,
-              "lttd": 30.31767,
-              "children": [
-                {
-                  "adcd": "420529201207100",
-                  "adnm": "五组（八坪）",
-                  "pcount": 282,
-                  "htcount": 89,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.505149,
-                  "lttd": 30.306069
-                },
-                {
-                  "adcd": "420529201207101",
-                  "adnm": "六组（八坪）",
-                  "pcount": 281,
-                  "htcount": 105,
-                  "ldarea": 1.78,
-                  "prevtp": "0",
-                  "lgtd": 110.507719,
-                  "lttd": 30.30555
-                },
-                {
-                  "adcd": "420529201207102",
-                  "adnm": "一组（白庙聚宝石）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 3.1,
-                  "prevtp": "2",
-                  "lgtd": 110.517796,
-                  "lttd": 30.34481
-                },
-                {
-                  "adcd": "420529201207103",
-                  "adnm": "四组（果坪埫2）",
-                  "pcount": 168,
-                  "htcount": 48,
-                  "ldarea": 3.04,
-                  "prevtp": "2",
-                  "lgtd": 110.495698,
-                  "lttd": 30.315614
-                },
-                {
-                  "adcd": "420529201207105",
-                  "adnm": "三组（白庙）",
-                  "pcount": 150,
-                  "htcount": 48,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.503506,
-                  "lttd": 30.319506
-                },
-                {
-                  "adcd": "420529201207106",
-                  "adnm": "一组（白庙黑潭河）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 3.05,
-                  "prevtp": "2",
-                  "lgtd": 110.500862,
-                  "lttd": 30.32349
-                },
-                {
-                  "adcd": "420529201207107",
-                  "adnm": "四组（果坪埫1）",
-                  "pcount": 100,
-                  "htcount": 40,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.496291,
-                  "lttd": 30.295625
-                }
-              ]
-            },
-            {
-              "adcd": "420529201208000",
-              "adnm": "鸭儿坪村",
-              "pcount": 2458,
-              "htcount": 810,
-              "ldarea": 14.48,
-              "prevtp": "0",
-              "lgtd": 110.523218,
-              "lttd": 30.37112,
-              "children": [
-                {
-                  "adcd": "420529201208100",
-                  "adnm": "一组（廖家湾）",
-                  "pcount": 512,
-                  "htcount": 162,
-                  "ldarea": 5.06,
-                  "prevtp": "2",
-                  "lgtd": 110.522115,
-                  "lttd": 30.369879
-                },
-                {
-                  "adcd": "420529201208101",
-                  "adnm": "三组",
-                  "pcount": 525,
-                  "htcount": 170,
-                  "ldarea": 5.24,
-                  "prevtp": "1",
-                  "lgtd": 110.535948,
-                  "lttd": 30.387679
-                }
-              ]
-            },
-            {
-              "adcd": "420529201209000",
-              "adnm": "桥料村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 110.543481,
-              "lttd": 30.369273,
-              "children": [
-                {
-                  "adcd": "420529201209100",
-                  "adnm": "四组（蒿坪）",
-                  "pcount": 353,
-                  "htcount": 121,
-                  "ldarea": 3.62,
-                  "prevtp": "2",
-                  "lgtd": 110.548285,
-                  "lttd": 30.358664
-                },
-                {
-                  "adcd": "420529201209101",
-                  "adnm": "六组（柞房湾）",
-                  "pcount": 386,
-                  "htcount": 116,
-                  "ldarea": 3.61,
-                  "prevtp": "2",
-                  "lgtd": 110.533869,
-                  "lttd": 30.358174
-                },
-                {
-                  "adcd": "420529201209102",
-                  "adnm": "五组（赛宝）",
-                  "pcount": 319,
-                  "htcount": 110,
-                  "ldarea": 3.52,
-                  "prevtp": "1",
-                  "lgtd": 110.546802,
-                  "lttd": 30.3667211
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529202000000",
-          "adnm": "牛庄乡",
-          "pcount": 7383,
-          "htcount": 2182,
-          "ldarea": 154,
-          "prevtp": "0",
-          "lgtd": 110.353576,
-          "lttd": 30.226665,
-          "children": [
-            {
-              "adcd": "420529202201000",
-              "adnm": "牛庄村",
-              "pcount": 1425,
-              "htcount": 401,
-              "ldarea": 27.81,
-              "prevtp": "0",
-              "lgtd": 110.351812,
-              "lttd": 30.223849,
-              "children": [
-                {
-                  "adcd": "420529202201100",
-                  "adnm": "一组",
-                  "pcount": 132,
-                  "htcount": 43,
-                  "ldarea": 3.73,
-                  "prevtp": "0",
-                  "lgtd": 110.359446,
-                  "lttd": 30.234513
-                },
-                {
-                  "adcd": "420529202201101",
-                  "adnm": "七组",
-                  "pcount": 88,
-                  "htcount": 31,
-                  "ldarea": 1.96,
-                  "prevtp": "0",
-                  "lgtd": 110.342555,
-                  "lttd": 30.228869
-                },
-                {
-                  "adcd": "420529202201102",
-                  "adnm": "二组",
-                  "pcount": 105,
-                  "htcount": 36,
-                  "ldarea": 2.01,
-                  "prevtp": "0",
-                  "lgtd": 110.291595,
-                  "lttd": 30.214394
-                },
-                {
-                  "adcd": "420529202201103",
-                  "adnm": "三组",
-                  "pcount": 182,
-                  "htcount": 52,
-                  "ldarea": 3.92,
-                  "prevtp": "0",
-                  "lgtd": 110.350574,
-                  "lttd": 30.22323
-                }
-              ]
-            },
-            {
-              "adcd": "420529202202000",
-              "adnm": "池南村",
-              "pcount": 734,
-              "htcount": 223,
-              "ldarea": 16.79,
-              "prevtp": "0",
-              "lgtd": 110.337422,
-              "lttd": 30.206523,
-              "children": [
-                {
-                  "adcd": "420529202202100",
-                  "adnm": "六组",
-                  "pcount": 51,
-                  "htcount": 15,
-                  "ldarea": 3.21,
-                  "prevtp": "1",
-                  "lgtd": 110.32757,
-                  "lttd": 30.222412
-                },
-                {
-                  "adcd": "420529202202101",
-                  "adnm": "二组（池南）",
-                  "pcount": 153,
-                  "htcount": 48,
-                  "ldarea": 3.7,
-                  "prevtp": "2",
-                  "lgtd": 110.337412,
-                  "lttd": 30.206112
-                },
-                {
-                  "adcd": "420529202202102",
-                  "adnm": "四组",
-                  "pcount": 106,
-                  "htcount": 29,
-                  "ldarea": 3.37,
-                  "prevtp": "1",
-                  "lgtd": 110.330964,
-                  "lttd": 30.2055751
-                }
-              ]
-            },
-            {
-              "adcd": "420529202203000",
-              "adnm": "凌云村",
-              "pcount": 704,
-              "htcount": 201,
-              "ldarea": 14.63,
-              "prevtp": "0",
-              "lgtd": 110.335722,
-              "lttd": 30.187676,
-              "children": [
-                {
-                  "adcd": "420529202203100",
-                  "adnm": "六组（弭坪）",
-                  "pcount": 85,
-                  "htcount": 15,
-                  "ldarea": 4.33,
-                  "prevtp": "2",
-                  "lgtd": 110.287151,
-                  "lttd": 30.190698
-                },
-                {
-                  "adcd": "420529202203101",
-                  "adnm": "八组（大埫）",
-                  "pcount": 65,
-                  "htcount": 19,
-                  "ldarea": 3.45,
-                  "prevtp": "1",
-                  "lgtd": 110.278841,
-                  "lttd": 30.185058
-                },
-                {
-                  "adcd": "420529202203102",
-                  "adnm": "五组（下土鱼河）",
-                  "pcount": 112,
-                  "htcount": 22,
-                  "ldarea": 5.39,
-                  "prevtp": "2",
-                  "lgtd": 110.302724,
-                  "lttd": 30.184629
-                },
-                {
-                  "adcd": "420529202203103",
-                  "adnm": "大花坪林场",
-                  "pcount": 185,
-                  "htcount": 57,
-                  "ldarea": 8.54,
-                  "prevtp": "2",
-                  "lgtd": 110.318371,
-                  "lttd": 30.154748
-                },
-                {
-                  "adcd": "420529202203104",
-                  "adnm": "五组（上土鱼河）",
-                  "pcount": 98,
-                  "htcount": 45,
-                  "ldarea": 5.32,
-                  "prevtp": "2",
-                  "lgtd": 110.312979,
-                  "lttd": 30.183736
-                }
-              ]
-            },
-            {
-              "adcd": "420529202204000",
-              "adnm": "沙河村",
-              "pcount": 403,
-              "htcount": 111,
-              "ldarea": 11.57,
-              "prevtp": "0",
-              "lgtd": 110.36442,
-              "lttd": 30.238031,
-              "children": [
-                {
-                  "adcd": "420529202204100",
-                  "adnm": "一组（沙河)",
-                  "pcount": 86,
-                  "htcount": 23,
-                  "ldarea": 3.93,
-                  "prevtp": "2",
-                  "lgtd": 110.364422,
-                  "lttd": 30.237765
-                }
-              ]
-            },
-            {
-              "adcd": "420529202205000",
-              "adnm": "松木坪村",
-              "pcount": 644,
-              "htcount": 169,
-              "ldarea": 14.99,
-              "prevtp": "0",
-              "lgtd": 110.306926,
-              "lttd": 30.229545,
-              "children": []
-            },
-            {
-              "adcd": "420529202206000",
-              "adnm": "金山村",
-              "pcount": 1321,
-              "htcount": 383,
-              "ldarea": 21.99,
-              "prevtp": "0",
-              "lgtd": 110.288519,
-              "lttd": 30.229658,
-              "children": [
-                {
-                  "adcd": "420529202206100",
-                  "adnm": "二组（罗家湾）",
-                  "pcount": 69,
-                  "htcount": 12,
-                  "ldarea": 3.01,
-                  "prevtp": "2",
-                  "lgtd": 110.293487,
-                  "lttd": 30.2124449
-                },
-                {
-                  "adcd": "420529202206101",
-                  "adnm": "三组（任家河）",
-                  "pcount": 113,
-                  "htcount": 28,
-                  "ldarea": 5.38,
-                  "prevtp": "1",
-                  "lgtd": 110.281083,
-                  "lttd": 30.223695
-                },
-                {
-                  "adcd": "420529202206102",
-                  "adnm": "一组（李家屋场）",
-                  "pcount": 84,
-                  "htcount": 19,
-                  "ldarea": 2.34,
-                  "prevtp": "0",
-                  "lgtd": 110.311067,
-                  "lttd": 30.219306
-                },
-                {
-                  "adcd": "420529202206103",
-                  "adnm": "五组（金山坪）",
-                  "pcount": 284,
-                  "htcount": 52,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.283955,
-                  "lttd": 30.233378
-                },
-                {
-                  "adcd": "420529202206104",
-                  "adnm": "九组（鹰嘴山）",
-                  "pcount": 220,
-                  "htcount": 47,
-                  "ldarea": 6.88,
-                  "prevtp": "1",
-                  "lgtd": 110.277328,
-                  "lttd": 30.235023
-                }
-              ]
-            },
-            {
-              "adcd": "420529202207000",
-              "adnm": "九里坪村",
-              "pcount": 734,
-              "htcount": 213,
-              "ldarea": 16.16,
-              "prevtp": "0",
-              "lgtd": 110.381023,
-              "lttd": 30.278049,
-              "children": [
-                {
-                  "adcd": "420529202207100",
-                  "adnm": "六组（黄家坳）",
-                  "pcount": 75,
-                  "htcount": 16,
-                  "ldarea": 3.95,
-                  "prevtp": "1",
-                  "lgtd": 110.377058,
-                  "lttd": 30.290256
-                },
-                {
-                  "adcd": "420529202207101",
-                  "adnm": "三组（阳坡坪）",
-                  "pcount": 123,
-                  "htcount": 29,
-                  "ldarea": 5.51,
-                  "prevtp": "2",
-                  "lgtd": 110.3784,
-                  "lttd": 30.2772
-                }
-              ]
-            },
-            {
-              "adcd": "420529202208000",
-              "adnm": "横茅湖村",
-              "pcount": 1238,
-              "htcount": 411,
-              "ldarea": 23.89,
-              "prevtp": "0",
-              "lgtd": 110.39574,
-              "lttd": 30.304549,
-              "children": [
-                {
-                  "adcd": "420529202208100",
-                  "adnm": "四组（倒洞坳）",
-                  "pcount": 82,
-                  "htcount": 16,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.369113,
-                  "lttd": 30.294094
-                },
-                {
-                  "adcd": "420529202208101",
-                  "adnm": "五组（红岩沟）",
-                  "pcount": 74,
-                  "htcount": 21,
-                  "ldarea": 3.26,
-                  "prevtp": "2",
-                  "lgtd": 110.376422,
-                  "lttd": 30.305973
-                }
-              ]
-            },
-            {
-              "adcd": "420529202209000",
-              "adnm": "沙湾村",
-              "pcount": 180,
-              "htcount": 70,
-              "ldarea": 4.98,
-              "prevtp": "0",
-              "lgtd": 110.405011,
-              "lttd": 30.334473,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529203000000",
-          "adnm": "采花乡",
-          "pcount": 27228,
-          "htcount": 8128,
-          "ldarea": 285.47,
-          "prevtp": "0",
-          "lgtd": 110.450562,
-          "lttd": 30.214214,
-          "children": [
-            {
-              "adcd": "420529203001000",
-              "adnm": "采花社区",
-              "pcount": 1323,
-              "htcount": 358,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.449803,
-              "lttd": 30.213941,
-              "children": [
-                {
-                  "adcd": "420529203001106",
-                  "adnm": "中街",
-                  "pcount": 406,
-                  "htcount": 116,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450705,
-                  "lttd": 30.214687
-                },
-                {
-                  "adcd": "420529203001107",
-                  "adnm": "下街",
-                  "pcount": 315,
-                  "htcount": 89,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450165,
-                  "lttd": 30.216293
-                },
-                {
-                  "adcd": "420529203001108",
-                  "adnm": "上街",
-                  "pcount": 602,
-                  "htcount": 153,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.445732,
-                  "lttd": 30.205698
-                }
-              ]
-            },
-            {
-              "adcd": "420529203201000",
-              "adnm": "长茂司村",
-              "pcount": 750,
-              "htcount": 231,
-              "ldarea": 13.7,
-              "prevtp": "0",
-              "lgtd": 110.452802,
-              "lttd": 30.217673,
-              "children": [
-                {
-                  "adcd": "420529203201100",
-                  "adnm": "三组（胡家台）",
-                  "pcount": 350,
-                  "htcount": 101,
-                  "ldarea": 6.53,
-                  "prevtp": "2",
-                  "lgtd": 110.452846,
-                  "lttd": 30.225834
-                },
-                {
-                  "adcd": "420529203201101",
-                  "adnm": "二组（茶丘）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 6.61,
-                  "prevtp": "2",
-                  "lgtd": 110.45266,
-                  "lttd": 30.218348
-                },
-                {
-                  "adcd": "420529203201102",
-                  "adnm": "一组（长茂司）",
-                  "pcount": 300,
-                  "htcount": 100,
-                  "ldarea": 6.57,
-                  "prevtp": "1",
-                  "lgtd": 110.451124,
-                  "lttd": 30.208181
-                }
-              ]
-            },
-            {
-              "adcd": "420529203202000",
-              "adnm": "黄家台村",
-              "pcount": 595,
-              "htcount": 190,
-              "ldarea": 17.75,
-              "prevtp": "0",
-              "lgtd": 110.456985,
-              "lttd": 30.238609,
-              "children": [
-                {
-                  "adcd": "420529203202100",
-                  "adnm": "四组（彭家屋场）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.458927,
-                  "lttd": 30.237277
-                },
-                {
-                  "adcd": "420529203202101",
-                  "adnm": "二组（黄家台）",
-                  "pcount": 119,
-                  "htcount": 43,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.462367,
-                  "lttd": 30.241478
-                },
-                {
-                  "adcd": "420529203202102",
-                  "adnm": "七组（白水）",
-                  "pcount": 196,
-                  "htcount": 65,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.431701,
-                  "lttd": 30.255427
-                },
-                {
-                  "adcd": "420529203202103",
-                  "adnm": "一组（小河湾）",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.456722,
-                  "lttd": 30.248939
-                }
-              ]
-            },
-            {
-              "adcd": "420529203203000",
-              "adnm": "白鹤村",
-              "pcount": 470,
-              "htcount": 183,
-              "ldarea": 7.57,
-              "prevtp": "0",
-              "lgtd": 110.439468,
-              "lttd": 30.196909,
-              "children": [
-                {
-                  "adcd": "420529203203101",
-                  "adnm": "三组（沙坝子）",
-                  "pcount": 160,
-                  "htcount": 55,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.439307,
-                  "lttd": 30.1976174
-                },
-                {
-                  "adcd": "420529203203102",
-                  "adnm": "二组（撒花溪）",
-                  "pcount": 210,
-                  "htcount": 83,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.441227,
-                  "lttd": 30.2078615
-                },
-                {
-                  "adcd": "420529203203103",
-                  "adnm": "一组(沙坝子）",
-                  "pcount": 100,
-                  "htcount": 45,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.444088,
-                  "lttd": 30.2049066
-                },
-                {
-                  "adcd": "420529203203104",
-                  "adnm": "三组（周家岭）",
-                  "pcount": 200,
-                  "htcount": 73,
-                  "ldarea": 3.9,
-                  "prevtp": "2",
-                  "lgtd": 110.441688,
-                  "lttd": 30.20215
-                }
-              ]
-            },
-            {
-              "adcd": "420529203204000",
-              "adnm": "大村",
-              "pcount": 803,
-              "htcount": 235,
-              "ldarea": 19.77,
-              "prevtp": "0",
-              "lgtd": 110.43015,
-              "lttd": 30.220485,
-              "children": [
-                {
-                  "adcd": "420529203204100",
-                  "adnm": "一组（大村）",
-                  "pcount": 238,
-                  "htcount": 70,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.427983,
-                  "lttd": 30.218539
-                },
-                {
-                  "adcd": "420529203204101",
-                  "adnm": "七组（廖叶池）",
-                  "pcount": 355,
-                  "htcount": 100,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.411043,
-                  "lttd": 30.2063821
-                },
-                {
-                  "adcd": "420529203204102",
-                  "adnm": "八组",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 8.59,
-                  "prevtp": "1",
-                  "lgtd": 110.404746,
-                  "lttd": 30.2028926
-                }
-              ]
-            },
-            {
-              "adcd": "420529203205000",
-              "adnm": "万里村",
-              "pcount": 363,
-              "htcount": 125,
-              "ldarea": 25,
-              "prevtp": "0",
-              "lgtd": 110.394666,
-              "lttd": 30.195858,
-              "children": [
-                {
-                  "adcd": "420529203205100",
-                  "adnm": "三组（二龙坪）",
-                  "pcount": 100,
-                  "htcount": 31,
-                  "ldarea": 10.34,
-                  "prevtp": "2",
-                  "lgtd": 110.390243,
-                  "lttd": 30.196587
-                },
-                {
-                  "adcd": "420529203205101",
-                  "adnm": "七组（地龙坪）",
-                  "pcount": 93,
-                  "htcount": 37,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.398801,
-                  "lttd": 30.1891199
-                },
-                {
-                  "adcd": "420529203205102",
-                  "adnm": "一组",
-                  "pcount": 170,
-                  "htcount": 57,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.406986,
-                  "lttd": 30.1996586
-                }
-              ]
-            },
-            {
-              "adcd": "420529203206000",
-              "adnm": "前坪村",
-              "pcount": 1272,
-              "htcount": 373,
-              "ldarea": 20.24,
-              "prevtp": "0",
-              "lgtd": 110.43581,
-              "lttd": 30.165766,
-              "children": [
-                {
-                  "adcd": "420529203206100",
-                  "adnm": "一组（苦竹园）",
-                  "pcount": 320,
-                  "htcount": 85,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423108,
-                  "lttd": 30.153465
-                },
-                {
-                  "adcd": "420529203206101",
-                  "adnm": "七组（严家河）",
-                  "pcount": 140,
-                  "htcount": 36,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423214,
-                  "lttd": 30.1728369
-                },
-                {
-                  "adcd": "420529203206102",
-                  "adnm": "二组（莫家溪）",
-                  "pcount": 322,
-                  "htcount": 89,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.419841,
-                  "lttd": 30.1590782
-                },
-                {
-                  "adcd": "420529203206103",
-                  "adnm": "六组（前坪）",
-                  "pcount": 190,
-                  "htcount": 65,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423714,
-                  "lttd": 30.167981
-                },
-                {
-                  "adcd": "420529203206104",
-                  "adnm": "三组",
-                  "pcount": 200,
-                  "htcount": 71,
-                  "ldarea": 7,
-                  "prevtp": "0",
-                  "lgtd": 110.423373,
-                  "lttd": 30.166645
-                },
-                {
-                  "adcd": "420529203206105",
-                  "adnm": "七组（关门岩）",
-                  "pcount": 100,
-                  "htcount": 35,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.424368,
-                  "lttd": 30.175888
-                }
-              ]
-            },
-            {
-              "adcd": "420529203207000",
-              "adnm": "采花台村",
-              "pcount": 835,
-              "htcount": 247,
-              "ldarea": 27.8,
-              "prevtp": "0",
-              "lgtd": 110.404831,
-              "lttd": 30.134315,
-              "children": [
-                {
-                  "adcd": "420529203207100",
-                  "adnm": "八组（堰坪）",
-                  "pcount": 115,
-                  "htcount": 32,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.387513,
-                  "lttd": 30.148693
-                },
-                {
-                  "adcd": "420529203207101",
-                  "adnm": "二组（覃家台）",
-                  "pcount": 200,
-                  "htcount": 55,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.408039,
-                  "lttd": 30.140805
-                },
-                {
-                  "adcd": "420529203207102",
-                  "adnm": "七组（堰坪）",
-                  "pcount": 90,
-                  "htcount": 35,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.391524,
-                  "lttd": 30.147526
-                },
-                {
-                  "adcd": "420529203207103",
-                  "adnm": "三组（覃家台）",
-                  "pcount": 220,
-                  "htcount": 65,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.397219,
-                  "lttd": 30.127049
-                },
-                {
-                  "adcd": "420529203207104",
-                  "adnm": "一组（采花台）",
-                  "pcount": 210,
-                  "htcount": 60,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.40784,
-                  "lttd": 30.133373
-                }
-              ]
-            },
-            {
-              "adcd": "420529203208000",
-              "adnm": "楠木桥村",
-              "pcount": 518,
-              "htcount": 148,
-              "ldarea": 35.4,
-              "prevtp": "0",
-              "lgtd": 110.464885,
-              "lttd": 30.173719,
-              "children": [
-                {
-                  "adcd": "420529203208100",
-                  "adnm": "一组（楠木桥）",
-                  "pcount": 305,
-                  "htcount": 88,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.464482,
-                  "lttd": 30.173049
-                },
-                {
-                  "adcd": "420529203208101",
-                  "adnm": "二组（后荒）",
-                  "pcount": 55,
-                  "htcount": 15,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.453234,
-                  "lttd": 30.164536
-                },
-                {
-                  "adcd": "420529203208102",
-                  "adnm": "三组",
-                  "pcount": 158,
-                  "htcount": 45,
-                  "ldarea": 13.8,
-                  "prevtp": "1",
-                  "lgtd": 110.527918,
-                  "lttd": 30.235771
-                }
-              ]
-            },
-            {
-              "adcd": "420529203209000",
-              "adnm": "星岩坪村",
-              "pcount": 1008,
-              "htcount": 295,
-              "ldarea": 21.9,
-              "prevtp": "0",
-              "lgtd": 110.472704,
-              "lttd": 30.257124,
-              "children": [
-                {
-                  "adcd": "420529203209100",
-                  "adnm": "一组（星岩坪公社湾）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.64,
-                  "prevtp": "2",
-                  "lgtd": 110.472441,
-                  "lttd": 30.255052
-                },
-                {
-                  "adcd": "420529203209101",
-                  "adnm": "七组（三渡水）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.65,
-                  "prevtp": "1",
-                  "lgtd": 110.48657,
-                  "lttd": 30.281577
-                },
-                {
-                  "adcd": "420529203209102",
-                  "adnm": "三组（张家湾）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.477373,
-                  "lttd": 30.269899
-                },
-                {
-                  "adcd": "420529203209103",
-                  "adnm": "白果坪",
-                  "pcount": 248,
-                  "htcount": 66,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.483562,
-                  "lttd": 30.291257
-                },
-                {
-                  "adcd": "420529203209104",
-                  "adnm": "五组",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.468164,
-                  "lttd": 30.2445375
-                },
-                {
-                  "adcd": "420529203209105",
-                  "adnm": "一组（褚家台）",
-                  "pcount": 190,
-                  "htcount": 55,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.472318,
-                  "lttd": 30.261083
-                }
-              ]
-            },
-            {
-              "adcd": "420529203210000",
-              "adnm": "苦竹坪村",
-              "pcount": 317,
-              "htcount": 92,
-              "ldarea": 5.1,
-              "prevtp": "0",
-              "lgtd": 110.511256,
-              "lttd": 30.267272,
-              "children": [
-                {
-                  "adcd": "420529203210100",
-                  "adnm": "八组（大沙坡）",
-                  "pcount": 222,
-                  "htcount": 65,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.514562,
-                  "lttd": 30.263478
-                },
-                {
-                  "adcd": "420529203210101",
-                  "adnm": "二组（陈家大坪）",
-                  "pcount": 50,
-                  "htcount": 15,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.515786,
-                  "lttd": 30.255662
-                },
-                {
-                  "adcd": "420529203210105",
-                  "adnm": "一组（渔泉河）",
-                  "pcount": 45,
-                  "htcount": 12,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.524606,
-                  "lttd": 30.241511
-                },
-                {
-                  "adcd": "420529203210106",
-                  "adnm": "八组（大沙坝）",
-                  "pcount": 210,
-                  "htcount": 55,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.510302,
-                  "lttd": 30.269807
-                }
-              ]
-            },
-            {
-              "adcd": "420529203211000",
-              "adnm": "珍珠头村",
-              "pcount": 248,
-              "htcount": 77,
-              "ldarea": 9.71,
-              "prevtp": "0",
-              "lgtd": 110.497443,
-              "lttd": 30.272249,
-              "children": [
-                {
-                  "adcd": "420529203211100",
-                  "adnm": "一组（二叉口）",
-                  "pcount": 98,
-                  "htcount": 32,
-                  "ldarea": 6.85,
-                  "prevtp": "2",
-                  "lgtd": 110.492167,
-                  "lttd": 30.294125
-                },
-                {
-                  "adcd": "420529203211102",
-                  "adnm": "五组（马家坡）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 6.86,
-                  "prevtp": "2",
-                  "lgtd": 110.516365,
-                  "lttd": 30.247835
-                }
-              ]
-            },
-            {
-              "adcd": "420529203212000",
-              "adnm": "红渔坪村",
-              "pcount": 1350,
-              "htcount": 428,
-              "ldarea": 18.1,
-              "prevtp": "0",
-              "lgtd": 110.496412,
-              "lttd": 30.222253,
-              "children": [
-                {
-                  "adcd": "420529203212100",
-                  "adnm": "二组（红渔坪）",
-                  "pcount": 340,
-                  "htcount": 108,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.494381,
-                  "lttd": 30.2221248
-                },
-                {
-                  "adcd": "420529203212101",
-                  "adnm": "四组（阳坡）",
-                  "pcount": 480,
-                  "htcount": 146,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.496759,
-                  "lttd": 30.228309
-                },
-                {
-                  "adcd": "420529203212102",
-                  "adnm": "三组",
-                  "pcount": 330,
-                  "htcount": 106,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.501227,
-                  "lttd": 30.22803
-                },
-                {
-                  "adcd": "420529203212103",
-                  "adnm": "五组（楠木）",
-                  "pcount": 200,
-                  "htcount": 68,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.516091,
-                  "lttd": 30.2269493
-                }
-              ]
-            },
-            {
-              "adcd": "420529203213000",
-              "adnm": "白溢坪村",
-              "pcount": 547,
-              "htcount": 169,
-              "ldarea": 19,
-              "prevtp": "0",
-              "lgtd": 110.556215,
-              "lttd": 30.248125,
-              "children": [
-                {
-                  "adcd": "420529203213100",
-                  "adnm": "二组（湖坪）",
-                  "pcount": 237,
-                  "htcount": 70,
-                  "ldarea": 6.75,
-                  "prevtp": "2",
-                  "lgtd": 110.542872,
-                  "lttd": 30.2415706
-                },
-                {
-                  "adcd": "420529203213101",
-                  "adnm": "三组（湖坪）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.545592,
-                  "lttd": 30.2411432
-                },
-                {
-                  "adcd": "420529203213102",
-                  "adnm": "七组（白溢坪）",
-                  "pcount": 108,
-                  "htcount": 32,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.552356,
-                  "lttd": 30.2441797
-                },
-                {
-                  "adcd": "420529203213103",
-                  "adnm": "一组",
-                  "pcount": 70,
-                  "htcount": 25,
-                  "ldarea": 6.75,
-                  "prevtp": "1",
-                  "lgtd": 110.528468,
-                  "lttd": 30.236548
-                }
-              ]
-            },
-            {
-              "adcd": "420529203214000",
-              "adnm": "宋家河村",
-              "pcount": 1023,
-              "htcount": 385,
-              "ldarea": 30.2,
-              "prevtp": "0",
-              "lgtd": 110.557717,
-              "lttd": 30.188565,
-              "children": [
-                {
-                  "adcd": "420529203214100",
-                  "adnm": "二组（宋家河）",
-                  "pcount": 182,
-                  "htcount": 120,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.558747,
-                  "lttd": 30.187884
-                },
-                {
-                  "adcd": "420529203214101",
-                  "adnm": "六组（唐家河）",
-                  "pcount": 139,
-                  "htcount": 45,
-                  "ldarea": 9.55,
-                  "prevtp": "1",
-                  "lgtd": 110.557433,
-                  "lttd": 30.204571
-                },
-                {
-                  "adcd": "420529203214102",
-                  "adnm": "七组（甘沟河）",
-                  "pcount": 486,
-                  "htcount": 150,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.545536,
-                  "lttd": 30.2194051
-                },
-                {
-                  "adcd": "420529203214103",
-                  "adnm": "五组（云山）",
-                  "pcount": 216,
-                  "htcount": 70,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.533849,
-                  "lttd": 30.1901553
-                }
-              ]
-            },
-            {
-              "adcd": "420529203215000",
-              "adnm": "栗子坪村",
-              "pcount": 951,
-              "htcount": 267,
-              "ldarea": 9.7,
-              "prevtp": "0",
-              "lgtd": 110.570566,
-              "lttd": 30.162327,
-              "children": []
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  waterList: [
-    {
-      "wscd": "11",
-      "wsnm": "百溪河"
-    },
-    {
-      "wscd": "61",
-      "wsnm": "沽洞溪"
-    },
-    {
-      "wscd": "71",
-      "wsnm": "二汊口河"
-    },
-    {
-      "wscd": "FA85W508610420000",
-      "wsnm": "泗洋河"
-    },
-    {
-      "wscd": "FA85X808780420000",
-      "wsnm": "天池河"
-    },
-    {
-      "wscd": "FF148801360420000",
-      "wsnm": "南河"
-    },
-    {
-      "wscd": "HBWS000000002",
-      "wsnm": "湾潭河"
-    },
-    {
-      "wscd": "HBWS000000003",
-      "wsnm": "渔阳河"
-    }
-  ],
-  tableData: [
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-  ]
-}
diff --git a/src/views/fxdd/tqyb/tqxx2/index.js b/src/views/fxdd/tqyb/tqxx2/index.js
deleted file mode 100644
index e75dfd3..0000000
--- a/src/views/fxdd/tqyb/tqxx2/index.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-import { Table, Segmented, Card, Tabs, Radio, Button, Switch } from 'antd'
-import Stroke from 'ol/style/Stroke'
-import Graticule from 'ol/layer/Graticule.js'
-import moment from 'moment'
-
-import { useDispatch, useSelector } from 'react-redux'
-import RadarPage from '../../../Home/panels/forecastPanels/meteorology/radar/player'
-import SateCloudPage from '../../../Home/panels/forecastPanels/meteorology/sateCloud/player'
-import GridRainfall2h from '../../../Home/panels/forecastPanels/meteorology/gridRainfall2h'
-import ArealRainfTm from '../../../Home/panels/forecastPanels/meteorology/arealRainfTm'
-import data from './dataConfig'
-import Ljtj from '../ljtj'
-import Pltj from '../qltj'
-import Sktj from '../sktj'
-import Lsyl from '../lsyl/index.js'
-
-import { weatherLevel } from '../../../../service/fxdd'
-import { check } from '../../../../service/endPointWarnDevice'
-
-const Page = ({ activeKey }) => {
-  const [badgeType, setBadgeType] = useState('网格')
-  const [checked, setChecked] = useState(true)
-
-  const [params, setParams] = useState({
-    tm: '',
-    ts: ''
-  })
-
-  const doSearch = params2 => {
-    const tmm = moment(params2.tm).format('YYYYMMDD')
-    const tss = params2?.dataForm?.ts?.split(':')
-    if (tmm && tss?.length === 2) {
-      setParams({
-        tm: tmm,
-        ts: tss[0] + tss[1],
-        dataForm: params2.dataForm
-      })
-    }
-  }
-  return (
-    <>
-      <div className='monitor-rainfall waterLevelBox'>
-        <div style={{ margin: '0 0 0 6px' }} className='topQuery'>
-          <Toolbar search={doSearch} />
-        </div>
-        <Lsyl params={params} />
-      </div>
-      <div
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 'calc(100vw - 480px)',
-          width: '400px',
-          transform: 'scal(1.3)'
-        }}
-      >
-        {/* <Radio.Group
-          defaultValue='网格'
-          // onChange={e => setBadgeType('面雨量')}
-          value={badgeType}
-        >
-          <Radio.Button value='网格'>网格</Radio.Button>
-          <Radio.Button value='面雨量'
-            onClick={()=>setBadgeType(badgeType==='面雨量'?"":'面雨量')}
-          >面雨量</Radio.Button>
-        </Radio.Group> */}
-
-        <Switch
-          size='default'
-          checkedChildren='面雨量'
-          unCheckedChildren='面雨量'
-          onChange={e => setChecked(e)}
-          value={checked}
-          defaultChecked
-        />
-      </div>
-
-      {badgeType === '网格' ? (
-        <div>{/* <GridRainfall2h tm={tm} /> */}</div>
-      ) : null}
-
-      {checked ? (
-        <div>
-          <ArealRainfTm tm={moment(params?.tm)} ts={params?.ts} />
-        </div>
-      ) : null}
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/tqxx2/index.less b/src/views/fxdd/tqyb/tqxx2/index.less
deleted file mode 100644
index cfd9037..0000000
--- a/src/views/fxdd/tqyb/tqxx2/index.less
+++ /dev/null
@@ -1,65 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-}
-
-.subTitle {
-  position: relative;
-  padding-left: 8px;
-  margin: 0 0 10px 10px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-
-  &:after {
-    content: "";
-    display: block;
-    position: absolute;
-    width: 3px;
-    height: 16px;
-    background: #0068F4;
-    left: -2px;
-    top: 5px;
-    border-radius: 4px;
-  }
-}
-
-.summary {
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-
-  .sum-count {
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
-
-
-.sateCloudPageBox,.radarPageBox{
-
-  // position:fixed;
-  position: absolute;
-  left: 500px;
-  padding-top: 15px;
-  bottom: 50px;
-  width: calc(100vw - 1000px);
-
-
-  
-  height:60px;
-  background: #fff;
-  z-index: 101;
-  // bottom:13px;
-  box-shadow: 1px 2px 10px #bdbaba;
-  box-sizing: border-box;
-  border-radius:6px;
-  >div{
-    background: #fff;
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxdd/tqyb/tqxx2/mock.js b/src/views/fxdd/tqyb/tqxx2/mock.js
deleted file mode 100644
index 8f1ca4d..0000000
--- a/src/views/fxdd/tqyb/tqxx2/mock.js
+++ /dev/null
@@ -1,196 +0,0 @@
-export default {
-  option: [
-    {
-      value: '00:00',
-      label: '00:00'
-    },
-    {
-      value: '00:30',
-      label: '00:30'
-    },
-    {
-      value: '01:00',
-      label: '01:00'
-    },
-    {
-      value: '01:30',
-      label: '01:30'
-    },
-    {
-      value: '02:00',
-      label: '02:00'
-    },
-    {
-      value: '02:30',
-      label: '02:30'
-    },
-    {
-      value: '03:00',
-      label: '03:00'
-    },
-    {
-      value: '03:30',
-      label: '03:30'
-    },
-    {
-      value: '04:00',
-      label: '04:00'
-    },
-    {
-      value: '04:30',
-      label: '04:30'
-    },
-    {
-      value: '05:00',
-      label: '05:00'
-    },
-    {
-      value: '05:30',
-      label: '05:30'
-    },
-    {
-      value: '06:00',
-      label: '06:00'
-    },
-    {
-      value: '06:30',
-      label: '06:30'
-    },
-    {
-      value: '07:00',
-      label: '07:00'
-    },
-    {
-      value: '07:30',
-      label: '07:30'
-    },
-    {
-      value: '08:00',
-      label: '08:00'
-    },
-    {
-      value: '08:30',
-      label: '08:30'
-    },
-    {
-      value: '09:00',
-      label: '09:00'
-    },
-    {
-      value: '09:30',
-      label: '09:30'
-    },
-    {
-      value: '10:00',
-      label: '10:00'
-    },
-    {
-      value: '10:30',
-      label: '10:30'
-    },
-    {
-      value: '11:00',
-      label: '11:00'
-    },
-    {
-      value: '11:30',
-      label: '11:30'
-    },
-    {
-      value: '12:00',
-      label: '12:00'
-    },
-    {
-      value: '12:30',
-      label: '12:30'
-    },
-    {
-      value: '13:00',
-      label: '13:00'
-    },
-    {
-      value: '13:30',
-      label: '13:30'
-    },
-    {
-      value: '14:00',
-      label: '14:00'
-    },
-    {
-      value: '14:30',
-      label: '14:30'
-    },
-    {
-      value: '15:00',
-      label: '15:00'
-    },
-    {
-      value: '15:30',
-      label: '15:30'
-    },
-    {
-      value: '16:00',
-      label: '16:00'
-    },
-    {
-      value: '16:30',
-      label: '16:30'
-    },
-    {
-      value: '17:00',
-      label: '17:00'
-    },
-    {
-      value: '17:30',
-      label: '17:30'
-    },
-    {
-      value: '18:00',
-      label: '18:00'
-    },
-    {
-      value: '18:30',
-      label: '18:30'
-    },
-    {
-      value: '19:00',
-      label: '19:00'
-    },
-    {
-      value: '19:30',
-      label: '19:30'
-    },
-    {
-      value: '20:00',
-      label: '20:00'
-    },
-    {
-      value: '20:30',
-      label: '20:30'
-    },
-    {
-      value: '21:00',
-      label: '21:00'
-    },
-    {
-      value: '21:30',
-      label: '21:30'
-    },
-    {
-      value: '22:00',
-      label: '22:00'
-    },
-    {
-      value: '22:30',
-      label: '22:30'
-    },
-    {
-      value: '23:00',
-      label: '23:00'
-    },
-    {
-      value: '23:30',
-      label: '23:30'
-    }
-  ]
-}
diff --git a/src/views/fxdd/tqyb/tqxx2/toolbar.js b/src/views/fxdd/tqyb/tqxx2/toolbar.js
deleted file mode 100644
index aa59a80..0000000
--- a/src/views/fxdd/tqyb/tqxx2/toolbar.js
+++ /dev/null
@@ -1,279 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Button, DatePicker, Checkbox, TreeSelect, Select } from 'antd'
-import { getDictService } from '../../../../service/SelectValue'
-import { LeftOutlined, RightOutlined } from '@ant-design/icons'
-import { Space } from 'antd'
-import NormalSelect from '../../../../components/Form/NormalSelect'
-
-import moment from 'moment'
-import data from './dataConfig'
-import optiondata from './mock'
-
-const { Option } = Select
-
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-
-const ToolBar = ({ search, downLoad }) => {
-  const [form] = Form.useForm()
-  const [optionsel, setPptionsel] = useState(optiondata.option)
-  const [disabled, setDisabled] = useState(true)
-  const [date, setDate] = useState(moment())
-
-  const [dataForm, setDataForm] = useState({
-    ts: '',
-    tm: moment()
-  })
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    setDataForm(state => ({ ...state, tm: val }))
-    setDate(val)
-
-    if (val.format('YYYYMMDD') != moment().format('YYYYMMDD')) {
-      setPptionsel(optiondata.option)
-      setDisabled(false)
-      search({ tm: dataForm.tm, dataForm })
-    } else {
-      getOption()
-    }
-  }
-
-  const onSearchClick1 = (val, index) => {
-    if (val) {
-      setDataForm(state => ({ ...state, ts: val }))
-    }
-    let b1 = optionsel.findIndex(item => item.value == val)
-    console.log('optionsel', val, b1, optionsel.length)
-    if (dataForm.tm.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-      if (b1 == optionsel.length - 1) {
-        setDisabled(true)
-      } else {
-        setDisabled(false)
-      }
-    } else {
-      setDisabled(false)
-    }
-  }
-
-  const onBtn = () => {
-    let inx = 0
-    let a1 = optiondata.option.findIndex(item => item.value == dataForm.ts)
-
-    if (a1 == optionsel.length - 1) {
-      inx = a1 + 1
-      setDataForm(state => ({
-        ...state,
-        ts: optiondata.option[0].value
-      }))
-      if (dataForm.tm.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-        getOpdata()
-      } else {
-        const tomorrow = dataForm.tm.add(1, 'days')
-
-        if (tomorrow.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-          console.log('tomorrow222dd', tomorrow)
-          getOpdata()
-        }
-      }
-    } else {
-      console.log('(a1 + 1(a1 + 1', a1, optionsel.length)
-      setDataForm(state => ({ ...state, ts: optiondata.option[a1 + 1].value }))
-      if (dataForm.tm.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-        if (a1 == optionsel.length - 1) {
-          setDisabled(true)
-        } else {
-          setDisabled(false)
-        }
-      }
-    }
-  }
-
-  const getOpdata = () => {
-    const { t2 } = getTime()
-    let b1 = optiondata.option.findIndex(item => item.value == t2)
-    if (b1 != -1) {
-      let b2 = optiondata.option.slice(0, b1 + 1)
-      setPptionsel(b2)
-    }
-  }
-  const onPerBtn = () => {
-    const { ...rec } = form.getFieldsValue()
-    let a1 = optiondata.option.findIndex(item => item.value == dataForm.ts)
-
-    let inx = 0
-
-    if (a1 != 0) {
-      inx = a1 - 1
-      setDataForm(state => ({ ...state, ts: optiondata.option[inx].value }))
-    } else {
-      setPptionsel(optiondata.option)
-      const yesterday = dataForm.tm.subtract(1, 'days')
-      inx = optiondata.option.length - 1
-
-      setDataForm(state => ({
-        tm: yesterday,
-        ts: optiondata.option[inx].value
-      }))
-      setDate(yesterday)
-      console.log('setDataFormsetDataFormsetDataFormsetDataForm', date)
-    }
-
-    if (a1 - 1 != optionsel.length) {
-      setDisabled(false)
-    } else {
-      setDisabled(true)
-    }
-  }
-
-  useEffect(() => {
-    const { ...rec } = form.getFieldsValue()
-    console.log('useEffect,', dataForm.tm.format('YYYYMMDD HH:ss'))
-
-    if (dataForm.ts == '00:00') {
-      setDisabled(false)
-    }
-
-    search({ tm: dataForm.tm, dataForm })
-  }, [dataForm])
-
-  const typeOptions = [
-    { label: '山洪', value: 'SH' },
-    { label: '水文', value: 'SW' },
-    { label: '气象', value: 'QX' },
-    { label: '水库', value: 'SK' }
-  ]
-  const getOption = () => {
-    const t = moment().toObject()
-    const th = t.hours
-    const tm = t.minutes
-    let t2 = null
-    let m = th >= 10 ? th : '0' + th
-    if (tm < 30) {
-      let mm = m - 1
-      let dd = mm >= 10 ? mm : '0' + mm
-      t2 = dd + ':' + '30'
-    } else {
-      t2 = m + ':' + '00'
-    }
-    let b1 = optiondata.option.findIndex(item => item.value == t2)
-    if (b1 != -1) {
-      let b2 = optiondata.option.slice(0, b1 + 1)
-      setPptionsel(b2)
-    }
-    setDataForm(state => ({ ...state, ts: t2 }))
-    setDisabled(true)
-  }
-  const handleTreeData = val => {
-    if (val.length > 0) {
-      val.map(item => {
-        item.value = item.adcd + item.adnm
-        item.title = item.adnm
-        if (item.children && item.children.length > 0) {
-          handleTreeData(item.children)
-        }
-      })
-    }
-  }
-
-  const getTime = () => {
-    const t = moment().toObject()
-    const th = t.hours
-    const tm = t.minutes
-    let t2 = null
-    let m = th > 10 ? th : '0' + th
-    if (tm < 30) {
-      let mm = m - 1
-      let dd = mm > 10 ? mm : '0' + mm
-      t2 = dd + ':' + '30'
-    } else {
-      t2 = m + ':' + '00'
-    }
-    return { t2 }
-  }
-
-  const [treeData, setTreeData] = useState(data.xzqh)
-  const [waterList, setWaterList] = useState(data.waterList)
-
-  useEffect(() => {
-    handleTreeData(treeData)
-    setTreeData(treeData)
-
-    // form.setFieldsValue({ "tm": [moment().add(-1, 'day'), moment()] });
-    if (dataForm.tm.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-      getOption()
-    }
-  }, [])
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          initialValues={{
-            types: ['SH', 'SW', 'QX', 'SK'],
-            tm: moment(),
-            ts: '12:00'
-          }}
-        >
-          {/* <Form.Item label='类型' name='types' style={{ margin: '0 0 8px 0' }}>
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick} />
-          </Form.Item> */}
-          <Form.Item label='时段选择' style={{ margin: '0 0 8px 0' }}>
-            <Space style={{ textAlign: 'center', lineHeight: '32px' }}>
-              <Form.Item>
-                <Button
-                  value='small'
-                  icon={<LeftOutlined />}
-                  onClick={() => {
-                    onPerBtn()
-                  }}
-                />
-              </Form.Item>
-              <Form.Item>
-                <DatePicker
-                  value={moment(date, 'YYYY-MM-DD')}
-                  onChange={onSearchClick}
-                  format='YYYY-MM-DD'
-                  disabledDate={current => current > moment().endOf('day')}
-                />
-              </Form.Item>
-              <Form.Item>
-                <Select
-                  style={{ width: 100 }}
-                  value={dataForm.ts}
-                  onChange={onSearchClick1}
-                >
-                  {optionsel.map((item, index) => {
-                    return (
-                      <>
-                        <Option value={item.value} key={index}>
-                          {item.value}
-                        </Option>
-                      </>
-                    )
-                  })}
-                  {/* <Option value='20'>20:00</Option> */}
-                </Select>
-              </Form.Item>
-
-              <Form.Item>
-                <Button
-                  value='small'
-                  icon={<RightOutlined />}
-                  disabled={disabled}
-                  onClick={() => {
-                    onBtn()
-                  }}
-                />
-              </Form.Item>
-            </Space>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/fxdd/tqyb/tqxx24/dataConfig.js b/src/views/fxdd/tqyb/tqxx24/dataConfig.js
deleted file mode 100644
index 05d9a9f..0000000
--- a/src/views/fxdd/tqyb/tqxx24/dataConfig.js
+++ /dev/null
@@ -1,4691 +0,0 @@
-export default {
-  xzqh: [
-    {
-      adcd: '420529000000000',
-      adnm: '五峰土家族自治县',
-      pcount: 200000,
-      htcount: 63880,
-      ldarea: 2372,
-      plarea: 28.8,
-      prevtp: '0',
-      lgtd: 110.670293,
-      lttd: 30.201663,
-      children: [
-        {
-          adcd: '420529101000000',
-          adnm: '五峰镇',
-          pcount: 39881,
-          htcount: 13699,
-          ldarea: 456,
-          prevtp: '0',
-          lgtd: 110.64161,
-          lttd: 30.184073,
-          children: [
-            {
-              adcd: '420529101001000',
-              adnm: '北门社区',
-              pcount: 3164,
-              htcount: 1536,
-              ldarea: 1.5,
-              prevtp: '0',
-              lgtd: 110.661896,
-              lttd: 30.204225,
-              children: [
-                {
-                  adcd: '420529101001100',
-                  adnm: '北门社区上',
-                  pcount: 1055,
-                  htcount: 512,
-                  ldarea: 2.5,
-                  prevtp: '2',
-                  lgtd: 110.667857,
-                  lttd: 30.204172
-                },
-                {
-                  adcd: '420529101001101',
-                  adnm: '北门社区中',
-                  pcount: 1054,
-                  htcount: 512,
-                  ldarea: 2.5,
-                  prevtp: '2',
-                  lgtd: 110.663659,
-                  lttd: 30.205619
-                },
-                {
-                  adcd: '420529101001102',
-                  adnm: '北门社区下',
-                  pcount: 1055,
-                  htcount: 512,
-                  ldarea: 2.5,
-                  prevtp: '2',
-                  lgtd: 110.662192,
-                  lttd: 30.207136
-                }
-              ]
-            },
-            {
-              adcd: '420529101002000',
-              adnm: '正街社区',
-              pcount: 4725,
-              htcount: 2340,
-              ldarea: 3.5,
-              prevtp: '2',
-              lgtd: 110.670643,
-              lttd: 30.200895,
-              children: []
-            },
-            {
-              adcd: '420529101003000',
-              adnm: '长坪社区',
-              pcount: 5725,
-              htcount: 2226,
-              ldarea: 1.5,
-              prevtp: '0',
-              lgtd: 110.665503,
-              lttd: 30.190297,
-              children: [
-                {
-                  adcd: '420529101003100',
-                  adnm: '长坪上',
-                  pcount: 2862,
-                  htcount: 1113,
-                  ldarea: 2.75,
-                  prevtp: '2',
-                  lgtd: 110.66546,
-                  lttd: 30.187869
-                },
-                {
-                  adcd: '420529101003101',
-                  adnm: '长坪下',
-                  pcount: 2862,
-                  htcount: 1113,
-                  ldarea: 2.75,
-                  prevtp: '2',
-                  lgtd: 110.670436,
-                  lttd: 30.196018
-                }
-              ]
-            },
-            {
-              adcd: '420529101201000',
-              adnm: '石梁司村',
-              pcount: 3012,
-              htcount: 890,
-              ldarea: 44,
-              prevtp: '0',
-              lgtd: 110.656911,
-              lttd: 30.175933,
-              children: [
-                {
-                  adcd: '420529101201100',
-                  adnm: '十三组(铁厂湾）',
-                  pcount: 155,
-                  htcount: 42,
-                  ldarea: 18.05,
-                  prevtp: '2',
-                  lgtd: 110.606521,
-                  lttd: 30.14701
-                },
-                {
-                  adcd: '420529101201101',
-                  adnm: '三组上（小汊湾）',
-                  pcount: 536,
-                  htcount: 145,
-                  ldarea: 9.4,
-                  prevtp: '2',
-                  lgtd: 110.653196,
-                  lttd: 30.171942
-                },
-                {
-                  adcd: '420529101201102',
-                  adnm: '二组（杨腊岭）',
-                  pcount: 691,
-                  htcount: 187,
-                  ldarea: 10.5,
-                  prevtp: '2',
-                  lgtd: 110.660371,
-                  lttd: 30.180565
-                },
-                {
-                  adcd: '420529101201103',
-                  adnm: '十二组',
-                  pcount: 148,
-                  htcount: 40,
-                  ldarea: 6,
-                  prevtp: '0',
-                  lgtd: 110.623533,
-                  lttd: 30.147948
-                },
-                {
-                  adcd: '420529101201104',
-                  adnm: '十五组',
-                  pcount: 270,
-                  htcount: 73,
-                  ldarea: 8.05,
-                  prevtp: '2',
-                  lgtd: 110.647408,
-                  lttd: 30.1812815
-                },
-                {
-                  adcd: '420529101201105',
-                  adnm: '三组下',
-                  pcount: 520,
-                  htcount: 140,
-                  ldarea: 7.2,
-                  prevtp: '2',
-                  lgtd: 110.655473,
-                  lttd: 30.176246
-                }
-              ]
-            },
-            {
-              adcd: '420529101202000',
-              adnm: '香东村',
-              pcount: 2100,
-              htcount: 625,
-              ldarea: 14.6,
-              prevtp: '0',
-              lgtd: 110.684722,
-              lttd: 30.195305,
-              children: [
-                {
-                  adcd: '420529101202100',
-                  adnm: '七组（口子泉）',
-                  pcount: 220,
-                  htcount: 60,
-                  ldarea: 8,
-                  prevtp: '2',
-                  lgtd: 110.664549,
-                  lttd: 30.208265
-                },
-                {
-                  adcd: '420529101202101',
-                  adnm: '八组（砂坪）',
-                  pcount: 114,
-                  htcount: 31,
-                  ldarea: 10.3,
-                  prevtp: '2',
-                  lgtd: 110.677247,
-                  lttd: 30.207814
-                },
-                {
-                  adcd: '420529101202102',
-                  adnm: '七组（天池河）',
-                  pcount: 200,
-                  htcount: 50,
-                  ldarea: 7,
-                  prevtp: '2',
-                  lgtd: 110.658039,
-                  lttd: 30.213228
-                }
-              ]
-            },
-            {
-              adcd: '420529101203000',
-              adnm: '小河村',
-              pcount: 3446,
-              htcount: 961,
-              ldarea: 36,
-              prevtp: '0',
-              lgtd: 110.648435,
-              lttd: 30.221484,
-              children: [
-                {
-                  adcd: '420529101203100',
-                  adnm: '一组',
-                  pcount: 620,
-                  htcount: 167,
-                  ldarea: 10,
-                  prevtp: '1',
-                  lgtd: 110.628695,
-                  lttd: 30.218468
-                },
-                {
-                  adcd: '420529101203101',
-                  adnm: '十一组（前坪）',
-                  pcount: 407,
-                  htcount: 110,
-                  ldarea: 14,
-                  prevtp: '2',
-                  lgtd: 110.593009,
-                  lttd: 30.2113403
-                },
-                {
-                  adcd: '420529101203102',
-                  adnm: '七组',
-                  pcount: 155,
-                  htcount: 42,
-                  ldarea: 18,
-                  prevtp: '1',
-                  lgtd: 110.606354,
-                  lttd: 30.207401
-                }
-              ]
-            },
-            {
-              adcd: '420529101204000',
-              adnm: '楠木河村',
-              pcount: 1526,
-              htcount: 442,
-              ldarea: 19.8,
-              prevtp: '0',
-              lgtd: 110.464955,
-              lttd: 30.174449,
-              children: [
-                {
-                  adcd: '420529101204100',
-                  adnm: '一组',
-                  pcount: 220,
-                  htcount: 59,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.661256,
-                  lttd: 30.2369128
-                },
-                {
-                  adcd: '420529101204101',
-                  adnm: '三组',
-                  pcount: 195,
-                  htcount: 53,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.679309,
-                  lttd: 30.2514761
-                }
-              ]
-            },
-            {
-              adcd: '420529101205000',
-              adnm: '水浕司村',
-              pcount: 3320,
-              htcount: 1045,
-              ldarea: 36.6,
-              prevtp: '0',
-              lgtd: 110.627483,
-              lttd: 30.248739,
-              children: [
-                {
-                  adcd: '420529101205100',
-                  adnm: '二组（渡糟）',
-                  pcount: 240,
-                  htcount: 65,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.61626,
-                  lttd: 30.2579
-                },
-                {
-                  adcd: '420529101205101',
-                  adnm: '四组',
-                  pcount: 296,
-                  htcount: 80,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.625852,
-                  lttd: 30.238361
-                },
-                {
-                  adcd: '420529101205102',
-                  adnm: '六组',
-                  pcount: 258,
-                  htcount: 70,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.626089,
-                  lttd: 30.249254
-                },
-                {
-                  adcd: '420529101205103',
-                  adnm: '三组',
-                  pcount: 249,
-                  htcount: 70,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.62251,
-                  lttd: 30.249145
-                },
-                {
-                  adcd: '420529101205104',
-                  adnm: '一组（水浕司）',
-                  pcount: 270,
-                  htcount: 75,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.607703,
-                  lttd: 30.266896
-                }
-              ]
-            },
-            {
-              adcd: '420529101206000',
-              adnm: '油菜坪',
-              pcount: 650,
-              htcount: 163,
-              ldarea: 2.8,
-              prevtp: '0',
-              lgtd: 110.622123,
-              lttd: 30.276306,
-              children: [
-                {
-                  adcd: '420529101206100',
-                  adnm: '一组',
-                  pcount: 340,
-                  htcount: 87,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.611682,
-                  lttd: 30.269515
-                }
-              ]
-            },
-            {
-              adcd: '420529101207000',
-              adnm: '黄粮坪村',
-              pcount: 1217,
-              htcount: 352,
-              ldarea: 24.3,
-              prevtp: '0',
-              lgtd: 110.652169,
-              lttd: 30.2798,
-              children: [
-                {
-                  adcd: '420529101207100',
-                  adnm: '一组',
-                  pcount: 302,
-                  htcount: 95,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.642672,
-                  lttd: 30.280247
-                }
-              ]
-            },
-            {
-              adcd: '420529101208000',
-              adnm: '谢家坪村',
-              pcount: 2302,
-              htcount: 644,
-              ldarea: 23.2,
-              prevtp: '0',
-              lgtd: 110.58412,
-              lttd: 30.299189,
-              children: [
-                {
-                  adcd: '420529101208100',
-                  adnm: '三组',
-                  pcount: 215,
-                  htcount: 67,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.592951,
-                  lttd: 30.3194646
-                },
-                {
-                  adcd: '420529101208101',
-                  adnm: '五组',
-                  pcount: 112,
-                  htcount: 38,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.580078,
-                  lttd: 30.279418
-                },
-                {
-                  adcd: '420529101208102',
-                  adnm: '八组',
-                  pcount: 132,
-                  htcount: 46,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.581833,
-                  lttd: 30.298807
-                }
-              ]
-            },
-            {
-              adcd: '420529101209000',
-              adnm: '麦庄村',
-              pcount: 2564,
-              htcount: 729,
-              ldarea: 30.5,
-              prevtp: '0',
-              lgtd: 110.552111,
-              lttd: 30.292016,
-              children: []
-            },
-            {
-              adcd: '420529101210000',
-              adnm: '怀抱窝村',
-              pcount: 1764,
-              htcount: 529,
-              ldarea: 26.1,
-              prevtp: '0',
-              lgtd: 110.606024,
-              lttd: 30.32805,
-              children: [
-                {
-                  adcd: '420529101210100',
-                  adnm: '一组(竹桥）',
-                  pcount: 83,
-                  htcount: 25,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.595765,
-                  lttd: 30.33814
-                },
-                {
-                  adcd: '420529101210101',
-                  adnm: '三组',
-                  pcount: 129,
-                  htcount: 35,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.592862,
-                  lttd: 30.3195735
-                }
-              ]
-            },
-            {
-              adcd: '420529101211000',
-              adnm: '茅坪村',
-              pcount: 2711,
-              htcount: 833,
-              ldarea: 0,
-              prevtp: '0',
-              lgtd: 110.674183,
-              lttd: 30.138689,
-              children: [
-                {
-                  adcd: '420529101211100',
-                  adnm: '二组（万家田）',
-                  pcount: 44,
-                  htcount: 18,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.597656,
-                  lttd: 30.089048
-                },
-                {
-                  adcd: '420529101211101',
-                  adnm: '三组',
-                  pcount: 68,
-                  htcount: 21,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.56665,
-                  lttd: 30.0911
-                },
-                {
-                  adcd: '420529101211102',
-                  adnm: '六组（晏家坪）',
-                  pcount: 118,
-                  htcount: 32,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.719605,
-                  lttd: 30.138661
-                },
-                {
-                  adcd: '420529101211104',
-                  adnm: '十组（茅坪）',
-                  pcount: 159,
-                  htcount: 43,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.669315,
-                  lttd: 30.153423
-                },
-                {
-                  adcd: '420529101211105',
-                  adnm: '九组（茅坪）',
-                  pcount: 318,
-                  htcount: 86,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.674523,
-                  lttd: 30.139839
-                },
-                {
-                  adcd: '420529101211106',
-                  adnm: '二组（老屋场）',
-                  pcount: 40,
-                  htcount: 12,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.621323,
-                  lttd: 30.080742
-                }
-              ]
-            },
-            {
-              adcd: '420529101212000',
-              adnm: '长坡村',
-              pcount: 1221,
-              htcount: 384,
-              ldarea: 51.5,
-              prevtp: '0',
-              lgtd: 110.727382,
-              lttd: 30.072334,
-              children: [
-                {
-                  adcd: '420529101212100',
-                  adnm: '四组',
-                  pcount: 221,
-                  htcount: 112,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.685538,
-                  lttd: 30.078245
-                }
-              ]
-            }
-          ]
-        },
-        {
-          adcd: '420529102000000',
-          adnm: '长乐坪镇',
-          pcount: 24902,
-          htcount: 6908,
-          ldarea: 374,
-          prevtp: '0',
-          lgtd: 110.817333,
-          lttd: 30.187285,
-          children: [
-            {
-              adcd: '420529102001000',
-              adnm: '长乐坪社区',
-              pcount: 1450,
-              htcount: 412,
-              ldarea: 4.53,
-              prevtp: '0',
-              lgtd: 110.950819,
-              lttd: 30.266553,
-              children: []
-            },
-            {
-              adcd: '420529102201000',
-              adnm: '洞口村',
-              pcount: 1686,
-              htcount: 525,
-              ldarea: 18.57,
-              prevtp: '0',
-              lgtd: 110.862146,
-              lttd: 30.17035,
-              children: [
-                {
-                  adcd: '420529102201100',
-                  adnm: '三组（洞口）',
-                  pcount: 423,
-                  htcount: 146,
-                  ldarea: 6.22,
-                  prevtp: '2',
-                  lgtd: 110.84918,
-                  lttd: 30.172821
-                },
-                {
-                  adcd: '420529102201101',
-                  adnm: '四组（滴淋冲）',
-                  pcount: 354,
-                  htcount: 101,
-                  ldarea: 7.15,
-                  prevtp: '1',
-                  lgtd: 110.852646,
-                  lttd: 30.166916
-                },
-                {
-                  adcd: '420529102201102',
-                  adnm: '一组（龟坪）',
-                  pcount: 427,
-                  htcount: 122,
-                  ldarea: 7.07,
-                  prevtp: '2',
-                  lgtd: 110.863379,
-                  lttd: 30.172428
-                },
-                {
-                  adcd: '420529102201103',
-                  adnm: '二组（洞口）',
-                  pcount: 482,
-                  htcount: 156,
-                  ldarea: 6.13,
-                  prevtp: '2',
-                  lgtd: 110.859648,
-                  lttd: 30.170953
-                }
-              ]
-            },
-            {
-              adcd: '420529102202000',
-              adnm: '腰牌村',
-              pcount: 1607,
-              htcount: 484,
-              ldarea: 15.17,
-              prevtp: '0',
-              lgtd: 110.898742,
-              lttd: 30.183227,
-              children: [
-                {
-                  adcd: '420529102202100',
-                  adnm: '二组（腰牌）',
-                  pcount: 377,
-                  htcount: 112,
-                  ldarea: 5.74,
-                  prevtp: '2',
-                  lgtd: 110.900312,
-                  lttd: 30.181927
-                },
-                {
-                  adcd: '420529102202101',
-                  adnm: '三组（腰牌）',
-                  pcount: 429,
-                  htcount: 129,
-                  ldarea: 5.95,
-                  prevtp: '2',
-                  lgtd: 110.891906,
-                  lttd: 30.182658
-                },
-                {
-                  adcd: '420529102202102',
-                  adnm: '四组（杨家坪）',
-                  pcount: 355,
-                  htcount: 92,
-                  ldarea: 5.67,
-                  prevtp: '2',
-                  lgtd: 110.884063,
-                  lttd: 30.178409
-                },
-                {
-                  adcd: '420529102202103',
-                  adnm: '五组（杨家坪）',
-                  pcount: 446,
-                  htcount: 151,
-                  ldarea: 5.81,
-                  prevtp: '2',
-                  lgtd: 110.878992,
-                  lttd: 30.174009
-                }
-              ]
-            },
-            {
-              adcd: '420529102203000',
-              adnm: '白岩坪村',
-              pcount: 2576,
-              htcount: 767,
-              ldarea: 31.35,
-              prevtp: '0',
-              lgtd: 110.894666,
-              lttd: 30.159786,
-              children: [
-                {
-                  adcd: '420529102203100',
-                  adnm: '一组',
-                  pcount: 1242,
-                  htcount: 379,
-                  ldarea: 16.98,
-                  prevtp: '1',
-                  lgtd: 110.926374,
-                  lttd: 30.172706
-                },
-                {
-                  adcd: '420529102203101',
-                  adnm: '二组（白岩坪）',
-                  pcount: 1334,
-                  htcount: 388,
-                  ldarea: 18.37,
-                  prevtp: '1',
-                  lgtd: 110.91441,
-                  lttd: 30.173227
-                }
-              ]
-            },
-            {
-              adcd: '420529102204000',
-              adnm: '月山村',
-              pcount: 1515,
-              htcount: 422,
-              ldarea: 25.29,
-              prevtp: '0',
-              lgtd: 110.899558,
-              lttd: 30.127007,
-              children: [
-                {
-                  adcd: '420529102204100',
-                  adnm: '三组（小河）',
-                  pcount: 258,
-                  htcount: 73,
-                  ldarea: 6.98,
-                  prevtp: '2',
-                  lgtd: 110.891944,
-                  lttd: 30.128185
-                },
-                {
-                  adcd: '420529102204101',
-                  adnm: '二组（高桥）',
-                  pcount: 289,
-                  htcount: 81,
-                  ldarea: 7.13,
-                  prevtp: '2',
-                  lgtd: 110.912641,
-                  lttd: 30.136977
-                },
-                {
-                  adcd: '420529102204102',
-                  adnm: '一组（曹家河）',
-                  pcount: 325,
-                  htcount: 89,
-                  ldarea: 7.05,
-                  prevtp: '2',
-                  lgtd: 110.944037,
-                  lttd: 30.139595
-                },
-                {
-                  adcd: '420529102204103',
-                  adnm: '六组',
-                  pcount: 323,
-                  htcount: 90,
-                  ldarea: 7.13,
-                  prevtp: '1',
-                  lgtd: 110.921658,
-                  lttd: 30.140975
-                },
-                {
-                  adcd: '420529102204104',
-                  adnm: '一组（邵家河）',
-                  pcount: 320,
-                  htcount: 89,
-                  ldarea: 7,
-                  prevtp: '2',
-                  lgtd: 110.935464,
-                  lttd: 30.135935
-                }
-              ]
-            },
-            {
-              adcd: '420529102205000',
-              adnm: '苏家河村',
-              pcount: 1483,
-              htcount: 419,
-              ldarea: 22.89,
-              prevtp: '0',
-              lgtd: 110.7719,
-              lttd: 30.160052,
-              children: [
-                {
-                  adcd: '420529102205100',
-                  adnm: '二组（苏家河）',
-                  pcount: 348,
-                  htcount: 96,
-                  ldarea: 7.38,
-                  prevtp: '2',
-                  lgtd: 110.758849,
-                  lttd: 30.151386
-                },
-                {
-                  adcd: '420529102205101',
-                  adnm: '三组（金家湾）',
-                  pcount: 375,
-                  htcount: 107,
-                  ldarea: 7.82,
-                  prevtp: '2',
-                  lgtd: 110.769432,
-                  lttd: 30.146094
-                },
-                {
-                  adcd: '420529102205102',
-                  adnm: '四组',
-                  pcount: 362,
-                  htcount: 103,
-                  ldarea: 7.78,
-                  prevtp: '1',
-                  lgtd: 110.749224,
-                  lttd: 30.143833
-                },
-                {
-                  adcd: '420529102205103',
-                  adnm: '一组',
-                  pcount: 398,
-                  htcount: 113,
-                  ldarea: 7.91,
-                  prevtp: '1',
-                  lgtd: 110.781997,
-                  lttd: 30.15012
-                }
-              ]
-            },
-            {
-              adcd: '420529102206000',
-              adnm: '甘沟村',
-              pcount: 1728,
-              htcount: 530,
-              ldarea: 26.69,
-              prevtp: '0',
-              lgtd: 110.792784,
-              lttd: 30.164572,
-              children: [
-                {
-                  adcd: '420529102206100',
-                  adnm: '二组（高家坪）',
-                  pcount: 402,
-                  htcount: 123,
-                  ldarea: 8.52,
-                  prevtp: '2',
-                  lgtd: 110.792131,
-                  lttd: 30.14632
-                },
-                {
-                  adcd: '420529102206101',
-                  adnm: '一组（甘沟）',
-                  pcount: 418,
-                  htcount: 129,
-                  ldarea: 8.38,
-                  prevtp: '2',
-                  lgtd: 110.802311,
-                  lttd: 30.164633
-                },
-                {
-                  adcd: '420529102206102',
-                  adnm: '三组',
-                  pcount: 453,
-                  htcount: 135,
-                  ldarea: 8.92,
-                  prevtp: '1',
-                  lgtd: 110.802988,
-                  lttd: 30.151881
-                },
-                {
-                  adcd: '420529102206103',
-                  adnm: '五组（剪槽沟）',
-                  pcount: 455,
-                  htcount: 143,
-                  ldarea: 8.87,
-                  prevtp: '1',
-                  lgtd: 110.829652,
-                  lttd: 30.1611865
-                }
-              ]
-            },
-            {
-              adcd: '420529102207000',
-              adnm: '百年关村',
-              pcount: 1805,
-              htcount: 540,
-              ldarea: 21.95,
-              prevtp: '0',
-              lgtd: 110.953275,
-              lttd: 30.179524,
-              children: []
-            },
-            {
-              adcd: '420529102208000',
-              adnm: '三教庙村',
-              pcount: 2267,
-              htcount: 690,
-              ldarea: 31.79,
-              prevtp: '0',
-              lgtd: 110.893176,
-              lttd: 30.200651,
-              children: []
-            },
-            {
-              adcd: '420529102209000',
-              adnm: '柴埠溪村',
-              pcount: 376,
-              htcount: 123,
-              ldarea: 9.52,
-              prevtp: '0',
-              lgtd: 110.933963,
-              lttd: 30.228582,
-              children: [
-                {
-                  adcd: '420529102209100',
-                  adnm: '二组（梯子口）',
-                  pcount: 71,
-                  htcount: 21,
-                  ldarea: 3.77,
-                  prevtp: '2',
-                  lgtd: 110.947618,
-                  lttd: 30.2309287
-                },
-                {
-                  adcd: '420529102209101',
-                  adnm: '四组（杨家坪）',
-                  pcount: 73,
-                  htcount: 23,
-                  ldarea: 3.75,
-                  prevtp: '1',
-                  lgtd: 110.961822,
-                  lttd: 30.2315995
-                },
-                {
-                  adcd: '420529102209102',
-                  adnm: '一组（陆家台）',
-                  pcount: 77,
-                  htcount: 25,
-                  ldarea: 3.95,
-                  prevtp: '2',
-                  lgtd: 110.91351,
-                  lttd: 30.231454
-                },
-                {
-                  adcd: '420529102209103',
-                  adnm: '五组（杨家坪）',
-                  pcount: 79,
-                  htcount: 28,
-                  ldarea: 4.14,
-                  prevtp: '2',
-                  lgtd: 110.974717,
-                  lttd: 30.2239784
-                },
-                {
-                  adcd: '420529102209104',
-                  adnm: '三组（岩板铺子）',
-                  pcount: 76,
-                  htcount: 26,
-                  ldarea: 3.91,
-                  prevtp: '2',
-                  lgtd: 110.929226,
-                  lttd: 30.229398
-                }
-              ]
-            },
-            {
-              adcd: '420529102210000',
-              adnm: '青岩冲村',
-              pcount: 2002,
-              htcount: 560,
-              ldarea: 40.51,
-              prevtp: '0',
-              lgtd: 110.782404,
-              lttd: 30.185819,
-              children: [
-                {
-                  adcd: '420529102210100',
-                  adnm: '四组（小林口）',
-                  pcount: 986,
-                  htcount: 266,
-                  ldarea: 20.85,
-                  prevtp: '2',
-                  lgtd: 110.820876,
-                  lttd: 30.202646
-                },
-                {
-                  adcd: '420529102210102',
-                  adnm: '六组（青岩冲）',
-                  pcount: 1016,
-                  htcount: 294,
-                  ldarea: 23.66,
-                  prevtp: '1',
-                  lgtd: 110.781604,
-                  lttd: 30.187083
-                }
-              ]
-            },
-            {
-              adcd: '420529102211000',
-              adnm: '桥坪村',
-              pcount: 1198,
-              htcount: 331,
-              ldarea: 24.77,
-              prevtp: '0',
-              lgtd: 110.766741,
-              lttd: 30.231465,
-              children: [
-                {
-                  adcd: '420529102211100',
-                  adnm: '四组（桥坪）',
-                  pcount: 258,
-                  htcount: 71,
-                  ldarea: 7.81,
-                  prevtp: '2',
-                  lgtd: 110.745652,
-                  lttd: 30.233487
-                },
-                {
-                  adcd: '420529102211101',
-                  adnm: '六组（曹家湾）',
-                  pcount: 349,
-                  htcount: 95,
-                  ldarea: 8.74,
-                  prevtp: '2',
-                  lgtd: 110.772836,
-                  lttd: 30.236809
-                },
-                {
-                  adcd: '420529102211102',
-                  adnm: '五组（桥坪）',
-                  pcount: 314,
-                  htcount: 89,
-                  ldarea: 8.55,
-                  prevtp: '2',
-                  lgtd: 110.752264,
-                  lttd: 30.235366
-                },
-                {
-                  adcd: '420529102211103',
-                  adnm: '六组（凉水井）',
-                  pcount: 277,
-                  htcount: 76,
-                  ldarea: 7.67,
-                  prevtp: '2',
-                  lgtd: 110.765834,
-                  lttd: 30.236687
-                }
-              ]
-            },
-            {
-              adcd: '420529102212000',
-              adnm: '菖蒲溪村',
-              pcount: 911,
-              htcount: 282,
-              ldarea: 36.28,
-              prevtp: '0',
-              lgtd: 110.777564,
-              lttd: 30.237061,
-              children: [
-                {
-                  adcd: '420529102212100',
-                  adnm: '四组（将军洞）',
-                  pcount: 189,
-                  htcount: 62,
-                  ldarea: 10.15,
-                  prevtp: '1',
-                  lgtd: 110.812549,
-                  lttd: 30.235984
-                },
-                {
-                  adcd: '420529102212101',
-                  adnm: '三组（岩屋垴）',
-                  pcount: 246,
-                  htcount: 71,
-                  ldarea: 10.98,
-                  prevtp: '2',
-                  lgtd: 110.797305,
-                  lttd: 30.238971
-                },
-                {
-                  adcd: '420529102212102',
-                  adnm: '二组（骆家坪）',
-                  pcount: 233,
-                  htcount: 69,
-                  ldarea: 10.29,
-                  prevtp: '2',
-                  lgtd: 110.788782,
-                  lttd: 30.237532
-                },
-                {
-                  adcd: '420529102212103',
-                  adnm: '一组（菖蒲溪）',
-                  pcount: 243,
-                  htcount: 80,
-                  ldarea: 12.86,
-                  prevtp: '2',
-                  lgtd: 110.778274,
-                  lttd: 30.238085
-                }
-              ]
-            },
-            {
-              adcd: '420529102213000',
-              adnm: '大湾村',
-              pcount: 1052,
-              htcount: 298,
-              ldarea: 20.31,
-              prevtp: '0',
-              lgtd: 110.707941,
-              lttd: 30.186264,
-              children: []
-            },
-            {
-              adcd: '420529102214000',
-              adnm: '白鹿庄村',
-              pcount: 1518,
-              htcount: 432,
-              ldarea: 21.58,
-              prevtp: '0',
-              lgtd: 110.729787,
-              lttd: 30.19293,
-              children: [
-                {
-                  adcd: '420529102214100',
-                  adnm: '三组（白鹿庄下）',
-                  pcount: 759,
-                  htcount: 216,
-                  ldarea: 12.79,
-                  prevtp: '2',
-                  lgtd: 110.735589,
-                  lttd: 30.198371
-                },
-                {
-                  adcd: '420529102214101',
-                  adnm: '三组（白鹿庄上）',
-                  pcount: 759,
-                  htcount: 216,
-                  ldarea: 12.79,
-                  prevtp: '2',
-                  lgtd: 110.735173,
-                  lttd: 30.201783
-                }
-              ]
-            },
-            {
-              adcd: '420529102215000',
-              adnm: '石桥沟村',
-              pcount: 1192,
-              htcount: 357,
-              ldarea: 12.93,
-              prevtp: '0',
-              lgtd: 110.712097,
-              lttd: 30.204806,
-              children: []
-            },
-            {
-              adcd: '420529102216000',
-              adnm: '红鱼潭村',
-              pcount: 940,
-              htcount: 243,
-              ldarea: 14.87,
-              prevtp: '0',
-              lgtd: 110.722212,
-              lttd: 30.221909,
-              children: [
-                {
-                  adcd: '420529102216100',
-                  adnm: '二组（下红鱼潭）',
-                  pcount: 470,
-                  htcount: 121,
-                  ldarea: 11.4,
-                  prevtp: '2',
-                  lgtd: 110.712448,
-                  lttd: 30.220817
-                },
-                {
-                  adcd: '420529102216101',
-                  adnm: '二组（上红鱼潭）',
-                  pcount: 470,
-                  htcount: 122,
-                  ldarea: 7.5,
-                  prevtp: '2',
-                  lgtd: 110.714051,
-                  lttd: 30.228049
-                }
-              ]
-            }
-          ]
-        },
-        {
-          adcd: '420529103000000',
-          adnm: '渔洋关镇',
-          pcount: 45920,
-          htcount: 17817,
-          ldarea: 356,
-          prevtp: '0',
-          lgtd: 111.045286,
-          lttd: 30.160398,
-          children: [
-            {
-              adcd: '420529103001000',
-              adnm: '曹家坪社区',
-              pcount: 5666,
-              htcount: 2376,
-              ldarea: 16.08,
-              prevtp: '0',
-              lgtd: 111.071315,
-              lttd: 30.174626,
-              children: [
-                {
-                  adcd: '420529103001100',
-                  adnm: '五组（松林坪）',
-                  pcount: 368,
-                  htcount: 111,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.033933,
-                  lttd: 30.1556506
-                },
-                {
-                  adcd: '420529103001101',
-                  adnm: '四组（松林坪）',
-                  pcount: 238,
-                  htcount: 63,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.040689,
-                  lttd: 30.1503546
-                },
-                {
-                  adcd: '420529103001103',
-                  adnm: '六组（松林坪）',
-                  pcount: 335,
-                  htcount: 100,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.039322,
-                  lttd: 30.160644
-                },
-                {
-                  adcd: '420529103001105',
-                  adnm: '二组（曹家坪）',
-                  pcount: 572,
-                  htcount: 158,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.064373,
-                  lttd: 30.166271
-                },
-                {
-                  adcd: '420529103001106',
-                  adnm: '九组（(簸箕山)）',
-                  pcount: 431,
-                  htcount: 136,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.052448,
-                  lttd: 30.176902
-                },
-                {
-                  adcd: '420529103001107',
-                  adnm: '三组（青岗岭）',
-                  pcount: 203,
-                  htcount: 69,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.057881,
-                  lttd: 30.156
-                }
-              ]
-            },
-            {
-              adcd: '420529103002000',
-              adnm: '大房坪社区',
-              pcount: 6224,
-              htcount: 2839,
-              ldarea: 15.17,
-              prevtp: '0',
-              lgtd: 111.074047,
-              lttd: 30.169517,
-              children: [
-                {
-                  adcd: '420529103002106',
-                  adnm: '六组（李家坪）',
-                  pcount: 337,
-                  htcount: 97,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.107587,
-                  lttd: 30.172462
-                },
-                {
-                  adcd: '420529103002107',
-                  adnm: '大房坪',
-                  pcount: 3742,
-                  htcount: 1761,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.076431,
-                  lttd: 30.170897
-                },
-                {
-                  adcd: '420529103002108',
-                  adnm: '四组（城墙口）',
-                  pcount: 331,
-                  htcount: 90,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.095059,
-                  lttd: 30.146079
-                },
-                {
-                  adcd: '420529103002109',
-                  adnm: '七组（麻溪冲）',
-                  pcount: 287,
-                  htcount: 88,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.104708,
-                  lttd: 30.176352
-                },
-                {
-                  adcd: '420529103002110',
-                  adnm: '八组（麻溪冲）',
-                  pcount: 655,
-                  htcount: 221,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.096686,
-                  lttd: 30.184931
-                }
-              ]
-            },
-            {
-              adcd: '420529103003000',
-              adnm: '桥河社区',
-              pcount: 7415,
-              htcount: 3338,
-              ldarea: 18.36,
-              prevtp: '0',
-              lgtd: 111.083223,
-              lttd: 30.182641,
-              children: [
-                {
-                  adcd: '420529103003100',
-                  adnm: '花桥',
-                  pcount: 2035,
-                  htcount: 945,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.064716,
-                  lttd: 30.178022
-                },
-                {
-                  adcd: '420529103003101',
-                  adnm: '桥河',
-                  pcount: 1372,
-                  htcount: 590,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.092056,
-                  lttd: 30.190173
-                },
-                {
-                  adcd: '420529103003102',
-                  adnm: '刘家坪',
-                  pcount: 676,
-                  htcount: 192,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.068048,
-                  lttd: 30.203047
-                }
-              ]
-            },
-            {
-              adcd: '420529103201000',
-              adnm: '汉马池村',
-              pcount: 4363,
-              htcount: 1476,
-              ldarea: 43.92,
-              prevtp: '0',
-              lgtd: 111.010216,
-              lttd: 30.145828,
-              children: [
-                {
-                  adcd: '420529103201100',
-                  adnm: '五组（千山）',
-                  pcount: 301,
-                  htcount: 85,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.972477,
-                  lttd: 30.1393608
-                },
-                {
-                  adcd: '420529103201101',
-                  adnm: '四组（桥板洞）',
-                  pcount: 207,
-                  htcount: 93,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.001791,
-                  lttd: 30.15045
-                },
-                {
-                  adcd: '420529103201102',
-                  adnm: '三组（桂花树）',
-                  pcount: 377,
-                  htcount: 110,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.991827,
-                  lttd: 30.150599
-                },
-                {
-                  adcd: '420529103201103',
-                  adnm: '一组（杨家坝子）',
-                  pcount: 538,
-                  htcount: 153,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.015634,
-                  lttd: 30.137185
-                },
-                {
-                  adcd: '420529103201104',
-                  adnm: '六组（阮家洞）',
-                  pcount: 191,
-                  htcount: 51,
-                  ldarea: 2,
-                  prevtp: '0',
-                  lgtd: 110.963332,
-                  lttd: 30.138323
-                },
-                {
-                  adcd: '420529103201105',
-                  adnm: '九组',
-                  pcount: 544,
-                  htcount: 109,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.018838,
-                  lttd: 30.188615
-                },
-                {
-                  adcd: '420529103201107',
-                  adnm: '七组（长冲子)',
-                  pcount: 471,
-                  htcount: 136,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.977879,
-                  lttd: 30.171188
-                },
-                {
-                  adcd: '420529103201108',
-                  adnm: '十组（穿心店）',
-                  pcount: 619,
-                  htcount: 98,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.008591,
-                  lttd: 30.176473
-                },
-                {
-                  adcd: '420529103201109',
-                  adnm: '二组（汉马池）',
-                  pcount: 560,
-                  htcount: 171,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.011178,
-                  lttd: 30.156577
-                },
-                {
-                  adcd: '420529103201110',
-                  adnm: '九组（杨家湾）',
-                  pcount: 550,
-                  htcount: 120,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.991313,
-                  lttd: 30.198529
-                }
-              ]
-            },
-            {
-              adcd: '420529103202000',
-              adnm: '三房坪村',
-              pcount: 3822,
-              htcount: 1327,
-              ldarea: 20.39,
-              prevtp: '0',
-              lgtd: 111.070836,
-              lttd: 30.148837,
-              children: [
-                {
-                  adcd: '420529103202100',
-                  adnm: '八组（樱桃山)',
-                  pcount: 407,
-                  htcount: 126,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.052614,
-                  lttd: 30.133604
-                },
-                {
-                  adcd: '420529103202101',
-                  adnm: '九组（樱桃山）',
-                  pcount: 273,
-                  htcount: 80,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.047375,
-                  lttd: 30.134426
-                },
-                {
-                  adcd: '420529103202102',
-                  adnm: '七组（赶子坪）',
-                  pcount: 349,
-                  htcount: 109,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.063756,
-                  lttd: 30.130336
-                },
-                {
-                  adcd: '420529103202103',
-                  adnm: '四组（砂滩口）',
-                  pcount: 239,
-                  htcount: 75,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.06732,
-                  lttd: 30.133277
-                },
-                {
-                  adcd: '420529103202104',
-                  adnm: '一组(青屋树)',
-                  pcount: 433,
-                  htcount: 160,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.066485,
-                  lttd: 30.155661
-                },
-                {
-                  adcd: '420529103202105',
-                  adnm: '三组（小河）',
-                  pcount: 400,
-                  htcount: 131,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.072293,
-                  lttd: 30.141717
-                },
-                {
-                  adcd: '420529103202106',
-                  adnm: '七组（灌沟）',
-                  pcount: 230,
-                  htcount: 103,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.071064,
-                  lttd: 30.134573
-                }
-              ]
-            },
-            {
-              adcd: '420529103203000',
-              adnm: '火田坑村',
-              pcount: 1785,
-              htcount: 604,
-              ldarea: 32.21,
-              prevtp: '0',
-              lgtd: 110.928335,
-              lttd: 30.251524,
-              children: [
-                {
-                  adcd: '420529103203103',
-                  adnm: '四组（余堰子）',
-                  pcount: 206,
-                  htcount: 58,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.923367,
-                  lttd: 30.256976
-                },
-                {
-                  adcd: '420529103203104',
-                  adnm: '七组（漩涡埫）',
-                  pcount: 202,
-                  htcount: 58,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.872437,
-                  lttd: 30.247461
-                },
-                {
-                  adcd: '420529103203105',
-                  adnm: '四组（大坑埫）',
-                  pcount: 200,
-                  htcount: 50,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.935343,
-                  lttd: 30.263216
-                }
-              ]
-            },
-            {
-              adcd: '420529103204000',
-              adnm: '鞍山村',
-              pcount: 1709,
-              htcount: 636,
-              ldarea: 20.78,
-              prevtp: '0',
-              lgtd: 110.985901,
-              lttd: 30.274849,
-              children: []
-            },
-            {
-              adcd: '420529103205000',
-              adnm: '涨水坪村',
-              pcount: 1709,
-              htcount: 616,
-              ldarea: 15.96,
-              prevtp: '0',
-              lgtd: 111.016591,
-              lttd: 30.263112,
-              children: [
-                {
-                  adcd: '420529103205100',
-                  adnm: '二组（涨水坪下）',
-                  pcount: 323,
-                  htcount: 105,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.018725,
-                  lttd: 30.257364
-                },
-                {
-                  adcd: '420529103205101',
-                  adnm: '四组（茅葫山）',
-                  pcount: 264,
-                  htcount: 75,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.037879,
-                  lttd: 30.270009
-                },
-                {
-                  adcd: '420529103205102',
-                  adnm: '六组（小龙潭）',
-                  pcount: 334,
-                  htcount: 97,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.010953,
-                  lttd: 30.28058
-                },
-                {
-                  adcd: '420529103205103',
-                  adnm: '七组（云龙山）',
-                  pcount: 247,
-                  htcount: 68,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.013247,
-                  lttd: 30.285109
-                },
-                {
-                  adcd: '420529103205104',
-                  adnm: '二组（涨水坪上）',
-                  pcount: 300,
-                  htcount: 60,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.019735,
-                  lttd: 30.255388
-                }
-              ]
-            },
-            {
-              adcd: '420529103206000',
-              adnm: '王家坪村',
-              pcount: 2372,
-              htcount: 887,
-              ldarea: 21,
-              prevtp: '0',
-              lgtd: 111.012233,
-              lttd: 30.244419,
-              children: [
-                {
-                  adcd: '420529103206100',
-                  adnm: '王家坪（五组）',
-                  pcount: 389,
-                  htcount: 122,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.007657,
-                  lttd: 30.243316
-                },
-                {
-                  adcd: '420529103206103',
-                  adnm: '碓臼坑（九组）',
-                  pcount: 297,
-                  htcount: 93,
-                  ldarea: 2,
-                  prevtp: '0',
-                  lgtd: 111.030894,
-                  lttd: 30.231012
-                },
-                {
-                  adcd: '420529103206104',
-                  adnm: '陈家埫（八组）',
-                  pcount: 193,
-                  htcount: 55,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.999815,
-                  lttd: 30.236805
-                },
-                {
-                  adcd: '420529103206106',
-                  adnm: '史家坪（四组）',
-                  pcount: 389,
-                  htcount: 125,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.020009,
-                  lttd: 30.234829
-                }
-              ]
-            },
-            {
-              adcd: '420529103207000',
-              adnm: '枚二冲村',
-              pcount: 2406,
-              htcount: 904,
-              ldarea: 20.72,
-              prevtp: '0',
-              lgtd: 111.048321,
-              lttd: 30.224802,
-              children: []
-            },
-            {
-              adcd: '420529103208000',
-              adnm: '清水湾村',
-              pcount: 1775,
-              htcount: 603,
-              ldarea: 37.11,
-              prevtp: '0',
-              lgtd: 110.965572,
-              lttd: 30.080175,
-              children: [
-                {
-                  adcd: '420529103208100',
-                  adnm: '四组（龙潭湾）',
-                  pcount: 106,
-                  htcount: 30,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.932338,
-                  lttd: 30.085706
-                },
-                {
-                  adcd: '420529103208101',
-                  adnm: '四组（唐黄坪）',
-                  pcount: 106,
-                  htcount: 30,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.939173,
-                  lttd: 30.082635
-                },
-                {
-                  adcd: '420529103208102',
-                  adnm: '六组（玉占花）',
-                  pcount: 185,
-                  htcount: 48,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.927351,
-                  lttd: 30.111314
-                },
-                {
-                  adcd: '420529103208103',
-                  adnm: '四组（翻水洞）',
-                  pcount: 106,
-                  htcount: 30,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.941731,
-                  lttd: 30.084026
-                },
-                {
-                  adcd: '420529103208104',
-                  adnm: '一组（清水堰））',
-                  pcount: 178,
-                  htcount: 54,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.963492,
-                  lttd: 30.0893062
-                },
-                {
-                  adcd: '420529103208105',
-                  adnm: '一组（清水湾）',
-                  pcount: 178,
-                  htcount: 50,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.96647,
-                  lttd: 30.080914
-                },
-                {
-                  adcd: '420529103208106',
-                  adnm: '二组（下坪）',
-                  pcount: 390,
-                  htcount: 100,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.98068,
-                  lttd: 30.073403
-                },
-                {
-                  adcd: '420529103208107',
-                  adnm: '四组（洈水）',
-                  pcount: 300,
-                  htcount: 54,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.94587,
-                  lttd: 30.082252
-                },
-                {
-                  adcd: '420529103208108',
-                  adnm: '二组（上坪）',
-                  pcount: 280,
-                  htcount: 52,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.968959,
-                  lttd: 30.075928
-                }
-              ]
-            },
-            {
-              adcd: '420529103209000',
-              adnm: '三板桥村',
-              pcount: 1584,
-              htcount: 538,
-              ldarea: 28.56,
-              prevtp: '0',
-              lgtd: 110.987244,
-              lttd: 30.101781,
-              children: [
-                {
-                  adcd: '420529103209100',
-                  adnm: '八组（三板桥）',
-                  pcount: 223,
-                  htcount: 56,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.990816,
-                  lttd: 30.100481
-                },
-                {
-                  adcd: '420529103209101',
-                  adnm: '五组（跑马岭）',
-                  pcount: 143,
-                  htcount: 43,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 110.993049,
-                  lttd: 30.105093
-                },
-                {
-                  adcd: '420529103209102',
-                  adnm: '三组（云台观）',
-                  pcount: 200,
-                  htcount: 57,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 110.980796,
-                  lttd: 30.122885
-                },
-                {
-                  adcd: '420529103209103',
-                  adnm: '一组（横溪河）',
-                  pcount: 156,
-                  htcount: 43,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.002633,
-                  lttd: 30.124493
-                },
-                {
-                  adcd: '420529103209104',
-                  adnm: '九组（高家岭）',
-                  pcount: 204,
-                  htcount: 59,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.006308,
-                  lttd: 30.093283
-                }
-              ]
-            },
-            {
-              adcd: '420529103210000',
-              adnm: '石柱山村',
-              pcount: 1232,
-              htcount: 430,
-              ldarea: 11.22,
-              prevtp: '0',
-              lgtd: 111.030437,
-              lttd: 30.108528,
-              children: [
-                {
-                  adcd: '420529103210100',
-                  adnm: '一组（石柱山）',
-                  pcount: 344,
-                  htcount: 88,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.026903,
-                  lttd: 30.113098
-                },
-                {
-                  adcd: '420529103210101',
-                  adnm: '黄土包',
-                  pcount: 240,
-                  htcount: 66,
-                  ldarea: 2,
-                  prevtp: '0',
-                  lgtd: 111.01604,
-                  lttd: 30.124506
-                },
-                {
-                  adcd: '420529103210102',
-                  adnm: '四组（横溪河）',
-                  pcount: 329,
-                  htcount: 100,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.014129,
-                  lttd: 30.128574
-                }
-              ]
-            },
-            {
-              adcd: '420529103211000',
-              adnm: '沙埫村',
-              pcount: 2002,
-              htcount: 674,
-              ldarea: 23.24,
-              prevtp: '0',
-              lgtd: 111.082426,
-              lttd: 30.115336,
-              children: []
-            },
-            {
-              adcd: '420529103212000',
-              adnm: '南河村',
-              pcount: 1794,
-              htcount: 569,
-              ldarea: 30.34,
-              prevtp: '0',
-              lgtd: 111.069873,
-              lttd: 30.066705,
-              children: [
-                {
-                  adcd: '420529103212100',
-                  adnm: '杨木洞',
-                  pcount: 452,
-                  htcount: 128,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.076144,
-                  lttd: 30.071189
-                },
-                {
-                  adcd: '420529103212101',
-                  adnm: '田家坪',
-                  pcount: 220,
-                  htcount: 60,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.041095,
-                  lttd: 30.078329
-                },
-                {
-                  adcd: '420529103212102',
-                  adnm: '谦敬坪',
-                  pcount: 326,
-                  htcount: 110,
-                  ldarea: 2,
-                  prevtp: '1',
-                  lgtd: 111.014608,
-                  lttd: 30.077743
-                },
-                {
-                  adcd: '420529103212103',
-                  adnm: '郑家台',
-                  pcount: 220,
-                  htcount: 54,
-                  ldarea: 2,
-                  prevtp: '2',
-                  lgtd: 111.026223,
-                  lttd: 30.082011
-                }
-              ]
-            }
-          ]
-        },
-        {
-          adcd: '420529104000000',
-          adnm: '仁和坪镇',
-          pcount: 16117,
-          htcount: 5069,
-          ldarea: 199.46,
-          prevtp: '0',
-          lgtd: 111.242259,
-          lttd: 30.104032,
-          children: [
-            {
-              adcd: '420529104001000',
-              adnm: '仁和坪社区',
-              pcount: 1247,
-              htcount: 487,
-              ldarea: 5,
-              prevtp: '0',
-              lgtd: 111.238323,
-              lttd: 30.104003,
-              children: []
-            },
-            {
-              adcd: '420529104201000',
-              adnm: '仁和坪村',
-              pcount: 1653,
-              htcount: 499,
-              ldarea: 17.46,
-              prevtp: '0',
-              lgtd: 111.235606,
-              lttd: 30.098939,
-              children: [
-                {
-                  adcd: '420529104201100',
-                  adnm: '五组（檀木岗）',
-                  pcount: 610,
-                  htcount: 186,
-                  ldarea: 8,
-                  prevtp: '2',
-                  lgtd: 111.251975,
-                  lttd: 30.099848
-                },
-                {
-                  adcd: '420529104201101',
-                  adnm: '五组（洋线沟）',
-                  pcount: 40,
-                  htcount: 6,
-                  ldarea: 2.23,
-                  prevtp: '2',
-                  lgtd: 111.258799,
-                  lttd: 30.094674
-                },
-                {
-                  adcd: '420529104201102',
-                  adnm: '六组（松林坑）',
-                  pcount: 480,
-                  htcount: 145,
-                  ldarea: 7,
-                  prevtp: '1',
-                  lgtd: 111.267794,
-                  lttd: 30.085327
-                },
-                {
-                  adcd: '420529104201103',
-                  adnm: '四组（杉林子）',
-                  pcount: 493,
-                  htcount: 155,
-                  ldarea: 8,
-                  prevtp: '2',
-                  lgtd: 111.250484,
-                  lttd: 30.111344
-                },
-                {
-                  adcd: '420529104201104',
-                  adnm: '一组（王家湾）',
-                  pcount: 30,
-                  htcount: 7,
-                  ldarea: 2.23,
-                  prevtp: '1',
-                  lgtd: 111.235377,
-                  lttd: 30.089216
-                }
-              ]
-            },
-            {
-              adcd: '420529104202000',
-              adnm: '杨家埫村',
-              pcount: 361,
-              htcount: 128,
-              ldarea: 2.5,
-              prevtp: '0',
-              lgtd: 111.224634,
-              lttd: 30.10431,
-              children: []
-            },
-            {
-              adcd: '420529104203000',
-              adnm: '枫香坪村',
-              pcount: 718,
-              htcount: 193,
-              ldarea: 4.9,
-              prevtp: '0',
-              lgtd: 111.228783,
-              lttd: 30.0674,
-              children: [
-                {
-                  adcd: '420529104203100',
-                  adnm: '六组（水井坪）',
-                  pcount: 351,
-                  htcount: 85,
-                  ldarea: 5,
-                  prevtp: '2',
-                  lgtd: 111.260666,
-                  lttd: 30.073385
-                },
-                {
-                  adcd: '420529104203101',
-                  adnm: '四组（简家坪）',
-                  pcount: 82,
-                  htcount: 25,
-                  ldarea: 2.5,
-                  prevtp: '2',
-                  lgtd: 111.209618,
-                  lttd: 30.076108
-                },
-                {
-                  adcd: '420529104203102',
-                  adnm: '四组（枫香坪）',
-                  pcount: 198,
-                  htcount: 56,
-                  ldarea: 2.8,
-                  prevtp: '2',
-                  lgtd: 111.222942,
-                  lttd: 30.0692433
-                },
-                {
-                  adcd: '420529104203103',
-                  adnm: '三组（剪刀溪）',
-                  pcount: 87,
-                  htcount: 27,
-                  ldarea: 2.6,
-                  prevtp: '2',
-                  lgtd: 111.216989,
-                  lttd: 30.08405
-                }
-              ]
-            },
-            {
-              adcd: '420529104204000',
-              adnm: '罗汉淌',
-              pcount: 300,
-              htcount: 140,
-              ldarea: 3,
-              prevtp: '0',
-              lgtd: 111.221815,
-              lttd: 30.052427,
-              children: []
-            },
-            {
-              adcd: '420529104205000',
-              adnm: '船山坪村',
-              pcount: 1738,
-              htcount: 574,
-              ldarea: 8.35,
-              prevtp: '0',
-              lgtd: 111.266407,
-              lttd: 30.057388,
-              children: []
-            },
-            {
-              adcd: '420529104206000',
-              adnm: '梅坪村',
-              pcount: 350,
-              htcount: 128,
-              ldarea: 1.76,
-              prevtp: '0',
-              lgtd: 111.301527,
-              lttd: 30.064403,
-              children: []
-            },
-            {
-              adcd: '420529104207000',
-              adnm: '业产坪村',
-              pcount: 298,
-              htcount: 285,
-              ldarea: 5.8,
-              prevtp: '0',
-              lgtd: 111.292338,
-              lttd: 30.111742,
-              children: [
-                {
-                  adcd: '420529104207100',
-                  adnm: '四组（多竹溪）',
-                  pcount: 85,
-                  htcount: 22,
-                  ldarea: 3.5,
-                  prevtp: '2',
-                  lgtd: 111.304219,
-                  lttd: 30.088104
-                },
-                {
-                  adcd: '420529104207101',
-                  adnm: '七组（杨树坳）',
-                  pcount: 88,
-                  htcount: 21,
-                  ldarea: 3.5,
-                  prevtp: '2',
-                  lgtd: 111.32324,
-                  lttd: 30.119831
-                },
-                {
-                  adcd: '420529104207102',
-                  adnm: '四组（百担淌）',
-                  pcount: 50,
-                  htcount: 12,
-                  ldarea: 2.5,
-                  prevtp: '2',
-                  lgtd: 111.316391,
-                  lttd: 30.094219
-                },
-                {
-                  adcd: '420529104207103',
-                  adnm: '一组（业产坪）',
-                  pcount: 85,
-                  htcount: 75,
-                  ldarea: 4.3,
-                  prevtp: '1',
-                  lgtd: 111.290478,
-                  lttd: 30.109408
-                }
-              ]
-            },
-            {
-              adcd: '420529104208000',
-              adnm: '杨柳池村',
-              pcount: 220,
-              htcount: 82,
-              ldarea: 2.5,
-              prevtp: '0',
-              lgtd: 111.281557,
-              lttd: 30.126121,
-              children: [
-                {
-                  adcd: '420529104208100',
-                  adnm: '四组（甘沟子）',
-                  pcount: 220,
-                  htcount: 82,
-                  ldarea: 4.5,
-                  prevtp: '2',
-                  lgtd: 111.318239,
-                  lttd: 30.130386
-                }
-              ]
-            },
-            {
-              adcd: '420529104209000',
-              adnm: '林家坪村',
-              pcount: 300,
-              htcount: 85,
-              ldarea: 2.1,
-              prevtp: '0',
-              lgtd: 111.229568,
-              lttd: 30.136506,
-              children: []
-            },
-            {
-              adcd: '420529104210000',
-              adnm: '大檀树村',
-              pcount: 685,
-              htcount: 206,
-              ldarea: 12,
-              prevtp: '0',
-              lgtd: 111.169768,
-              lttd: 30.128698,
-              children: [
-                {
-                  adcd: '420529104210100',
-                  adnm: '四组（大堰）',
-                  pcount: 210,
-                  htcount: 65,
-                  ldarea: 5,
-                  prevtp: '2',
-                  lgtd: 111.191456,
-                  lttd: 30.140086
-                },
-                {
-                  adcd: '420529104210102',
-                  adnm: '二组（摊子坡）',
-                  pcount: 280,
-                  htcount: 83,
-                  ldarea: 6.5,
-                  prevtp: '2',
-                  lgtd: 111.178975,
-                  lttd: 30.125395
-                },
-                {
-                  adcd: '420529104210103',
-                  adnm: '五组（余家坪）',
-                  pcount: 195,
-                  htcount: 58,
-                  ldarea: 6.5,
-                  prevtp: '2',
-                  lgtd: 111.181009,
-                  lttd: 30.144807
-                }
-              ]
-            },
-            {
-              adcd: '420529104211000',
-              adnm: '升子坪村',
-              pcount: 2102,
-              htcount: 670,
-              ldarea: 9.94,
-              prevtp: '0',
-              lgtd: 111.168879,
-              lttd: 30.105211,
-              children: []
-            },
-            {
-              adcd: '420529104212000',
-              adnm: '富裕冲村',
-              pcount: 353,
-              htcount: 121,
-              ldarea: 1.62,
-              prevtp: '0',
-              lgtd: 111.143766,
-              lttd: 30.117854,
-              children: []
-            },
-            {
-              adcd: '420529104213000',
-              adnm: '桥梁村',
-              pcount: 127,
-              htcount: 31,
-              ldarea: 2.7,
-              prevtp: '0',
-              lgtd: 111.101141,
-              lttd: 30.108951,
-              children: [
-                {
-                  adcd: '420529104213100',
-                  adnm: '一组（翻水坳）',
-                  pcount: 11,
-                  htcount: 3,
-                  ldarea: 2.2,
-                  prevtp: '1',
-                  lgtd: 111.104619,
-                  lttd: 30.115265
-                },
-                {
-                  adcd: '420529104213101',
-                  adnm: '六组（麒麟观）',
-                  pcount: 20,
-                  htcount: 4,
-                  ldarea: 2.6,
-                  prevtp: '1',
-                  lgtd: 111.110327,
-                  lttd: 30.08415
-                },
-                {
-                  adcd: '420529104213102',
-                  adnm: '一组（道家湾）',
-                  pcount: 48,
-                  htcount: 12,
-                  ldarea: 2.8,
-                  prevtp: '2',
-                  lgtd: 111.099774,
-                  lttd: 30.118108
-                },
-                {
-                  adcd: '420529104213103',
-                  adnm: '四组（桥梁）',
-                  pcount: 22,
-                  htcount: 6,
-                  ldarea: 2.5,
-                  prevtp: '1',
-                  lgtd: 111.102086,
-                  lttd: 30.107225
-                },
-                {
-                  adcd: '420529104213104',
-                  adnm: '三组（流满沟)',
-                  pcount: 26,
-                  htcount: 6,
-                  ldarea: 2.6,
-                  prevtp: '2',
-                  lgtd: 111.082384,
-                  lttd: 30.104546
-                }
-              ]
-            },
-            {
-              adcd: '420529104214000',
-              adnm: '大栗树村',
-              pcount: 1680,
-              htcount: 502,
-              ldarea: 24,
-              prevtp: '0',
-              lgtd: 111.142519,
-              lttd: 30.059065,
-              children: []
-            }
-          ]
-        },
-        {
-          adcd: '420529105000000',
-          adnm: '湾潭镇',
-          pcount: 15721,
-          htcount: 4650,
-          ldarea: 295.53,
-          plarea: 38929,
-          prevtp: '0',
-          lgtd: 110.425002,
-          lttd: 30.050047,
-          wscd: 'HBWS000000002',
-          children: [
-            {
-              adcd: '420529105001000',
-              adnm: '湾潭社区',
-              pcount: 1313,
-              htcount: 398,
-              ldarea: 16.21,
-              plarea: 1153,
-              prevtp: '0',
-              lgtd: 110.42388,
-              lttd: 30.047864,
-              wscd: 'HBWS000000002',
-              children: [
-                {
-                  adcd: '420529105001100',
-                  adnm: '上街',
-                  pcount: 249,
-                  htcount: 74,
-                  ldarea: 5.24,
-                  plarea: 225,
-                  prevtp: '2',
-                  lgtd: 110.425785,
-                  lttd: 30.053044,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105001101',
-                  adnm: '中街',
-                  pcount: 285,
-                  htcount: 86,
-                  ldarea: 5.39,
-                  plarea: 229,
-                  prevtp: '2',
-                  lgtd: 110.425614,
-                  lttd: 30.048871,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105001102',
-                  adnm: '下街',
-                  pcount: 291,
-                  htcount: 88,
-                  ldarea: 5.49,
-                  plarea: 218,
-                  prevtp: '2',
-                  lgtd: 110.427007,
-                  lttd: 30.041187,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105001103',
-                  adnm: '四组',
-                  pcount: 300,
-                  htcount: 94,
-                  ldarea: 5.68,
-                  plarea: 289,
-                  prevtp: '2',
-                  lgtd: 110.435104,
-                  lttd: 30.057728,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105001104',
-                  adnm: '三组（黄家湾上）',
-                  pcount: 94,
-                  htcount: 28,
-                  ldarea: 3.2,
-                  plarea: 96,
-                  prevtp: '2',
-                  lgtd: 110.421384,
-                  lttd: 30.061152,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105001105',
-                  adnm: '三组（黄家湾下）',
-                  pcount: 94,
-                  htcount: 28,
-                  ldarea: 3.21,
-                  plarea: 96,
-                  prevtp: '2',
-                  lgtd: 110.423788,
-                  lttd: 30.052927,
-                  wscd: 'HBWS000000002'
-                }
-              ]
-            },
-            {
-              adcd: '420529105201000',
-              adnm: '龙桥村',
-              pcount: 1806,
-              htcount: 524,
-              ldarea: 21.15,
-              plarea: 2719,
-              prevtp: '0',
-              lgtd: 110.427125,
-              lttd: 30.034791,
-              wscd: 'HBWS000000002',
-              children: [
-                {
-                  adcd: '420529105201100',
-                  adnm: '五组（田家坪）',
-                  pcount: 424,
-                  htcount: 124,
-                  ldarea: 6.96,
-                  plarea: 632,
-                  prevtp: '2',
-                  lgtd: 110.425186,
-                  lttd: 30.030705,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105201101',
-                  adnm: '二组（胡家坪）',
-                  pcount: 386,
-                  htcount: 113,
-                  ldarea: 6.52,
-                  plarea: 576,
-                  prevtp: '2',
-                  lgtd: 110.439722,
-                  lttd: 30.055551,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105201102',
-                  adnm: '三组',
-                  pcount: 361,
-                  htcount: 106,
-                  ldarea: 6.24,
-                  plarea: 540,
-                  prevtp: '1',
-                  lgtd: 110.457203,
-                  lttd: 30.049073,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105201103',
-                  adnm: '四组（覃家坪）',
-                  pcount: 340,
-                  htcount: 100,
-                  ldarea: 6,
-                  plarea: 510,
-                  prevtp: '2',
-                  lgtd: 110.430404,
-                  lttd: 30.036725,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105201104',
-                  adnm: '一组（八里铺）',
-                  pcount: 295,
-                  htcount: 81,
-                  ldarea: 5.43,
-                  plarea: 461,
-                  prevtp: '2',
-                  lgtd: 110.458963,
-                  lttd: 30.074837,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105201105',
-                  adnm: '二组（白果湾）',
-                  pcount: 193,
-                  htcount: 56,
-                  ldarea: 4.26,
-                  plarea: 288,
-                  prevtp: '2',
-                  lgtd: 110.436559,
-                  lttd: 30.051893,
-                  wscd: 'HBWS000000002'
-                }
-              ]
-            },
-            {
-              adcd: '420529105202000',
-              adnm: '九门村',
-              pcount: 1191,
-              htcount: 330,
-              ldarea: 27.38,
-              plarea: 3720,
-              prevtp: '0',
-              lgtd: 110.424995,
-              lttd: 29.994538,
-              wscd: 'HBWS000000002',
-              children: [
-                {
-                  adcd: '420529105202100',
-                  adnm: '四组',
-                  pcount: 187,
-                  htcount: 52,
-                  ldarea: 4.66,
-                  prevtp: '1',
-                  lgtd: 111.019734,
-                  lttd: 30.038212
-                },
-                {
-                  adcd: '420529105202101',
-                  adnm: '三组（大岭）',
-                  pcount: 170,
-                  htcount: 46,
-                  ldarea: 4.38,
-                  prevtp: '1',
-                  lgtd: 110.466198,
-                  lttd: 30.017541
-                }
-              ]
-            },
-            {
-              adcd: '420529105203000',
-              adnm: '小凤池村',
-              pcount: 1236,
-              htcount: 362,
-              ldarea: 17.03,
-              plarea: 3512,
-              prevtp: '0',
-              lgtd: 110.39745,
-              lttd: 30.054112,
-              wscd: 'HBWS000000002',
-              children: [
-                {
-                  adcd: '420529105203100',
-                  adnm: '三组（横渡口）',
-                  pcount: 870,
-                  htcount: 256,
-                  ldarea: 14.12,
-                  plarea: 2484,
-                  prevtp: '2',
-                  lgtd: 110.397542,
-                  lttd: 30.052772,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105203102',
-                  adnm: '二组（小凤池上）',
-                  pcount: 186,
-                  htcount: 56,
-                  ldarea: 4.51,
-                  plarea: 528,
-                  prevtp: '2',
-                  lgtd: 110.41154,
-                  lttd: 30.032823,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105203103',
-                  adnm: '二组（小凤池下）',
-                  pcount: 180,
-                  htcount: 50,
-                  ldarea: 4.4,
-                  plarea: 500,
-                  prevtp: '2',
-                  lgtd: 110.406546,
-                  lttd: 30.024965,
-                  wscd: 'HBWS000000002'
-                }
-              ]
-            },
-            {
-              adcd: '420529105204000',
-              adnm: '茅庄村',
-              pcount: 1668,
-              htcount: 489,
-              ldarea: 65.77,
-              plarea: 1947,
-              prevtp: '0',
-              lgtd: 110.481058,
-              lttd: 30.081057,
-              wscd: 'HBWS000000002',
-              children: [
-                {
-                  adcd: '420529105204100',
-                  adnm: '五组（三板桥）',
-                  pcount: 119,
-                  htcount: 35,
-                  ldarea: 6.69,
-                  plarea: 138,
-                  prevtp: '1',
-                  lgtd: 110.385549,
-                  lttd: 30.084092,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105204101',
-                  adnm: '四组（三峰岗）',
-                  pcount: 139,
-                  htcount: 41,
-                  ldarea: 7.49,
-                  plarea: 159,
-                  prevtp: '1',
-                  lgtd: 110.456626,
-                  lttd: 30.106181,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105204103',
-                  adnm: '一组（土坪）',
-                  pcount: 187,
-                  htcount: 55,
-                  ldarea: 9.37,
-                  plarea: 214,
-                  prevtp: '1',
-                  lgtd: 110.510515,
-                  lttd: 30.127021,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105204104',
-                  adnm: '二组（横河）',
-                  pcount: 214,
-                  htcount: 63,
-                  ldarea: 10.44,
-                  plarea: 246,
-                  prevtp: '2',
-                  lgtd: 110.47501,
-                  lttd: 30.097844,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105204105',
-                  adnm: '三组（关岔口）',
-                  pcount: 197,
-                  htcount: 58,
-                  ldarea: 9.77,
-                  plarea: 226,
-                  prevtp: '2',
-                  lgtd: 110.47866,
-                  lttd: 30.080996,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105204106',
-                  adnm: '二组（茅庄）',
-                  pcount: 289,
-                  htcount: 85,
-                  ldarea: 13.39,
-                  plarea: 332,
-                  prevtp: '2',
-                  lgtd: 110.487741,
-                  lttd: 30.117695,
-                  wscd: 'HBWS000000002'
-                }
-              ]
-            },
-            {
-              adcd: '420529105205000',
-              adnm: '红烈村',
-              pcount: 1743,
-              htcount: 545,
-              ldarea: 18.88,
-              plarea: 3378,
-              prevtp: '0',
-              lgtd: 110.402328,
-              lttd: 30.018152,
-              wscd: 'HBWS000000002',
-              children: [
-                {
-                  adcd: '420529105205100',
-                  adnm: '二组（红旗1）',
-                  pcount: 105,
-                  htcount: 34,
-                  ldarea: 3.18,
-                  plarea: 200,
-                  prevtp: '2',
-                  lgtd: 110.403549,
-                  lttd: 30.021536,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105205101',
-                  adnm: '二组（红旗2）',
-                  pcount: 100,
-                  htcount: 30,
-                  ldarea: 3,
-                  plarea: 190,
-                  prevtp: '2',
-                  lgtd: 110.403766,
-                  lttd: 30.016641,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105205102',
-                  adnm: '三组(幺牌）',
-                  pcount: 318,
-                  htcount: 91,
-                  ldarea: 5.09,
-                  plarea: 555,
-                  prevtp: '2',
-                  lgtd: 110.407947,
-                  lttd: 30.013943,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105205103',
-                  adnm: '一组（龚家坪）',
-                  pcount: 89,
-                  htcount: 23,
-                  ldarea: 2.78,
-                  plarea: 140,
-                  prevtp: '1',
-                  lgtd: 110.370446,
-                  lttd: 30.04961,
-                  wscd: 'HBWS000000002'
-                }
-              ]
-            },
-            {
-              adcd: '420529105206000',
-              adnm: '红旗坪村',
-              pcount: 1006,
-              htcount: 308,
-              ldarea: 19,
-              plarea: 1998,
-              prevtp: '0',
-              lgtd: 110.396358,
-              lttd: 30.002951,
-              wscd: 'HBWS000000002',
-              children: []
-            },
-            {
-              adcd: '420529105207000',
-              adnm: '三台坡村',
-              pcount: 784,
-              htcount: 240,
-              ldarea: 33.06,
-              plarea: 3637,
-              prevtp: '0',
-              lgtd: 110.348317,
-              lttd: 30.078608,
-              wscd: 'HBWS000000002',
-              children: [
-                {
-                  adcd: '420529105207100',
-                  adnm: '三组',
-                  pcount: 144,
-                  htcount: 45,
-                  ldarea: 9.68,
-                  plarea: 675,
-                  prevtp: '1',
-                  lgtd: 110.348484,
-                  lttd: 30.077671,
-                  wscd: 'HBWS000000002'
-                },
-                {
-                  adcd: '420529105207101',
-                  adnm: '二组',
-                  pcount: 381,
-                  htcount: 118,
-                  ldarea: 19.28,
-                  plarea: 1770,
-                  prevtp: '1',
-                  lgtd: 110.353433,
-                  lttd: 30.090529,
-                  wscd: 'HBWS000000002'
-                }
-              ]
-            },
-            {
-              adcd: '420529105208000',
-              adnm: '锁山金村',
-              pcount: 1944,
-              htcount: 550,
-              ldarea: 24.27,
-              prevtp: '0',
-              lgtd: 110.310285,
-              lttd: 29.967872,
-              children: [
-                {
-                  adcd: '420529105208100',
-                  adnm: '一组（岗坪）',
-                  pcount: 196,
-                  htcount: 56,
-                  ldarea: 2.47,
-                  prevtp: '0',
-                  lgtd: 110.310224,
-                  lttd: 29.966106
-                },
-                {
-                  adcd: '420529105208101',
-                  adnm: '四组（大树垭）',
-                  pcount: 252,
-                  htcount: 72,
-                  ldarea: 2.69,
-                  prevtp: '0',
-                  lgtd: 110.335138,
-                  lttd: 29.976205
-                },
-                {
-                  adcd: '420529105208102',
-                  adnm: '二组',
-                  pcount: 161,
-                  htcount: 46,
-                  ldarea: 1.71,
-                  prevtp: '0',
-                  lgtd: 110.30384,
-                  lttd: 29.960653
-                }
-              ]
-            },
-            {
-              adcd: '420529105209000',
-              adnm: '茶园村',
-              pcount: 956,
-              htcount: 445,
-              ldarea: 22.25,
-              prevtp: '0',
-              lgtd: 110.321912,
-              lttd: 30.00915,
-              children: []
-            },
-            {
-              adcd: '420529105210000',
-              adnm: '鹿耳庄村',
-              pcount: 1588,
-              htcount: 462,
-              ldarea: 22.5,
-              plarea: 2025,
-              prevtp: '0',
-              lgtd: 110.362793,
-              lttd: 29.995701,
-              wscd: 'HBWS000000002',
-              children: []
-            }
-          ]
-        },
-        {
-          adcd: '420529201000000',
-          adnm: '付家堰乡',
-          pcount: 17205,
-          htcount: 5427,
-          ldarea: 92.28,
-          prevtp: '0',
-          lgtd: 110.487421,
-          lttd: 30.349922,
-          children: [
-            {
-              adcd: '420529201001000',
-              adnm: '付家堰社区',
-              pcount: 386,
-              htcount: 168,
-              ldarea: 5.68,
-              prevtp: '2',
-              lgtd: 110.478735,
-              lttd: 30.3065179,
-              children: []
-            },
-            {
-              adcd: '420529201201000',
-              adnm: '付家堰村',
-              pcount: 2492,
-              htcount: 775,
-              ldarea: 5.84,
-              prevtp: '0',
-              lgtd: 110.480256,
-              lttd: 30.307638,
-              children: [
-                {
-                  adcd: '420529201201101',
-                  adnm: '一组（饶家湾）',
-                  pcount: 410,
-                  htcount: 122,
-                  ldarea: 2.95,
-                  prevtp: '2',
-                  lgtd: 110.473528,
-                  lttd: 30.3011483
-                },
-                {
-                  adcd: '420529201201102',
-                  adnm: '六组（排山）',
-                  pcount: 392,
-                  htcount: 131,
-                  ldarea: 2.81,
-                  prevtp: '1',
-                  lgtd: 110.456762,
-                  lttd: 30.2860972
-                },
-                {
-                  adcd: '420529201201103',
-                  adnm: '一组（段沟）',
-                  pcount: 450,
-                  htcount: 420,
-                  ldarea: 4.5,
-                  prevtp: '2',
-                  lgtd: 110.479115,
-                  lttd: 30.304886
-                }
-              ]
-            },
-            {
-              adcd: '420529201202000',
-              adnm: '火山村',
-              pcount: 1996,
-              htcount: 605,
-              ldarea: 11.46,
-              prevtp: '0',
-              lgtd: 110.469095,
-              lttd: 30.319452,
-              children: [
-                {
-                  adcd: '420529201202100',
-                  adnm: '二组',
-                  pcount: 402,
-                  htcount: 122,
-                  ldarea: 4.33,
-                  prevtp: '1',
-                  lgtd: 110.469635,
-                  lttd: 30.3418893
-                },
-                {
-                  adcd: '420529201202101',
-                  adnm: '三组',
-                  pcount: 382,
-                  htcount: 113,
-                  ldarea: 4.2,
-                  prevtp: '1',
-                  lgtd: 110.463773,
-                  lttd: 30.3235754
-                },
-                {
-                  adcd: '420529201202102',
-                  adnm: '五组（毛沟湾）',
-                  pcount: 361,
-                  htcount: 128,
-                  ldarea: 4.5,
-                  prevtp: '2',
-                  lgtd: 110.461409,
-                  lttd: 30.307311
-                },
-                {
-                  adcd: '420529201202103',
-                  adnm: '五组（桂竹溪）',
-                  pcount: 360,
-                  htcount: 120,
-                  ldarea: 4,
-                  prevtp: '2',
-                  lgtd: 110.463332,
-                  lttd: 30.306439
-                }
-              ]
-            },
-            {
-              adcd: '420529201203000',
-              adnm: '马蹄井村',
-              pcount: 1624,
-              htcount: 458,
-              ldarea: 14.07,
-              prevtp: '0',
-              lgtd: 110.443532,
-              lttd: 30.3156,
-              children: [
-                {
-                  adcd: '420529201203100',
-                  adnm: '张家池',
-                  pcount: 310,
-                  htcount: 92,
-                  ldarea: 4.82,
-                  prevtp: '1',
-                  lgtd: 110.438819,
-                  lttd: 30.3408115
-                },
-                {
-                  adcd: '420529201203101',
-                  adnm: '一组（岩板上）',
-                  pcount: 330,
-                  htcount: 112,
-                  ldarea: 5.02,
-                  prevtp: '2',
-                  lgtd: 110.453829,
-                  lttd: 30.336959
-                },
-                {
-                  adcd: '420529201203102',
-                  adnm: '一组（李家埫）',
-                  pcount: 200,
-                  htcount: 82,
-                  ldarea: 4.35,
-                  prevtp: '2',
-                  lgtd: 110.449439,
-                  lttd: 30.33028
-                },
-                {
-                  adcd: '420529201203103',
-                  adnm: '一组（陈家沟）',
-                  pcount: 210,
-                  htcount: 78,
-                  ldarea: 4.21,
-                  prevtp: '2',
-                  lgtd: 110.450861,
-                  lttd: 30.32628
-                }
-              ]
-            },
-            {
-              adcd: '420529201204000',
-              adnm: '田家山村',
-              pcount: 1326,
-              htcount: 458,
-              ldarea: 9.19,
-              prevtp: '0',
-              lgtd: 110.4688,
-              lttd: 30.391132,
-              children: [
-                {
-                  adcd: '420529201204100',
-                  adnm: '一组',
-                  pcount: 420,
-                  htcount: 130,
-                  ldarea: 4.29,
-                  prevtp: '1',
-                  lgtd: 110.436456,
-                  lttd: 30.350601
-                }
-              ]
-            },
-            {
-              adcd: '420529201205000',
-              adnm: '左泉洞村',
-              pcount: 1738,
-              htcount: 574,
-              ldarea: 8.35,
-              prevtp: '0',
-              lgtd: 110.491354,
-              lttd: 30.38796,
-              children: [
-                {
-                  adcd: '420529201205100',
-                  adnm: '二组（莲蓬溪）',
-                  pcount: 350,
-                  htcount: 128,
-                  ldarea: 3.76,
-                  prevtp: '2',
-                  lgtd: 110.485923,
-                  lttd: 30.404639
-                },
-                {
-                  adcd: '420529201205101',
-                  adnm: '五组（炉子坡）',
-                  pcount: 282,
-                  htcount: 110,
-                  ldarea: 3.56,
-                  prevtp: '1',
-                  lgtd: 110.503146,
-                  lttd: 30.3823
-                }
-              ]
-            },
-            {
-              adcd: '420529201206000',
-              adnm: '大龙坪村',
-              pcount: 1784,
-              htcount: 545,
-              ldarea: 7.41,
-              prevtp: '0',
-              lgtd: 110.471902,
-              lttd: 30.36017,
-              children: [
-                {
-                  adcd: '420529201206100',
-                  adnm: '三组（刘家湾)',
-                  pcount: 412,
-                  htcount: 154,
-                  ldarea: 3.88,
-                  prevtp: '2',
-                  lgtd: 110.468727,
-                  lttd: 30.357258
-                },
-                {
-                  adcd: '420529201206101',
-                  adnm: '二组（大龙坪）',
-                  pcount: 421,
-                  htcount: 160,
-                  ldarea: 3.83,
-                  prevtp: '2',
-                  lgtd: 110.470463,
-                  lttd: 30.363806
-                },
-                {
-                  adcd: '420529201206102',
-                  adnm: '三组（冲门沟）',
-                  pcount: 364,
-                  htcount: 155,
-                  ldarea: 3.65,
-                  prevtp: '2',
-                  lgtd: 110.469068,
-                  lttd: 30.365667
-                }
-              ]
-            },
-            {
-              adcd: '420529201207000',
-              adnm: '白庙村',
-              pcount: 1685,
-              htcount: 532,
-              ldarea: 11.54,
-              prevtp: '0',
-              lgtd: 110.50056,
-              lttd: 30.31767,
-              children: [
-                {
-                  adcd: '420529201207100',
-                  adnm: '五组（八坪）',
-                  pcount: 282,
-                  htcount: 89,
-                  ldarea: 3.89,
-                  prevtp: '2',
-                  lgtd: 110.505149,
-                  lttd: 30.306069
-                },
-                {
-                  adcd: '420529201207101',
-                  adnm: '六组（八坪）',
-                  pcount: 281,
-                  htcount: 105,
-                  ldarea: 1.78,
-                  prevtp: '0',
-                  lgtd: 110.507719,
-                  lttd: 30.30555
-                },
-                {
-                  adcd: '420529201207102',
-                  adnm: '一组（白庙聚宝石）',
-                  pcount: 150,
-                  htcount: 45,
-                  ldarea: 3.1,
-                  prevtp: '2',
-                  lgtd: 110.517796,
-                  lttd: 30.34481
-                },
-                {
-                  adcd: '420529201207103',
-                  adnm: '四组（果坪埫2）',
-                  pcount: 168,
-                  htcount: 48,
-                  ldarea: 3.04,
-                  prevtp: '2',
-                  lgtd: 110.495698,
-                  lttd: 30.315614
-                },
-                {
-                  adcd: '420529201207105',
-                  adnm: '三组（白庙）',
-                  pcount: 150,
-                  htcount: 48,
-                  ldarea: 3,
-                  prevtp: '2',
-                  lgtd: 110.503506,
-                  lttd: 30.319506
-                },
-                {
-                  adcd: '420529201207106',
-                  adnm: '一组（白庙黑潭河）',
-                  pcount: 132,
-                  htcount: 42,
-                  ldarea: 3.05,
-                  prevtp: '2',
-                  lgtd: 110.500862,
-                  lttd: 30.32349
-                },
-                {
-                  adcd: '420529201207107',
-                  adnm: '四组（果坪埫1）',
-                  pcount: 100,
-                  htcount: 40,
-                  ldarea: 3,
-                  prevtp: '2',
-                  lgtd: 110.496291,
-                  lttd: 30.295625
-                }
-              ]
-            },
-            {
-              adcd: '420529201208000',
-              adnm: '鸭儿坪村',
-              pcount: 2458,
-              htcount: 810,
-              ldarea: 14.48,
-              prevtp: '0',
-              lgtd: 110.523218,
-              lttd: 30.37112,
-              children: [
-                {
-                  adcd: '420529201208100',
-                  adnm: '一组（廖家湾）',
-                  pcount: 512,
-                  htcount: 162,
-                  ldarea: 5.06,
-                  prevtp: '2',
-                  lgtd: 110.522115,
-                  lttd: 30.369879
-                },
-                {
-                  adcd: '420529201208101',
-                  adnm: '三组',
-                  pcount: 525,
-                  htcount: 170,
-                  ldarea: 5.24,
-                  prevtp: '1',
-                  lgtd: 110.535948,
-                  lttd: 30.387679
-                }
-              ]
-            },
-            {
-              adcd: '420529201209000',
-              adnm: '桥料村',
-              pcount: 2102,
-              htcount: 670,
-              ldarea: 9.94,
-              prevtp: '0',
-              lgtd: 110.543481,
-              lttd: 30.369273,
-              children: [
-                {
-                  adcd: '420529201209100',
-                  adnm: '四组（蒿坪）',
-                  pcount: 353,
-                  htcount: 121,
-                  ldarea: 3.62,
-                  prevtp: '2',
-                  lgtd: 110.548285,
-                  lttd: 30.358664
-                },
-                {
-                  adcd: '420529201209101',
-                  adnm: '六组（柞房湾）',
-                  pcount: 386,
-                  htcount: 116,
-                  ldarea: 3.61,
-                  prevtp: '2',
-                  lgtd: 110.533869,
-                  lttd: 30.358174
-                },
-                {
-                  adcd: '420529201209102',
-                  adnm: '五组（赛宝）',
-                  pcount: 319,
-                  htcount: 110,
-                  ldarea: 3.52,
-                  prevtp: '1',
-                  lgtd: 110.546802,
-                  lttd: 30.3667211
-                }
-              ]
-            }
-          ]
-        },
-        {
-          adcd: '420529202000000',
-          adnm: '牛庄乡',
-          pcount: 7383,
-          htcount: 2182,
-          ldarea: 154,
-          prevtp: '0',
-          lgtd: 110.353576,
-          lttd: 30.226665,
-          children: [
-            {
-              adcd: '420529202201000',
-              adnm: '牛庄村',
-              pcount: 1425,
-              htcount: 401,
-              ldarea: 27.81,
-              prevtp: '0',
-              lgtd: 110.351812,
-              lttd: 30.223849,
-              children: [
-                {
-                  adcd: '420529202201100',
-                  adnm: '一组',
-                  pcount: 132,
-                  htcount: 43,
-                  ldarea: 3.73,
-                  prevtp: '0',
-                  lgtd: 110.359446,
-                  lttd: 30.234513
-                },
-                {
-                  adcd: '420529202201101',
-                  adnm: '七组',
-                  pcount: 88,
-                  htcount: 31,
-                  ldarea: 1.96,
-                  prevtp: '0',
-                  lgtd: 110.342555,
-                  lttd: 30.228869
-                },
-                {
-                  adcd: '420529202201102',
-                  adnm: '二组',
-                  pcount: 105,
-                  htcount: 36,
-                  ldarea: 2.01,
-                  prevtp: '0',
-                  lgtd: 110.291595,
-                  lttd: 30.214394
-                },
-                {
-                  adcd: '420529202201103',
-                  adnm: '三组',
-                  pcount: 182,
-                  htcount: 52,
-                  ldarea: 3.92,
-                  prevtp: '0',
-                  lgtd: 110.350574,
-                  lttd: 30.22323
-                }
-              ]
-            },
-            {
-              adcd: '420529202202000',
-              adnm: '池南村',
-              pcount: 734,
-              htcount: 223,
-              ldarea: 16.79,
-              prevtp: '0',
-              lgtd: 110.337422,
-              lttd: 30.206523,
-              children: [
-                {
-                  adcd: '420529202202100',
-                  adnm: '六组',
-                  pcount: 51,
-                  htcount: 15,
-                  ldarea: 3.21,
-                  prevtp: '1',
-                  lgtd: 110.32757,
-                  lttd: 30.222412
-                },
-                {
-                  adcd: '420529202202101',
-                  adnm: '二组（池南）',
-                  pcount: 153,
-                  htcount: 48,
-                  ldarea: 3.7,
-                  prevtp: '2',
-                  lgtd: 110.337412,
-                  lttd: 30.206112
-                },
-                {
-                  adcd: '420529202202102',
-                  adnm: '四组',
-                  pcount: 106,
-                  htcount: 29,
-                  ldarea: 3.37,
-                  prevtp: '1',
-                  lgtd: 110.330964,
-                  lttd: 30.2055751
-                }
-              ]
-            },
-            {
-              adcd: '420529202203000',
-              adnm: '凌云村',
-              pcount: 704,
-              htcount: 201,
-              ldarea: 14.63,
-              prevtp: '0',
-              lgtd: 110.335722,
-              lttd: 30.187676,
-              children: [
-                {
-                  adcd: '420529202203100',
-                  adnm: '六组（弭坪）',
-                  pcount: 85,
-                  htcount: 15,
-                  ldarea: 4.33,
-                  prevtp: '2',
-                  lgtd: 110.287151,
-                  lttd: 30.190698
-                },
-                {
-                  adcd: '420529202203101',
-                  adnm: '八组（大埫）',
-                  pcount: 65,
-                  htcount: 19,
-                  ldarea: 3.45,
-                  prevtp: '1',
-                  lgtd: 110.278841,
-                  lttd: 30.185058
-                },
-                {
-                  adcd: '420529202203102',
-                  adnm: '五组（下土鱼河）',
-                  pcount: 112,
-                  htcount: 22,
-                  ldarea: 5.39,
-                  prevtp: '2',
-                  lgtd: 110.302724,
-                  lttd: 30.184629
-                },
-                {
-                  adcd: '420529202203103',
-                  adnm: '大花坪林场',
-                  pcount: 185,
-                  htcount: 57,
-                  ldarea: 8.54,
-                  prevtp: '2',
-                  lgtd: 110.318371,
-                  lttd: 30.154748
-                },
-                {
-                  adcd: '420529202203104',
-                  adnm: '五组（上土鱼河）',
-                  pcount: 98,
-                  htcount: 45,
-                  ldarea: 5.32,
-                  prevtp: '2',
-                  lgtd: 110.312979,
-                  lttd: 30.183736
-                }
-              ]
-            },
-            {
-              adcd: '420529202204000',
-              adnm: '沙河村',
-              pcount: 403,
-              htcount: 111,
-              ldarea: 11.57,
-              prevtp: '0',
-              lgtd: 110.36442,
-              lttd: 30.238031,
-              children: [
-                {
-                  adcd: '420529202204100',
-                  adnm: '一组（沙河)',
-                  pcount: 86,
-                  htcount: 23,
-                  ldarea: 3.93,
-                  prevtp: '2',
-                  lgtd: 110.364422,
-                  lttd: 30.237765
-                }
-              ]
-            },
-            {
-              adcd: '420529202205000',
-              adnm: '松木坪村',
-              pcount: 644,
-              htcount: 169,
-              ldarea: 14.99,
-              prevtp: '0',
-              lgtd: 110.306926,
-              lttd: 30.229545,
-              children: []
-            },
-            {
-              adcd: '420529202206000',
-              adnm: '金山村',
-              pcount: 1321,
-              htcount: 383,
-              ldarea: 21.99,
-              prevtp: '0',
-              lgtd: 110.288519,
-              lttd: 30.229658,
-              children: [
-                {
-                  adcd: '420529202206100',
-                  adnm: '二组（罗家湾）',
-                  pcount: 69,
-                  htcount: 12,
-                  ldarea: 3.01,
-                  prevtp: '2',
-                  lgtd: 110.293487,
-                  lttd: 30.2124449
-                },
-                {
-                  adcd: '420529202206101',
-                  adnm: '三组（任家河）',
-                  pcount: 113,
-                  htcount: 28,
-                  ldarea: 5.38,
-                  prevtp: '1',
-                  lgtd: 110.281083,
-                  lttd: 30.223695
-                },
-                {
-                  adcd: '420529202206102',
-                  adnm: '一组（李家屋场）',
-                  pcount: 84,
-                  htcount: 19,
-                  ldarea: 2.34,
-                  prevtp: '0',
-                  lgtd: 110.311067,
-                  lttd: 30.219306
-                },
-                {
-                  adcd: '420529202206103',
-                  adnm: '五组（金山坪）',
-                  pcount: 284,
-                  htcount: 52,
-                  ldarea: 5.66,
-                  prevtp: '1',
-                  lgtd: 110.283955,
-                  lttd: 30.233378
-                },
-                {
-                  adcd: '420529202206104',
-                  adnm: '九组（鹰嘴山）',
-                  pcount: 220,
-                  htcount: 47,
-                  ldarea: 6.88,
-                  prevtp: '1',
-                  lgtd: 110.277328,
-                  lttd: 30.235023
-                }
-              ]
-            },
-            {
-              adcd: '420529202207000',
-              adnm: '九里坪村',
-              pcount: 734,
-              htcount: 213,
-              ldarea: 16.16,
-              prevtp: '0',
-              lgtd: 110.381023,
-              lttd: 30.278049,
-              children: [
-                {
-                  adcd: '420529202207100',
-                  adnm: '六组（黄家坳）',
-                  pcount: 75,
-                  htcount: 16,
-                  ldarea: 3.95,
-                  prevtp: '1',
-                  lgtd: 110.377058,
-                  lttd: 30.290256
-                },
-                {
-                  adcd: '420529202207101',
-                  adnm: '三组（阳坡坪）',
-                  pcount: 123,
-                  htcount: 29,
-                  ldarea: 5.51,
-                  prevtp: '2',
-                  lgtd: 110.3784,
-                  lttd: 30.2772
-                }
-              ]
-            },
-            {
-              adcd: '420529202208000',
-              adnm: '横茅湖村',
-              pcount: 1238,
-              htcount: 411,
-              ldarea: 23.89,
-              prevtp: '0',
-              lgtd: 110.39574,
-              lttd: 30.304549,
-              children: [
-                {
-                  adcd: '420529202208100',
-                  adnm: '四组（倒洞坳）',
-                  pcount: 82,
-                  htcount: 16,
-                  ldarea: 4.21,
-                  prevtp: '2',
-                  lgtd: 110.369113,
-                  lttd: 30.294094
-                },
-                {
-                  adcd: '420529202208101',
-                  adnm: '五组（红岩沟）',
-                  pcount: 74,
-                  htcount: 21,
-                  ldarea: 3.26,
-                  prevtp: '2',
-                  lgtd: 110.376422,
-                  lttd: 30.305973
-                }
-              ]
-            },
-            {
-              adcd: '420529202209000',
-              adnm: '沙湾村',
-              pcount: 180,
-              htcount: 70,
-              ldarea: 4.98,
-              prevtp: '0',
-              lgtd: 110.405011,
-              lttd: 30.334473,
-              children: []
-            }
-          ]
-        },
-        {
-          adcd: '420529203000000',
-          adnm: '采花乡',
-          pcount: 27228,
-          htcount: 8128,
-          ldarea: 285.47,
-          prevtp: '0',
-          lgtd: 110.450562,
-          lttd: 30.214214,
-          children: [
-            {
-              adcd: '420529203001000',
-              adnm: '采花社区',
-              pcount: 1323,
-              htcount: 358,
-              ldarea: 4.53,
-              prevtp: '0',
-              lgtd: 110.449803,
-              lttd: 30.213941,
-              children: [
-                {
-                  adcd: '420529203001106',
-                  adnm: '中街',
-                  pcount: 406,
-                  htcount: 116,
-                  ldarea: 3.51,
-                  prevtp: '2',
-                  lgtd: 110.450705,
-                  lttd: 30.214687
-                },
-                {
-                  adcd: '420529203001107',
-                  adnm: '下街',
-                  pcount: 315,
-                  htcount: 89,
-                  ldarea: 3.51,
-                  prevtp: '2',
-                  lgtd: 110.450165,
-                  lttd: 30.216293
-                },
-                {
-                  adcd: '420529203001108',
-                  adnm: '上街',
-                  pcount: 602,
-                  htcount: 153,
-                  ldarea: 3.51,
-                  prevtp: '2',
-                  lgtd: 110.445732,
-                  lttd: 30.205698
-                }
-              ]
-            },
-            {
-              adcd: '420529203201000',
-              adnm: '长茂司村',
-              pcount: 750,
-              htcount: 231,
-              ldarea: 13.7,
-              prevtp: '0',
-              lgtd: 110.452802,
-              lttd: 30.217673,
-              children: [
-                {
-                  adcd: '420529203201100',
-                  adnm: '三组（胡家台）',
-                  pcount: 350,
-                  htcount: 101,
-                  ldarea: 6.53,
-                  prevtp: '2',
-                  lgtd: 110.452846,
-                  lttd: 30.225834
-                },
-                {
-                  adcd: '420529203201101',
-                  adnm: '二组（茶丘）',
-                  pcount: 100,
-                  htcount: 30,
-                  ldarea: 6.61,
-                  prevtp: '2',
-                  lgtd: 110.45266,
-                  lttd: 30.218348
-                },
-                {
-                  adcd: '420529203201102',
-                  adnm: '一组（长茂司）',
-                  pcount: 300,
-                  htcount: 100,
-                  ldarea: 6.57,
-                  prevtp: '1',
-                  lgtd: 110.451124,
-                  lttd: 30.208181
-                }
-              ]
-            },
-            {
-              adcd: '420529203202000',
-              adnm: '黄家台村',
-              pcount: 595,
-              htcount: 190,
-              ldarea: 17.75,
-              prevtp: '0',
-              lgtd: 110.456985,
-              lttd: 30.238609,
-              children: [
-                {
-                  adcd: '420529203202100',
-                  adnm: '四组（彭家屋场）',
-                  pcount: 180,
-                  htcount: 50,
-                  ldarea: 6.44,
-                  prevtp: '2',
-                  lgtd: 110.458927,
-                  lttd: 30.237277
-                },
-                {
-                  adcd: '420529203202101',
-                  adnm: '二组（黄家台）',
-                  pcount: 119,
-                  htcount: 43,
-                  ldarea: 6.44,
-                  prevtp: '2',
-                  lgtd: 110.462367,
-                  lttd: 30.241478
-                },
-                {
-                  adcd: '420529203202102',
-                  adnm: '七组（白水）',
-                  pcount: 196,
-                  htcount: 65,
-                  ldarea: 6.44,
-                  prevtp: '1',
-                  lgtd: 110.431701,
-                  lttd: 30.255427
-                },
-                {
-                  adcd: '420529203202103',
-                  adnm: '一组（小河湾）',
-                  pcount: 100,
-                  htcount: 32,
-                  ldarea: 6.44,
-                  prevtp: '1',
-                  lgtd: 110.456722,
-                  lttd: 30.248939
-                }
-              ]
-            },
-            {
-              adcd: '420529203203000',
-              adnm: '白鹤村',
-              pcount: 470,
-              htcount: 183,
-              ldarea: 7.57,
-              prevtp: '0',
-              lgtd: 110.439468,
-              lttd: 30.196909,
-              children: [
-                {
-                  adcd: '420529203203101',
-                  adnm: '三组（沙坝子）',
-                  pcount: 160,
-                  htcount: 55,
-                  ldarea: 3.89,
-                  prevtp: '2',
-                  lgtd: 110.439307,
-                  lttd: 30.1976174
-                },
-                {
-                  adcd: '420529203203102',
-                  adnm: '二组（撒花溪）',
-                  pcount: 210,
-                  htcount: 83,
-                  ldarea: 3.89,
-                  prevtp: '2',
-                  lgtd: 110.441227,
-                  lttd: 30.2078615
-                },
-                {
-                  adcd: '420529203203103',
-                  adnm: '一组(沙坝子）',
-                  pcount: 100,
-                  htcount: 45,
-                  ldarea: 3.88,
-                  prevtp: '2',
-                  lgtd: 110.444088,
-                  lttd: 30.2049066
-                },
-                {
-                  adcd: '420529203203104',
-                  adnm: '三组（周家岭）',
-                  pcount: 200,
-                  htcount: 73,
-                  ldarea: 3.9,
-                  prevtp: '2',
-                  lgtd: 110.441688,
-                  lttd: 30.20215
-                }
-              ]
-            },
-            {
-              adcd: '420529203204000',
-              adnm: '大村',
-              pcount: 803,
-              htcount: 235,
-              ldarea: 19.77,
-              prevtp: '0',
-              lgtd: 110.43015,
-              lttd: 30.220485,
-              children: [
-                {
-                  adcd: '420529203204100',
-                  adnm: '一组（大村）',
-                  pcount: 238,
-                  htcount: 70,
-                  ldarea: 8.59,
-                  prevtp: '2',
-                  lgtd: 110.427983,
-                  lttd: 30.218539
-                },
-                {
-                  adcd: '420529203204101',
-                  adnm: '七组（廖叶池）',
-                  pcount: 355,
-                  htcount: 100,
-                  ldarea: 8.59,
-                  prevtp: '2',
-                  lgtd: 110.411043,
-                  lttd: 30.2063821
-                },
-                {
-                  adcd: '420529203204102',
-                  adnm: '八组',
-                  pcount: 210,
-                  htcount: 65,
-                  ldarea: 8.59,
-                  prevtp: '1',
-                  lgtd: 110.404746,
-                  lttd: 30.2028926
-                }
-              ]
-            },
-            {
-              adcd: '420529203205000',
-              adnm: '万里村',
-              pcount: 363,
-              htcount: 125,
-              ldarea: 25,
-              prevtp: '0',
-              lgtd: 110.394666,
-              lttd: 30.195858,
-              children: [
-                {
-                  adcd: '420529203205100',
-                  adnm: '三组（二龙坪）',
-                  pcount: 100,
-                  htcount: 31,
-                  ldarea: 10.34,
-                  prevtp: '2',
-                  lgtd: 110.390243,
-                  lttd: 30.196587
-                },
-                {
-                  adcd: '420529203205101',
-                  adnm: '七组（地龙坪）',
-                  pcount: 93,
-                  htcount: 37,
-                  ldarea: 10.34,
-                  prevtp: '1',
-                  lgtd: 110.398801,
-                  lttd: 30.1891199
-                },
-                {
-                  adcd: '420529203205102',
-                  adnm: '一组',
-                  pcount: 170,
-                  htcount: 57,
-                  ldarea: 10.34,
-                  prevtp: '1',
-                  lgtd: 110.406986,
-                  lttd: 30.1996586
-                }
-              ]
-            },
-            {
-              adcd: '420529203206000',
-              adnm: '前坪村',
-              pcount: 1272,
-              htcount: 373,
-              ldarea: 20.24,
-              prevtp: '0',
-              lgtd: 110.43581,
-              lttd: 30.165766,
-              children: [
-                {
-                  adcd: '420529203206100',
-                  adnm: '一组（苦竹园）',
-                  pcount: 320,
-                  htcount: 85,
-                  ldarea: 6.45,
-                  prevtp: '2',
-                  lgtd: 110.423108,
-                  lttd: 30.153465
-                },
-                {
-                  adcd: '420529203206101',
-                  adnm: '七组（严家河）',
-                  pcount: 140,
-                  htcount: 36,
-                  ldarea: 6.45,
-                  prevtp: '2',
-                  lgtd: 110.423214,
-                  lttd: 30.1728369
-                },
-                {
-                  adcd: '420529203206102',
-                  adnm: '二组（莫家溪）',
-                  pcount: 322,
-                  htcount: 89,
-                  ldarea: 6.45,
-                  prevtp: '2',
-                  lgtd: 110.419841,
-                  lttd: 30.1590782
-                },
-                {
-                  adcd: '420529203206103',
-                  adnm: '六组（前坪）',
-                  pcount: 190,
-                  htcount: 65,
-                  ldarea: 6.45,
-                  prevtp: '2',
-                  lgtd: 110.423714,
-                  lttd: 30.167981
-                },
-                {
-                  adcd: '420529203206104',
-                  adnm: '三组',
-                  pcount: 200,
-                  htcount: 71,
-                  ldarea: 7,
-                  prevtp: '0',
-                  lgtd: 110.423373,
-                  lttd: 30.166645
-                },
-                {
-                  adcd: '420529203206105',
-                  adnm: '七组（关门岩）',
-                  pcount: 100,
-                  htcount: 35,
-                  ldarea: 6.45,
-                  prevtp: '2',
-                  lgtd: 110.424368,
-                  lttd: 30.175888
-                }
-              ]
-            },
-            {
-              adcd: '420529203207000',
-              adnm: '采花台村',
-              pcount: 835,
-              htcount: 247,
-              ldarea: 27.8,
-              prevtp: '0',
-              lgtd: 110.404831,
-              lttd: 30.134315,
-              children: [
-                {
-                  adcd: '420529203207100',
-                  adnm: '八组（堰坪）',
-                  pcount: 115,
-                  htcount: 32,
-                  ldarea: 7.56,
-                  prevtp: '1',
-                  lgtd: 110.387513,
-                  lttd: 30.148693
-                },
-                {
-                  adcd: '420529203207101',
-                  adnm: '二组（覃家台）',
-                  pcount: 200,
-                  htcount: 55,
-                  ldarea: 7.56,
-                  prevtp: '2',
-                  lgtd: 110.408039,
-                  lttd: 30.140805
-                },
-                {
-                  adcd: '420529203207102',
-                  adnm: '七组（堰坪）',
-                  pcount: 90,
-                  htcount: 35,
-                  ldarea: 7.56,
-                  prevtp: '2',
-                  lgtd: 110.391524,
-                  lttd: 30.147526
-                },
-                {
-                  adcd: '420529203207103',
-                  adnm: '三组（覃家台）',
-                  pcount: 220,
-                  htcount: 65,
-                  ldarea: 7.56,
-                  prevtp: '1',
-                  lgtd: 110.397219,
-                  lttd: 30.127049
-                },
-                {
-                  adcd: '420529203207104',
-                  adnm: '一组（采花台）',
-                  pcount: 210,
-                  htcount: 60,
-                  ldarea: 7.56,
-                  prevtp: '2',
-                  lgtd: 110.40784,
-                  lttd: 30.133373
-                }
-              ]
-            },
-            {
-              adcd: '420529203208000',
-              adnm: '楠木桥村',
-              pcount: 518,
-              htcount: 148,
-              ldarea: 35.4,
-              prevtp: '0',
-              lgtd: 110.464885,
-              lttd: 30.173719,
-              children: [
-                {
-                  adcd: '420529203208100',
-                  adnm: '一组（楠木桥）',
-                  pcount: 305,
-                  htcount: 88,
-                  ldarea: 13.8,
-                  prevtp: '2',
-                  lgtd: 110.464482,
-                  lttd: 30.173049
-                },
-                {
-                  adcd: '420529203208101',
-                  adnm: '二组（后荒）',
-                  pcount: 55,
-                  htcount: 15,
-                  ldarea: 13.8,
-                  prevtp: '2',
-                  lgtd: 110.453234,
-                  lttd: 30.164536
-                },
-                {
-                  adcd: '420529203208102',
-                  adnm: '三组',
-                  pcount: 158,
-                  htcount: 45,
-                  ldarea: 13.8,
-                  prevtp: '1',
-                  lgtd: 110.527918,
-                  lttd: 30.235771
-                }
-              ]
-            },
-            {
-              adcd: '420529203209000',
-              adnm: '星岩坪村',
-              pcount: 1008,
-              htcount: 295,
-              ldarea: 21.9,
-              prevtp: '0',
-              lgtd: 110.472704,
-              lttd: 30.257124,
-              children: [
-                {
-                  adcd: '420529203209100',
-                  adnm: '一组（星岩坪公社湾）',
-                  pcount: 210,
-                  htcount: 65,
-                  ldarea: 5.64,
-                  prevtp: '2',
-                  lgtd: 110.472441,
-                  lttd: 30.255052
-                },
-                {
-                  adcd: '420529203209101',
-                  adnm: '七组（三渡水）',
-                  pcount: 210,
-                  htcount: 65,
-                  ldarea: 5.65,
-                  prevtp: '1',
-                  lgtd: 110.48657,
-                  lttd: 30.281577
-                },
-                {
-                  adcd: '420529203209102',
-                  adnm: '三组（张家湾）',
-                  pcount: 50,
-                  htcount: 12,
-                  ldarea: 5.65,
-                  prevtp: '2',
-                  lgtd: 110.477373,
-                  lttd: 30.269899
-                },
-                {
-                  adcd: '420529203209103',
-                  adnm: '白果坪',
-                  pcount: 248,
-                  htcount: 66,
-                  ldarea: 5.65,
-                  prevtp: '2',
-                  lgtd: 110.483562,
-                  lttd: 30.291257
-                },
-                {
-                  adcd: '420529203209104',
-                  adnm: '五组',
-                  pcount: 100,
-                  htcount: 32,
-                  ldarea: 5.66,
-                  prevtp: '1',
-                  lgtd: 110.468164,
-                  lttd: 30.2445375
-                },
-                {
-                  adcd: '420529203209105',
-                  adnm: '一组（褚家台）',
-                  pcount: 190,
-                  htcount: 55,
-                  ldarea: 5.65,
-                  prevtp: '2',
-                  lgtd: 110.472318,
-                  lttd: 30.261083
-                }
-              ]
-            },
-            {
-              adcd: '420529203210000',
-              adnm: '苦竹坪村',
-              pcount: 317,
-              htcount: 92,
-              ldarea: 5.1,
-              prevtp: '0',
-              lgtd: 110.511256,
-              lttd: 30.267272,
-              children: [
-                {
-                  adcd: '420529203210100',
-                  adnm: '八组（大沙坡）',
-                  pcount: 222,
-                  htcount: 65,
-                  ldarea: 3.28,
-                  prevtp: '2',
-                  lgtd: 110.514562,
-                  lttd: 30.263478
-                },
-                {
-                  adcd: '420529203210101',
-                  adnm: '二组（陈家大坪）',
-                  pcount: 50,
-                  htcount: 15,
-                  ldarea: 3.28,
-                  prevtp: '2',
-                  lgtd: 110.515786,
-                  lttd: 30.255662
-                },
-                {
-                  adcd: '420529203210105',
-                  adnm: '一组（渔泉河）',
-                  pcount: 45,
-                  htcount: 12,
-                  ldarea: 3.28,
-                  prevtp: '2',
-                  lgtd: 110.524606,
-                  lttd: 30.241511
-                },
-                {
-                  adcd: '420529203210106',
-                  adnm: '八组（大沙坝）',
-                  pcount: 210,
-                  htcount: 55,
-                  ldarea: 3.28,
-                  prevtp: '2',
-                  lgtd: 110.510302,
-                  lttd: 30.269807
-                }
-              ]
-            },
-            {
-              adcd: '420529203211000',
-              adnm: '珍珠头村',
-              pcount: 248,
-              htcount: 77,
-              ldarea: 9.71,
-              prevtp: '0',
-              lgtd: 110.497443,
-              lttd: 30.272249,
-              children: [
-                {
-                  adcd: '420529203211100',
-                  adnm: '一组（二叉口）',
-                  pcount: 98,
-                  htcount: 32,
-                  ldarea: 6.85,
-                  prevtp: '2',
-                  lgtd: 110.492167,
-                  lttd: 30.294125
-                },
-                {
-                  adcd: '420529203211102',
-                  adnm: '五组（马家坡）',
-                  pcount: 150,
-                  htcount: 45,
-                  ldarea: 6.86,
-                  prevtp: '2',
-                  lgtd: 110.516365,
-                  lttd: 30.247835
-                }
-              ]
-            },
-            {
-              adcd: '420529203212000',
-              adnm: '红渔坪村',
-              pcount: 1350,
-              htcount: 428,
-              ldarea: 18.1,
-              prevtp: '0',
-              lgtd: 110.496412,
-              lttd: 30.222253,
-              children: [
-                {
-                  adcd: '420529203212100',
-                  adnm: '二组（红渔坪）',
-                  pcount: 340,
-                  htcount: 108,
-                  ldarea: 6.52,
-                  prevtp: '2',
-                  lgtd: 110.494381,
-                  lttd: 30.2221248
-                },
-                {
-                  adcd: '420529203212101',
-                  adnm: '四组（阳坡）',
-                  pcount: 480,
-                  htcount: 146,
-                  ldarea: 6.52,
-                  prevtp: '2',
-                  lgtd: 110.496759,
-                  lttd: 30.228309
-                },
-                {
-                  adcd: '420529203212102',
-                  adnm: '三组',
-                  pcount: 330,
-                  htcount: 106,
-                  ldarea: 6.52,
-                  prevtp: '2',
-                  lgtd: 110.501227,
-                  lttd: 30.22803
-                },
-                {
-                  adcd: '420529203212103',
-                  adnm: '五组（楠木）',
-                  pcount: 200,
-                  htcount: 68,
-                  ldarea: 6.52,
-                  prevtp: '2',
-                  lgtd: 110.516091,
-                  lttd: 30.2269493
-                }
-              ]
-            },
-            {
-              adcd: '420529203213000',
-              adnm: '白溢坪村',
-              pcount: 547,
-              htcount: 169,
-              ldarea: 19,
-              prevtp: '0',
-              lgtd: 110.556215,
-              lttd: 30.248125,
-              children: [
-                {
-                  adcd: '420529203213100',
-                  adnm: '二组（湖坪）',
-                  pcount: 237,
-                  htcount: 70,
-                  ldarea: 6.75,
-                  prevtp: '2',
-                  lgtd: 110.542872,
-                  lttd: 30.2415706
-                },
-                {
-                  adcd: '420529203213101',
-                  adnm: '三组（湖坪）',
-                  pcount: 132,
-                  htcount: 42,
-                  ldarea: 4.75,
-                  prevtp: '0',
-                  lgtd: 110.545592,
-                  lttd: 30.2411432
-                },
-                {
-                  adcd: '420529203213102',
-                  adnm: '七组（白溢坪）',
-                  pcount: 108,
-                  htcount: 32,
-                  ldarea: 4.75,
-                  prevtp: '0',
-                  lgtd: 110.552356,
-                  lttd: 30.2441797
-                },
-                {
-                  adcd: '420529203213103',
-                  adnm: '一组',
-                  pcount: 70,
-                  htcount: 25,
-                  ldarea: 6.75,
-                  prevtp: '1',
-                  lgtd: 110.528468,
-                  lttd: 30.236548
-                }
-              ]
-            },
-            {
-              adcd: '420529203214000',
-              adnm: '宋家河村',
-              pcount: 1023,
-              htcount: 385,
-              ldarea: 30.2,
-              prevtp: '0',
-              lgtd: 110.557717,
-              lttd: 30.188565,
-              children: [
-                {
-                  adcd: '420529203214100',
-                  adnm: '二组（宋家河）',
-                  pcount: 182,
-                  htcount: 120,
-                  ldarea: 9.55,
-                  prevtp: '2',
-                  lgtd: 110.558747,
-                  lttd: 30.187884
-                },
-                {
-                  adcd: '420529203214101',
-                  adnm: '六组（唐家河）',
-                  pcount: 139,
-                  htcount: 45,
-                  ldarea: 9.55,
-                  prevtp: '1',
-                  lgtd: 110.557433,
-                  lttd: 30.204571
-                },
-                {
-                  adcd: '420529203214102',
-                  adnm: '七组（甘沟河）',
-                  pcount: 486,
-                  htcount: 150,
-                  ldarea: 9.55,
-                  prevtp: '2',
-                  lgtd: 110.545536,
-                  lttd: 30.2194051
-                },
-                {
-                  adcd: '420529203214103',
-                  adnm: '五组（云山）',
-                  pcount: 216,
-                  htcount: 70,
-                  ldarea: 9.55,
-                  prevtp: '2',
-                  lgtd: 110.533849,
-                  lttd: 30.1901553
-                }
-              ]
-            },
-            {
-              adcd: '420529203215000',
-              adnm: '栗子坪村',
-              pcount: 951,
-              htcount: 267,
-              ldarea: 9.7,
-              prevtp: '0',
-              lgtd: 110.570566,
-              lttd: 30.162327,
-              children: []
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  waterList: [
-    {
-      wscd: '11',
-      wsnm: '百溪河'
-    },
-    {
-      wscd: '61',
-      wsnm: '沽洞溪'
-    },
-    {
-      wscd: '71',
-      wsnm: '二汊口河'
-    },
-    {
-      wscd: 'FA85W508610420000',
-      wsnm: '泗洋河'
-    },
-    {
-      wscd: 'FA85X808780420000',
-      wsnm: '天池河'
-    },
-    {
-      wscd: 'FF148801360420000',
-      wsnm: '南河'
-    },
-    {
-      wscd: 'HBWS000000002',
-      wsnm: '湾潭河'
-    },
-    {
-      wscd: 'HBWS000000003',
-      wsnm: '渔阳河'
-    }
-  ],
-  tableData: [
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    },
-    {
-      name: '鸡鸣坝雨量站',
-      sumDrp: '61.5',
-      adnm: '高乐山镇',
-      wsnm: '唐崖河'
-    }
-  ],
-  tqDate: [
-    {
-      type: 6,
-      typeName: '>250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 5,
-      typeName: '100~250',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 4,
-      typeName: '50~100',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 3,
-      typeName: '25~50',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 2,
-      typeName: '10~25',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 1,
-      typeName: '0.1~10',
-      flowSign: null,
-      flowDetails: []
-    },
-    {
-      type: 0,
-      typeName: '0~0.1',
-      flowSign: null,
-      flowDetails: []
-    }
-  ]
-}
diff --git a/src/views/fxdd/tqyb/tqxx24/index.css b/src/views/fxdd/tqyb/tqxx24/index.css
deleted file mode 100644
index 0fe13c2..0000000
--- a/src/views/fxdd/tqyb/tqxx24/index.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-}
-.waterLevelBox .smallTable {
-  height: calc(100% - 190px);
-}
-.txyb24 .ant-form-item {
-  margin-bottom: 0 !important;
-}
-.subTitle {
-  position: relative;
-  padding-left: 8px;
-  margin: 0 0 10px 10px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-}
-.subTitle:after {
-  content: '';
-  display: block;
-  position: absolute;
-  width: 3px;
-  height: 16px;
-  background: #0068f4;
-  left: -2px;
-  top: 5px;
-  border-radius: 4px;
-}
-.summary {
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-}
-.summary .sum-count {
-  font-size: 18px;
-  font-weight: bold;
-}
-.sateCloudPageBox,
-.radarPageBox {
-  position: absolute;
-  left: 500px;
-  padding-top: 15px;
-  bottom: 50px;
-  width: calc(100vw - 1000px);
-  height: 60px;
-  background: #fff;
-  z-index: 101;
-  box-shadow: 1px 2px 10px #bdbaba;
-  box-sizing: border-box;
-  border-radius: 6px;
-}
-.sateCloudPageBox > div,
-.radarPageBox > div {
-  background: #fff;
-}
-.toolbarBox1 {
-  margin: 0 2px;
-}
-.toolbarBox1 .ant-form-item {
-  padding: 0;
-}
diff --git a/src/views/fxdd/tqyb/tqxx24/index.js b/src/views/fxdd/tqyb/tqxx24/index.js
deleted file mode 100644
index 64b0af3..0000000
--- a/src/views/fxdd/tqyb/tqxx24/index.js
+++ /dev/null
@@ -1,195 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-import { Table, Segmented, Card, Tabs, Radio } from 'antd'
-import Stroke from 'ol/style/Stroke'
-import Graticule from 'ol/layer/Graticule.js'
-import moment from 'moment'
-
-import { useDispatch, useSelector } from 'react-redux'
-import RadarPage from '../../../Home/panels/forecastPanels/meteorology/radar/player'
-import SateCloudPage from '../../../Home/panels/forecastPanels/meteorology/sateCloud/player'
-import GridRainfall from '../../../Home/panels/forecastPanels/meteorology/gridRainfall'
-import ArealRainfall from '../../../Home/panels/forecastPanels/meteorology/arealRainfall'
-import data from './dataConfig'
-import Ljtj from '../ljtj'
-import Pltj from '../pltj'
-import Sktj from '../sktj'
-import Qyjy from '../qyjy'
-
-import { weatherRes, weatherLevel } from '../../../../service/fxdd'
-
-const Page = ({ activeKey }) => {
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  const dispatch = useDispatch()
-  const [tableData, setTableData] = useState(data.tableData)
-  const [tqDate, setTqDate] = useState(data.tqDate)
-  const [badgeType, setBadgeType] = useState('网格')
-  const [tm, setTm] = useState(moment())
-  const [leg, setLeg] = useState([])
-  const [rl, setrRl] = useState(0)
-  const [params, setParams] = useState(() => {
-    let t = moment().toObject()
-    let th = t.hours
-    return {
-      tm: moment(),
-      ts: th > 20 ? '20' : '08'
-    }
-  })
-  let mapObj = useSelector(s => s.map.map)
-
-  const flyTo = record => {
-    dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-
-    const { lgtd, lttd, elev } = record
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          ShuiKuLayer: [record.id]
-        }
-      })
-
-      dispatch.runtime.setFeaturePop({
-        type: 'shuiku',
-        data: record,
-        lgtd: record.lgtd,
-        lttd: record.lttd
-      })
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60
-      })
-    }
-  }
-
-  const clickBadge = type => {
-    setBadgeType(type)
-  }
-
-  const doSearch = params => {
-    setParams(params)
-    console.log('doSearch', params)
-  }
-
-  const getData = async params => {
-    let obj = { tm: params.tm.format('YYYYMMDD') + params.ts }
-    if (!params.ts) {
-      return
-    }
-    getResData()
-    let list = await weatherLevel(obj)
-    let arr = []
-    for (const [key, value] of Object.entries(list)) {
-      console.log(key, value)
-      arr = tqDate.map(item => {
-        if (item.type == key) {
-          console.log(key, item.type)
-          item.flowDetails = value
-        }
-        return item
-      })
-
-      const as = arr.map(item => {
-        return item.flowDetails.length
-      })
-      setLeg(as)
-
-      const rl = eval(as.join('+')) - as[as.length - 1]
-      setrRl(rl)
-    }
-  }
-
-  const getResData = () => {
-    const arr = data.tqDate.map(item => {
-      item.flowDetails = []
-      return item
-    })
-
-    setrRl(0)
-    setLeg([])
-    setTqDate(arr)
-  }
-
-  useEffect(() => {
-    getData(params)
-  }, [params])
-
-  return (
-    <>
-      <div className='monitor-rainfall waterLevelBox'>
-        <div style={{ margin: '0 0 0 6px' }} className='topQuery'>
-          <Toolbar search={doSearch} />
-        </div>
-        <Tabs>
-          <Tabs.TabPane tab='水库统计' key='item-1'>
-            <Sktj params={params} leg={leg} rl={rl} />
-          </Tabs.TabPane>
-          <Tabs.TabPane tab='流域降雨' key='item-2'>
-            <Pltj params={params} leg={leg} rl={rl} />
-          </Tabs.TabPane>
-          <Tabs.TabPane tab='区域降雨' key='item-3'>
-            <Qyjy params={params} leg={leg} rl={rl}></Qyjy>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab='量级统计' key='item-4'>
-            <Ljtj params={params} leg={leg} rl={rl} />
-          </Tabs.TabPane>
-        </Tabs>
-      </div>
-      <div
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 'calc(100vw - 700px)',
-          width: '400px'
-        }}
-      >
-        <Radio.Group
-          defaultValue='网格'
-          onChange={e => clickBadge(e.target.value)}
-        >
-          <Radio.Button value='网格'>网格</Radio.Button>
-          <Radio.Button value='面雨量'>面雨量</Radio.Button>
-          <Radio.Button value='雷达回波'>雷达回波</Radio.Button>
-          <Radio.Button value='卫星云图'>卫星云图</Radio.Button>
-        </Radio.Group>
-      </div>
-
-      {badgeType === '网格' ? (
-        <div>
-          <GridRainfall tm={params?.tm} ts={params?.ts} />
-        </div>
-      ) : null}
-
-      {badgeType === '面雨量' ? (
-        <div>
-          <ArealRainfall tm={params?.tm} ts={params?.ts} />
-        </div>
-      ) : null}
-
-      {badgeType === '雷达回波' ? (
-        <div className='radarPageBox'>
-          <RadarPage
-            activeKey={'0'}
-            badgeType={1}
-            tm={params?.tm}
-            ts={params?.ts}
-          />
-        </div>
-      ) : null}
-
-      {badgeType === '卫星云图' ? (
-        <div className='sateCloudPageBox'>
-          <SateCloudPage
-            activeKey={'0'}
-            badgeType={0}
-            tm={moment(params?.tm)}
-          />
-        </div>
-      ) : null}
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/tqxx24/index.less b/src/views/fxdd/tqyb/tqxx24/index.less
deleted file mode 100644
index 655c19b..0000000
--- a/src/views/fxdd/tqyb/tqxx24/index.less
+++ /dev/null
@@ -1,71 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-}
-.txyb24 .ant-form-item {
-  margin-bottom: 0 !important;
-}
-
-.subTitle {
-  position: relative;
-  padding-left: 8px;
-  margin: 0 0 10px 10px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-
-  &:after {
-    content: '';
-    display: block;
-    position: absolute;
-    width: 3px;
-    height: 16px;
-    background: #0068f4;
-    left: -2px;
-    top: 5px;
-    border-radius: 4px;
-  }
-}
-
-.summary {
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-
-  .sum-count {
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
-
-.sateCloudPageBox,
-.radarPageBox {
-  // position:fixed;
-  position: absolute;
-  left: 500px;
-  padding-top: 15px;
-  bottom: 50px;
-  width: calc(100vw - 1000px);
-
-  height: 60px;
-  background: #fff;
-  z-index: 101;
-  // bottom:13px;
-  box-shadow: 1px 2px 10px #bdbaba;
-  box-sizing: border-box;
-  border-radius: 6px;
-  > div {
-    background: #fff;
-  }
-}
-.toolbarBox1 {
-  margin: 0 2px;
-  .ant-form-item {
-    padding: 0;
-  }
-}
diff --git a/src/views/fxdd/tqyb/tqxx24/tool.js b/src/views/fxdd/tqyb/tqxx24/tool.js
deleted file mode 100644
index 1dd112a..0000000
--- a/src/views/fxdd/tqyb/tqxx24/tool.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import moment from 'moment'
-export function getMoment (date) {
-  const t = moment().toObject()
-  const th = t.hours
-  const tm = t.minutes
-  let t2 = null
-
-  if (th < 20) {
-    t2 = '08:00'
-  } else {
-    t2 = '20:00'
-  }
-
-  return t2
-}
diff --git a/src/views/fxdd/tqyb/tqxx24/toolbar.js b/src/views/fxdd/tqyb/tqxx24/toolbar.js
deleted file mode 100644
index 0c69057..0000000
--- a/src/views/fxdd/tqyb/tqxx24/toolbar.js
+++ /dev/null
@@ -1,310 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Button, DatePicker, Checkbox, TreeSelect, Select } from 'antd'
-import {
-  CaretUpOutlined,
-  CaretDownOutlined,
-  LeftOutlined,
-  RightOutlined
-} from '@ant-design/icons'
-import { Space } from 'antd'
-
-// import customParseFormat from 'dayjs/plugin/customParseFormat'
-
-import { getDictService } from '../../../../service/SelectValue'
-import NormalSelect from '../../../../components/Form/NormalSelect'
-import moment from 'moment'
-import data from './dataConfig'
-import { getMoment } from './tool'
-
-const { Option } = Select
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-const dateFormat = 'YYYY/MM/DD'
-
-const optionData = [
-  {
-    value: '08:00',
-    label: '08:00'
-  },
-  {
-    value: '20:00',
-    label: '20:00'
-  }
-]
-
-const ToolBar = ({ search, downLoad }) => {
-  const [form] = Form.useForm()
-  const [dateTime, setValue] = useState({})
-  const [optionsel, setPptionsel] = useState(optionData)
-  const [date, setDate] = useState(moment())
-  const [dataForm, setDataForm] = useState({
-    ts: '',
-    tm: moment()
-  })
-  const [disabled, setDisabled] = useState(false)
-  useEffect(() => {
-    handleTreeData(treeData)
-    setTreeData(treeData)
-    getOption()
-  }, [])
-
-  useEffect(() => {
-    const { ...rec } = form.getFieldsValue()
-    search({ tm: date, ts: dataForm.ts.split(':')[0] })
-  }, [dataForm])
-
-  const getOption = () => {
-    const t2 = getMoment()
-    const { ...rec } = form.getFieldsValue()
-
-    if (date.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-      let b1 = optionData.findIndex(item => item.value == t2)
-      let b2 = optionData.slice(0, b1 + 1)
-      setDisabled(true)
-      setPptionsel(b2)
-    } else {
-      setDisabled(false)
-    }
-
-    setDataForm(state => ({ ...state, ts: t2 }))
-  }
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    setDate(val)
-    if (val.format('YYYYMMDD') != moment().format('YYYYMMDD')) {
-      setDisabled(false)
-      setPptionsel(optionData)
-      search({ tm: date, ts: dataForm.ts.split(':')[0] })
-    } else {
-      getOption()
-    }
-  }
-  const onSearchClick1 = val => {
-    // const { ...rec } = form.getFieldsValue()
-    // if (val) {
-    //   setDataForm({ ts: val })
-    // }
-
-    if (val) {
-      setDataForm(state => ({ ...state, ts: val }))
-    }
-    let b1 = optionsel.findIndex(item => item.value == val)
-    if (date.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-      if (b1 == optionsel.length - 1) {
-        setDisabled(true)
-      } else {
-        setDisabled(false)
-      }
-    } else {
-      setDisabled(false)
-    }
-  }
-
-  const typeOptions = [
-    { label: '山洪', value: 'SH' },
-    { label: '水文', value: 'SW' },
-    { label: '气象', value: 'QX' },
-    { label: '水库', value: 'SK' }
-  ]
-
-  const handleTreeData = val => {
-    if (val.length > 0) {
-      val.map(item => {
-        item.value = item.adcd + item.adnm
-        item.title = item.adnm
-        if (item.children && item.children.length > 0) {
-          handleTreeData(item.children)
-        }
-      })
-    }
-  }
-
-  const [treeData, setTreeData] = useState(data.xzqh)
-  const [waterList, setWaterList] = useState(data.waterList)
-
-  // const getOpdata = () => {
-  //   const { t2 } = getTime()
-  //   let b1 =optionData.findIndex(item => item.value == t2)
-  //   if (b1 != -1) {
-  //     let b2 = optionData.slice(0, b1 + 1)
-  //     setPptionsel(b2)
-  //   }
-  // }
-
-  const onBtn = () => {
-    const { ...rec } = form.getFieldsValue()
-    let inx = 0
-    let a1 = optionData.findIndex(item => item.value == dataForm.ts)
-    if (a1 == optionsel.length - 1) {
-      inx = a1 + 1
-      setDataForm(state => ({
-        ...state,
-        ts: optionData[0].value
-      }))
-
-      if (date.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-        // getOpdata()
-        // const t2 = getMoment()
-        // let b1 = optionData.findIndex(item => item.value == t2)
-        // let b2 = optionData.slice(0, b1 + 1)
-        // setDisabled(true)
-        // setPptionsel(b2)
-      } else {
-        const tomorrow = dataForm.tm.add(1, 'days')
-
-        if (tomorrow.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-          console.log('tomorrow222dd', tomorrow)
-          // getOpdata()
-          getOption()
-        }
-      }
-    } else {
-      console.log('(a1 + 1(a1 + 1', a1, optionsel.length)
-      setDataForm(state => ({ ...state, ts: optionData[a1 + 1].value }))
-      if (dataForm.tm.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-        if (a1 == optionsel.length - 1) {
-          setDisabled(true)
-        } else {
-          setDisabled(false)
-        }
-      }
-    }
-
-    // setDataForm({ ts: optionData[a1 + 1].value })
-    console.log('a1,dataForm', a1, optionData)
-  }
-  const onPerBtn = () => {
-    const { ...rec } = form.getFieldsValue()
-    console.log('dataForm.ts=====', rec, dataForm.ts)
-
-    let inx = 0
-    let a1 = optionData.findIndex(item => item.value == dataForm.ts)
-
-    if (a1 != 0) {
-      inx = a1 - 1
-      let b = a1 != 0 ? optionData[a1 - 1].value : optionData[0].value
-      setDataForm(state => ({ ...state, ts: b }))
-    } else {
-      const yesterday = date.subtract(1, 'days')
-      inx = optionData.length - 1
-      setPptionsel(optionData)
-
-      setDataForm(state => ({
-        tm: yesterday,
-        ts: optionData[inx].value
-      }))
-
-      setDate(yesterday)
-
-      console.log('setDataFormsetDataFormsetDataFormsetDataForm', date)
-    }
-
-    if (a1 == optionData.length) {
-      setDisabled(true)
-    } else {
-      setDisabled(false)
-    }
-
-    // if (date.format('YYYYMMDD') == moment().format('YYYYMMDD')) {
-    //   console.log('ggggggggggg', a1)
-    //   setDisabled(true)
-    // } else {
-    //   console.log('bbbbbbbbb')
-    //   const yesterday = date.subtract(1, 'days')
-    //   inx = optionData.length - 1
-    //   setDate(yesterday)
-
-    //   setDataForm(state => ({ tm: yesterday, ts: optionData[inx].value }))
-
-    //   if (a1 == optionData.length) {
-    //     setDisabled(true)
-    //   } else {
-    //     setDisabled(false)
-    //   }
-    // }
-  }
-
-  return (
-    <>
-      <div
-        className='txyb24'
-        style={{ display: 'flex', justifyContent: 'space-between' }}
-      >
-        <Form
-          form={form}
-          // className='toolbarBox'
-          className='toolbarBox1'
-          initialValues={{
-            tm: moment()
-          }}
-        >
-          {/* <Form.Item label='类型' name='types' style={{ margin: '0 0 8px 0' }}>
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick} />
-          </Form.Item> */}
-
-          <Form.Item label='预报时间选择'>
-            <Space
-            // style={{ textAlign: 'center', lineHeight: '32px' }}
-            >
-              <Form.Item>
-                <Button
-                  value='small'
-                  icon={<LeftOutlined />}
-                  onClick={() => {
-                    onPerBtn()
-                  }}
-                />
-              </Form.Item>
-              <Form.Item>
-                <DatePicker
-                  allowClear
-                  // defaultValue={dayjs('2015-01-01', dateFormat)}
-                  value={moment(date, 'YYYY-MM-DD')}
-                  onChange={onSearchClick}
-                  format='YYYY-MM-DD'
-                  disabledDate={current => current > moment().endOf('day')}
-                />
-              </Form.Item>
-              <Form.Item>
-                <Select
-                  style={{
-                    width: 80
-                    // margin: '0 8px'
-                  }}
-                  value={dataForm.ts}
-                  onChange={onSearchClick1}
-                >
-                  {optionsel.map((item, index) => {
-                    return (
-                      <>
-                        <Option value={item.value} key={index}>
-                          {item.value}
-                        </Option>
-                      </>
-                    )
-                  })}
-                  {/* <Option value='08'>08:00</Option>
-                  <Option value='20'>20:00</Option> */}
-                </Select>
-              </Form.Item>
-
-              <Form.Item>
-                <Button
-                  value='small'
-                  icon={<RightOutlined />}
-                  disabled={disabled}
-                  onClick={() => {
-                    onBtn()
-                  }}
-                />
-              </Form.Item>
-            </Space>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/fxdd/tqyb/tqxx24/toolbar2.js b/src/views/fxdd/tqyb/tqxx24/toolbar2.js
deleted file mode 100644
index 9df174f..0000000
--- a/src/views/fxdd/tqyb/tqxx24/toolbar2.js
+++ /dev/null
@@ -1,186 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Button, DatePicker, Checkbox, TreeSelect, Select } from 'antd'
-import { getDictService } from '../../../../service/SelectValue'
-import { LeftOutlined, RightOutlined } from '@ant-design/icons'
-import { Space } from 'antd'
-import NormalSelect from '../../../../components/Form/NormalSelect'
-
-import moment from 'moment'
-import data from './dataConfig'
-import optiondata from '../../tqyb/tqxx2/mock'
-
-const { Option } = Select
-
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-
-const ToolBar = ({ search, downLoad }) => {
-  const [form] = Form.useForm()
-  const [optionsel, setPptionsel] = useState(optiondata.option)
-  const [disabled, setDisabled] = useState(false)
-
-  const [dataForm, setDataForm] = useState({
-    ts: ''
-  })
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-
-    if (rec.tm.format('YYYYMMDD') != moment().format('YYYYMMDD')) {
-      setDisabled(false)
-    } else {
-      setDisabled(true)
-    }
-    search({ ...rec, dataForm })
-  }
-
-  const onSearchClick1 = val => {
-    const { ...rec } = form.getFieldsValue()
-    if (val) {
-      setDataForm({ ts: val })
-    }
-    search(rec)
-  }
-
-  const onBtn = () => {
-    const { ...rec } = form.getFieldsValue()
-    console.log('onBtn,', dataForm)
-
-    let a1 = optiondata.option.findIndex(item => item.value == dataForm.ts)
-    setDataForm({ ts: optiondata.option[a1 + 1].value })
-  }
-  const onPerBtn = () => {
-    const { ...rec } = form.getFieldsValue()
-
-    let a1 = optiondata.option.findIndex(item => item.value == dataForm.ts)
-    setDataForm({ ts: optiondata.option[a1 - 1].value })
-  }
-
-  useEffect(() => {
-
-    const t = moment().toObject()
-    const th = t.hours
-    const tm = t.minutes
-    let t2 = null
-
-    if (tm < 30) {
-      // console.log('>>>>>>>>>>>', th - 1 + ':' + '30')
-      t2 = th - 1 + ':' + '30'
-    } else {
-      // console.log('<<<<<<<<<<<', th + ':' + '00')
-      t2 = th + ':' + '00'
-    }
-    let b1 = optiondata.option.findIndex(item => item.value == t2)
-    let b2 = optiondata.option.slice(1, b1 + 1)
-    setPptionsel(b2)
-    setDataForm({ ts: t2 })
-    setDisabled(true)
-  }, [])
-
-  useEffect(() => {
-    const { ...rec } = form.getFieldsValue()
-    search({ ...rec, dataForm })
-    console.log('useEffect,', dataForm)
-  }, [dataForm])
-
-  const typeOptions = [
-    { label: '山洪', value: 'SH' },
-    { label: '水文', value: 'SW' },
-    { label: '气象', value: 'QX' },
-    { label: '水库', value: 'SK' }
-  ]
-
-  const handleTreeData = val => {
-    if (val.length > 0) {
-      val.map(item => {
-        item.value = item.adcd + item.adnm
-        item.title = item.adnm
-        if (item.children && item.children.length > 0) {
-          handleTreeData(item.children)
-        }
-      })
-    }
-  }
-
-  const [treeData, setTreeData] = useState(data.xzqh)
-  const [waterList, setWaterList] = useState(data.waterList)
-
-  useEffect(() => {
-    handleTreeData(treeData)
-    setTreeData(treeData)
-
-    // form.setFieldsValue({ "tm": [moment().add(-1, 'day'), moment()] });
-  }, [])
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          initialValues={{
-            types: ['SH', 'SW', 'QX', 'SK'],
-            tm: moment(),
-            ts: '12:00'
-          }}
-        >
-          {/* <Form.Item label='类型' name='types' style={{ margin: '0 0 8px 0' }}>
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick} />
-          </Form.Item> */}
-          <Form.Item label='时段选择' style={{ margin: '0 0 8px 0' }}>
-            <Space style={{ textAlign: 'center', lineHeight: '32px' }}>
-              <Form.Item>
-                <Button
-                  value='small'
-                  icon={<LeftOutlined />}
-                  onClick={() => {
-                    onPerBtn()
-                  }}
-                />
-              </Form.Item>
-              <Form.Item name='tm'>
-                <DatePicker
-                  allowClear
-                  onChange={onSearchClick}
-                  format='YYYY-MM-DD'
-                  disabledDate={current => current > moment().endOf('day')}
-                />
-              </Form.Item>
-              <Form.Item>
-                <Select
-                  style={{ width: 100 }}
-                  value={dataForm.ts}
-                  onChange={onSearchClick1}
-                >
-                  {optionsel.map((item, index) => {
-                    return (
-                      <>
-                        <Option value={item.value} key={index}>
-                          {item.value}
-                        </Option>
-                      </>
-                    )
-                  })}
-                  {/* <Option value='20'>20:00</Option> */}
-                </Select>
-              </Form.Item>
-
-              <Form.Item>
-                <Button
-                  value='small'
-                  icon={<RightOutlined />}
-                  disabled={disabled}
-                  onClick={() => {
-                    onBtn()
-                  }}
-                />
-              </Form.Item>
-            </Space>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/fxdd/tqyb/tqxx72/dataConfig.js b/src/views/fxdd/tqyb/tqxx72/dataConfig.js
deleted file mode 100644
index 2f6b5cb..0000000
--- a/src/views/fxdd/tqyb/tqxx72/dataConfig.js
+++ /dev/null
@@ -1,4639 +0,0 @@
-export default {
-  xzqh: [
-    {
-      "adcd": "420529000000000",
-      "adnm": "五峰土家族自治县",
-      "pcount": 200000,
-      "htcount": 63880,
-      "ldarea": 2372,
-      "plarea": 28.8,
-      "prevtp": "0",
-      "lgtd": 110.670293,
-      "lttd": 30.201663,
-      "children": [
-        {
-          "adcd": "420529101000000",
-          "adnm": "五峰镇",
-          "pcount": 39881,
-          "htcount": 13699,
-          "ldarea": 456,
-          "prevtp": "0",
-          "lgtd": 110.64161,
-          "lttd": 30.184073,
-          "children": [
-            {
-              "adcd": "420529101001000",
-              "adnm": "北门社区",
-              "pcount": 3164,
-              "htcount": 1536,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.661896,
-              "lttd": 30.204225,
-              "children": [
-                {
-                  "adcd": "420529101001100",
-                  "adnm": "北门社区上",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.667857,
-                  "lttd": 30.204172
-                },
-                {
-                  "adcd": "420529101001101",
-                  "adnm": "北门社区中",
-                  "pcount": 1054,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.663659,
-                  "lttd": 30.205619
-                },
-                {
-                  "adcd": "420529101001102",
-                  "adnm": "北门社区下",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.662192,
-                  "lttd": 30.207136
-                }
-              ]
-            },
-            {
-              "adcd": "420529101002000",
-              "adnm": "正街社区",
-              "pcount": 4725,
-              "htcount": 2340,
-              "ldarea": 3.5,
-              "prevtp": "2",
-              "lgtd": 110.670643,
-              "lttd": 30.200895,
-              "children": []
-            },
-            {
-              "adcd": "420529101003000",
-              "adnm": "长坪社区",
-              "pcount": 5725,
-              "htcount": 2226,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.665503,
-              "lttd": 30.190297,
-              "children": [
-                {
-                  "adcd": "420529101003100",
-                  "adnm": "长坪上",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.66546,
-                  "lttd": 30.187869
-                },
-                {
-                  "adcd": "420529101003101",
-                  "adnm": "长坪下",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.670436,
-                  "lttd": 30.196018
-                }
-              ]
-            },
-            {
-              "adcd": "420529101201000",
-              "adnm": "石梁司村",
-              "pcount": 3012,
-              "htcount": 890,
-              "ldarea": 44,
-              "prevtp": "0",
-              "lgtd": 110.656911,
-              "lttd": 30.175933,
-              "children": [
-                {
-                  "adcd": "420529101201100",
-                  "adnm": "十三组(铁厂湾）",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18.05,
-                  "prevtp": "2",
-                  "lgtd": 110.606521,
-                  "lttd": 30.14701
-                },
-                {
-                  "adcd": "420529101201101",
-                  "adnm": "三组上（小汊湾）",
-                  "pcount": 536,
-                  "htcount": 145,
-                  "ldarea": 9.4,
-                  "prevtp": "2",
-                  "lgtd": 110.653196,
-                  "lttd": 30.171942
-                },
-                {
-                  "adcd": "420529101201102",
-                  "adnm": "二组（杨腊岭）",
-                  "pcount": 691,
-                  "htcount": 187,
-                  "ldarea": 10.5,
-                  "prevtp": "2",
-                  "lgtd": 110.660371,
-                  "lttd": 30.180565
-                },
-                {
-                  "adcd": "420529101201103",
-                  "adnm": "十二组",
-                  "pcount": 148,
-                  "htcount": 40,
-                  "ldarea": 6,
-                  "prevtp": "0",
-                  "lgtd": 110.623533,
-                  "lttd": 30.147948
-                },
-                {
-                  "adcd": "420529101201104",
-                  "adnm": "十五组",
-                  "pcount": 270,
-                  "htcount": 73,
-                  "ldarea": 8.05,
-                  "prevtp": "2",
-                  "lgtd": 110.647408,
-                  "lttd": 30.1812815
-                },
-                {
-                  "adcd": "420529101201105",
-                  "adnm": "三组下",
-                  "pcount": 520,
-                  "htcount": 140,
-                  "ldarea": 7.2,
-                  "prevtp": "2",
-                  "lgtd": 110.655473,
-                  "lttd": 30.176246
-                }
-              ]
-            },
-            {
-              "adcd": "420529101202000",
-              "adnm": "香东村",
-              "pcount": 2100,
-              "htcount": 625,
-              "ldarea": 14.6,
-              "prevtp": "0",
-              "lgtd": 110.684722,
-              "lttd": 30.195305,
-              "children": [
-                {
-                  "adcd": "420529101202100",
-                  "adnm": "七组（口子泉）",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 110.664549,
-                  "lttd": 30.208265
-                },
-                {
-                  "adcd": "420529101202101",
-                  "adnm": "八组（砂坪）",
-                  "pcount": 114,
-                  "htcount": 31,
-                  "ldarea": 10.3,
-                  "prevtp": "2",
-                  "lgtd": 110.677247,
-                  "lttd": 30.207814
-                },
-                {
-                  "adcd": "420529101202102",
-                  "adnm": "七组（天池河）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.658039,
-                  "lttd": 30.213228
-                }
-              ]
-            },
-            {
-              "adcd": "420529101203000",
-              "adnm": "小河村",
-              "pcount": 3446,
-              "htcount": 961,
-              "ldarea": 36,
-              "prevtp": "0",
-              "lgtd": 110.648435,
-              "lttd": 30.221484,
-              "children": [
-                {
-                  "adcd": "420529101203100",
-                  "adnm": "一组",
-                  "pcount": 620,
-                  "htcount": 167,
-                  "ldarea": 10,
-                  "prevtp": "1",
-                  "lgtd": 110.628695,
-                  "lttd": 30.218468
-                },
-                {
-                  "adcd": "420529101203101",
-                  "adnm": "十一组（前坪）",
-                  "pcount": 407,
-                  "htcount": 110,
-                  "ldarea": 14,
-                  "prevtp": "2",
-                  "lgtd": 110.593009,
-                  "lttd": 30.2113403
-                },
-                {
-                  "adcd": "420529101203102",
-                  "adnm": "七组",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18,
-                  "prevtp": "1",
-                  "lgtd": 110.606354,
-                  "lttd": 30.207401
-                }
-              ]
-            },
-            {
-              "adcd": "420529101204000",
-              "adnm": "楠木河村",
-              "pcount": 1526,
-              "htcount": 442,
-              "ldarea": 19.8,
-              "prevtp": "0",
-              "lgtd": 110.464955,
-              "lttd": 30.174449,
-              "children": [
-                {
-                  "adcd": "420529101204100",
-                  "adnm": "一组",
-                  "pcount": 220,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.661256,
-                  "lttd": 30.2369128
-                },
-                {
-                  "adcd": "420529101204101",
-                  "adnm": "三组",
-                  "pcount": 195,
-                  "htcount": 53,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.679309,
-                  "lttd": 30.2514761
-                }
-              ]
-            },
-            {
-              "adcd": "420529101205000",
-              "adnm": "水浕司村",
-              "pcount": 3320,
-              "htcount": 1045,
-              "ldarea": 36.6,
-              "prevtp": "0",
-              "lgtd": 110.627483,
-              "lttd": 30.248739,
-              "children": [
-                {
-                  "adcd": "420529101205100",
-                  "adnm": "二组（渡糟）",
-                  "pcount": 240,
-                  "htcount": 65,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.61626,
-                  "lttd": 30.2579
-                },
-                {
-                  "adcd": "420529101205101",
-                  "adnm": "四组",
-                  "pcount": 296,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.625852,
-                  "lttd": 30.238361
-                },
-                {
-                  "adcd": "420529101205102",
-                  "adnm": "六组",
-                  "pcount": 258,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.626089,
-                  "lttd": 30.249254
-                },
-                {
-                  "adcd": "420529101205103",
-                  "adnm": "三组",
-                  "pcount": 249,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.62251,
-                  "lttd": 30.249145
-                },
-                {
-                  "adcd": "420529101205104",
-                  "adnm": "一组（水浕司）",
-                  "pcount": 270,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.607703,
-                  "lttd": 30.266896
-                }
-              ]
-            },
-            {
-              "adcd": "420529101206000",
-              "adnm": "油菜坪",
-              "pcount": 650,
-              "htcount": 163,
-              "ldarea": 2.8,
-              "prevtp": "0",
-              "lgtd": 110.622123,
-              "lttd": 30.276306,
-              "children": [
-                {
-                  "adcd": "420529101206100",
-                  "adnm": "一组",
-                  "pcount": 340,
-                  "htcount": 87,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.611682,
-                  "lttd": 30.269515
-                }
-              ]
-            },
-            {
-              "adcd": "420529101207000",
-              "adnm": "黄粮坪村",
-              "pcount": 1217,
-              "htcount": 352,
-              "ldarea": 24.3,
-              "prevtp": "0",
-              "lgtd": 110.652169,
-              "lttd": 30.2798,
-              "children": [
-                {
-                  "adcd": "420529101207100",
-                  "adnm": "一组",
-                  "pcount": 302,
-                  "htcount": 95,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.642672,
-                  "lttd": 30.280247
-                }
-              ]
-            },
-            {
-              "adcd": "420529101208000",
-              "adnm": "谢家坪村",
-              "pcount": 2302,
-              "htcount": 644,
-              "ldarea": 23.2,
-              "prevtp": "0",
-              "lgtd": 110.58412,
-              "lttd": 30.299189,
-              "children": [
-                {
-                  "adcd": "420529101208100",
-                  "adnm": "三组",
-                  "pcount": 215,
-                  "htcount": 67,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592951,
-                  "lttd": 30.3194646
-                },
-                {
-                  "adcd": "420529101208101",
-                  "adnm": "五组",
-                  "pcount": 112,
-                  "htcount": 38,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.580078,
-                  "lttd": 30.279418
-                },
-                {
-                  "adcd": "420529101208102",
-                  "adnm": "八组",
-                  "pcount": 132,
-                  "htcount": 46,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.581833,
-                  "lttd": 30.298807
-                }
-              ]
-            },
-            {
-              "adcd": "420529101209000",
-              "adnm": "麦庄村",
-              "pcount": 2564,
-              "htcount": 729,
-              "ldarea": 30.5,
-              "prevtp": "0",
-              "lgtd": 110.552111,
-              "lttd": 30.292016,
-              "children": []
-            },
-            {
-              "adcd": "420529101210000",
-              "adnm": "怀抱窝村",
-              "pcount": 1764,
-              "htcount": 529,
-              "ldarea": 26.1,
-              "prevtp": "0",
-              "lgtd": 110.606024,
-              "lttd": 30.32805,
-              "children": [
-                {
-                  "adcd": "420529101210100",
-                  "adnm": "一组(竹桥）",
-                  "pcount": 83,
-                  "htcount": 25,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.595765,
-                  "lttd": 30.33814
-                },
-                {
-                  "adcd": "420529101210101",
-                  "adnm": "三组",
-                  "pcount": 129,
-                  "htcount": 35,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592862,
-                  "lttd": 30.3195735
-                }
-              ]
-            },
-            {
-              "adcd": "420529101211000",
-              "adnm": "茅坪村",
-              "pcount": 2711,
-              "htcount": 833,
-              "ldarea": 0,
-              "prevtp": "0",
-              "lgtd": 110.674183,
-              "lttd": 30.138689,
-              "children": [
-                {
-                  "adcd": "420529101211100",
-                  "adnm": "二组（万家田）",
-                  "pcount": 44,
-                  "htcount": 18,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.597656,
-                  "lttd": 30.089048
-                },
-                {
-                  "adcd": "420529101211101",
-                  "adnm": "三组",
-                  "pcount": 68,
-                  "htcount": 21,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.56665,
-                  "lttd": 30.0911
-                },
-                {
-                  "adcd": "420529101211102",
-                  "adnm": "六组（晏家坪）",
-                  "pcount": 118,
-                  "htcount": 32,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.719605,
-                  "lttd": 30.138661
-                },
-                {
-                  "adcd": "420529101211104",
-                  "adnm": "十组（茅坪）",
-                  "pcount": 159,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.669315,
-                  "lttd": 30.153423
-                },
-                {
-                  "adcd": "420529101211105",
-                  "adnm": "九组（茅坪）",
-                  "pcount": 318,
-                  "htcount": 86,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.674523,
-                  "lttd": 30.139839
-                },
-                {
-                  "adcd": "420529101211106",
-                  "adnm": "二组（老屋场）",
-                  "pcount": 40,
-                  "htcount": 12,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.621323,
-                  "lttd": 30.080742
-                }
-              ]
-            },
-            {
-              "adcd": "420529101212000",
-              "adnm": "长坡村",
-              "pcount": 1221,
-              "htcount": 384,
-              "ldarea": 51.5,
-              "prevtp": "0",
-              "lgtd": 110.727382,
-              "lttd": 30.072334,
-              "children": [
-                {
-                  "adcd": "420529101212100",
-                  "adnm": "四组",
-                  "pcount": 221,
-                  "htcount": 112,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.685538,
-                  "lttd": 30.078245
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529102000000",
-          "adnm": "长乐坪镇",
-          "pcount": 24902,
-          "htcount": 6908,
-          "ldarea": 374,
-          "prevtp": "0",
-          "lgtd": 110.817333,
-          "lttd": 30.187285,
-          "children": [
-            {
-              "adcd": "420529102001000",
-              "adnm": "长乐坪社区",
-              "pcount": 1450,
-              "htcount": 412,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.950819,
-              "lttd": 30.266553,
-              "children": []
-            },
-            {
-              "adcd": "420529102201000",
-              "adnm": "洞口村",
-              "pcount": 1686,
-              "htcount": 525,
-              "ldarea": 18.57,
-              "prevtp": "0",
-              "lgtd": 110.862146,
-              "lttd": 30.17035,
-              "children": [
-                {
-                  "adcd": "420529102201100",
-                  "adnm": "三组（洞口）",
-                  "pcount": 423,
-                  "htcount": 146,
-                  "ldarea": 6.22,
-                  "prevtp": "2",
-                  "lgtd": 110.84918,
-                  "lttd": 30.172821
-                },
-                {
-                  "adcd": "420529102201101",
-                  "adnm": "四组（滴淋冲）",
-                  "pcount": 354,
-                  "htcount": 101,
-                  "ldarea": 7.15,
-                  "prevtp": "1",
-                  "lgtd": 110.852646,
-                  "lttd": 30.166916
-                },
-                {
-                  "adcd": "420529102201102",
-                  "adnm": "一组（龟坪）",
-                  "pcount": 427,
-                  "htcount": 122,
-                  "ldarea": 7.07,
-                  "prevtp": "2",
-                  "lgtd": 110.863379,
-                  "lttd": 30.172428
-                },
-                {
-                  "adcd": "420529102201103",
-                  "adnm": "二组（洞口）",
-                  "pcount": 482,
-                  "htcount": 156,
-                  "ldarea": 6.13,
-                  "prevtp": "2",
-                  "lgtd": 110.859648,
-                  "lttd": 30.170953
-                }
-              ]
-            },
-            {
-              "adcd": "420529102202000",
-              "adnm": "腰牌村",
-              "pcount": 1607,
-              "htcount": 484,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 110.898742,
-              "lttd": 30.183227,
-              "children": [
-                {
-                  "adcd": "420529102202100",
-                  "adnm": "二组（腰牌）",
-                  "pcount": 377,
-                  "htcount": 112,
-                  "ldarea": 5.74,
-                  "prevtp": "2",
-                  "lgtd": 110.900312,
-                  "lttd": 30.181927
-                },
-                {
-                  "adcd": "420529102202101",
-                  "adnm": "三组（腰牌）",
-                  "pcount": 429,
-                  "htcount": 129,
-                  "ldarea": 5.95,
-                  "prevtp": "2",
-                  "lgtd": 110.891906,
-                  "lttd": 30.182658
-                },
-                {
-                  "adcd": "420529102202102",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 355,
-                  "htcount": 92,
-                  "ldarea": 5.67,
-                  "prevtp": "2",
-                  "lgtd": 110.884063,
-                  "lttd": 30.178409
-                },
-                {
-                  "adcd": "420529102202103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 446,
-                  "htcount": 151,
-                  "ldarea": 5.81,
-                  "prevtp": "2",
-                  "lgtd": 110.878992,
-                  "lttd": 30.174009
-                }
-              ]
-            },
-            {
-              "adcd": "420529102203000",
-              "adnm": "白岩坪村",
-              "pcount": 2576,
-              "htcount": 767,
-              "ldarea": 31.35,
-              "prevtp": "0",
-              "lgtd": 110.894666,
-              "lttd": 30.159786,
-              "children": [
-                {
-                  "adcd": "420529102203100",
-                  "adnm": "一组",
-                  "pcount": 1242,
-                  "htcount": 379,
-                  "ldarea": 16.98,
-                  "prevtp": "1",
-                  "lgtd": 110.926374,
-                  "lttd": 30.172706
-                },
-                {
-                  "adcd": "420529102203101",
-                  "adnm": "二组（白岩坪）",
-                  "pcount": 1334,
-                  "htcount": 388,
-                  "ldarea": 18.37,
-                  "prevtp": "1",
-                  "lgtd": 110.91441,
-                  "lttd": 30.173227
-                }
-              ]
-            },
-            {
-              "adcd": "420529102204000",
-              "adnm": "月山村",
-              "pcount": 1515,
-              "htcount": 422,
-              "ldarea": 25.29,
-              "prevtp": "0",
-              "lgtd": 110.899558,
-              "lttd": 30.127007,
-              "children": [
-                {
-                  "adcd": "420529102204100",
-                  "adnm": "三组（小河）",
-                  "pcount": 258,
-                  "htcount": 73,
-                  "ldarea": 6.98,
-                  "prevtp": "2",
-                  "lgtd": 110.891944,
-                  "lttd": 30.128185
-                },
-                {
-                  "adcd": "420529102204101",
-                  "adnm": "二组（高桥）",
-                  "pcount": 289,
-                  "htcount": 81,
-                  "ldarea": 7.13,
-                  "prevtp": "2",
-                  "lgtd": 110.912641,
-                  "lttd": 30.136977
-                },
-                {
-                  "adcd": "420529102204102",
-                  "adnm": "一组（曹家河）",
-                  "pcount": 325,
-                  "htcount": 89,
-                  "ldarea": 7.05,
-                  "prevtp": "2",
-                  "lgtd": 110.944037,
-                  "lttd": 30.139595
-                },
-                {
-                  "adcd": "420529102204103",
-                  "adnm": "六组",
-                  "pcount": 323,
-                  "htcount": 90,
-                  "ldarea": 7.13,
-                  "prevtp": "1",
-                  "lgtd": 110.921658,
-                  "lttd": 30.140975
-                },
-                {
-                  "adcd": "420529102204104",
-                  "adnm": "一组（邵家河）",
-                  "pcount": 320,
-                  "htcount": 89,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.935464,
-                  "lttd": 30.135935
-                }
-              ]
-            },
-            {
-              "adcd": "420529102205000",
-              "adnm": "苏家河村",
-              "pcount": 1483,
-              "htcount": 419,
-              "ldarea": 22.89,
-              "prevtp": "0",
-              "lgtd": 110.7719,
-              "lttd": 30.160052,
-              "children": [
-                {
-                  "adcd": "420529102205100",
-                  "adnm": "二组（苏家河）",
-                  "pcount": 348,
-                  "htcount": 96,
-                  "ldarea": 7.38,
-                  "prevtp": "2",
-                  "lgtd": 110.758849,
-                  "lttd": 30.151386
-                },
-                {
-                  "adcd": "420529102205101",
-                  "adnm": "三组（金家湾）",
-                  "pcount": 375,
-                  "htcount": 107,
-                  "ldarea": 7.82,
-                  "prevtp": "2",
-                  "lgtd": 110.769432,
-                  "lttd": 30.146094
-                },
-                {
-                  "adcd": "420529102205102",
-                  "adnm": "四组",
-                  "pcount": 362,
-                  "htcount": 103,
-                  "ldarea": 7.78,
-                  "prevtp": "1",
-                  "lgtd": 110.749224,
-                  "lttd": 30.143833
-                },
-                {
-                  "adcd": "420529102205103",
-                  "adnm": "一组",
-                  "pcount": 398,
-                  "htcount": 113,
-                  "ldarea": 7.91,
-                  "prevtp": "1",
-                  "lgtd": 110.781997,
-                  "lttd": 30.15012
-                }
-              ]
-            },
-            {
-              "adcd": "420529102206000",
-              "adnm": "甘沟村",
-              "pcount": 1728,
-              "htcount": 530,
-              "ldarea": 26.69,
-              "prevtp": "0",
-              "lgtd": 110.792784,
-              "lttd": 30.164572,
-              "children": [
-                {
-                  "adcd": "420529102206100",
-                  "adnm": "二组（高家坪）",
-                  "pcount": 402,
-                  "htcount": 123,
-                  "ldarea": 8.52,
-                  "prevtp": "2",
-                  "lgtd": 110.792131,
-                  "lttd": 30.14632
-                },
-                {
-                  "adcd": "420529102206101",
-                  "adnm": "一组（甘沟）",
-                  "pcount": 418,
-                  "htcount": 129,
-                  "ldarea": 8.38,
-                  "prevtp": "2",
-                  "lgtd": 110.802311,
-                  "lttd": 30.164633
-                },
-                {
-                  "adcd": "420529102206102",
-                  "adnm": "三组",
-                  "pcount": 453,
-                  "htcount": 135,
-                  "ldarea": 8.92,
-                  "prevtp": "1",
-                  "lgtd": 110.802988,
-                  "lttd": 30.151881
-                },
-                {
-                  "adcd": "420529102206103",
-                  "adnm": "五组（剪槽沟）",
-                  "pcount": 455,
-                  "htcount": 143,
-                  "ldarea": 8.87,
-                  "prevtp": "1",
-                  "lgtd": 110.829652,
-                  "lttd": 30.1611865
-                }
-              ]
-            },
-            {
-              "adcd": "420529102207000",
-              "adnm": "百年关村",
-              "pcount": 1805,
-              "htcount": 540,
-              "ldarea": 21.95,
-              "prevtp": "0",
-              "lgtd": 110.953275,
-              "lttd": 30.179524,
-              "children": []
-            },
-            {
-              "adcd": "420529102208000",
-              "adnm": "三教庙村",
-              "pcount": 2267,
-              "htcount": 690,
-              "ldarea": 31.79,
-              "prevtp": "0",
-              "lgtd": 110.893176,
-              "lttd": 30.200651,
-              "children": []
-            },
-            {
-              "adcd": "420529102209000",
-              "adnm": "柴埠溪村",
-              "pcount": 376,
-              "htcount": 123,
-              "ldarea": 9.52,
-              "prevtp": "0",
-              "lgtd": 110.933963,
-              "lttd": 30.228582,
-              "children": [
-                {
-                  "adcd": "420529102209100",
-                  "adnm": "二组（梯子口）",
-                  "pcount": 71,
-                  "htcount": 21,
-                  "ldarea": 3.77,
-                  "prevtp": "2",
-                  "lgtd": 110.947618,
-                  "lttd": 30.2309287
-                },
-                {
-                  "adcd": "420529102209101",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 73,
-                  "htcount": 23,
-                  "ldarea": 3.75,
-                  "prevtp": "1",
-                  "lgtd": 110.961822,
-                  "lttd": 30.2315995
-                },
-                {
-                  "adcd": "420529102209102",
-                  "adnm": "一组（陆家台）",
-                  "pcount": 77,
-                  "htcount": 25,
-                  "ldarea": 3.95,
-                  "prevtp": "2",
-                  "lgtd": 110.91351,
-                  "lttd": 30.231454
-                },
-                {
-                  "adcd": "420529102209103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 79,
-                  "htcount": 28,
-                  "ldarea": 4.14,
-                  "prevtp": "2",
-                  "lgtd": 110.974717,
-                  "lttd": 30.2239784
-                },
-                {
-                  "adcd": "420529102209104",
-                  "adnm": "三组（岩板铺子）",
-                  "pcount": 76,
-                  "htcount": 26,
-                  "ldarea": 3.91,
-                  "prevtp": "2",
-                  "lgtd": 110.929226,
-                  "lttd": 30.229398
-                }
-              ]
-            },
-            {
-              "adcd": "420529102210000",
-              "adnm": "青岩冲村",
-              "pcount": 2002,
-              "htcount": 560,
-              "ldarea": 40.51,
-              "prevtp": "0",
-              "lgtd": 110.782404,
-              "lttd": 30.185819,
-              "children": [
-                {
-                  "adcd": "420529102210100",
-                  "adnm": "四组（小林口）",
-                  "pcount": 986,
-                  "htcount": 266,
-                  "ldarea": 20.85,
-                  "prevtp": "2",
-                  "lgtd": 110.820876,
-                  "lttd": 30.202646
-                },
-                {
-                  "adcd": "420529102210102",
-                  "adnm": "六组（青岩冲）",
-                  "pcount": 1016,
-                  "htcount": 294,
-                  "ldarea": 23.66,
-                  "prevtp": "1",
-                  "lgtd": 110.781604,
-                  "lttd": 30.187083
-                }
-              ]
-            },
-            {
-              "adcd": "420529102211000",
-              "adnm": "桥坪村",
-              "pcount": 1198,
-              "htcount": 331,
-              "ldarea": 24.77,
-              "prevtp": "0",
-              "lgtd": 110.766741,
-              "lttd": 30.231465,
-              "children": [
-                {
-                  "adcd": "420529102211100",
-                  "adnm": "四组（桥坪）",
-                  "pcount": 258,
-                  "htcount": 71,
-                  "ldarea": 7.81,
-                  "prevtp": "2",
-                  "lgtd": 110.745652,
-                  "lttd": 30.233487
-                },
-                {
-                  "adcd": "420529102211101",
-                  "adnm": "六组（曹家湾）",
-                  "pcount": 349,
-                  "htcount": 95,
-                  "ldarea": 8.74,
-                  "prevtp": "2",
-                  "lgtd": 110.772836,
-                  "lttd": 30.236809
-                },
-                {
-                  "adcd": "420529102211102",
-                  "adnm": "五组（桥坪）",
-                  "pcount": 314,
-                  "htcount": 89,
-                  "ldarea": 8.55,
-                  "prevtp": "2",
-                  "lgtd": 110.752264,
-                  "lttd": 30.235366
-                },
-                {
-                  "adcd": "420529102211103",
-                  "adnm": "六组（凉水井）",
-                  "pcount": 277,
-                  "htcount": 76,
-                  "ldarea": 7.67,
-                  "prevtp": "2",
-                  "lgtd": 110.765834,
-                  "lttd": 30.236687
-                }
-              ]
-            },
-            {
-              "adcd": "420529102212000",
-              "adnm": "菖蒲溪村",
-              "pcount": 911,
-              "htcount": 282,
-              "ldarea": 36.28,
-              "prevtp": "0",
-              "lgtd": 110.777564,
-              "lttd": 30.237061,
-              "children": [
-                {
-                  "adcd": "420529102212100",
-                  "adnm": "四组（将军洞）",
-                  "pcount": 189,
-                  "htcount": 62,
-                  "ldarea": 10.15,
-                  "prevtp": "1",
-                  "lgtd": 110.812549,
-                  "lttd": 30.235984
-                },
-                {
-                  "adcd": "420529102212101",
-                  "adnm": "三组（岩屋垴）",
-                  "pcount": 246,
-                  "htcount": 71,
-                  "ldarea": 10.98,
-                  "prevtp": "2",
-                  "lgtd": 110.797305,
-                  "lttd": 30.238971
-                },
-                {
-                  "adcd": "420529102212102",
-                  "adnm": "二组（骆家坪）",
-                  "pcount": 233,
-                  "htcount": 69,
-                  "ldarea": 10.29,
-                  "prevtp": "2",
-                  "lgtd": 110.788782,
-                  "lttd": 30.237532
-                },
-                {
-                  "adcd": "420529102212103",
-                  "adnm": "一组（菖蒲溪）",
-                  "pcount": 243,
-                  "htcount": 80,
-                  "ldarea": 12.86,
-                  "prevtp": "2",
-                  "lgtd": 110.778274,
-                  "lttd": 30.238085
-                }
-              ]
-            },
-            {
-              "adcd": "420529102213000",
-              "adnm": "大湾村",
-              "pcount": 1052,
-              "htcount": 298,
-              "ldarea": 20.31,
-              "prevtp": "0",
-              "lgtd": 110.707941,
-              "lttd": 30.186264,
-              "children": []
-            },
-            {
-              "adcd": "420529102214000",
-              "adnm": "白鹿庄村",
-              "pcount": 1518,
-              "htcount": 432,
-              "ldarea": 21.58,
-              "prevtp": "0",
-              "lgtd": 110.729787,
-              "lttd": 30.19293,
-              "children": [
-                {
-                  "adcd": "420529102214100",
-                  "adnm": "三组（白鹿庄下）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735589,
-                  "lttd": 30.198371
-                },
-                {
-                  "adcd": "420529102214101",
-                  "adnm": "三组（白鹿庄上）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735173,
-                  "lttd": 30.201783
-                }
-              ]
-            },
-            {
-              "adcd": "420529102215000",
-              "adnm": "石桥沟村",
-              "pcount": 1192,
-              "htcount": 357,
-              "ldarea": 12.93,
-              "prevtp": "0",
-              "lgtd": 110.712097,
-              "lttd": 30.204806,
-              "children": []
-            },
-            {
-              "adcd": "420529102216000",
-              "adnm": "红鱼潭村",
-              "pcount": 940,
-              "htcount": 243,
-              "ldarea": 14.87,
-              "prevtp": "0",
-              "lgtd": 110.722212,
-              "lttd": 30.221909,
-              "children": [
-                {
-                  "adcd": "420529102216100",
-                  "adnm": "二组（下红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 121,
-                  "ldarea": 11.4,
-                  "prevtp": "2",
-                  "lgtd": 110.712448,
-                  "lttd": 30.220817
-                },
-                {
-                  "adcd": "420529102216101",
-                  "adnm": "二组（上红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 122,
-                  "ldarea": 7.5,
-                  "prevtp": "2",
-                  "lgtd": 110.714051,
-                  "lttd": 30.228049
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529103000000",
-          "adnm": "渔洋关镇",
-          "pcount": 45920,
-          "htcount": 17817,
-          "ldarea": 356,
-          "prevtp": "0",
-          "lgtd": 111.045286,
-          "lttd": 30.160398,
-          "children": [
-            {
-              "adcd": "420529103001000",
-              "adnm": "曹家坪社区",
-              "pcount": 5666,
-              "htcount": 2376,
-              "ldarea": 16.08,
-              "prevtp": "0",
-              "lgtd": 111.071315,
-              "lttd": 30.174626,
-              "children": [
-                {
-                  "adcd": "420529103001100",
-                  "adnm": "五组（松林坪）",
-                  "pcount": 368,
-                  "htcount": 111,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.033933,
-                  "lttd": 30.1556506
-                },
-                {
-                  "adcd": "420529103001101",
-                  "adnm": "四组（松林坪）",
-                  "pcount": 238,
-                  "htcount": 63,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.040689,
-                  "lttd": 30.1503546
-                },
-                {
-                  "adcd": "420529103001103",
-                  "adnm": "六组（松林坪）",
-                  "pcount": 335,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.039322,
-                  "lttd": 30.160644
-                },
-                {
-                  "adcd": "420529103001105",
-                  "adnm": "二组（曹家坪）",
-                  "pcount": 572,
-                  "htcount": 158,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064373,
-                  "lttd": 30.166271
-                },
-                {
-                  "adcd": "420529103001106",
-                  "adnm": "九组（(簸箕山)）",
-                  "pcount": 431,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052448,
-                  "lttd": 30.176902
-                },
-                {
-                  "adcd": "420529103001107",
-                  "adnm": "三组（青岗岭）",
-                  "pcount": 203,
-                  "htcount": 69,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.057881,
-                  "lttd": 30.156
-                }
-              ]
-            },
-            {
-              "adcd": "420529103002000",
-              "adnm": "大房坪社区",
-              "pcount": 6224,
-              "htcount": 2839,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 111.074047,
-              "lttd": 30.169517,
-              "children": [
-                {
-                  "adcd": "420529103002106",
-                  "adnm": "六组（李家坪）",
-                  "pcount": 337,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.107587,
-                  "lttd": 30.172462
-                },
-                {
-                  "adcd": "420529103002107",
-                  "adnm": "大房坪",
-                  "pcount": 3742,
-                  "htcount": 1761,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.076431,
-                  "lttd": 30.170897
-                },
-                {
-                  "adcd": "420529103002108",
-                  "adnm": "四组（城墙口）",
-                  "pcount": 331,
-                  "htcount": 90,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.095059,
-                  "lttd": 30.146079
-                },
-                {
-                  "adcd": "420529103002109",
-                  "adnm": "七组（麻溪冲）",
-                  "pcount": 287,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.104708,
-                  "lttd": 30.176352
-                },
-                {
-                  "adcd": "420529103002110",
-                  "adnm": "八组（麻溪冲）",
-                  "pcount": 655,
-                  "htcount": 221,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.096686,
-                  "lttd": 30.184931
-                }
-              ]
-            },
-            {
-              "adcd": "420529103003000",
-              "adnm": "桥河社区",
-              "pcount": 7415,
-              "htcount": 3338,
-              "ldarea": 18.36,
-              "prevtp": "0",
-              "lgtd": 111.083223,
-              "lttd": 30.182641,
-              "children": [
-                {
-                  "adcd": "420529103003100",
-                  "adnm": "花桥",
-                  "pcount": 2035,
-                  "htcount": 945,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064716,
-                  "lttd": 30.178022
-                },
-                {
-                  "adcd": "420529103003101",
-                  "adnm": "桥河",
-                  "pcount": 1372,
-                  "htcount": 590,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.092056,
-                  "lttd": 30.190173
-                },
-                {
-                  "adcd": "420529103003102",
-                  "adnm": "刘家坪",
-                  "pcount": 676,
-                  "htcount": 192,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.068048,
-                  "lttd": 30.203047
-                }
-              ]
-            },
-            {
-              "adcd": "420529103201000",
-              "adnm": "汉马池村",
-              "pcount": 4363,
-              "htcount": 1476,
-              "ldarea": 43.92,
-              "prevtp": "0",
-              "lgtd": 111.010216,
-              "lttd": 30.145828,
-              "children": [
-                {
-                  "adcd": "420529103201100",
-                  "adnm": "五组（千山）",
-                  "pcount": 301,
-                  "htcount": 85,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.972477,
-                  "lttd": 30.1393608
-                },
-                {
-                  "adcd": "420529103201101",
-                  "adnm": "四组（桥板洞）",
-                  "pcount": 207,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.001791,
-                  "lttd": 30.15045
-                },
-                {
-                  "adcd": "420529103201102",
-                  "adnm": "三组（桂花树）",
-                  "pcount": 377,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991827,
-                  "lttd": 30.150599
-                },
-                {
-                  "adcd": "420529103201103",
-                  "adnm": "一组（杨家坝子）",
-                  "pcount": 538,
-                  "htcount": 153,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.015634,
-                  "lttd": 30.137185
-                },
-                {
-                  "adcd": "420529103201104",
-                  "adnm": "六组（阮家洞）",
-                  "pcount": 191,
-                  "htcount": 51,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 110.963332,
-                  "lttd": 30.138323
-                },
-                {
-                  "adcd": "420529103201105",
-                  "adnm": "九组",
-                  "pcount": 544,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018838,
-                  "lttd": 30.188615
-                },
-                {
-                  "adcd": "420529103201107",
-                  "adnm": "七组（长冲子)",
-                  "pcount": 471,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.977879,
-                  "lttd": 30.171188
-                },
-                {
-                  "adcd": "420529103201108",
-                  "adnm": "十组（穿心店）",
-                  "pcount": 619,
-                  "htcount": 98,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.008591,
-                  "lttd": 30.176473
-                },
-                {
-                  "adcd": "420529103201109",
-                  "adnm": "二组（汉马池）",
-                  "pcount": 560,
-                  "htcount": 171,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.011178,
-                  "lttd": 30.156577
-                },
-                {
-                  "adcd": "420529103201110",
-                  "adnm": "九组（杨家湾）",
-                  "pcount": 550,
-                  "htcount": 120,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991313,
-                  "lttd": 30.198529
-                }
-              ]
-            },
-            {
-              "adcd": "420529103202000",
-              "adnm": "三房坪村",
-              "pcount": 3822,
-              "htcount": 1327,
-              "ldarea": 20.39,
-              "prevtp": "0",
-              "lgtd": 111.070836,
-              "lttd": 30.148837,
-              "children": [
-                {
-                  "adcd": "420529103202100",
-                  "adnm": "八组（樱桃山)",
-                  "pcount": 407,
-                  "htcount": 126,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052614,
-                  "lttd": 30.133604
-                },
-                {
-                  "adcd": "420529103202101",
-                  "adnm": "九组（樱桃山）",
-                  "pcount": 273,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.047375,
-                  "lttd": 30.134426
-                },
-                {
-                  "adcd": "420529103202102",
-                  "adnm": "七组（赶子坪）",
-                  "pcount": 349,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.063756,
-                  "lttd": 30.130336
-                },
-                {
-                  "adcd": "420529103202103",
-                  "adnm": "四组（砂滩口）",
-                  "pcount": 239,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.06732,
-                  "lttd": 30.133277
-                },
-                {
-                  "adcd": "420529103202104",
-                  "adnm": "一组(青屋树)",
-                  "pcount": 433,
-                  "htcount": 160,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.066485,
-                  "lttd": 30.155661
-                },
-                {
-                  "adcd": "420529103202105",
-                  "adnm": "三组（小河）",
-                  "pcount": 400,
-                  "htcount": 131,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.072293,
-                  "lttd": 30.141717
-                },
-                {
-                  "adcd": "420529103202106",
-                  "adnm": "七组（灌沟）",
-                  "pcount": 230,
-                  "htcount": 103,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.071064,
-                  "lttd": 30.134573
-                }
-              ]
-            },
-            {
-              "adcd": "420529103203000",
-              "adnm": "火田坑村",
-              "pcount": 1785,
-              "htcount": 604,
-              "ldarea": 32.21,
-              "prevtp": "0",
-              "lgtd": 110.928335,
-              "lttd": 30.251524,
-              "children": [
-                {
-                  "adcd": "420529103203103",
-                  "adnm": "四组（余堰子）",
-                  "pcount": 206,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.923367,
-                  "lttd": 30.256976
-                },
-                {
-                  "adcd": "420529103203104",
-                  "adnm": "七组（漩涡埫）",
-                  "pcount": 202,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.872437,
-                  "lttd": 30.247461
-                },
-                {
-                  "adcd": "420529103203105",
-                  "adnm": "四组（大坑埫）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.935343,
-                  "lttd": 30.263216
-                }
-              ]
-            },
-            {
-              "adcd": "420529103204000",
-              "adnm": "鞍山村",
-              "pcount": 1709,
-              "htcount": 636,
-              "ldarea": 20.78,
-              "prevtp": "0",
-              "lgtd": 110.985901,
-              "lttd": 30.274849,
-              "children": []
-            },
-            {
-              "adcd": "420529103205000",
-              "adnm": "涨水坪村",
-              "pcount": 1709,
-              "htcount": 616,
-              "ldarea": 15.96,
-              "prevtp": "0",
-              "lgtd": 111.016591,
-              "lttd": 30.263112,
-              "children": [
-                {
-                  "adcd": "420529103205100",
-                  "adnm": "二组（涨水坪下）",
-                  "pcount": 323,
-                  "htcount": 105,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018725,
-                  "lttd": 30.257364
-                },
-                {
-                  "adcd": "420529103205101",
-                  "adnm": "四组（茅葫山）",
-                  "pcount": 264,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.037879,
-                  "lttd": 30.270009
-                },
-                {
-                  "adcd": "420529103205102",
-                  "adnm": "六组（小龙潭）",
-                  "pcount": 334,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.010953,
-                  "lttd": 30.28058
-                },
-                {
-                  "adcd": "420529103205103",
-                  "adnm": "七组（云龙山）",
-                  "pcount": 247,
-                  "htcount": 68,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.013247,
-                  "lttd": 30.285109
-                },
-                {
-                  "adcd": "420529103205104",
-                  "adnm": "二组（涨水坪上）",
-                  "pcount": 300,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.019735,
-                  "lttd": 30.255388
-                }
-              ]
-            },
-            {
-              "adcd": "420529103206000",
-              "adnm": "王家坪村",
-              "pcount": 2372,
-              "htcount": 887,
-              "ldarea": 21,
-              "prevtp": "0",
-              "lgtd": 111.012233,
-              "lttd": 30.244419,
-              "children": [
-                {
-                  "adcd": "420529103206100",
-                  "adnm": "王家坪（五组）",
-                  "pcount": 389,
-                  "htcount": 122,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.007657,
-                  "lttd": 30.243316
-                },
-                {
-                  "adcd": "420529103206103",
-                  "adnm": "碓臼坑（九组）",
-                  "pcount": 297,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.030894,
-                  "lttd": 30.231012
-                },
-                {
-                  "adcd": "420529103206104",
-                  "adnm": "陈家埫（八组）",
-                  "pcount": 193,
-                  "htcount": 55,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.999815,
-                  "lttd": 30.236805
-                },
-                {
-                  "adcd": "420529103206106",
-                  "adnm": "史家坪（四组）",
-                  "pcount": 389,
-                  "htcount": 125,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.020009,
-                  "lttd": 30.234829
-                }
-              ]
-            },
-            {
-              "adcd": "420529103207000",
-              "adnm": "枚二冲村",
-              "pcount": 2406,
-              "htcount": 904,
-              "ldarea": 20.72,
-              "prevtp": "0",
-              "lgtd": 111.048321,
-              "lttd": 30.224802,
-              "children": []
-            },
-            {
-              "adcd": "420529103208000",
-              "adnm": "清水湾村",
-              "pcount": 1775,
-              "htcount": 603,
-              "ldarea": 37.11,
-              "prevtp": "0",
-              "lgtd": 110.965572,
-              "lttd": 30.080175,
-              "children": [
-                {
-                  "adcd": "420529103208100",
-                  "adnm": "四组（龙潭湾）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.932338,
-                  "lttd": 30.085706
-                },
-                {
-                  "adcd": "420529103208101",
-                  "adnm": "四组（唐黄坪）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.939173,
-                  "lttd": 30.082635
-                },
-                {
-                  "adcd": "420529103208102",
-                  "adnm": "六组（玉占花）",
-                  "pcount": 185,
-                  "htcount": 48,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.927351,
-                  "lttd": 30.111314
-                },
-                {
-                  "adcd": "420529103208103",
-                  "adnm": "四组（翻水洞）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.941731,
-                  "lttd": 30.084026
-                },
-                {
-                  "adcd": "420529103208104",
-                  "adnm": "一组（清水堰））",
-                  "pcount": 178,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.963492,
-                  "lttd": 30.0893062
-                },
-                {
-                  "adcd": "420529103208105",
-                  "adnm": "一组（清水湾）",
-                  "pcount": 178,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.96647,
-                  "lttd": 30.080914
-                },
-                {
-                  "adcd": "420529103208106",
-                  "adnm": "二组（下坪）",
-                  "pcount": 390,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.98068,
-                  "lttd": 30.073403
-                },
-                {
-                  "adcd": "420529103208107",
-                  "adnm": "四组（洈水）",
-                  "pcount": 300,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.94587,
-                  "lttd": 30.082252
-                },
-                {
-                  "adcd": "420529103208108",
-                  "adnm": "二组（上坪）",
-                  "pcount": 280,
-                  "htcount": 52,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.968959,
-                  "lttd": 30.075928
-                }
-              ]
-            },
-            {
-              "adcd": "420529103209000",
-              "adnm": "三板桥村",
-              "pcount": 1584,
-              "htcount": 538,
-              "ldarea": 28.56,
-              "prevtp": "0",
-              "lgtd": 110.987244,
-              "lttd": 30.101781,
-              "children": [
-                {
-                  "adcd": "420529103209100",
-                  "adnm": "八组（三板桥）",
-                  "pcount": 223,
-                  "htcount": 56,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.990816,
-                  "lttd": 30.100481
-                },
-                {
-                  "adcd": "420529103209101",
-                  "adnm": "五组（跑马岭）",
-                  "pcount": 143,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.993049,
-                  "lttd": 30.105093
-                },
-                {
-                  "adcd": "420529103209102",
-                  "adnm": "三组（云台观）",
-                  "pcount": 200,
-                  "htcount": 57,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.980796,
-                  "lttd": 30.122885
-                },
-                {
-                  "adcd": "420529103209103",
-                  "adnm": "一组（横溪河）",
-                  "pcount": 156,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.002633,
-                  "lttd": 30.124493
-                },
-                {
-                  "adcd": "420529103209104",
-                  "adnm": "九组（高家岭）",
-                  "pcount": 204,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.006308,
-                  "lttd": 30.093283
-                }
-              ]
-            },
-            {
-              "adcd": "420529103210000",
-              "adnm": "石柱山村",
-              "pcount": 1232,
-              "htcount": 430,
-              "ldarea": 11.22,
-              "prevtp": "0",
-              "lgtd": 111.030437,
-              "lttd": 30.108528,
-              "children": [
-                {
-                  "adcd": "420529103210100",
-                  "adnm": "一组（石柱山）",
-                  "pcount": 344,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.026903,
-                  "lttd": 30.113098
-                },
-                {
-                  "adcd": "420529103210101",
-                  "adnm": "黄土包",
-                  "pcount": 240,
-                  "htcount": 66,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.01604,
-                  "lttd": 30.124506
-                },
-                {
-                  "adcd": "420529103210102",
-                  "adnm": "四组（横溪河）",
-                  "pcount": 329,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014129,
-                  "lttd": 30.128574
-                }
-              ]
-            },
-            {
-              "adcd": "420529103211000",
-              "adnm": "沙埫村",
-              "pcount": 2002,
-              "htcount": 674,
-              "ldarea": 23.24,
-              "prevtp": "0",
-              "lgtd": 111.082426,
-              "lttd": 30.115336,
-              "children": []
-            },
-            {
-              "adcd": "420529103212000",
-              "adnm": "南河村",
-              "pcount": 1794,
-              "htcount": 569,
-              "ldarea": 30.34,
-              "prevtp": "0",
-              "lgtd": 111.069873,
-              "lttd": 30.066705,
-              "children": [
-                {
-                  "adcd": "420529103212100",
-                  "adnm": "杨木洞",
-                  "pcount": 452,
-                  "htcount": 128,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.076144,
-                  "lttd": 30.071189
-                },
-                {
-                  "adcd": "420529103212101",
-                  "adnm": "田家坪",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.041095,
-                  "lttd": 30.078329
-                },
-                {
-                  "adcd": "420529103212102",
-                  "adnm": "谦敬坪",
-                  "pcount": 326,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014608,
-                  "lttd": 30.077743
-                },
-                {
-                  "adcd": "420529103212103",
-                  "adnm": "郑家台",
-                  "pcount": 220,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.026223,
-                  "lttd": 30.082011
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529104000000",
-          "adnm": "仁和坪镇",
-          "pcount": 16117,
-          "htcount": 5069,
-          "ldarea": 199.46,
-          "prevtp": "0",
-          "lgtd": 111.242259,
-          "lttd": 30.104032,
-          "children": [
-            {
-              "adcd": "420529104001000",
-              "adnm": "仁和坪社区",
-              "pcount": 1247,
-              "htcount": 487,
-              "ldarea": 5,
-              "prevtp": "0",
-              "lgtd": 111.238323,
-              "lttd": 30.104003,
-              "children": []
-            },
-            {
-              "adcd": "420529104201000",
-              "adnm": "仁和坪村",
-              "pcount": 1653,
-              "htcount": 499,
-              "ldarea": 17.46,
-              "prevtp": "0",
-              "lgtd": 111.235606,
-              "lttd": 30.098939,
-              "children": [
-                {
-                  "adcd": "420529104201100",
-                  "adnm": "五组（檀木岗）",
-                  "pcount": 610,
-                  "htcount": 186,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.251975,
-                  "lttd": 30.099848
-                },
-                {
-                  "adcd": "420529104201101",
-                  "adnm": "五组（洋线沟）",
-                  "pcount": 40,
-                  "htcount": 6,
-                  "ldarea": 2.23,
-                  "prevtp": "2",
-                  "lgtd": 111.258799,
-                  "lttd": 30.094674
-                },
-                {
-                  "adcd": "420529104201102",
-                  "adnm": "六组（松林坑）",
-                  "pcount": 480,
-                  "htcount": 145,
-                  "ldarea": 7,
-                  "prevtp": "1",
-                  "lgtd": 111.267794,
-                  "lttd": 30.085327
-                },
-                {
-                  "adcd": "420529104201103",
-                  "adnm": "四组（杉林子）",
-                  "pcount": 493,
-                  "htcount": 155,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.250484,
-                  "lttd": 30.111344
-                },
-                {
-                  "adcd": "420529104201104",
-                  "adnm": "一组（王家湾）",
-                  "pcount": 30,
-                  "htcount": 7,
-                  "ldarea": 2.23,
-                  "prevtp": "1",
-                  "lgtd": 111.235377,
-                  "lttd": 30.089216
-                }
-              ]
-            },
-            {
-              "adcd": "420529104202000",
-              "adnm": "杨家埫村",
-              "pcount": 361,
-              "htcount": 128,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.224634,
-              "lttd": 30.10431,
-              "children": []
-            },
-            {
-              "adcd": "420529104203000",
-              "adnm": "枫香坪村",
-              "pcount": 718,
-              "htcount": 193,
-              "ldarea": 4.9,
-              "prevtp": "0",
-              "lgtd": 111.228783,
-              "lttd": 30.0674,
-              "children": [
-                {
-                  "adcd": "420529104203100",
-                  "adnm": "六组（水井坪）",
-                  "pcount": 351,
-                  "htcount": 85,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.260666,
-                  "lttd": 30.073385
-                },
-                {
-                  "adcd": "420529104203101",
-                  "adnm": "四组（简家坪）",
-                  "pcount": 82,
-                  "htcount": 25,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.209618,
-                  "lttd": 30.076108
-                },
-                {
-                  "adcd": "420529104203102",
-                  "adnm": "四组（枫香坪）",
-                  "pcount": 198,
-                  "htcount": 56,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.222942,
-                  "lttd": 30.0692433
-                },
-                {
-                  "adcd": "420529104203103",
-                  "adnm": "三组（剪刀溪）",
-                  "pcount": 87,
-                  "htcount": 27,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.216989,
-                  "lttd": 30.08405
-                }
-              ]
-            },
-            {
-              "adcd": "420529104204000",
-              "adnm": "罗汉淌",
-              "pcount": 300,
-              "htcount": 140,
-              "ldarea": 3,
-              "prevtp": "0",
-              "lgtd": 111.221815,
-              "lttd": 30.052427,
-              "children": []
-            },
-            {
-              "adcd": "420529104205000",
-              "adnm": "船山坪村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 111.266407,
-              "lttd": 30.057388,
-              "children": []
-            },
-            {
-              "adcd": "420529104206000",
-              "adnm": "梅坪村",
-              "pcount": 350,
-              "htcount": 128,
-              "ldarea": 1.76,
-              "prevtp": "0",
-              "lgtd": 111.301527,
-              "lttd": 30.064403,
-              "children": []
-            },
-            {
-              "adcd": "420529104207000",
-              "adnm": "业产坪村",
-              "pcount": 298,
-              "htcount": 285,
-              "ldarea": 5.8,
-              "prevtp": "0",
-              "lgtd": 111.292338,
-              "lttd": 30.111742,
-              "children": [
-                {
-                  "adcd": "420529104207100",
-                  "adnm": "四组（多竹溪）",
-                  "pcount": 85,
-                  "htcount": 22,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.304219,
-                  "lttd": 30.088104
-                },
-                {
-                  "adcd": "420529104207101",
-                  "adnm": "七组（杨树坳）",
-                  "pcount": 88,
-                  "htcount": 21,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.32324,
-                  "lttd": 30.119831
-                },
-                {
-                  "adcd": "420529104207102",
-                  "adnm": "四组（百担淌）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.316391,
-                  "lttd": 30.094219
-                },
-                {
-                  "adcd": "420529104207103",
-                  "adnm": "一组（业产坪）",
-                  "pcount": 85,
-                  "htcount": 75,
-                  "ldarea": 4.3,
-                  "prevtp": "1",
-                  "lgtd": 111.290478,
-                  "lttd": 30.109408
-                }
-              ]
-            },
-            {
-              "adcd": "420529104208000",
-              "adnm": "杨柳池村",
-              "pcount": 220,
-              "htcount": 82,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.281557,
-              "lttd": 30.126121,
-              "children": [
-                {
-                  "adcd": "420529104208100",
-                  "adnm": "四组（甘沟子）",
-                  "pcount": 220,
-                  "htcount": 82,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 111.318239,
-                  "lttd": 30.130386
-                }
-              ]
-            },
-            {
-              "adcd": "420529104209000",
-              "adnm": "林家坪村",
-              "pcount": 300,
-              "htcount": 85,
-              "ldarea": 2.1,
-              "prevtp": "0",
-              "lgtd": 111.229568,
-              "lttd": 30.136506,
-              "children": []
-            },
-            {
-              "adcd": "420529104210000",
-              "adnm": "大檀树村",
-              "pcount": 685,
-              "htcount": 206,
-              "ldarea": 12,
-              "prevtp": "0",
-              "lgtd": 111.169768,
-              "lttd": 30.128698,
-              "children": [
-                {
-                  "adcd": "420529104210100",
-                  "adnm": "四组（大堰）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.191456,
-                  "lttd": 30.140086
-                },
-                {
-                  "adcd": "420529104210102",
-                  "adnm": "二组（摊子坡）",
-                  "pcount": 280,
-                  "htcount": 83,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.178975,
-                  "lttd": 30.125395
-                },
-                {
-                  "adcd": "420529104210103",
-                  "adnm": "五组（余家坪）",
-                  "pcount": 195,
-                  "htcount": 58,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.181009,
-                  "lttd": 30.144807
-                }
-              ]
-            },
-            {
-              "adcd": "420529104211000",
-              "adnm": "升子坪村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 111.168879,
-              "lttd": 30.105211,
-              "children": []
-            },
-            {
-              "adcd": "420529104212000",
-              "adnm": "富裕冲村",
-              "pcount": 353,
-              "htcount": 121,
-              "ldarea": 1.62,
-              "prevtp": "0",
-              "lgtd": 111.143766,
-              "lttd": 30.117854,
-              "children": []
-            },
-            {
-              "adcd": "420529104213000",
-              "adnm": "桥梁村",
-              "pcount": 127,
-              "htcount": 31,
-              "ldarea": 2.7,
-              "prevtp": "0",
-              "lgtd": 111.101141,
-              "lttd": 30.108951,
-              "children": [
-                {
-                  "adcd": "420529104213100",
-                  "adnm": "一组（翻水坳）",
-                  "pcount": 11,
-                  "htcount": 3,
-                  "ldarea": 2.2,
-                  "prevtp": "1",
-                  "lgtd": 111.104619,
-                  "lttd": 30.115265
-                },
-                {
-                  "adcd": "420529104213101",
-                  "adnm": "六组（麒麟观）",
-                  "pcount": 20,
-                  "htcount": 4,
-                  "ldarea": 2.6,
-                  "prevtp": "1",
-                  "lgtd": 111.110327,
-                  "lttd": 30.08415
-                },
-                {
-                  "adcd": "420529104213102",
-                  "adnm": "一组（道家湾）",
-                  "pcount": 48,
-                  "htcount": 12,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.099774,
-                  "lttd": 30.118108
-                },
-                {
-                  "adcd": "420529104213103",
-                  "adnm": "四组（桥梁）",
-                  "pcount": 22,
-                  "htcount": 6,
-                  "ldarea": 2.5,
-                  "prevtp": "1",
-                  "lgtd": 111.102086,
-                  "lttd": 30.107225
-                },
-                {
-                  "adcd": "420529104213104",
-                  "adnm": "三组（流满沟)",
-                  "pcount": 26,
-                  "htcount": 6,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.082384,
-                  "lttd": 30.104546
-                }
-              ]
-            },
-            {
-              "adcd": "420529104214000",
-              "adnm": "大栗树村",
-              "pcount": 1680,
-              "htcount": 502,
-              "ldarea": 24,
-              "prevtp": "0",
-              "lgtd": 111.142519,
-              "lttd": 30.059065,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529105000000",
-          "adnm": "湾潭镇",
-          "pcount": 15721,
-          "htcount": 4650,
-          "ldarea": 295.53,
-          "plarea": 38929,
-          "prevtp": "0",
-          "lgtd": 110.425002,
-          "lttd": 30.050047,
-          "wscd": "HBWS000000002",
-          "children": [
-            {
-              "adcd": "420529105001000",
-              "adnm": "湾潭社区",
-              "pcount": 1313,
-              "htcount": 398,
-              "ldarea": 16.21,
-              "plarea": 1153,
-              "prevtp": "0",
-              "lgtd": 110.42388,
-              "lttd": 30.047864,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105001100",
-                  "adnm": "上街",
-                  "pcount": 249,
-                  "htcount": 74,
-                  "ldarea": 5.24,
-                  "plarea": 225,
-                  "prevtp": "2",
-                  "lgtd": 110.425785,
-                  "lttd": 30.053044,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001101",
-                  "adnm": "中街",
-                  "pcount": 285,
-                  "htcount": 86,
-                  "ldarea": 5.39,
-                  "plarea": 229,
-                  "prevtp": "2",
-                  "lgtd": 110.425614,
-                  "lttd": 30.048871,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001102",
-                  "adnm": "下街",
-                  "pcount": 291,
-                  "htcount": 88,
-                  "ldarea": 5.49,
-                  "plarea": 218,
-                  "prevtp": "2",
-                  "lgtd": 110.427007,
-                  "lttd": 30.041187,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001103",
-                  "adnm": "四组",
-                  "pcount": 300,
-                  "htcount": 94,
-                  "ldarea": 5.68,
-                  "plarea": 289,
-                  "prevtp": "2",
-                  "lgtd": 110.435104,
-                  "lttd": 30.057728,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001104",
-                  "adnm": "三组（黄家湾上）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.2,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.421384,
-                  "lttd": 30.061152,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001105",
-                  "adnm": "三组（黄家湾下）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.21,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.423788,
-                  "lttd": 30.052927,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105201000",
-              "adnm": "龙桥村",
-              "pcount": 1806,
-              "htcount": 524,
-              "ldarea": 21.15,
-              "plarea": 2719,
-              "prevtp": "0",
-              "lgtd": 110.427125,
-              "lttd": 30.034791,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105201100",
-                  "adnm": "五组（田家坪）",
-                  "pcount": 424,
-                  "htcount": 124,
-                  "ldarea": 6.96,
-                  "plarea": 632,
-                  "prevtp": "2",
-                  "lgtd": 110.425186,
-                  "lttd": 30.030705,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201101",
-                  "adnm": "二组（胡家坪）",
-                  "pcount": 386,
-                  "htcount": 113,
-                  "ldarea": 6.52,
-                  "plarea": 576,
-                  "prevtp": "2",
-                  "lgtd": 110.439722,
-                  "lttd": 30.055551,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201102",
-                  "adnm": "三组",
-                  "pcount": 361,
-                  "htcount": 106,
-                  "ldarea": 6.24,
-                  "plarea": 540,
-                  "prevtp": "1",
-                  "lgtd": 110.457203,
-                  "lttd": 30.049073,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201103",
-                  "adnm": "四组（覃家坪）",
-                  "pcount": 340,
-                  "htcount": 100,
-                  "ldarea": 6,
-                  "plarea": 510,
-                  "prevtp": "2",
-                  "lgtd": 110.430404,
-                  "lttd": 30.036725,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201104",
-                  "adnm": "一组（八里铺）",
-                  "pcount": 295,
-                  "htcount": 81,
-                  "ldarea": 5.43,
-                  "plarea": 461,
-                  "prevtp": "2",
-                  "lgtd": 110.458963,
-                  "lttd": 30.074837,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201105",
-                  "adnm": "二组（白果湾）",
-                  "pcount": 193,
-                  "htcount": 56,
-                  "ldarea": 4.26,
-                  "plarea": 288,
-                  "prevtp": "2",
-                  "lgtd": 110.436559,
-                  "lttd": 30.051893,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105202000",
-              "adnm": "九门村",
-              "pcount": 1191,
-              "htcount": 330,
-              "ldarea": 27.38,
-              "plarea": 3720,
-              "prevtp": "0",
-              "lgtd": 110.424995,
-              "lttd": 29.994538,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105202100",
-                  "adnm": "四组",
-                  "pcount": 187,
-                  "htcount": 52,
-                  "ldarea": 4.66,
-                  "prevtp": "1",
-                  "lgtd": 111.019734,
-                  "lttd": 30.038212
-                },
-                {
-                  "adcd": "420529105202101",
-                  "adnm": "三组（大岭）",
-                  "pcount": 170,
-                  "htcount": 46,
-                  "ldarea": 4.38,
-                  "prevtp": "1",
-                  "lgtd": 110.466198,
-                  "lttd": 30.017541
-                }
-              ]
-            },
-            {
-              "adcd": "420529105203000",
-              "adnm": "小凤池村",
-              "pcount": 1236,
-              "htcount": 362,
-              "ldarea": 17.03,
-              "plarea": 3512,
-              "prevtp": "0",
-              "lgtd": 110.39745,
-              "lttd": 30.054112,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105203100",
-                  "adnm": "三组（横渡口）",
-                  "pcount": 870,
-                  "htcount": 256,
-                  "ldarea": 14.12,
-                  "plarea": 2484,
-                  "prevtp": "2",
-                  "lgtd": 110.397542,
-                  "lttd": 30.052772,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203102",
-                  "adnm": "二组（小凤池上）",
-                  "pcount": 186,
-                  "htcount": 56,
-                  "ldarea": 4.51,
-                  "plarea": 528,
-                  "prevtp": "2",
-                  "lgtd": 110.41154,
-                  "lttd": 30.032823,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203103",
-                  "adnm": "二组（小凤池下）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 4.4,
-                  "plarea": 500,
-                  "prevtp": "2",
-                  "lgtd": 110.406546,
-                  "lttd": 30.024965,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105204000",
-              "adnm": "茅庄村",
-              "pcount": 1668,
-              "htcount": 489,
-              "ldarea": 65.77,
-              "plarea": 1947,
-              "prevtp": "0",
-              "lgtd": 110.481058,
-              "lttd": 30.081057,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105204100",
-                  "adnm": "五组（三板桥）",
-                  "pcount": 119,
-                  "htcount": 35,
-                  "ldarea": 6.69,
-                  "plarea": 138,
-                  "prevtp": "1",
-                  "lgtd": 110.385549,
-                  "lttd": 30.084092,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204101",
-                  "adnm": "四组（三峰岗）",
-                  "pcount": 139,
-                  "htcount": 41,
-                  "ldarea": 7.49,
-                  "plarea": 159,
-                  "prevtp": "1",
-                  "lgtd": 110.456626,
-                  "lttd": 30.106181,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204103",
-                  "adnm": "一组（土坪）",
-                  "pcount": 187,
-                  "htcount": 55,
-                  "ldarea": 9.37,
-                  "plarea": 214,
-                  "prevtp": "1",
-                  "lgtd": 110.510515,
-                  "lttd": 30.127021,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204104",
-                  "adnm": "二组（横河）",
-                  "pcount": 214,
-                  "htcount": 63,
-                  "ldarea": 10.44,
-                  "plarea": 246,
-                  "prevtp": "2",
-                  "lgtd": 110.47501,
-                  "lttd": 30.097844,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204105",
-                  "adnm": "三组（关岔口）",
-                  "pcount": 197,
-                  "htcount": 58,
-                  "ldarea": 9.77,
-                  "plarea": 226,
-                  "prevtp": "2",
-                  "lgtd": 110.47866,
-                  "lttd": 30.080996,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204106",
-                  "adnm": "二组（茅庄）",
-                  "pcount": 289,
-                  "htcount": 85,
-                  "ldarea": 13.39,
-                  "plarea": 332,
-                  "prevtp": "2",
-                  "lgtd": 110.487741,
-                  "lttd": 30.117695,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105205000",
-              "adnm": "红烈村",
-              "pcount": 1743,
-              "htcount": 545,
-              "ldarea": 18.88,
-              "plarea": 3378,
-              "prevtp": "0",
-              "lgtd": 110.402328,
-              "lttd": 30.018152,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105205100",
-                  "adnm": "二组（红旗1）",
-                  "pcount": 105,
-                  "htcount": 34,
-                  "ldarea": 3.18,
-                  "plarea": 200,
-                  "prevtp": "2",
-                  "lgtd": 110.403549,
-                  "lttd": 30.021536,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205101",
-                  "adnm": "二组（红旗2）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 3,
-                  "plarea": 190,
-                  "prevtp": "2",
-                  "lgtd": 110.403766,
-                  "lttd": 30.016641,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205102",
-                  "adnm": "三组(幺牌）",
-                  "pcount": 318,
-                  "htcount": 91,
-                  "ldarea": 5.09,
-                  "plarea": 555,
-                  "prevtp": "2",
-                  "lgtd": 110.407947,
-                  "lttd": 30.013943,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205103",
-                  "adnm": "一组（龚家坪）",
-                  "pcount": 89,
-                  "htcount": 23,
-                  "ldarea": 2.78,
-                  "plarea": 140,
-                  "prevtp": "1",
-                  "lgtd": 110.370446,
-                  "lttd": 30.04961,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105206000",
-              "adnm": "红旗坪村",
-              "pcount": 1006,
-              "htcount": 308,
-              "ldarea": 19,
-              "plarea": 1998,
-              "prevtp": "0",
-              "lgtd": 110.396358,
-              "lttd": 30.002951,
-              "wscd": "HBWS000000002",
-              "children": []
-            },
-            {
-              "adcd": "420529105207000",
-              "adnm": "三台坡村",
-              "pcount": 784,
-              "htcount": 240,
-              "ldarea": 33.06,
-              "plarea": 3637,
-              "prevtp": "0",
-              "lgtd": 110.348317,
-              "lttd": 30.078608,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105207100",
-                  "adnm": "三组",
-                  "pcount": 144,
-                  "htcount": 45,
-                  "ldarea": 9.68,
-                  "plarea": 675,
-                  "prevtp": "1",
-                  "lgtd": 110.348484,
-                  "lttd": 30.077671,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105207101",
-                  "adnm": "二组",
-                  "pcount": 381,
-                  "htcount": 118,
-                  "ldarea": 19.28,
-                  "plarea": 1770,
-                  "prevtp": "1",
-                  "lgtd": 110.353433,
-                  "lttd": 30.090529,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105208000",
-              "adnm": "锁山金村",
-              "pcount": 1944,
-              "htcount": 550,
-              "ldarea": 24.27,
-              "prevtp": "0",
-              "lgtd": 110.310285,
-              "lttd": 29.967872,
-              "children": [
-                {
-                  "adcd": "420529105208100",
-                  "adnm": "一组（岗坪）",
-                  "pcount": 196,
-                  "htcount": 56,
-                  "ldarea": 2.47,
-                  "prevtp": "0",
-                  "lgtd": 110.310224,
-                  "lttd": 29.966106
-                },
-                {
-                  "adcd": "420529105208101",
-                  "adnm": "四组（大树垭）",
-                  "pcount": 252,
-                  "htcount": 72,
-                  "ldarea": 2.69,
-                  "prevtp": "0",
-                  "lgtd": 110.335138,
-                  "lttd": 29.976205
-                },
-                {
-                  "adcd": "420529105208102",
-                  "adnm": "二组",
-                  "pcount": 161,
-                  "htcount": 46,
-                  "ldarea": 1.71,
-                  "prevtp": "0",
-                  "lgtd": 110.30384,
-                  "lttd": 29.960653
-                }
-              ]
-            },
-            {
-              "adcd": "420529105209000",
-              "adnm": "茶园村",
-              "pcount": 956,
-              "htcount": 445,
-              "ldarea": 22.25,
-              "prevtp": "0",
-              "lgtd": 110.321912,
-              "lttd": 30.00915,
-              "children": []
-            },
-            {
-              "adcd": "420529105210000",
-              "adnm": "鹿耳庄村",
-              "pcount": 1588,
-              "htcount": 462,
-              "ldarea": 22.5,
-              "plarea": 2025,
-              "prevtp": "0",
-              "lgtd": 110.362793,
-              "lttd": 29.995701,
-              "wscd": "HBWS000000002",
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529201000000",
-          "adnm": "付家堰乡",
-          "pcount": 17205,
-          "htcount": 5427,
-          "ldarea": 92.28,
-          "prevtp": "0",
-          "lgtd": 110.487421,
-          "lttd": 30.349922,
-          "children": [
-            {
-              "adcd": "420529201001000",
-              "adnm": "付家堰社区",
-              "pcount": 386,
-              "htcount": 168,
-              "ldarea": 5.68,
-              "prevtp": "2",
-              "lgtd": 110.478735,
-              "lttd": 30.3065179,
-              "children": []
-            },
-            {
-              "adcd": "420529201201000",
-              "adnm": "付家堰村",
-              "pcount": 2492,
-              "htcount": 775,
-              "ldarea": 5.84,
-              "prevtp": "0",
-              "lgtd": 110.480256,
-              "lttd": 30.307638,
-              "children": [
-                {
-                  "adcd": "420529201201101",
-                  "adnm": "一组（饶家湾）",
-                  "pcount": 410,
-                  "htcount": 122,
-                  "ldarea": 2.95,
-                  "prevtp": "2",
-                  "lgtd": 110.473528,
-                  "lttd": 30.3011483
-                },
-                {
-                  "adcd": "420529201201102",
-                  "adnm": "六组（排山）",
-                  "pcount": 392,
-                  "htcount": 131,
-                  "ldarea": 2.81,
-                  "prevtp": "1",
-                  "lgtd": 110.456762,
-                  "lttd": 30.2860972
-                },
-                {
-                  "adcd": "420529201201103",
-                  "adnm": "一组（段沟）",
-                  "pcount": 450,
-                  "htcount": 420,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.479115,
-                  "lttd": 30.304886
-                }
-              ]
-            },
-            {
-              "adcd": "420529201202000",
-              "adnm": "火山村",
-              "pcount": 1996,
-              "htcount": 605,
-              "ldarea": 11.46,
-              "prevtp": "0",
-              "lgtd": 110.469095,
-              "lttd": 30.319452,
-              "children": [
-                {
-                  "adcd": "420529201202100",
-                  "adnm": "二组",
-                  "pcount": 402,
-                  "htcount": 122,
-                  "ldarea": 4.33,
-                  "prevtp": "1",
-                  "lgtd": 110.469635,
-                  "lttd": 30.3418893
-                },
-                {
-                  "adcd": "420529201202101",
-                  "adnm": "三组",
-                  "pcount": 382,
-                  "htcount": 113,
-                  "ldarea": 4.2,
-                  "prevtp": "1",
-                  "lgtd": 110.463773,
-                  "lttd": 30.3235754
-                },
-                {
-                  "adcd": "420529201202102",
-                  "adnm": "五组（毛沟湾）",
-                  "pcount": 361,
-                  "htcount": 128,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.461409,
-                  "lttd": 30.307311
-                },
-                {
-                  "adcd": "420529201202103",
-                  "adnm": "五组（桂竹溪）",
-                  "pcount": 360,
-                  "htcount": 120,
-                  "ldarea": 4,
-                  "prevtp": "2",
-                  "lgtd": 110.463332,
-                  "lttd": 30.306439
-                }
-              ]
-            },
-            {
-              "adcd": "420529201203000",
-              "adnm": "马蹄井村",
-              "pcount": 1624,
-              "htcount": 458,
-              "ldarea": 14.07,
-              "prevtp": "0",
-              "lgtd": 110.443532,
-              "lttd": 30.3156,
-              "children": [
-                {
-                  "adcd": "420529201203100",
-                  "adnm": "张家池",
-                  "pcount": 310,
-                  "htcount": 92,
-                  "ldarea": 4.82,
-                  "prevtp": "1",
-                  "lgtd": 110.438819,
-                  "lttd": 30.3408115
-                },
-                {
-                  "adcd": "420529201203101",
-                  "adnm": "一组（岩板上）",
-                  "pcount": 330,
-                  "htcount": 112,
-                  "ldarea": 5.02,
-                  "prevtp": "2",
-                  "lgtd": 110.453829,
-                  "lttd": 30.336959
-                },
-                {
-                  "adcd": "420529201203102",
-                  "adnm": "一组（李家埫）",
-                  "pcount": 200,
-                  "htcount": 82,
-                  "ldarea": 4.35,
-                  "prevtp": "2",
-                  "lgtd": 110.449439,
-                  "lttd": 30.33028
-                },
-                {
-                  "adcd": "420529201203103",
-                  "adnm": "一组（陈家沟）",
-                  "pcount": 210,
-                  "htcount": 78,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.450861,
-                  "lttd": 30.32628
-                }
-              ]
-            },
-            {
-              "adcd": "420529201204000",
-              "adnm": "田家山村",
-              "pcount": 1326,
-              "htcount": 458,
-              "ldarea": 9.19,
-              "prevtp": "0",
-              "lgtd": 110.4688,
-              "lttd": 30.391132,
-              "children": [
-                {
-                  "adcd": "420529201204100",
-                  "adnm": "一组",
-                  "pcount": 420,
-                  "htcount": 130,
-                  "ldarea": 4.29,
-                  "prevtp": "1",
-                  "lgtd": 110.436456,
-                  "lttd": 30.350601
-                }
-              ]
-            },
-            {
-              "adcd": "420529201205000",
-              "adnm": "左泉洞村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 110.491354,
-              "lttd": 30.38796,
-              "children": [
-                {
-                  "adcd": "420529201205100",
-                  "adnm": "二组（莲蓬溪）",
-                  "pcount": 350,
-                  "htcount": 128,
-                  "ldarea": 3.76,
-                  "prevtp": "2",
-                  "lgtd": 110.485923,
-                  "lttd": 30.404639
-                },
-                {
-                  "adcd": "420529201205101",
-                  "adnm": "五组（炉子坡）",
-                  "pcount": 282,
-                  "htcount": 110,
-                  "ldarea": 3.56,
-                  "prevtp": "1",
-                  "lgtd": 110.503146,
-                  "lttd": 30.3823
-                }
-              ]
-            },
-            {
-              "adcd": "420529201206000",
-              "adnm": "大龙坪村",
-              "pcount": 1784,
-              "htcount": 545,
-              "ldarea": 7.41,
-              "prevtp": "0",
-              "lgtd": 110.471902,
-              "lttd": 30.36017,
-              "children": [
-                {
-                  "adcd": "420529201206100",
-                  "adnm": "三组（刘家湾)",
-                  "pcount": 412,
-                  "htcount": 154,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.468727,
-                  "lttd": 30.357258
-                },
-                {
-                  "adcd": "420529201206101",
-                  "adnm": "二组（大龙坪）",
-                  "pcount": 421,
-                  "htcount": 160,
-                  "ldarea": 3.83,
-                  "prevtp": "2",
-                  "lgtd": 110.470463,
-                  "lttd": 30.363806
-                },
-                {
-                  "adcd": "420529201206102",
-                  "adnm": "三组（冲门沟）",
-                  "pcount": 364,
-                  "htcount": 155,
-                  "ldarea": 3.65,
-                  "prevtp": "2",
-                  "lgtd": 110.469068,
-                  "lttd": 30.365667
-                }
-              ]
-            },
-            {
-              "adcd": "420529201207000",
-              "adnm": "白庙村",
-              "pcount": 1685,
-              "htcount": 532,
-              "ldarea": 11.54,
-              "prevtp": "0",
-              "lgtd": 110.50056,
-              "lttd": 30.31767,
-              "children": [
-                {
-                  "adcd": "420529201207100",
-                  "adnm": "五组（八坪）",
-                  "pcount": 282,
-                  "htcount": 89,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.505149,
-                  "lttd": 30.306069
-                },
-                {
-                  "adcd": "420529201207101",
-                  "adnm": "六组（八坪）",
-                  "pcount": 281,
-                  "htcount": 105,
-                  "ldarea": 1.78,
-                  "prevtp": "0",
-                  "lgtd": 110.507719,
-                  "lttd": 30.30555
-                },
-                {
-                  "adcd": "420529201207102",
-                  "adnm": "一组（白庙聚宝石）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 3.1,
-                  "prevtp": "2",
-                  "lgtd": 110.517796,
-                  "lttd": 30.34481
-                },
-                {
-                  "adcd": "420529201207103",
-                  "adnm": "四组（果坪埫2）",
-                  "pcount": 168,
-                  "htcount": 48,
-                  "ldarea": 3.04,
-                  "prevtp": "2",
-                  "lgtd": 110.495698,
-                  "lttd": 30.315614
-                },
-                {
-                  "adcd": "420529201207105",
-                  "adnm": "三组（白庙）",
-                  "pcount": 150,
-                  "htcount": 48,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.503506,
-                  "lttd": 30.319506
-                },
-                {
-                  "adcd": "420529201207106",
-                  "adnm": "一组（白庙黑潭河）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 3.05,
-                  "prevtp": "2",
-                  "lgtd": 110.500862,
-                  "lttd": 30.32349
-                },
-                {
-                  "adcd": "420529201207107",
-                  "adnm": "四组（果坪埫1）",
-                  "pcount": 100,
-                  "htcount": 40,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.496291,
-                  "lttd": 30.295625
-                }
-              ]
-            },
-            {
-              "adcd": "420529201208000",
-              "adnm": "鸭儿坪村",
-              "pcount": 2458,
-              "htcount": 810,
-              "ldarea": 14.48,
-              "prevtp": "0",
-              "lgtd": 110.523218,
-              "lttd": 30.37112,
-              "children": [
-                {
-                  "adcd": "420529201208100",
-                  "adnm": "一组（廖家湾）",
-                  "pcount": 512,
-                  "htcount": 162,
-                  "ldarea": 5.06,
-                  "prevtp": "2",
-                  "lgtd": 110.522115,
-                  "lttd": 30.369879
-                },
-                {
-                  "adcd": "420529201208101",
-                  "adnm": "三组",
-                  "pcount": 525,
-                  "htcount": 170,
-                  "ldarea": 5.24,
-                  "prevtp": "1",
-                  "lgtd": 110.535948,
-                  "lttd": 30.387679
-                }
-              ]
-            },
-            {
-              "adcd": "420529201209000",
-              "adnm": "桥料村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 110.543481,
-              "lttd": 30.369273,
-              "children": [
-                {
-                  "adcd": "420529201209100",
-                  "adnm": "四组（蒿坪）",
-                  "pcount": 353,
-                  "htcount": 121,
-                  "ldarea": 3.62,
-                  "prevtp": "2",
-                  "lgtd": 110.548285,
-                  "lttd": 30.358664
-                },
-                {
-                  "adcd": "420529201209101",
-                  "adnm": "六组（柞房湾）",
-                  "pcount": 386,
-                  "htcount": 116,
-                  "ldarea": 3.61,
-                  "prevtp": "2",
-                  "lgtd": 110.533869,
-                  "lttd": 30.358174
-                },
-                {
-                  "adcd": "420529201209102",
-                  "adnm": "五组（赛宝）",
-                  "pcount": 319,
-                  "htcount": 110,
-                  "ldarea": 3.52,
-                  "prevtp": "1",
-                  "lgtd": 110.546802,
-                  "lttd": 30.3667211
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529202000000",
-          "adnm": "牛庄乡",
-          "pcount": 7383,
-          "htcount": 2182,
-          "ldarea": 154,
-          "prevtp": "0",
-          "lgtd": 110.353576,
-          "lttd": 30.226665,
-          "children": [
-            {
-              "adcd": "420529202201000",
-              "adnm": "牛庄村",
-              "pcount": 1425,
-              "htcount": 401,
-              "ldarea": 27.81,
-              "prevtp": "0",
-              "lgtd": 110.351812,
-              "lttd": 30.223849,
-              "children": [
-                {
-                  "adcd": "420529202201100",
-                  "adnm": "一组",
-                  "pcount": 132,
-                  "htcount": 43,
-                  "ldarea": 3.73,
-                  "prevtp": "0",
-                  "lgtd": 110.359446,
-                  "lttd": 30.234513
-                },
-                {
-                  "adcd": "420529202201101",
-                  "adnm": "七组",
-                  "pcount": 88,
-                  "htcount": 31,
-                  "ldarea": 1.96,
-                  "prevtp": "0",
-                  "lgtd": 110.342555,
-                  "lttd": 30.228869
-                },
-                {
-                  "adcd": "420529202201102",
-                  "adnm": "二组",
-                  "pcount": 105,
-                  "htcount": 36,
-                  "ldarea": 2.01,
-                  "prevtp": "0",
-                  "lgtd": 110.291595,
-                  "lttd": 30.214394
-                },
-                {
-                  "adcd": "420529202201103",
-                  "adnm": "三组",
-                  "pcount": 182,
-                  "htcount": 52,
-                  "ldarea": 3.92,
-                  "prevtp": "0",
-                  "lgtd": 110.350574,
-                  "lttd": 30.22323
-                }
-              ]
-            },
-            {
-              "adcd": "420529202202000",
-              "adnm": "池南村",
-              "pcount": 734,
-              "htcount": 223,
-              "ldarea": 16.79,
-              "prevtp": "0",
-              "lgtd": 110.337422,
-              "lttd": 30.206523,
-              "children": [
-                {
-                  "adcd": "420529202202100",
-                  "adnm": "六组",
-                  "pcount": 51,
-                  "htcount": 15,
-                  "ldarea": 3.21,
-                  "prevtp": "1",
-                  "lgtd": 110.32757,
-                  "lttd": 30.222412
-                },
-                {
-                  "adcd": "420529202202101",
-                  "adnm": "二组（池南）",
-                  "pcount": 153,
-                  "htcount": 48,
-                  "ldarea": 3.7,
-                  "prevtp": "2",
-                  "lgtd": 110.337412,
-                  "lttd": 30.206112
-                },
-                {
-                  "adcd": "420529202202102",
-                  "adnm": "四组",
-                  "pcount": 106,
-                  "htcount": 29,
-                  "ldarea": 3.37,
-                  "prevtp": "1",
-                  "lgtd": 110.330964,
-                  "lttd": 30.2055751
-                }
-              ]
-            },
-            {
-              "adcd": "420529202203000",
-              "adnm": "凌云村",
-              "pcount": 704,
-              "htcount": 201,
-              "ldarea": 14.63,
-              "prevtp": "0",
-              "lgtd": 110.335722,
-              "lttd": 30.187676,
-              "children": [
-                {
-                  "adcd": "420529202203100",
-                  "adnm": "六组（弭坪）",
-                  "pcount": 85,
-                  "htcount": 15,
-                  "ldarea": 4.33,
-                  "prevtp": "2",
-                  "lgtd": 110.287151,
-                  "lttd": 30.190698
-                },
-                {
-                  "adcd": "420529202203101",
-                  "adnm": "八组（大埫）",
-                  "pcount": 65,
-                  "htcount": 19,
-                  "ldarea": 3.45,
-                  "prevtp": "1",
-                  "lgtd": 110.278841,
-                  "lttd": 30.185058
-                },
-                {
-                  "adcd": "420529202203102",
-                  "adnm": "五组（下土鱼河）",
-                  "pcount": 112,
-                  "htcount": 22,
-                  "ldarea": 5.39,
-                  "prevtp": "2",
-                  "lgtd": 110.302724,
-                  "lttd": 30.184629
-                },
-                {
-                  "adcd": "420529202203103",
-                  "adnm": "大花坪林场",
-                  "pcount": 185,
-                  "htcount": 57,
-                  "ldarea": 8.54,
-                  "prevtp": "2",
-                  "lgtd": 110.318371,
-                  "lttd": 30.154748
-                },
-                {
-                  "adcd": "420529202203104",
-                  "adnm": "五组（上土鱼河）",
-                  "pcount": 98,
-                  "htcount": 45,
-                  "ldarea": 5.32,
-                  "prevtp": "2",
-                  "lgtd": 110.312979,
-                  "lttd": 30.183736
-                }
-              ]
-            },
-            {
-              "adcd": "420529202204000",
-              "adnm": "沙河村",
-              "pcount": 403,
-              "htcount": 111,
-              "ldarea": 11.57,
-              "prevtp": "0",
-              "lgtd": 110.36442,
-              "lttd": 30.238031,
-              "children": [
-                {
-                  "adcd": "420529202204100",
-                  "adnm": "一组（沙河)",
-                  "pcount": 86,
-                  "htcount": 23,
-                  "ldarea": 3.93,
-                  "prevtp": "2",
-                  "lgtd": 110.364422,
-                  "lttd": 30.237765
-                }
-              ]
-            },
-            {
-              "adcd": "420529202205000",
-              "adnm": "松木坪村",
-              "pcount": 644,
-              "htcount": 169,
-              "ldarea": 14.99,
-              "prevtp": "0",
-              "lgtd": 110.306926,
-              "lttd": 30.229545,
-              "children": []
-            },
-            {
-              "adcd": "420529202206000",
-              "adnm": "金山村",
-              "pcount": 1321,
-              "htcount": 383,
-              "ldarea": 21.99,
-              "prevtp": "0",
-              "lgtd": 110.288519,
-              "lttd": 30.229658,
-              "children": [
-                {
-                  "adcd": "420529202206100",
-                  "adnm": "二组（罗家湾）",
-                  "pcount": 69,
-                  "htcount": 12,
-                  "ldarea": 3.01,
-                  "prevtp": "2",
-                  "lgtd": 110.293487,
-                  "lttd": 30.2124449
-                },
-                {
-                  "adcd": "420529202206101",
-                  "adnm": "三组（任家河）",
-                  "pcount": 113,
-                  "htcount": 28,
-                  "ldarea": 5.38,
-                  "prevtp": "1",
-                  "lgtd": 110.281083,
-                  "lttd": 30.223695
-                },
-                {
-                  "adcd": "420529202206102",
-                  "adnm": "一组（李家屋场）",
-                  "pcount": 84,
-                  "htcount": 19,
-                  "ldarea": 2.34,
-                  "prevtp": "0",
-                  "lgtd": 110.311067,
-                  "lttd": 30.219306
-                },
-                {
-                  "adcd": "420529202206103",
-                  "adnm": "五组（金山坪）",
-                  "pcount": 284,
-                  "htcount": 52,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.283955,
-                  "lttd": 30.233378
-                },
-                {
-                  "adcd": "420529202206104",
-                  "adnm": "九组（鹰嘴山）",
-                  "pcount": 220,
-                  "htcount": 47,
-                  "ldarea": 6.88,
-                  "prevtp": "1",
-                  "lgtd": 110.277328,
-                  "lttd": 30.235023
-                }
-              ]
-            },
-            {
-              "adcd": "420529202207000",
-              "adnm": "九里坪村",
-              "pcount": 734,
-              "htcount": 213,
-              "ldarea": 16.16,
-              "prevtp": "0",
-              "lgtd": 110.381023,
-              "lttd": 30.278049,
-              "children": [
-                {
-                  "adcd": "420529202207100",
-                  "adnm": "六组（黄家坳）",
-                  "pcount": 75,
-                  "htcount": 16,
-                  "ldarea": 3.95,
-                  "prevtp": "1",
-                  "lgtd": 110.377058,
-                  "lttd": 30.290256
-                },
-                {
-                  "adcd": "420529202207101",
-                  "adnm": "三组（阳坡坪）",
-                  "pcount": 123,
-                  "htcount": 29,
-                  "ldarea": 5.51,
-                  "prevtp": "2",
-                  "lgtd": 110.3784,
-                  "lttd": 30.2772
-                }
-              ]
-            },
-            {
-              "adcd": "420529202208000",
-              "adnm": "横茅湖村",
-              "pcount": 1238,
-              "htcount": 411,
-              "ldarea": 23.89,
-              "prevtp": "0",
-              "lgtd": 110.39574,
-              "lttd": 30.304549,
-              "children": [
-                {
-                  "adcd": "420529202208100",
-                  "adnm": "四组（倒洞坳）",
-                  "pcount": 82,
-                  "htcount": 16,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.369113,
-                  "lttd": 30.294094
-                },
-                {
-                  "adcd": "420529202208101",
-                  "adnm": "五组（红岩沟）",
-                  "pcount": 74,
-                  "htcount": 21,
-                  "ldarea": 3.26,
-                  "prevtp": "2",
-                  "lgtd": 110.376422,
-                  "lttd": 30.305973
-                }
-              ]
-            },
-            {
-              "adcd": "420529202209000",
-              "adnm": "沙湾村",
-              "pcount": 180,
-              "htcount": 70,
-              "ldarea": 4.98,
-              "prevtp": "0",
-              "lgtd": 110.405011,
-              "lttd": 30.334473,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529203000000",
-          "adnm": "采花乡",
-          "pcount": 27228,
-          "htcount": 8128,
-          "ldarea": 285.47,
-          "prevtp": "0",
-          "lgtd": 110.450562,
-          "lttd": 30.214214,
-          "children": [
-            {
-              "adcd": "420529203001000",
-              "adnm": "采花社区",
-              "pcount": 1323,
-              "htcount": 358,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.449803,
-              "lttd": 30.213941,
-              "children": [
-                {
-                  "adcd": "420529203001106",
-                  "adnm": "中街",
-                  "pcount": 406,
-                  "htcount": 116,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450705,
-                  "lttd": 30.214687
-                },
-                {
-                  "adcd": "420529203001107",
-                  "adnm": "下街",
-                  "pcount": 315,
-                  "htcount": 89,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450165,
-                  "lttd": 30.216293
-                },
-                {
-                  "adcd": "420529203001108",
-                  "adnm": "上街",
-                  "pcount": 602,
-                  "htcount": 153,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.445732,
-                  "lttd": 30.205698
-                }
-              ]
-            },
-            {
-              "adcd": "420529203201000",
-              "adnm": "长茂司村",
-              "pcount": 750,
-              "htcount": 231,
-              "ldarea": 13.7,
-              "prevtp": "0",
-              "lgtd": 110.452802,
-              "lttd": 30.217673,
-              "children": [
-                {
-                  "adcd": "420529203201100",
-                  "adnm": "三组（胡家台）",
-                  "pcount": 350,
-                  "htcount": 101,
-                  "ldarea": 6.53,
-                  "prevtp": "2",
-                  "lgtd": 110.452846,
-                  "lttd": 30.225834
-                },
-                {
-                  "adcd": "420529203201101",
-                  "adnm": "二组（茶丘）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 6.61,
-                  "prevtp": "2",
-                  "lgtd": 110.45266,
-                  "lttd": 30.218348
-                },
-                {
-                  "adcd": "420529203201102",
-                  "adnm": "一组（长茂司）",
-                  "pcount": 300,
-                  "htcount": 100,
-                  "ldarea": 6.57,
-                  "prevtp": "1",
-                  "lgtd": 110.451124,
-                  "lttd": 30.208181
-                }
-              ]
-            },
-            {
-              "adcd": "420529203202000",
-              "adnm": "黄家台村",
-              "pcount": 595,
-              "htcount": 190,
-              "ldarea": 17.75,
-              "prevtp": "0",
-              "lgtd": 110.456985,
-              "lttd": 30.238609,
-              "children": [
-                {
-                  "adcd": "420529203202100",
-                  "adnm": "四组（彭家屋场）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.458927,
-                  "lttd": 30.237277
-                },
-                {
-                  "adcd": "420529203202101",
-                  "adnm": "二组（黄家台）",
-                  "pcount": 119,
-                  "htcount": 43,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.462367,
-                  "lttd": 30.241478
-                },
-                {
-                  "adcd": "420529203202102",
-                  "adnm": "七组（白水）",
-                  "pcount": 196,
-                  "htcount": 65,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.431701,
-                  "lttd": 30.255427
-                },
-                {
-                  "adcd": "420529203202103",
-                  "adnm": "一组（小河湾）",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.456722,
-                  "lttd": 30.248939
-                }
-              ]
-            },
-            {
-              "adcd": "420529203203000",
-              "adnm": "白鹤村",
-              "pcount": 470,
-              "htcount": 183,
-              "ldarea": 7.57,
-              "prevtp": "0",
-              "lgtd": 110.439468,
-              "lttd": 30.196909,
-              "children": [
-                {
-                  "adcd": "420529203203101",
-                  "adnm": "三组（沙坝子）",
-                  "pcount": 160,
-                  "htcount": 55,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.439307,
-                  "lttd": 30.1976174
-                },
-                {
-                  "adcd": "420529203203102",
-                  "adnm": "二组（撒花溪）",
-                  "pcount": 210,
-                  "htcount": 83,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.441227,
-                  "lttd": 30.2078615
-                },
-                {
-                  "adcd": "420529203203103",
-                  "adnm": "一组(沙坝子）",
-                  "pcount": 100,
-                  "htcount": 45,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.444088,
-                  "lttd": 30.2049066
-                },
-                {
-                  "adcd": "420529203203104",
-                  "adnm": "三组（周家岭）",
-                  "pcount": 200,
-                  "htcount": 73,
-                  "ldarea": 3.9,
-                  "prevtp": "2",
-                  "lgtd": 110.441688,
-                  "lttd": 30.20215
-                }
-              ]
-            },
-            {
-              "adcd": "420529203204000",
-              "adnm": "大村",
-              "pcount": 803,
-              "htcount": 235,
-              "ldarea": 19.77,
-              "prevtp": "0",
-              "lgtd": 110.43015,
-              "lttd": 30.220485,
-              "children": [
-                {
-                  "adcd": "420529203204100",
-                  "adnm": "一组（大村）",
-                  "pcount": 238,
-                  "htcount": 70,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.427983,
-                  "lttd": 30.218539
-                },
-                {
-                  "adcd": "420529203204101",
-                  "adnm": "七组（廖叶池）",
-                  "pcount": 355,
-                  "htcount": 100,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.411043,
-                  "lttd": 30.2063821
-                },
-                {
-                  "adcd": "420529203204102",
-                  "adnm": "八组",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 8.59,
-                  "prevtp": "1",
-                  "lgtd": 110.404746,
-                  "lttd": 30.2028926
-                }
-              ]
-            },
-            {
-              "adcd": "420529203205000",
-              "adnm": "万里村",
-              "pcount": 363,
-              "htcount": 125,
-              "ldarea": 25,
-              "prevtp": "0",
-              "lgtd": 110.394666,
-              "lttd": 30.195858,
-              "children": [
-                {
-                  "adcd": "420529203205100",
-                  "adnm": "三组（二龙坪）",
-                  "pcount": 100,
-                  "htcount": 31,
-                  "ldarea": 10.34,
-                  "prevtp": "2",
-                  "lgtd": 110.390243,
-                  "lttd": 30.196587
-                },
-                {
-                  "adcd": "420529203205101",
-                  "adnm": "七组（地龙坪）",
-                  "pcount": 93,
-                  "htcount": 37,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.398801,
-                  "lttd": 30.1891199
-                },
-                {
-                  "adcd": "420529203205102",
-                  "adnm": "一组",
-                  "pcount": 170,
-                  "htcount": 57,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.406986,
-                  "lttd": 30.1996586
-                }
-              ]
-            },
-            {
-              "adcd": "420529203206000",
-              "adnm": "前坪村",
-              "pcount": 1272,
-              "htcount": 373,
-              "ldarea": 20.24,
-              "prevtp": "0",
-              "lgtd": 110.43581,
-              "lttd": 30.165766,
-              "children": [
-                {
-                  "adcd": "420529203206100",
-                  "adnm": "一组（苦竹园）",
-                  "pcount": 320,
-                  "htcount": 85,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423108,
-                  "lttd": 30.153465
-                },
-                {
-                  "adcd": "420529203206101",
-                  "adnm": "七组（严家河）",
-                  "pcount": 140,
-                  "htcount": 36,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423214,
-                  "lttd": 30.1728369
-                },
-                {
-                  "adcd": "420529203206102",
-                  "adnm": "二组（莫家溪）",
-                  "pcount": 322,
-                  "htcount": 89,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.419841,
-                  "lttd": 30.1590782
-                },
-                {
-                  "adcd": "420529203206103",
-                  "adnm": "六组（前坪）",
-                  "pcount": 190,
-                  "htcount": 65,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423714,
-                  "lttd": 30.167981
-                },
-                {
-                  "adcd": "420529203206104",
-                  "adnm": "三组",
-                  "pcount": 200,
-                  "htcount": 71,
-                  "ldarea": 7,
-                  "prevtp": "0",
-                  "lgtd": 110.423373,
-                  "lttd": 30.166645
-                },
-                {
-                  "adcd": "420529203206105",
-                  "adnm": "七组（关门岩）",
-                  "pcount": 100,
-                  "htcount": 35,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.424368,
-                  "lttd": 30.175888
-                }
-              ]
-            },
-            {
-              "adcd": "420529203207000",
-              "adnm": "采花台村",
-              "pcount": 835,
-              "htcount": 247,
-              "ldarea": 27.8,
-              "prevtp": "0",
-              "lgtd": 110.404831,
-              "lttd": 30.134315,
-              "children": [
-                {
-                  "adcd": "420529203207100",
-                  "adnm": "八组（堰坪）",
-                  "pcount": 115,
-                  "htcount": 32,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.387513,
-                  "lttd": 30.148693
-                },
-                {
-                  "adcd": "420529203207101",
-                  "adnm": "二组（覃家台）",
-                  "pcount": 200,
-                  "htcount": 55,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.408039,
-                  "lttd": 30.140805
-                },
-                {
-                  "adcd": "420529203207102",
-                  "adnm": "七组（堰坪）",
-                  "pcount": 90,
-                  "htcount": 35,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.391524,
-                  "lttd": 30.147526
-                },
-                {
-                  "adcd": "420529203207103",
-                  "adnm": "三组（覃家台）",
-                  "pcount": 220,
-                  "htcount": 65,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.397219,
-                  "lttd": 30.127049
-                },
-                {
-                  "adcd": "420529203207104",
-                  "adnm": "一组（采花台）",
-                  "pcount": 210,
-                  "htcount": 60,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.40784,
-                  "lttd": 30.133373
-                }
-              ]
-            },
-            {
-              "adcd": "420529203208000",
-              "adnm": "楠木桥村",
-              "pcount": 518,
-              "htcount": 148,
-              "ldarea": 35.4,
-              "prevtp": "0",
-              "lgtd": 110.464885,
-              "lttd": 30.173719,
-              "children": [
-                {
-                  "adcd": "420529203208100",
-                  "adnm": "一组（楠木桥）",
-                  "pcount": 305,
-                  "htcount": 88,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.464482,
-                  "lttd": 30.173049
-                },
-                {
-                  "adcd": "420529203208101",
-                  "adnm": "二组（后荒）",
-                  "pcount": 55,
-                  "htcount": 15,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.453234,
-                  "lttd": 30.164536
-                },
-                {
-                  "adcd": "420529203208102",
-                  "adnm": "三组",
-                  "pcount": 158,
-                  "htcount": 45,
-                  "ldarea": 13.8,
-                  "prevtp": "1",
-                  "lgtd": 110.527918,
-                  "lttd": 30.235771
-                }
-              ]
-            },
-            {
-              "adcd": "420529203209000",
-              "adnm": "星岩坪村",
-              "pcount": 1008,
-              "htcount": 295,
-              "ldarea": 21.9,
-              "prevtp": "0",
-              "lgtd": 110.472704,
-              "lttd": 30.257124,
-              "children": [
-                {
-                  "adcd": "420529203209100",
-                  "adnm": "一组（星岩坪公社湾）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.64,
-                  "prevtp": "2",
-                  "lgtd": 110.472441,
-                  "lttd": 30.255052
-                },
-                {
-                  "adcd": "420529203209101",
-                  "adnm": "七组（三渡水）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.65,
-                  "prevtp": "1",
-                  "lgtd": 110.48657,
-                  "lttd": 30.281577
-                },
-                {
-                  "adcd": "420529203209102",
-                  "adnm": "三组（张家湾）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.477373,
-                  "lttd": 30.269899
-                },
-                {
-                  "adcd": "420529203209103",
-                  "adnm": "白果坪",
-                  "pcount": 248,
-                  "htcount": 66,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.483562,
-                  "lttd": 30.291257
-                },
-                {
-                  "adcd": "420529203209104",
-                  "adnm": "五组",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.468164,
-                  "lttd": 30.2445375
-                },
-                {
-                  "adcd": "420529203209105",
-                  "adnm": "一组（褚家台）",
-                  "pcount": 190,
-                  "htcount": 55,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.472318,
-                  "lttd": 30.261083
-                }
-              ]
-            },
-            {
-              "adcd": "420529203210000",
-              "adnm": "苦竹坪村",
-              "pcount": 317,
-              "htcount": 92,
-              "ldarea": 5.1,
-              "prevtp": "0",
-              "lgtd": 110.511256,
-              "lttd": 30.267272,
-              "children": [
-                {
-                  "adcd": "420529203210100",
-                  "adnm": "八组（大沙坡）",
-                  "pcount": 222,
-                  "htcount": 65,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.514562,
-                  "lttd": 30.263478
-                },
-                {
-                  "adcd": "420529203210101",
-                  "adnm": "二组（陈家大坪）",
-                  "pcount": 50,
-                  "htcount": 15,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.515786,
-                  "lttd": 30.255662
-                },
-                {
-                  "adcd": "420529203210105",
-                  "adnm": "一组（渔泉河）",
-                  "pcount": 45,
-                  "htcount": 12,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.524606,
-                  "lttd": 30.241511
-                },
-                {
-                  "adcd": "420529203210106",
-                  "adnm": "八组（大沙坝）",
-                  "pcount": 210,
-                  "htcount": 55,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.510302,
-                  "lttd": 30.269807
-                }
-              ]
-            },
-            {
-              "adcd": "420529203211000",
-              "adnm": "珍珠头村",
-              "pcount": 248,
-              "htcount": 77,
-              "ldarea": 9.71,
-              "prevtp": "0",
-              "lgtd": 110.497443,
-              "lttd": 30.272249,
-              "children": [
-                {
-                  "adcd": "420529203211100",
-                  "adnm": "一组（二叉口）",
-                  "pcount": 98,
-                  "htcount": 32,
-                  "ldarea": 6.85,
-                  "prevtp": "2",
-                  "lgtd": 110.492167,
-                  "lttd": 30.294125
-                },
-                {
-                  "adcd": "420529203211102",
-                  "adnm": "五组（马家坡）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 6.86,
-                  "prevtp": "2",
-                  "lgtd": 110.516365,
-                  "lttd": 30.247835
-                }
-              ]
-            },
-            {
-              "adcd": "420529203212000",
-              "adnm": "红渔坪村",
-              "pcount": 1350,
-              "htcount": 428,
-              "ldarea": 18.1,
-              "prevtp": "0",
-              "lgtd": 110.496412,
-              "lttd": 30.222253,
-              "children": [
-                {
-                  "adcd": "420529203212100",
-                  "adnm": "二组（红渔坪）",
-                  "pcount": 340,
-                  "htcount": 108,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.494381,
-                  "lttd": 30.2221248
-                },
-                {
-                  "adcd": "420529203212101",
-                  "adnm": "四组（阳坡）",
-                  "pcount": 480,
-                  "htcount": 146,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.496759,
-                  "lttd": 30.228309
-                },
-                {
-                  "adcd": "420529203212102",
-                  "adnm": "三组",
-                  "pcount": 330,
-                  "htcount": 106,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.501227,
-                  "lttd": 30.22803
-                },
-                {
-                  "adcd": "420529203212103",
-                  "adnm": "五组（楠木）",
-                  "pcount": 200,
-                  "htcount": 68,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.516091,
-                  "lttd": 30.2269493
-                }
-              ]
-            },
-            {
-              "adcd": "420529203213000",
-              "adnm": "白溢坪村",
-              "pcount": 547,
-              "htcount": 169,
-              "ldarea": 19,
-              "prevtp": "0",
-              "lgtd": 110.556215,
-              "lttd": 30.248125,
-              "children": [
-                {
-                  "adcd": "420529203213100",
-                  "adnm": "二组（湖坪）",
-                  "pcount": 237,
-                  "htcount": 70,
-                  "ldarea": 6.75,
-                  "prevtp": "2",
-                  "lgtd": 110.542872,
-                  "lttd": 30.2415706
-                },
-                {
-                  "adcd": "420529203213101",
-                  "adnm": "三组（湖坪）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.545592,
-                  "lttd": 30.2411432
-                },
-                {
-                  "adcd": "420529203213102",
-                  "adnm": "七组（白溢坪）",
-                  "pcount": 108,
-                  "htcount": 32,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.552356,
-                  "lttd": 30.2441797
-                },
-                {
-                  "adcd": "420529203213103",
-                  "adnm": "一组",
-                  "pcount": 70,
-                  "htcount": 25,
-                  "ldarea": 6.75,
-                  "prevtp": "1",
-                  "lgtd": 110.528468,
-                  "lttd": 30.236548
-                }
-              ]
-            },
-            {
-              "adcd": "420529203214000",
-              "adnm": "宋家河村",
-              "pcount": 1023,
-              "htcount": 385,
-              "ldarea": 30.2,
-              "prevtp": "0",
-              "lgtd": 110.557717,
-              "lttd": 30.188565,
-              "children": [
-                {
-                  "adcd": "420529203214100",
-                  "adnm": "二组（宋家河）",
-                  "pcount": 182,
-                  "htcount": 120,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.558747,
-                  "lttd": 30.187884
-                },
-                {
-                  "adcd": "420529203214101",
-                  "adnm": "六组（唐家河）",
-                  "pcount": 139,
-                  "htcount": 45,
-                  "ldarea": 9.55,
-                  "prevtp": "1",
-                  "lgtd": 110.557433,
-                  "lttd": 30.204571
-                },
-                {
-                  "adcd": "420529203214102",
-                  "adnm": "七组（甘沟河）",
-                  "pcount": 486,
-                  "htcount": 150,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.545536,
-                  "lttd": 30.2194051
-                },
-                {
-                  "adcd": "420529203214103",
-                  "adnm": "五组（云山）",
-                  "pcount": 216,
-                  "htcount": 70,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.533849,
-                  "lttd": 30.1901553
-                }
-              ]
-            },
-            {
-              "adcd": "420529203215000",
-              "adnm": "栗子坪村",
-              "pcount": 951,
-              "htcount": 267,
-              "ldarea": 9.7,
-              "prevtp": "0",
-              "lgtd": 110.570566,
-              "lttd": 30.162327,
-              "children": []
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  waterList: [
-    {
-      "wscd": "11",
-      "wsnm": "百溪河"
-    },
-    {
-      "wscd": "61",
-      "wsnm": "沽洞溪"
-    },
-    {
-      "wscd": "71",
-      "wsnm": "二汊口河"
-    },
-    {
-      "wscd": "FA85W508610420000",
-      "wsnm": "泗洋河"
-    },
-    {
-      "wscd": "FA85X808780420000",
-      "wsnm": "天池河"
-    },
-    {
-      "wscd": "FF148801360420000",
-      "wsnm": "南河"
-    },
-    {
-      "wscd": "HBWS000000002",
-      "wsnm": "湾潭河"
-    },
-    {
-      "wscd": "HBWS000000003",
-      "wsnm": "渔阳河"
-    }
-  ],
-  tableData: [
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-  ]
-}
diff --git a/src/views/fxdd/tqyb/tqxx72/index.js b/src/views/fxdd/tqyb/tqxx72/index.js
deleted file mode 100644
index 4dab3ec..0000000
--- a/src/views/fxdd/tqyb/tqxx72/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-import { Table, Segmented, Card, Tabs, Radio } from 'antd'
-import { useDispatch, useSelector } from 'react-redux'
-import data from './dataConfig'
-import Ljtj from '../ljtj'
-import Pltj from '../qltj'
-import Sktj from '../sktj'
-
-const Page = ({ activeKey }) => {
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  const dispatch = useDispatch()
-  const [tableData, setTableData] = useState(data.tableData)
-  const doSearch = params => {}
-
-  const flyTo = record => {
-    dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-
-    const { lgtd, lttd, elev } = record
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          ShuiKuLayer: [record.id]
-        }
-      })
-
-      dispatch.runtime.setFeaturePop({
-        type: 'shuiku',
-        data: record,
-        lgtd: record.lgtd,
-        lttd: record.lttd
-      })
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60
-      })
-    }
-  }
-  return (
-    <>
-      <div className='monitor-rainfall waterLevelBox'>
-        <div style={{ margin: '0 0 0 6px' }} className='topQuery'>
-          <Toolbar search={doSearch} />
-        </div>
-        <Tabs>
-          <Tabs.TabPane tab='水库统计' key='item-1'>
-            <Sktj />
-          </Tabs.TabPane>
-          <Tabs.TabPane tab='流域降雨' key='item-2'>
-            {/* <Pltj /> */}
-          </Tabs.TabPane>
-          <Tabs.TabPane tab='区域降雨' key='item-3'>
-            内容 2
-          </Tabs.TabPane>
-          <Tabs.TabPane tab='量级统计' key='item-4'>
-            <Ljtj />
-          </Tabs.TabPane>
-        </Tabs>
-      </div>
-      <div
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 'calc(100vw - 550px)',
-          width: '200px'
-        }}
-      >
-        <Radio.Group defaultValue='网格'>
-          <Radio.Button value='网格'>网格</Radio.Button>
-          <Radio.Button value='面雨量'>面雨量</Radio.Button>
-        </Radio.Group>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/fxdd/tqyb/tqxx72/index.less b/src/views/fxdd/tqyb/tqxx72/index.less
deleted file mode 100644
index 54a83fe..0000000
--- a/src/views/fxdd/tqyb/tqxx72/index.less
+++ /dev/null
@@ -1,41 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-}
-
-.subTitle {
-  position: relative;
-  padding-left: 8px;
-  margin: 0 0 10px 10px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-
-  &:after {
-    content: "";
-    display: block;
-    position: absolute;
-    width: 3px;
-    height: 16px;
-    background: #0068F4;
-    left: -2px;
-    top: 5px;
-    border-radius: 4px;
-  }
-}
-
-.summary {
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-
-  .sum-count {
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxdd/tqyb/tqxx72/toolbar.js b/src/views/fxdd/tqyb/tqxx72/toolbar.js
deleted file mode 100644
index 7b97b88..0000000
--- a/src/views/fxdd/tqyb/tqxx72/toolbar.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Button, DatePicker, Checkbox, TreeSelect, Select } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import moment from 'moment';
-import data from './dataConfig'
-
-const CheckboxGroup = Checkbox.Group;
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ onSearch, downLoad }) => {
-  const [form] = Form.useForm();
-
-  const onSearchClick = (val) => {
-    val.tm = val.tm ? moment(val.tm).format('YYYY-MM-DD') : ''
-    onSearch(val);
-  }
-
-
-  const typeOptions = [
-    { label: "山洪", value: "SH" },
-    { label: "水文", value: "SW" },
-    { label: "气象", value: "QX" },
-    { label: "水库", value: "SK" },
-  ];
-
-  const handleTreeData = (val) => {
-    if (val.length > 0) {
-      val.map((item) => {
-        item.value = item.adcd + item.adnm;
-        item.title = item.adnm;
-        if (item.children && item.children.length > 0) {
-          handleTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const [treeData, setTreeData] = useState(data.xzqh);
-  const [waterList, setWaterList] = useState(data.waterList);
-
-  useEffect(() => {
-
-    handleTreeData(treeData);
-    setTreeData(treeData);
-
-    form.setFieldsValue({ "tm": [moment().add(-1, 'day'), moment()] });
-  }, []);
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' initialValues={{ types: ["SH", "SW", "QX", "SK"], tm: moment() }}>
-          <Form.Item label="类型" name="types" style={{ margin: "0 0 8px 0" }}>
-            <CheckboxGroup options={typeOptions} />
-          </Form.Item>
-          <Form.Item label="时段选择" name="tm" style={{ margin: "0 0 8px 0" }}>
-            <RangePicker allowClear style={{ width: "330px" }}
-              //defaultValue={[moment().add(-1, 'day'), moment()]}
-              onChange={onSearchClick}
-              format="YYYY-MM-DD HH:mm"
-            />
-          </Form.Item>
-        </Form>
-
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/csgl/Form/index.js b/src/views/fxzb/csgl/Form/index.js
deleted file mode 100644
index 4fd9522..0000000
--- a/src/views/fxzb/csgl/Form/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Switch,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-
-import apiurl from '../../../../service/apiurl';
-import { httppost2 } from '../../../../utils/request';
-import MyTable from './table'
-const Page = ({record,close}) => {
-  const [data,setData] = useState([])
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center",render:(a,b,c)=>c+1 },
-    { title: '月份', key: 'month', dataIndex: 'month', width: 140,align:"center", },
-    { title: 'K值', key: 'kvalue', dataIndex: 'kvalue', width: 140,align:"center", },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
- 
-
-
-  useEffect(()=>{
-    getList()
-  }, [])
-  
-
-  const getList = async()=>{
-    const {code, data} = await httppost2(apiurl.fxdd_xyt.hsyb.ybcsgl.base+record.abilityCode+'/list')
-    const list = data.map((item,index)=>{
-      return {
-        ...item,
-        key:index+1,
-        inx:index+1,
-      }
-    })
-    setData(list)
-  }
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0",height:'500px'}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%",height:'100%' }}>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            {data.length>0?<MyTable list={data} abilityCode={record.abilityCode} getList={getList} close={close}/>:null}
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/csgl/Form/table.js b/src/views/fxzb/csgl/Form/table.js
deleted file mode 100644
index 04dd4dd..0000000
--- a/src/views/fxzb/csgl/Form/table.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import { Form, Input, Button, Popconfirm, Table, Typography, message } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import React, { useState } from 'react';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-
-const App = ({list, abilityCode, getList, close}) => {
-  console.log(abilityCode);
-  const [form] = Form.useForm();
-  const [data, setData] = useState(list);
-  const [editingKey, setEditingKey] = useState('');
-  const isEditing = (record) => record.key === editingKey;
-  const edit = (record) => {
-    if(abilityCode==='/forecastK'){
-      form.setFieldsValue({
-        month: '',
-        kvalue: '',
-        ...record,
-      });
-    }
-    if(abilityCode==='/forecastU'){
-      form.setFieldsValue({
-        uvalue: '',
-        ...record,
-      });
-    }
-    setEditingKey(record.key);
-  };
-  const save = async (key) => {
-    try {
-      const row = await form.validateFields();
-      const newData = [...data];
-      const index = newData.findIndex((item) => key === item.key);
-      if (index > -1) {
-        const item = newData[index];
-        newData.splice(index, 1, {
-          ...item,
-          ...row,
-        });
-        setData(newData);
-        setEditingKey('');
-      } else {
-        newData.push(row);
-        setData(newData);
-        setEditingKey('');
-      }
-    } catch (errInfo) {
-      console.log('Validate Failed:', errInfo);
-    }
-  };
-  const columns = [
-    {
-      title: '序号',
-      dataIndex: 'inx',
-      width: '25%',
-      editable: false,
-    }
-  ];
-  if(abilityCode==='/forecastK'){
-    columns.push({
-      title: '月份',
-      dataIndex: 'month',
-      width: '25%',
-      editable: false,
-    })
-    columns.push({
-      title: 'K值',
-      dataIndex: 'kvalue',
-      width: '40%',
-      editable: true,
-    })
-  }
-  if(abilityCode==='/forecastU'){
-    columns.push({
-      title: '值',
-      dataIndex: 'uvalue',
-      width: '40%',
-      editable: true,
-    })
-  }
-  columns.push({
-    title: '操作',
-    dataIndex: 'operation',
-    render: (_, record) => {
-      const editable = isEditing(record);
-      return editable ? (
-        <span>
-          <Typography.Link
-            onClick={() => save(record.key)}
-            style={{
-              marginRight: 8,
-            }}
-          >
-            保存
-          </Typography.Link>
-        </span>
-      ) : (
-        <Typography.Link disabled={editingKey !== ''} onClick={() => edit(record)}>
-          修改
-        </Typography.Link>
-      );
-    },
-  })
-
-  const mergedColumns = columns.map((col) => {
-    if (!col.editable) {
-      return col;
-    }
-    return {
-      ...col,
-      onCell: (record) => ({
-        record,
-        dataIndex: col.dataIndex,
-        title: col.title,
-        editing: isEditing(record),
-      }),
-    };
-  });
-  const onFinish = async()=>{
-    const {code} = await httppost2(apiurl.fxdd_xyt.hsyb.ybcsgl.base+abilityCode+'/saveBatch',data)
-    if(code===200){
-      getList()
-      message.success('保存成功')
-      setTimeout(() => {
-        close()
-      }, 500);
-    }
-  }
-
-  return (
-    <Form form={form} component={false}>
-      <Table
-        components={{
-          body: {
-            cell: ({editing,dataIndex,title,record,index,children,...restProps}) => {
-              const inputNode = <Input />
-              return (
-                <td {...restProps}>
-                  {editing ? (
-                    <Form.Item
-                      name={dataIndex}
-                      style={{
-                        margin: 0,
-                      }}
-                      rules={[
-                        {
-                          required: true,
-                          message: `Please Input ${title}!`,
-                        },
-                      ]}
-                    >
-                      {inputNode}
-                    </Form.Item>
-                  ) : (
-                    children
-                  )}
-                </td>
-              );
-            },
-          },
-        }}
-        dataSource={data}
-        columns={mergedColumns}
-        pagination={false}
-        
-      />
-
-      <Form.Item {...btnItemLayout}>
-        <Button type="primary" onClick={onFinish}>提交</Button>
-      </Form.Item>
-    </Form>
-  );
-};
-export default App;
\ No newline at end of file
diff --git a/src/views/fxzb/csgl/Form/toolbar.js b/src/views/fxzb/csgl/Form/toolbar.js
deleted file mode 100644
index ee42c7b..0000000
--- a/src/views/fxzb/csgl/Form/toolbar.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-const ToolBar = ({ onSave }) => {
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form className='toolbarBox' layout="inline">
-          <Form.Item>
-            <Button type="primary" htmlType="submit" onClick={onSave} style={{padding:'0 20px', borderRadius:'5px',height:'30px',fontWeight:'500'}}>新建自动预报配置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/csgl/form.js b/src/views/fxzb/csgl/form.js
deleted file mode 100644
index 405fb48..0000000
--- a/src/views/fxzb/csgl/form.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, InputNumber , Switch,message,Image,Modal,Radio } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import { httppost2 } from '../../../utils/request';
-
-import moment from 'moment';
-const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
-  
-  console.log("record",record);
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    const params = {
-      ...record,
-      ...values,
-    }
-    if (mode === 'edit') {
-      onEdit(apiurl.fxdd_xyt.hsyb.ybcsgl.edit,params)
-    }
-  }
-
-  
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}
-      >
-      <Form.Item
-        label={record.paramName}
-        name="paramValue"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
-        rules={[{ required: true }]}
-      >
-        <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-      </Form.Item>
-      {
-        mode==='view'?null:(
-          <>
-            <Form.Item {...btnItemLayout}>
-              <Button type="primary" htmlType="submit">
-                    {mode === 'save' ? '保存' :
-                      mode === "similarSave" ? "保存" :
-                      '修改'}
-              </Button>
-            </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/csgl/form2.js b/src/views/fxzb/csgl/form2.js
deleted file mode 100644
index 6e5454b..0000000
--- a/src/views/fxzb/csgl/form2.js
+++ /dev/null
@@ -1,186 +0,0 @@
-import { Button, Form, Input, Popconfirm, Table, message } from 'antd';
-import React, { useContext, useEffect, useRef, useState } from 'react';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import { httppost2 } from '../../../utils/request';
-const EditableContext = React.createContext(null);
-const EditableRow = ({ index, ...props }) => {
-  const [form] = Form.useForm();
-  return (
-    <Form form={form} component={false}>
-      <EditableContext.Provider value={form}>
-        <tr {...props} />
-      </EditableContext.Provider>
-    </Form>
-  );
-};
-const EditableCell = ({
-  title,
-  editable,
-  children,
-  dataIndex,
-  record,
-  handleSave,
-  ...restProps
-}) => {
-  const [editing, setEditing] = useState(false);
-  const inputRef = useRef(null);
-  const form = useContext(EditableContext);
-  useEffect(() => {
-    if (editing) {
-      inputRef.current.focus();
-    }
-  }, [editing]);
-  const toggleEdit = () => {
-    setEditing(!editing);
-    form.setFieldsValue({
-      [dataIndex]: record[dataIndex],
-    });
-  };
-  const save = async () => {
-    try {
-      const values = await form.validateFields();
-      toggleEdit();
-      handleSave({
-        ...record,
-        ...values,
-      });
-    } catch (errInfo) {
-      console.log('Save failed:', errInfo);
-    }
-  };
-  let childNode = children;
-  if (editable) {
-    childNode = editing ? (
-      <Form.Item
-        style={{
-          margin: 0,
-        }}
-        name={dataIndex}
-        rules={[
-          {
-            required: true,
-            message: `${title} is required.`,
-          },
-        ]}
-      >
-        <Input ref={inputRef} onPressEnter={save} onBlur={save} style={{width:'60px',height:'30px'}}/>
-      </Form.Item>
-    ) : (
-      <div
-        className="editable-cell-value-wrap"
-        style={{
-          paddingRight: 24,
-          height:'35px'
-        }}
-        onClick={toggleEdit}
-      >
-        {children}
-      </div>
-    );
-  }
-  return <td {...restProps}>{childNode}</td>;
-};
-const App = ({record,close}) => {
-  const [dataSource, setDataSource] = useState([]);
-  const defaultColumns = [{
-      title: '序号',
-      dataIndex: 'key',
-      editable: false,
-    }]
-  for (let i=0;i<14;i++){
-    defaultColumns.push({
-      title: i+1 + '列',
-      dataIndex: i,
-      editable: true,
-    })
-  }
-
-
-  const handleSave = (row) => {
-    const newData = [...dataSource];
-    const index = newData.findIndex((item) => row.key === item.key);
-    const item = newData[index];
-    newData.splice(index, 1, {
-      ...item,
-      ...row,
-    });
-    setDataSource(newData);
-  };
-  const components = {
-    body: {
-      row: EditableRow,
-      cell: EditableCell,
-    },
-  };
-  const columns = defaultColumns.map((col) => {
-    if (!col.editable) {
-      return col;
-    }
-    return {
-      ...col,
-      onCell: (record) => ({
-        record,
-        editable: col.editable,
-        dataIndex: col.dataIndex,
-        title: col.title,
-        handleSave,
-      }),
-    };
-  });
-
-
-  useEffect(()=>{
-    getList()
-  },[])
-
-  const getList = async()=>{
-    const {code, data} = await httppost2(apiurl.fxdd_xyt.hsyb.ybcsgl.base+record.abilityCode+'/list')
-
-    const list = data.map((item,index)=>{
-      return {
-        ...item,
-        key:index+1,
-      }
-    })
-    setDataSource(list)
-  }
-
-  const onFinish = async()=>{
-    const list = []
-    dataSource.map((item)=>{
-      const linshi = []
-      for(let i in item){
-        if(i!=='key'){
-          linshi.push(item[i])
-        }
-      }
-      list.push(linshi)
-    })
-    const {code} = await httppost2(apiurl.fxdd_xyt.hsyb.ybcsgl.base+record.abilityCode+'/saveBatch',list)
-    if(code===200){
-      getList()
-      message.success('保存成功')
-      setTimeout(() => {
-        close()
-      }, 500);
-    }
-  }
-
-
-  return (
-    <div>
-      <Table
-        components={components}
-        bordered
-        dataSource={dataSource}
-        columns={columns}
-        rowKey='inx'
-      />
-      <Form.Item {...btnItemLayout}>
-        <Button type="primary" onClick={onFinish}>提交</Button>
-      </Form.Item>
-    </div>
-  );
-};
-export default App;
\ No newline at end of file
diff --git a/src/views/fxzb/csgl/index.js b/src/views/fxzb/csgl/index.js
deleted file mode 100644
index 036db21..0000000
--- a/src/views/fxzb/csgl/index.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { useSelector } from 'react-redux';
-import { Table, Card,Switch,Form,Input,Button,Row,Col,message } from 'antd';
-import ModalForm from './form';
-import ModalForm2 from './Form/index';
-import ModalForm3 from './form2';
-
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
-const Page = () => {
-  const refModal = useRef();
-  const refModal2 = useRef();
-  const refModal3 = useRef();
-  const role = useSelector(state => state.auth.role);
-  const editBtn = (role?.rule?.find(item => item.menuName == "编辑"))?true:true;
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '参数名称', key: 'paramName', dataIndex: 'paramName', width: 140,align:"center", },
-    { title: '描述', key: 'paramDesc', dataIndex: 'paramDesc', width: 140,align:"center", },
-    { title: '参数值', key: 'paramValue', dataIndex: 'paramValue', width: 140,align:"center", },
-    { title: '备注', key: 'remarks', dataIndex: 'remarks', width: 140,align:"center", },
-    // { title: '临时增加类型', key: 'paramType', dataIndex: 'paramType', width: 140,align:"center", },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={editBtn} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      if(params.paramType==='1'){
-        refModal.current.showEdit({ ...params });
-      }else if(params.paramType==='2'){
-        refModal2.current.showEdit({ ...params });
-      }else{
-        refModal3.current.showEdit({ ...params });
-      }
-    } else if (type === 'view') {
-    } else if (type === 'del') {
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxdd_xyt.hsyb.ybcsgl.page).find_noCode);
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-        'orderField':'id',
-        'isAsc':true
-      }
-    };
-    search(params)
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-        <BasicCrudModal
-          width={500}
-          style={{top:'50px'}}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})}
-        />
-        <BasicCrudModal
-          width={1000}
-          style={{top:'50px'}}
-          ref={refModal2}
-          title=""
-          component={ModalForm2}
-          onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})}
-        />
-        <BasicCrudModal
-          width={1500}
-          style={{top:'50px'}}
-          ref={refModal3}
-          title=""
-          component={ModalForm3}
-          onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/csgl/toolbar.js b/src/views/fxzb/csgl/toolbar.js
deleted file mode 100644
index ee42c7b..0000000
--- a/src/views/fxzb/csgl/toolbar.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-const ToolBar = ({ onSave }) => {
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form className='toolbarBox' layout="inline">
-          <Form.Item>
-            <Button type="primary" htmlType="submit" onClick={onSave} style={{padding:'0 20px', borderRadius:'5px',height:'30px',fontWeight:'500'}}>新建自动预报配置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/ddgc/form.js b/src/views/fxzb/ddgc/form.js
deleted file mode 100644
index 65495d2..0000000
--- a/src/views/fxzb/ddgc/form.js
+++ /dev/null
@@ -1,322 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col,Upload,DatePicker,Modal,message,Image } from 'antd';
-import {PaperClipOutlined,DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined} from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import { httpget2 } from '../../../utils/request';
-import moment from 'moment';
-import "./index.less";
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [loading, setLoading] = useState(false)
-  const [iframeId, setIframeId] = useState('')
-  const [perviewOpen, setPerviewOpen] = useState(false)
-
-  const fileChange = (info) => {
-    console.log("file",info);
-    
-    if (info.file.status === "done") {
-      setLoading(false);
-     setFileList(info.fileList)
-      
-    }
-    if (info.file.status === "uploading") { 
-        setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-        setLoading(false);
-    }
-    if (fileList.length > 0) {
-      return 
-    }
-     setFileList(info.fileList)
-  }
-
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-}
-  const onFinish = async (values) => {
-    if (fileList.length <= 0) {
-      message.error("请上传预案文件")
-      return
-    }
-    let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-    values.resCode = "42120250085"
-    values.type = 2
-    values.files = oldFiles;
-    values.prepTime = moment(values.prepTime).format("YYYY-MM-DD 00:00:00")
-    values.apprTime = moment(values.apprTime).format("YYYY-MM-DD 00:00:00")
-    if (mode === 'edit') {
-      values.id = record?.id;
-      onEdit(apiurl.fxya.update,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.fxya.save,values)
-    }
-  }
-
-  const viewPdf = (params) => {
-    setIframeId(params)
-    setPerviewOpen(true)
-  }
-  const beforeUpload = () => {
-    if (fileList.length > 0) { 
-      message.error("只能上传一个附件");
-      return false;
-    }
-  }
-  const getFileInfo = async(id) => {
-    try {
-        const res = await httpget2(`${apiurl.dataResourcesCenter.projectAndWater.fxya.getFile}/${id}`)
-        let obj ={
-            name: res.data.fileName,
-            response: {
-              data: {
-                filePath: res.data.filePath,
-                fileId:res.data.fileId
-              }
-            },
-          }
-        setFileList([obj])
-    } catch (error) {
-        console.log(error);
-        
-    }
-  }
-  
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/resPlanB/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  useEffect(() => {
-    if (record && mode != "save") {
-      getFileInfo(record?.files[0]?.fileId)
-    }
-  }, [record,mode])
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="调度规程名称"
-                name="planName"
-                labelCol={{ span: 3, offset: 0 }}
-                wrapperCol={{span:21,offset:0}}
-                rules={[{ required: true }]}
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={mode==='view'}
-              />
-              </Form.Item>
-          </Col>
-         
-      </Row>
-
-        <Row>
-        <Col span={12}>
-              <Form.Item
-                label="编制单位"
-                name="prepOrg"
-                rules={[{ required: true }]}
-              >
-               <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={mode==='view'}
-              />
-              </Form.Item>
-          </Col>
-           <Col span={12}>
-              <Form.Item
-                label="编制日期"
-                name="prepTime"
-                getValueFromEvent={(e, dateString) => dateString}
-                getValueProps={value => ({
-                  value: value ? moment(value) : undefined
-                })}
-                rules={[{ required: true }]}
-              >
-              <DatePicker allowClear style={{width:'280px'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-        <Col span={12}>
-              <Form.Item
-                label="批复部门"
-                name="apprOrg"
-                rules={[{ required: true }]}
-              >
-               <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={mode==='view'}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="批复日期"
-                name="apprTime"
-                getValueFromEvent={(e, dateString) => dateString}
-                getValueProps={value => ({
-                  value: value ? moment(value) : undefined
-                })}
-                rules={[{ required: true }]}
-              >
-                <DatePicker allowClear style={{width:'280px'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col> 
-        </Row>
-        <Row>
-          <Col span={24}>
-          <Form.Item
-                label="预案文件"
-                name="files"
-                labelCol={{ span: 3, offset: 0 }}
-                wrapperCol={{span:21,offset:0}}
-                rules={[{ required: true }]}
-            >
-               <Upload 
-                name='file'
-                action="/gunshiApp/tsg/resPlanB/file/upload/singleSimple"
-                onChange={fileChange}
-                fileList={fileList}
-                maxCount={1}
-                disabled={loading}
-                showUploadList={false}
-                beforeUpload={beforeUpload}
-              >
-                {mode == "view" ? null :
-              <div style={{display:"flex",alignItems:"center",columnGap:10,color:"#4f85ec",cursor:"pointer"}}>
-              <PaperClipOutlined />
-                    <a style={{ cursor: "pointer" }}>上传附件
-                      <span style={{ marginLeft:10,color:"#dfdfdf" }}>(支持扩展名：.xls .xlsx .doc .docx .pdf .jpg .png)</span></a>
-              </div>
-                }
-          </Upload>
-          </Form.Item>  
-          </Col>
-         
-        </Row>   
-        <Row gutter={[16]} style={{margin:"-25px 0 0 14px"}}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                        </div>
-                        {mode !== "view" && 
-                          <div
-                            className="delete-icon"
-                            onClick={() =>  deleteFile(file.response?.data?.fileId)}
-                          >
-                              <DeleteOutlined />
-                          </div>
-                        }
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-        </Row>
-                
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={perviewOpen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPerviewOpen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/resPlanB/file/download/${iframeId}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/ddgc/index.js b/src/views/fxzb/ddgc/index.js
deleted file mode 100644
index 48b66e4..0000000
--- a/src/views/fxzb/ddgc/index.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import React,{useEffect,useState,useRef,useMemo} from 'react'
-import { Table, Button,Modal} from 'antd'
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import { httppost2 } from '../../../utils/request';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal2';
-import moment from "moment"
-export default function Zrtx() {
-  const refModal = useRef();
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-    const columns = [
-      { title: '序号', key: 'idx', dataIndex: 'idx', width: 60, align:"center" },
-      { title: '调度规程名称', key: 'planName', dataIndex: 'planName', width: 200,align:"center"  },
-      { title: '编制单位', key: 'prepOrg', dataIndex: 'prepOrg', width: 200 ,align:"center" },
-      {
-        title: '编制日期', key: 'prepTime', dataIndex: 'prepTime', width: 200, align: "center",
-        render: (r) => <span>{r ? moment(r).format("YYYY-MM-DD") : ''}</span>
-       },
-      { title: '批复部门', key: 'apprOrg', dataIndex: 'apprOrg', width: 200 ,align:"center" },
-      {
-        title: '批复日期', key: 'apprTime', dataIndex: 'apprTime', width: 200, align: "center",
-        render: (r) => <span>{r ? moment(r).format("YYYY-MM-DD") : ''}</span>
-       },
-      {
-        title: '文件', key: 'planName', dataIndex: 'planName', width: 200, align: "center",
-        render: (rec, record) => <a onClick={() => reviewFile(record?.files[0])}>{record?.files[0]?.fileName}</a>
-       },
-      { title: '上传时间', key: 'moditime', dataIndex: 'moditime', width: 150,align:"center"  },
-        {
-            title: '操作', dataIndex: 'orgName', key: 'orgName', align: "center",width: 240, fixed: 'right',
-            render: (value, row, index) => (<CrudOpRender_text view={true} del={true} edit={true} command={(cmd) => () => command(cmd)(row)} />)
-         },
-    ];
-    const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-    const [data, setData] = useState([])
-    const getData = async () => {
-        try {
-            const res = await httppost2(apiurl.fxya.page, { resCode: "42120250085",type:2 })
-            let newData = res.data.filter(s => s.type == 2)
-            setData(newData.map((item,i) => ({...item,idx:i+1})))
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-    const download = (params) => {
-      let downloadLink = document.createElement("a");
-          downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/resPlanB/file/download/${params?.fileId}`;
-          downloadLink.download = `${params.fileName}`;
-          downloadLink.style.display = "none";
-          // 将链接添加到页面中
-          document.body.appendChild(downloadLink);
-  
-          // 模拟点击事件，开始下载
-          downloadLink.click();
-    }
-    const reviewFile = (params) => {
-      if (params.fileName.split('.').pop() == "pdf") {
-        setPdfViewOPen(true)
-        setIframeSrc(params)
-      } else {
-        download(params)
-      }
-    }
-    const command = (type) => (params) => {
-        if (type === 'save') {
-          refModal.current.showSave({});
-        } else if (type === 'edit') {
-          refModal.current.showEdit(params)
-        } else if (type === 'view') {
-          refModal.current.showView(params);
-        } else if (type === 'del') {
-          refModal.current.onDeleteGet(apiurl.fxya.delete + `/${params.id}`);
-        } 
-      }
-    useEffect(() => {
-      getData();
-    }, [])
-    
-  return (
-      <div style={{background:"#fff",padding:10}}>
-         <h1><Button type='primary' onClick={() => {refModal.current.showSave({})}}>新增</Button></h1>
-          <Table
-              rowKey="id"
-              columns={columns}
-              dataSource={data}
-              pagination={false}
-              scroll={{
-                x: width,
-                y: "calc( 100vh - 400px )"
-              }} 
-          />
-
-        <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={getData}
-      />
-      
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/resPlanB/file/download/${iframeSrc.fileId}`)}`}
-        />
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/views/fxzb/ddgc/index.less b/src/views/fxzb/ddgc/index.less
deleted file mode 100644
index ad80c0a..0000000
--- a/src/views/fxzb/ddgc/index.less
+++ /dev/null
@@ -1,23 +0,0 @@
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px !important;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/fxya/form.js b/src/views/fxzb/fxya/form.js
deleted file mode 100644
index 07bd6e3..0000000
--- a/src/views/fxzb/fxya/form.js
+++ /dev/null
@@ -1,322 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col,Upload,DatePicker,Modal,message,Image } from 'antd';
-import {PaperClipOutlined,DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined} from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import { httpget2 } from '../../../utils/request';
-import moment from 'moment';
-import "./index.less";
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [loading, setLoading] = useState(false)
-  const [iframeId, setIframeId] = useState('')
-  const [perviewOpen, setPerviewOpen] = useState(false)
-
-  const fileChange = (info) => {
-    console.log("file",info);
-    
-    if (info.file.status === "done") {
-      setLoading(false);
-     setFileList(info.fileList)
-      
-    }
-    if (info.file.status === "uploading") { 
-        setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-        setLoading(false);
-    }
-    if (fileList.length > 0) {
-      return 
-    }
-     setFileList(info.fileList)
-  }
-
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-}
-  const onFinish = async (values) => {
-    if (fileList.length <= 0) {
-      message.error("请上传预案文件")
-      return
-    }
-    let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-    values.resCode = "42120250085"
-    values.type = 1
-    values.files = oldFiles;
-    values.prepTime = moment(values.prepTime).format("YYYY-MM-DD 00:00:00")
-    values.apprTime = moment(values.apprTime).format("YYYY-MM-DD 00:00:00")
-    if (mode === 'edit') {
-      values.id = record?.id;
-      onEdit(apiurl.fxya.update,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.fxya.save,values)
-    }
-  }
-
-  const viewPdf = (params) => {
-    setIframeId(params)
-    setPerviewOpen(true)
-  }
-  const beforeUpload = () => {
-    if (fileList.length > 0) { 
-      message.error("只能上传一个附件");
-      return false;
-    }
-  }
-  const getFileInfo = async(id) => {
-    try {
-        const res = await httpget2(`${apiurl.fxya.getFile}/${id}`)
-        let obj ={
-            name: res.data.fileName,
-            response: {
-              data: {
-                filePath: res.data.filePath,
-                fileId:res.data.fileId
-              }
-            },
-          }
-        setFileList([obj])
-    } catch (error) {
-        console.log(error);
-        
-    }
-  }
-  
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/resPlanB/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  useEffect(() => {
-    if (record && mode != "save") {
-      getFileInfo(record?.files[0]?.fileId)
-    }
-  }, [record,mode])
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="预案名称"
-                name="planName"
-                labelCol={{ span: 3, offset: 0 }}
-                wrapperCol={{span:21,offset:0}}
-                rules={[{ required: true }]}
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={mode==='view'}
-              />
-              </Form.Item>
-          </Col>
-         
-      </Row>
-
-        <Row>
-        <Col span={12}>
-              <Form.Item
-                label="编制单位"
-                name="prepOrg"
-                rules={[{ required: true }]}
-              >
-               <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={mode==='view'}
-              />
-              </Form.Item>
-          </Col>
-           <Col span={12}>
-              <Form.Item
-                label="编制日期"
-                name="prepTime"
-                getValueFromEvent={(e, dateString) => dateString}
-                getValueProps={value => ({
-                  value: value ? moment(value) : undefined
-                })}
-                rules={[{ required: true }]}
-              >
-              <DatePicker allowClear style={{width:'280px'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-        <Col span={12}>
-              <Form.Item
-                label="批复部门"
-                name="apprOrg"
-                rules={[{ required: true }]}
-              >
-               <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={mode==='view'}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="批复日期"
-                name="apprTime"
-                getValueFromEvent={(e, dateString) => dateString}
-                getValueProps={value => ({
-                  value: value ? moment(value) : undefined
-                })}
-                rules={[{ required: true }]}
-              >
-                <DatePicker allowClear style={{width:'280px'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col> 
-        </Row>
-        <Row>
-          <Col span={24}>
-          <Form.Item
-                label="预案文件"
-                name="files"
-                labelCol={{ span: 3, offset: 0 }}
-                wrapperCol={{span:21,offset:0}}
-                rules={[{ required: true }]}
-            >
-               <Upload 
-                name='file'
-                action="/gunshiApp/tsg/resPlanB/file/upload/singleSimple"
-                onChange={fileChange}
-                fileList={fileList}
-                maxCount={1}
-                disabled={loading}
-                showUploadList={false}
-                beforeUpload={beforeUpload}
-              >
-                {mode == "view" ? null :
-              <div style={{display:"flex",alignItems:"center",columnGap:10,color:"#4f85ec",cursor:"pointer"}}>
-              <PaperClipOutlined />
-                    <a style={{ cursor: "pointer" }}>上传附件
-                      <span style={{ marginLeft:10,color:"#dfdfdf" }}>(支持扩展名：.xls .xlsx .doc .docx .pdf .jpg .png)</span></a>
-              </div>
-                }
-          </Upload>
-          </Form.Item>  
-          </Col>
-         
-        </Row>   
-        <Row gutter={[16]} style={{margin:"-25px 0 0 14px"}}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                        </div>
-                        {mode !== "view" && 
-                          <div
-                            className="delete-icon"
-                            onClick={() =>  deleteFile(file.response?.data?.fileId)}
-                          >
-                              <DeleteOutlined />
-                          </div>
-                        }
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-        </Row>
-                
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={perviewOpen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPerviewOpen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/resPlanB/file/download/${iframeId}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/fxya/index.js b/src/views/fxzb/fxya/index.js
deleted file mode 100644
index 01c2b2e..0000000
--- a/src/views/fxzb/fxya/index.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import React,{useEffect,useState,useRef,useMemo} from 'react'
-import { Table, Button,Modal} from 'antd'
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import { httppost2 } from '../../../utils/request';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal2';
-import moment from "moment"
-export default function Zrtx() {
-  const refModal = useRef();
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-    const columns = [
-      { title: '序号', key: 'idx', dataIndex: 'idx', width: 60, align:"center" },
-      { title: '预案名称', key: 'planName', dataIndex: 'planName', width: 200,align:"center"  },
-      { title: '编制单位', key: 'prepOrg', dataIndex: 'prepOrg', width: 200 ,align:"center" },
-      {
-        title: '编制日期', key: 'prepTime', dataIndex: 'prepTime', width: 200, align: "center",
-        render: (r) => <span>{r ? moment(r).format("YYYY-MM-DD") : ''}</span>
-       },
-      { title: '批复部门', key: 'apprOrg', dataIndex: 'apprOrg', width: 200 ,align:"center" },
-      {
-        title: '批复日期', key: 'apprTime', dataIndex: 'apprTime', width: 200, align: "center",
-        render: (r) => <span>{r ? moment(r).format("YYYY-MM-DD") : ''}</span>
-       },
-      {
-        title: '文件', key: 'planName', dataIndex: 'planName', width: 200, align: "center",
-        render: (rec, record) => <a onClick={() => reviewFile(record?.files[0])}>{record?.files[0]?.fileName}</a>
-       },
-      { title: '上传时间', key: 'moditime', dataIndex: 'moditime', width: 150,align:"center"  },
-        {
-            title: '操作', dataIndex: 'orgName', key: 'orgName', align: "center",width: 240, fixed: 'right',
-            render: (value, row, index) => (<CrudOpRender_text view={true} del={true} edit={true} command={(cmd) => () => command(cmd)(row)} />)
-         },
-    ];
-    const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-    const [data, setData] = useState([])
-  const getData = async () => {
-        try {
-            const res = await httppost2(apiurl.fxya.page, { resCode: "42120250085",type:"1" })
-            let newData = res.data.filter(s => s.type == 1)
-            setData(newData.map((item,i) => ({...item,idx:i+1})))
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-    const download = (params) => {
-      let downloadLink = document.createElement("a");
-          downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/resPlanB/file/download/${params?.fileId}`;
-          downloadLink.download = `${params.fileName}`;
-          downloadLink.style.display = "none";
-          // 将链接添加到页面中
-          document.body.appendChild(downloadLink);
-  
-          // 模拟点击事件，开始下载
-          downloadLink.click();
-    }
-    const reviewFile = (params) => {
-      if (params.fileName.split('.').pop() == "pdf") {
-        setPdfViewOPen(true)
-        setIframeSrc(params)
-      } else {
-        download(params)
-      }
-    }
-    const command = (type) => (params) => {
-        if (type === 'save') {
-          refModal.current.showSave({});
-        } else if (type === 'edit') {
-          refModal.current.showEdit(params)
-        } else if (type === 'view') {
-          refModal.current.showView(params);
-        } else if (type === 'del') {
-          refModal.current.onDeleteGet(apiurl.fxya.delete + `/${params.id}`);
-        } 
-      }
-    useEffect(() => {
-      getData();
-    }, [])
-    
-  return (
-      <div style={{background:"#fff",padding:10}}>
-         <h1><Button type='primary' onClick={() => {refModal.current.showSave({})}}>新增</Button></h1>
-          <Table
-              rowKey="id"
-              columns={columns}
-              dataSource={data}
-              pagination={false}
-              scroll={{
-                x: width,
-                y: "calc( 100vh - 400px )"
-              }} 
-          />
-
-        <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={getData}
-      />
-      
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/resPlanB/file/download/${iframeSrc.fileId}`)}`}
-        />
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/views/fxzb/fxya/index.less b/src/views/fxzb/fxya/index.less
deleted file mode 100644
index 46e62de..0000000
--- a/src/views/fxzb/fxya/index.less
+++ /dev/null
@@ -1,23 +0,0 @@
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: -10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/gczx/hdqz/form.js b/src/views/fxzb/gczx/hdqz/form.js
deleted file mode 100644
index 266ee1a..0000000
--- a/src/views/fxzb/gczx/hdqz/form.js
+++ /dev/null
@@ -1,349 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { createCrudService } from '../../../../components/crud/_';
-import apiurl from '../../../../service/apiurl';
-import "../ytygc/index.less"
-import moment from 'moment';
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  if(record.tmStart && record.tmEnd) {
-    record.tmStart = moment(record.tmStart)
-    record.tmEnd = moment(record.tmEnd)
-  }
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-   /**
-   * @description 表单重置
-   */
-   const onReset = () => {
-    form.resetFields();
-  };
-  const onFinish = async(values) => {
-    if(values.meetDate){
-      values.startDate = moment(values.meetDate[0]).format('YYYY-MM-DD HH:mm:ss')
-      values.endDate = moment(values.meetDate[1]).format('YYYY-MM-DD HH:mm:ss')
-      delete values.meetDate
-    }else {
-      values.tmStart = moment(values.tmStart).format('YYYY-MM-DD 00:00:00')
-      values.tmEnd = moment(values.tmEnd).format('YYYY-MM-DD 00:00:00')
-    }
-    values.year = record.year
-    values.relatedObjectId = record.relatedObjectId
-    values.relatedObjectType = "bzProjectManipulationRecord3"
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-      values.id = record.id
-      values.attachList = oldFiles;
-      onEdit(apiurl.fxzb.gczx.ytygc.edit,values)
-    }
-    if (mode === 'save') {
-      values.attachList = fileIds
-      onSave(apiurl.fxzb.gczx.ytygc.save,values)
-    }
-  }
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-    // if (mode === "edit" && flag) {
-    //   createCrudService(apiurl.fxzb.gczx.ytygc.deleteFile + `/${record.id}/${fileId}`).delGet().then(res => {
-    //     if (res.code === 200) {
-    //       setFlag(false)
-    //       message.success("删除附件成功")
-    //       onCrudSuccess()
-    //     }
-    //   })
-    // }
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    console.log(info);
-    let fileIds = info.fileList.map(file => {
-      return {fileId: file.response?.data?.fileId}
-    })
-    console.log(fileIds);
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-     /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  useEffect(()=>{
-    if ((mode === "view" || mode === "edit") && record.attachList.length) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="标题名称"
-                name="title"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="工作开展日期"
-                name="tmStart"
-                labelCol={{ span: 6}}
-                wrapperCol={{ span: 16 }}
-                rules={[{ required: true }]}
-              >
-                 <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="结束日期"
-                name="tmEnd"
-                rules={[{ required: true }]}
-              >
-                <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="主要内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      
-      <Row>
-          <Col span={24}>
-            <Form.Item
-                label="附件"
-                // label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/bzProjectManipulationRecord/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                fileList={fileList}
-                disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                        </div>
-                        {mode !== "view" && 
-                          <div
-                            className="delete-icon"
-                            onClick={() =>  deleteFile(file.response?.data?.fileId)}
-                          >
-                              <DeleteOutlined />
-                          </div>
-                        }
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-   
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button onClick={onReset} style={{marginRight:10}}>
-              重置
-            </Button>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/gczx/hdqz/index.js b/src/views/fxzb/gczx/hdqz/index.js
deleted file mode 100644
index 0e50cc4..0000000
--- a/src/views/fxzb/gczx/hdqz/index.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider, Empty } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import moment from 'moment';
-
-// 页面初始默认查询参数
-const options = {
-  search:{
-    year:moment().format('YYYY')
-  },
-};
-
-const Page = () => {
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [searchVal, setSearchVal] = useState({year:options.search.year})
-  
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '标题名称', key: 'title', dataIndex: 'title', width: 200 },
-    { title: '主要内容', key: 'content', dataIndex: 'content', width: 300},
-    {
-      title: '工作开展日期', key: 'tmStart', dataIndex: 'tmStart', width: 150,
-      render: (rec, record) => <span>{
-        moment(rec).format('YYYY-MM-DD')
-      }</span>
-    },
-    {
-      title: '结束日期  ', key: 'tmEnd', dataIndex: 'tmEnd', width: 150,
-      render: (rec, record) => <span>{
-        moment(rec).format('YYYY-MM-DD')
-      }</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({relatedObjectId:"ro",year:searchVal.year});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params)
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.gczx.ytygc.delete + `/${params.id}`);
-    } 
-  }
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.gczx.ytygc.page).find_noCode,options);
-  useEffect(()=>{
-    // if(isRender.current){
-    //   isRender.current = false
-    //   return
-    // }
-
-    const params = {
-      search: {
-        relatedObjectId: "ro",
-        relatedObjectType:"bzProjectManipulationRecord3",
-        ...searchVal
-      }
-    };
-    search(params)
-
-  },[searchVal])
-
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='AdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')}/>
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="inx"
-              {...tableProps}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-         
-        </div>
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/gczx/hdqz/index.less b/src/views/fxzb/gczx/hdqz/index.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/fxzb/gczx/hdqz/toolbar.js b/src/views/fxzb/gczx/hdqz/toolbar.js
deleted file mode 100644
index cfa47eb..0000000
--- a/src/views/fxzb/gczx/hdqz/toolbar.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-
-const ToolBar = ({ setSearchVal, onSave,}) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="工作开展年度" name="year">
-            <DatePicker onChange={(v)=>setSearchVal({year:v.format('YYYY')})} picker="year" defaultValue={moment()} format={'YYYY'}/>
-          </Form.Item>
-        </Form>
-
-        {
-          
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onSave}>新增</Button>
-          </div>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/TableData.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/TableData.js
deleted file mode 100644
index 55bc614..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center'},
-    {title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/drpOption.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
deleted file mode 100644
index 0afdd02..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  console.log(data);
-  const maxVal = Math.max(...data.map(obj => obj.rz))+1
-  const minVal = Math.min(...data.map(obj => obj.rz))-1
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-
-  let arr =[]
-  const dataList = data.map(item=>{
-    console.log(data);
-    arr.push([item.w,item.rz])
-  })
-  
-  return {
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "10%",
-        right: "20%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "蓄水量",
-        nameGap: -8,
-        type: 'category',
-        data: data.map(o => o.w),
-        // min:Math.floor(minValX),
-        // max:Math.round(maxValX),
-        // interval:GetInterval(minValX,maxValX),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#333',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        // axisTick: {
-        //   show: false,
-        // },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        // symbol: 'none' // 设置标记点为'none'，即去掉圆点
-        symbolSize:10
-      },
-    ]
-  };
-}
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/index.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/index.js
deleted file mode 100644
index 4f6a56d..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-import {zvarl} from "../../../../../../../service/sssq";
-
-function Krqx({record}) {
-  const [data,setData]=useState([])
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  const getData=async (params)=>{
-    setData(await zvarl(params))
-  }
-  useEffect(() => {
-    getData({stcd:record.stcd})
-  }, [record]);
-
-
-  return (
-    <div style={{width: "98%", height: '60vh'}} className="swllgx-sq">
-      <div className="content">
-        <div className="content-left">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default Krqx
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/index.less b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/index.less
deleted file mode 100644
index 6e2608b..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/Krqx/index.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left{
-      width: 48%;
-      max-height: 60vh;
-      overflow: auto;
-    }
-    .content-right{
-      width: 48%;
-      height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/fxya.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/fxya.js
deleted file mode 100644
index 2c57485..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/fxya.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {plan} from "../../../../../../service/sssq";
-
-
-function Fxya({record}) {
-
-  const [data, setData] = useState({})
-  const getData = async (params) => {
-    let obj = await plan(params)
-    setData(obj[0])
-  }
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions column={3} bordered labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.preparation == 1 ? "是" : data?.preparation == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.approval == 1 ? "是" : data?.approval == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="编制时间" style={{width: "16.5%"}}>{data?.prepTime}</Descriptions.Item>
-        <Descriptions.Item label="批复时间">{data?.apprTime}</Descriptions.Item>
-        <Descriptions.Item label="编制单位">{data?.prepOrg}</Descriptions.Item>
-        <Descriptions.Item label="批复部门">{data?.apprOrg}</Descriptions.Item>
-        <Descriptions.Item label="预案文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.apprName}</span>
-        </Descriptions.Item>
-        <Descriptions.Item label="批复文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.planName}</span>
-        </Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Fxya;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/gctp.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/gctp.js
deleted file mode 100644
index 734be0d..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/gctp.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {projectimg, fileget} from "../../../../../../service/sssq";
-import {projDict} from "../../../../../../utils/dictType"
-
-
-function Gctp({record}) {
-  const [data, setData] = useState([])
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const getData = async (params) => {
-    setData(await projectimg(params))
-  }
-
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered layout="vertical" column={3}>
-        {
-          data?.length > 0 ? data?.map(o => <Descriptions.Item label={projDict(o?.projType)}>
-              <div className="no-data">
-                <img src={url + o?.filePath} style={{width: "100%"}} alt=""/>
-              </div>
-            </Descriptions.Item>
-            )
-            : ""
-        }
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Gctp;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/index.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/index.js
deleted file mode 100644
index bc265cc..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { Tabs} from "antd";
-import Jbxx from './jbxx'
-import Krqx from './Krqx'
-import Zrtx from './zrtx'
-import Jzw from './jzw'
-import Jsxx from './jsxx'
-import Gctp from './gctp'
-import Fxya from './fxya'
-import Sjbg from './sjbg'
-
-
-
-function Skjcxx({data}) {
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <>
-      <div>
-        <Tabs defaultActiveKey="1" tabPosition="left" type="card">
-          <Tabs.TabPane tab="基本信息" key="1">
-            <Jbxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="库容曲线" key="2">
-            <Krqx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="责任体系" key="3">
-            <Zrtx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建筑物" key="4">
-            <Jzw record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建设信息" key="5">
-            <Jsxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="工程图片" key="6">
-            <Gctp record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="防汛预案" key="7">
-            <Fxya record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="设计报告" key="8">
-            <Sjbg record={data}/>
-          </Tabs.TabPane>
-
-
-        </Tabs>
-      </div>
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jbxx.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jbxx.js
deleted file mode 100644
index 4c399c4..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jbxx.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {attResBase} from '../../../../../../service/sssq'
-import {engScalDict} from '../../../../../../utils/dictType'
-function Skjcxx({ data }) {
-  const [info,setInfo]=useState({})
-  const getData=async (params)=>{
-    setInfo(await attResBase(params))
-  }
-  useEffect(() => {
-    if (data?.resCode) {
-      getData({resCode:data.resCode})
-    }
-  }, [data]);
-
-  return (
-    <>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="水库名称" style={{ width: '16.5%' }}>{info?.resName}</Descriptions.Item>
-        <Descriptions.Item label="所在地" style={{ width: '16.5%' }}>{info?.resLoc}</Descriptions.Item>
-        <Descriptions.Item label="管理单位" style={{ width: '16.5%' }}>{info?.managName}</Descriptions.Item>
-        <Descriptions.Item label="水库代码">{info?.resCode}</Descriptions.Item>
-        <Descriptions.Item label="注册登记号">{info?.regSn}</Descriptions.Item>
-        <Descriptions.Item label="注册登记时间">{info?.regTime}</Descriptions.Item>
-        <Descriptions.Item label="经度">{info?.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{info?.lttd}</Descriptions.Item>
-        <Descriptions.Item label="高程基准面">{info?.elevDat}</Descriptions.Item>
-        <Descriptions.Item label="所在流域">{info?.basName}</Descriptions.Item>
-        <Descriptions.Item label="所在水系">{info?.wsName}</Descriptions.Item>
-        <Descriptions.Item label="所在河流名称">{info?.rvName}</Descriptions.Item>
-        <Descriptions.Item label="工程规模">{engScalDict(info?.engScal)}</Descriptions.Item>
-        <Descriptions.Item label="水库功能">{info?.rsvFunction}</Descriptions.Item>
-        <Descriptions.Item label="溢洪道是否有闸">{info?.spillwayGate==1?"有":info.spillwayGate==0?"无":""}</Descriptions.Item>
-        <Descriptions.Item label="水库特征参数" span={3}></Descriptions.Item>
-        <Descriptions.Item label="坝址以上控制流域面积(km³)">{info?.watShedArea}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)">{info?.crestElev}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{info?.maxDamHeig}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{info?.calFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万m³)">{info?.totCap}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水时最大下泄流量(m³/s)">{info?.maxDesFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{info?.desFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="调洪库容(万m³)">{info?.storFlCap}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水时最大下泄流量(m³/s)">{info?.maxCalFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="防洪高水位(m)">{info?.uppLevFlco}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万m³)">{info?.flcoCap}</Descriptions.Item>
-        <Descriptions.Item label="下游河道安全流量(m³/s)">{info?.dsSaftFlow}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{info?.normWatLev}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万m³)">{info?.benResCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{info?.deadLev}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万m³)">{info?.deadCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="工程概况" span={3}>{info?.projOverview}</Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jsxx.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jsxx.js
deleted file mode 100644
index 2412f45..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jsxx.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {construction} from "../../../../../../service/sssq";
-
-
-
-function Jsxx({record}) {
-
-  const columns = [
-    {title: '状态', key: '', dataIndex: '', align: 'center',render:rec=>rec.engStat==0?"始建":rec.engStat==1?"扩建":""},
-    {title: '工程开工时间', key: 'startDate', dataIndex: 'startDate', align: 'center'},
-    {title: '投入使用时间', key: 'useDate', dataIndex: 'useDate', align: 'center'},
-    {title: '竣工验收时间', key: 'compDate', dataIndex: 'compDate', align: 'center'},
-    {title: '改扩建内容', key: 'content', dataIndex: 'content', align: 'center'},
-    {title: '第几次扩建', key: 'buildNo', dataIndex: 'buildNo', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await construction(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Jsxx;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jzw.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jzw.js
deleted file mode 100644
index 2cebbec..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/jzw.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions,Table} from "antd";
-import {drainage,dam,transport} from "../../../../../../service/sssq";
-
-
-
-function Jzw({record}) {
-
-  const columns1 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns2 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启用标准', key: 'enableCriteria', dataIndex: 'enableCriteria', align: 'center'},
-  ];
-  const columns3 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '洞(孔)身型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '数量(条或孔)', key: 'num', dataIndex: 'num', align: 'center'},
-    {title: '进口底槛高程(m)', key: 'inletEle', dataIndex: 'inletEle', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns4 = [
-    {title: '设计流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '输水道型式', key: 'transType', dataIndex: 'transType', align: 'center',},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '输水道长度(m)', key: 'transLeng', dataIndex: 'transLeng', align: 'center'},
-    {title: '座教', key: 'num', dataIndex: 'num', align: 'center'},
-  ];
-
-  const [tableDataDs, setTableDataDs] = useState([])
-  const [tableDataXs, setTableDataXs] = useState({})
-  const [tableDataSs, setTableDataSs] = useState([])
-
-  const getData=async (params)=>{
-    setTableDataDs(await dam(params))
-    setTableDataXs(await drainage(params))
-    setTableDataSs(await transport(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <div style={{maxHeight:"60vh",overflow:"auto"}}>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>挡水建筑物</div>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="坝型" style={{ width: '16.5%' }}>{tableDataDs[0]?.damType}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damMaxHeig}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damTopElev}</Descriptions.Item>
-        <Descriptions.Item label="坝顶长度(m)">{tableDataDs[0]?.damTopLen}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{tableDataDs[0]?.damTopWid}</Descriptions.Item>
-        <Descriptions.Item label="坝基防渗体型式">{tableDataDs[0]?.damImpermeableType}</Descriptions.Item>
-        <Descriptions.Item label="副坝座数">{tableDataDs[0]?.subDamNum}</Descriptions.Item>
-        <Descriptions.Item label="副坝总长度(m)">{tableDataDs[0]?.subDamLen}</Descriptions.Item>
-        <Descriptions.Item label="副坝最大坝高(m)">{tableDataDs[0]?.subDamMaxHeig}</Descriptions.Item>
-      </Descriptions>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>泄水建筑物</div>
-      <div className="table-title" style={{padding:"4px"}}>☆正常溢洪道</div>
-      <Table rowKey="inx"
-             sticky
-             size="small"
-             columns={columns1}
-             pagination={false}
-             dataSource={tableDataXs.normalSpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆非常溢洪道</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns2}
-             pagination={false}
-             dataSource={tableDataXs.emergencySpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆泄洪洞</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns3}
-             pagination={false}
-             dataSource={tableDataXs.sluiceGateList}
-      />
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>输水建筑物</div>
-      <Table rowKey="key"
-             sticky
-             size="small "
-             columns={columns4}
-             pagination={false}
-             dataSource={tableDataSs}
-      />
-    </div>
-  )
-}
-
-export default Jzw;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/sjbg.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/sjbg.js
deleted file mode 100644
index f7d62f0..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/sjbg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {file} from "../../../../../../service/sssq";
-
-
-
-function Sjbg({record}) {
-
-  const columns = [
-    {title: '文件名称', key: '', dataIndex: '', align: 'center',render:rec=><span style={{color:"#689FFF"}}>{rec.fileName}</span>},
-    {title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center'},
-    {title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center'},
-    {title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center'},
-    {title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await file(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             bordered
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Sjbg;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/zrtx.js b/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/zrtx.js
deleted file mode 100644
index d78d4ac..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/Skjcxx/zrtx.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {person} from "../../../../../../service/sssq";
-import {repDict} from "../../../../../../utils/dictType"
-
-
-
-function Zrtx({record}) {
-
-  const columns = [
-    {title: '责任人', key: '', dataIndex: '', align: 'center',render:rec=>repDict(rec.repType)},
-    {title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center'},
-    {title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center'},
-    {title: '职务', key: 'position', dataIndex: 'position', align: 'center'},
-    {title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await person(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Zrtx;
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/index.less b/src/views/fxzb/gczx/ytygc/GcTreeSelector/index.less
deleted file mode 100644
index 0e58af7..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/index.less
+++ /dev/null
@@ -1,232 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.GcTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-  .ant-tree-treenode{
-    width: 100%;
-
-    .ant-tree-node-content-wrapper{
-      // width: 100%;
-      // padding-right: 15px;
-      position: static;
-    }
-  }
-}
-// .detail-modal{
-//   .ant-descriptions-item{
-//     border-bottom: 1px solid rgb(232, 232, 232) ;
-//   }
-// }
-.no-matter{
-  opacity: .5;
-}
-
-.tree-container{
-  .ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
-    color:rgba(0, 0, 0, 0.7)
-  }
-}
-.detail-modal{
-  .ant-modal-body{
-
-    .dp-popup-content {
-      position: relative;
-      // box-shadow: 0 1px 2px rgba(0,0,0,.1);
-      pointer-events: auto;
-      //background: rgba(4, 8, 27, 0.9);
-      background: rgba(255, 255, 255, 0.9);
-      border-radius: 0px;
-      padding: 0;
-      margin-top: 20px;
-    }
-    
-    .content-body {
-      color: #333;
-      padding: 0.4rem 0.4rem 0.2rem 0.4rem;
-      position: relative;
-    
-      .cursor-pointer1, .cursor-pointer2, .cursor-pointer3{
-        position: absolute;
-        top:15px;
-        color:#0893FF;
-        cursor:pointer;
-      }
-      .cursor-pointer1{
-        right:145px;
-      }
-      .cursor-pointer2{
-        right:115px;
-      }
-      .cursor-pointer3{
-        right:45px;
-      }
-    
-      .title {
-        display: flex;
-        align-items: center;
-        border-bottom: 1px solid #f0f0f0;
-        padding: 0.2rem 0.6rem 0.4rem 0.6rem;
-        line-height:30px;
-        font-size:16px;
-        background-color: #f7f7f7;
-        color: #007AFD;
-    
-        .icon {
-          width: 1.2rem;
-          height: 1.2rem;
-          flex-shrink: 0;
-          margin-right: 0.5rem;
-        }
-    
-        .name {
-          flex-grow: 1;
-          font-weight:normal;
-          .nameBorder{
-            width: 5px;
-            height: 16px;
-            background-color: #007AFD;
-            margin-right: 10px;
-          }
-        }
-        .flex{
-          display: flex;
-        }
-    
-        .close {
-          flex-shrink: 0;
-          width: 0.8rem;
-          margin: 0 0.1rem 0.1rem 0;
-          cursor: pointer;
-        }
-      }
-    
-      .body {
-        padding: 0.5rem 1rem;
-        .body-row {
-          display: flex;
-          line-height: 2;
-    
-          .row-key {
-            width: 6rem;
-          }
-    
-          .row-value {
-            color: rgb(184, 233, 248)
-          }
-    
-          .row-key-w {
-            width: 10rem;
-          }
-        }
-    
-        .body-row-grid {
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 0.5rem;
-        }
-    
-      }
-        .foot {
-          padding-top: 0.2rem;
-          border-top: 1px solid rgba(36, 136, 223, 0.60);
-          display: flex;
-          justify-content: space-around;
-        }
-    }
-    .dp-popup-tip {
-      border: 10px solid transparent;
-    }
-    
-    
-    .shuichi-border {
-      animation: redred 1000ms 0ms infinite linear;
-    
-      @keyframes redred {
-        0% {
-          fill:  #17abe3;
-        }
-        100% {
-          fill:  #f7d28d;
-        }
-      }
-    }
-    
-    .pulsating-circle {
-      position: absolute;
-      transform: translateX(-50%) translateY(-50%) scaleY(0.6);
-    
-      &:before {
-        content: '';
-        position: relative;
-        display: block;
-        width: 300%;
-        height: 300%;
-        box-sizing: border-box;
-        margin-left: -100%;
-        margin-top: -100%;
-        border-radius: 45px;
-        background-color: #01a4e9;
-        animation: pulse-ring 1.25s cubic-bezier(0.215, 0.61, 0.355, 1) infinite;
-      }
-      
-      &:after {
-        content: '';
-        position: absolute;
-        left: 0; 
-        top: 0;
-        display: block;
-        width: 100%;
-        height: 100%;
-        background-color: rgb(152 218 237);
-        border-radius: 15px;
-        box-shadow: 0 0 8px rgba(0,0,0,.3);
-        animation: pulse-dot 1.25s cubic-bezier(0.455, 0.03, 0.515, 0.955) -.4s infinite;
-      }
-    }
-    
-    .pulsating-circle-blue {
-      &:before {
-        background-color: #01a4e9;
-      }
-    }
-  }
-
-}
-
-@keyframes pulse-ring {
-  0% {
-    transform: scale(.63);
-  }
-  80%, 100% {
-    opacity: 0;
-  }
-}
-
-@keyframes pulse-dot {
-  0% {
-    transform: scale(.8);
-  }
-  50% {
-    transform: scale(1);
-  }
-  100% {
-    transform: scale(.8);
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/gczx/ytygc/GcTreeSelector/index.tsx b/src/views/fxzb/gczx/ytygc/GcTreeSelector/index.tsx
deleted file mode 100644
index f762974..0000000
--- a/src/views/fxzb/gczx/ytygc/GcTreeSelector/index.tsx
+++ /dev/null
@@ -1,426 +0,0 @@
-import React, { useState, useRef,useEffect,forwardRef, useImperativeHandle } from 'react';
-import {Tree, Input, Checkbox, Spin, Modal,Tabs} from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import Jbxx from '../../../../Home/MapCtrl/components/Skjcxx/jbxx'
-import Krqx from '../../../../Home/MapCtrl/components/Skjcxx/Krqx'
-import Zrtx from '../../../../Home/MapCtrl/components/Skjcxx/zrtx'
-import Jzw from '../../../../Home/MapCtrl/components/Skjcxx/jzw'
-import Jsxx from '../../../../Home/MapCtrl/components/Skjcxx/jsxx'
-import Gctp from '../../../../Home/MapCtrl/components/Skjcxx/gctp'
-import Fxya from '../../../../Home/MapCtrl/components/Skjcxx/fxya'
-import Sjbg from '../../../../Home/MapCtrl/components/Skjcxx/sjbg'
-import SdzJbxx from '../../../../Home/MapCtrl/components/sdz/jbxx'
-import SdzZrr from '../../../../Home/MapCtrl/components/sdz/zrr'
-import SdzGctp from '../../../../Home/MapCtrl/components/sdz/gctp'
-import SdzFxya from '../../../../Home/MapCtrl/components/sdz/fxya'
-import SdzSjzl from '../../../../Home/MapCtrl/components/sdz/sjzl'
-import './index.less';
-
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setCode?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  setTag?: any,
-  data?: any,
-  clickHandler?: any,
-  url?:any
-}
-
-const AdcdTreeSelector: React.FC<IProps> = forwardRef(({
-  onSelectFun,
-  clickHandler,
-  setCode,
-  setTag,
-  showCheckbox,
-  tableName,
-  hasAlertBox,
-  data,
-  url
-}, ref) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [itemDetail, setItemDetail] = useState<any>({}) // 树中的每一项的详细信息
-
-  const [open, setOpen] = useState(false)
-  const [keys, setKeys] = useState(1)
-  const selectKeysRef = useRef()
-  console.log("data22",data);
-  
-  useImperativeHandle(ref, () => ({
-    getTreeData: () => {
-      getCustomerTreeData();
-    }
-  }))
-  const TabList1 = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-    {
-      key: '2',
-      label: '库容曲线',
-    },
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '4',
-      label: '建筑物',
-    },
-    {
-      key: '5',
-      label: '建设信息',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计报告',
-    },
-  ]
-  const TabList2 = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计资料',
-    },
-  ]
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    // const adcdTreedata:any = await getGczxGcTreeData(params);
-    const adcdTreedata: any = await url(params);
-    const item:any = adcdTreedata?.[0]?.children?.[0]
-    if (item) {
-      if (selectKeysRef.current) {
-        setSelectedKeys(selectKeysRef.current)
-        setCode(selectKeysRef.current[0])
-      } else {
-        setCode(item.code)
-        setSelectedKeys([item.code])
-        setTag(item.type)
-      }
-      // setCode(item.code)
-      // setSelectedKeys([item.code])
-    }
-
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.sname;
-        // (
-        //   <span  style={{position:'relative'}}>
-        //     {item.sname}
-        //     <div  style={{color:'red',position:'absolute',left:'50px'}}>按钮</div>
-        //   </span>
-        // )
-        item.key = item.code;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue: any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    setSelectedKeys(selectedKeysValue);
-    selectKeysRef.current = selectedKeysValue;
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.code;
-      // if(!adcdLevel){
-      //   const code = selectData.code.substring(0,15);
-      //   if(code.endsWith('000000000')){//县
-      //     adcdVal = selectData.code.substring(0,6);
-      //   }else if(code.endsWith('000000')){//镇
-      //     adcdVal = selectData.code.substring(0,9);
-      //   }else if(code.endsWith('000')){//村
-      //     adcdVal = selectData.code.substring(0,12);
-      //   }else{
-      //     adcdVal = selectData.code;
-      //   }
-      // }else{
-      //   adcdVal = selectData.code;
-      // }
-
-      let params = { code: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode(adcdVal)
-        setTag(selectData.type)
-      }
-    } else {
-      let params = { code: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode("")
-        setTag("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.sname.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-  const onChange = (key:any) => {
-    setKeys(key)
-  }
-  return (
-    <div style={{position:"relative"}} className='GcTreeSelectorStyle '>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }} className='tree-container'>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              titleRender={(v:any)=>{
-                return (<>
-                    {
-                    v.children?.length > 0 ? null :
-                      <>
-                      <div  style={{color:'#a8a8a8',position:'absolute',right:'25px'}} onClick={(e)=>{
-                        e.stopPropagation()
-                        setOpen(true)
-                          setItemDetail(v)
-                          console.log(v);
-                          
-                        clickHandler(v)
-                      }}><FileTextOutlined /></div>
-                      </>
-                  }
-                    <div className={v.status ? "" : "no-matter"}>{v.title}</div>
-                </>)
-              }}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-            />
-          }
-        </div>
-        <Modal
-          title=""
-          width={1000}
-          style={{ height: '646px' }}
-          open={open}
-          footer={null}
-          onCancel={() => {
-            setOpen(false)
-            setKeys(1)
-          }}
-          className='detail-modal'
-          destroyOnClose
-        >
-          <div className="dp-popup-content">
-          <div className="content-body tyb skpop" id='tyb'>
-            <div className="title flexac flex">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {itemDetail.type === 1 ?data?.resName : data?.hystName}
-              </div>
-            </div>
-              <div style={{ padding: '5px', display: 'flex' }}>
-                <>
-                  <Tabs
-                    defaultActiveKey="1"
-                    type="card"
-                    onChange={onChange}
-                    items={itemDetail.type === 1 ? TabList1 : TabList2}
-                    tabPosition='left'
-                    tabBarStyle={{margin:0}}
-                  />
-                  {itemDetail.type == 1 ? 
-                    <div style={{backgroundColor:'#fff',overflowY:'auto',padding:'0 5px 5px 5px'}}>
-                      {keys == 1 && <Jbxx data={data} />}
-                      {keys == 2 && <Krqx record={data} />}
-                      {keys == 3 && <Zrtx record={data} />}
-                      {keys == 4 && <Jzw record={data} />}
-                      {keys == 5 && <Jsxx record={data} />}
-                      {keys == 6 && <Gctp record={data} />}
-                      {keys == 7 && <Fxya record={data} />}
-                      {keys == 8 && <Sjbg record={data} />}
-                    </div> :
-                     <div style={{backgroundColor:'#fff',overflowY:'auto',padding:'0 5px 5px 5px'}}>
-                       {keys == 1 && <SdzJbxx data={data} />}
-                       {keys == 3 && <SdzZrr data={data} />}
-                       {keys == 6 && <SdzGctp data={data} />}
-                       {keys == 7 && <SdzFxya data={data} />}
-                       {keys == 8 && <SdzSjzl data={data} />}
-                   </div>
-                 }
-                
-                </>
-              </div>
-          </div>
-        </div>
-        </Modal>
-      </div>
-
-    </div>
-  );
-});
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/gczx/ytygc/form.js b/src/views/fxzb/gczx/ytygc/form.js
deleted file mode 100644
index 5d02fec..0000000
--- a/src/views/fxzb/gczx/ytygc/form.js
+++ /dev/null
@@ -1,479 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import { createCrudService } from '../../../../components/crud/_';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import moment from 'moment';
-import "./index.less"
-const { Dragger } = Upload;
-const ModalForm = ({ mode, record, onEdit, onSave,onDeleteGet,onCrudSuccess }) => {
-  // 检查结论选项 暂时写死
-  const checkConclusionOption = [
-    {
-      value: '1',
-      label: '无隐患'
-    },
-    {
-      value: '2',
-      label: '需整改'
-    }
-  ]
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const [flag, setFlag] = useState(false)
-  // if (record.tmStart && record.tmEnd) {
-  //   record.tmStart = moment(record.tmStart)
-  //   record.tmEnd = moment(record.tmEnd)
-  //   // record.meetDate = [moment(record.startDate), moment(record.endDate)]
-  // }
-  if (!record.conclusion) {
-    record.conclusion = '1'
-  }
-console.log("record",record);
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-  const onFinish = async (values) => {
-    console.log("values",values)
-      values.tmStart = moment(values.tmStart).format('YYYY-MM-DD 00:00:00')
-      values.tmEnd =values.tmEnd ? moment(values.tmEnd).format('YYYY-MM-DD 00:00:00') :''
-    if (record.adcd) {
-      values.adcd = record.adcd
-    }
-    values.year = record.year
-    values.relatedObjectId = record.relatedObjectId
-    values.relatedObjectType = "bzProjectManipulationRecord1"
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-      values.attachList = oldFiles;
-      values.id = record.id
-      onEdit(apiurl.fxzb.gczx.ytygc.edit,values)
-    }
-    if (mode === 'save') {
-      values.attachList = fileIds
-      onSave(apiurl.fxzb.gczx.ytygc.save,values)
-    }
-  }
-
-  /**
-   * @description 表单重置
-   */
-  const onReset = () => {
-    form.resetFields();
-  };
-
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-    // if (mode === "edit"&& flag) {
-    //   createCrudService(apiurl.fxzb.gczx.ytygc.deleteFile + `/${record.id}/${fileId}`).delGet().then(res => {
-    //     if (res.code === 200 ) {
-    //       message.success("删除附件成功")
-    //       setFlag(false)
-    //       onCrudSuccess()
-    //     }
-    //   })
-    // }
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return {fileId: file.response?.data?.fileId}
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-
-    /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  // const getFileInfo = (params) => {
-  //       console.log(params);
-  //       let fileArr=[]
-  //          params?.attachList.forEach(item => {
-  //            createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`).delGet()
-  //              .then(res => {
-  //             if (res.code === 200) { 
-  //               setFlag(true)
-  //               fileArr.push({
-  //                 name: res.data.fileName,
-  //                 response: {
-  //                   data: {
-  //                     filePath: res.data.filePath,
-  //                     fileId:res.data.fileId
-  //                   }
-  //                 },
-  //               })
-  //             }
-  //           }).catch(err => console.log(err))
-  //         }); 
-  //         setFileList(fileArr)
-  //       }
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-  useEffect(()=>{
-    if (mode === "view" || mode === "edit") {
-      getFileInfo(record)
-      form.setFieldsValue({
-        ...record,
-        tmEnd: record.tmEnd ? moment(record.tmEnd) : null,
-        tmStart: record.tmStart ? moment(record.tmStart) : null
-      })
-      }
-  },[mode,record])
-
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="标题名称"
-                name="title"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="防汛检查日期"
-                name="tmStart"
-                rules={[{ required: true }]}
-              >
-                <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode === 'view'}
-                /> 
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="主办单位"
-                name="orgName"
-                // rules={[{ required: true }]}
-              >
-                 {/* <NormalSelect disabled={mode!=='save'} style={{width:'100%'}} allowClear options={[]}/> */}
-                 <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="检查人员"
-                name="personnelIdsType1"
-                // rules={[{ required: true }]}
-              >
-                {/* <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD HH:mm"  
-                  style={{width:'100%'}}
-                /> */}
-                 {/* <RangePicker  style={{width:'100%'}} disabled={mode==='view'}/> */}
-                 <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="主要检查内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode ==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="检查结论"
-                name="conclusion"
-                rules={[{ required: true }]}
-              >
-              <NormalSelect
-                disabled={mode == 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={checkConclusionOption}
-                // defaultValue="1"
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="问题描述"
-                name="problemDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理意见及建议"
-                name="suggestion"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="整改完成时间"
-                name="tmEnd"
-              >
-                <DatePicker 
-                  // showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                /> 
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="问题整改情况"
-                name="situation"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      
-      <Row>
-          <Col span={24}>
-            <Form.Item
-               label="附件"
-                // label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/bzProjectManipulationRecord/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={fileList}
-                  disabled={loading}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-               }
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item' : 'file-item'}>
-                        <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          {
-                          mode !== "view" &&  
-                        <div className='delete-icon'
-                          onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        }
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-             </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-     
-
-      {
-        mode==='view' ? null : (
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button onClick={onReset} style={{marginRight:10}}>
-              重置
-            </Button>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/gczx/ytygc/index.js b/src/views/fxzb/gczx/ytygc/index.js
deleted file mode 100644
index 63d3d13..0000000
--- a/src/views/fxzb/gczx/ytygc/index.js
+++ /dev/null
@@ -1,181 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider, Empty } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import GcTreeSelector from "./GcTreeSelector";
-import {getAdcdTreeData1, getGczxGcTreeData} from '../../../../service/warn';
-import Form from './form'
-import moment from 'moment';
-
-// 页面初始默认查询参数
-const options = {
-  search:{
-    year:moment().format('YYYY')
-  },
-};
-
-
-const Page = () => {
-  const refModal = useRef();
-  const treeRef = useRef();
-  const isRender = useRef(true)
-  const [code, setCode] = useState()
-  const [tag, setTag] = useState()
-  const [searchVal, setSearchVal] = useState({year:options.search.year})
-  const [projectInfo, setProjectInfo] = useState({})
-  const [fetchTree, setFetchTree] = useState(false)
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '标题名称', key: 'title', dataIndex: 'title', width: 200 },
-    {
-      title: '防汛检查日期', key: 'tmStart', dataIndex: 'tmStart', width: 140,
-      render: (rec, record) => <span>{
-        moment(rec).format('YYYY-MM-DD')
-      }</span>
-    },
-    { title: '主办单位', key: 'orgName', dataIndex: 'orgName', width: 140 },
-    {
-      title: '检查结论', key: 'conclusion', dataIndex: 'conclusion', width: 150,
-      render: (_, record) => {
-        return (
-          <span>
-            {record.conclusion == "1" ? "无隐患" : '需整改'}
-          </span>
-        )
-      }
-    },
-    { title: '问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 200 },
-    {
-      title: '整改完成日期', key: 'tmEnd', dataIndex: 'tmEnd', width: 200,
-      render: (rec, record) => <span>{
-        rec ?
-        moment(rec).format('YYYY-MM-DD') : ''
-      }</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    console.log("params", params);
-    if (type === 'save') {
-      refModal.current.showSave({relatedObjectId:code, year:searchVal.year});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.gczx.ytygc.delete + `/${params.id}`);
-    } 
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.gczx.ytygc.page).find_noCode, options);
-   /**
-   * @description 获取工程相关信息
-   */
-   const getProjectInfo = (params) => {
-    createCrudService(apiurl.sssq.attResBase).delGet({ resCode: params }).then(res => {
-      if (res.code == 200) {
-        let data = res.data
-        setProjectInfo(data)
-      }
-    })
-  }
-
-  /**
-   * @description 获取水电站相关信息
-   */
-  const getStationInfo = (code) => {
-    createCrudService(apiurl.station.hydropowerStation.list).delGet().then(res => {
-      if (res.code == 200) {
-        let data = res.data.find(item => item.hystCode == code)
-        setProjectInfo(data)
-      }
-    })
-  }
-  const clickHandler = (v) => {
-    if (v.type == 1) {
-      getProjectInfo(v.code)
-    } else {
-      getStationInfo(v.code)
-    }
-    // console.log("v",v);
-    // getProjectInfo(v.code)
-    // setProjectInfo({reCode: v.code})
-  }
-  useEffect(()=>{
-    if(isRender.current){
-      isRender.current = false
-      return
-    }
-
-    const params = {
-      search: {
-        relatedObjectId: code,
-        relatedObjectType:"bzProjectManipulationRecord1",
-        ...searchVal
-      }
-    };
-    if (code && searchVal) {
-      search(params)
-      // treeRef.current.getTreeData()
-    }
-
-  },[code,searchVal])
-  useEffect(() => {
-    if (tableProps.dataSource?.length === 1) {
-        treeRef.current.getTreeData()
-   }
- }, [tableProps.dataSource])
- 
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <GcTreeSelector
-            setCode={setCode}
-            setTag={setTag}
-            showCheckbox={false}
-            hasAlertBox={false}
-            data={projectInfo}
-            clickHandler={clickHandler}
-            ref={treeRef}
-            url={getGczxGcTreeData}
-          />
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')}/>
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/gczx/ytygc/index.less b/src/views/fxzb/gczx/ytygc/index.less
deleted file mode 100644
index 694974c..0000000
--- a/src/views/fxzb/gczx/ytygc/index.less
+++ /dev/null
@@ -1,40 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.view-file{
-    margin-left: 12% ;
-}
-.upload-file{
-    margin-left: 92%;
-}
-.disable-icon{
-    pointer-events: none;
-    cursor: not-allowed !important;
-}
-
-.ant-card-body ::-webkit-scrollbar{
-    height: 10px !important;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/gczx/ytygc/toolbar.js b/src/views/fxzb/gczx/ytygc/toolbar.js
deleted file mode 100644
index 9cd1141..0000000
--- a/src/views/fxzb/gczx/ytygc/toolbar.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-
-const ToolBar = ({ setSearchVal, onSave,}) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="防汛检查年度" name="year">
-            <DatePicker onChange={(v)=>setSearchVal({year:v.format('YYYY')})} picker="year" defaultValue={moment()} format={'YYYY'}/>
-          </Form.Item>
-        </Form>
-
-        {
-          
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onSave}>新增</Button>
-          </div>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/gczx/zjgc/form.js b/src/views/fxzb/gczx/zjgc/form.js
deleted file mode 100644
index 760c901..0000000
--- a/src/views/fxzb/gczx/zjgc/form.js
+++ /dev/null
@@ -1,484 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import { createCrudService } from '../../../../components/crud/_';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import moment from 'moment';
-import "../ytygc/index.less"
-const { Dragger } = Upload;
-const ModalForm = ({ mode, record, onEdit, onSave,onDeleteGet,onCrudSuccess }) => {
-  // 检查结论选项 暂时写死
-  const checkConclusionOption = [
-    {
-      value: '1',
-      label: '无隐患'
-    },
-    {
-      value: '2',
-      label: '需整改'
-    }
-  ]
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const [flag, setFlag] = useState(false)
-  if (record.tmStart && record.tmEnd) {
-    record.tmStart = moment(record.tmStart)
-    record.tmEnd = moment(record.tmEnd)
-    // record.meetDate = [moment(record.startDate), moment(record.endDate)]
-  }
-  if (!record.conclusion) {
-    record.conclusion = '1'
-  }
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-
-  const onFinish = async (values) => {
-    if(values.meetDate){
-      values.startDate = moment(values.meetDate[0]).format('YYYY-MM-DD HH:mm:ss')
-      values.endDate = moment(values.meetDate[1]).format('YYYY-MM-DD HH:mm:ss')
-      delete values.meetDate
-    } else {
-      values.tmStart = moment(values.tmStart).format('YYYY-MM-DD 00:00:00')
-      values.tmEnd =values.tmEnd ? moment(values.tmEnd).format('YYYY-MM-DD 00:00:00') :''
-    }
-    if (record.adcd) {
-      values.adcd = record.adcd
-    }
-    values.year = record.year
-    values.relatedObjectId = record.relatedObjectId
-    values.relatedObjectType = "bzProjectManipulationRecord2"
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-      values.attachList = oldFiles;
-      values.id = record.id
-      onEdit(apiurl.fxzb.gczx.ytygc.edit,values)
-    }
-    if (mode === 'save') {
-      values.attachList = fileIds
-      onSave(apiurl.fxzb.gczx.ytygc.save,values)
-    }
-  }
-
-  /**
-   * @description 表单重置
-   */
-  const onReset = () => {
-    form.resetFields();
-  };
-
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-    // if (mode === "edit"&& flag) {
-    //   createCrudService(apiurl.fxzb.gczx.ytygc.deleteFile + `/${record.id}/${fileId}`).delGet().then(res => {
-    //     if (res.code === 200 ) {
-    //       message.success("删除附件成功")
-    //       setFlag(false)
-    //       onCrudSuccess()
-    //     }
-    //   })
-    // }
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return {fileId: file.response?.data?.fileId}
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-
-    /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  // const getFileInfo = (params) => {
-  //       console.log(params);
-  //       let fileArr=[]
-  //          params?.attachList.forEach(item => {
-  //            createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`).delGet()
-  //              .then(res => {
-  //             if (res.code === 200) { 
-  //               setFlag(true)
-  //               fileArr.push({
-  //                 name: res.data.fileName,
-  //                 response: {
-  //                   data: {
-  //                     filePath: res.data.filePath,
-  //                     fileId:res.data.fileId
-  //                   }
-  //                 },
-  //               })
-  //             }
-  //           }).catch(err => console.log(err))
-  //         }); 
-  //         setFileList(fileArr)
-  //       }
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-  useEffect(()=>{
-    if (mode === "view" || mode === "edit") {
-      getFileInfo(record)
-      form.setFieldsValue({
-        ...record,
-        tmEnd: record.tmEnd ? moment(record.tmEnd) : null,
-        tmStart: record.tmStart ? moment(record.tmStart) : null
-      })
-      }
-  },[mode,record])
-
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="标题名称"
-                name="title"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="防汛检查日期"
-                name="tmStart"
-                rules={[{ required: true }]}
-              >
-                <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                /> 
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="主办单位"
-                name="orgName"
-                // rules={[{ required: true }]}
-              >
-                 {/* <NormalSelect disabled={mode!=='save'} style={{width:'100%'}} allowClear options={[]}/> */}
-                 <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="检查人员"
-                name="personnelIdsType1"
-                // rules={[{ required: true }]}
-              >
-                {/* <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD HH:mm"  
-                  style={{width:'100%'}}
-                /> */}
-                 {/* <RangePicker  style={{width:'100%'}} disabled={mode==='view'}/> */}
-                 <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="主要检查内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode ==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="检查结论"
-                name="conclusion"
-                rules={[{ required: true }]}
-              >
-              <NormalSelect
-                disabled={mode == 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={checkConclusionOption}
-                // defaultValue="1"
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="问题描述"
-                name="problemDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理意见及建议"
-                name="suggestion"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="整改完成时间"
-                name="tmEnd"
-              >
-                <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                /> 
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="问题整改情况"
-                name="situation"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                // rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/bzProjectManipulationRecord/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info); }}
-                fileList={fileList}
-                disabled={loading}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-               }
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}>
-                        <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                        </div>
-                        {
-                          mode !== "view" &&  
-                        <div className='delete-icon'
-                          onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        }
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-             </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-     
-
-      {
-        mode==='view' ? null : (
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button onClick={onReset} style={{marginRight:10}}>
-              重置
-            </Button>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/gczx/zjgc/index.js b/src/views/fxzb/gczx/zjgc/index.js
deleted file mode 100644
index ac654b3..0000000
--- a/src/views/fxzb/gczx/zjgc/index.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Descriptions,Modal } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import ListSelect from "../../../../components/Form/ListSelect1";
-import moment from 'moment';
-
-// 页面初始默认查询参数
-const options = {
-  search:{
-    // adcd: 'hbs',
-    year:moment().format('YYYY')
-  },
-};
-
-const Page = () => {
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [adcd, setAdcd] = useState(options.search.adcd)
-  const [searchVal, setSearchVal] = useState({year:options.search.year})
-  const [open, setOpen] = useState(false)
-  const [listData, setListData] = useState([])
-  const [itemDetail, setItemDetail] = useState({})
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '标题名称', key: 'title', dataIndex: 'title', width: 200 },
-    {
-      title: '防汛检查日期', key: 'tmStart', dataIndex: 'tmStart', width: 140,
-      render: (rec, record) => <span>{
-        moment(rec).format('YYYY-MM-DD')
-      }</span>
-    },
-    { title: '主办单位', key: 'orgName', dataIndex: 'orgName', width: 140 },
-    {
-      title: '检查结论', key: 'conclusion', dataIndex: 'conclusion', width: 150,
-      render: (_, record) => {
-        return (
-          <span>
-            {record.conclusion == "1" ? "无隐患" : '需整改'}
-          </span>
-        )
-      }
-    },
-    { title: '问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 200 },
-    {
-      title: '整改完成日期', key: 'tmEnd', dataIndex: 'tmEnd', width: 200,
-      render: (rec, record) => <span>{
-        rec ?
-        moment(rec).format('YYYY-MM-DD') : ''
-      }</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({relatedObjectId:adcd, year:searchVal.year});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.gczx.ytygc.delete + `/${params.id}`);
-    } 
-  }
-
-  
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.gczx.ytygc.page).find_noCode,options);
-  /**
-   * @description 图标点击回调
-   * @param {v}  
-   * @param {Boolen} bool 打开弹框
-   */
-  const clickHandler = (v,bool) => {
-    console.log(v);
-    setOpen(bool)
-    setItemDetail(v)
-  }
-
-  /**
-   * @description 获取左边内容的列表
-   */
-  const getLeftList = () => {
-    createCrudService(apiurl.fxzb.gczx.zjgc.list).delGet().then(res => {
-      if (res.code === 200) {
-        setListData(res.data)
-      }
-    });
-  }
-  useEffect(() => {
-    // if(isRender.current){
-    //   isRender.current = false
-    //   return
-    // }
-    const params = {
-      search: {
-        relatedObjectId: adcd,
-        relatedObjectType:"bzProjectManipulationRecord2",
-        ...searchVal
-      }
-    };
-    if (adcd && searchVal) {
-      search(params)
-    }
-    // search(params)
-
-  },[adcd,searchVal])
-
-  useEffect(() => {
-   getLeftList()
- }, [tableProps.dataSource])
- 
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <ListSelect
-            setAdcd={setAdcd}
-            clickHandler={clickHandler}
-            listData={listData}
-          />
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')}/>
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-        <Modal
-          title={<span className='basic-info'>{ itemDetail?.projNm}</span>}
-          open={open}
-          onCancel={() => setOpen(false)}
-          footer={null}
-          className='detail-modal'
-        >
-          <Descriptions >
-            <Descriptions.Item label="工程名称" span={3}>{itemDetail?.projNm || "-"}</Descriptions.Item>
-            <Descriptions.Item label="业主单位" span={3}>{itemDetail?.ownerUnit || "-"}</Descriptions.Item>
-            <Descriptions.Item label="工程开工日期" span={3}>{itemDetail?.startDate || "-"}</Descriptions.Item>
-            <Descriptions.Item label="工程主要内容" span={3}>{itemDetail?.content || "-"}</Descriptions.Item>
-            <Descriptions.Item label="防汛联系人" span={3}>{itemDetail?.contactPerson || "-"}</Descriptions.Item>
-            <Descriptions.Item label="联系电话" span={3}>{itemDetail?.phone || "-"}</Descriptions.Item>
-           </Descriptions>
-        </Modal>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/gczx/zjgc/toolbar.js b/src/views/fxzb/gczx/zjgc/toolbar.js
deleted file mode 100644
index 9cd1141..0000000
--- a/src/views/fxzb/gczx/zjgc/toolbar.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-
-const ToolBar = ({ setSearchVal, onSave,}) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="防汛检查年度" name="year">
-            <DatePicker onChange={(v)=>setSearchVal({year:v.format('YYYY')})} picker="year" defaultValue={moment()} format={'YYYY'}/>
-          </Form.Item>
-        </Form>
-
-        {
-          
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onSave}>新增</Button>
-          </div>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/hsybjs/form.js b/src/views/fxzb/hsybjs/form.js
deleted file mode 100644
index 4831b7a..0000000
--- a/src/views/fxzb/hsybjs/form.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, InputNumber , Switch,message,Image,Modal,Radio } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import { httppost2 } from '../../../utils/request';
-
-import moment from 'moment';
-const ModalForm = ({ mode, record,onEdit,onSave,close }) => {
-  
-  console.log("record",record);
-  const [form] = Form.useForm();
-  const [staCodeList, setStaCodeList] = useState([])
-  const [checked, setChecked] = useState(true)
-
-  const onFinish = async(values) => {
-    const userId = localStorage.getItem("userId");
-    const userName = localStorage.getItem("userName");
-
-    const params = {
-      ...values,
-      forecastTm: record.tms.forecastTime,
-      projectTm: record.tms.projectTm,
-      startTm: record.tms.startTime,
-      endTm: record.tms.endTime,
-      forecastPeriod: record.tms.forecastPeriod,
-      forecastWarm: record.tms.forecastWarm,
-      type: record.tms.type,
-      voList:record.data,
-      userId:userId+'_'+userName
-    }
-
-    if (mode === 'save') {
-      // onEdit(apiurl.fxdd_xyt.hsyb.hsybjs.rgjhyb.save,params)
-      const {code, data} = await httppost2(apiurl.fxdd_xyt.hsyb.hsybjs.rgjhyb.save,params)
-      if(code===200){
-        message.success('保存成功')
-        close()
-      }else{
-        message.error('保存失败')
-      }
-    }
-  }
-
-  
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={{...record, name:'洪水预报'+moment(record.tms.forecastTime).format('YYYYMMDDHH')+'方案'}}
-      >
-      <Form.Item
-        label="方案名称"
-        name="name"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
-        rules={[{ required: true }]}
-      >
-        <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-      </Form.Item>
-      {
-        mode==='view'?null:(
-          <>
-            <Form.Item {...btnItemLayout}>
-              <Button type="primary" htmlType="submit">
-                    {mode === 'save' ? '保存' :
-                      mode === "similarSave" ? "保存" :
-                      '修改'}
-              </Button>
-            </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/hsybjs/index.js b/src/views/fxzb/hsybjs/index.js
deleted file mode 100644
index 9951097..0000000
--- a/src/views/fxzb/hsybjs/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card } from 'antd';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable';
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2 } from '../../../utils/request';
-import moment from 'moment';
-import ToolBar from './toolbar';
-import './index.less'
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import Page1 from './page1/index.js';
-import Page2 from './page2/index.js'
-import ModalForm from './form';
-
-
-
-const Page = () => {
-  const [tabVal, setTabVal] = useState('1')
-  const [data, setData] = useState({data:[],tms:{}})
-  const refModal = useRef();
-  console.log('datalist',data);
-  
-  const save = ()=>{
-    if(data?.data?.length!==0){
-      refModal.current.showSave(data) 
-    }
-}
-
-  return (
-      <div className='fxdd_hsybjs'>
-        <div className='fxdd_hsybjs_toolbar'>
-          <div className={tabVal==='1'?'fxdd_hsybjs_toolbar_item hsybjs_checked':'fxdd_hsybjs_toolbar_item'} onClick={()=>setTabVal('1')}>人工交互预报</div>
-          <div className={tabVal==='2'?'fxdd_hsybjs_toolbar_item hsybjs_checked':'fxdd_hsybjs_toolbar_item'} onClick={()=>setTabVal('2')}>自动滚动预报</div>
-        </div>
-        <div className='fxdd_hsybjs_content'>
-          {
-            tabVal==='1'?
-            <>
-              <div className='fxdd_hsybjs_content_item1'><ToolBar setData={setData} save={save}/></div>
-              <div className='fxdd_hsybjs_content_item2'><Page1 data={data}/></div>
-            </>:null
-          }
-          {
-            tabVal==='2'?
-            <>
-              <div className='fxdd_hsybjs_content_item3'>
-                <Page2 data={data.data}/>
-              </div>
-            </>:null
-          }
-        </div>
-
-        <BasicCrudModal
-            width={500}
-            style={{top:'150px'}}
-            ref={refModal}
-            title="方案"
-            component={ModalForm}
-        />
-      </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/hsybjs/index.less b/src/views/fxzb/hsybjs/index.less
deleted file mode 100644
index e2cab3e..0000000
--- a/src/views/fxzb/hsybjs/index.less
+++ /dev/null
@@ -1,85 +0,0 @@
-.fxdd_hsybjs{
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-
-    .fxdd_hsybjs_toolbar{
-        width: 100%;
-        height: 40px;
-        display: flex;
-
-        .fxdd_hsybjs_toolbar_item{
-            width: 140px;
-            height: 40px;
-            line-height: 40px;
-            margin-right: 5px;
-            border-radius: 10px 10px 0 0;
-            background: #D7DFEB;
-            border: 1px solid rgba(228, 231, 237, 1);
-            text-align: center;
-            font-size: 14px;
-            font-weight: 500;
-            color: #333;
-            cursor: pointer;
-        }
-        .hsybjs_checked{
-            color: #409EFF;
-            background: #ffffff;
-        }
-        .fxdd_hsybjs_toolbar_item:hover{
-            color: #409EFF;
-        }
-        
-    }
-    .fxdd_hsybjs_content{
-        flex: 1;
-        display: flex;
-        width: 100%;
-        
-        .fxdd_hsybjs_content_item1{
-            width: 310px;
-            height: 100%;
-            padding: 10px 30px;
-            border: 1px solid rgba(233, 233, 233, 1);
-            background: #ffffff;
-            margin-right: 10px;
-            box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.0470588235294118);
-
-            .fxdd_hsybjs_content_item1_button1{
-                width: 100%;
-                display: flex;
-                justify-content: space-between;
-
-                .ant-btn{
-                    width: 100px;
-                    border-radius: 5px;
-                }
-            }
-            .fxdd_hsybjs_content_item1_button2{
-                width: 100%;
-                .ant-btn{
-                    width: 100%;
-                    border-radius: 5px;
-                }
-            }
-        }
-        .fxdd_hsybjs_content_item2{
-            flex: 1;
-            height: 100%;
-            display: flex;
-            flex-direction: column;
-            border: 1px solid rgba(233, 233, 233, 1);
-            background: #ffffff;
-            box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.0470588235294118);
-        }
-        .fxdd_hsybjs_content_item3{
-            width: 100%;
-            height: 100%;
-            border: 1px solid rgba(233, 233, 233, 1);
-            background: #ffffff;
-            margin-right: 10px;
-            box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.0470588235294118);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/hsybjs/page1/drpOption.js b/src/views/fxzb/hsybjs/page1/drpOption.js
deleted file mode 100644
index 1377aac..0000000
--- a/src/views/fxzb/hsybjs/page1/drpOption.js
+++ /dev/null
@@ -1,700 +0,0 @@
-import * as echarts from 'echarts';
-import moment from 'moment';
-
-export default function drpOption({data,tms}) {
-  const list1 = []
-  data.map(i=>{
-    if(i.ycSwHValue!==null){list1.push(i.ycSwHValue)}
-    if(i.realSwHValue!==null){list1.push(i.realSwHValue)}
-    if(i.flLowLimLev!==null){list1.push(i.flLowLimLev)}
-  })
-  const maxSw = list1.length===0?200:Math.max(...list1)
-  const minSw = list1.length===0?0:Math.min(...list1)
-
-
-  const list2 = []
-  data.map(i=>{
-    if(i.ycRkQValue!==null){list2.push(i.ycRkQValue)}
-    if(i.realRkQValue!==null){list2.push(i.realRkQValue)}
-    if(i.ycCkQValue!==null){list2.push(i.ycCkQValue)}
-    if(i.realCkQValue!==null){list2.push(i.realCkQValue)}
-  })
-
-  const maxLl = list2.length===0?200:Math.max(...list2)
-  const minLl = list2.length===0?0:Math.min(...list2)
-
-  const list3 = []
-  data.map((i=>{
-    if(i.drp!==null){list3.push(i.drp)}
-  }))
-  const maxYl = list3.length===0?200:Math.max(...list3)
-  const minYl = list3.length===0?0:Math.min(...list3)
-
-  const getVal = (val)=>{
-    if(val===null||val===undefined){
-      return '-'
-    }else{
-      return Number(val).toFixed(2)
-    }
-  }
-
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-      formatter: function (params,b) {
-        // params 是一个数组，数组中包含每个系列的数据信息
-        let result = '时间：'+params[0].axisValueLabel+'<br/>';
-        params.forEach(function (item) {
-            // item 是每一个系列的数据
-            const seriesName = item.seriesName; // 系列名称
-            const value = item.value; // 数据值
-            const marker = item.marker; // 标志图形
-            if(value!==undefined && seriesName!=='预报时间'){
-              result += `${marker}${seriesName}: ${value}<br/>`;
-            }
-        });
-        return result;
-      }
-    },
-    grid: [
-      {
-        top: '15%',
-        left: '5%',
-        right: '5%',
-        width: '90%',
-        height: '25%'
-      },
-      {
-        top: '15%',
-        left: '5%',
-        right: '5%',
-        width: '90%',
-        height: '25%'
-      },
-      {
-        bottom: '5%',
-        left: '5%',
-        right: '5%',
-        width: '90%',
-        height: '45%'
-      },
-    ],
-    legend: {
-      top:'3%',
-      // 显示图例
-      show: true,
-      // 图例的位置
-      // data: ["降雨量","预测雨量","实测水位","预报水位","汛限水位","实测入库流量","预报入库流量","实测出库流量","预报出库流量"],
-      data: [
-        {
-          name: '降雨量',
-        },
-        {
-          name: '预测雨量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ycjyicon.svg`
-        },
-        {
-          name: '实测水位',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/scswicon.svg`
-        },
-        {
-          name: '预报水位',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ybswicon.svg`
-        },
-        {
-          name: '汛限水位',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/xxswicon2.svg`
-        },
-        {
-          name: '实测入库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/scrkicon.svg`
-        },
-        {
-          name: '预报入库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ybrkllicon.svg`
-        },
-        {
-          name: '实测出库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/scckllicon.svg`
-
-        },
-        {
-          name: '预报出库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ybckllicon.svg`
-        },
-      ],
-    },
-    xAxis: [
-      //降雨量的图
-      {
-        gridIndex: 0,
-        type: 'category',
-        offset:100,
-        // inverse: true,
-        data: data.map(o => o.tm),
-
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          show: false
-        },
-        axisLine: {
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1
-          }
-          
-        },
-        axisTick: {
-          show: false,
-          alignWithLabel: true
-        }
-      },
-      //预测雨量的图
-      {
-        gridIndex: 1,
-        type: 'category',
-        // inverse: true,
-        data: data.map(o => o.tm),
-
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          show: false
-        },
-        axisLine: {
-          show: false,
-          // lineStyle: {
-          //   color: 'rgb(170, 170, 170)',
-          //   width: 1
-          // }
-          
-        },
-        axisTick: {
-          show: false,
-          alignWithLabel: true
-        }
-      },
-      //流量水位的图
-      {
-        gridIndex: 2,
-        type: 'category',
-        data: data.map(o => o.tm),
-        // inverse: true,
-        inverse: false,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          padding: [0, 0, 100, 0],
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.slice(5,16)
-        },
-        axisLine: {
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      },
-    ],
-    yAxis: [
-      {
-        gridIndex: 0,
-        inverse: true,
-        type: 'value',
-        position: 'left',
-        name: '降雨量(mm)',
-        nameTextStyle: {
-          padding: [0, 0, 0, -5],
-          color:'#333333',
-          fontSize: 12
-        },
-        nameLocation: 'start',
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170,0.5)',
-            width: 0.25,
-            // type: 'line'
-          }
-        },
-        max: Math.ceil((6*maxYl-minYl)/5),
-        min: minYl===0?0:Math.floor((6*minYl-maxYl)/5)
-      },
-      {
-        gridIndex: 1,
-        inverse: true,
-        type: 'value',
-        nameLocation: 'start',
-        axisLabel: {
-          // color: '#333',
-          fontSize: 0
-        },
-        axisLine: {
-          lineStyle: {
-            // color: 'rgb(170, 170, 170)',
-            width: 0,
-          }
-        },
-        axisTick: {
-          show: false
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            // color: 'rgb(170, 170, 170,0.5)',
-            width: 0,
-            // type: 'line'
-          }
-        },
-        max: Math.ceil((6*maxYl-minYl)/5),
-        min: minYl===0?0:Math.floor((6*minYl-maxYl)/5)
-      },
-      {
-        gridIndex: 2,
-        type: 'value',
-        position: 'left',
-        name: "流量(m³/s)",
-        nameTextStyle: {
-          padding: [0, 0, 0, -20],
-          color:'#333333',
-          fontSize: 12
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170,0.5)',
-            width: 0.25,
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        max: Math.ceil((6*maxLl-minLl)/5),
-        min: minLl===0?0:Math.floor((6*minLl-maxLl)/5)
-      },
-      {
-        gridIndex: 2,
-        type: 'value',
-        position: 'right',
-        name: "水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, 0, 55],
-          color:'#333333',
-          fontSize: 12
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        max: Math.ceil((6*maxSw-minSw)/5),
-        min: minSw===0?0:Math.floor((6*minSw-maxSw)/5)
-      },
-    ],
-    series: [
-      {
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        name: '降雨量',
-        type: 'bar',
-        barWidth: '50%',
-        data: data.map((v) => {
-          //"0"真实数据，“1”预报数据
-          if (v.ispreDrp==='0') {
-            return getVal(v.drp)
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#007AFD',
-        },
-        label: {
-          show: false
-        },
-      },
-      {
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        name: '预报时间',
-        type: 'bar',
-        barWidth: '2px',
-        data: data.map((v) => {
-          if (v.tm===tms.forecastTime) {
-            return maxYl*1.2
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#e35650',
-        },
-        label: {
-          show: true,
-          position: 'top',
-          formatter: '预报时间'
-        },
-      },
-      {
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        name: '占位',
-        type: 'bar',
-        barWidth: '50%',
-        barGap:'0%',
-        data: data.map((v) => null),
-        itemStyle: {
-          color: '#dbe6fb',
-          barBorderWidth:'2',
-          barBorderColor:'#007AFD',
-          borderType: "dotted"//这一行属性就是虚线
-        },
-        label: {
-          show: false
-        }
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '预测雨量',
-        type: 'bar',
-        barWidth: '50%',
-        data: data.map((v) => {
-          //"0"真实数据，“1”预报数据
-          if (v.ispreDrp==='1') {
-            return getVal(v.drp)
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#dbe6fb',
-          barBorderWidth:'2',
-          barBorderColor:'#007AFD',
-          borderType: "dotted"//这一行属性就是虚线
-        },
-        label: {
-          show: false
-        },
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '占位',
-        type: 'bar',
-        barWidth: '50%',
-        barGap:'0%',
-        data: data.map((v) => null),
-        itemStyle: {
-          color: '#dbe6fb',
-          barBorderWidth:'2',
-          barBorderColor:'#007AFD',
-          borderType: "dotted"//这一行属性就是虚线
-        },
-        label: {
-          show: false
-        }
-      },
-      {
-        //渐变背景
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        type: 'line',
-        markArea: {
-          data: [
-              [{
-                  xAxis: tms.startTime||''
-              }, {
-                  xAxis: tms.forecastTime||''
-              }]
-          ],
-          itemStyle: {
-            normal: {
-                color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
-                    offset: 0, color: 'rgba(255, 0, 0, 0.1)' // 0% 处的颜色
-                }, {
-                    offset: 1, color: 'rgba(255, 255, 0, 0)' // 100% 处的颜色
-                }], false)
-            }
-          }
-        }
-      },
-
-
-
-
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '实测入库流量',
-        type: 'line',
-        color: "#82b87e",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.realRkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '预报入库流量',
-        type: 'line',
-        color: "#82b87e",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.ycRkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markPoint: {
-          data: [
-            { type: "max", name: "最大值" },
-            // { type: "min", name: "最小值" },
-          ],
-          symbol:'circle',
-          symbolSize:10,
-          label:{
-            show:false,
-            position: [-15, -20]
-          }
-        },
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '实测出库流量',
-        type: 'line',
-        color: "#e5625c",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.realCkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '预报出库流量',
-        type: 'line',
-        color: "#e5625c",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.ycCkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markPoint: {
-          data: [
-            { type: "max", name: "最大值" },
-            // { type: "min", name: "最小值" },
-          ],
-          symbol:'circle',
-          symbolSize:10,
-          label:{
-            show:false,
-            position: [-15, -20]
-          }
-        },
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '实测水位',
-        type: 'line',
-        color: "#4b85f0",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.realSwHValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报水位',
-        type: 'line',
-        color: "#4b85f0",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.ycSwHValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markPoint: {
-          data: [
-            { type: "max", name: "最大值" },
-            // { type: "min", name: "最小值" },
-          ],
-          symbol:'circle',
-          symbolSize:10,
-          label:{
-            show:false,
-            position: [-15, -20]
-          }
-        },
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报-实测',
-        type: 'line',
-        color: "#4b85f0",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.swHDValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '汛限水位',
-        type: 'line',
-        color: "#f2ca6b",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.flLowLimLev)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markArea: {
-          data: [
-              [{
-                xAxis: tms.startTime||''
-              }, {
-                  xAxis: tms.forecastTime||''
-              }]
-          ],
-          itemStyle: {
-            normal: {
-                color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
-                    offset: 0, color: 'rgba(255, 0, 0, 0.1)' // 0% 处的颜色
-                }, {
-                    offset: 1, color: 'rgba(255, 255, 0, 0)' // 100% 处的颜色
-                }], false)
-            }
-          }
-        }  
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报时间',
-        type: 'bar',
-        barWidth: '2px',
-        z:2,
-        data: data.map((v) => {
-          if (v.tm===tms.forecastTime) {
-            return maxSw*1.2
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#e35650',
-        }
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报时间',
-        type: 'bar',
-        barWidth: '2px',
-        barGap:'-100%',
-        z:3,
-        data: data.map((v) => {
-          if (v.tm===tms.projectTm) {
-            return 0//maxSw*1.2
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#a1fcfd',
-          backgroundColor: {
-              image: require("../../../../assets/icons/arrow.png")
-          }
-        },
-        label: {
-          offset:[0,10],
-          show: true,
-          position: 'top',
-          formatter: function(value, index) {
-            return `{img0|}`;
-        },
-        rich: {
-            value: {
-                fontsize: 20
-            },
-            img0: {
-                height: 100,
-                width: 10,
-                backgroundColor: {
-                    image: `${process.env.PUBLIC_URL}/assets/xyt/fxdd/dqsj2.svg`
-                }
-            }, 
-          }
-        },
-      },
-    ]
-  };
-}
diff --git a/src/views/fxzb/hsybjs/page1/index.js b/src/views/fxzb/hsybjs/page1/index.js
deleted file mode 100644
index ad028d6..0000000
--- a/src/views/fxzb/hsybjs/page1/index.js
+++ /dev/null
@@ -1,143 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { Form, Input, Button, Table, Radio } from 'antd';
-import { EyeOutlined } from '@ant-design/icons';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption';
-import moment from 'moment';
-import './index.less'
-import ModalForm1 from './table1'
-
-const Page = ({data}) => {
-    const [tab,setTab] = useState('1')
-    const refModal = useRef();
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', align:"center", render: (text, rec, index) => index + 1 },
-        { title: '时间', key: 'tm', dataIndex: 'tm', align:"center",render:v=>v.slice(0, 16)},
-        { title: '降雨量(mm)', key: 'drp', dataIndex: 'drp', align:"center", render:(v,row)=>{
-            const val = v===null?'-':Number(v).toFixed(2)
-            return <div style={{display:'flex',alignItems:'center',justifyContent:'center'}}>{val}{row.ispreDrp==='1'?<div style={{marginLeft:'5px',width:'20px',height:'20px',borderRadius:"10px",border:'1px solid rgb(245, 154, 35)',color:'rgb(245, 154, 35)',display:'flex',alignItems:'center',justifyContent:'center',fontSize:'12px'}}>预</div>:null}</div>
-        }},
-        { title: '实测水位(m)', key: 'realSwHValue', dataIndex: 'realSwHValue', align:"center", render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '预报水位(m)', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center" ,render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '入库流量(m³/s)', key: 'realRkQValue', dataIndex: 'realRkQValue',  align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '预报入库流量(m³/s)', key: 'ycRkQValue', dataIndex: 'ycRkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '实际出库流量(m³/s)', key: 'realCkQValue', dataIndex: 'realCkQValue',  align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '预报出库流量(m³/s)', key: 'ycCkQValue', dataIndex: 'ycCkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-      ];
-
-    return (
-        <>
-        <div className='fxdd_hsybjs_content_item2_toolbar'>
-            <img width={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/icon.png`} alt=""/>
-            洪水预报明细信息
-            <div className='fxdd_hsybjs_content_item2_toolbar_tab'>
-            <Radio.Group onChange={(e)=>{setTab(e.target.value)}} defaultValue="1">
-                <Radio.Button value="1">数据图</Radio.Button>
-                <Radio.Button value="2">数据表</Radio.Button>
-            </Radio.Group>
-            </div>
-        </div>
-        <div className='fxdd_hsybjs_content_item2_toolbar2'>
-            <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报最高调洪水位(m):<span>{data?.tms?.ycMaxSwH?.toFixed(2)}</span></div>
-            <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报最大入库流量(m³/s):<span>{data?.tms?.ycMaxRkQ?.toFixed(2)}</span></div>
-            <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报最大下泄流量(m³/s):<span>{data?.tms?.ycMaxCkQ?.toFixed(2)}</span></div>
-            <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报洪水总量(万m³):<span>{data?.tms?.ycSumFlood?.toFixed(2)}</span></div>
-        </div>
-        <div className='fxdd_hsybjs_content_item2_content'>
-            {
-                tab==='1'?
-                    data?.data?.length>0?
-                    <ReactEcharts option={drpOption(data)} style={{width: "100%", height: '60%'}}/>
-                    :<div style={{textAlign: "center", margin: "10%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-                :null
-            }
-            {
-                tab==='1'?
-                <>
-                <div className='fxdd_hsybjs_content_item2_content_flow'>
-                    <div className='fxdd_hsybjs_content_item2_content_flow_item'>
-                        <div className='fxdd_hsybjs_content_item2_content_flow_item_item1'>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon'><div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon2'>1</div></div>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon3'>
-                                <img width={'100%'} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/xuxian.svg`} alt="" />
-                            </div>
-                        </div>
-                        <div style={{padding:'5px 0',color:'#000000',fontSize:'16px',fontWeight:500}}>洪水预报配置</div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>操作人员：<span style={{color:'#409EFF'}}></span></div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>操作时间：<span style={{color:'#409EFF'}}>{moment().format('YYYY-MM-DD HH:00')}</span></div>
-                    </div>
-                    <div className='fxdd_hsybjs_content_item2_content_flow_item'>
-                        <div className='fxdd_hsybjs_content_item2_content_flow_item_item1'>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon'><div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon2'>2</div></div>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon3'>
-                                <img width={'100%'} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/xuxian.svg`} alt="" />
-                            </div>
-                        </div>
-                        <div style={{padding:'5px 0',color:'#000000',fontSize:'16px',fontWeight:500}}>产流计算</div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>执行状态：<span style={{color:'#409EFF'}}>计算完成</span><span style={{cursor:'pointer',marginLeft:'5px'}}><EyeOutlined style={{color:'#448ef7'}} onClick={()=>refModal.current.showView({list:data.data,type:'产流计算'})}/></span></div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>操作时间：<span style={{color:'#409EFF'}}>{moment().format('YYYY-MM-DD HH:00')}</span></div>
-                    </div>
-                    <div className='fxdd_hsybjs_content_item2_content_flow_item'>
-                        <div className='fxdd_hsybjs_content_item2_content_flow_item_item1'>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon'><div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon2'>3</div></div>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon3'>
-                                <img width={'100%'} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/xuxian.svg`} alt="" />
-                            </div>
-                        </div>
-                        <div style={{padding:'5px 0',color:'#000000',fontSize:'16px',fontWeight:500}}>汇流计算</div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>执行状态：<span style={{color:'#409EFF'}}>计算完成</span><span style={{cursor:'pointer',marginLeft:'5px'}}><EyeOutlined style={{color:'#448ef7'}} onClick={()=>refModal.current.showView({list:data.data,type:'汇流计算'})}/></span></div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>操作时间：<span style={{color:'#409EFF'}}>{moment().format('YYYY-MM-DD HH:00')}</span></div>
-                    </div>
-                    <div className='fxdd_hsybjs_content_item2_content_flow_item'>
-                        <div className='fxdd_hsybjs_content_item2_content_flow_item_item1'>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon'><div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon2'>4</div></div>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon3'>
-                                <img width={'100%'} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/xuxian.svg`} alt="" />
-                            </div>
-                        </div>
-                        <div style={{padding:'5px 0',color:'#000000',fontSize:'16px',fontWeight:500}}>调洪试算</div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>执行状态：<span style={{color:'#409EFF'}}>计算完成</span><span style={{cursor:'pointer',marginLeft:'5px'}}><EyeOutlined style={{color:'#448ef7'}} onClick={()=>refModal.current.showView({list:data.data,type:'调洪试算'})}/></span></div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>操作时间：<span style={{color:'#409EFF'}}>{moment().format('YYYY-MM-DD HH:00')}</span></div>
-                    </div>
-                    <div className='fxdd_hsybjs_content_item2_content_flow_item'>
-                        <div className='fxdd_hsybjs_content_item2_content_flow_item_item1'>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon'><div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon2'>5</div></div>
-                            <div className='fxdd_hsybjs_content_item2_content_flow_item_item1_icon3'>
-                                {/* <img width={'100%'} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/xuxian.svg`} alt="" /> */}
-                            </div>
-                        </div>
-                        <div style={{padding:'5px 0',color:'#000000',fontSize:'16px',fontWeight:500}}>完成</div>
-                        {/* <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>操作人员：<span style={{color:'#409EFF'}}>计算完成</span></div>
-                        <div style={{padding:'2px 0',color:'#666666',fontSize:'14px',fontWeight:400}}>操作时间：<span style={{color:'#409EFF'}}>{moment().format('YYYY-MM-DD HH:00')}</span></div> */}
-                    </div>
-                </div>
-                </>
-                :null
-            }
-            {
-                tab==='2'?
-                <div className="colorTable" style={{padding:"10px 30px"}}>
-                    <Table rowKey="id"
-                        sticky
-                        columns={columns}
-                        pagination={false}
-                        dataSource={data.data}
-                        scroll={{ y: "650px"}}
-                    />
-                </div>:null
-            }
-        </div>
-
-        <BasicCrudModal
-            width={1000}
-            style={{top:'150px'}}
-            ref={refModal}
-            title=""
-            component={ModalForm1}
-        />
-        </>
-    );
-}
-
-export default Page;
\ No newline at end of file
diff --git a/src/views/fxzb/hsybjs/page1/index.less b/src/views/fxzb/hsybjs/page1/index.less
deleted file mode 100644
index c59d2a8..0000000
--- a/src/views/fxzb/hsybjs/page1/index.less
+++ /dev/null
@@ -1,103 +0,0 @@
-.fxdd_hsybjs_content_item2_toolbar{
-    padding: 0 20px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    width: 100%;
-    height: 40px;
-    display: flex;
-    align-items: center;
-    font-size: 16px;
-    font-weight: 500;
-
-    img{
-        margin-right: 10px;
-    }
-    .fxdd_hsybjs_content_item2_toolbar_tab{
-        flex: 1;
-        margin-right: 30px;
-        text-align: right;
-    }
-}
-.fxdd_hsybjs_content_item2_toolbar2{
-    padding: 0 20px;
-    margin: 0 20px;
-    background: #F7F7F7;
-    border-radius: 5px;
-    display: flex;
-
-    .fxdd_hsybjs_content_item2_toolbar_content{
-        width: 24%;
-        height: 40px;
-        line-height: 40px;
-        font-size: 16px;
-        font-weight: 500;
-
-        span{
-            margin-left: 10px;
-            font-weight: 600;
-            color: #333;
-        }
-    }
-}
-.fxdd_hsybjs_content_item2_content{
-    width: 100%;
-    flex: 1;
-    // background: red;
-
-
-    .fxdd_hsybjs_content_item2_content_flow{
-        margin: 10px 20px;
-        margin-top: 40px;
-        height: 150px;
-        padding: 0 50px;
-        background: rgba(245, 248, 255, 1); 
-        display: flex;
-        align-items: center;
-
-        .fxdd_hsybjs_content_item2_content_flow_item{
-            // width: 24%;
-            height: 100px;
-
-
-            .fxdd_hsybjs_content_item2_content_flow_item_item1{
-                width: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: flex-start;
-
-                .fxdd_hsybjs_content_item2_content_flow_item_item1_icon{
-                    margin-right: 10px;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    width: 23px;
-                    height: 23px;
-                    border-radius: 23px;
-                    border: 1px solid #8c8c8c;
-                    .fxdd_hsybjs_content_item2_content_flow_item_item1_icon2{
-                        width: 18px;
-                        height: 18px;
-                        border-radius: 20px;
-                        background: rgb(128, 174, 252);
-                        font-size: 14px;
-                        color: #ffffff;
-                        font-weight: 500;
-                        text-align: center;
-                        line-height: 18px;
-                    }
-                }
-                .fxdd_hsybjs_content_item2_content_flow_item_item1_icon3{
-                    flex: 1;
-                    display: flex;
-                    align-items: center;
-                    overflow: hidden;
-                }
-            }
-
-            .fxdd_hsybjs_content_item2_content_flow_item_item2{
-                padding: 10px 0;
-
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/hsybjs/page1/table1.js b/src/views/fxzb/hsybjs/page1/table1.js
deleted file mode 100644
index a4a20c8..0000000
--- a/src/views/fxzb/hsybjs/page1/table1.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { useEffect, useState, useRef, useMemo } from 'react';
-import { Form, Input, Button, Table, Radio } from 'antd';
-import { EyeOutlined } from '@ant-design/icons';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption';
-import moment from 'moment';
-import './index.less'
-
-
-const Page = ({record}) => {
-    const columns = useMemo(()=>{
-        if(record.type==='产流计算'){
-            return [
-                { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-                { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-                { title: '面雨量P(mm)', key: 'drp', dataIndex: 'drp', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '土壤含水量Pa(mm)', key: 'pa', dataIndex: 'pa', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '径流深R(mm)', key: 'r', dataIndex: 'r', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-              ];
-        }else if(record.type==='汇流计算'){
-            return [
-                { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-                { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-                { title: '预测入库流量', key: 'ycRkQValue', dataIndex: 'ycRkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-              ];
-        }else{
-            return [
-                { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-                { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-                { title: '实测水位(m)', key: 'realSwHValue', dataIndex: 'realSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '预测水位(m)', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '预测入库流量', key: 'ycRkQValue', dataIndex: 'ycRkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '预测出库流量', key: 'ycCkQValue', dataIndex: 'ycCkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '库容(万 ㎡)', key: 'nowCap', dataIndex: 'nowCap', align:"center",
-                    render:(v,row)=>{
-                        const val = v===null?'-':Number(v).toFixed(2)
-                        return <div style={{display:'flex',alignItems:'center',justifyContent:'center'}}>{val}{row.realSwHValue===null?<div style={{marginLeft:'5px',width:'20px',height:'20px',borderRadius:"10px",border:'1px solid rgb(245, 154, 35)',color:'rgb(245, 154, 35)',display:'flex',alignItems:'center',justifyContent:'center',fontSize:'12px'}}>预</div>:null}</div>
-                    }
-                },
-              ];
-        }
-    },[record])
-    
-
-    return (
-        <>
-            <div className="colorTable" style={{padding:"0px 0px"}}>
-                <Table rowKey="id"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={record.list}
-                    scroll={{ y: "60vh"}}
-                />
-            </div>
-        </>
-    );
-}
-
-export default Page;
\ No newline at end of file
diff --git a/src/views/fxzb/hsybjs/page2/form.js b/src/views/fxzb/hsybjs/page2/form.js
deleted file mode 100644
index 4473eda..0000000
--- a/src/views/fxzb/hsybjs/page2/form.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, InputNumber , Switch,message,Image,Modal,Radio } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { httppost2 } from '../../../../utils/request';
-
-import moment from 'moment';
-
-const jg = [
-  {label:'0.5',value:'0.5'},
-  {label:'1',value:'1'},
-  {label:'3',value:'3'},
-  {label:'6',value:'6'},
-  {label:'12',value:'12'},
-  {label:'24',value:'24'},
-]
-
-const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
-  
-  console.log("record",record);
-  const [form] = Form.useForm();
-  const [staCodeList, setStaCodeList] = useState([])
-  const [checked, setChecked] = useState(true)
-  console.log(checked);
-
-  const onFinish = (values) => {
-    const userId = localStorage.getItem("userId");
-    const userName = localStorage.getItem("userName");
-
-    const params = {
-      ...values,
-      status:checked?'0':'1',
-      userId:userId+'_'+userName
-    }
-
-    console.log(params);
-    if (mode === 'edit') {
-      params.id = record.id;
-      onEdit(apiurl.fxdd_xyt.hsyb.hsybjs.zdgdyb.edit,params)
-    }
-    if (mode === 'save') {
-      onEdit(apiurl.fxdd_xyt.hsyb.hsybjs.zdgdyb.save,params)
-    }
-  }
-
-  useEffect(()=>{
-    if(mode==='edit'){
-      setChecked(record.status==='0'?true:false)
-    }
-  },[])
-
-  
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}
-      >
-      <Form.Item
-        label="预报任务名称"
-        name="name"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
-        rules={[{ required: true }]}
-      >
-        <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-      </Form.Item>
-      <Form.Item
-        label="预见期(小时)："
-        name="forecastPeriod"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
-        rules={[{ required: true }]}
-      >
-        <InputNumber min={1} max={24} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-      </Form.Item>
-      <Form.Item
-        label="预热期(天)："
-        name="forecastWarm"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
-        rules={[{ required: true }]}
-      >
-        <InputNumber min={1} max={7} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-      </Form.Item>
-      <Form.Item
-        label="间隔(小时)"
-        name="timeInterval"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
-        rules={[{ required: true }]}
-      >
-        <NormalSelect options={jg} style={{ width: '100%' }} />
-      </Form.Item>
-      <Form.Item
-        label="状态"
-        name="status"
-      >
-        <Switch
-          size='default'
-          checkedChildren='启用'
-          unCheckedChildren='禁用'
-          onChange={e => setChecked(e)}
-          checked={checked}
-        />
-      </Form.Item>
-      {
-        mode==='view'?null:(
-          <>
-            <Form.Item {...btnItemLayout}>
-              <Button type="primary" htmlType="submit">
-                    {mode === 'save' ? '保存' :
-                      mode === "similarSave" ? "保存" :
-                      '修改'}
-              </Button>
-            </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/hsybjs/page2/index.js b/src/views/fxzb/hsybjs/page2/index.js
deleted file mode 100644
index 2f301f4..0000000
--- a/src/views/fxzb/hsybjs/page2/index.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Switch,Form,Input,Button,Row,Col,message } from 'antd';
-import ModalForm from './form';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { httppost, httppost2 } from '../../../../utils/request';
-const Page = () => {
-  const typeObj = {
-    1: "渗压监测",
-    2: "渗流监测",
-    3:"位移监测"
-  }
-  const levelObj = {
-    1: "黄色",
-    2:"红色"
-  }
-
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '预报任务名称', key: 'name', dataIndex: 'name', width: 140,align:"center", },
-    { title: '预见期(小时)', key: 'forecastPeriod', dataIndex: 'forecastPeriod', width: 140,align:"center", },
-    { title: '预热期(天)', key: 'forecastWarm', dataIndex: 'forecastWarm', width: 140,align:"center", },
-    { title: '间隔(小时)', key: 'timeInterval', dataIndex: 'timeInterval', width: 140,align:"center", },
-    { title: '状态', key: 'status', dataIndex: 'status', width: 140,align:"center",render:(v,row)=>
-        <Switch
-          size='default'
-          checkedChildren='启用'
-          unCheckedChildren='禁用'
-          onChange={e => getChecked(e,row)}
-          checked={v==='0'?true:false}
-        />
-    },
-    { title: '创建日期', key: 'updateTm', dataIndex: 'updateTm', width: 140,align:"center", },
-    { title: '创建人', key: 'userId', dataIndex: 'userId', width: 140,align:"center",render:(v)=>v?.split('_')?.[1] },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxdd_xyt.hsyb.hsybjs.zdgdyb.del + `/${params.id}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxdd_xyt.hsyb.hsybjs.zdgdyb.page).find_noCode);
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-        "orderField":"chtm",
-        "isAsc":false
-      }
-    };
-    search(params)
-  }, [searchVal])
-
-
-  const getChecked = async(checked,row)=>{
-    const params = {
-      ...row,
-      status : checked?'0':'1'
-    }
-    const { code } = await httppost2(apiurl.fxdd_xyt.hsyb.hsybjs.zdgdyb.edit,params)
-    if(code!==200){
-      message.error('修改失败')
-      return
-    }
-      refresh({search:{'orderField':'chtm','isAsc':false}})
-      message.success('修改成功')
-
-  }
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-        <BasicCrudModal
-          width={500}
-          style={{top:'150px'}}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={()=>refresh({search:{'orderField':'chtm','isAsc':false}})}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/hsybjs/page2/toolbar.js b/src/views/fxzb/hsybjs/page2/toolbar.js
deleted file mode 100644
index ee42c7b..0000000
--- a/src/views/fxzb/hsybjs/page2/toolbar.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-const ToolBar = ({ onSave }) => {
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form className='toolbarBox' layout="inline">
-          <Form.Item>
-            <Button type="primary" htmlType="submit" onClick={onSave} style={{padding:'0 20px', borderRadius:'5px',height:'30px',fontWeight:'500'}}>新建自动预报配置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/hsybjs/toolbar/index.js b/src/views/fxzb/hsybjs/toolbar/index.js
deleted file mode 100644
index c0bd94a..0000000
--- a/src/views/fxzb/hsybjs/toolbar/index.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import { Form, Input, Button, InputNumber, DatePicker, message } from 'antd';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import moment from 'moment';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import { useEffect } from 'react';
-
-const options1 = []
-for(let i=1; i<25; i++){
-    options1.push({
-        label:i,
-        value:i
-    })
-}
-
-
-const ToolBar = ({setData,save}) => {
-    const [form] = Form.useForm();
-    const initialValues = {
-        yjq:24,
-        yrq:1,
-        ybsj:moment(),
-        kssj:moment().add(-1,'days'),
-        jssj:moment().add(24,'hours'),
-    }
-
-    const onFinish = async(value)=>{
-        const params = {
-            forecastTime: moment(value.ybsj).format('YYYY-MM-DD HH:00:00'),
-            startTime: moment(value.kssj).format('YYYY-MM-DD HH:00:00'),
-            endTime: moment(value.jssj).format('YYYY-MM-DD HH:00:00'),
-            forecastPeriod:value.yjq,
-            forecastWarm:value.yrq,
-        }
-        const { code ,data, description } = await httppost2(apiurl.fxdd_xyt.hsyb.hsybjs.rgjhyb.list,params)
-        if(code!==200){
-            if(description){
-                message.error(description)
-            }else{
-                message.error('查询失败')
-            }
-            return
-        }
-        if( data?.voList?.length === 0 ){
-            message.info('所选时间段内无数据')
-        }
-        setData({data:[...data?.voList||[]],tms:{
-            forecastTime: data.forecastTm,
-            projectTm: data.projectTm,
-            startTime: data.startTm,
-            endTime: data.endTm,
-            forecastPeriod: data.forecastPeriod,
-            forecastWarm: data.forecastWarm,
-            type:data.type,
-            ycMaxSwH:data.ycMaxSwH,
-            ycMaxRkQ:data.ycMaxRkQ,
-            ycMaxCkQ:data.ycMaxCkQ,
-            ycSumFlood:data.ycSumFlood,
-        }})
-    }
-
-    useEffect(()=>{
-        onFinish({
-            ybsj:initialValues.ybsj.format('YYYY-MM-DD HH:00:00'),
-            kssj:initialValues.kssj.format('YYYY-MM-DD HH:00:00'),
-            jssj:initialValues.jssj.format('YYYY-MM-DD HH:00:00'),
-            yjq:initialValues.yjq,
-            yrq:initialValues.yrq,
-        })
-    },[])
-
-    return (
-        <>
-            <Form form={form} className='toolbarBox' layout="vertical" initialValues={initialValues} onFinish={onFinish}>
-            <Form.Item 
-                label="预见期(小时)：" 
-                name="yjq" 
-                rules={[{ required: true }]} 
-                style={{margin:'0px'}}
-                getValueFromEvent={(e,dateString) => {
-                    const formVal = form.getFieldsValue()
-                    const etm = moment(formVal.ybsj).add(e,'hours')
-                    form.setFieldsValue({jssj:etm})
-                    return e
-                }}
-            >
-                <NormalSelect options={options1}/>
-            </Form.Item>
-            <Form.Item 
-                label="预热期(天)：" 
-                name="yrq" 
-                rules={[{ required: true }]} 
-                style={{margin:'0px'}}
-                getValueFromEvent={(e,dateString) => {
-                    const formVal = form.getFieldsValue()
-                    const stm = moment(formVal.ybsj).add(0-e,'days')
-                    form.setFieldsValue({kssj:stm})
-                    return e
-                }}
-            >
-                <InputNumber min={1} max={7} style={{width:'100%'}}/>
-            </Form.Item>
-            <Form.Item 
-                label="预报时间：" 
-                name="ybsj" 
-                rules={[{ required: true }]} 
-                style={{margin:'0px'}}
-                getValueFromEvent={(e,dateString) => {
-                    const formVal = form.getFieldsValue()
-                    const stm = moment(e).add(0-formVal.yrq,'days')
-                    const etm = moment(e).add(formVal.yjq,'hours')
-                    form.setFieldsValue({kssj:stm,jssj:etm})
-                    return e
-                }}
-            >
-                <DatePicker 
-                    allowClear 
-                    showTime 
-                    format='YYYY-MM-DD HH:00' 
-                    style={{width:'100%'}}
-                    disabledDate={(e)=>{
-                        return moment(e).isAfter(moment())
-                    }}
-                    disabledTime={(e)=>{
-                        return moment(e).format('HH')<=moment().format('HH')
-                    }}
-                />
-            </Form.Item>
-            <Form.Item label="开始时间：" name="kssj" style={{margin:'0px'}}>
-                <DatePicker allowClear showTime disabled format='YYYY-MM-DD HH:00' style={{width:'100%'}}/>
-            </Form.Item>
-            <Form.Item label="结束时间：" name="jssj">
-                <DatePicker allowClear showTime disabled format='YYYY-MM-DD HH:00' style={{width:'100%'}}/>
-            </Form.Item>
-            <Form.Item style={{marginBottom:'10px'}}>
-                <div className='fxdd_hsybjs_content_item1_button1'>
-                    <Button type="primary" htmlType="submit">计算</Button>
-                    <Button onClick={()=>{
-                        form.setFieldsValue(initialValues)
-                    }}>重置</Button>
-                </div>
-            </Form.Item>
-            <Form.Item>
-                <div className='fxdd_hsybjs_content_item1_button2'>
-                    <Button type="primary" onClick={save}>保存方案</Button>
-                </div>
-            </Form.Item>
-            </Form>
-        </>
-    );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/jczw/sqz/index.js b/src/views/fxzb/jczw/sqz/index.js
deleted file mode 100644
index 427aeaa..0000000
--- a/src/views/fxzb/jczw/sqz/index.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import {Collapse, Checkbox, Button, Space, Modal, Radio} from 'antd'
-import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-
-const Page = () => {
-    const dispatch = useDispatch();
-    const [count,setCount] = useState({})
-    const [sh,setSh] = useState(true)
-    const [sw,setSw] = useState(true)
-    const [gcz,setGcz] = useState(true)
-
-    const getCount = async()=>{
-        const res = await httpget2(apiurl.fxzb.jczw.sqz.list)
-        if(res.data && res.data.length>0){
-            const obj = {}
-            res.data.map((i)=>{
-                obj[i.sname] = i.count
-            })
-            setCount(obj)
-        }
-    }
-
-    useEffect(()=>{
-        if(JSON.stringify(count)==='{}'){
-            getCount()
-        }
-        dispatch.map.setLayerVisible({'HdswAllLayer': true});
-        dispatch.map.setLayerVisible({'AdcdLayer': true });
-        dispatch.map.setSqz({
-            SH:sh,
-            SW:sw,
-            SK:gcz,
-          });
-        
-        return ()=>{
-            dispatch.runtime.closeFeaturePopAll()
-            dispatch.map.setLayerVisible({'HdswAllLayer': false});
-            dispatch.map.setLayerVisible({'AdcdLayer': true });
-        }
-
-    },[sh,sw,gcz])
-
-
-  return (
-    <>
-      <div className="waterBox" style={{height:"calc(100vh - 90px)", width: "18rem",borderRadius:'3px',boxShadow:'5px 5px 10px rgba(0, 0, 0, 0.1)', top:'4px'}}>
-            <Space direction="vertical" size='middle' style={{padding:'10px',paddingTop:'20px'}}> 
-                <Checkbox checked={!!sh} onChange={(e)=>setSh(e.target.checked)} style={{display:'flex',alignItems:'center'}}>
-                    <div style={{display:'flex',alignItems:'center',marginTop:'6px'}}>
-                        <div style={{width:'0px',height:'0px', borderLeft:'10px solid transparent', borderRight:'10px solid transparent', borderTop:'25px solid #0f0', marginRight:'5px',marginTop:'6px',position:'relative'}}>
-                            <div style={{position:'absolute',left:'-6px',top:'-25px',fontSize:'12px'}}>
-                                山
-                            </div>
-                        </div>
-                        <div>山洪 ({count?.['山洪']||0})</div>
-                    </div>
-                </Checkbox>
-                <Checkbox checked={!!sw} onChange={(e)=>setSw(e.target.checked)} style={{display:'flex',alignItems:'center'}}>
-                    <div style={{display:'flex',alignItems:'center',marginTop:'6px'}}>
-                        <div style={{width:'0px',height:'0px', borderLeft:'10px solid transparent', borderRight:'10px solid transparent', borderTop:'25px solid #0f0', marginRight:'5px',marginTop:'6px',position:'relative'}}>
-                            <div style={{position:'absolute',left:'-6px',top:'-25px',fontSize:'12px'}}>
-                                水
-                            </div>
-                        </div>
-                        <div>水文 ({count?.['水文']||0})</div>
-                    </div>
-                </Checkbox>
-                <Checkbox checked={!!gcz} onChange={(e)=>setGcz(e.target.checked)} style={{display:'flex',alignItems:'center'}}>
-                    <div style={{display:'flex',alignItems:'center',marginTop:'6px'}}>
-                        <div style={{width:'0px',height:'0px', borderLeft:'10px solid transparent', borderRight:'10px solid transparent', borderTop:'25px solid #0f0', marginRight:'5px',marginTop:'6px',position:'relative'}}>
-                            <div style={{position:'absolute',left:'-6px',top:'-25px',fontSize:'12px'}}>
-                                工
-                            </div>
-                        </div>
-                        <div>工程站 ({count?.['工程站']||0})</div>
-                    </div>
-                </Checkbox>
-            </Space>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/jczw/yqz/index.js b/src/views/fxzb/jczw/yqz/index.js
deleted file mode 100644
index 0927a57..0000000
--- a/src/views/fxzb/jczw/yqz/index.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import {Collapse, Checkbox, Button, Space, Modal, Radio} from 'antd'
-import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-
-
-const Page = () => {
-    const dispatch = useDispatch();
-    const [count,setCount] = useState({})
-    const [sh,setSh] = useState(true)
-    const [sw,setSw] = useState(true)
-    const [qx,setQx] = useState(true)
-    const [gcz,setGcz] = useState(true)
-
-    const getCount = async()=>{
-        const res = await httpget2(apiurl.fxzb.jczw.yqz.list)
-        if(res.data && res.data.length>0){
-            const obj = {}
-            res.data.map((i)=>{
-                obj[i.sname] = i.count
-            })
-            setCount(obj)
-        }
-    }
-
-
-    useEffect(()=>{
-        if(JSON.stringify(count)==='{}'){
-            getCount()
-        }
-        dispatch.map.setLayerVisible({'AdcdLayer': true });
-        dispatch.map.setLayerVisible({'RealDrpAllLayer': true});
-        dispatch.map.setYqz({
-            SH:sh,
-            SW:sw,
-            QX:qx,
-            SK:gcz,
-          });
-        
-        return ()=>{
-            dispatch.runtime.closeFeaturePopAll()
-            dispatch.map.setLayerVisible({'RealDrpAllLayer': false});
-            dispatch.map.setLayerVisible({'AdcdLayer': false });
-        }
-    },[sh,sw,qx,gcz])
-
-
-
-  return (
-    <>
-      <div className="waterBox" style={{height:"calc(100vh - 90px)", width: "18rem",borderRadius:'3px',boxShadow:'5px 5px 10px rgba(0, 0, 0, 0.1)', top:'4px'}}>
-            <Space direction="vertical" size='middle' style={{padding:'10px',paddingTop:'20px'}}> 
-                <Checkbox checked={!!sh} onChange={(e)=>setSh(e.target.checked)}>
-                    <div style={{display:'flex',alignItems:'center'}}>
-                        <div style={{width:'20px',height:'20px',background:'rgb(102, 177, 255)',borderRadius:'10px',textAlign:'center',lineHeight:'20px',fontSize:'12px',color:'#ffffff',marginRight:'5px'}}>山</div>
-                        <div>山洪 ({count?.['山洪']||0})</div>
-                    </div>
-                </Checkbox>
-                <Checkbox checked={!!sw} onChange={(e)=>setSw(e.target.checked)}>
-                    <div style={{display:'flex',alignItems:'center'}}>
-                        <div style={{width:'20px',height:'20px',background:'rgb(102, 177, 255)',borderRadius:'10px',textAlign:'center',lineHeight:'20px',fontSize:'12px',color:'#ffffff',marginRight:'5px'}}>水</div>
-                        <div>水文 ({count?.['水文']||0})</div>
-                    </div>
-                </Checkbox>
-                <Checkbox checked={!!qx} onChange={(e)=>setQx(e.target.checked)}>
-                    <div style={{display:'flex',alignItems:'center'}}>
-                        <div style={{width:'20px',height:'20px',background:'rgb(102, 177, 255)',borderRadius:'10px',textAlign:'center',lineHeight:'20px',fontSize:'12px',color:'#ffffff',marginRight:'5px'}}>气</div>
-                        <div>气象 ({count?.['气象']||0})</div>
-                    </div>
-                </Checkbox>
-                <Checkbox checked={!!gcz} onChange={(e)=>setGcz(e.target.checked)}>
-                    <div style={{display:'flex',alignItems:'center'}}>
-                        <div style={{width:'20px',height:'20px',background:'rgb(102, 177, 255)',borderRadius:'10px',textAlign:'center',lineHeight:'20px',fontSize:'12px',color:'#ffffff',marginRight:'5px'}}>工</div>
-                        <div>工程站 ({count?.['工程站']||0})</div>
-                    </div>
-                </Checkbox>
-            </Space>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/qxdw/gc/AdcdTreeSelector/index.less b/src/views/fxzb/qxdw/gc/AdcdTreeSelector/index.less
deleted file mode 100644
index 2843201..0000000
--- a/src/views/fxzb/qxdw/gc/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,22 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/gc/AdcdTreeSelector/index.tsx b/src/views/fxzb/qxdw/gc/AdcdTreeSelector/index.tsx
deleted file mode 100644
index 81790f5..0000000
--- a/src/views/fxzb/qxdw/gc/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal } from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import './index.less';
-import {getAdcdTreeData3} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  onChangeOpen?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd,onChangeOpen, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight,setTreeBoxHeight] = useState({})
-
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await getAdcdTreeData3(params);
-    const item:any = adcdTreedata?.[0]?.children?.[0]
-    if(item){
-      setSelectedKeys([item.adcd])
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.adnm;
-        item.key = item.adcd;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.adcd;
-
-      let params = { adcd: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { adcd: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.adnm.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-
-  const handleStore = (params:any) => {
-    onChangeOpen(true,params)
-  }
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              titleRender={(v: any) => {
-                return (
-                  <div>
-                    <div
-                      style={
-                        {
-                          color: '#a8a8a8',
-                          position:"absolute",
-                          right: '13px',
-                          // width:'100px'
-                        }}
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        console.log("v", v);
-                        handleStore(v)
-                        
-                      }}><FileTextOutlined /></div>
-                    
-                    <div>{v.title}</div>
-                  </div>
-                )
-              }}
-            />
-          }
-        </div>
-      
-      </div>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js
deleted file mode 100644
index 55bc614..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center'},
-    {title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
deleted file mode 100644
index 47863bb..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  console.log(data);
-  const maxVal = Math.max(...data.map(obj => obj.rz))+1
-  const minVal = Math.min(...data.map(obj => obj.rz))-1
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-
-  let arr =[]
-  data.forEach(item=>{
-    arr.push([item.w,item.rz])
-  })
-
-  return {
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "10%",
-        right: "20%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "蓄水量",
-        nameGap: -8,
-        type: 'category',
-        data: data.map(o => o.w),
-        // min:Math.floor(minValX),
-        // max:Math.round(maxValX),
-        // interval:GetInterval(minValX,maxValX),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#333',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        // symbol: 'none' // 设置标记点为'none'，即去掉圆点
-        symbolSize:10
-      },
-    ]
-  };
-}
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/index.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/index.js
deleted file mode 100644
index 4f6a56d..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-import {zvarl} from "../../../../../../../service/sssq";
-
-function Krqx({record}) {
-  const [data,setData]=useState([])
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  const getData=async (params)=>{
-    setData(await zvarl(params))
-  }
-  useEffect(() => {
-    getData({stcd:record.stcd})
-  }, [record]);
-
-
-  return (
-    <div style={{width: "98%", height: '60vh'}} className="swllgx-sq">
-      <div className="content">
-        <div className="content-left">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default Krqx
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/index.less b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/index.less
deleted file mode 100644
index 6e2608b..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/Krqx/index.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left{
-      width: 48%;
-      max-height: 60vh;
-      overflow: auto;
-    }
-    .content-right{
-      width: 48%;
-      height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/fxya.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/fxya.js
deleted file mode 100644
index 2c57485..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/fxya.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {plan} from "../../../../../../service/sssq";
-
-
-function Fxya({record}) {
-
-  const [data, setData] = useState({})
-  const getData = async (params) => {
-    let obj = await plan(params)
-    setData(obj[0])
-  }
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions column={3} bordered labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.preparation == 1 ? "是" : data?.preparation == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.approval == 1 ? "是" : data?.approval == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="编制时间" style={{width: "16.5%"}}>{data?.prepTime}</Descriptions.Item>
-        <Descriptions.Item label="批复时间">{data?.apprTime}</Descriptions.Item>
-        <Descriptions.Item label="编制单位">{data?.prepOrg}</Descriptions.Item>
-        <Descriptions.Item label="批复部门">{data?.apprOrg}</Descriptions.Item>
-        <Descriptions.Item label="预案文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.apprName}</span>
-        </Descriptions.Item>
-        <Descriptions.Item label="批复文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.planName}</span>
-        </Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Fxya;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/gctp.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/gctp.js
deleted file mode 100644
index 734be0d..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/gctp.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {projectimg, fileget} from "../../../../../../service/sssq";
-import {projDict} from "../../../../../../utils/dictType"
-
-
-function Gctp({record}) {
-  const [data, setData] = useState([])
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const getData = async (params) => {
-    setData(await projectimg(params))
-  }
-
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered layout="vertical" column={3}>
-        {
-          data?.length > 0 ? data?.map(o => <Descriptions.Item label={projDict(o?.projType)}>
-              <div className="no-data">
-                <img src={url + o?.filePath} style={{width: "100%"}} alt=""/>
-              </div>
-            </Descriptions.Item>
-            )
-            : ""
-        }
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Gctp;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/index.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/index.js
deleted file mode 100644
index bc265cc..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { Tabs} from "antd";
-import Jbxx from './jbxx'
-import Krqx from './Krqx'
-import Zrtx from './zrtx'
-import Jzw from './jzw'
-import Jsxx from './jsxx'
-import Gctp from './gctp'
-import Fxya from './fxya'
-import Sjbg from './sjbg'
-
-
-
-function Skjcxx({data}) {
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <>
-      <div>
-        <Tabs defaultActiveKey="1" tabPosition="left" type="card">
-          <Tabs.TabPane tab="基本信息" key="1">
-            <Jbxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="库容曲线" key="2">
-            <Krqx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="责任体系" key="3">
-            <Zrtx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建筑物" key="4">
-            <Jzw record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建设信息" key="5">
-            <Jsxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="工程图片" key="6">
-            <Gctp record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="防汛预案" key="7">
-            <Fxya record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="设计报告" key="8">
-            <Sjbg record={data}/>
-          </Tabs.TabPane>
-
-
-        </Tabs>
-      </div>
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jbxx.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jbxx.js
deleted file mode 100644
index 4c399c4..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jbxx.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {attResBase} from '../../../../../../service/sssq'
-import {engScalDict} from '../../../../../../utils/dictType'
-function Skjcxx({ data }) {
-  const [info,setInfo]=useState({})
-  const getData=async (params)=>{
-    setInfo(await attResBase(params))
-  }
-  useEffect(() => {
-    if (data?.resCode) {
-      getData({resCode:data.resCode})
-    }
-  }, [data]);
-
-  return (
-    <>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="水库名称" style={{ width: '16.5%' }}>{info?.resName}</Descriptions.Item>
-        <Descriptions.Item label="所在地" style={{ width: '16.5%' }}>{info?.resLoc}</Descriptions.Item>
-        <Descriptions.Item label="管理单位" style={{ width: '16.5%' }}>{info?.managName}</Descriptions.Item>
-        <Descriptions.Item label="水库代码">{info?.resCode}</Descriptions.Item>
-        <Descriptions.Item label="注册登记号">{info?.regSn}</Descriptions.Item>
-        <Descriptions.Item label="注册登记时间">{info?.regTime}</Descriptions.Item>
-        <Descriptions.Item label="经度">{info?.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{info?.lttd}</Descriptions.Item>
-        <Descriptions.Item label="高程基准面">{info?.elevDat}</Descriptions.Item>
-        <Descriptions.Item label="所在流域">{info?.basName}</Descriptions.Item>
-        <Descriptions.Item label="所在水系">{info?.wsName}</Descriptions.Item>
-        <Descriptions.Item label="所在河流名称">{info?.rvName}</Descriptions.Item>
-        <Descriptions.Item label="工程规模">{engScalDict(info?.engScal)}</Descriptions.Item>
-        <Descriptions.Item label="水库功能">{info?.rsvFunction}</Descriptions.Item>
-        <Descriptions.Item label="溢洪道是否有闸">{info?.spillwayGate==1?"有":info.spillwayGate==0?"无":""}</Descriptions.Item>
-        <Descriptions.Item label="水库特征参数" span={3}></Descriptions.Item>
-        <Descriptions.Item label="坝址以上控制流域面积(km³)">{info?.watShedArea}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)">{info?.crestElev}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{info?.maxDamHeig}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{info?.calFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万m³)">{info?.totCap}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水时最大下泄流量(m³/s)">{info?.maxDesFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{info?.desFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="调洪库容(万m³)">{info?.storFlCap}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水时最大下泄流量(m³/s)">{info?.maxCalFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="防洪高水位(m)">{info?.uppLevFlco}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万m³)">{info?.flcoCap}</Descriptions.Item>
-        <Descriptions.Item label="下游河道安全流量(m³/s)">{info?.dsSaftFlow}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{info?.normWatLev}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万m³)">{info?.benResCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{info?.deadLev}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万m³)">{info?.deadCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="工程概况" span={3}>{info?.projOverview}</Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jsxx.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jsxx.js
deleted file mode 100644
index 2412f45..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jsxx.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {construction} from "../../../../../../service/sssq";
-
-
-
-function Jsxx({record}) {
-
-  const columns = [
-    {title: '状态', key: '', dataIndex: '', align: 'center',render:rec=>rec.engStat==0?"始建":rec.engStat==1?"扩建":""},
-    {title: '工程开工时间', key: 'startDate', dataIndex: 'startDate', align: 'center'},
-    {title: '投入使用时间', key: 'useDate', dataIndex: 'useDate', align: 'center'},
-    {title: '竣工验收时间', key: 'compDate', dataIndex: 'compDate', align: 'center'},
-    {title: '改扩建内容', key: 'content', dataIndex: 'content', align: 'center'},
-    {title: '第几次扩建', key: 'buildNo', dataIndex: 'buildNo', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await construction(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Jsxx;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jzw.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jzw.js
deleted file mode 100644
index 2cebbec..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/jzw.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions,Table} from "antd";
-import {drainage,dam,transport} from "../../../../../../service/sssq";
-
-
-
-function Jzw({record}) {
-
-  const columns1 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns2 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启用标准', key: 'enableCriteria', dataIndex: 'enableCriteria', align: 'center'},
-  ];
-  const columns3 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '洞(孔)身型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '数量(条或孔)', key: 'num', dataIndex: 'num', align: 'center'},
-    {title: '进口底槛高程(m)', key: 'inletEle', dataIndex: 'inletEle', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns4 = [
-    {title: '设计流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '输水道型式', key: 'transType', dataIndex: 'transType', align: 'center',},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '输水道长度(m)', key: 'transLeng', dataIndex: 'transLeng', align: 'center'},
-    {title: '座教', key: 'num', dataIndex: 'num', align: 'center'},
-  ];
-
-  const [tableDataDs, setTableDataDs] = useState([])
-  const [tableDataXs, setTableDataXs] = useState({})
-  const [tableDataSs, setTableDataSs] = useState([])
-
-  const getData=async (params)=>{
-    setTableDataDs(await dam(params))
-    setTableDataXs(await drainage(params))
-    setTableDataSs(await transport(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <div style={{maxHeight:"60vh",overflow:"auto"}}>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>挡水建筑物</div>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="坝型" style={{ width: '16.5%' }}>{tableDataDs[0]?.damType}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damMaxHeig}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damTopElev}</Descriptions.Item>
-        <Descriptions.Item label="坝顶长度(m)">{tableDataDs[0]?.damTopLen}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{tableDataDs[0]?.damTopWid}</Descriptions.Item>
-        <Descriptions.Item label="坝基防渗体型式">{tableDataDs[0]?.damImpermeableType}</Descriptions.Item>
-        <Descriptions.Item label="副坝座数">{tableDataDs[0]?.subDamNum}</Descriptions.Item>
-        <Descriptions.Item label="副坝总长度(m)">{tableDataDs[0]?.subDamLen}</Descriptions.Item>
-        <Descriptions.Item label="副坝最大坝高(m)">{tableDataDs[0]?.subDamMaxHeig}</Descriptions.Item>
-      </Descriptions>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>泄水建筑物</div>
-      <div className="table-title" style={{padding:"4px"}}>☆正常溢洪道</div>
-      <Table rowKey="inx"
-             sticky
-             size="small"
-             columns={columns1}
-             pagination={false}
-             dataSource={tableDataXs.normalSpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆非常溢洪道</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns2}
-             pagination={false}
-             dataSource={tableDataXs.emergencySpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆泄洪洞</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns3}
-             pagination={false}
-             dataSource={tableDataXs.sluiceGateList}
-      />
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>输水建筑物</div>
-      <Table rowKey="key"
-             sticky
-             size="small "
-             columns={columns4}
-             pagination={false}
-             dataSource={tableDataSs}
-      />
-    </div>
-  )
-}
-
-export default Jzw;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/sjbg.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/sjbg.js
deleted file mode 100644
index f7d62f0..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/sjbg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {file} from "../../../../../../service/sssq";
-
-
-
-function Sjbg({record}) {
-
-  const columns = [
-    {title: '文件名称', key: '', dataIndex: '', align: 'center',render:rec=><span style={{color:"#689FFF"}}>{rec.fileName}</span>},
-    {title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center'},
-    {title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center'},
-    {title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center'},
-    {title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await file(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             bordered
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Sjbg;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/zrtx.js b/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/zrtx.js
deleted file mode 100644
index d78d4ac..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/Skjcxx/zrtx.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {person} from "../../../../../../service/sssq";
-import {repDict} from "../../../../../../utils/dictType"
-
-
-
-function Zrtx({record}) {
-
-  const columns = [
-    {title: '责任人', key: '', dataIndex: '', align: 'center',render:rec=>repDict(rec.repType)},
-    {title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center'},
-    {title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center'},
-    {title: '职务', key: 'position', dataIndex: 'position', align: 'center'},
-    {title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await person(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Zrtx;
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/index.less b/src/views/fxzb/qxdw/gc/GcTreeSelector/index.less
deleted file mode 100644
index d4d4ab8..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/index.less
+++ /dev/null
@@ -1,44 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.GcTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-  .ant-tree-treenode{
-    width: 100%;
-
-    .ant-tree-node-content-wrapper{
-      // width: 100%;
-      // padding-right: 15px;
-      position: static;
-    }
-  }
-}
-.no-matter{
-  opacity: .5;
-}
-.tree-container{
-  .ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
-    color:rgba(0, 0, 0, 0.9)
-  }
-}
-// .detail-modal{
-//   .ant-descriptions-item{
-//     border-bottom: 1px solid rgb(232, 232, 232) ;
-//   }
-// }
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/gc/GcTreeSelector/index.tsx b/src/views/fxzb/qxdw/gc/GcTreeSelector/index.tsx
deleted file mode 100644
index eb358e9..0000000
--- a/src/views/fxzb/qxdw/gc/GcTreeSelector/index.tsx
+++ /dev/null
@@ -1,386 +0,0 @@
-import React, { useState, useEffect,useRef } from 'react';
-import {Tree, Input, Checkbox,Tabs, Spin, Modal,Descriptions} from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import Jbxx from '../../../../Home/MapCtrl/components/Skjcxx/jbxx'
-import Krqx from '../../../../Home/MapCtrl/components/Skjcxx/Krqx'
-import Zrtx from '../../../../Home/MapCtrl/components/Skjcxx/zrtx'
-import Jzw from '../../../../Home/MapCtrl/components/Skjcxx/jzw'
-import Jsxx from '../../../../Home/MapCtrl/components/Skjcxx/jsxx'
-import Gctp from '../../../../Home/MapCtrl/components/Skjcxx/gctp'
-import Fxya from '../../../../Home/MapCtrl/components/Skjcxx/fxya'
-import Sjbg from '../../../../Home/MapCtrl/components/Skjcxx/sjbg'
-import SdzJbxx from '../../../../Home/MapCtrl/components/sdz/jbxx'
-import SdzZrr from '../../../../Home/MapCtrl/components/sdz/zrr'
-import SdzGctp from '../../../../Home/MapCtrl/components/sdz/gctp'
-import SdzFxya from '../../../../Home/MapCtrl/components/sdz/fxya'
-import SdzSjzl from '../../../../Home/MapCtrl/components/sdz/sjzl'
-import './index.less';
-
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setCode?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  setTag?: any,
-  isFetch?: any,
-  data?: any,
-  clickHandler?: any,
-  url?:any
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun,data, setCode,clickHandler, isFetch,setTag, showCheckbox, tableName, hasAlertBox,url }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [itemDetail, setItemDetail] = useState<any>({}) // 树中的每一项的详细信息
-
-  const [ open, setOpen] = useState(false)
-  const [keys, setKeys] = useState(1)
-  const TabList1 = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-    {
-      key: '2',
-      label: '库容曲线',
-    },
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '4',
-      label: '建筑物',
-    },
-    {
-      key: '5',
-      label: '建设信息',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计报告',
-    },
-  ]
-  const TabList2 = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计资料',
-    },
-  ]
-  const selectedKeysRef = useRef('')
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await url(params);
-
-    const item: any = adcdTreedata?.[0]?.children?.[0]
-    if(item){
-      setCode(item.code)
-      setSelectedKeys([item.code])
-      setTag(item.type)
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.name;
-        item.key =item.code
-        // (
-        //   <span  style={{position:'relative'}}>
-        //     {item.sname}
-        //     <div  style={{color:'red',position:'absolute',left:'50px'}}>按钮</div>
-        //   </span>
-        // )
-        item.key = item.code;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue: any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    console.log("selectedKeysValue", selectedKeysValue);
-    selectedKeysRef.current = selectedKeysValue
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.code;
-
-      let params = { code: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode(adcdVal)
-        setTag(selectData.type)
-      }
-    } else {
-      let params = { code: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode("")
-        setTag("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.name.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-  const onChange = (key:any) => {
-    setKeys(key)
-  }
-  return (
-    <div style={{position:"relative"}} className='GcTreeSelectorStyle '>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }} className='tree-container'>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              titleRender={(v:any)=>{
-                return (<>
-                    {
-                      v.children?.length?null:
-                      <div  style={{color:'#a8a8a8',position:'absolute',right:'25px'}} onClick={(e)=>{
-                        e.stopPropagation()
-                        setOpen(true)
-                        setItemDetail(v)
-                        clickHandler(v)
-                        
-                      }}><FileTextOutlined /></div>
-                    }
-                    <div  className={v.status ? "" : "no-matter"}>{v.title}</div>
-                </>)
-              }}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-            />
-          }
-        </div>
-        <Modal
-          title=""
-          width={1000}
-          open={open}
-          footer={null}
-          onCancel={() => {
-            setOpen(false)
-            setKeys(1)
-          }}
-          className='detail-modal'
-          destroyOnClose
-        >
-          <div className="dp-popup-content">
-          <div className="content-body tyb skpop" id='tyb'>
-            <div className="title flexac flex">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {itemDetail.type === 1 ?data?.resName : data?.hystName}
-              </div>
-            </div>
-              <div style={{ padding: '5px', display: 'flex' }}>
-                <>
-                  <Tabs
-                    defaultActiveKey="1"
-                    type="card"
-                    onChange={onChange}
-                    items={itemDetail.type === 1 ? TabList1 : TabList2}
-                    tabPosition='left'
-                    tabBarStyle={{margin:0}}
-                  />
-                  {itemDetail.type == 1 ? 
-                    <div style={{backgroundColor:'#fff',overflowY:'auto',padding:'0 5px 5px 5px'}}>
-                      {keys == 1 && <Jbxx data={data} />}
-                      {keys == 2 && <Krqx record={data} />}
-                      {keys == 3 && <Zrtx record={data} />}
-                      {keys == 4 && <Jzw record={data} />}
-                      {keys == 5 && <Jsxx record={data} />}
-                      {keys == 6 && <Gctp record={data} />}
-                      {keys == 7 && <Fxya record={data} />}
-                      {keys == 8 && <Sjbg record={data} />}
-                    </div> :
-                     <div style={{backgroundColor:'#fff',overflowY:'auto',padding:'0 5px 5px 5px'}}>
-                       {keys == 1 && <SdzJbxx data={data} />}
-                       {keys == 3 && <SdzZrr data={data} />}
-                       {keys == 6 && <SdzGctp data={data} />}
-                       {keys == 7 && <SdzFxya data={data} />}
-                       {keys == 8 && <SdzSjzl data={data} />}
-                   </div>
-                 }
-                
-                </>
-              </div>
-          </div>
-        </div>
-        </Modal>
-      </div>
-
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/qxdw/gc/form.js b/src/views/fxzb/qxdw/gc/form.js
deleted file mode 100644
index 8edc626..0000000
--- a/src/views/fxzb/qxdw/gc/form.js
+++ /dev/null
@@ -1,641 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import "./index.less"
-import moment from 'moment';
-import { createCrudService } from '../../../../components/crud/_';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const EditableCell = ({
-  editing,
-  dataIndex,
-  title,
-  inputType,
-  record,
-  index,
-  children,
-  ...restProps
-}) => {
-  const inputNode = inputType === 'number' ?
-    <InputNumber style={{ textAlign: "center", flex: 1 }} /> :
-    inputType === 'select' ? <NormalSelect style={{ textAlign: "center", flex: 1 }} options={[{label:"男",value:"男"},{label:"女",value:"女"}]} />:
-    <Input style={{ textAlign: "center" }} />;
-  return (
-    <td {...restProps}>
-      {editing ? (
-        <Form.Item
-          name={dataIndex}
-          wrapperCol={[24]}
-          style={{
-            margin: 0,
-          }}
-          // rules={[
-          //   {
-          //     required: true,
-          //     message: `Please Input ${title}!`,
-          //   },
-          // ]}
-        >
-          {inputNode}
-        </Form.Item>
-      ) : (
-        children
-      )}
-    </td>
-  );
-};
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const [editingKey, setEditingKey] = useState('');
-  const [disabled, setDisabled] = useState(false)
-  const [details, setDetails] = useState([])
-  const detailsRef = useRef(null)
-  detailsRef.current = details
-  const isEditing = (record) => {
-     return record.key === editingKey;
-  }
-
-  const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      width: 60,
-      render: (text, record, index) => <span>{ index + 1}</span>,
-      align: "center"
-    },
-    {
-      title: '姓名',
-      key: 'name',
-      dataIndex: 'name',
-      width: 150
-      , align: "center",
-      editable: true,
-    },
-    {
-      title: '性别',
-      key: 'sex',
-      dataIndex: 'sex',
-      width: 100,
-      align: "center",
-      render: (rec, record) => <span>{rec == "F" ? "女" : rec == "M" ? "男" : ''}</span>,
-      editable: true,
-    },
-    {
-      title: '年龄',
-      key: 'age',
-      dataIndex: 'age',
-      width: 100,
-      align: "center",
-      editable: true,
-    },
-    {
-      title: '工作单位',
-      key: 'workUnit',
-      dataIndex: 'workUnit',
-      width: 150,
-      align: "center",
-      editable: true,
-    },
-    {
-      title: '职务',
-      key: 'duty',
-      dataIndex: 'duty',
-      width: 150,
-      align: "center",
-      editable: true,
-    },
-    {
-      title: '联系方式',
-      key: 'phone',
-      dataIndex: 'phone',
-      width: 150,
-      align: "center",
-      editable: true,
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (_, record) => {
-        const editable = isEditing(record);  
-        return editable ? (
-          <span>
-            <Typography.Link
-              onClick={() => save(record.key)}
-              style={{
-                marginRight: 8,
-              }}
-            >
-              完成
-            </Typography.Link>
-           
-          </span>
-        ) : (
-            <div style={{display:"flex",justifyContent:"center",columnGap:10}}>
-              <Typography.Link disabled={editingKey !== ''} onClick={() => edit1(record)}>
-            编辑
-            </Typography.Link>
-               <Popconfirm title="确定要删除?" onConfirm={()=>handleDelete(record.key)}>
-              <a>删除</a>
-            </Popconfirm>
-            </div>
-          
-            
-        );
-      },
-    },
-  ]
-
- 
-  
-  const newColumns = useMemo(() => {
-    let data = columns;
-    if (mode == "view") {
-      data.pop();
-      return data
-    } else {
-      return data;
-    }
-  }, [mode,editingKey])
-  const [form1] = Form.useForm()
-
-  const edit1 = (record) => {
-    setDisabled(true)
-    form1.setFieldsValue({
-      name: '',
-      sex:"",
-      age: '',
-      workUnit:'',
-      duty: '',
-      phone:'',
-      ...record,
-      sex:record.sex == "F" ? "女" : record.sex  == "M" ? "男" : ''
-    });
-    setEditingKey(record.key);
-  };
-
-  const save = async (key) => {
-    setDisabled(false)
-    try {
-      const row = await form1.validateFields();
-      if (row.sex) {
-        row.sex = row.sex == "男" ? "M" : row.sex == "女" ? "F" :''
-      }
-      const newData = [...details];
-      const index = newData.findIndex((item) => key === item.key);
-      if (index > -1) {
-        const item = newData[index];
-        newData.splice(index, 1, {
-          ...item,
-          ...row,
-        });
-        setDetails(newData);
-        setEditingKey('');
-      } else {
-        newData.push(row);
-        setDetails(newData);
-        setEditingKey('');
-      }
-    } catch (errInfo) {
-      console.log('Validate Failed:', errInfo);
-    }
-  };
-  const mergedColumns = newColumns.map((col) => {
-    if (!col.editable) {
-      return col;
-    }
-    return {
-      ...col,
-      onCell: (record) => ({
-        record,
-        inputType: col.dataIndex === 'age' ? 'number' : 
-        col.dataIndex === 'sex' ? 'select' : "text",
-        dataIndex: col.dataIndex,
-        title: col.title,
-        editing: isEditing(record),
-      }),
-    };
-  });
-  
-  const handleAddRow = () => {
-    setDisabled(true)
-    const newData = {
-        key: (details.length + 1).toString(),
-        name: '',
-        sex: '',
-        age: '',
-        workUnit: '',
-        duty: '',
-        phone:""
-    };
-    form1.setFieldsValue(newData)
-    setDetails([...details, newData]);
-    setEditingKey(newData.key);
-};
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-   /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    createCrudService(apiurl.fxzb.qsdw.zq.getFile).delGet({ teamId: params.teamId  }).then(res => {
-      if (res.code === 200) {
-        let fileArr = res.data?.files.map(item => {
-                return {
-                  name: item.fileName,
-                  response: {
-                    data: {
-                      filePath: item.filePath,
-                      fileId:item.fileId
-                    }
-                  },
-                }
-              })
-        setFileList(fileArr)
-        const result = res.data?.details.map(item => ({ ...item, key: item.detailId }))
-        console.log("resss",result);
-        
-        setDetails(result)
-      }
-    })
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/rescue/team/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-
-
-  const handleDelete = (key) => {
-    const newData = detailsRef.current.filter((item) => item.key !== key);
-    setDetails(newData);
-  };
-  
- 
-  const onfinish = () => {
-    let values = form.getFieldsValue();
-    values.details = details;
-    values.validStartDate = values.dateRangeSo&&moment(values.dateRangeSo[0]).format("YYYY-MM-DD")
-    values.validEndDate = values.dateRangeSo&&moment(values.dateRangeSo[1]).format("YYYY-MM-DD")
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item =>  item.response?.data?.fileId )
-      values.fileIds = oldFiles;
-      values.teamId = record.teamId;
-      onEdit(apiurl.fxzb.qsdw.zq.edit,values)
-    }
-    if (mode === 'save') {
-      values.fileIds = fileIds
-      onSave(apiurl.fxzb.qsdw.zq.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-  useEffect(()=>{
-    if (record.teamId ) {
-        getFileInfo(record)
-      }
-  }, [record])
-
-  useEffect(() => {
-    if (mode !== "save") { 
-      let dateSo = [
-        record.validStartDate? moment(record.validStartDate):'',
-        record.validEndDate? moment(record.validEndDate): ''
-      ]
-    
-      form.setFieldsValue({...record,dateRangeSo:dateSo})
-
-    }
-
- }, [record,mode])
- 
-  return (
-    <>
-      <div className='basic-info'>基本信息</div>
-      {/* <Divider /> */}
-      <Form
-        form={form}
-        {...formItemLayout}
-        // initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="队伍名称"
-                name="teamName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="登记日期"
-                name="registerDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                    message: `登记日期不能为空`,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="有效期限"
-                name="dateRangeSo"
-                rules={[
-                  {
-                    required: true,
-                    message: `有效期限不能为空`,
-                  },
-                ]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => {
-                  return {
-                    value: value ? [value[0]&&moment(value[0]),value[1]&&moment(value[1])] : undefined
-                  };
-                }}
-              >
-               <RangePicker
-                allowClear
-                showTime 
-                disabled={mode==='view'}
-                //  style={{ width: "300px" }}
-                 format="YYYY-MM-DD"
-               />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="管理单位"
-                name="managementUnit"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="地址"
-                name="address"
-                rules={[{ required: true }]}
-              >
-                <Input type='text' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={6}>
-              <Form.Item
-                label="经度"
-                name="lgtd"
-                labelCol={{ span: 12 }}
-                wrapperCol={{ span: 10 }}
-              >
-                 <Input type='text' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={6}>
-              <Form.Item
-                label="纬度"
-                name="lttd"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 10 }}
-              >
-                 <Input type='text' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="队伍负责人"
-                name="teamLeader"
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="联系电话"
-                name="phone"
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/rescue/team/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-      </Form>
-      <div className='basic-info' style={{display:"flex",justifyContent:"space-between"}}>
-          <span>队伍明细：（共计{details?.length}人）</span>
-          {mode != "view" ?<div style={{display:"flex",columnGap:10,marginBottom:10}}>
-            <Button onClick={handleAddRow} type='primary' disabled={disabled}>添加</Button>
-            {/* <Button onClick={() => {}} >导入</Button> */}
-          </div>:null}
-      </div>
-      <Form form={form1} component={false}>
-        <Table
-          rowKey="index"
-          components={{
-            body: {
-              // row: EditableRow,
-              cell: EditableCell,
-            },
-          }}
-          columns={mergedColumns}
-          dataSource={details}
-          scroll={{ x: width}}
-          pagination={false}
-        />
-
-{
-        mode==='view'?null:(
-          <div style={{marginTop:20}}>
-          <Form.Item wrapperCol={{span:2,offset:22}}>
-            <Button type="primary" onClick={onfinish} disabled={disabled}>
-                  {mode === 'save' ? '保存' :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </div>
-        )
-      }
-        </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/rescue/goods/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/qxdw/gc/index.js b/src/views/fxzb/qxdw/gc/index.js
deleted file mode 100644
index 0b28525..0000000
--- a/src/views/fxzb/qxdw/gc/index.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import GTreeSelector from "./GcTreeSelector";
-import {getAdcdTreeData1, getGcTreeData5} from '../../../../service/warn';
-
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [isFetch, setIsFetch] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '队伍名称', key: 'teamName', dataIndex: 'teamName', width: 200, ellipsis: true },
-    {
-      title: '人员总数', key: 'personCount', dataIndex: 'personCount', width: 140,
-    },
-    { title: '地址', key: 'address', dataIndex: 'address', width: 140 },
-    {
-      title: '管理单位', key: 'managementUnit', dataIndex: 'managementUnit', width: 150
-    },
-    { title: '队伍负责人', key: 'teamLeader', dataIndex: 'teamLeader', width: 150, ellipsis: true },
-    { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true },
-    { title: '登记日期', key: 'registerDate', dataIndex: 'registerDate', width: 150, ellipsis: true },
-    {
-      title: '有效期限', key: 'dateSo', dataIndex: 'dateSo', width: 250,
-      render: (value, row, index) => {
-        return (
-          <>
-            {row.isValid === 1 && row.validStartDate && row.validEndDate ?
-              <span style={
-                {
-                  color: "#67c750",
-                  border: "1px solid #b7eb8f",
-                  backgroundColor: "#f6ffed",
-                  padding: '0 5px',
-                  borderRadius: "4px"
-                }
-              }>有效</span> :
-              row.isValid === 0 && row.validStartDate && row.validEndDate?
-              <span
-                style={
-                  {
-                      color: "#f5222d",
-                      border: "1px solid #ffa6a1",
-                      backgroundColor: "#fff1f0",
-                      padding:'0 5px',
-                      borderRadius: "4px"
-                  }
-                }
-              >无效</span> : null}
-            {row.validStartDate && row.validEndDate ?<span style={{ paddingLeft: '10px' }}>{row.validStartDate}至{row.validEndDate}</span>: null}
-          </>
-        )
-      }
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-          edit={editBtn ? true : false}
-          del={delBtn ? true : false}
-          view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.qsdw.zq.delete + `/${params.teamId}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.qsdw.zq.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-  setIsFetch(!isFetch)
-}
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/qxdw/gc/index.less b/src/views/fxzb/qxdw/gc/index.less
deleted file mode 100644
index 2740803..0000000
--- a/src/views/fxzb/qxdw/gc/index.less
+++ /dev/null
@@ -1,17 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/gc/toolbar.js b/src/views/fxzb/qxdw/gc/toolbar.js
deleted file mode 100644
index bbea57a..0000000
--- a/src/views/fxzb/qxdw/gc/toolbar.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role = [] }) => {
-  const [form] = Form.useForm();
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="队伍名称" name="teamName">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="有效期限" name="tm">
-            <RangePicker
-              allowClear
-              showTime 
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/zq/AdcdTreeSelector/index.less b/src/views/fxzb/qxdw/zq/AdcdTreeSelector/index.less
deleted file mode 100644
index 3b94c18..0000000
--- a/src/views/fxzb/qxdw/zq/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-.treeBox1{
-  .ant-tree-node-content-wrapper{
-    position: static !important;
-  }
-
-}
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-}
-.no-matter{
-  opacity: 0.5;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/zq/AdcdTreeSelector/index.tsx b/src/views/fxzb/qxdw/zq/AdcdTreeSelector/index.tsx
deleted file mode 100644
index e958d6b..0000000
--- a/src/views/fxzb/qxdw/zq/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal } from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import './index.less';
-import {getAdcdTreeData6} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  onChangeOpen?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  isFetch?: boolean;
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd,onChangeOpen,isFetch, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight,setTreeBoxHeight] = useState({})
-
-  useEffect(() => {
-    getCustomerTreeData();
-  }, [isFetch]);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata: any = await getAdcdTreeData6(params);
-    const item:any = adcdTreedata?.[0]?.adcd
-    if (item) {
-      setSelectedKeys([item])
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.adnm;
-        item.key = item.adcd;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.adcd;
-
-      let params = { adcd: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { adcd: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.adnm.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-
-  const handleStore = (params:any) => {
-    onChangeOpen(true,params)
-  }
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox1" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              titleRender={(v: any) => {
-                return (
-                  <div>
-                    <div className={v.status ? "" : "no-matter"}>{v.title}</div>
-                  </div>
-                )
-              }}
-            />
-          }
-        </div>
-      
-      </div>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/qxdw/zq/form.js b/src/views/fxzb/qxdw/zq/form.js
deleted file mode 100644
index 7c7c3ce..0000000
--- a/src/views/fxzb/qxdw/zq/form.js
+++ /dev/null
@@ -1,354 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, Table, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import "./index.less"
-import moment from 'moment';
-import { createCrudService } from '../../../../components/crud/_';
-const {RangePicker} = DatePicker
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
- 
-  console.log("record", record);
-  
-  const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      width: 60,
-      render: (text, record, index) => <span>{ index + 1}</span>
-    },
-    {
-      title: '姓名',
-      key: 'name',
-      dataIndex: 'name',
-      width: 200
-    },
-    {
-      title: '性别',
-      key: 'sex',
-      dataIndex: 'sex',
-      width: 60,
-      render: (text, record) => <span>{ record.sex === "M" ? "男" : "女"}</span>
-    },
-    {
-      title: '年龄',
-      key: 'age',
-      dataIndex: 'age',
-      width: 60,
-    },
-    {
-      title: '工作单位',
-      key: 'workUnit',
-      dataIndex: 'workUnit',
-      width: 150
-    },
-    {
-      title: '职务',
-      key: 'duty',
-      dataIndex: 'duty',
-      width: 150
-    },
-    {
-      title: '联系方式',
-      key: 'phone',
-      dataIndex: 'phone',
-      width: 150
-    },
-  ]
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [details, setDetails] = useState([])
-  const [serviceObjs, setServiceObjs] = useState([])
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-   /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    createCrudService(apiurl.fxzb.qsdw.zq.getFile).delGet({ teamId: params.teamId  }).then(res => {
-      if (res.code === 200) {
-        let fileArr = res.data?.files.map(item => {
-                return {
-                  name: item.fileName,
-                  response: {
-                    data: {
-                      filePath: item.filePath,
-                      fileId:item.fileId
-                    }
-                  },
-                }
-              })
-        setFileList(fileArr)
-        setDetails(res.data?.details)
-        setServiceObjs(res.data?.serviceObjs)
-      }
-    })
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/rescue/team/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
- 
-  useEffect(()=>{
-    if ((mode === "view") && record.teamId ) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-
-  useEffect(() => {
-   let serviceObj
-   let dateSo = [
-     moment(record.validStartDate),
-     moment(record.validEndDate)
-   ]
-   if (serviceObjs?.length > 0) {
-    serviceObj = serviceObjs.map(item => item.name).join()
-  }
-   form.setFieldsValue({...record,dateSo,serviceObjs:serviceObj})
- }, [record,serviceObjs])
- 
-  return (
-    <>
-      <div className='basic-info'>基本信息</div>
-      {/* <Divider /> */}
-      <Form
-        form={form}
-        {...formItemLayout}
-        // initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="队伍名称"
-                name="teamName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="登记日期"
-                name="registerDate"
-                rules={[{ required: true }]}
-              >
-               <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="有效期限"
-                name="dateSo"
-              >
-               <RangePicker
-                allowClear
-                showTime 
-                disabled={mode==='view'}
-                //  style={{ width: "300px" }}
-                 format="YYYY-MM-DD HH:mm:ss"
-               />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="管理单位"
-                name="managementUnit"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="地址"
-                name="address"
-                rules={[{ required: true }]}
-              >
-                <Input type='text' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={6}>
-              <Form.Item
-                label="经度"
-                name="lgtd"
-                labelCol={{ span: 12 }}
-                wrapperCol={{ span: 10 }}
-              >
-                 <Input type='text' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={6}>
-              <Form.Item
-                label="纬度"
-                name="lttd"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 10 }}
-              >
-                 <Input type='text' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="队伍负责人"
-                name="teamLeader"
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="联系电话"
-                name="phone"
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-        </Row>
-        <Row>
-          <Col span={12}>
-              <Form.Item
-                label="服务对象"
-                name="serviceObjs"
-              >
-              <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} >
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-        <div className='basic-info'>队伍明细：（共计{details?.length }人）</div>
-        <Table
-          rowKey="index"
-          columns={columns}
-          dataSource={details}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-          pagination={false}
-        />
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/rescue/goods/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/qxdw/zq/index.js b/src/views/fxzb/qxdw/zq/index.js
deleted file mode 100644
index 973871a..0000000
--- a/src/views/fxzb/qxdw/zq/index.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import AdcdTreeSelector from "./AdcdTreeSelector";
-
-const Page = () => {
-  const refModal = useRef();
-  const [form1] = Form.useForm();
-  const [form2] = Form.useForm();
-  const [adcd, setAdcd] = useState('422826000000000')
-  const [code, setcode] = useState('')
-  const [searchVal, setSearchVal] = useState(false)
-  const [storeData, setStoreData] = useState([])
-  const [storeOpen, setStoreOpen] = useState(false)
-  const [addStoreOpen, setAddStoreOpen] = useState(false) 
-  const [storeMode, setStoreMode] = useState('add')
-  const [storeParams, setStoreParams] = useState({})
-  const [isFetch, setIsFetch] = useState(false)
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '队伍名称', key: 'teamName', dataIndex: 'teamName', width: 200, ellipsis: true },
-    {
-      title: '人员总数', key: 'personCount', dataIndex: 'personCount', width: 140,
-    },
-    { title: '地址', key: 'address', dataIndex: 'address', width: 140 },
-    {
-      title: '管理单位', key: 'managementUnit', dataIndex: 'managementUnit', width: 150
-    },
-    { title: '队伍负责人', key: 'teamLeader', dataIndex: 'teamLeader', width: 150, ellipsis: true },
-    { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true },
-    { title: '登记日期', key: 'registerDate', dataIndex: 'registerDate', width: 150, ellipsis: true },
-    {
-      title: '有效期限', key: 'dateSo', dataIndex: 'dateSo', width: 250,
-      render: (value, row, index) => {
-        return (
-          <>
-            {row.isValid === 1 ?
-              <span style={
-                {
-                  color: "#67c750",
-                  border: "1px solid #b7eb8f",
-                  backgroundColor: "#f6ffed",
-                  padding: '0 5px',
-                  borderRadius: "4px"
-                }
-              }>有效</span> :
-              <span
-                style={
-                  {
-                      color: "#f5222d",
-                      border: "1px solid #ffa6a1",
-                      backgroundColor: "#fff1f0",
-                      padding: '0 5px',
-                      borderRadius: "4px"
-                  }
-                }
-              >无效</span>}
-              <span style={{paddingLeft:'10px'}}>{row.validStartDate}至{row.validEndDate}</span>
-          </>
-        )
-      }
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'view') {
-      refModal.current.showView(params);
-    }
-    
-  }
-
- 
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.qsdw.zq.page).find_noCode);
-  // const { tableProps, search, refresh } = usePageTable(async(params)=>{
-
-  //   return {
-  //     list: [
-  //       {
-  //         inx:'1',
-  //         wzmc:'彩条布',
-  //         wzlx:'抢险物料',
-  //         gg:'',
-  //         dw:'捆',
-  //         kcsl:'2',
-  //         cfck:'沿河路防汛仓库',
-  //         lxr:'周欣',
-  //         lxdh:'13909035906'
-  //       },
-  //       {
-  //         inx:'2',
-  //         wzmc:'无纺布',
-  //         wzlx:'抢险物料',
-  //         gg:'规格',
-  //         dw:'单位',
-  //         kcsl:'库存数量',
-  //         cfck:'存放仓库',
-  //         lxr:'周欣',
-  //         lxdh:'13909035906'
-  //       }
-  //     ], totalRow: 2
-  //   };
-  // },options);
- 
-
-
-  const onChangeOpen = (bool,v) => {
-    setStoreOpen(bool)
-    setcode(v)
-  }
-  
-
-  /**
-   * @description 处理成功的回调
-   */
-  const successCallback = () => {
-    refresh()
-    setIsFetch(!isFetch)
-  }
- 
-  
-  
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        code:adcd,
-        ...searchVal,
-        type:1
-      }
-    };
-    search(params)
-  }, [adcd, searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)',width:"233px"}}>
-          <AdcdTreeSelector setAdcd={setAdcd} isFetch={isFetch} onChangeOpen={onChangeOpen} hasAlertBox={false}/>
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/qxdw/zq/index.less b/src/views/fxzb/qxdw/zq/index.less
deleted file mode 100644
index 2740803..0000000
--- a/src/views/fxzb/qxdw/zq/index.less
+++ /dev/null
@@ -1,17 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxdw/zq/toolbar.js b/src/views/fxzb/qxdw/zq/toolbar.js
deleted file mode 100644
index 1050902..0000000
--- a/src/views/fxzb/qxdw/zq/toolbar.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave,storeData }) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="队伍名称" name="teamName">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="有效期限" name="tm">
-            <RangePicker
-              allowClear
-              // showTime 
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/qxwl/gc/AdcdTreeSelector/index.less b/src/views/fxzb/qxwl/gc/AdcdTreeSelector/index.less
deleted file mode 100644
index 2843201..0000000
--- a/src/views/fxzb/qxwl/gc/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,22 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxwl/gc/AdcdTreeSelector/index.tsx b/src/views/fxzb/qxwl/gc/AdcdTreeSelector/index.tsx
deleted file mode 100644
index 81790f5..0000000
--- a/src/views/fxzb/qxwl/gc/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal } from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import './index.less';
-import {getAdcdTreeData3} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  onChangeOpen?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd,onChangeOpen, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight,setTreeBoxHeight] = useState({})
-
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await getAdcdTreeData3(params);
-    const item:any = adcdTreedata?.[0]?.children?.[0]
-    if(item){
-      setSelectedKeys([item.adcd])
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.adnm;
-        item.key = item.adcd;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.adcd;
-
-      let params = { adcd: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { adcd: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.adnm.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-
-  const handleStore = (params:any) => {
-    onChangeOpen(true,params)
-  }
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              titleRender={(v: any) => {
-                return (
-                  <div>
-                    <div
-                      style={
-                        {
-                          color: '#a8a8a8',
-                          position:"absolute",
-                          right: '13px',
-                          // width:'100px'
-                        }}
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        console.log("v", v);
-                        handleStore(v)
-                        
-                      }}><FileTextOutlined /></div>
-                    
-                    <div>{v.title}</div>
-                  </div>
-                )
-              }}
-            />
-          }
-        </div>
-      
-      </div>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js
deleted file mode 100644
index 55bc614..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center'},
-    {title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
deleted file mode 100644
index 47863bb..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  console.log(data);
-  const maxVal = Math.max(...data.map(obj => obj.rz))+1
-  const minVal = Math.min(...data.map(obj => obj.rz))-1
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-
-  let arr =[]
-  data.forEach(item=>{
-    arr.push([item.w,item.rz])
-  })
-
-  return {
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "10%",
-        right: "20%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "蓄水量",
-        nameGap: -8,
-        type: 'category',
-        data: data.map(o => o.w),
-        // min:Math.floor(minValX),
-        // max:Math.round(maxValX),
-        // interval:GetInterval(minValX,maxValX),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#333',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        // symbol: 'none' // 设置标记点为'none'，即去掉圆点
-        symbolSize:10
-      },
-    ]
-  };
-}
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/index.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/index.js
deleted file mode 100644
index 4f6a56d..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-import {zvarl} from "../../../../../../../service/sssq";
-
-function Krqx({record}) {
-  const [data,setData]=useState([])
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  const getData=async (params)=>{
-    setData(await zvarl(params))
-  }
-  useEffect(() => {
-    getData({stcd:record.stcd})
-  }, [record]);
-
-
-  return (
-    <div style={{width: "98%", height: '60vh'}} className="swllgx-sq">
-      <div className="content">
-        <div className="content-left">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default Krqx
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/index.less b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/index.less
deleted file mode 100644
index 6e2608b..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/Krqx/index.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left{
-      width: 48%;
-      max-height: 60vh;
-      overflow: auto;
-    }
-    .content-right{
-      width: 48%;
-      height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/fxya.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/fxya.js
deleted file mode 100644
index 2c57485..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/fxya.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {plan} from "../../../../../../service/sssq";
-
-
-function Fxya({record}) {
-
-  const [data, setData] = useState({})
-  const getData = async (params) => {
-    let obj = await plan(params)
-    setData(obj[0])
-  }
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions column={3} bordered labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.preparation == 1 ? "是" : data?.preparation == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.approval == 1 ? "是" : data?.approval == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="编制时间" style={{width: "16.5%"}}>{data?.prepTime}</Descriptions.Item>
-        <Descriptions.Item label="批复时间">{data?.apprTime}</Descriptions.Item>
-        <Descriptions.Item label="编制单位">{data?.prepOrg}</Descriptions.Item>
-        <Descriptions.Item label="批复部门">{data?.apprOrg}</Descriptions.Item>
-        <Descriptions.Item label="预案文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.apprName}</span>
-        </Descriptions.Item>
-        <Descriptions.Item label="批复文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.planName}</span>
-        </Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Fxya;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/gctp.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/gctp.js
deleted file mode 100644
index 734be0d..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/gctp.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {projectimg, fileget} from "../../../../../../service/sssq";
-import {projDict} from "../../../../../../utils/dictType"
-
-
-function Gctp({record}) {
-  const [data, setData] = useState([])
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const getData = async (params) => {
-    setData(await projectimg(params))
-  }
-
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered layout="vertical" column={3}>
-        {
-          data?.length > 0 ? data?.map(o => <Descriptions.Item label={projDict(o?.projType)}>
-              <div className="no-data">
-                <img src={url + o?.filePath} style={{width: "100%"}} alt=""/>
-              </div>
-            </Descriptions.Item>
-            )
-            : ""
-        }
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Gctp;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/index.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/index.js
deleted file mode 100644
index bc265cc..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { Tabs} from "antd";
-import Jbxx from './jbxx'
-import Krqx from './Krqx'
-import Zrtx from './zrtx'
-import Jzw from './jzw'
-import Jsxx from './jsxx'
-import Gctp from './gctp'
-import Fxya from './fxya'
-import Sjbg from './sjbg'
-
-
-
-function Skjcxx({data}) {
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <>
-      <div>
-        <Tabs defaultActiveKey="1" tabPosition="left" type="card">
-          <Tabs.TabPane tab="基本信息" key="1">
-            <Jbxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="库容曲线" key="2">
-            <Krqx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="责任体系" key="3">
-            <Zrtx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建筑物" key="4">
-            <Jzw record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建设信息" key="5">
-            <Jsxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="工程图片" key="6">
-            <Gctp record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="防汛预案" key="7">
-            <Fxya record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="设计报告" key="8">
-            <Sjbg record={data}/>
-          </Tabs.TabPane>
-
-
-        </Tabs>
-      </div>
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jbxx.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jbxx.js
deleted file mode 100644
index 4c399c4..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jbxx.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {attResBase} from '../../../../../../service/sssq'
-import {engScalDict} from '../../../../../../utils/dictType'
-function Skjcxx({ data }) {
-  const [info,setInfo]=useState({})
-  const getData=async (params)=>{
-    setInfo(await attResBase(params))
-  }
-  useEffect(() => {
-    if (data?.resCode) {
-      getData({resCode:data.resCode})
-    }
-  }, [data]);
-
-  return (
-    <>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="水库名称" style={{ width: '16.5%' }}>{info?.resName}</Descriptions.Item>
-        <Descriptions.Item label="所在地" style={{ width: '16.5%' }}>{info?.resLoc}</Descriptions.Item>
-        <Descriptions.Item label="管理单位" style={{ width: '16.5%' }}>{info?.managName}</Descriptions.Item>
-        <Descriptions.Item label="水库代码">{info?.resCode}</Descriptions.Item>
-        <Descriptions.Item label="注册登记号">{info?.regSn}</Descriptions.Item>
-        <Descriptions.Item label="注册登记时间">{info?.regTime}</Descriptions.Item>
-        <Descriptions.Item label="经度">{info?.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{info?.lttd}</Descriptions.Item>
-        <Descriptions.Item label="高程基准面">{info?.elevDat}</Descriptions.Item>
-        <Descriptions.Item label="所在流域">{info?.basName}</Descriptions.Item>
-        <Descriptions.Item label="所在水系">{info?.wsName}</Descriptions.Item>
-        <Descriptions.Item label="所在河流名称">{info?.rvName}</Descriptions.Item>
-        <Descriptions.Item label="工程规模">{engScalDict(info?.engScal)}</Descriptions.Item>
-        <Descriptions.Item label="水库功能">{info?.rsvFunction}</Descriptions.Item>
-        <Descriptions.Item label="溢洪道是否有闸">{info?.spillwayGate==1?"有":info.spillwayGate==0?"无":""}</Descriptions.Item>
-        <Descriptions.Item label="水库特征参数" span={3}></Descriptions.Item>
-        <Descriptions.Item label="坝址以上控制流域面积(km³)">{info?.watShedArea}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)">{info?.crestElev}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{info?.maxDamHeig}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{info?.calFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万m³)">{info?.totCap}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水时最大下泄流量(m³/s)">{info?.maxDesFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{info?.desFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="调洪库容(万m³)">{info?.storFlCap}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水时最大下泄流量(m³/s)">{info?.maxCalFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="防洪高水位(m)">{info?.uppLevFlco}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万m³)">{info?.flcoCap}</Descriptions.Item>
-        <Descriptions.Item label="下游河道安全流量(m³/s)">{info?.dsSaftFlow}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{info?.normWatLev}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万m³)">{info?.benResCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{info?.deadLev}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万m³)">{info?.deadCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="工程概况" span={3}>{info?.projOverview}</Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jsxx.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jsxx.js
deleted file mode 100644
index 2412f45..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jsxx.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {construction} from "../../../../../../service/sssq";
-
-
-
-function Jsxx({record}) {
-
-  const columns = [
-    {title: '状态', key: '', dataIndex: '', align: 'center',render:rec=>rec.engStat==0?"始建":rec.engStat==1?"扩建":""},
-    {title: '工程开工时间', key: 'startDate', dataIndex: 'startDate', align: 'center'},
-    {title: '投入使用时间', key: 'useDate', dataIndex: 'useDate', align: 'center'},
-    {title: '竣工验收时间', key: 'compDate', dataIndex: 'compDate', align: 'center'},
-    {title: '改扩建内容', key: 'content', dataIndex: 'content', align: 'center'},
-    {title: '第几次扩建', key: 'buildNo', dataIndex: 'buildNo', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await construction(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Jsxx;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jzw.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jzw.js
deleted file mode 100644
index 2cebbec..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/jzw.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions,Table} from "antd";
-import {drainage,dam,transport} from "../../../../../../service/sssq";
-
-
-
-function Jzw({record}) {
-
-  const columns1 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns2 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启用标准', key: 'enableCriteria', dataIndex: 'enableCriteria', align: 'center'},
-  ];
-  const columns3 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '洞(孔)身型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '数量(条或孔)', key: 'num', dataIndex: 'num', align: 'center'},
-    {title: '进口底槛高程(m)', key: 'inletEle', dataIndex: 'inletEle', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns4 = [
-    {title: '设计流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '输水道型式', key: 'transType', dataIndex: 'transType', align: 'center',},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '输水道长度(m)', key: 'transLeng', dataIndex: 'transLeng', align: 'center'},
-    {title: '座教', key: 'num', dataIndex: 'num', align: 'center'},
-  ];
-
-  const [tableDataDs, setTableDataDs] = useState([])
-  const [tableDataXs, setTableDataXs] = useState({})
-  const [tableDataSs, setTableDataSs] = useState([])
-
-  const getData=async (params)=>{
-    setTableDataDs(await dam(params))
-    setTableDataXs(await drainage(params))
-    setTableDataSs(await transport(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <div style={{maxHeight:"60vh",overflow:"auto"}}>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>挡水建筑物</div>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="坝型" style={{ width: '16.5%' }}>{tableDataDs[0]?.damType}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damMaxHeig}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damTopElev}</Descriptions.Item>
-        <Descriptions.Item label="坝顶长度(m)">{tableDataDs[0]?.damTopLen}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{tableDataDs[0]?.damTopWid}</Descriptions.Item>
-        <Descriptions.Item label="坝基防渗体型式">{tableDataDs[0]?.damImpermeableType}</Descriptions.Item>
-        <Descriptions.Item label="副坝座数">{tableDataDs[0]?.subDamNum}</Descriptions.Item>
-        <Descriptions.Item label="副坝总长度(m)">{tableDataDs[0]?.subDamLen}</Descriptions.Item>
-        <Descriptions.Item label="副坝最大坝高(m)">{tableDataDs[0]?.subDamMaxHeig}</Descriptions.Item>
-      </Descriptions>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>泄水建筑物</div>
-      <div className="table-title" style={{padding:"4px"}}>☆正常溢洪道</div>
-      <Table rowKey="inx"
-             sticky
-             size="small"
-             columns={columns1}
-             pagination={false}
-             dataSource={tableDataXs.normalSpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆非常溢洪道</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns2}
-             pagination={false}
-             dataSource={tableDataXs.emergencySpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆泄洪洞</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns3}
-             pagination={false}
-             dataSource={tableDataXs.sluiceGateList}
-      />
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>输水建筑物</div>
-      <Table rowKey="key"
-             sticky
-             size="small "
-             columns={columns4}
-             pagination={false}
-             dataSource={tableDataSs}
-      />
-    </div>
-  )
-}
-
-export default Jzw;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/sjbg.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/sjbg.js
deleted file mode 100644
index f7d62f0..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/sjbg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {file} from "../../../../../../service/sssq";
-
-
-
-function Sjbg({record}) {
-
-  const columns = [
-    {title: '文件名称', key: '', dataIndex: '', align: 'center',render:rec=><span style={{color:"#689FFF"}}>{rec.fileName}</span>},
-    {title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center'},
-    {title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center'},
-    {title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center'},
-    {title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await file(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             bordered
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Sjbg;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/zrtx.js b/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/zrtx.js
deleted file mode 100644
index d78d4ac..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/Skjcxx/zrtx.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {person} from "../../../../../../service/sssq";
-import {repDict} from "../../../../../../utils/dictType"
-
-
-
-function Zrtx({record}) {
-
-  const columns = [
-    {title: '责任人', key: '', dataIndex: '', align: 'center',render:rec=>repDict(rec.repType)},
-    {title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center'},
-    {title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center'},
-    {title: '职务', key: 'position', dataIndex: 'position', align: 'center'},
-    {title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await person(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Zrtx;
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/index.less b/src/views/fxzb/qxwl/gc/GcTreeSelector/index.less
deleted file mode 100644
index 94cb227..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/index.less
+++ /dev/null
@@ -1,44 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.GcTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-  .ant-tree-treenode{
-    width: 100%;
-
-    .ant-tree-node-content-wrapper{
-      // width: 100%;
-      // padding-right: 15px;
-      position: static;
-    }
-  }
-}
-.no-matter{
-  opacity: .5;
-}
-// .detail-modal{
-//   .ant-descriptions-item{
-//     border-bottom: 1px solid rgb(232, 232, 232) ;
-//   }
-// }
-.tree-container{
-  .ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
-    color:rgba(0, 0, 0, 0.7)
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxwl/gc/GcTreeSelector/index.tsx b/src/views/fxzb/qxwl/gc/GcTreeSelector/index.tsx
deleted file mode 100644
index 94b698e..0000000
--- a/src/views/fxzb/qxwl/gc/GcTreeSelector/index.tsx
+++ /dev/null
@@ -1,357 +0,0 @@
-import React, { useState, useEffect,useRef,forwardRef, useImperativeHandle } from 'react';
-import {Tree, Input, Checkbox, Tabs,Spin, Modal,Descriptions} from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import Jbxx from './Skjcxx/jbxx'
-import Krqx from './Skjcxx/Krqx'
-import Zrtx from './Skjcxx/zrtx'
-import Jzw from './Skjcxx/jzw'
-import Jsxx from './Skjcxx/jsxx'
-import Gctp from './Skjcxx/gctp'
-import Fxya from './Skjcxx/fxya'
-import Sjbg from './Skjcxx/sjbg'
-import './index.less';
-import {getAdcdTreeData1, getGcTreeData4} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setCode?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  setTag?: any,
-  isFetch?: any,
-  data?: any,
-  clickHandler?:any
-}
-
-const AdcdTreeSelector: React.FC<IProps> =forwardRef(({ onSelectFun, setCode,data,clickHandler, isFetch,setTag, showCheckbox, tableName, hasAlertBox },ref) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [itemDetail, setItemDetail] = useState<any>({}) // 树中的每一项的详细信息
-
-  const [ open, setOpen] = useState(false)
-  const [keys, setKeys] = useState(1)
-  const selectKeysRef = useRef()
-  useImperativeHandle(ref, () => ({
-    getTreeData: () => {
-      getCustomerTreeData();
-    }
-  }))
-  const TabList = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-    {
-      key: '2',
-      label: '库容曲线',
-    },
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '4',
-      label: '建筑物',
-    },
-    {
-      key: '5',
-      label: '建设信息',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计报告',
-    },
-  ]
-  const selectedKeysRef = useRef('')
-  useEffect(() => {
-    getCustomerTreeData();
-    // if (selectedKeysRef.current) {
-    //   setSelectedKeys(selectedKeysRef.current)
-    // }
-  }, []);
-
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await getGcTreeData4(params);
-
-    const item:any = adcdTreedata?.[0]?.children?.[0]
-    if (item) {
-      if (selectKeysRef.current) {
-        setSelectedKeys(selectKeysRef.current)
-        setCode(selectKeysRef.current[0])
-      } else {
-        setCode(item.code)
-        setSelectedKeys([item.code])
-      }
-      // setCode(item.code)
-      // setSelectedKeys([item.code])
-      // setTag(item.tag)
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.name;
-        item.key =item.code
-        // (
-        //   <span  style={{position:'relative'}}>
-        //     {item.sname}
-        //     <div  style={{color:'red',position:'absolute',left:'50px'}}>按钮</div>
-        //   </span>
-        // )
-        item.key = item.code;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue: any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    selectKeysRef.current = selectedKeysValue;
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.code;
-
-      let params = { code: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode(adcdVal)
-        // setTag(selectData.tag)
-      }
-    } else {
-      let params = { code: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode("")
-        setTag("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.name.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-  const onChange = (key:any) => {
-    setKeys(key)
-  }
-  return (
-    <div style={{position:"relative"}} className='GcTreeSelectorStyle '>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }} className='tree-container'>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              titleRender={(v:any)=>{
-                return (<>
-                    {
-                      v.children?.length?null:
-                      <div  style={{color:'#a8a8a8',position:'absolute',right:'25px'}} onClick={(e)=>{
-                        e.stopPropagation()
-                        setOpen(true)
-                        setItemDetail(v)
-                        clickHandler(v)
-                        
-                      }}><FileTextOutlined /></div>
-                    }
-                    <div  className={v.status ? "" : "no-matter"}>{v.title}</div>
-                </>)
-              }}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-            />
-          }
-        </div>
-
-
-        <Modal
-          title=""
-          width={1000}
-          open={open}
-          footer={null}
-          onCancel={() => setOpen(false)}
-          className='detail-modal'
-        >
-          <div className="dp-popup-content">
-          <div className="content-body tyb skpop" id='tyb'>
-            <div className="title flexac flex">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data?.resName}
-              </div>
-
-              <Tabs
-                defaultActiveKey="1"
-                type="card"
-                onChange={onChange}
-                items={TabList}
-                tabBarStyle={{margin:0}}
-              />
-            </div>
-            <div style={{backgroundColor:'#fff'}}>
-              {keys == 1 && <Jbxx data={data} />}
-              {keys == 2 && <Krqx record={data} />}
-              {keys == 3 && <Zrtx record={data} />}
-              {keys == 4 && <Jzw record={data} />}
-              {keys == 5 && <Jsxx record={data} />}
-              {keys == 6 && <Gctp record={data} />}
-              {keys == 7 && <Fxya record={data} />}
-              {keys == 8 && <Sjbg record={data} />}
-            </div>
-          </div>
-        </div>
-        </Modal>
-      </div>
-
-    </div>
-  );
-});
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/qxwl/gc/form.js b/src/views/fxzb/qxwl/gc/form.js
deleted file mode 100644
index 79445b1..0000000
--- a/src/views/fxzb/qxwl/gc/form.js
+++ /dev/null
@@ -1,401 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FilePptOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import { createCrudService } from '../../../../components/crud/_';
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
-  const goodsOptions = [
-    {
-      label: "抢险物资",
-      value: 1,
-    },
-    {
-      label: "救生器材",
-      value: 2,
-    }
-  ]
-  const unitOptions = [
-    {
-      label: "个",
-      value: 1,
-    },
-    {
-      label: "件",
-      value: 2,
-    },
-    {
-      label: "米",
-      value: 3,
-    },
-    {
-      label: "把",
-      value: 4,
-    },
-    {
-      label: "台",
-      value: 5,
-    },
-    {
-      label: "套",
-      value: 6,
-    },
-    {
-      label: "副",
-      value: 7,
-    },
-    {
-      label: "箱",
-      value: 8,
-    },
-    {
-      label: "卷",
-      value: 9,
-    },
-    {
-      label: "立方米",
-      value: 10,
-    },
-    {
-      label: "平方米",
-      value: 11,
-    }
-  ]
-  console.log("record",record);
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-  const onFinish = (values) => {
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item =>  item.response?.data?.fileId )
-      values.fileIds = oldFiles;
-      values.goodsId = record.goodsId;
-      // values.fileIds = fileIds
-      onEdit(apiurl.fxzb.qswl.zq.edit,values)
-    }
-    if (mode === 'save') {
-      values.fileIds = fileIds
-      // debugger
-      onSave(apiurl.fxzb.qswl.zq.save,values)
-    }
-    if (mode === "similarSave") {
-      let oldFiles = fileList.map(item =>  item.response?.data?.fileId )
-      values.fileIds = oldFiles;
-      onSave(apiurl.fxzb.qswl.zq.save,values)
-    }
-  }
-
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    console.log(fileId);
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-  }
-     /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    createCrudService(apiurl.fxzb.qswl.zq.getFile).delGet({ goodsId: params.goodsId }).then(res => {
-      if (res.code === 200) {
-        let fileArr = res.data.map(item => {
-                return {
-                  name: item.fileName,
-                  response: {
-                    data: {
-                      filePath: item.filePath,
-                      fileId:item.fileId
-                    }
-                  },
-                }
-              })
-              setFileList(fileArr)
-      }
-    })
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/rescue/goods/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
- 
-  useEffect(()=>{
-    if ((mode === "view" || mode === "edit" || mode === "similarSave") && record.goodsId) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="物资名称"
-                name="goodsName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="物资类型"
-                name="goodsType"
-                rules={[{ required: true }]}
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={goodsOptions}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="规格"
-                name="specs"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="单位"
-                name="unit"
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={unitOptions}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="库存数量"
-                name="storeQuantity"
-                rules={[{ required: true }]}
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="仓库地点"
-                name="storeLocation"
-              >
-                 <Input type='text' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="联系人"
-                name="contactPerson"
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="联系电话"
-                name="phone"
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/rescue/goods/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-      
-
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '增加' :
-                    mode === "similarSave" ? "增加" :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/rescue/goods/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/qxwl/gc/index.js b/src/views/fxzb/qxwl/gc/index.js
deleted file mode 100644
index 994540b..0000000
--- a/src/views/fxzb/qxwl/gc/index.js
+++ /dev/null
@@ -1,212 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import GTreeSelector from "../../qxdw/gc/GcTreeSelector";
-import {getAdcdTreeData1, getGcTreeData4} from '../../../../service/warn';
-
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const copyBtn = role?.rule?.find(item => item.menuName == "复制") || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
-  const refModal = useRef();
-  const treeRef = useRef();
-  const [form1] = Form.useForm();
-  const [form2] = Form.useForm();
-  const [adcd, setCode] = useState('42282650004')
-  const [code, setcode] = useState('')
-  const [searchVal, setSearchVal] = useState(false)
-  const [storeData, setStoreData] = useState([])
-  const [storeOpen, setStoreOpen] = useState(false)
-  const [addStoreOpen, setAddStoreOpen] = useState(false) 
-  const [storeMode, setStoreMode] = useState('add')
-  const [storeParams, setStoreParams] = useState({})
-  const [isFetch, setIsFetch] = useState(false)
-  const [projectInfo, setProjectInfo] = useState({})
-  const [tag, setTag] = useState()
-  const [goodsIcon, setGoodsIcon] = useState(1)
-  const [locationIcon, setLocationIcon] = useState(2)
-
-  /**
-   * @description 处理物质名称排序
-   */
-  const handleOrder = () => {
-    if (goodsIcon === 1) {
-      setGoodsIcon(2)
-    } else if (goodsIcon === 2) {
-      setLocationIcon(2)
-      setGoodsIcon(1)
-    }
-  }
-
-  /**
-   * @description 处理仓库名称排序
-   */
-  const handleLocationOrder = () => {
-    if (locationIcon === 1) {
-      setLocationIcon(2)
-    } else if (locationIcon === 2) {
-      setGoodsIcon(2)
-      setLocationIcon(1)
-    }
-  }
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    {
-      title: 
-        <>
-          <span>物资名称</span>
-          <img
-            src={`${process.env.PUBLIC_URL}/assets/fxdd/${ goodsIcon == 1 ? "stop.png" : 'start.png'}`}
-            alt=""
-            style={{
-              marginTop:-3,
-              marginLeft: 10,
-              width: 20,
-              height: 20,
-              cursor: 'pointer',
-            }}
-            onClick={handleOrder}
-          />
-        </>,
-      key: 'goodsName',
-      dataIndex: 'goodsName',
-      width: 200,
-      ellipsis: true,
-    },
-    {
-      title: '物资类型', key: 'goodsType', dataIndex: 'goodsType', width: 140,
-      render: (_, record) => <span>{ record.goodsType === 1 ? "抢险物资" : "救生器材"}</span>
-    },
-    { title: '规格', key: 'specs', dataIndex: 'specs', width: 140 },
-    {
-      title: '单位', key: 'unit', dataIndex: 'unit', width: 150,
-      render: (_, record) => <span>{
-        record.unit === 1 ? "个" : 
-          record.unit === 2 ? "件" :
-            record.unit === 3 ? "米" :
-              record.unit === 4 ? "把" :
-                record.unit === 5 ? "台" :
-                  record.unit === 6 ? "套" :
-                    record.unit === 7 ? "副" :
-                      record.unit === 8 ? "箱" :
-                        record.unit === 9 ? "卷" :
-                          record.unit === 10 ? "立方米" :
-                          record.unit === 11 ? "平方米" :
-                          ""
-      }</span>
-    },
-    { title: '库存数量', key: 'storeQuantity', dataIndex: 'storeQuantity', width: 150, ellipsis: true },
-    {
-      title:  <>
-        <span>仓库地点</span>
-        <img
-          src={`${process.env.PUBLIC_URL}/assets/fxdd/${ locationIcon == 1 ? "stop.png" : 'start.png'}`}
-        alt=""
-          style={{
-          marginTop:-3,
-          marginLeft: 10,
-          width: 20,
-          height: 20,
-          cursor: 'pointer',
-        }}
-          onClick={handleLocationOrder}
-        />
-  
-    </>,
-      key: 'storeLocation',
-      dataIndex: 'storeLocation',
-      width: 150,
-      ellipsis: true
-    },
-    { title: '联系人', key: 'contactPerson', dataIndex: 'contactPerson', width: 150, ellipsis: true },
-    { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={editBtn ? true : false} view={true} del={delBtn ? true : false} similarAdd={copyBtn ? true : false} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({...params});
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.qswl.zq.delete+ `/${params.goodsId}`);
-    }else if (type === 'similarAdd') {
-      refModal.current.showSimilarSave(params);
-    }
-  }
-
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.qswl.zq.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-  setIsFetch(!isFetch)
-}
-
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      },
-      sortField:
-        goodsIcon === 1 ? "goods_name" : 
-        locationIcon === 1 ? "store_location" : ""
-    };
-    search(params)
-  }, [searchVal,goodsIcon,locationIcon])
-
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-    
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              storeData={storeData}
-              role={role}
-              onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/qxwl/gc/toolbar.js b/src/views/fxzb/qxwl/gc/toolbar.js
deleted file mode 100644
index ca7962e..0000000
--- a/src/views/fxzb/qxwl/gc/toolbar.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-  // useEffect(()=>{
-  //   getSelect()
-  // },[])
-
-  // const getSelect = async()=>{
-  //   setSource(await getDictService({dictType:'source'}))
-  //   setSttp(await getDictService({dictType:'sttp'}))
-  // }
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="物质名称" name="goodsName">
-            <Input allowClear  style={{width:'180px'}}/>
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/qxwl/zq/AdcdTreeSelector/index.less b/src/views/fxzb/qxwl/zq/AdcdTreeSelector/index.less
deleted file mode 100644
index 3b94c18..0000000
--- a/src/views/fxzb/qxwl/zq/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-.treeBox1{
-  .ant-tree-node-content-wrapper{
-    position: static !important;
-  }
-
-}
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-}
-.no-matter{
-  opacity: 0.5;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/qxwl/zq/AdcdTreeSelector/index.tsx b/src/views/fxzb/qxwl/zq/AdcdTreeSelector/index.tsx
deleted file mode 100644
index 79f606a..0000000
--- a/src/views/fxzb/qxwl/zq/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,251 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal } from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import './index.less';
-import {getAdcdTreeData3} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  onChangeOpen?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  isFetch?: boolean;
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd,onChangeOpen,isFetch, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight,setTreeBoxHeight] = useState({})
-
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata: any = await getAdcdTreeData3(params);
-    console.log(adcdTreedata);
-    
-    const item: any = adcdTreedata[0]?.adcd
-    if(item){
-      setSelectedKeys([item])
-      setAdcd(item)
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.adnm;
-        item.key = item.adcd;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.adcd;
-
-      let params = { adcd: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { adcd: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.adnm.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-
-  const handleStore = (params:any) => {
-    onChangeOpen(true,params)
-  }
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-      {/* {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />} */}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox1" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              titleRender={(v: any) => {
-                return (
-                  <div>
-                    <div
-                      style={
-                        {
-                          color: '#a8a8a8',
-                          position:"absolute",
-                          right: '13px',
-                          // width:'100px'
-                        }}
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        console.log("v", v);
-                        handleStore(v)
-                      }}>
-                      <FileTextOutlined />
-                    </div>
-                    <div className={v.status ? "" : "no-matter"}>{v.title}</div>
-                  </div>
-                )
-              }}
-            />
-          }
-        </div>
-      
-      </div>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/qxwl/zq/form.js b/src/views/fxzb/qxwl/zq/form.js
deleted file mode 100644
index 9498011..0000000
--- a/src/views/fxzb/qxwl/zq/form.js
+++ /dev/null
@@ -1,425 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import { createCrudService } from '../../../../components/crud/_';
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
-  const goodsOptions = [
-    {
-      label: "抢险物资",
-      value: 1,
-    },
-    {
-      label: "救生器材",
-      value: 2,
-    }
-  ]
-  console.log("record",record);
-  const unitOptions = [
-    {
-      label: "个",
-      value: 1,
-    },
-    {
-      label: "件",
-      value: 2,
-    },
-    {
-      label: "米",
-      value: 3,
-    },
-    {
-      label: "把",
-      value: 4,
-    },
-    {
-      label: "台",
-      value: 5,
-    },
-    {
-      label: "套",
-      value: 6,
-    },
-    {
-      label: "副",
-      value: 7,
-    },
-    {
-      label: "箱",
-      value: 8,
-    },
-    {
-      label: "卷",
-      value: 9,
-    },
-    {
-      label: "立方米",
-      value: 10,
-    },
-    {
-      label: "平方米",
-      value: 11,
-    }
-  ]
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-  const onFinish = (values) => {
-    values.code = record.code;
-    values.type = 1;
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item =>  item.response?.data?.fileId )
-      values.fileIds = oldFiles;
-      values.goodsId = record.goodsId;
-      // values.fileIds = fileIds
-      onEdit(apiurl.fxzb.qswl.zq.edit,values)
-    }
-    if (mode === 'save') {
-      values.fileIds = fileIds
-      onSave(apiurl.fxzb.qswl.zq.save,values)
-    }
-    if (mode === "similarSave") {
-      let oldFiles = fileList.map(item =>  item.response?.data?.fileId )
-      values.fileIds = oldFiles;
-      onSave(apiurl.fxzb.qswl.zq.save,values)
-    }
-  }
-
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    console.log(fileId);
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-     /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    createCrudService(apiurl.fxzb.qswl.zq.getFile).delGet({ goodsId: params.goodsId }).then(res => {
-      if (res.code === 200) {
-        let fileArr = res.data.map(item => {
-                return {
-                  name: item.fileName,
-                  response: {
-                    data: {
-                      filePath: item.filePath,
-                      fileId:item.fileId
-                    }
-                  },
-                }
-              })
-              setFileList(fileArr)
-      }
-    })
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/rescue/goods/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
- /**
-  * 
-  * @param {Object} changedValues 改变的某个字表单的值
-  * @description 某个表单值发生改变引起的表单的变化
-  */
-  const handleFormChange = (changedValues, allValues) => {
-    let dymaicFormValue = record.storeData.find(item =>
-      item.value === changedValues.warehouseId)
-      form.setFieldsValue({
-      contactPerson: dymaicFormValue.contactPerson,
-      phone:dymaicFormValue.phone,
-    })
-  };
-  useEffect(()=>{
-    if ((mode === "view" || mode === "edit" || mode === "similarSave") && record.goodsId) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-  useEffect(() => {
-    form.setFieldsValue({...record,warehouseId:String(record.warehouseId || "")})
-  //   if (record.storeData?.length > 0) {
-     
-  //  }
-  
-  }, [record])
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onFinish}
-        onValuesChange={handleFormChange}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="物资名称"
-                name="goodsName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="物资类型"
-                name="goodsType"
-                rules={[{ required: true }]}
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={goodsOptions}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="规格"
-                name="specs"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="单位"
-                name="unit"
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={unitOptions}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="库存数量"
-                name="storeQuantity"
-                rules={[{ required: true }]}
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="存放仓库"
-                name="warehouseId"
-                rules={[{ required: true }]}
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={record.storeData}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="联系人"
-                name="contactPerson"
-                dependencies={["warehouseId"]}
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="联系电话"
-                name="phone"
-                dependencies={["warehouseId"]}
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/rescue/goods/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                   loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-      
-
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '增加' :
-                    mode === "similarSave" ? "增加" :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/rescue/goods/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/qxwl/zq/index.js b/src/views/fxzb/qxwl/zq/index.js
deleted file mode 100644
index c52b543..0000000
--- a/src/views/fxzb/qxwl/zq/index.js
+++ /dev/null
@@ -1,468 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import AdcdTreeSelector from "./AdcdTreeSelector";
-
-const Page = () => {
-  const refModal = useRef();
-  const [form1] = Form.useForm();
-  const [form2] = Form.useForm();
-  const [adcd, setAdcd] = useState('422826100000000')
-  const [code, setcode] = useState('')
-  const [searchVal, setSearchVal] = useState(false)
-  const [storeData, setStoreData] = useState([])
-  const [storeOpen, setStoreOpen] = useState(false)
-  const [addStoreOpen, setAddStoreOpen] = useState(false) 
-  const [storeMode, setStoreMode] = useState('add')
-  const [storeParams, setStoreParams] = useState({})
-  const [isFetch, setIsFetch] = useState(false)
-  const [goodsIcon, setGoodsIcon] = useState(1)
-  const [locationIcon, setLocationIcon] = useState(2)
-
-  /**
-   * @description 处理物质名称排序
-   */
-  const handleOrder = () => {
-    if (goodsIcon === 1) {
-      setGoodsIcon(2)
-    } else if (goodsIcon === 2) {
-      setGoodsIcon(1)
-      setLocationIcon(2)
-    }
-  }
-
-  /**
-   * @description 处理仓库名称排序
-   */
-  const handleLocationOrder = () => {
-    if (locationIcon === 1) {
-      setLocationIcon(2)
-    } else if (locationIcon === 2) {
-      setLocationIcon(1)
-      setGoodsIcon(2)
-    }
-  }
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    {
-      title:  <>
-      <span>物资名称</span>
-      <img
-        src={`${process.env.PUBLIC_URL}/assets/fxdd/${ goodsIcon == 1 ? "stop.png" : 'start.png'}`}
-        alt=""
-        style={{
-          marginTop:-3,
-          marginLeft: 10,
-          width: 20,
-          height: 20,
-          cursor: 'pointer',
-        }}
-        onClick={handleOrder}
-      />
-    </>,
-      key: 'goodsName',
-      dataIndex: 'goodsName',
-      width: 200,
-      ellipsis: true,
-    },
-    {
-      title: '物资类型', key: 'goodsType', dataIndex: 'goodsType', width: 140,
-      render: (_, record) => <span>{record.goodsType === 1 ? "抢险物资" : "救生器材"}</span>
-    },
-    { title: '规格', key: 'specs', dataIndex: 'specs', width: 140 },
-    {
-      title: '单位', key: 'unit', dataIndex: 'unit', width: 150,
-      render: (_, record) => <span>{
-        record.unit === 1 ? "个" : 
-          record.unit === 2 ? "件" :
-            record.unit === 3 ? "米" :
-              record.unit === 4 ? "把" :
-                record.unit === 5 ? "台" :
-                  record.unit === 6 ? "套" :
-                    record.unit === 7 ? "副" :
-                      record.unit === 8 ? "箱" :
-                        record.unit === 9 ? "卷" :
-                          record.unit === 10 ? "立方米" : 
-                          record.unit === 11 ? "平方米" :''
-                          
-      }</span>
-    },
-    { title: '库存数量', key: 'storeQuantity', dataIndex: 'storeQuantity', width: 150, ellipsis: true },
-    {
-      title: <>
-      <span>存放仓库</span>
-      <img
-        src={`${process.env.PUBLIC_URL}/assets/fxdd/${ locationIcon == 1 ? "stop.png" : 'start.png'}`}
-        alt=""
-          style={{
-          marginTop:-3,
-          marginLeft: 10,
-          width: 20,
-          height: 20,
-          cursor: 'pointer',
-        }}
-        onClick={handleLocationOrder}
-      />
-    </>,
-      key: 'warehouseName',
-      dataIndex: 'warehouseName',
-      width: 150,
-      ellipsis: true
-    },
-    { title: '联系人', key: 'contactPerson', dataIndex: 'contactPerson', width: 150, ellipsis: true },
-    { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} similarAdd={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const columns1 = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '仓库名称', key: 'warehouseName', dataIndex: 'warehouseName', width: 150, ellipsis: true },
-    { title: '地址', key: 'address', dataIndex: 'address', width: 200, ellipsis: true },
-    { title: '联系人', key: 'contactPerson', dataIndex: 'contactPerson', width: 150, ellipsis: true },
-    { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} command={(cmd) => () => command1(cmd)(row)} />)
-    },
-
-  ]
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({storeData,code:adcd});
-    } else if (type === 'edit') {
-      refModal.current.showEdit({...params,storeData});
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.qswl.zq.delete+ `/${params.goodsId}`);
-    }else if (type === 'similarAdd') {
-      refModal.current.showSimilarSave({...params,storeData});
-    }
-  }
- 
-  const command1 = (type) => (params) => { 
-    if (type === 'edit') { 
-      setAddStoreOpen(true)
-      setStoreMode("edit")
-      setStoreParams(params)
-      form2.setFieldsValue(params)
-    } else {
-      createCrudService(apiurl.fxzb.qswl.zq.storeDelete + `/${params.warehouseId}`).delGet().then(res => {
-        if (res.code == 200) {
-          message.success('删除成功')
-          refresh1()
-        }
-      })
-    }
-  }
-
-/**
- * @description 获取仓库下拉
- */
-  const getStoreData = (adcd) => {
-    createCrudService(apiurl.fxzb.qswl.zq.getStore).delGet({adcd}).then(res => {
-      if (res.code == 200) {
-        let newData = res.data.map(item => ({
-          value: item.warehouseId,
-          label: item.warehouseName,
-          contactPerson: item.contactPerson,
-          phone:item.phone
-        }))
-        setStoreData(newData)
-      }
-    })
-  }
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.qswl.zq.page).find_noCode);
-  // const { tableProps, search, refresh } = usePageTable(async(params)=>{
-
-  //   return {
-  //     list: [
-  //       {
-  //         inx:'1',
-  //         wzmc:'彩条布',
-  //         wzlx:'抢险物料',
-  //         gg:'',
-  //         dw:'捆',
-  //         kcsl:'2',
-  //         cfck:'沿河路防汛仓库',
-  //         lxr:'周欣',
-  //         lxdh:'13909035906'
-  //       },
-  //       {
-  //         inx:'2',
-  //         wzmc:'无纺布',
-  //         wzlx:'抢险物料',
-  //         gg:'规格',
-  //         dw:'单位',
-  //         kcsl:'库存数量',
-  //         cfck:'存放仓库',
-  //         lxr:'周欣',
-  //         lxdh:'13909035906'
-  //       }
-  //     ], totalRow: 2
-  //   };
-  // },options);
-  const { tableProps:tableProps1, search:search1, refresh:refresh1 } = usePageTable(createCrudService(apiurl.fxzb.qswl.zq.storePage).find_noCode);
-
- 
-
-  /**
-   * 
-   * @description 仓库列表查询
-   */
-  const onfinish = (v) => {
-    let params = {
-      search: {
-        ...v,
-        adcd:code.adcd
-      }
-    }
-    search1(params)
-  }
-
-  const onChangeOpen = (bool,v) => {
-    setStoreOpen(bool)
-    setcode(v)
-  }
-  
-  /**
-   * @description 新增仓库弹框
-   */
-  const addStore = () => {
-    setStoreMode("add")
-    setAddStoreOpen(true)
-    form2.resetFields()
-  }
-  /**
-   * @description 处理成功的回调
-   */
-  const successCallback = () => {
-    refresh()
-    setIsFetch(!isFetch)
-  }
-  /**
-   * @description 新增仓库的提交
-   */
-  const onfinish2 = (values) => {
-    values.adcd = code.adcd
-    if (storeMode === "add") {
-      createCrudService(apiurl.fxzb.qswl.zq.storeSave).save(values).then(res => {
-        if (res.code === 200) {
-          setAddStoreOpen(false)
-          message.success('保存成功');
-          refresh1({adcd: code.adcd})
-        }
-      })
-    } else {
-      values.warehouseId = storeParams.warehouseId
-      createCrudService(apiurl.fxzb.qswl.zq.storeEdit).save(values).then(res => {
-        if (res.code === 200) {
-          setAddStoreOpen(false)
-          message.success('修改成功');
-          refresh1({adcd: code.adcd})
-        }
-      })
-    }
-  }
-  useEffect(() => { 
-    getStoreData(adcd)
-  }, [adcd])
-  
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        code:adcd,
-        ...searchVal,
-        type:1
-      },
-      sortField:
-        goodsIcon === 1 ? "goods_name" : 
-        locationIcon === 1 ? "warehouse_id" : ""
-    };
-    search(params)
-  }, [adcd, searchVal,goodsIcon,locationIcon])
-  
-  useEffect(() => {
-    if (code.adcd) {
-      let params = {
-        search: {
-          adcd:code.adcd,
-        }
-      }
-        search1(params)
-  
-    }
-  }, [code.adcd])
-  
-  // useEffect(() => {
-  //   if (tableProps.dataSource) {
-  //     setDataSource(tableProps.dataSource)
-  //   }
-  // }, [tableProps])
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)',width:"233px"}}>
-          <AdcdTreeSelector setAdcd={setAdcd} isFetch={isFetch} onChangeOpen={onChangeOpen} hasAlertBox={false}/>
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              storeData={storeData}
-              onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="inx"
-              {...tableProps}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-            />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-        <Modal
-          open={storeOpen}
-          width={1000}
-          title="仓库列表"
-          footer={null}
-          destroyOnClose
-          onCancel={() => {
-            setStoreOpen(false);
-            form1.resetFields()
-          }}
-        >
-        <div style={{display:'flex',justifyContent:'space-between'}}>
-            <Form form={form1} className='toolbarBox' layout="inline" onFinish={onfinish}>
-              <Form.Item label="仓库名称" name="warehouseName">
-                <Input allowClear  style={{width:'180px'}}/>
-              </Form.Item>
-              <Form.Item>
-                <Button type="primary" htmlType="submit">查询</Button>
-              </Form.Item>
-              <Form.Item>
-                    <Button onClick={addStore}>新增</Button>
-                  </Form.Item>
-            </Form>
-          </div>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns1} rowKey="inx" {...tableProps1} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </Modal>
-        
-      </div>
-      <Modal
-          open={addStoreOpen}
-          width={800}
-          title={storeMode === "add" ? "新增" :"编辑"}
-          footer={null}
-          onCancel={() => setAddStoreOpen(false)}
-          destroyOnClose
-        >
-        <div>
-            <Form form={form2} className='toolbarBox'  onFinish={onfinish2}>
-              <Row>
-                <Col span={12}>
-                  <Form.Item
-                    label="仓库名称"
-                    name="warehouseName" 
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 19 }}
-                  >
-                    <Input allowClear  style={{width:'100%'}}/>
-                  </Form.Item>
-                </Col>
-                <Col span={12}>
-                  <Form.Item
-                    label="地址"
-                    name="address"
-                    labelCol={{ span: 5 }}
-                    wrapperCol={{ span: 19 }}
-                  >
-                    <Input allowClear  style={{width:'100%'}}/>
-                  </Form.Item>
-                </Col>
-              </Row>
-              <Row>
-                <Col span={12}>
-                  <Form.Item
-                    label="联系人"
-                    name="contactPerson"
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 19 }}
-                  >
-                    <Input allowClear  style={{width:'100%'}}/>
-                  </Form.Item>
-                </Col>
-                <Col span={12}>
-                  <Form.Item
-                    label="联系人电话"
-                    name="phone"
-                  >
-                      <Input allowClear  style={{width:'100%'}}/>
-                    </Form.Item>
-                </Col>
-              </Row>
-              <Row>
-                <Col span={12}>
-                  <Form.Item
-                    label="经度"
-                    name="lgtd"
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 19 }}
-                  >
-                    <Input allowClear  style={{width:'100%'}}/>
-                  </Form.Item>
-                </Col>
-                <Col span={12}>
-                  <Form.Item
-                    label="纬度"
-                    name="lttd"
-                    labelCol={{ span: 5 }}
-                    wrapperCol={{ span: 19 }}
-                  >
-                      <Input allowClear  style={{width:'100%'}}/>
-                    </Form.Item>
-                </Col>
-              </Row>
-              <Row>
-                <Col span={24}>
-                  <Form.Item {...btnItemLayout}>
-                    <Button type="primary" htmlType="submit">提交</Button>
-                  </Form.Item>
-                </Col>
-              </Row>
-            </Form>
-          </div>
-        </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/qxwl/zq/toolbar.js b/src/views/fxzb/qxwl/zq/toolbar.js
deleted file mode 100644
index 772ca70..0000000
--- a/src/views/fxzb/qxwl/zq/toolbar.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-const fxck = [
-  {
-    label:'沿河路防汛仓库',
-    value:'沿河路防汛仓库'
-  },
-  {
-    label:'育英路防汛仓库',
-    value:'育英路防汛仓库'
-  },
-  {
-    label:'红旗路防汛仓库',
-    value:'红旗路防汛仓库'
-  },
-]
-
-
-const ToolBar = ({ setSearchVal, onSave,storeData }) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-  // useEffect(()=>{
-  //   getSelect()
-  // },[])
-
-  // const getSelect = async()=>{
-  //   setSource(await getDictService({dictType:'source'}))
-  //   setSttp(await getDictService({dictType:'sttp'}))
-  // }
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="物资名称" name="goodsName">
-            <Input allowClear placeholder='请输入' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="防汛仓库" name="warehouseId">
-            <NormalSelect  options={storeData} style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/sxfd/fbzrh/form.js b/src/views/fxzb/sxfd/fbzrh/form.js
deleted file mode 100644
index 50f3632..0000000
--- a/src/views/fxzb/sxfd/fbzrh/form.js
+++ /dev/null
@@ -1,409 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import {
-  Form,
-  Button,
-  Input,
-  message,
-  Row,
-  Col,
-  DatePicker,
-  Upload,
-  Image,
-  Modal
-} from 'antd'
-import {
-  DeleteOutlined,
-  FileWordOutlined,
-  FilePdfOutlined,
-  FileZipOutlined,
-  FileExcelOutlined,
-  FilePptOutlined
-} from '@ant-design/icons'
-import {
-  formItemLayout,
-  btnItemLayout
-} from '../../../../components/crud/FormLayoutProps'
-import { createCrudService } from '../../../../components/crud/_'
-import apiurl from '../../../../service/apiurl'
-import moment from 'moment'
-import NormalSelect from '../../../../components/Form/NormalSelect'
-import EditText from '../../../../components/EditText'
-const { Dragger } = Upload
-const { RangePicker } = DatePicker
-const url = 'http://223.75.53.141:9102/test.by-lyf.tmp'
-const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => {
-  if (record.startDate) {
-    record.startDate = moment(record.startDate)
-  }
-  console.log('record', record)
-  const meetingType = [
-    {
-      label: "视频会议",
-      value: "0"
-    },
-    {
-      label: '现场会议',
-      value: '1'
-    },
-    {
-      label: '电话会议',
-      value: '2'
-    },
-    {
-      label: '网络会议',
-      value: '3'
-    }
-  ]
-  const [form] = Form.useForm()
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(true)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [editorText, setEditorText] = useState('')
-  const [loading, setLoading] = useState(false)
-  const onFinish = async values => {
-    // if(values.startDate){values.startDate = moment(values.startDate).format('YYYY-MM-DD HH:mm:ss')}
-    values.adcd = record.adcd
-    values.year = record.year
-    values.hmId = record.hmId
-    values.startDate = moment(values.dateRange[0]).format('YYYY-MM-DD HH:mm')
-    values.endDate = moment(values.dateRange[1]).format('YYYY-MM-DD HH:mm')
-    delete values.dateRange
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item => item.response?.data?.fileId)
-      values.fileIds = oldFiles
-      values.content = editorText
-      onEdit(apiurl.fxzb.sxfd.fbzrh.edit, values)
-    }
-    if (mode === 'save') {
-      values.fileIds = fileIds
-      values.content = editorText
-      onSave(apiurl.fxzb.sxfd.fbzrh.save,values)
-    }
-  }
-  const onchange = html => {
-    setEditorText(html)
-  }
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = fileId => {
-    let filterFile = fileList.filter(
-      item => item.response?.data?.fileId !== fileId
-    )
-    setFileList(filterFile)
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = info => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = params => {
-    let downloadLink = document.createElement('a')
-    downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfIdeoHmB/file/download/${params}`
-    downloadLink.download = `${params.fileName}`
-    downloadLink.style.display = 'none'
-    // 将链接添加到页面中
-    document.body.appendChild(downloadLink)
-
-    // 模拟点击事件，开始下载
-    downloadLink.click()
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = params => {
-    if (params) {
-      setIframeSrc(params)
-      setPdfViewOPen(true)
-    }
-  }
-  useEffect(() => {
-    console.log(record.fileList)
-    if (record.fileList) {
-      setFileList(record.fileList)
-    }
-    if (mode == 'edit') {
-      form.setFieldsValue({
-        ...record,
-        dateRange: [moment(record.startDate), moment(record.endDate)]
-      })
-    }
-  }, [record])
-
-  return (
-    <>
-      <Form form={form} {...formItemLayout} onFinish={onFinish}>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label='会议主题'
-              name='theme'
-              rules={[{ required: true }]}
-            >
-              <Input
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-              />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label='主办单位'
-              name='organiser'
-              rules={[{ required: true }]}
-            >
-              <Input
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-              />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row>
-          <Col span={12}>
-              <Form.Item
-                label="会议类型"
-                name="meetType"
-                rules={[{ required: true }]}
-              >
-                 <NormalSelect  style={{width:'100%'}} allowClear options={meetingType}/>
-                 {/* <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear /> */}
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label='会议时间'
-              name='dateRange'
-              rules={[{ required: true }]}
-            >
-              <RangePicker
-                showTime
-                format='YYYY-MM-DD HH:mm'
-                style={{ width: '100%' }}
-              />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row>
-          <Col span={12}>
-            <Form.Item label='会议地点' name='loc' rules={[{ required: true }]}>
-              <Input
-                type='num'
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-              />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label='局内参加人员'
-              name='participant'
-              rules={[{ required: true }]}
-            >
-              <Input
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-              />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label='会议主要内容'
-              // name=""
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-              rules={[{ required: true }]}
-            >
-              <EditText
-                onChange={onchange}
-                htmlText={mode === 'edit' ? record.content : ''}
-              />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label={mode !== 'view' ? '附件' : ''}
-              name='fieldId'
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-            >
-              {mode !== 'view' && (
-                <Dragger
-                  name='file'
-                  // multiple
-                  action='/gunshiApp/xfflood/xfIdeoHmB/file/upload/singleSimple'
-                  onChange={fileChange}
-                  onDrop={info => {
-                    console.log(info.dataTransfer.files)
-                  }}
-                  fileList={fileList}
-                  disabled={loading}
-                  // onSuccess={handleSuccess}
-                >
-                  <p className='ant-upload-text'>点击或拖拽文件到此区域上传</p>
-                  <p className='ant-upload-hint'>
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                  </p>
-                </Dragger>
-              )}
-              <Row gutter={[16]}>
-                {  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 &&
-                  fileList.map(file => {
-                    return (
-                      <Col span={12}>
-                        <div
-                          className={
-                            mode == 'view' ? 'file-item view-file' : 'file-item'
-                          }
-                        >
-                          <div className='file-description'>
-                            {file.name.indexOf('.docx') > -1 ? (
-                              <div
-                                onClick={() => {
-                                  download(file.response?.data?.fileId)
-                                }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                                <FileWordOutlined style={{ fontSize: 40 }} />
-                              </div>
-                            ) : file.name.indexOf('.pdf') > -1 ? (
-                              <div
-                                onClick={() => {
-                                  viewPdf(file.response?.data?.fileId)
-                                }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                                <FilePdfOutlined style={{ fontSize: 40 }} />
-                              </div>
-                            ) : file.name.indexOf('.zip') > -1 ? (
-                              <div
-                                onClick={() => {
-                                  download(file.response?.data?.fileId)
-                                }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                                <FileZipOutlined style={{ fontSize: 40 }} />
-                              </div>
-                                ) :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                  file.name.indexOf('.xlsx') > -1 ? (
-                              <div
-                                onClick={() => {
-                                  download(file.response?.data?.fileId)
-                                }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                                <FileExcelOutlined style={{ fontSize: 40 }} />
-                              </div>
-                            ) : (
-                              <Image
-                                width={60}
-                                src={url + file.response?.data?.filePath}
-                                alt=''
-                              />
-                            )}
-                            <span>{file.name}</span>
-                          </div>
-                          <div
-                            className={
-                              mode == 'view'
-                                ? 'delete-icon disable-icon'
-                                : 'delete-icon'
-                            }
-                            onClick={() =>
-                              deleteFile(file.response?.data?.fileId)
-                            }
-                          >
-                            <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                    )
-                  })}
-              </Row>
-            </Form.Item>
-          </Col>
-        </Row>
-
-        {mode === 'view' ? null : (
-          <>
-            <Form.Item {...btnItemLayout}>
-              <Button type='primary' htmlType='submit'>
-                {mode === 'save' ? '增加' : '修改'}
-              </Button>
-            </Form.Item>
-          </>
-        )}
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=''
-        footer={null}
-        style={{ marginTop: '-5%' }}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-        <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20
-          }}
-          src={`${
-            process.env.PUBLIC_URL
-          }/static/pdf/web/viewer.html?file=${encodeURIComponent(
-            `/gunshiApp/xfflood/xfIdeoFcB/file/download/${iframeSrc}`
-          )}`}
-        />
-      </Modal>
-    </>
-  )
-}
-
-export default ModalForm
diff --git a/src/views/fxzb/sxfd/fbzrh/index.js b/src/views/fxzb/sxfd/fbzrh/index.js
deleted file mode 100644
index dfbc2a9..0000000
--- a/src/views/fxzb/sxfd/fbzrh/index.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider, Empty } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import ListSelect from "../../../../components/Form/ListSelect";
-import Form from './form'
-import MeetingPage from '../fxkhgzh/meetingPage'
-import moment from 'moment';
-
-// 页面初始默认查询参数
-const options = {
-  search:{
-    adcd: 'hbs',
-    year:moment().format('YYYY')
-  },
-};
-
-const Page = () => {
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [adcd, setAdcd] = useState(options.search.adcd)
-  const [searchVal, setSearchVal] = useState({year:options.search.year})
-  const [fileList, setFileList] = useState([]) //上传文件列表
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.sxfd.fbzrh.page).find_noCode,options);
-  const data = {...tableProps.dataSource[0]} || {}
-  useEffect(()=>{
-    if(isRender.current){
-      isRender.current = false
-      return
-    }
-
-    const params = {
-      search: {
-        adcd,
-        ...searchVal
-      }
-    };
-
-    search(params)
-
-  },[adcd,searchVal])
-
-
-  const onEdit = ()=>{
-    refModal.current.showEdit({...data,fileList:fileList});
-  }
-
-  const onSave = ()=>{
-    refModal.current.showSave({adcd:adcd, year:searchVal.year,hmId:data.hmId});
-  }
-
-  const onDelete = ()=>{
-    refModal.current.onDeleteGet(apiurl.fxzb.sxfd.fbzrh.del+data.hmId);
-  }
- /**
-   * @description 获取文件详细信息
-   * @param {string} 文件的fileId
-   */
- const getFileInfo = (params) => {
-  let fetchArr = params?.attachList.map(item => {
-    return createCrudService(apiurl.fxzb.sxfd.fbzrh.getFile + `/${item.fileId}`)
-      .delGet()
-        }
-      ); 
-    Promise.all(fetchArr).then(res => {
-      let fileArr = res.map(item => {
-        return {
-          name: item.data.fileName,
-          response: {
-            data: {
-              filePath: item.data.filePath,
-              fileId: item.data.fileId,
-              fileLength: item.data.fileLength
-            }
-          },
-        }
-      })
-      // setFlag(true)
-      setFileList(fileArr)
-    }).catch(err => console.log(err))
-}
-useEffect(() => {
-  if (data.attachList) {
-    getFileInfo(data)
-  }
-}, [data.attachList])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <ListSelect setAdcd={setAdcd} show={false}/>
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onEdit={onEdit} onSave={onSave} onDelete={onDelete} data={data}/>
-          </Card>
-          {
-            data.hmId ? <MeetingPage
-              data={data}
-              fileList={fileList}
-              isMeetData={true}
-            /> : <Empty style={{ margin: '100px' }} />
-          }
-        </div>
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title="会议"
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/fbzrh/meetingPage.js b/src/views/fxzb/sxfd/fbzrh/meetingPage.js
deleted file mode 100644
index c36f521..0000000
--- a/src/views/fxzb/sxfd/fbzrh/meetingPage.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import ListSelect from "../../../../components/Form/ListSelect";
-import Form from './form'
-import moment from 'moment';
-
-
-
-
-const Page = ({data}) => {
-  return (
-    <>
-        <div className="ant-card-body meetingPage" style={{padding:"20px 0 0 0"}}>
-            <div className='meetingPage_header'>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议主题：</div>
-                <div className='meetingPage_header_item_value'>{data.theme}</div>
-            </div>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>主办单位：</div>
-                <div className='meetingPage_header_item_value'>{data.organiser}</div>
-            </div>
-            <Divider dashed />
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议时间：</div>
-                <div className='meetingPage_header_item_value'>{data.startDate} - {data.endDate}</div>
-            </div>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议地点：</div>
-                <div className='meetingPage_header_item_value'>{data.loc}</div>
-            </div>
-            <Divider dashed />
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>局内参加人员：</div>
-                <div className='meetingPage_header_item_value'>{data.participant}</div>
-            </div>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议类型：</div>
-                <div className='meetingPage_header_item_value'>{data.meetType}</div>
-            </div>
-            <Divider dashed />
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议主要内容：</div>
-            </div>
-            </div>
-            <div className='meetingPage_content' >
-                {data.content}
-           </div>  
-            <Divider dashed />
-            <div className='meetingPage_footer'>
-            <div className='meetingPage_footer_title'>
-                附件
-            </div>
-            {/* <div className='meetingPage_footer_box'>
-                <div className='meetingPage_footer_item'>
-                附件1
-                </div>
-                <div className='meetingPage_footer_item'>
-                附件2
-                </div>
-                <div className='meetingPage_footer_item'>
-                附件3
-                </div>
-            </div> */}
-            </div>
-        </div>  
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/fbzrh/toolbar.js b/src/views/fxzb/sxfd/fbzrh/toolbar.js
deleted file mode 100644
index 52e5ad5..0000000
--- a/src/views/fxzb/sxfd/fbzrh/toolbar.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const ToolBar = ({ setSearchVal, data, onEdit, onSave, onDelete }) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="会议年度" name="year">
-            <DatePicker onChange={(v)=>setSearchVal({year:v.format('YYYY')})} picker="year" defaultValue={moment()} format={'YYYY'}/>
-          </Form.Item>
-        </Form>
-
-        {
-          data && data.hmId?
-          <div>
-            <Button  style={{marginRight:'20px'}} size='Default' onClick={onEdit}>编辑</Button>
-            <Popconfirm title="确定要删除吗?" onConfirm={onDelete}>
-              {/* <Button style={{ marginRight: 4,color:'red' }} type="link" size="small" title='删除'>删除</Button> */}
-              <Button danger >删除</Button>
-            </Popconfirm>
-            {/* <Button danger  onClick={onDelete}>删除</Button> */}
-          </div>:
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onSave}>新增</Button>
-          </div>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/sxfd/fxkhgzh/form.js b/src/views/fxzb/sxfd/fxkhgzh/form.js
deleted file mode 100644
index 4af99e3..0000000
--- a/src/views/fxzb/sxfd/fxkhgzh/form.js
+++ /dev/null
@@ -1,348 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, message,Row, Col, DatePicker,Upload,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { createCrudService } from '../../../../components/crud/_';
-import apiurl from '../../../../service/apiurl';
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import EditText from '../../../../components/EditText';
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  if(record.meetDate){
-    record.meetDate = moment(record.meetDate)
-  }
-  const meetingType = [
-    {
-      label: "视频会议",
-      value: "0"
-    },
-    {
-      label: "现场会议",
-      value: "1"
-    },
-    {
-      label: "电话会议",
-      value: "2"
-    },
-    {
-      label: "网络会议",
-      value: "3"
-    },
-  ]
-  console.log("record",record);
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(true)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [editorText, setEditorText] = useState('')
-  const [loading, setLoading] = useState(false)
-
-  const onFinish = async(values) => {
-    if(values.meetDate){values.meetDate = moment(values.meetDate).format('YYYY-MM-DD HH:mm')}
-    values.adcd = record.adcd
-    values.year = record.year
-    values.fcId = record.fcId
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item => item.response?.data?.fileId )
-      values.fileIds = oldFiles;
-      values.content = editorText
-      onEdit(apiurl.fxzb.sxfd.fxkhgzh.edit,values)
-    }
-    if (mode === 'save') {
-      values.content = editorText
-      values.fileIds = fileIds
-      onSave(apiurl.fxzb.sxfd.fxkhgzh.save,values)
-    }
-  }
-
-  const onchange = (html) => {
-    setEditorText(html)
-  }
-   /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-   const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-    // if (mode === "edit" && flag) {
-    //   createCrudService(apiurl.fxzb.sxfd.fxkhgzh.deleteFile + `/${fileId}`).delGet().then(res => {
-    //     if (res.code === 200) {
-    //       setFlag(false)
-    //       message.success("删除附件成功")
-    //       onCrudSuccess()
-    //     }
-    //   })
-    // }
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return  file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-   /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-   const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfIdeoFcB/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    if (params) {
-      setIframeSrc(params)
-      setPdfViewOPen(true)
-    }
-   }
-  useEffect(()=>{
-    if (record.fileList) {
-     setFileList(record.fileList)
-   }
-  },[record])
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="会议主题"
-                name="theme"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="主办单位"
-                name="organiser"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="会议类型"
-                name="meetType"
-                rules={[{ required: true }]}
-              >
-                 <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={meetingType}/>
-                 {/* <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear /> */}
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="会议时间"
-                name="meetDate"
-                rules={[{ required: true }]}
-              >
-                <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD HH:mm"  
-                  style={{width:'100%'}}
-                />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="会议地点"
-                name="loc"
-                rules={[{ required: true }]}
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="局内参加人员"
-                name="participant"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label="会议主要内容"
-                // name=""
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-
-              >
-                <EditText onChange={onchange} htmlText={mode === "edit" ? record.content : ''} />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/xfIdeoFcB/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                fileList={fileList}
-                disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-      
-
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '增加' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfIdeoFcB/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/sxfd/fxkhgzh/index.js b/src/views/fxzb/sxfd/fxkhgzh/index.js
deleted file mode 100644
index aad0167..0000000
--- a/src/views/fxzb/sxfd/fxkhgzh/index.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider, Empty } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import ListSelect from "../../../../components/Form/ListSelect";
-import Form from './form'
-import MeetingPage from './meetingPage'
-import moment from 'moment';
-import './index.less'
-
-// 页面初始默认查询参数
-const options = {
-  search:{
-    adcd: 'hbs',
-    year:moment().format('YYYY')
-  },
-};
-
-const Page = () => {
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [adcd, setAdcd] = useState(options.search.adcd)
-  const [searchVal, setSearchVal] = useState({year:options.search.year})
-  const [fileList, setFileList] = useState([]) //上传文件列表
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.sxfd.fxkhgzh.page).find_noCode,options);
-  const data = { ...tableProps.dataSource[0] } || {}
-  useEffect(()=>{
-    if(isRender.current){
-      isRender.current = false
-      return
-    }
-
-    const params = {
-      search: {
-        adcd,
-        ...searchVal
-      }
-    };
-
-    search(params)
-
-  },[adcd,searchVal])
-
-
-  const onEdit = ()=>{
-    refModal.current.showEdit({...data,fileList:fileList});
-  }
-
-  const onSave = ()=>{
-    refModal.current.showSave({adcd:adcd, year:searchVal.year,fcId:data.fcId});
-  }
-
-  const onDelete = ()=>{
-    refModal.current.onDeleteGet(apiurl.fxzb.sxfd.fxkhgzh.del+data.fcId);
-  }
-
-  /**
-   * @description 获取文件详细信息
-   * @param {string} 文件的fileId
-   */
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.sxfd.fxkhgzh.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId: item.data.fileId,
-                fileLength: item.data.fileLength
-              }
-            },
-          }
-        })
-        // setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-  useEffect(() => {
-    if (data.attachList) {
-      getFileInfo(data)
-    }
-  }, [data.attachList])
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <ListSelect setAdcd={setAdcd} show={false} />
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onEdit={onEdit} onSave={onSave} onDelete={onDelete} data={data}/>
-          </Card>
-          {
-            data.fcId ? <MeetingPage
-              data={data}
-              fileList={fileList}
-            /> : <Empty style={{ margin: '100px' }} />
-          }
-         
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title="会议"
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/fxkhgzh/index.less b/src/views/fxzb/sxfd/fxkhgzh/index.less
deleted file mode 100644
index d5c1099..0000000
--- a/src/views/fxzb/sxfd/fxkhgzh/index.less
+++ /dev/null
@@ -1,63 +0,0 @@
-.meetingPage{
-    
-    .meetingPage_header{
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        .meetingPage_header_item{
-            width: 50%;
-            display: flex;
-
-            .meetingPage_header_item_lable{
-                width: 31%;
-                text-align: right;
-                font-size: 18px;
-                color: #666666;
-            }
-            .meetingPage_header_item_value{
-                width: 70%;
-                font-size: 18px;
-                color: #333333;
-            }
-        }
-    }
-    .meetingPage_content{
-        overflow-y: scroll;
-        max-height: 400px;
-        padding: 10px 100px;
-        font-size: 18px;
-        color: #333333;
-    }
-    .meetingPage_footer{
-        .meetingPage_footer_title{
-            width: 100%;
-            font-size: 18px;
-            color: #666666;
-            margin-left: 72px;
-        }
-        .attach-list{
-            display: flex;
-            margin-left: 14%;
-            flex-wrap: wrap;
-            column-gap: 10px;
-            .file-item{
-                width: 31%;
-            }
-        }
-        .meetingPage_footer_box{
-            display: flex;
-            flex-direction: row;
-            flex-wrap: wrap;
-            padding: 0 72px;
-
-            .meetingPage_footer_item{
-                width: 33%;
-                // background-color: red
-            }
-        }
-    }
-
-    .ant-divider{
-        margin: 10px;
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/sxfd/fxkhgzh/meetingPage.js b/src/views/fxzb/sxfd/fxkhgzh/meetingPage.js
deleted file mode 100644
index 0708a06..0000000
--- a/src/views/fxzb/sxfd/fxkhgzh/meetingPage.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import ListSelect from "../../../../components/Form/ListSelect";
-import Form from './form'
-import moment from 'moment';
-
-
-const Page = ({data,fileList,isMeetData=false}) => {
-    const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-    const [iframeSrc, setIframeSrc] = useState('')
-    const [pdfViewOPen, setPdfViewOPen] = useState(false)
-     /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-    const viewPdf = (params) => {
-    console.log(params);
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfIdeoFcB/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-  return (
-    <>
-        <div className="ant-card-body meetingPage" style={{padding:"20px 0 0 0"}}>
-            <div className='meetingPage_header'>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议主题：</div>
-            <div className='meetingPage_header_item_value'>
-              {data.theme}
-            </div>
-            </div>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>主办单位：</div>
-                <div className='meetingPage_header_item_value'>{data.organiser}</div>
-            </div>
-            <Divider dashed />
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议时间：</div>
-                <div className='meetingPage_header_item_value'>{ !isMeetData ?data.meetDate:data.startDate}</div>
-            </div>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议地点：</div>
-                <div className='meetingPage_header_item_value'>{data.loc}</div>
-            </div>
-            <Divider dashed />
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>局内参加人员：</div>
-                <div className='meetingPage_header_item_value'>{data.participant}</div>
-            </div>
-            <div className='meetingPage_header_item'>
-                <div className='meetingPage_header_item_lable'>会议类型：</div>
-            <div className='meetingPage_header_item_value'>
-              {
-               data.meetType === "0" ? "视频会议" :
-                data.meetType === "1" ? "现场会议" :
-                data.meetType === "2" ? "电话会议" : "网络会议"
-              }
-            </div>
-            </div>
-            <Divider dashed />
-            <div className='meetingPage_header_item'>
-                <div 
-                    className='meetingPage_header_item_lable'
-                    // style={{width:"51%"}}
-                    >会议主要内容：</div>
-            </div>
-            </div>
-            <div className='meetingPage_content'  dangerouslySetInnerHTML={{ __html:data.content }} />
-            <Divider dashed />
-            <div className='meetingPage_footer'>
-            <div className='meetingPage_footer_title'>
-                附件：
-            </div>
-            <div className='attach-list'>
-                {  
-                      fileList.length > 0 && fileList.map(file => {
-                          return (
-                      <>     
-                        <div className={'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <div style={{display:'flex',flexDirection:"column"}}>
-                             <span>{file.name}</span>
-                             <span>{((file.response?.data?.fileLength)/1024).toFixed(2) }KB</span>
-                            </div>
-                          </div>
-                       </div>
-                       <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfIdeoFcB/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-                      </>
-                      
-                        )
-                 })
-                }
-            </div>
-            </div>
-        </div>  
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/fxkhgzh/toolbar.js b/src/views/fxzb/sxfd/fxkhgzh/toolbar.js
deleted file mode 100644
index 6dfcb9a..0000000
--- a/src/views/fxzb/sxfd/fxkhgzh/toolbar.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-
-const ToolBar = ({ setSearchVal, data, onEdit, onSave, onDelete }) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="会议年度" name="year">
-            <DatePicker onChange={(v)=>setSearchVal({year:v.format('YYYY')})} picker="year" defaultValue={moment()} format={'YYYY'}/>
-          </Form.Item>
-        </Form>
-
-        {
-          data && data.fcId?
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onEdit}>编辑</Button>
-            <Popconfirm title="确定要删除吗?" onConfirm={onDelete}>
-              {/* <Button style={{ marginRight: 4,color:'red' }} type="link" size="small" title='删除'>删除</Button> */}
-              <Button danger >删除</Button>
-            </Popconfirm>
-            {/* <Button danger  onClick={onDelete}>删除</Button> */}
-          </div>:
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onSave}>新增</Button>
-          </div>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/sxfd/fxpxb/form.js b/src/views/fxzb/sxfd/fxpxb/form.js
deleted file mode 100644
index 77ab14d..0000000
--- a/src/views/fxzb/sxfd/fxpxb/form.js
+++ /dev/null
@@ -1,373 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, message,Row, Col, DatePicker,Upload,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { createCrudService } from '../../../../components/crud/_';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import { httppost2 } from '../../../../utils/request';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  if(record.startDate && record.startDate ){
-    record.meetDate = [moment(record.startDate), moment(record.endDate)]
-  }
-  const type = [
-    {
-      value: '1',
-      label: '视频教学'
-    },
-    {
-      value: '2',
-      label: '现场授课'
-    }
-  ]
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(true)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false)
-
-console.log(record);
-  const onFinish = async(values) => {
-    if(values.meetDate){
-      values.startDate = moment(values.meetDate[0]).format('YYYY-MM-DD')
-      values.endDate = moment(values.meetDate[1]).format('YYYY-MM-DD')
-      delete values.meetDate
-    }
-    values.adcd = record.adcd
-    values.year = record.year
-
-
-    if (mode === 'edit') {
-      values.id = record.id
-      let oldFiles = fileList.map(item => item.response?.data?.fileId )
-      values.fileIds = oldFiles;
-      onEdit(apiurl.fxzb.sxfd.fxpxb.edit,values)
-    }
-    if (mode === 'save') {
-      values.fileIds = fileIds
-      onSave(apiurl.fxzb.sxfd.fxpxb.save,values)
-    }
-  }
-
-   /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-   const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-    // if (mode === "edit" && flag) {
-    //   createCrudService(apiurl.fxzb.sxfd.fxpxb.deleteFile + `/${fileId}`).delGet().then(res => {
-    //     if (res.code === 200) {
-    //       setFlag(false)
-    //       message.success("删除附件成功")
-    //       onCrudSuccess()
-    //     }
-    //   })
-    // }
-  }
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    console.log(info);
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return  file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-    
-  }
-   /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-   const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfIdeoTcB/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    if (params) {
-      setIframeSrc(params)
-      setPdfViewOPen(true)
-    }
-   }
-  
-   /**
-   * @description 获取文件详细信息
-   * @param {string} 文件的fileId
-   */
-   const getFileInfo = (params) => {
-      let fetchArr = params?.attachList.map(item => {
-        return createCrudService(apiurl.fxzb.sxfd.fxpxb.getFile + `/${item.fileId}`)
-          .delGet()
-            }
-          ); 
-        Promise.all(fetchArr).then(res => {
-          let fileArr = res.map(item => {
-            return {
-              name: item.data.fileName,
-              response: {
-                data: {
-                  filePath: item.data.filePath,
-                  fileId: item.data.fileId,
-                  fileLength: item.data.fileLength
-                }
-              },
-            }
-          })
-          setFlag(true)
-          setFileList(fileArr)
-        }).catch(err => console.log(err))
-    }
-
-   useEffect(()=>{
-    if ((mode === "view" || mode === "edit") && record.attachList?.length) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训主题"
-                name="theme"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="主办单位"
-                name="organiser"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训方式"
-                name="tcType"
-                rules={[{ required: true }]}
-              >
-                 <NormalSelect disabled={mode =='view'} style={{width:'100%'}} allowClear options={type}/>
-                 {/* <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear /> */}
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="培训时间"
-                name="meetDate"
-                rules={[{ required: true }]}
-              >
-                {/* <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD HH:mm"  
-                  style={{width:'100%'}}
-                /> */}
-              <RangePicker
-                style={{ width: '100%' }}
-                disabled={mode === 'view'}
-
-              />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训地点"
-                name="loc"
-                rules={[{ required: true }]}
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="培训主要内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'200px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      
-      <Row>
-          <Col span={24}>
-            <Form.Item
-                label="附件"
-                // label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/xfIdeoTcB/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                fileList={fileList}
-                disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '增加' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfIdeoTcB/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/sxfd/fxpxb/index.js b/src/views/fxzb/sxfd/fxpxb/index.js
deleted file mode 100644
index e9e7af1..0000000
--- a/src/views/fxzb/sxfd/fxpxb/index.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider, Empty } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import ListSelect from "../../../../components/Form/ListSelect";
-import Form from './form'
-import moment from 'moment';
-
-// 页面初始默认查询参数
-const options = {
-  search:{
-    adcd: 'hbs',
-    year:moment().format('YYYY')
-  },
-};
-
-const Page = () => {
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [adcd, setAdcd] = useState(options.search.adcd)
-  const [searchVal, setSearchVal] = useState({year:options.search.year})
-  const [fileList, setFileList] = useState([]) //上传文件列表
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '培训主题', key: 'theme', dataIndex: 'theme', width: 200 },
-    { title: '主办单位', key: 'organiser', dataIndex: 'organiser', width: 140 },
-    {
-      title: '培训方式', key: 'tcType', dataIndex: 'tcType', width: 140,
-      render: (_, record) => {
-        return <span>{ record?.tcType == "1 "? "视频教学" :'现场授课'}</span>
-      }
-    },
-    { title: '培训开始时间', key: 'startDate', dataIndex: 'startDate', width: 150 },
-    { title: '培训地点  ', key: 'loc', dataIndex: 'loc', width: 150 },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({adcd:adcd, year:searchVal.year,id:params.id});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.sxfd.fxpxb.del + `/${params.id}`);
-    } 
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.sxfd.fxpxb.page).find_noCode, options);
-  useEffect(()=>{
-    if(isRender.current){
-      isRender.current = false
-      return
-    }
-
-    const params = {
-      search: {
-        adcd,
-        ...searchVal
-      }
-    };
-
-    search(params)
-
-  },[adcd,searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <ListSelect setAdcd={setAdcd} show={false}/>
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')}/>
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-         
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title="防汛培训班"
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/fxpxb/toolbar.js b/src/views/fxzb/sxfd/fxpxb/toolbar.js
deleted file mode 100644
index f9a2b01..0000000
--- a/src/views/fxzb/sxfd/fxpxb/toolbar.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-
-const ToolBar = ({ setSearchVal, onSave,}) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="培训年度" name="year">
-            <DatePicker onChange={(v)=>setSearchVal({year:v.format('YYYY')})} picker="year" defaultValue={moment()} format={'YYYY'}/>
-          </Form.Item>
-        </Form>
-
-        {
-          
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onSave}>新增</Button>
-          </div>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/sxfd/fxtj/form.js b/src/views/fxzb/sxfd/fxtj/form.js
deleted file mode 100644
index 8530079..0000000
--- a/src/views/fxzb/sxfd/fxtj/form.js
+++ /dev/null
@@ -1,297 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, message,Row, Col, DatePicker,Upload,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import { createCrudService } from '../../../../components/crud/_';
-import moment from 'moment';
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave }) => {
-  if(record.prodDate){
-    record.myTm = moment(record.prodDate)
-  }
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [flag, setFlag] = useState(true)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-  }
-   /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-   const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/xfIdeoImgB/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-   /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-  const onFinish = (values) => {
-    if(values.myTm){
-      values.prodDate = moment(values.myTm).format('YYYY-MM-DD')
-      delete values.myTm
-    }
-
-    if (mode === 'edit') {
-      let oldFiles = fileList.map(item => item.response?.data?.fileId )
-      values.id = record.id
-      values.fileIds = oldFiles;
-      onEdit(apiurl.fxzb.sxfd.fxtj.edit,values)
-    }
-    if (mode === 'save') {
-      values.fileIds = fileIds
-      onSave(apiurl.fxzb.sxfd.fxtj.save,values)
-    }
-  }
-  /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    if (params) {
-      setIframeSrc(params)
-      setPdfViewOPen(true)
-    }
-  }
-  useEffect(() => {
-    console.log(record);
-    if ((mode === "view" || mode === "edit") && record.attachList?.length) {
-        getFileInfo(record)
-      }
-  }, [record, mode])
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="图件名称"
-                name="imgName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="制作单位"
-                name="prodUnitName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="制作时间"
-                name="myTm"
-                rules={[{ required: true }]}
-              >
-                <DatePicker 
-                  disabled={mode==='view'}
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-            <Form.Item
-                label="附件"
-                // label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/xfIdeoImgB/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item' : 'file-item'}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '增加' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfIdeoImgB/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/sxfd/fxtj/index.js b/src/views/fxzb/sxfd/fxtj/index.js
deleted file mode 100644
index 30986ff..0000000
--- a/src/views/fxzb/sxfd/fxtj/index.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import moment from 'moment';
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '图件名称', key: 'imgName', dataIndex: 'imgName', width: 200 },
-    { title: '制作单位', key: 'prodUnitName', dataIndex: 'prodUnitName', width: 140 },
-    { title: '制作时间', key: 'prodDate', dataIndex: 'prodDate', width: 140, render:(v)=>moment(v).format('YYYY-MM-DD') },
-    { title: '上传时间', key: 'tm', dataIndex: 'tm', width: 150, render:(v)=>moment(v).format('YYYY-MM-DD') },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={ true} del={true} view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.sxfd.fxtj.del+params.id);
-    }
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.sxfd.fxtj.page).find_noCode);
-
-  useEffect(()=>{
-    if(searchVal){
-      const params = {
-        search: searchVal
-      };
-      search(params)
-    }
-  },[searchVal])
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='adcdTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title="图件"
-          component={ModalForm}
-          onCrudSuccess={() => { refresh({ addvcd: localStorage.getItem('ADCD6') }) }}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/fxtj/toolbar.js b/src/views/fxzb/sxfd/fxtj/toolbar.js
deleted file mode 100644
index 9692bb2..0000000
--- a/src/views/fxzb/sxfd/fxtj/toolbar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Form, Input, Button } from 'antd';
-
-
-const ToolBar = ({ setSearchVal, onSave }) => {
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form className='toolbarBox' layout="inline" onFinish={(v)=>setSearchVal(v)}>
-          <Form.Item label="图件名称" name="imgName">
-            <Input allowClear placeholder='请输入图件名称' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/sxfd/index.js b/src/views/fxzb/sxfd/index.js
deleted file mode 100644
index 30a43fa..0000000
--- a/src/views/fxzb/sxfd/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-const Page = () => {
-
-
-  return (
-    <>
-        <div>防汛培训班</div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/模版/form.js b/src/views/fxzb/sxfd/模版/form.js
deleted file mode 100644
index dce0832..0000000
--- a/src/views/fxzb/sxfd/模版/form.js
+++ /dev/null
@@ -1,374 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, InputNumber } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-const ModalForm = ({ mode, record,onEdit,onSave }) => {
-
-  const [form] = Form.useForm();
-  const [sttp,setSttp] = useState([])
-  const [frgrd,setFrgrd] = useState([])
-  const [stbk,setStbk] = useState([])
-  const [usfl,setUsfl] = useState([])
-  const [locality,setLocality] = useState([])
-
-
-  const onFinish = (values) => {
-
-    if (mode === 'edit') {
-      // onEdit(apiurl.informationManagement.stcd.edit,values)
-    }
-    if (mode === 'save') {
-      // onSave(apiurl.informationManagement.stcd.save,values)
-    }
-  }
-
-  useEffect(()=>{
-    getOptions()
-  },[])
-
-  const getOptions = async ()=>{
-    setSttp(await getDictService({dictType:'sttp'}))
-    setFrgrd(await getDictService({dictType:'frgrd'}))
-    setStbk(await getDictService({dictType:'stbk'}))
-    setUsfl(await getDictService({dictType:'usfl'}))
-    setLocality(await getDictService({dictType:'locality'}))
-  }
-
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="测站名称"
-                name="stnm"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="测站编码"
-                name="stcd"
-                rules={[{ required: true }]}
-              >
-                <InputNumber disabled={mode!=='save'} style={{width:'100%'}} allowClear/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="行政区划"
-                name="addvcd"
-                rules={[{ required: true }]}
-              >
-                <AdcdTreeSelect disabled={mode==='view'} style={{width:'100%'}}/>
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="测站类型"
-                name="sttp"
-                rules={[{ required: true }]}
-              >
-                <NormalSelect disabled={mode==='view'} options={sttp} allowClear={false}/>
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="所在小流域代码"
-                name="wscd"
-              >
-                <Input min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-         <Row>
-            <Col span={12}>
-                <Form.Item
-                  label="来源"
-                  name="source"
-                  rules={[{ required: true }]}
-                >
-                  <NormalSelect disabled={true} options={[{label:'山洪',value:'SH'},{label:'水文',value:'SW'},{label:'气象',value:'QX'},{label:'水库',value:'SK'}]} allowClear={false}/>
-                </Form.Item>
-            </Col>
-            <Col span={12}>
-                <Form.Item
-                  label="县行政区划编码"
-                  name="countycode"
-                  rules={[{ required: true }]}
-                >
-                  <InputNumber  disabled={mode==='view'} style={{width:'100%'}} allowClear />
-                </Form.Item>
-            </Col>
-        </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="河流名称"
-                name="rvnm"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="水系名称"
-                name="hnnm"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="流域名称"
-                name="bsnm"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="站址"
-                name="stlc"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="经度"
-                name="lgtd"
-                rules={[{ required: true, validator: validlgtd }]}
-
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="纬度"
-                name="lttd"
-                rules={[{ required: true,validator: validlttd}]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="基面名称"
-                name="dtmnm"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="基面高程(m)"
-                name="dtmel"
-                rules={record?.dtmel===undefined?[{ required: false,}]:[{ required: true,}]}
-              >
-                <InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="基面修正值(m)"
-                name="dtpr"
-                rules={record?.dtpr===undefined?[{ required: false,}]:[{ required: true,}]}
-              >
-                <InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="报汛等级"
-                name="frgrd"
-              >
-                <NormalSelect disabled={mode==='view'} options={frgrd} allowClear={false}/>
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="建站年月"
-                name="esstym"
-              >
-                <DatePicker picker="month" style={{width:'100%'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="始报年月"
-                name="bgfrym"
-              >
-                <DatePicker picker="month" style={{width:'100%'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="隶属行业单位"
-                name="atcunit"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="信息管理单位"
-                name="admauth"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="交换管理单位"
-                name="locality"
-              >
-                <NormalSelect disabled={mode==='view'} options={locality} allowClear={false}/>
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="测站岸别"
-                name="stbk"
-              >
-                <NormalSelect disabled={mode==='view'} options={stbk} allowClear={false}/>
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="测站方位(°)"
-                name="stazt"
-                rules={record?.stazt===undefined?[{ required: false,}]:[{ required: true,}]}
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}}  />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="至河口距离(km)"
-                name="dstrvm"
-                rules={record?.dstrvm===undefined?[{ required: false,}]:[{ required: true,}]}
-              >
-                <InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="集水面积(k㎡)"
-                name="drna"
-                rules={record?.drna===undefined?[{ required: false,}]:[{ required: true,}]}
-              >
-                <InputNumber  disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="拼音码"
-                name="phcd"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="启用标志"
-                name="usfl"
-              >
-                <NormalSelect disabled={mode==='view'} options={usfl} allowClear={false}/>
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="建设年度"
-                name="buildYear"
-              >
-                <DatePicker picker="year" style={{width:'100%'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="备注"
-                name="comments"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '增加' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-    </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/sxfd/模版/index.js b/src/views/fxzb/sxfd/模版/index.js
deleted file mode 100644
index 7dabf19..0000000
--- a/src/views/fxzb/sxfd/模版/index.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import AdcdTreeSelector from "../../../../components/Form/AdcdTreeSelector";
-
-const Page = () => {
-  const refModal = useRef();
-  const refModal2 = useRef();
-  const [adcd, setAdcd] = useState(null)
-  const [searchVal, setSearchVal] = useState({})
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '测站名称', key: 'stnm', dataIndex: 'stnm', width: 200, ellipsis: true },
-    { title: '测站编码', key: 'stcd', dataIndex: 'stcd', width: 140 },
-    { title: '行政区划', key: 'adnm', dataIndex: 'adnm', width: 140 },
-    { title: '站址', key: 'stlc', dataIndex: 'stlc', width: 150, ellipsis: true },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={row.source === 'SH'? true : false} del={row.source === 'SH'? true : false} view={row.source !== 'SH'? true : false} cjxgl={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDelete(apiurl.informationManagement.stcd.del,{stcd:params?.stcd,source:params?.source,countycode:params?.countycode?params?.countycode:''});
-    } else if (type === 'cjxgl') {
-      refModal2.current.show(params)
-    }
-  }
-
-  // 页面初始默认查询参数
-  const options = {
-    search:{
-      adcd:''
-    },
-  };
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.informationManagement.stcd.page).find_noCode,options);
-
-  useEffect(()=>{
-    getDictValue()
-  },[])
-
-  useEffect(()=>{
-    if(adcd!==null && searchVal){
-      const params = {
-        search: {
-          adcd,
-          ...searchVal
-        }
-      };
-      search(params)
-    }
-
-  },[adcd,searchVal])
-
-  const getDictValue = async()=>{
-    // setImportancy(dealValue(await getDictService({dictType:'importancy'})))
-    // setSttp(dealValue(await getDictService({dictType:'sttp'})))
-    // setSource(dealValue(await getDictService({dictType:'source'})))
-    // setFrgrd(dealValue(await getDictService({dictType:'frgrd'})))
-    // setUsfl(dealValue(await getDictService({dictType:'usfl'})))
-  };
-
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <AdcdTreeSelector setAdcd={setAdcd} showCheckbox={true} hasAlertBox={false}/>
-        </div>
-        <div className='lf adcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1200}
-          ref={refModal}
-          title="测站"
-          component={ModalForm}
-          onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/sxfd/模版/toolbar.js b/src/views/fxzb/sxfd/模版/toolbar.js
deleted file mode 100644
index bc02f48..0000000
--- a/src/views/fxzb/sxfd/模版/toolbar.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import '../../../index.less'
-
-
-const ToolBar = ({ setSearchVal, onSave }) => {
-  const [form] = Form.useForm();
-  const [source,setSource] = useState([])
-  const [sttp,setSttp] = useState([])
-
-  const onFinish = (val) => {
-    val.buildYear=val.buildYear?moment(val.buildYear).format('YYYY'):undefined
-    setSearchVal(val);
-  }
-
-  useEffect(()=>{
-    getSelect()
-  },[])
-
-  const getSelect = async()=>{
-    setSource(await getDictService({dictType:'source'}))
-    setSttp(await getDictService({dictType:'sttp'}))
-  }
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="测站名称" name="stnm">
-            <Input allowClear placeholder='请输入测站名称' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="测站编码" name="stcd">
-            <Input allowClear placeholder='请输入测站编码' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="测站来源" name="source">
-            <NormalSelect  options={source} style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="站类" name="sttp" >
-            <NormalSelect  options={sttp} style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="建设年度" name="buildYear">
-            <DatePicker picker="year" style={{width:'180px'}}/>  
-          </Form.Item>
-          {/*<Form.Item label="行政区划" name="addvcd">
-            <AdcdFuzzyTreeSelect style={{width:'180px'}}/>
-          </Form.Item>*/}
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/txl/GcTreeSelector/index.less b/src/views/fxzb/txl/GcTreeSelector/index.less
deleted file mode 100644
index 81c358f..0000000
--- a/src/views/fxzb/txl/GcTreeSelector/index.less
+++ /dev/null
@@ -1,45 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.GcTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-  .ant-tree-treenode{
-    width: 100%;
-
-    .ant-tree-node-content-wrapper{
-      // width: 100%;
-      // padding-right: 15px;
-      position: static;
-    }
-  }
-}
-.style-updata{
-  width: 98%;
-  overflow: hidden ;
-  text-overflow: ellipsis ;
-  white-space: nowrap ;
-}
-.ant-tree .ant-tree-node-content-wrapper{
-  padding: 0 !important;
-}
-// .detail-modal{
-//   .ant-descriptions-item{
-//     border-bottom: 1px solid rgb(232, 232, 232) ;
-//   }
-// }
\ No newline at end of file
diff --git a/src/views/fxzb/txl/GcTreeSelector/index.tsx b/src/views/fxzb/txl/GcTreeSelector/index.tsx
deleted file mode 100644
index 6daccf2..0000000
--- a/src/views/fxzb/txl/GcTreeSelector/index.tsx
+++ /dev/null
@@ -1,270 +0,0 @@
-import React, { useState, useEffect, } from 'react';
-import {Tree, Input, Checkbox, Spin, Modal,Descriptions} from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import './index.less';
-import {getTxTreeData} from '../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setCode?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  setTag?:any 
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setCode, setTag, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [itemDetail, setItemDetail] = useState<any>({}) // 树中的每一项的详细信息
-
-  const [ open, setOpen] = useState(false)
- 
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await getTxTreeData(params);
-
-    const item: any = adcdTreedata?.[0]?.departmentCode
-    if(item){
-      setCode(item)
-      setSelectedKeys([item])
-      setTag(item.tag)
-    }
-
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.departmentName;
-        // (
-        //   <span  style={{position:'relative'}}>
-        //     {item.sname}
-        //     <div  style={{color:'red',position:'absolute',left:'50px'}}>按钮</div>
-        //   </span>
-        // )
-        item.key = item.departmentCode;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue: any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-      let adcdVal = "";
-      if(!adcdLevel && selectData.departmentCode){
-        const code = selectData.departmentCode.substring(0, 15);
-        if(code.endsWith('000000000')){//县
-          adcdVal = selectData.departmentCode.substring(0,6);
-        }else if(code.endsWith('000000')){//镇
-          adcdVal = selectData.departmentCode.substring(0,9);
-        }else if(code.endsWith('000')){//村
-          adcdVal = selectData.departmentCode.substring(0,12);
-        }else{
-          adcdVal = selectData.departmentCode;
-        }
-      }else{
-        adcdVal = selectData.userId;
-      }
-
-      let params = { code: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode(adcdVal)
-        setTag(selectData.tag)
-      }
-    } else {
-      let params = { code: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode("")
-        setTag("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.departmentName.indexOf(value) > -1) {
-          setSelectedKeys([element.departmentCode])
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          } 
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    console.log(event);
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      console.log(treeData);
-      rebuildData(event.target.value, treeData)
-    }
-  };
-
-  return (
-    <div style={{position:"relative"}} className='GcTreeSelectorStyle '>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              titleRender={(v: any) => {
-                return (
-                  <>
-                    <div className={v.title?.length > 6 && !v.children ? "style-updata" : ""}>{v.title}</div>
-                  </>
-                )
-              }}
-            />
-          }
-        </div>
-
-
-        <Modal
-          title={itemDetail?.title}
-          open={open}
-          onCancel={() => setOpen(false)} footer={[null]}
-          className='detail-modal'
-        >
-          <Descriptions >
-            <Descriptions.Item label="工程名称" span={3}>{itemDetail?.title || "---"}</Descriptions.Item>
-            <Descriptions.Item label="业主单位" span={3}>{itemDetail?.orgName || "---"}</Descriptions.Item>
-            <Descriptions.Item label="工程开工日期" span={3}>{itemDetail?.tmStart || "---"}</Descriptions.Item>
-            <Descriptions.Item label="工程主要内容" span={3}>{itemDetail?.content || "---"}</Descriptions.Item>
-            <Descriptions.Item label="防汛联系人" span={3}>{itemDetail?.personnelNamesType1 || "---"}</Descriptions.Item>
-            <Descriptions.Item label="联系电话" span={3}>{itemDetail?.contactPhone || "---"}</Descriptions.Item>
-           </Descriptions>
-        </Modal>
-      </div>
-
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/txl/form.js b/src/views/fxzb/txl/form.js
deleted file mode 100644
index d403c28..0000000
--- a/src/views/fxzb/txl/form.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import { createCrudService } from '../../../components/crud/_';
-import apiurl from '../../../service/apiurl';
-import moment from 'moment';
-import "./index.less"
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave }) => {
-  if(record.tmStart && record.tmEnd) {
-    record.tmStart = moment(record.tmStart)
-    record.tmEnd = moment(record.tmEnd)
-  }
-  const [form] = Form.useForm();
-
-  console.log("record",record);
-   /**
-   * @description 表单重置
-   */
-   const onReset = () => {
-    form.resetFields();
-  };
-  const onFinish = async(values) => {
-    values.departmentCode = record.departmentCode
-    if (mode === 'edit') {
-      values.userId = record.userId
-      onEdit(apiurl.fxzb.txl.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.fxzb.txl.save,values)
-    }
-  }
-
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="姓名"
-                name="userName"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 14 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="职务"
-                name="duty"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 14 }}
-                rules={[{ required: true }]}
-              >
-               <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />  
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="联系电话"
-                name="phone"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 14 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      
-      {
-        mode==='view'?null:(
-          <>
-              <Form.Item wrapperCol={{ span: 6, offset: 14 }}>
-            <Button onClick={onReset} style={{marginRight:10}}>
-              重置
-            </Button>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-    </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/txl/index.js b/src/views/fxzb/txl/index.js
deleted file mode 100644
index c0d221b..0000000
--- a/src/views/fxzb/txl/index.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card, Button, message } from 'antd';
-import ModalForm from './form';
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import GcTreeSelector from "./GcTreeSelector";
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({userName:''})
-  const toolBarRef = useRef();
-  const [code, setCode] = useState()
-  const [tag, setTag] = useState()
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '姓名', key: 'userName', dataIndex: 'userName', width: 200 },
-    { title: '部门', key: 'departmentName', dataIndex: 'departmentName', width: 200 },
-    { title: '职务', key: 'duty', dataIndex: 'duty', width: 200 },
-    { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 140 },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={ true} del={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.txl.page).find_noCode, {});
-  
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      setSearchVal({userName:''})
-      toolBarRef.current.reset();
-      refModal.current.showSave({departmentCode:code,userId:params.userId});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.txl.delete+ `/${params.userId}`);
-    }
-  }
- 
-  useEffect(() => {
-    if (searchVal && code) {
-      let params = {
-        search: {
-          userName:searchVal.userName || undefined,
-          departmentCode:code
-          }
-      };
-      search(params)
-    }
-  },[searchVal,code])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-      <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-        <GcTreeSelector setCode={setCode} setTag={setTag} showCheckbox={false} hasAlertBox={false}/>
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              ref={toolBarRef}
-            />
-            </Card>
-            <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="inx"
-              {...tableProps}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={600}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/txl/index.less b/src/views/fxzb/txl/index.less
deleted file mode 100644
index 35237c4..0000000
--- a/src/views/fxzb/txl/index.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.view-file{
-    margin-left: 12% ;
-}
-.upload-file{
-    margin-left: 92%;
-}
-.disable-icon{
-    pointer-events: none;
-    cursor: not-allowed !important;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/txl/toolbar.js b/src/views/fxzb/txl/toolbar.js
deleted file mode 100644
index 1400815..0000000
--- a/src/views/fxzb/txl/toolbar.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { forwardRef, useImperativeHandle } from 'react';
-import { Form, Input, Button } from 'antd';
-const ToolBar = forwardRef(({ setSearchVal, onSave },ref) => {
-  const [form] = Form.useForm();
-  useImperativeHandle(ref, () => ({
-    reset: () => {
-      form.resetFields();
-    }
-  }))
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form
-          className='toolbarBox'
-          layout="inline"
-          onFinish={(v) => setSearchVal(v)}
-          form={form}
-        >
-          <Form.Item label="姓名" name="userName">
-            <Input allowClear placeholder='' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          }
-        </Form>
-      </div>
-    </>
-  );
-})
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/hsddya/form.js b/src/views/fxzb/yaxb/hsddya/form.js
deleted file mode 100644
index 79f1c5b..0000000
--- a/src/views/fxzb/yaxb/hsddya/form.js
+++ /dev/null
@@ -1,382 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FilePptOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { createCrudService } from '../../../../components/crud/_';
-import apiurl from '../../../../service/apiurl';
-import moment from 'moment';
-import "./index.less"
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  if(record.tmStart && record.tmEnd) {
-    record.tmStart = moment(record.tmStart)
-    record.tmEnd = moment(record.tmEnd)
-  }
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileParams, setFileParams] = useState([]) // 文件参数
-  const [flag, setFlag] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [loading, setLoading] = useState(false)
-   /**
-   * @description 表单重置
-   */
-   const onReset = () => {
-    form.resetFields();
-  };
-  console.log(record);
-  const onFinish = async(values) => {
-    if(values.meetDate){
-      values.startDate = moment(values.meetDate[0]).format('YYYY-MM-DD HH:mm:ss')
-      values.endDate = moment(values.meetDate[1]).format('YYYY-MM-DD HH:mm:ss')
-      delete values.meetDate
-    }else {
-      values.tmStart = moment(values.tmStart).format('YYYY-MM-DD 00:00:00')
-      values.tmEnd = moment(values.tmEnd).format('YYYY-MM-DD 00:00:00')
-    }
-    values.relatedObjectId = record.relatedObjectId
-    values.relatedObjectType = "bzPredictionScheme4"
-    if (mode === 'edit') {
-      console.log(fileList);
-      let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-      values.id = record.id
-      values.attachList = oldFiles;
-      onEdit(apiurl.fxzb.yaxb.edit,values)
-    }
-    if (mode === 'save') {
-      values.attachList = fileParams
-      onSave(apiurl.fxzb.yaxb.save,values)
-    }
-  }
-  /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-    // if (mode === "edit" && flag) {
-    //   createCrudService(apiurl.fxzb.yaxb.deleteFile + `/${record.id}/${fileId}`).delGet().then(res => {
-    //     setFlag(false)
-    //     if (res.code === 200) {
-    //       message.success("删除附件成功")
-    //       onCrudSuccess()
-    //     }
-    //   })
-    // }
-  }
-
-  /**
-   * @description 上传文件之前的回调
-   * @param {Object} file  文件信息
-   */
-
-  // const handleBeforeUpload = (file) => {
-  //   // 限制上传文件的数量
-  //   const maxFiles = 1;
-  //   if (fileList.length >= maxFiles) {
-  //     message.error(`最多只能上传 ${maxFiles} 个文件`);
-  //     setIsRenderItem(false)
-  //     return false;
-  //   } else {
-  //     setIsRenderItem(true)
-  //   }
-  //   return true;
-  // };
-  /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
-  const fileChange = (info) => {
-    console.log(info);
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let params = info.fileList.map(file => {
-      return {
-        fileId: file.response?.data?.fileId,
-        tmCreate: file.response?.data?.uploadTime,
-      }
-    })
-    setFileParams(params)
-    setFileList(info.fileList)
-    setFlag(false)
-  }
-    /**
-   * @description 获取查看时文件
-   * @param {Array} params  文件详细数组
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    console.log(params);
-    let fetchArr = params?.attachList.map(item => {
-      return createCrudService(apiurl.fxzb.gczx.ytygc.getFile + `/${item.fileId}`)
-        .delGet()
-          }
-        ); 
-      Promise.all(fetchArr).then(res => {
-        let fileArr = res.map(item => {
-          return {
-            name: item.data.fileName,
-            response: {
-              data: {
-                filePath: item.data.filePath,
-                fileId:item.data.fileId
-              }
-            },
-          }
-        })
-        setFlag(true)
-        setFileList(fileArr)
-      }).catch(err => console.log(err))
-  }
-
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzPredictionScheme/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  useEffect(() => {
-    if (mode === "view" || mode === "edit") {
-      getFileInfo(record)
-      }
-  }, [record,mode])
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="方案名称"
-                name="title"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="编制单位"
-                name="orgName"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 14 }}
-                // rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="编制日期"
-                name="tmStart"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 14 }}
-                // rules={[{ required: true }]}
-              >
-               <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="批复部门"
-                name="replyOrgName"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 14 }}
-                // rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="批复日期"
-                name="tmEnd"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 14 }}
-                // rules={[{ required: true }]}
-              >
-               <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD"  
-                  style={{width:'100%'}}
-                  disabled={mode==='view'}
-                />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/xfflood/bzProjectManipulationRecord/file/upload/singleSimple"
-                onChange={fileChange}
-                // beforeUpload={handleBeforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={fileList}
-                  disabled={loading}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              }
-              <Row gutter={[16]}>
-                {
-                   loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.ppt') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePptOutlined style={{ fontSize: 40 }} /> 
-                                </div> :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                        <div
-                          className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'}
-                          onClick={() => deleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined
-                          />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-      
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button onClick={onReset} style={{marginRight:10}}>
-              重置
-            </Button>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzPredictionScheme/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/yaxb/hsddya/index.js b/src/views/fxzb/yaxb/hsddya/index.js
deleted file mode 100644
index 4dd7e7b..0000000
--- a/src/views/fxzb/yaxb/hsddya/index.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Button,message } from 'antd';
-import ModalForm from './form';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import moment from 'moment';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({title:''})
-  const toolBarRef = useRef();
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '方案名称', key: 'title', dataIndex: 'title', width: 200 },
-    { title: '编制单位', key: 'orgName', dataIndex: 'orgName', width: 200 },
-    {
-      title: '编制日期', key: 'tmStart', dataIndex: 'tmStart', width: 200,
-      render: (res => <span>{moment(res).format("YYYY-MM-DD")}</span>)
-     },
-    { title: '批复部门', key: 'replyOrgName', dataIndex: 'replyOrgName', width: 140 },
-    {
-      title: '批复日期', key: 'tmEnd', dataIndex: 'tmEnd', width: 200,
-      render: (res => <span>{moment(res).format("YYYY-MM-DD")}</span>)
-     },
-    { title: '上传时间', key: 'tmCreate', dataIndex: 'tmCreate', width: 200 },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={ true} del={true} view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.yaxb.hsddPage).find_noCode, {});
-  
-  // 获取表格的dataSource
-  // const dataSource = useMemo(() => {
-  //   if (tableProps.dataSource.length > 0) {
-  //     let dataArr = tableProps.dataSource.map((item, index) => {
-  //       let tmCreateArr = item.attachList.map(attach => attach.tmCreate)
-  //       return {
-  //         ...item,
-  //         tmCreate: tmCreateArr[0]
-  //       }
-  //     })
-  //     return dataArr.flat()
-  //   }
-  // }, [tableProps.dataSource])
-  
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      setSearchVal({title:''})
-      toolBarRef.current.reset();
-      refModal.current.showSave({relatedObjectId:'fs'});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.yaxb.delete+ `/${params.id}`);
-    }
-  }
- 
-  useEffect(() => {
-    if (searchVal) {
-      let params = {
-        search: {
-          title:searchVal.title || undefined,
-          relatedObjectId: 'fs',
-          relatedObjectType:"bzPredictionScheme4"
-          }
-        };
-      search(params)
-    }
-  },[searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-            <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              ref={toolBarRef}
-            />
-            </Card>
-            <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="inx"
-              {...tableProps}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/yaxb/hsddya/index.less b/src/views/fxzb/yaxb/hsddya/index.less
deleted file mode 100644
index 35237c4..0000000
--- a/src/views/fxzb/yaxb/hsddya/index.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.view-file{
-    margin-left: 12% ;
-}
-.upload-file{
-    margin-left: 92%;
-}
-.disable-icon{
-    pointer-events: none;
-    cursor: not-allowed !important;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/hsddya/toolbar.js b/src/views/fxzb/yaxb/hsddya/toolbar.js
deleted file mode 100644
index 5b07f8c..0000000
--- a/src/views/fxzb/yaxb/hsddya/toolbar.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { forwardRef, useImperativeHandle } from 'react';
-import { Form, Input, Button } from 'antd';
-const ToolBar = forwardRef(({ setSearchVal, onSave },ref) => {
-  const [form] = Form.useForm();
-  useImperativeHandle(ref, () => ({
-    reset: () => {
-      form.resetFields();
-    }
-  }))
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form
-          className='toolbarBox'
-          layout="inline"
-          onFinish={(v) => setSearchVal(v)}
-          form={form}
-        >
-          <Form.Item label="方案名称" name="title">
-            <Input allowClear placeholder='请输入方案名称' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新建</Button>
-              </Form.Item>
-            )
-          }
-        </Form>
-      </div>
-    </>
-  );
-})
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/TableData.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/TableData.js
deleted file mode 100644
index 55bc614..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center'},
-    {title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/drpOption.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/drpOption.js
deleted file mode 100644
index e242da0..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/drpOption.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  const maxVal = Math.max(...data.map(obj => obj.rz))+1
-  const minVal = Math.min(...data.map(obj => obj.rz))-1
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-
-  let arr =[]
-  data.forEach(item=>{
-    arr.push([item.w,item.rz])
-  })
-  return {
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "10%",
-        right: "20%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "蓄水量",
-        nameGap: -8,
-        type: 'category',
-        data: data.map(o => o.w),
-        // min:Math.floor(minValX),
-        // max:Math.round(maxValX),
-        // interval:GetInterval(minValX,maxValX),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#333',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        // symbol: 'none' // 设置标记点为'none'，即去掉圆点
-        symbolSize:10
-      },
-    ]
-  };
-}
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/index.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/index.js
deleted file mode 100644
index 4f6a56d..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-import {zvarl} from "../../../../../../../service/sssq";
-
-function Krqx({record}) {
-  const [data,setData]=useState([])
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  const getData=async (params)=>{
-    setData(await zvarl(params))
-  }
-  useEffect(() => {
-    getData({stcd:record.stcd})
-  }, [record]);
-
-
-  return (
-    <div style={{width: "98%", height: '60vh'}} className="swllgx-sq">
-      <div className="content">
-        <div className="content-left">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default Krqx
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/index.less b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/index.less
deleted file mode 100644
index 6e2608b..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/Krqx/index.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left{
-      width: 48%;
-      max-height: 60vh;
-      overflow: auto;
-    }
-    .content-right{
-      width: 48%;
-      height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/fxya.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/fxya.js
deleted file mode 100644
index 2c57485..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/fxya.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {plan} from "../../../../../../service/sssq";
-
-
-function Fxya({record}) {
-
-  const [data, setData] = useState({})
-  const getData = async (params) => {
-    let obj = await plan(params)
-    setData(obj[0])
-  }
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions column={3} bordered labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.preparation == 1 ? "是" : data?.preparation == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.approval == 1 ? "是" : data?.approval == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="编制时间" style={{width: "16.5%"}}>{data?.prepTime}</Descriptions.Item>
-        <Descriptions.Item label="批复时间">{data?.apprTime}</Descriptions.Item>
-        <Descriptions.Item label="编制单位">{data?.prepOrg}</Descriptions.Item>
-        <Descriptions.Item label="批复部门">{data?.apprOrg}</Descriptions.Item>
-        <Descriptions.Item label="预案文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.apprName}</span>
-        </Descriptions.Item>
-        <Descriptions.Item label="批复文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.planName}</span>
-        </Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Fxya;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/gctp.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/gctp.js
deleted file mode 100644
index 734be0d..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/gctp.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {projectimg, fileget} from "../../../../../../service/sssq";
-import {projDict} from "../../../../../../utils/dictType"
-
-
-function Gctp({record}) {
-  const [data, setData] = useState([])
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const getData = async (params) => {
-    setData(await projectimg(params))
-  }
-
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered layout="vertical" column={3}>
-        {
-          data?.length > 0 ? data?.map(o => <Descriptions.Item label={projDict(o?.projType)}>
-              <div className="no-data">
-                <img src={url + o?.filePath} style={{width: "100%"}} alt=""/>
-              </div>
-            </Descriptions.Item>
-            )
-            : ""
-        }
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Gctp;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/index.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/index.js
deleted file mode 100644
index bc265cc..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { Tabs} from "antd";
-import Jbxx from './jbxx'
-import Krqx from './Krqx'
-import Zrtx from './zrtx'
-import Jzw from './jzw'
-import Jsxx from './jsxx'
-import Gctp from './gctp'
-import Fxya from './fxya'
-import Sjbg from './sjbg'
-
-
-
-function Skjcxx({data}) {
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <>
-      <div>
-        <Tabs defaultActiveKey="1" tabPosition="left" type="card">
-          <Tabs.TabPane tab="基本信息" key="1">
-            <Jbxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="库容曲线" key="2">
-            <Krqx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="责任体系" key="3">
-            <Zrtx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建筑物" key="4">
-            <Jzw record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建设信息" key="5">
-            <Jsxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="工程图片" key="6">
-            <Gctp record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="防汛预案" key="7">
-            <Fxya record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="设计报告" key="8">
-            <Sjbg record={data}/>
-          </Tabs.TabPane>
-
-
-        </Tabs>
-      </div>
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jbxx.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jbxx.js
deleted file mode 100644
index 4c399c4..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jbxx.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {attResBase} from '../../../../../../service/sssq'
-import {engScalDict} from '../../../../../../utils/dictType'
-function Skjcxx({ data }) {
-  const [info,setInfo]=useState({})
-  const getData=async (params)=>{
-    setInfo(await attResBase(params))
-  }
-  useEffect(() => {
-    if (data?.resCode) {
-      getData({resCode:data.resCode})
-    }
-  }, [data]);
-
-  return (
-    <>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="水库名称" style={{ width: '16.5%' }}>{info?.resName}</Descriptions.Item>
-        <Descriptions.Item label="所在地" style={{ width: '16.5%' }}>{info?.resLoc}</Descriptions.Item>
-        <Descriptions.Item label="管理单位" style={{ width: '16.5%' }}>{info?.managName}</Descriptions.Item>
-        <Descriptions.Item label="水库代码">{info?.resCode}</Descriptions.Item>
-        <Descriptions.Item label="注册登记号">{info?.regSn}</Descriptions.Item>
-        <Descriptions.Item label="注册登记时间">{info?.regTime}</Descriptions.Item>
-        <Descriptions.Item label="经度">{info?.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{info?.lttd}</Descriptions.Item>
-        <Descriptions.Item label="高程基准面">{info?.elevDat}</Descriptions.Item>
-        <Descriptions.Item label="所在流域">{info?.basName}</Descriptions.Item>
-        <Descriptions.Item label="所在水系">{info?.wsName}</Descriptions.Item>
-        <Descriptions.Item label="所在河流名称">{info?.rvName}</Descriptions.Item>
-        <Descriptions.Item label="工程规模">{engScalDict(info?.engScal)}</Descriptions.Item>
-        <Descriptions.Item label="水库功能">{info?.rsvFunction}</Descriptions.Item>
-        <Descriptions.Item label="溢洪道是否有闸">{info?.spillwayGate==1?"有":info.spillwayGate==0?"无":""}</Descriptions.Item>
-        <Descriptions.Item label="水库特征参数" span={3}></Descriptions.Item>
-        <Descriptions.Item label="坝址以上控制流域面积(km³)">{info?.watShedArea}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)">{info?.crestElev}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{info?.maxDamHeig}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{info?.calFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万m³)">{info?.totCap}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水时最大下泄流量(m³/s)">{info?.maxDesFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{info?.desFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="调洪库容(万m³)">{info?.storFlCap}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水时最大下泄流量(m³/s)">{info?.maxCalFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="防洪高水位(m)">{info?.uppLevFlco}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万m³)">{info?.flcoCap}</Descriptions.Item>
-        <Descriptions.Item label="下游河道安全流量(m³/s)">{info?.dsSaftFlow}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{info?.normWatLev}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万m³)">{info?.benResCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{info?.deadLev}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万m³)">{info?.deadCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="工程概况" span={3}>{info?.projOverview}</Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jsxx.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jsxx.js
deleted file mode 100644
index 2412f45..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jsxx.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {construction} from "../../../../../../service/sssq";
-
-
-
-function Jsxx({record}) {
-
-  const columns = [
-    {title: '状态', key: '', dataIndex: '', align: 'center',render:rec=>rec.engStat==0?"始建":rec.engStat==1?"扩建":""},
-    {title: '工程开工时间', key: 'startDate', dataIndex: 'startDate', align: 'center'},
-    {title: '投入使用时间', key: 'useDate', dataIndex: 'useDate', align: 'center'},
-    {title: '竣工验收时间', key: 'compDate', dataIndex: 'compDate', align: 'center'},
-    {title: '改扩建内容', key: 'content', dataIndex: 'content', align: 'center'},
-    {title: '第几次扩建', key: 'buildNo', dataIndex: 'buildNo', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await construction(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Jsxx;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jzw.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jzw.js
deleted file mode 100644
index 2cebbec..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/jzw.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions,Table} from "antd";
-import {drainage,dam,transport} from "../../../../../../service/sssq";
-
-
-
-function Jzw({record}) {
-
-  const columns1 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns2 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启用标准', key: 'enableCriteria', dataIndex: 'enableCriteria', align: 'center'},
-  ];
-  const columns3 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '洞(孔)身型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '数量(条或孔)', key: 'num', dataIndex: 'num', align: 'center'},
-    {title: '进口底槛高程(m)', key: 'inletEle', dataIndex: 'inletEle', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns4 = [
-    {title: '设计流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '输水道型式', key: 'transType', dataIndex: 'transType', align: 'center',},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '输水道长度(m)', key: 'transLeng', dataIndex: 'transLeng', align: 'center'},
-    {title: '座教', key: 'num', dataIndex: 'num', align: 'center'},
-  ];
-
-  const [tableDataDs, setTableDataDs] = useState([])
-  const [tableDataXs, setTableDataXs] = useState({})
-  const [tableDataSs, setTableDataSs] = useState([])
-
-  const getData=async (params)=>{
-    setTableDataDs(await dam(params))
-    setTableDataXs(await drainage(params))
-    setTableDataSs(await transport(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <div style={{maxHeight:"60vh",overflow:"auto"}}>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>挡水建筑物</div>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="坝型" style={{ width: '16.5%' }}>{tableDataDs[0]?.damType}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damMaxHeig}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damTopElev}</Descriptions.Item>
-        <Descriptions.Item label="坝顶长度(m)">{tableDataDs[0]?.damTopLen}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{tableDataDs[0]?.damTopWid}</Descriptions.Item>
-        <Descriptions.Item label="坝基防渗体型式">{tableDataDs[0]?.damImpermeableType}</Descriptions.Item>
-        <Descriptions.Item label="副坝座数">{tableDataDs[0]?.subDamNum}</Descriptions.Item>
-        <Descriptions.Item label="副坝总长度(m)">{tableDataDs[0]?.subDamLen}</Descriptions.Item>
-        <Descriptions.Item label="副坝最大坝高(m)">{tableDataDs[0]?.subDamMaxHeig}</Descriptions.Item>
-      </Descriptions>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>泄水建筑物</div>
-      <div className="table-title" style={{padding:"4px"}}>☆正常溢洪道</div>
-      <Table rowKey="inx"
-             sticky
-             size="small"
-             columns={columns1}
-             pagination={false}
-             dataSource={tableDataXs.normalSpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆非常溢洪道</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns2}
-             pagination={false}
-             dataSource={tableDataXs.emergencySpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆泄洪洞</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns3}
-             pagination={false}
-             dataSource={tableDataXs.sluiceGateList}
-      />
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>输水建筑物</div>
-      <Table rowKey="key"
-             sticky
-             size="small "
-             columns={columns4}
-             pagination={false}
-             dataSource={tableDataSs}
-      />
-    </div>
-  )
-}
-
-export default Jzw;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/sjbg.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/sjbg.js
deleted file mode 100644
index f7d62f0..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/sjbg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {file} from "../../../../../../service/sssq";
-
-
-
-function Sjbg({record}) {
-
-  const columns = [
-    {title: '文件名称', key: '', dataIndex: '', align: 'center',render:rec=><span style={{color:"#689FFF"}}>{rec.fileName}</span>},
-    {title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center'},
-    {title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center'},
-    {title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center'},
-    {title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await file(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             bordered
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Sjbg;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/zrtx.js b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/zrtx.js
deleted file mode 100644
index d78d4ac..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/Skjcxx/zrtx.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {person} from "../../../../../../service/sssq";
-import {repDict} from "../../../../../../utils/dictType"
-
-
-
-function Zrtx({record}) {
-
-  const columns = [
-    {title: '责任人', key: '', dataIndex: '', align: 'center',render:rec=>repDict(rec.repType)},
-    {title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center'},
-    {title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center'},
-    {title: '职务', key: 'position', dataIndex: 'position', align: 'center'},
-    {title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await person(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Zrtx;
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/index.less b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/index.less
deleted file mode 100644
index 7b1e7ed..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/index.less
+++ /dev/null
@@ -1,231 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.GcTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-  .ant-tree-treenode{
-    width: 100%;
-
-    .ant-tree-node-content-wrapper{
-      // width: 100%;
-      // padding-right: 15px;
-      position: static;
-    }
-  }
-}
-// .detail-modal{
-//   .ant-descriptions-item{
-//     border-bottom: 1px solid rgb(232, 232, 232) ;
-//   }
-// }
-
-.tree-container{
-  .ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
-    color:rgba(0, 0, 0, 0.7)
-  }
-}
-.detail-modal{
-  .ant-modal-body{
-
-    .dp-popup-content {
-      position: relative;
-      // box-shadow: 0 1px 2px rgba(0,0,0,.1);
-      pointer-events: auto;
-      //background: rgba(4, 8, 27, 0.9);
-      background: rgba(255, 255, 255, 0.9);
-      border-radius: 0px;
-      padding: 0;
-      margin-top: 20px;
-    }
-    
-    .content-body {
-      color: #333;
-      padding: 0.4rem 0.4rem 0.2rem 0.4rem;
-      position: relative;
-    
-      .cursor-pointer1, .cursor-pointer2, .cursor-pointer3{
-        position: absolute;
-        top:15px;
-        color:#0893FF;
-        cursor:pointer;
-      }
-      .cursor-pointer1{
-        right:145px;
-      }
-      .cursor-pointer2{
-        right:115px;
-      }
-      .cursor-pointer3{
-        right:45px;
-      }
-    
-      .title {
-        display: flex;
-        align-items: center;
-        border-bottom: 1px solid #f0f0f0;
-        padding: 0.2rem 0.6rem 0.4rem 0.6rem;
-        line-height:30px;
-        font-size:16px;
-        background-color: #f7f7f7;
-        color: #007AFD;
-    
-        .icon {
-          width: 1.2rem;
-          height: 1.2rem;
-          flex-shrink: 0;
-          margin-right: 0.5rem;
-        }
-    
-        .name {
-          flex-grow: 1;
-          font-weight:normal;
-          .nameBorder{
-            width: 5px;
-            height: 16px;
-            background-color: #007AFD;
-            margin-right: 10px;
-          }
-        }
-        .flex{
-          display: flex;
-        }
-    
-        .close {
-          flex-shrink: 0;
-          width: 0.8rem;
-          margin: 0 0.1rem 0.1rem 0;
-          cursor: pointer;
-        }
-      }
-    
-      .body {
-        padding: 0.5rem 1rem;
-        .body-row {
-          display: flex;
-          line-height: 2;
-    
-          .row-key {
-            width: 6rem;
-          }
-    
-          .row-value {
-            color: rgb(184, 233, 248)
-          }
-    
-          .row-key-w {
-            width: 10rem;
-          }
-        }
-    
-        .body-row-grid {
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 0.5rem;
-        }
-    
-      }
-        .foot {
-          padding-top: 0.2rem;
-          border-top: 1px solid rgba(36, 136, 223, 0.60);
-          display: flex;
-          justify-content: space-around;
-        }
-    }
-    .dp-popup-tip {
-      border: 10px solid transparent;
-    }
-    
-    .no-matter{
-      opacity: .5;
-    }
-    .shuichi-border {
-      animation: redred 1000ms 0ms infinite linear;
-    
-      @keyframes redred {
-        0% {
-          fill:  #17abe3;
-        }
-        100% {
-          fill:  #f7d28d;
-        }
-      }
-    }
-    
-    .pulsating-circle {
-      position: absolute;
-      transform: translateX(-50%) translateY(-50%) scaleY(0.6);
-    
-      &:before {
-        content: '';
-        position: relative;
-        display: block;
-        width: 300%;
-        height: 300%;
-        box-sizing: border-box;
-        margin-left: -100%;
-        margin-top: -100%;
-        border-radius: 45px;
-        background-color: #01a4e9;
-        animation: pulse-ring 1.25s cubic-bezier(0.215, 0.61, 0.355, 1) infinite;
-      }
-      
-      &:after {
-        content: '';
-        position: absolute;
-        left: 0; 
-        top: 0;
-        display: block;
-        width: 100%;
-        height: 100%;
-        background-color: rgb(152 218 237);
-        border-radius: 15px;
-        box-shadow: 0 0 8px rgba(0,0,0,.3);
-        animation: pulse-dot 1.25s cubic-bezier(0.455, 0.03, 0.515, 0.955) -.4s infinite;
-      }
-    }
-    
-    .pulsating-circle-blue {
-      &:before {
-        background-color: #01a4e9;
-      }
-    }
-  }
-
-}
-
-@keyframes pulse-ring {
-  0% {
-    transform: scale(.63);
-  }
-  80%, 100% {
-    opacity: 0;
-  }
-}
-
-@keyframes pulse-dot {
-  0% {
-    transform: scale(.8);
-  }
-  50% {
-    transform: scale(1);
-  }
-  100% {
-    transform: scale(.8);
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/index.tsx b/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/index.tsx
deleted file mode 100644
index 7bcfdf6..0000000
--- a/src/views/fxzb/yaxb/ytygcya/GcTreeSelector/index.tsx
+++ /dev/null
@@ -1,361 +0,0 @@
-import React, { useState, useRef,useEffect,forwardRef, useImperativeHandle } from 'react';
-import {Tree, Input, Checkbox, Spin, Modal,Tabs} from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import Jbxx from './Skjcxx/jbxx'
-import Krqx from './Skjcxx/Krqx'
-import Zrtx from './Skjcxx/zrtx'
-import Jzw from './Skjcxx/jzw'
-import Jsxx from './Skjcxx/jsxx'
-import Gctp from './Skjcxx/gctp'
-import Fxya from './Skjcxx/fxya'
-import Sjbg from './Skjcxx/sjbg'
-import './index.less';
-import {getAdcdTreeData1, getYaxbGcTreeData} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setCode?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  setTag?: any,
-  data?: any,
-  clickHandler?:any
-}
-
-const AdcdTreeSelector: React.FC<IProps> = forwardRef (({ onSelectFun, clickHandler,setCode, setTag, showCheckbox, tableName, hasAlertBox,data },ref) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [itemDetail, setItemDetail] = useState<any>({}) // 树中的每一项的详细信息
-
-  const [open, setOpen] = useState(false)
-  const [keys, setKeys] = useState(1)
-  const selectKeysRef = useRef()
-  useImperativeHandle(ref, () => ({
-    getTreeData: () => {
-      getCustomerTreeData();
-    }
-  }))
-  const TabList = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-    {
-      key: '2',
-      label: '库容曲线',
-    },
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '4',
-      label: '建筑物',
-    },
-    {
-      key: '5',
-      label: '建设信息',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计报告',
-    },
-  ]
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await getYaxbGcTreeData(params);
-
-    const item:any = adcdTreedata?.[0]?.children?.[0]
-    if (item) {
-      if (selectKeysRef.current) {
-        setSelectedKeys(selectKeysRef.current)
-        setCode(selectKeysRef.current[0])
-      } else {
-        setCode(item.code)
-        setSelectedKeys([item.code])
-      }
-      // setCode(item.code)
-      // setSelectedKeys([item.code])
-      // setTag(item.tag)
-    }
-
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.sname;
-        // (
-        //   <span  style={{position:'relative'}}>
-        //     {item.sname}
-        //     <div  style={{color:'red',position:'absolute',left:'50px'}}>按钮</div>
-        //   </span>
-        // )
-        item.key = item.code;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue: any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-    selectKeysRef.current = selectedKeysValue;
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      if(!adcdLevel){
-        const code = selectData.code.substring(0,15);
-        if(code.endsWith('000000000')){//县
-          adcdVal = selectData.code.substring(0,6);
-        }else if(code.endsWith('000000')){//镇
-          adcdVal = selectData.code.substring(0,9);
-        }else if(code.endsWith('000')){//村
-          adcdVal = selectData.code.substring(0,12);
-        }else{
-          adcdVal = selectData.code;
-        }
-      }else{
-        adcdVal = selectData.code;
-      }
-
-      let params = { code: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode(adcdVal)
-        setTag(selectData.tag)
-      }
-    } else {
-      let params = { code: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode("")
-        setTag("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.sname.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-  const onChange = (key:any) => {
-    setKeys(key)
-  }
-  return (
-    <div style={{position:"relative"}} className='GcTreeSelectorStyle '>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }} className='tree-container'>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              titleRender={(v:any)=>{
-                return (<>
-                    {
-                      v.children?.length > 0?null:
-                      <div  style={{color:'#a8a8a8',position:'absolute',right:'25px'}} onClick={(e)=>{
-                        e.stopPropagation()
-                        setOpen(true)
-                        setItemDetail(v)
-                        clickHandler(v)
-                      }}><FileTextOutlined /></div>
-                    }
-                    <div className={v.status ? "" : "no-matter"}>{v.title}</div>
-                </>)
-              }}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-            />
-          }
-        </div>
-        <Modal
-          title=""
-          width={1000}
-          open={open}
-          footer={null}
-          onCancel={() => setOpen(false)}
-          className='detail-modal'
-        >
-          <div className="dp-popup-content">
-          <div className="content-body tyb skpop" id='tyb'>
-            <div className="title flexac flex">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data?.resName}
-              </div>
-
-              <Tabs
-                defaultActiveKey="1"
-                type="card"
-                onChange={onChange}
-                items={TabList}
-                tabBarStyle={{margin:0}}
-              />
-            </div>
-            <div style={{backgroundColor:'#fff'}}>
-              {keys == 1 && <Jbxx data={data} />}
-              {keys == 2 && <Krqx record={data} />}
-              {keys == 3 && <Zrtx record={data} />}
-              {keys == 4 && <Jzw record={data} />}
-              {keys == 5 && <Jsxx record={data} />}
-              {keys == 6 && <Gctp record={data} />}
-              {keys == 7 && <Fxya record={data} />}
-              {keys == 8 && <Sjbg record={data} />}
-            </div>
-          </div>
-        </div>
-        </Modal>
-      </div>
-
-    </div>
-  );
-});
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/yaxb/ytygcya/form.js b/src/views/fxzb/yaxb/ytygcya/form.js
deleted file mode 100644
index 54955c2..0000000
--- a/src/views/fxzb/yaxb/ytygcya/form.js
+++ /dev/null
@@ -1,14 +0,0 @@
-
-import "./index.less"
-const ModalForm = ({ mode, record, onEdit, onSave,onDeleteGet }) => {
-  return (
-    <>
-       <iframe
-        style={{ height: '70vh', width: '100%', border: 0,marginTop:20 }}
-        src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzPredictionScheme/file/download/${record.fileId}`)}`}
-       />
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/yaxb/ytygcya/index.js b/src/views/fxzb/yaxb/ytygcya/index.js
deleted file mode 100644
index 3b8d602..0000000
--- a/src/views/fxzb/yaxb/ytygcya/index.js
+++ /dev/null
@@ -1,281 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Upload, Button,message ,Image} from 'antd';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import GcTreeSelector from "../../gczx/ytygc/GcTreeSelector/index";
-import {getAdcdTreeData1, getYaxbGcTreeData} from '../../../../service/warn';
-
-const Page = () => {
-  const url = "http://local.gunshiiot.com:18083/gunshiApp/xfflood"
-  const url1 = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const allowedFileTypes = ['.pdf']; //文件上传格式
-  const refModal = useRef();
-  const treeRef = useRef();
-  const isRender = useRef(true)
-  const [code, setCode] = useState()
-  const [tag, setTag] = useState()
-  const [fileList, setFileList] = useState([])
-  const [projectInfo, setProjectInfo] = useState({})
-  const [image, setImage] = useState()
-  const [visible, setVisible] = useState(false);
-  const [loading, setLoading] = useState(false)
-
-  const picType = ["png", "jpg", "jpeg", "gif"];
-  const bytesToKB = (bytes) => {
-    return (bytes / 1024).toFixed(2);
-  }
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '文件名', key: 'fileName', dataIndex: 'fileName', width: 200 },
-    { title: '上传时间', key: 'tmCreate', dataIndex: 'tmCreate', width: 200 },
-    { title: '类型', key: 'fileType', dataIndex: 'fileType', width: 80 },
-    {
-      title: '大小（KB）', key: 'fileLength', dataIndex: 'fileLength', width: 140,
-      render: (rec) => <span>{bytesToKB(rec)}</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text
-        review={row?.fileType === "pdf"}
-        picReview={picType.includes(row?.fileType) }
-        download={true}
-        del={true}
-        command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.yaxb.page).find_noCode, {});
-    // 获取表格的dataSource
-  const dataSource = useMemo(() => {
-    if (tableProps.dataSource.length > 0) {
-      let dataArr = tableProps.dataSource.map((item, index) => {
-        let schemeId = item.id
-        return item.attachList.map(attach => ({...attach, schemeId}))
-      })
-      return dataArr.flat()
-    }
-    },[tableProps.dataSource])
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({relatedObjectId:code});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'download') {
-      let downloadLink = document.createElement("a");
-        downloadLink.href = `${url}/bzPredictionScheme/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-    } else if (type === "review") {
-      refModal.current.showReView(params);
-    }
-    else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.yaxb.delete + `/${params.schemeId}`);
-    } else if (type === "picReview") {
-      console.log(params);
-      setVisible(true)
-      getFileInfo(params)
-    }
-  }
-
-  const getFileInfo = (params) => {
-    createCrudService(apiurl.fxzb.yaxb.getFile + `/${params.fileId}`)
-         .delGet()    
-      .then(res => {
-        if (res.code === 200) {
-         setImage(res.data)
-        }
-       }).catch(err => console.log(err))
-   }
-  /**
-   * @description 获取文件类型
-   */
-  const getFileTypeFromFileName = (fileName) => {
-    var lastDotIndex = fileName.lastIndexOf(".");
-    if (lastDotIndex !== -1) {
-      return fileName.substring(lastDotIndex + 1);
-    }
-    return "";
-  }
-  /**
-   * @description 上传之前的回调
-   */
-  const beforeUpload = (info) => {
-    // if (info.type != "application/pdf") {
-    //   message.error("请上传pdf格式的文件")
-    //   return false
-    // }
-    return true
-  }
-  /**
-   * @description 上传文件后的回调
-   * @param {Array} info 
-   */
-  const handleUploadChange = (info) => { 
-    setLoading(true)
-    let fileLists;
-    // 防止上传状态一直是uploading
-    setFileList([info.file])
-    const { status } = info.file;
-    if (status === 'done') {
-      message.success("文件上传成功 ")
-      setLoading(false)
-      setFileList([info.file])
-      fileLists = info.fileList.map(file => { 
-        return {
-          fileId: file.response?.data?.fileId,
-          fileName: file.response?.data?.fileName,
-          tmCreate: file.response?.data?.uploadTime,
-          fileLength: file.response?.data?.fileLength,
-          filePath: file.response?.data?.filePath,
-          fileType: getFileTypeFromFileName(file.response?.data?.fileName)
-        }
-      })
-      let params = {
-        attachList: fileLists,
-        relatedObjectId: code,
-        relatedObjectType:"bzPredictionScheme2"
-      }
-      createCrudService(apiurl.fxzb.yaxb.save).edit(params).then(res => {
-        if (res.code === 200) { 
-          search(params)
-        }
-      })
-    } else if (status === 'error') {
-      message.error(`文件上传失败`);
-    }
-  }
-  /**
-   * @description 获取工程相关信息
-   */
-  const getProjectInfo = (params) => {
-    createCrudService(apiurl.sssq.attResBase).delGet({ resCode: params }).then(res => {
-      if (res.code == 200) {
-        let data = res.data
-        setProjectInfo(data)
-      }
-    })
-  }
-
-   /**
-   * @description 获取水电站相关信息
-   */
-   const getStationInfo = (code) => {
-    createCrudService(apiurl.station.hydropowerStation.list).delGet().then(res => {
-      if (res.code == 200) {
-        let data = res.data.find(item => item.hystCode == code)
-        setProjectInfo(data)
-      }
-    })
-  }
-  const clickHandler = (v) => {
-    if (v.type == 1) {
-      getProjectInfo(v.code)
-    } else {
-      getStationInfo(v.code)
-    }
-  }
-  useEffect(()=>{
-    if(isRender.current){
-      isRender.current = false
-      return
-    }
-
-  const params = {
-      search: {
-      relatedObjectId: code,
-      relatedObjectType:"bzPredictionScheme2"
-      }
-    };
-    search(params)
-
-  }, [code])
-  
-  useEffect(() => {
-    if (tableProps.dataSource?.length === 1) {
-        treeRef.current.getTreeData()
-   }
- }, [tableProps.dataSource])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <GcTreeSelector
-            setCode={setCode}
-            setTag={setTag}
-            showCheckbox={false}
-            hasAlertBox={false}
-            data={projectInfo}
-            clickHandler={clickHandler}
-            ref={treeRef}
-            url={getYaxbGcTreeData}
-          />
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Upload
-            name="file"
-            action="/gunshiApp/xfflood/bzPredictionScheme/file/upload/singleSimple"
-            onChange={handleUploadChange}
-            beforeUpload={beforeUpload}
-            className='upload-file'
-            fileList={fileList}
-          >
-              <Button size='Default' type='primary' onClick={() => {}}>上传</Button>
-            </Upload>
-            <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="inx"
-              {...tableProps}
-              dataSource={dataSource}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-      {image && 
-        <Image
-        style={
-          {
-             display: 'none',
-          }
-        }
-        width={60}
-        src={url1 + image?.filePath}
-        preview={
-          {
-            visible,
-            onVisibleChange: (value) => {
-              setVisible(value);
-            },
-          }
-        }
-        alt='' />
-      }
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/yaxb/ytygcya/index.less b/src/views/fxzb/yaxb/ytygcya/index.less
deleted file mode 100644
index 6d1757c..0000000
--- a/src/views/fxzb/yaxb/ytygcya/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.upload-file{
-    margin-left: 92%;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/zjgcya/form.js b/src/views/fxzb/yaxb/zjgcya/form.js
deleted file mode 100644
index 0127480..0000000
--- a/src/views/fxzb/yaxb/zjgcya/form.js
+++ /dev/null
@@ -1,15 +0,0 @@
-
-import "./index.less"
-const ModalForm = ({ mode, record, onEdit, onSave, onDeleteGet }) => {
-  console.log(process.env.PUBLIC_URL);
-  return (
-    <>
-       <iframe
-        style={{ height: '70vh', width: '100%', border: 0,marginTop:20 }}
-        src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzPredictionScheme/file/download/${record.fileId}`)}`}
-       />
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/yaxb/zjgcya/index.js b/src/views/fxzb/yaxb/zjgcya/index.js
deleted file mode 100644
index 938c7bd..0000000
--- a/src/views/fxzb/yaxb/zjgcya/index.js
+++ /dev/null
@@ -1,279 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Upload, Button,message ,Descriptions,Modal,Image} from 'antd';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import ListSelect from "../../../../components/Form/ListSelect1";
-
-const Page = () => {
-  const url = "http://local.gunshiiot.com:18083/gunshiApp/xfflood"
-  const url1 = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  // 页面初始默认查询参数
-  const options = {
-    search:{
-      adcd: 'hbs',
-    },
-  };
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [adcd, setAdcd] = useState(options.search.adcd)
-  const [fileList, setFileList] = useState([])
-  const [open, setOpen] = useState(false)
-  const [image, setImage] = useState()
-  const [visible, setVisible] = useState(false);
-  const [loading, setLoading] = useState(false)
-  const [listData, setListData] = useState([])
-  const [itemDetail, setItemDetail] = useState({})
-  const picType = ["png", "jpg", "jpeg", "gif"];
-  const bytesToKB = (bytes) => {
-    return (bytes / 1024).toFixed(2);
-  }
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '文件名', key: 'fileName', dataIndex: 'fileName', width: 200 },
-    { title: '上传时间', key: 'tmCreate', dataIndex: 'tmCreate', width: 200 },
-    { title: '类型', key: 'fileType', dataIndex: 'fileType', width: 80 },
-    {
-      title: '大小（KB）', key: 'fileLength', dataIndex: 'fileLength', width: 140,
-      render: (rec) => <span>{bytesToKB(rec)}</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text
-        review={row?.fileType === "pdf"}
-        picReview={picType.includes(row?.fileType) }
-        download={true}
-        del={true}
-        command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.yaxb.page).find_noCode, {});
-    // 获取表格的dataSource
-  const dataSource = useMemo(() => {
-    if (tableProps.dataSource.length > 0) {
-      let dataArr = tableProps.dataSource.map((item, index) => {
-        let schemeId = item.id
-        return item.attachList.map(attach => ({...attach, schemeId}))
-      })
-      return dataArr.flat()
-    }
-    },[tableProps.dataSource])
-  const command = (type) => (params) => {
-   if (type === 'download') {
-      let downloadLink = document.createElement("a");
-        downloadLink.href = `${url}/bzPredictionScheme/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-    } else if (type === "review") {
-      refModal.current.showReView(params);
-    }
-    else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.yaxb.delete + `/${params.schemeId}`);
-    } else if (type === "picReview") {
-      console.log(params);
-      setVisible(true)
-      getFileInfo(params)
-    }
-  }
-  const getFileInfo = (params) => {
-    createCrudService(apiurl.fxzb.yaxb.getFile + `/${params.fileId}`)
-         .delGet()    
-      .then(res => {
-        if (res.code === 200) {
-         setImage(res.data)
-        }
-       }).catch(err => console.log(err))
-   }
-  /**
-   * @description 获取文件类型
-   */
-  const getFileTypeFromFileName = (fileName) => {
-    var lastDotIndex = fileName.lastIndexOf(".");
-    if (lastDotIndex !== -1) {
-      return fileName.substring(lastDotIndex + 1);
-    }
-    return "";
-  }
-  /**
-   * @description 上传之前的回调
-   */
-  const beforeUpload = (info) => {
-    // if (info.type != "application/pdf") {
-    //   message.error("请上传pdf格式的文件")
-    //   return false
-    // }
-    return true
-  }
-  /**
-   * @description 上传文件后的回调
-   * @param {Array} info 
-   */
-  const handleUploadChange = (info) => { 
-    setLoading(true)
-    let fileLists;
-    // 防止上传状态一直是uploading
-    setFileList([info.file])
-    const { status } = info.file;
-    if (status === 'done') {
-      message.success("文件上传成功 ")
-      setLoading(false)
-      setFileList([info.file])
-      fileLists = info.fileList.map(file => { 
-        return {
-          fileId: file.response?.data?.fileId,
-          fileName: file.response?.data?.fileName,
-          tmCreate: file.response?.data?.uploadTime,
-          fileLength: file.response?.data?.fileLength,
-          filePath: file.response?.data?.filePath,
-          fileType: getFileTypeFromFileName(file.response?.data?.fileName)
-        }
-      })
-      let params = {
-        attachList: fileLists,
-        relatedObjectId: adcd,
-        relatedObjectType:"bzPredictionScheme3"
-      }
-      createCrudService(apiurl.fxzb.yaxb.save).edit(params).then(res => {
-        if (res.code === 200) { 
-          search(params)
-        }
-      })
-    } else if (status === 'error') {
-      message.error(`文件上传失败`);
-    }
-  }
-  
-   /**
-   * @description 图标点击回调
-   * @param {v}  
-   * @param {Boolen} bool 打开弹框
-   */
-   const clickHandler = (v,bool) => {
-     setOpen(bool)
-     setItemDetail(v)
-  }
-
-   /**
-   * @description 获取左边内容的列表
-   */
-   const getLeftList = () => {
-    createCrudService(apiurl.fxzb.yaxb.zjgcya.list).delGet().then(res => {
-      if (res.code === 200) {
-        setListData(res.data)
-      }
-    });
-  }
-
-  useEffect(()=>{
-    // if(isRender.current){
-    //   isRender.current = false
-    //   return
-    // }
-
-  const params = {
-      search: {
-      relatedObjectId: adcd,
-      relatedObjectType:"bzPredictionScheme3"
-      }
-    };
-    search(params)
-
-  }, [adcd])
-  
-  useEffect(() => {
-    getLeftList()
-  }, [tableProps.dataSource])
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <ListSelect
-            setAdcd={setAdcd}
-            clickHandler={clickHandler}
-            listData={listData}
-          />
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Upload
-            name="file"
-            action="/gunshiApp/xfflood/bzPredictionScheme/file/upload/singleSimple"
-            onChange={handleUploadChange}
-            beforeUpload={beforeUpload}
-            className='upload-file'
-            fileList={fileList}
-          >
-              <Button size='Default' type='primary' onClick={() => {}}>上传</Button>
-            </Upload>
-            <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="inx"
-              {...tableProps}
-              dataSource={dataSource}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-         {image && 
-        <Image
-        style={
-          {
-             display: 'none',
-          }
-        }
-        width={60}
-        src={url1 + image?.filePath}
-        preview={
-          {
-            visible,
-            onVisibleChange: (value) => {
-              setVisible(value);
-            },
-          }
-        }
-        alt='' />
-      }
-        <Modal
-         title={<span className='basic-info'>{ itemDetail?.projNm}</span>}
-          open={open}
-          onCancel={() => setOpen(false)}
-          footer={null}
-          className='detail-modal'
-        >
-            <Descriptions >
-            <Descriptions.Item label="工程名称" span={3}>{itemDetail?.projNm || "-"}</Descriptions.Item>
-            <Descriptions.Item label="业主单位" span={3}>{itemDetail?.ownerUnit || "-"}</Descriptions.Item>
-            <Descriptions.Item label="工程开工日期" span={3}>{itemDetail?.startDate || "-"}</Descriptions.Item>
-            <Descriptions.Item label="工程主要内容" span={3}>{itemDetail?.content || "-"}</Descriptions.Item>
-            <Descriptions.Item label="防汛联系人" span={3}>{itemDetail?.contactPerson || "-"}</Descriptions.Item>
-            <Descriptions.Item label="联系电话" span={3}>{itemDetail?.phone || "-"}</Descriptions.Item>
-           </Descriptions>
-        </Modal>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/yaxb/zjgcya/index.less b/src/views/fxzb/yaxb/zjgcya/index.less
deleted file mode 100644
index 6d1757c..0000000
--- a/src/views/fxzb/yaxb/zjgcya/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.upload-file{
-    margin-left: 92%;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/zqya/GcTreeSelector/index.less b/src/views/fxzb/yaxb/zqya/GcTreeSelector/index.less
deleted file mode 100644
index fad0fd4..0000000
--- a/src/views/fxzb/yaxb/zqya/GcTreeSelector/index.less
+++ /dev/null
@@ -1,39 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.GcTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-  .ant-tree-treenode{
-    width: 100%;
-
-    .ant-tree-node-content-wrapper{
-      // width: 100%;
-      // padding-right: 15px;
-      position: static;
-    }
-  }
-}
-.no-matter{
-  opacity: .5;
-}
-// .detail-modal{
-//   .ant-descriptions-item{
-//     border-bottom: 1px solid rgb(232, 232, 232) ;
-//   }
-// }
\ No newline at end of file
diff --git a/src/views/fxzb/yaxb/zqya/GcTreeSelector/index.tsx b/src/views/fxzb/yaxb/zqya/GcTreeSelector/index.tsx
deleted file mode 100644
index 5095c17..0000000
--- a/src/views/fxzb/yaxb/zqya/GcTreeSelector/index.tsx
+++ /dev/null
@@ -1,274 +0,0 @@
-import React, { useState, useEffect, } from 'react';
-import {Tree, Input, Checkbox, Spin, Modal,Descriptions} from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import './index.less';
-import {getYaxbAdcdTreeData} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setCode?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  setTag?:any 
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setCode, setTag, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [itemDetail, setItemDetail] = useState<any>({}) // 树中的每一项的详细信息
-
-  const [ open, setOpen] = useState(false)
- 
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await getYaxbAdcdTreeData(params);
-
-    const item: any = adcdTreedata[0]?.code
-    console.log("adcdTreedata",item);
-    if(item){
-      setCode(item)
-      setSelectedKeys([item])
-      setTag(item.tag)
-    }
-
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.sname;
-        // (
-        //   <span  style={{position:'relative'}}>
-        //     {item.sname}
-        //     <div  style={{color:'red',position:'absolute',left:'50px'}}>按钮</div>
-        //   </span>
-        // )
-        item.key = item.code;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue: any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.code;
-      // if(!adcdLevel){
-      //   const code = selectData.code.substring(0,15);
-      //   if(code.endsWith('000000000')){//县
-      //     adcdVal = selectData.code.substring(0,6);
-      //   }else if(code.endsWith('000000')){//镇
-      //     adcdVal = selectData.code.substring(0,9);
-      //   }else if(code.endsWith('000')){//村
-      //     adcdVal = selectData.code.substring(0,12);
-      //   }else{
-      //     adcdVal = selectData.code;
-      //   }
-      // }else{
-      //   adcdVal = selectData.code;
-      // }
-
-      let params = { code: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode(adcdVal)
-        setTag(selectData.tag)
-      }
-    } else {
-      let params = { code: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode("")
-        setTag("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.sname.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-
-  return (
-    <div style={{position:"relative"}} className='GcTreeSelectorStyle '>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              titleRender={(v:any)=>{
-                return (<>
-                    <div className={v.status ? "" : "no-matter"}>{v.title}</div>
-                </>)
-              }}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-            />
-          }
-        </div>
-
-
-        <Modal
-          title={itemDetail?.title}
-          open={open}
-          onCancel={() => setOpen(false)} footer={[null]}
-          className='detail-modal'
-        >
-          <Descriptions >
-            <Descriptions.Item label="工程名称" span={3}>{itemDetail?.title || "---"}</Descriptions.Item>
-            <Descriptions.Item label="业主单位" span={3}>{itemDetail?.orgName || "---"}</Descriptions.Item>
-            <Descriptions.Item label="工程开工日期" span={3}>{itemDetail?.tmStart || "---"}</Descriptions.Item>
-            <Descriptions.Item label="工程主要内容" span={3}>{itemDetail?.content || "---"}</Descriptions.Item>
-            <Descriptions.Item label="防汛联系人" span={3}>{itemDetail?.personnelNamesType1 || "---"}</Descriptions.Item>
-            <Descriptions.Item label="联系电话" span={3}>{itemDetail?.contactPhone || "---"}</Descriptions.Item>
-           </Descriptions>
-        </Modal>
-      </div>
-
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/yaxb/zqya/form.js b/src/views/fxzb/yaxb/zqya/form.js
deleted file mode 100644
index 54955c2..0000000
--- a/src/views/fxzb/yaxb/zqya/form.js
+++ /dev/null
@@ -1,14 +0,0 @@
-
-import "./index.less"
-const ModalForm = ({ mode, record, onEdit, onSave,onDeleteGet }) => {
-  return (
-    <>
-       <iframe
-        style={{ height: '70vh', width: '100%', border: 0,marginTop:20 }}
-        src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzPredictionScheme/file/download/${record.fileId}`)}`}
-       />
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/yaxb/zqya/index.js b/src/views/fxzb/yaxb/zqya/index.js
deleted file mode 100644
index 654fac8..0000000
--- a/src/views/fxzb/yaxb/zqya/index.js
+++ /dev/null
@@ -1,240 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Upload, Button,message,Image } from 'antd';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import GcTreeSelector from "./GcTreeSelector";
-
-const Page = () => {
-  const url = "http://local.gunshiiot.com:18083/gunshiApp/xfflood"
-  const url1 = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const allowedFileTypes = ['.pdf']; //文件上传格式
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [code, setCode] = useState()
-  const [tag, setTag] = useState()
-  const [fileList, setFileList] = useState([])
-  const [image, setImage] = useState()
-  const [visible, setVisible] = useState(false);
-  const [loading, setLoading] = useState(false)
-  const picType = ["png", "jpg", "jpeg", "gif"];
-  const bytesToKB = (bytes) => {
-    return (bytes / 1024).toFixed(2);
-  }
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '文件名', key: 'fileName', dataIndex: 'fileName', width: 200 },
-    { title: '上传时间', key: 'tmCreate', dataIndex: 'tmCreate', width: 200 },
-    { title: '类型', key: 'fileType', dataIndex: 'fileType', width: 80 },
-    {
-      title: '大小（KB）', key: 'fileLength', dataIndex: 'fileLength', width: 140,
-      render: (rec) => <span>{bytesToKB(rec)}</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text
-        review={row?.fileType === "pdf"}
-        picReview={picType.includes(row?.fileType) }
-        download={true}
-        del={true}
-        command={(cmd) => () => command(cmd)(row)}
-      />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.yaxb.page).find_noCode, {});
-    // 获取表格的dataSource
-  const dataSource = useMemo(() => {
-    if (tableProps.dataSource.length > 0) {
-      let dataArr = tableProps.dataSource.map((item, index) => {
-        let schemeId = item.id;
-        let time = item.tmCreate
-        return item.attachList.map(attach => ({...attach, schemeId,tmCreate:time}))
-      })
-      return dataArr.flat()
-    }
-    },[tableProps.dataSource])
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({adcd:code});
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'download') {
-      let downloadLink = document.createElement("a");
-        downloadLink.href = `${url}/bzPredictionScheme/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-    } else if (type === "review") {
-      refModal.current.showReView(params);
-    }
-    else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.fxzb.yaxb.delete + `/${params.schemeId}`);
-    } else if (type === "picReview") {
-      setVisible(true)
-      getFileInfo(params)
-      // refModal.current.showReView(params);
-    }
-  }
-
-  const getFileInfo = (params) => {
-   createCrudService(apiurl.fxzb.yaxb.getFile + `/${params.fileId}`)
-        .delGet()    
-     .then(res => {
-       if (res.code === 200) {
-        setImage(res.data)
-       }
-      }).catch(err => console.log(err))
-  }
-  /**
-   * @description 获取文件类型
-   */
-  const getFileTypeFromFileName = (fileName) => {
-    var lastDotIndex = fileName.lastIndexOf(".");
-    if (lastDotIndex !== -1) {
-      return fileName.substring(lastDotIndex + 1);
-    }
-    return "";
-  }
-  /**
-   * @description 上传之前的回调
-   */
-  const beforeUpload = (info) => {
-    // message.info("文件正在上传")
-    // if (info.type != "application/pdf") {
-    //   message.error("请上传pdf格式的文件")
-    //   return false
-    // }
-    return true
-  }
-  /**
-   * @description 上传文件后的回调
-   * @param {Array} info 
-   */
-  const handleUploadChange = (info) => { 
-    setLoading(true)
-    let fileLists;
-    // 防止上传状态一直是uploading
-    setFileList([info.file])
-    const { status } = info.file;
-    if (status === 'done') {
-      message.success("文件上传成功 ")
-      setLoading(false)
-      setFileList([info.file])
-      fileLists = info.fileList.map(file => { 
-        return {
-          fileId: file.response?.data?.fileId,
-          fileName: file.response?.data?.fileName,
-          tmCreate: file.response?.data?.uploadTime,
-          fileLength: file.response?.data?.fileLength,
-          filePath: file.response?.data?.filePath,
-          fileType: getFileTypeFromFileName(file.response?.data?.fileName)
-        }
-      })
-      let params = {
-        attachList: fileLists,
-        adcd: code,
-        relatedObjectId: code,
-        relatedObjectType:"bzPredictionScheme1"
-      }
-      createCrudService(apiurl.fxzb.yaxb.save).edit(params).then(res => {
-        if (res.code === 200) { 
-          search(params)
-        }
-      })
-    } else if (status === 'error') {
-      message.error(`文件上传失败`);
-    }
-  }
-  
-  useEffect(()=>{
-    if(isRender.current){
-      isRender.current = false
-      return
-    }
-
-  const params = {
-      search: {
-      adcd: code,
-      relatedObjectId: code,
-      relatedObjectType:"bzPredictionScheme1"
-      }
-    };
-    search(params)
-
-  },[code])
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-        <GcTreeSelector setCode={setCode} setTag={setTag} showCheckbox={false} hasAlertBox={false}/>
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Upload
-            name="file"
-            action="/gunshiApp/xfflood/bzPredictionScheme/file/upload/singleSimple"
-            onChange={handleUploadChange}
-            beforeUpload={beforeUpload}
-            className='upload-file'
-            fileList={fileList}
-          >
-              <Button size='Default' type='primary' onClick={() => {}}>上传</Button>
-            </Upload>
-            <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="inx"
-              {...tableProps}
-              dataSource={dataSource}
-              loading={loading}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-      {image && 
-        <Image
-        style={
-          {
-             display: 'none',
-          }
-        }
-        width={60}
-        src={url1 + image?.filePath}
-        preview={
-          {
-            visible,
-            onVisibleChange: (value) => {
-              setVisible(value);
-            },
-          }
-        }
-        alt='' />
-      }
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/yaxb/zqya/index.less b/src/views/fxzb/yaxb/zqya/index.less
deleted file mode 100644
index 6d1757c..0000000
--- a/src/views/fxzb/yaxb/zqya/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.upload-file{
-    margin-left: 92%;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/ybfagl/index.js b/src/views/fxzb/ybfagl/index.js
deleted file mode 100644
index f8f85ca..0000000
--- a/src/views/fxzb/ybfagl/index.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ModalForm from './information/index';
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
-import { httpget2 } from '../../../utils/request';
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = (role?.rule?.find(item => item.menuName == "查询"))?true:true;
-  const viewBtn = (role?.rule?.find(item => item.menuName == "详情"))?true:true;
-  const delBtn = (role?.rule?.find(item => item.menuName == "删除"))?true:true;
-
-  const [open, setOpen] = useState(false)
-  const [projectId, setProjectId] = useState('')
-  const refModal = useRef();
-
- 
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '预报方案名称', key: 'name', dataIndex: 'name', width: 140,align:"center", },
-    { title: '类型', key: 'type', dataIndex: 'type', width: 140,align:"center",render:(v)=>v=='1'?'自动':'手动' },
-    { title: '预报时间', key: 'forecastTm', dataIndex: 'forecastTm', width: 140,align:"center", },
-    { title: '开始时间', key: 'startTm', dataIndex: 'startTm', width: 140,align:"center", },
-    { title: '结束时间', key: 'endTm', dataIndex: 'endTm', width: 140,align:"center", },
-    { title: '操作人', key: 'userId', dataIndex: 'userId', width: 140,align:"center", },
-    { title: '方案制作时间', key: 'chtm', dataIndex: 'chtm', width: 140,align:"center", },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text del={delBtn} detail={viewBtn} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => async(params) => {
-    if (type === 'save') {
-      // refModal.current.showSave();
-    } else if (type === 'edit') {
-      // refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      // refModal.current.showView(params);
-      setOpen(true)
-      setProjectId(params.id)
-    } else if (type === 'del') {
-      const {code} = await httpget2(apiurl.fxdd_xyt.hsyb.ybfagl.del + `/${params.id}`)
-      if(code===200){
-        message.success('删除成功')
-        refresh(
-          {
-            search:{
-              'orderField':'chtm',
-              'isAsc':false
-            }
-          }
-        )
-      }else{
-        message.error('删除失败')
-        refresh(
-          {
-            search:{
-              'orderField':'chtm',
-              'isAsc':false
-            }
-          }
-        )
-      }
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxdd_xyt.hsyb.ybfagl.page).find_noCode);
-
-  useEffect(()=>{
-    search({
-      search:{
-        'orderField':'chtm',
-        'isAsc':false
-      }
-    })
-  },[])
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              search={search}
-              editBtn={editBtn}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-      </div>
-
-      <Modal width={1500} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={open} onCancel={()=>setOpen(false)} destroyOnClose={true}>
-        <ModalForm projectId={projectId} onCancel={()=>setOpen(false)}/>
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/ybfagl/index.less b/src/views/fxzb/ybfagl/index.less
deleted file mode 100644
index 53363c1..0000000
--- a/src/views/fxzb/ybfagl/index.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.fxdd_hsybjs_content_item2_toolbar{
-    padding: 0 20px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    width: 100%;
-    height: 40px;
-    display: flex;
-    align-items: center;
-    font-size: 16px;
-    font-weight: 500;
-
-    img{
-        margin-right: 10px;
-    }
-    .fxdd_hsybjs_content_item2_toolbar_tab{
-        flex: 1;
-        margin-right: 30px;
-        text-align: right;
-    }
-}
-.fxdd_hsybjs_content_item2_toolbar2{
-    padding: 0 20px;
-    margin: 0 20px;
-    background: #F7F7F7;
-    border-radius: 5px;
-    display: flex;
-
-    .fxdd_hsybjs_content_item2_toolbar_content{
-        width: 24%;
-        height: 40px;
-        line-height: 40px;
-        font-size: 16px;
-        font-weight: 500;
-
-        span{
-            margin-left: 10px;
-            font-weight: 600;
-            color: #333;
-        }
-    }
-}
-.fxdd_hsybjs_content_item2_content{
-    width: 100%;
-    flex: 1;
-    // background: red;
-}
\ No newline at end of file
diff --git a/src/views/fxzb/ybfagl/information/drpOption.js b/src/views/fxzb/ybfagl/information/drpOption.js
deleted file mode 100644
index 1377aac..0000000
--- a/src/views/fxzb/ybfagl/information/drpOption.js
+++ /dev/null
@@ -1,700 +0,0 @@
-import * as echarts from 'echarts';
-import moment from 'moment';
-
-export default function drpOption({data,tms}) {
-  const list1 = []
-  data.map(i=>{
-    if(i.ycSwHValue!==null){list1.push(i.ycSwHValue)}
-    if(i.realSwHValue!==null){list1.push(i.realSwHValue)}
-    if(i.flLowLimLev!==null){list1.push(i.flLowLimLev)}
-  })
-  const maxSw = list1.length===0?200:Math.max(...list1)
-  const minSw = list1.length===0?0:Math.min(...list1)
-
-
-  const list2 = []
-  data.map(i=>{
-    if(i.ycRkQValue!==null){list2.push(i.ycRkQValue)}
-    if(i.realRkQValue!==null){list2.push(i.realRkQValue)}
-    if(i.ycCkQValue!==null){list2.push(i.ycCkQValue)}
-    if(i.realCkQValue!==null){list2.push(i.realCkQValue)}
-  })
-
-  const maxLl = list2.length===0?200:Math.max(...list2)
-  const minLl = list2.length===0?0:Math.min(...list2)
-
-  const list3 = []
-  data.map((i=>{
-    if(i.drp!==null){list3.push(i.drp)}
-  }))
-  const maxYl = list3.length===0?200:Math.max(...list3)
-  const minYl = list3.length===0?0:Math.min(...list3)
-
-  const getVal = (val)=>{
-    if(val===null||val===undefined){
-      return '-'
-    }else{
-      return Number(val).toFixed(2)
-    }
-  }
-
-  return {
-
-    tooltip: {
-      trigger: 'axis',
-      formatter: function (params,b) {
-        // params 是一个数组，数组中包含每个系列的数据信息
-        let result = '时间：'+params[0].axisValueLabel+'<br/>';
-        params.forEach(function (item) {
-            // item 是每一个系列的数据
-            const seriesName = item.seriesName; // 系列名称
-            const value = item.value; // 数据值
-            const marker = item.marker; // 标志图形
-            if(value!==undefined && seriesName!=='预报时间'){
-              result += `${marker}${seriesName}: ${value}<br/>`;
-            }
-        });
-        return result;
-      }
-    },
-    grid: [
-      {
-        top: '15%',
-        left: '5%',
-        right: '5%',
-        width: '90%',
-        height: '25%'
-      },
-      {
-        top: '15%',
-        left: '5%',
-        right: '5%',
-        width: '90%',
-        height: '25%'
-      },
-      {
-        bottom: '5%',
-        left: '5%',
-        right: '5%',
-        width: '90%',
-        height: '45%'
-      },
-    ],
-    legend: {
-      top:'3%',
-      // 显示图例
-      show: true,
-      // 图例的位置
-      // data: ["降雨量","预测雨量","实测水位","预报水位","汛限水位","实测入库流量","预报入库流量","实测出库流量","预报出库流量"],
-      data: [
-        {
-          name: '降雨量',
-        },
-        {
-          name: '预测雨量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ycjyicon.svg`
-        },
-        {
-          name: '实测水位',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/scswicon.svg`
-        },
-        {
-          name: '预报水位',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ybswicon.svg`
-        },
-        {
-          name: '汛限水位',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/xxswicon2.svg`
-        },
-        {
-          name: '实测入库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/scrkicon.svg`
-        },
-        {
-          name: '预报入库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ybrkllicon.svg`
-        },
-        {
-          name: '实测出库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/scckllicon.svg`
-
-        },
-        {
-          name: '预报出库流量',
-          icon: 'image://'+`${process.env.PUBLIC_URL}/assets/xyt/fxdd/ybckllicon.svg`
-        },
-      ],
-    },
-    xAxis: [
-      //降雨量的图
-      {
-        gridIndex: 0,
-        type: 'category',
-        offset:100,
-        // inverse: true,
-        data: data.map(o => o.tm),
-
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          show: false
-        },
-        axisLine: {
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1
-          }
-          
-        },
-        axisTick: {
-          show: false,
-          alignWithLabel: true
-        }
-      },
-      //预测雨量的图
-      {
-        gridIndex: 1,
-        type: 'category',
-        // inverse: true,
-        data: data.map(o => o.tm),
-
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          show: false
-        },
-        axisLine: {
-          show: false,
-          // lineStyle: {
-          //   color: 'rgb(170, 170, 170)',
-          //   width: 1
-          // }
-          
-        },
-        axisTick: {
-          show: false,
-          alignWithLabel: true
-        }
-      },
-      //流量水位的图
-      {
-        gridIndex: 2,
-        type: 'category',
-        data: data.map(o => o.tm),
-        // inverse: true,
-        inverse: false,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          padding: [0, 0, 100, 0],
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.slice(5,16)
-        },
-        axisLine: {
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      },
-    ],
-    yAxis: [
-      {
-        gridIndex: 0,
-        inverse: true,
-        type: 'value',
-        position: 'left',
-        name: '降雨量(mm)',
-        nameTextStyle: {
-          padding: [0, 0, 0, -5],
-          color:'#333333',
-          fontSize: 12
-        },
-        nameLocation: 'start',
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170,0.5)',
-            width: 0.25,
-            // type: 'line'
-          }
-        },
-        max: Math.ceil((6*maxYl-minYl)/5),
-        min: minYl===0?0:Math.floor((6*minYl-maxYl)/5)
-      },
-      {
-        gridIndex: 1,
-        inverse: true,
-        type: 'value',
-        nameLocation: 'start',
-        axisLabel: {
-          // color: '#333',
-          fontSize: 0
-        },
-        axisLine: {
-          lineStyle: {
-            // color: 'rgb(170, 170, 170)',
-            width: 0,
-          }
-        },
-        axisTick: {
-          show: false
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            // color: 'rgb(170, 170, 170,0.5)',
-            width: 0,
-            // type: 'line'
-          }
-        },
-        max: Math.ceil((6*maxYl-minYl)/5),
-        min: minYl===0?0:Math.floor((6*minYl-maxYl)/5)
-      },
-      {
-        gridIndex: 2,
-        type: 'value',
-        position: 'left',
-        name: "流量(m³/s)",
-        nameTextStyle: {
-          padding: [0, 0, 0, -20],
-          color:'#333333',
-          fontSize: 12
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170,0.5)',
-            width: 0.25,
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        max: Math.ceil((6*maxLl-minLl)/5),
-        min: minLl===0?0:Math.floor((6*minLl-maxLl)/5)
-      },
-      {
-        gridIndex: 2,
-        type: 'value',
-        position: 'right',
-        name: "水位(m)",
-        nameTextStyle: {
-          padding: [0, 0, 0, 55],
-          color:'#333333',
-          fontSize: 12
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: 'rgb(170, 170, 170)',
-            width: 1,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-        max: Math.ceil((6*maxSw-minSw)/5),
-        min: minSw===0?0:Math.floor((6*minSw-maxSw)/5)
-      },
-    ],
-    series: [
-      {
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        name: '降雨量',
-        type: 'bar',
-        barWidth: '50%',
-        data: data.map((v) => {
-          //"0"真实数据，“1”预报数据
-          if (v.ispreDrp==='0') {
-            return getVal(v.drp)
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#007AFD',
-        },
-        label: {
-          show: false
-        },
-      },
-      {
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        name: '预报时间',
-        type: 'bar',
-        barWidth: '2px',
-        data: data.map((v) => {
-          if (v.tm===tms.forecastTime) {
-            return maxYl*1.2
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#e35650',
-        },
-        label: {
-          show: true,
-          position: 'top',
-          formatter: '预报时间'
-        },
-      },
-      {
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        name: '占位',
-        type: 'bar',
-        barWidth: '50%',
-        barGap:'0%',
-        data: data.map((v) => null),
-        itemStyle: {
-          color: '#dbe6fb',
-          barBorderWidth:'2',
-          barBorderColor:'#007AFD',
-          borderType: "dotted"//这一行属性就是虚线
-        },
-        label: {
-          show: false
-        }
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '预测雨量',
-        type: 'bar',
-        barWidth: '50%',
-        data: data.map((v) => {
-          //"0"真实数据，“1”预报数据
-          if (v.ispreDrp==='1') {
-            return getVal(v.drp)
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#dbe6fb',
-          barBorderWidth:'2',
-          barBorderColor:'#007AFD',
-          borderType: "dotted"//这一行属性就是虚线
-        },
-        label: {
-          show: false
-        },
-      },
-      {
-        xAxisIndex: 1,
-        yAxisIndex: 1,
-        name: '占位',
-        type: 'bar',
-        barWidth: '50%',
-        barGap:'0%',
-        data: data.map((v) => null),
-        itemStyle: {
-          color: '#dbe6fb',
-          barBorderWidth:'2',
-          barBorderColor:'#007AFD',
-          borderType: "dotted"//这一行属性就是虚线
-        },
-        label: {
-          show: false
-        }
-      },
-      {
-        //渐变背景
-        xAxisIndex: 0,
-        yAxisIndex: 0,
-        type: 'line',
-        markArea: {
-          data: [
-              [{
-                  xAxis: tms.startTime||''
-              }, {
-                  xAxis: tms.forecastTime||''
-              }]
-          ],
-          itemStyle: {
-            normal: {
-                color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
-                    offset: 0, color: 'rgba(255, 0, 0, 0.1)' // 0% 处的颜色
-                }, {
-                    offset: 1, color: 'rgba(255, 255, 0, 0)' // 100% 处的颜色
-                }], false)
-            }
-          }
-        }
-      },
-
-
-
-
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '实测入库流量',
-        type: 'line',
-        color: "#82b87e",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.realRkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '预报入库流量',
-        type: 'line',
-        color: "#82b87e",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.ycRkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markPoint: {
-          data: [
-            { type: "max", name: "最大值" },
-            // { type: "min", name: "最小值" },
-          ],
-          symbol:'circle',
-          symbolSize:10,
-          label:{
-            show:false,
-            position: [-15, -20]
-          }
-        },
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '实测出库流量',
-        type: 'line',
-        color: "#e5625c",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.realCkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 2,
-        name: '预报出库流量',
-        type: 'line',
-        color: "#e5625c",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.ycCkQValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markPoint: {
-          data: [
-            { type: "max", name: "最大值" },
-            // { type: "min", name: "最小值" },
-          ],
-          symbol:'circle',
-          symbolSize:10,
-          label:{
-            show:false,
-            position: [-15, -20]
-          }
-        },
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '实测水位',
-        type: 'line',
-        color: "#4b85f0",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.realSwHValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报水位',
-        type: 'line',
-        color: "#4b85f0",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.ycSwHValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markPoint: {
-          data: [
-            { type: "max", name: "最大值" },
-            // { type: "min", name: "最小值" },
-          ],
-          symbol:'circle',
-          symbolSize:10,
-          label:{
-            show:false,
-            position: [-15, -20]
-          }
-        },
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报-实测',
-        type: 'line',
-        color: "#4b85f0",
-        lineStyle: {
-          // type: "dashed"
-        },
-        data:  data.map(o => getVal(o.swHDValue)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '汛限水位',
-        type: 'line',
-        color: "#f2ca6b",
-        lineStyle: {
-          type: "dashed"
-        },
-        data:  data.map(o => getVal(o.flLowLimLev)),
-        symbol: 'none', // 设置标记点为'none'，即去掉圆点
-        smooth: 0.5,
-        markArea: {
-          data: [
-              [{
-                xAxis: tms.startTime||''
-              }, {
-                  xAxis: tms.forecastTime||''
-              }]
-          ],
-          itemStyle: {
-            normal: {
-                color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
-                    offset: 0, color: 'rgba(255, 0, 0, 0.1)' // 0% 处的颜色
-                }, {
-                    offset: 1, color: 'rgba(255, 255, 0, 0)' // 100% 处的颜色
-                }], false)
-            }
-          }
-        }  
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报时间',
-        type: 'bar',
-        barWidth: '2px',
-        z:2,
-        data: data.map((v) => {
-          if (v.tm===tms.forecastTime) {
-            return maxSw*1.2
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#e35650',
-        }
-      },
-      {
-        xAxisIndex: 2,
-        yAxisIndex: 3,
-        name: '预报时间',
-        type: 'bar',
-        barWidth: '2px',
-        barGap:'-100%',
-        z:3,
-        data: data.map((v) => {
-          if (v.tm===tms.projectTm) {
-            return 0//maxSw*1.2
-          }else{
-            return null
-          }
-        }),
-        itemStyle: {
-          color: '#a1fcfd',
-          backgroundColor: {
-              image: require("../../../../assets/icons/arrow.png")
-          }
-        },
-        label: {
-          offset:[0,10],
-          show: true,
-          position: 'top',
-          formatter: function(value, index) {
-            return `{img0|}`;
-        },
-        rich: {
-            value: {
-                fontsize: 20
-            },
-            img0: {
-                height: 100,
-                width: 10,
-                backgroundColor: {
-                    image: `${process.env.PUBLIC_URL}/assets/xyt/fxdd/dqsj2.svg`
-                }
-            }, 
-          }
-        },
-      },
-    ]
-  };
-}
diff --git a/src/views/fxzb/ybfagl/information/index.js b/src/views/fxzb/ybfagl/information/index.js
deleted file mode 100644
index 96c387a..0000000
--- a/src/views/fxzb/ybfagl/information/index.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { Form, Input, Button, Table, Radio } from 'antd';
-import {CloseOutlined} from '@ant-design/icons';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption';
-import moment from 'moment';
-import './index.less'
-import ModalForm1 from './table1'
-import { httpget2, httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-
-const Page = ({projectId,onCancel}) => {
-    const [data,setData] = useState({data:[],tms:{}})
-    const [tab,setTab] = useState('1')
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-        { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-        { title: '降雨量(mm)', key: 'drp', dataIndex: 'drp', align:"center", width:100,render:(v,row)=>{
-            const val = v===null?'-':Number(v).toFixed(2)
-            return <div style={{display:'flex',alignItems:'center',justifyContent:'center'}}>{val}{row.ispreDrp==='1'?<div style={{marginLeft:'5px',width:'20px',height:'20px',borderRadius:"10px",border:'1px solid rgb(245, 154, 35)',color:'rgb(245, 154, 35)',display:'flex',alignItems:'center',justifyContent:'center',fontSize:'12px'}}>预</div>:null}</div>
-        }},
-        { title: '实测水位(m)', key: 'realSwHValue', dataIndex: 'realSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '预报水位(m)', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '入库流量(m³/s)', key: 'realRkQValue', dataIndex: 'realRkQValue', width:120, align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '预报入库流量(m³/s)', key: 'ycRkQValue', dataIndex: 'ycRkQValue', width:160, align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '实际出库流量(m³/s)', key: 'realCkQValue', dataIndex: 'realCkQValue', width:160, align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-        { title: '预报出库流量(m³/s)', key: 'ycCkQValue', dataIndex: 'ycCkQValue', width:160, align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-      ];
-
-
-    useEffect(()=>{
-        (async()=>{
-            const {code , data} = await httpget2(apiurl.fxdd_xyt.hsyb.ybfagl.getData+'?projectId='+projectId)
-            if(code!==200){
-                return
-            }
-            setData({data:[...data.voList],tms:{
-                forecastTime: data.forecastTm,
-                projectTm: data.projectTm,
-                startTime: data.startTm,
-                endTime: data.endTm,
-                forecastPeriod: data.forecastPeriod,
-                forecastWarm: data.forecastWarm,
-                type:data.type,
-                ycMaxSwH:data.ycMaxSwH,
-                ycMaxRkQ:data.ycMaxRkQ,
-                ycMaxCkQ:data.ycMaxCkQ,
-                ycSumFlood:data.ycSumFlood, 
-            }})
-        })()
-    },[])
-    return (
-        <div className='normalModalStyle homeModal2' style={{paddingBottom:'20px'}}>
-            <div className="normalModalStyle_title">
-                <div className="normalModalStyle_title_icon"></div>
-                预报成果详情
-                <div className="normalModalStyle_title_cancel">
-                    <CloseOutlined onClick={onCancel} style={{color:"#333"}}/>
-                </div>
-            </div>
-            <div className='fxdd_hsybjs_content_item2_toolbar'>
-                预见期(小时)：
-                <span style={{marginRight:'55px'}}>{data?.tms?.forecastPeriod}</span>
-                预热期(天)：
-                <span style={{marginRight:'55px'}}>{data?.tms?.forecastWarm}</span>
-                预报时间：
-                <span style={{marginRight:'55px'}}>{data?.tms?.forecastTime}</span>
-                开始时间：
-                <span style={{marginRight:'55px'}}>{data?.tms?.startTime}</span>
-                结束时间：
-                <span style={{marginRight:'55px'}}>{data?.tms?.endTime}</span>
-                <div className='fxdd_hsybjs_content_item2_toolbar_tab'>
-                <Radio.Group onChange={(e)=>{setTab(e.target.value)}} defaultValue="1">
-                    <Radio.Button value="1">数据图</Radio.Button>
-                    <Radio.Button value="2">数据表</Radio.Button>
-                </Radio.Group>
-                </div>
-            </div>
-            <div className='fxdd_hsybjs_content_item2_toolbar2'>
-                <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报最高调洪水位(m):<span>{data?.tms?.ycMaxSwH?.toFixed(2)}</span></div>
-                <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报最大入库流量(m³/s):<span>{data?.tms?.ycMaxRkQ?.toFixed(2)}</span></div>
-                <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报最大下泄流量(m³/s):<span>{data?.tms?.ycMaxCkQ?.toFixed(2)}</span></div>
-                <div className='fxdd_hsybjs_content_item2_toolbar_content'>预报洪水总量(万m³):<span>{data?.tms?.ycSumFlood?.toFixed(2)}</span></div>
-            </div>
-            <div className='fxdd_hsybjs_content_item2_content'>
-                {
-                    tab==='1'?
-                    <ReactEcharts option={drpOption(data)} style={{width: "1500px", height: '600px'}}/>
-                    :null //<div style={{textAlign: "center", margin: "10%"}}><img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/></div>
-                }
-                {
-                    tab==='2'?
-                    <div className="colorTable" style={{padding:"10px 30px",height:'600px'}}>
-                        <Table rowKey="id"
-                            sticky
-                            columns={columns}
-                            pagination={false}
-                            dataSource={data.data}
-                            scroll={{ y: "540px"}}
-                        />
-                    </div>:null
-                }
-            </div>
-        </div>
-    );
-}
-
-export default Page;
\ No newline at end of file
diff --git a/src/views/fxzb/ybfagl/information/index.less b/src/views/fxzb/ybfagl/information/index.less
deleted file mode 100644
index c59d2a8..0000000
--- a/src/views/fxzb/ybfagl/information/index.less
+++ /dev/null
@@ -1,103 +0,0 @@
-.fxdd_hsybjs_content_item2_toolbar{
-    padding: 0 20px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    width: 100%;
-    height: 40px;
-    display: flex;
-    align-items: center;
-    font-size: 16px;
-    font-weight: 500;
-
-    img{
-        margin-right: 10px;
-    }
-    .fxdd_hsybjs_content_item2_toolbar_tab{
-        flex: 1;
-        margin-right: 30px;
-        text-align: right;
-    }
-}
-.fxdd_hsybjs_content_item2_toolbar2{
-    padding: 0 20px;
-    margin: 0 20px;
-    background: #F7F7F7;
-    border-radius: 5px;
-    display: flex;
-
-    .fxdd_hsybjs_content_item2_toolbar_content{
-        width: 24%;
-        height: 40px;
-        line-height: 40px;
-        font-size: 16px;
-        font-weight: 500;
-
-        span{
-            margin-left: 10px;
-            font-weight: 600;
-            color: #333;
-        }
-    }
-}
-.fxdd_hsybjs_content_item2_content{
-    width: 100%;
-    flex: 1;
-    // background: red;
-
-
-    .fxdd_hsybjs_content_item2_content_flow{
-        margin: 10px 20px;
-        margin-top: 40px;
-        height: 150px;
-        padding: 0 50px;
-        background: rgba(245, 248, 255, 1); 
-        display: flex;
-        align-items: center;
-
-        .fxdd_hsybjs_content_item2_content_flow_item{
-            // width: 24%;
-            height: 100px;
-
-
-            .fxdd_hsybjs_content_item2_content_flow_item_item1{
-                width: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: flex-start;
-
-                .fxdd_hsybjs_content_item2_content_flow_item_item1_icon{
-                    margin-right: 10px;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    width: 23px;
-                    height: 23px;
-                    border-radius: 23px;
-                    border: 1px solid #8c8c8c;
-                    .fxdd_hsybjs_content_item2_content_flow_item_item1_icon2{
-                        width: 18px;
-                        height: 18px;
-                        border-radius: 20px;
-                        background: rgb(128, 174, 252);
-                        font-size: 14px;
-                        color: #ffffff;
-                        font-weight: 500;
-                        text-align: center;
-                        line-height: 18px;
-                    }
-                }
-                .fxdd_hsybjs_content_item2_content_flow_item_item1_icon3{
-                    flex: 1;
-                    display: flex;
-                    align-items: center;
-                    overflow: hidden;
-                }
-            }
-
-            .fxdd_hsybjs_content_item2_content_flow_item_item2{
-                padding: 10px 0;
-
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/ybfagl/information/table1.js b/src/views/fxzb/ybfagl/information/table1.js
deleted file mode 100644
index aee836f..0000000
--- a/src/views/fxzb/ybfagl/information/table1.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useEffect, useState, useRef, useMemo } from 'react';
-import { Form, Input, Button, Table, Radio } from 'antd';
-import { EyeOutlined } from '@ant-design/icons';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption';
-import moment from 'moment';
-import './index.less'
-
-
-const Page = ({record}) => {
-    const columns = useMemo(()=>{
-        if(record.type==='产流计算'){
-            return [
-                { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-                { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-                { title: '面雨量P(mm)', key: 'drp', dataIndex: 'drp', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '土壤含水量Pa(mm)', key: 'pa', dataIndex: 'pa', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-                { title: '径流深R(mm)', key: 'r', dataIndex: 'r', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-              ];
-        }else if(record.type==='汇流计算'){
-            return [
-                { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-                { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-                { title: '预测入库流量', key: 'ycRkQValue', dataIndex: 'ycRkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-              ];
-        }else{
-            return [
-                { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
-                { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-                { title: '预测出库流量', key: 'ycCkQValue', dataIndex: 'ycCkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
-              ];
-        }
-    },[record])
-    
-
-    return (
-        <>
-            <div className="colorTable" style={{padding:"0px 0px"}}>
-                <Table rowKey="id"
-                    sticky
-                    columns={columns}
-                    pagination={false}
-                    dataSource={record.list}
-                    scroll={{ y: "650px"}}
-                />
-            </div>
-        </>
-    );
-}
-
-export default Page;
\ No newline at end of file
diff --git a/src/views/fxzb/ybfagl/toolbar.js b/src/views/fxzb/ybfagl/toolbar.js
deleted file mode 100644
index 2fff7a2..0000000
--- a/src/views/fxzb/ybfagl/toolbar.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import moment from 'moment';
-import NormalSelect from '../../../components/Form/NormalSelect'
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ search, editBtn }) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    const params = {}
-    if(values.name){params.name = values.name}
-    if(values.type){params.type = values.type}
-    if(values.tms?.length===2){
-      params.startTm = moment(values.tms[0]).format('YYYY-MM-DD 00:00:00')
-      params.endTm = moment(values.tms[1]).format('YYYY-MM-DD 23:59:59')
-    }
-    search({search:{
-      ...params,
-      'orderField':'chtm',
-      'isAsc':false
-    }})
-  }
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} onFinish={onFinish} className='toolbarBox' layout="inline">
-          <Form.Item label="预报方案名称：" name="name">
-            <Input allowClear placeholder='请输入名称' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="预报时间" name="tms">
-            <RangePicker />
-          </Form.Item>
-          <Form.Item label="类型" name="type">
-            <NormalSelect options={[
-              {
-                "label": "自动",
-                "value": "1"
-              },
-              {
-                "label": "手动",
-                "value": "2"
-              }
-            ]} 
-            allowClear={true}
-            style={{width:'100px'}}
-            />
-          </Form.Item>
-          {
-            editBtn?
-            <>
-              <Form.Item>
-                <Button type="primary" htmlType="submit">查询</Button>
-              </Form.Item>
-              <Form.Item>
-                <Button onClick={()=>form.resetFields()}>重置</Button>
-              </Form.Item>
-            </>:null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/zbb/form.js b/src/views/fxzb/zbb/form.js
deleted file mode 100644
index f56b2b1..0000000
--- a/src/views/fxzb/zbb/form.js
+++ /dev/null
@@ -1,228 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Row, Col, Divider, message,TreeSelect } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import { createCrudService } from '../../../components/crud/_';
-import { getDictService,getDutyTypeService } from '../../../service/SelectValue'
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect'
-import { disable } from 'ol/rotationconstraint';
-
-const ModalForm = ({ mode, record,onEdit,onSave,close,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const treeData = [
-    {
-      value: 'parent 1',
-      title: 'parent 1',
-      disable:true,
-      children: [
-        {
-          value: 'parent 1-0',
-          title: 'parent 1-0',
-          disable:true,
-          children: [
-            {
-              value: 'leaf1',
-              title: 'leaf1',
-              disable:false,
-              children:[]
-            },
-            {
-              value: 'leaf2',
-              title: 'leaf2',
-              disable:false,
-              children:[]
-            },
-          ],
-        },
-        {
-          value: 'parent 1-1',
-          title: 'parent 1-1',
-          children: [
-            {
-              value: 'leaf3',
-              title: (
-                <b
-                  style={{
-                    color: '#08c',
-                  }}
-                >
-                  leaf3
-                </b>
-              ),
-              children:[]
-            },
-          ],
-        },
-      ],
-    },
-  ];
-  console.log(record);
-  const [value, setValue] = useState({});
-  const [isHoliday, setIsHoliday] = useState(0)
-  /**
-   * @description 表单重置
-   */
-  const onReset = () => {
-    form.resetFields();
-  };
-  const onFinish = (values) => {
-    let params = {
-      isHoliday,
-      rotaDate: record.time,
-      userDtoList:Object.keys(values).map(item => ({
-        rotaType: item == "1" ? 1 :
-          item == "2" ? 2 :
-            item == "3" ? 3 : 4,
-        userId : values[item]
-      }))
-    }
-    if (mode == "save") {
-      onSave(apiurl.fxzb.zbb.edit,params)
-    }
-    if (mode == "edit") {
-      onEdit(apiurl.fxzb.zbb.edit,params)
-    }
-  }
-
-  /**
-   * @description 设置放假日
-   */
-  
-  const handleHoliday = () => {
-    setIsHoliday(1)
-    form.submit()
-  }
-  useEffect(() => {
-    if (mode == "edit") {
-      let initialValues = {
-        "1": record.shiftLeader.userId,
-        "2": record.dutyLeader.userId,
-        "3": record.dayShift.userId,
-        "4": record.nightShift.userId,
-      }
-      console.log(initialValues);
-      form.setFieldsValue(initialValues);
-    }
-  }, [record])
-  
-  return (
-    <Form form={form} {...formItemLayout} onFinish={onFinish} >
-      <Row>
-        <Col span={24}>
-            <Form.Item
-              label="带班领导"
-              name="1"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-                   treeData={record.tree}
-                   treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      <Row>
-        <Col span={24}>
-            <Form.Item
-              label="值班领导"
-              name="2"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   value="leaf3"
-                   treeDefaultExpandAll
-              treeData={record.tree}
-              treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      <Row>
-        <Col span={24}>
-            <Form.Item
-              label="白班"
-              name="3"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-              treeData={record.tree}
-              treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      <Row>
-        <Col span={24}>
-            <Form.Item
-              label="晚班"
-              name="4"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-              treeData={record.tree}
-              treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item wrapperCol={{ span: 15, offset: 9 }}>
-              <Button
-                type='primary'
-                onClick={handleHoliday}
-                style={{ marginRight: 10 }}>
-              设为放假日
-            </Button>
-            <Button onClick={onReset} style={{marginRight:10}}>
-              重置
-            </Button>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-    </Form>
-  );
-}
-
-export default ModalForm;
-
diff --git a/src/views/fxzb/zbb/index.js b/src/views/fxzb/zbb/index.js
deleted file mode 100644
index 33c6379..0000000
--- a/src/views/fxzb/zbb/index.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import React, { Fragment, useRef, useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Calendar, Badge, Button } from 'antd';
-import {FormOutlined} from "@ant-design/icons"
-import HeaderRender from './toolbar';
-import ModalForm from './form';
-import moment from 'moment';
-import './index.less';
-import { EditOutlined } from '@ant-design/icons';
-import apiurl from '../../../service/apiurl';
-import { createCrudService } from '../../../components/crud/_';
-
-const Page = () => {
-  const refModal = useRef();
-  const [tm,setTm] = useState(moment())
-
-  const [data, setData] = useState({})
-  const [personTreeData, setPersonTreeData] = useState([])
-  const [holiday, setHoliday] = useState(0) //放假日  1放假 0工作
-
-  const onChange = (newTm) => {
-    console.log("newTm",newTm);
-    if (tm.year() !== newTm.year() || tm.month() !== newTm.month()) {
-      setTm(newTm)
-    }
-  }
-
-  const dateCellRender = (value) => {
-    const record = {}
-    const sig = value.format('YYYY-MM-DD');
-    if (data.hasOwnProperty(sig)) {
-      if (data[sig].length > 1) {
-        data[sig].forEach(item => {
-          record.shiftLeader = {
-            name: item.rotaType == 1 ? item.userName : record.shiftLeader?.name,
-            userId: item.rotaType == 1 ? item.userId : record.shiftLeader?.userId,
-            isHoliday:item.rotaType == 1 ? item.isHoliday : record.shiftLeader?.isHoliday
-          }
-          record.dutyLeader = {
-            name: item.rotaType == 2 ? item.userName : record.dutyLeader?.name,
-            userId: item.rotaType == 2 ? item.userId : record.dutyLeader?.userId,
-            isHoliday:item.rotaType == 2 ? item.isHoliday : record.dutyLeader?.isHoliday
-          }
-          record.dayShift = {
-            name: item.rotaType == 3 ? item.userName : record.dayShift?.name, //人员名
-            userId: item.rotaType == 3 ? item.userId : record.dayShift?.userId,  //用户
-            isHoliday:item.rotaType == 3 ? item.isHoliday : record.dayShift?.isHoliday //放假日
-          }
-          record.nightShift = {
-            name: item.rotaType == 4 ? item.userName : record.nightShift?.name,
-            userId: item.rotaType == 4 ? item.userId : record.nightShift?.userId,
-            isHoliday:item.rotaType == 4 ? item.isHoliday : record.nightShift?.isHoliday
-          }
-        })
-      } else if(data[sig][0].isHoliday == 1) {
-        return (
-          <div style={{ position: 'relative', width: '100%' }}>
-            <span style={{
-              display:"inline-block",
-              padding: "0px 10px",
-              color: "#f56c6c",
-              border:"1px solid #f56c6c",
-            }}>放假</span>
-            <Button
-              style={{ position: 'absolute', top: 0, right: 0 }}
-              size="small"
-              icon={<EditOutlined />}
-              onClick={(e) => { e.preventDefault(); refModal.current.showSave({ ...record, time: sig,tree:personTreeData }); }} />
-          </div>
-        )
-      }
-    }
-    if (Object.values(record).some(item => item.userId  && item.name )) {
-      return (
-        <div style={{ position: 'relative', width: '100%' }}>
-          {
-            record.shiftLeader?.name && <div><Badge status="error" text={record.shiftLeader?.name} /></div>
-          }
-          {
-           record.dutyLeader?.name && <div><Badge status="processing" text={record.dutyLeader?.name} /></div>
-          }
-          {
-           record.dayShift?.name && <div><Badge status="success" text={record.dayShift?.name} /></div>
-          }
-          {
-           record.nightShift?.name && <div><Badge status="warning" text={record.nightShift?.name} /></div>
-          }
-          <Button
-            style={{ position: 'absolute', top: 0, right: 0 }}
-            size="small" icon={<EditOutlined />}
-            onClick={(e) => {
-              e.preventDefault();
-              refModal.current.showEdit({ ...record, time: sig, tree: personTreeData });
-            }} />
-        </div>
-      );
-    } else {
-      if (tm.month() === value.month()) {
-        return (
-          <>
-              <Button style={{ float: 'right' }} size="small" onClick={(e) => { e.preventDefault(); refModal.current.showSave({ ...record, time: sig,tree:personTreeData }); }}>+</Button>
-          </>
-        )
-      }
-    }
-  }
-
-  /**
-   * @description 获取组织人员树
-   */
-  const personTree = () => {
-    createCrudService(apiurl.fxzb.zbb.ryTree).delGet().then(res => {
-      if (res.code == 200) {
-        let dataTree = res.data
-        setPersonTreeData(handelTreeData(dataTree))
-      }
-    })
-  }
-
-  /**
-   * @description 处理树节点
-   *
-   */
-  const handelTreeData = (treeData) => {
-    return treeData.map(item => {
-      return {
-        title : item.name,
-        value : item.userId || item.orgCode,
-        disabled: item.userId ? false : true,
-        children: item.children && item.children.length > 0? handelTreeData(item.children) : []
-      }
-    })
-  }
-  useEffect(()=>{
-    getData()
-  },[tm])
-
-  useEffect(() => {
-    personTree()
-  }, [])
-
-  const getData = async()=>{
-    const stm = tm.format('YYYY-MM')
-
-    // const etm = tm.endOf('months').format('YYYY-MM-DD')
-    // console.log(stm,etm);
-    createCrudService(apiurl.fxzb.zbb.page).delGet({yearMonth:stm}).then(res => {
-      if (res.code === 200) {
-        setData(res.data)
-      }
-      
-    })
-  }
-
-  return (
-    <>
-    <div className='content-root zbap'>
-    <Fragment>
-      <div className='CalendarBox'>
-        <Calendar
-          mode="month"
-          onChange={onChange}
-          headerRender={({ value, onChange }) => <HeaderRender  value={value} onChange={onChange} tm={tm}/>}//doUpload={this.canOp ? this.doUpload : null}
-          dateCellRender={dateCellRender}
-        />
-      </div>
-      <BasicCrudModal
-        width={600}
-        ref={refModal}
-        title="值班安排"
-        component={ModalForm}
-        onCrudSuccess={()=>{getData()}}
-      />
-    </Fragment>
-    </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/zbb/index.less b/src/views/fxzb/zbb/index.less
deleted file mode 100644
index e567901..0000000
--- a/src/views/fxzb/zbb/index.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.zbap{
-    .CalendarBox{
-        padding: 1.5em;
-        background-color: white;
-
-        .pagetoolbar{
-            width: 100%;
-            display: inline-block;
-            .ant-form{
-                width: 100%;
-                display: inline-block;
-                .ant-form-item{
-                    display: inline-block;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/zbb/toolbar.js b/src/views/fxzb/zbb/toolbar.js
deleted file mode 100644
index 856c1e3..0000000
--- a/src/views/fxzb/zbb/toolbar.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Select, Badge, message } from 'antd';
-import moment from 'moment';
-import { createCrudService } from '../../../components/crud/_';
-import apiurl from '../../../service/apiurl';
-
-
-
-
-
-const ToolBar = ({ value, onChange, tm }) => {
-  const [yearRange,setYearRange] = useState([])
-  const [monthRange,setMonthRange] = useState([])
-  const [form] = Form.useForm();
-
-  useEffect(()=>{ 
-    getDefaultValue()
-  },[])
-
-
-  const getDefaultValue = ()=>{
-    const tm = moment()
-    const year = tm.year();
-    let linshi1 = [];
-    for (let i = year - 5; i <= year + 1; i++) {
-      linshi1.push(i);
-    }
-    setYearRange(linshi1)
-    let linshi2 = [];
-    for (let i = 0; i < 12; i++) {
-      linshi2.push(i);
-    }
-    setMonthRange(linshi2)
-  }
-
-  const down = ()=>{
-    const stm = tm.format('YYYY-MM')+'-01'
-    const etm = tm.endOf('months').format('YYYY-MM-DD')
-    createCrudService(apiurl.informationManagement.dutyPlan.down).downLoad({
-      stm:stm,
-      etm:etm,
-    })
-  }
-
-  const downTemplate = ()=>{
-    createCrudService(apiurl.informationManagement.dutyPlan.downTemplate).downLoad()
-  }
-
-  const handleGclqdFileFileChange = async()=>{
-    var files = document.getElementById("gclqdFile").files;
-    const resData = await createCrudService(apiurl.informationManagement.dutyPlan.upLoad).upLoad({file:files[0]})
-    console.log('resData',resData)
-
-  }
-
- /**
-  * @description 回到今天
-  */
-  const backToday = () => {
-    const now = moment();
-    onChange(now);
-  };
-  return (
-    <>
-     <div className="pagetoolbar">
-        <Form layout="inline">
-          <Form.Item label="年份">
-            <Select
-              style={{ width: 80 }}
-              dropdownMatchSelectWidth={false}
-              onChange={newYear => {
-                const now = value.clone().year(newYear);
-                onChange(now);
-              }}
-              value={value.year()}
-            >
-              {
-                yearRange.map(o => <Select.Option key={o} value={o}>{o}</Select.Option>)
-              }
-            </Select>
-          </Form.Item>
-          <Form.Item label="月份">
-            <Select
-              style={{ width: 80 }}
-              dropdownMatchSelectWidth={false}
-              onChange={newMonth => {
-                const now = value.clone().month(newMonth);
-                onChange(now);
-              }}
-              value={value.month()}
-            >
-              {
-                monthRange.map(o => <Select.Option key={o} value={o}>{o+1}</Select.Option>)
-              }
-            </Select>
-          </Form.Item>
-          <Form.Item>
-              <Button onClick={() => {backToday()}}>今天</Button>
-          </Form.Item>
-          
-          {/* <Form.Item style={{ float: 'right' }}>
-            <Button type="primary" className='but4' onClick={downTemplate}>模板</Button>
-          </Form.Item>
-          <Form.Item style={{ float: 'right' }}>
-            <Button type="primary" className='but4' onClick={down}>导出</Button>
-          </Form.Item>
-          <Form.Item style={{ float: 'right' }}>
-            <Button type="primary" className='but4' onClick={()=>{
-              document.getElementById('gclqdFile').value = "";
-              document.getElementById('gclqdFile').click()
-            }}>导入</Button>
-            <input id="gclqdFile" style={{display:"none"}}
-                       onChange={handleGclqdFileFileChange}
-                       type="file"
-                ></input>
-          </Form.Item> */}
-          <Form.Item style={{ float: 'right' }}>
-            <Badge status="error" text="带班领导" style={{ marginRight: 8 }} />
-            <Badge status="processing" text="值班领导" style={{ marginRight: 8 }} />
-            <Badge status="success" text="白班" style={{ marginRight: 8 }} />
-            <Badge status="warning" text="晚班" style={{ marginRight: 8 }} />
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js
deleted file mode 100644
index 55bc614..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/TableData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Table} from 'antd';
-import React, {useEffect, useState} from 'react';
-
-
-const Tabledata = ({data}) => {
-  const columns = [
-    {title: '库水位(m)', key: 'rz', dataIndex: 'rz', align: 'center'},
-    {title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-  useEffect(()=>{
-    setTableData(data)
-  })
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-      />
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
deleted file mode 100644
index 1c19590..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/drpOption.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  const maxVal = Math.max(...data.map(obj => obj.rz))+1
-  const minVal = Math.min(...data.map(obj => obj.rz))-1
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-
-  let arr =[]
-  data.forEach(item=>{
-    arr.push([item.w,item.rz])
-  })
-
-
-  return {
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "10%",
-        right: "20%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "库容(万m³)",
-        nameGap: -8,
-        type: 'category',
-        data: data.map(o => o.w),
-        // min:Math.floor(minValX),
-        // max:Math.round(maxValX),
-        // interval:GetInterval(minValX,maxValX),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#333',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        symbolSize:10,
-        // symbol: 'none' // 设置标记点为'none'，即去掉圆点
-      },
-    ]
-  };
-}
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/index.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/index.js
deleted file mode 100644
index 4f6a56d..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption'
-import {zvarl} from "../../../../../../../service/sssq";
-
-function Krqx({record}) {
-  const [data,setData]=useState([])
-  const option = useMemo(() => {
-    return drpOption({data});
-  }, [data])
-
-  const getData=async (params)=>{
-    setData(await zvarl(params))
-  }
-  useEffect(() => {
-    getData({stcd:record.stcd})
-  }, [record]);
-
-
-  return (
-    <div style={{width: "98%", height: '60vh'}} className="swllgx-sq">
-      <div className="content">
-        <div className="content-left">
-          <TableData data={data}/>
-        </div>
-        <div className="content-right">  {
-          data.length > 0 ?
-            <ReactEcharts
-              option={option}
-              style={{width: "100%", height: '100%'}}
-            /> : <div style={{textAlign: "center", margin: "10%"}}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-            </div>
-        }</div>
-      </div>
-    </div>
-  )
-}
-
-export default Krqx
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/index.less b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/index.less
deleted file mode 100644
index 6e2608b..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/Krqx/index.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.swllgx-sq{
-  .content{
-    display: flex;
-    justify-content: space-between;
-    .content-left{
-      width: 48%;
-      max-height: 60vh;
-      overflow: auto;
-    }
-    .content-right{
-      width: 48%;
-      height: 60vh;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/fxya.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/fxya.js
deleted file mode 100644
index 2c57485..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/fxya.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {plan} from "../../../../../../service/sssq";
-
-
-function Fxya({record}) {
-
-  const [data, setData] = useState({})
-  const getData = async (params) => {
-    let obj = await plan(params)
-    setData(obj[0])
-  }
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions column={3} bordered labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.preparation == 1 ? "是" : data?.preparation == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="是否批复"
-                           style={{width: "16.5%"}}>{data?.approval == 1 ? "是" : data?.approval == 0 ? "否" : ""}</Descriptions.Item>
-        <Descriptions.Item label="编制时间" style={{width: "16.5%"}}>{data?.prepTime}</Descriptions.Item>
-        <Descriptions.Item label="批复时间">{data?.apprTime}</Descriptions.Item>
-        <Descriptions.Item label="编制单位">{data?.prepOrg}</Descriptions.Item>
-        <Descriptions.Item label="批复部门">{data?.apprOrg}</Descriptions.Item>
-        <Descriptions.Item label="预案文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.apprName}</span>
-        </Descriptions.Item>
-        <Descriptions.Item label="批复文件" span={1.5}>
-          <span style={{color: "#689FFF"}}>{data?.planName}</span>
-        </Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Fxya;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/gctp.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/gctp.js
deleted file mode 100644
index 734be0d..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/gctp.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {projectimg, fileget} from "../../../../../../service/sssq";
-import {projDict} from "../../../../../../utils/dictType"
-
-
-function Gctp({record}) {
-  const [data, setData] = useState([])
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const getData = async (params) => {
-    setData(await projectimg(params))
-  }
-
-  useEffect(() => {
-    getData({resCode: record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Descriptions bordered layout="vertical" column={3}>
-        {
-          data?.length > 0 ? data?.map(o => <Descriptions.Item label={projDict(o?.projType)}>
-              <div className="no-data">
-                <img src={url + o?.filePath} style={{width: "100%"}} alt=""/>
-              </div>
-            </Descriptions.Item>
-            )
-            : ""
-        }
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Gctp;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/index.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/index.js
deleted file mode 100644
index bc265cc..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import { Tabs} from "antd";
-import Jbxx from './jbxx'
-import Krqx from './Krqx'
-import Zrtx from './zrtx'
-import Jzw from './jzw'
-import Jsxx from './jsxx'
-import Gctp from './gctp'
-import Fxya from './fxya'
-import Sjbg from './sjbg'
-
-
-
-function Skjcxx({data}) {
-
-  useEffect(() => {
-
-  }, []);
-
-  return (
-    <>
-      <div>
-        <Tabs defaultActiveKey="1" tabPosition="left" type="card">
-          <Tabs.TabPane tab="基本信息" key="1">
-            <Jbxx data={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="库容曲线" key="2">
-            <Krqx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="责任体系" key="3">
-            <Zrtx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建筑物" key="4">
-            <Jzw record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="建设信息" key="5">
-            <Jsxx record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="工程图片" key="6">
-            <Gctp record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="防汛预案" key="7">
-            <Fxya record={data}/>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab="设计报告" key="8">
-            <Sjbg record={data}/>
-          </Tabs.TabPane>
-
-
-        </Tabs>
-      </div>
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jbxx.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jbxx.js
deleted file mode 100644
index 4c399c4..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jbxx.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions} from "antd";
-import {attResBase} from '../../../../../../service/sssq'
-import {engScalDict} from '../../../../../../utils/dictType'
-function Skjcxx({ data }) {
-  const [info,setInfo]=useState({})
-  const getData=async (params)=>{
-    setInfo(await attResBase(params))
-  }
-  useEffect(() => {
-    if (data?.resCode) {
-      getData({resCode:data.resCode})
-    }
-  }, [data]);
-
-  return (
-    <>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="水库名称" style={{ width: '16.5%' }}>{info?.resName}</Descriptions.Item>
-        <Descriptions.Item label="所在地" style={{ width: '16.5%' }}>{info?.resLoc}</Descriptions.Item>
-        <Descriptions.Item label="管理单位" style={{ width: '16.5%' }}>{info?.managName}</Descriptions.Item>
-        <Descriptions.Item label="水库代码">{info?.resCode}</Descriptions.Item>
-        <Descriptions.Item label="注册登记号">{info?.regSn}</Descriptions.Item>
-        <Descriptions.Item label="注册登记时间">{info?.regTime}</Descriptions.Item>
-        <Descriptions.Item label="经度">{info?.lgtd}</Descriptions.Item>
-        <Descriptions.Item label="纬度">{info?.lttd}</Descriptions.Item>
-        <Descriptions.Item label="高程基准面">{info?.elevDat}</Descriptions.Item>
-        <Descriptions.Item label="所在流域">{info?.basName}</Descriptions.Item>
-        <Descriptions.Item label="所在水系">{info?.wsName}</Descriptions.Item>
-        <Descriptions.Item label="所在河流名称">{info?.rvName}</Descriptions.Item>
-        <Descriptions.Item label="工程规模">{engScalDict(info?.engScal)}</Descriptions.Item>
-        <Descriptions.Item label="水库功能">{info?.rsvFunction}</Descriptions.Item>
-        <Descriptions.Item label="溢洪道是否有闸">{info?.spillwayGate==1?"有":info.spillwayGate==0?"无":""}</Descriptions.Item>
-        <Descriptions.Item label="水库特征参数" span={3}></Descriptions.Item>
-        <Descriptions.Item label="坝址以上控制流域面积(km³)">{info?.watShedArea}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)">{info?.crestElev}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)">{info?.maxDamHeig}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水位(m)">{info?.calFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="总库容(万m³)">{info?.totCap}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水时最大下泄流量(m³/s)">{info?.maxDesFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="设计洪水位(m)">{info?.desFloodLev}</Descriptions.Item>
-        <Descriptions.Item label="调洪库容(万m³)">{info?.storFlCap}</Descriptions.Item>
-        <Descriptions.Item label="校核洪水时最大下泄流量(m³/s)">{info?.maxCalFloodFlow}</Descriptions.Item>
-        <Descriptions.Item label="防洪高水位(m)">{info?.uppLevFlco}</Descriptions.Item>
-        <Descriptions.Item label="防洪库容(万m³)">{info?.flcoCap}</Descriptions.Item>
-        <Descriptions.Item label="下游河道安全流量(m³/s)">{info?.dsSaftFlow}</Descriptions.Item>
-        <Descriptions.Item label="正常蓄水位(m)">{info?.normWatLev}</Descriptions.Item>
-        <Descriptions.Item label="兴利库容(万m³)">{info?.benResCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="死水位(m)">{info?.deadLev}</Descriptions.Item>
-        <Descriptions.Item label="死库容(万m³)">{info?.deadCap}</Descriptions.Item>
-        <Descriptions.Item label=""></Descriptions.Item>
-        <Descriptions.Item label="工程概况" span={3}>{info?.projOverview}</Descriptions.Item>
-      </Descriptions>
-
-    </>
-  )
-}
-
-export default Skjcxx;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jsxx.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jsxx.js
deleted file mode 100644
index 2412f45..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jsxx.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {construction} from "../../../../../../service/sssq";
-
-
-
-function Jsxx({record}) {
-
-  const columns = [
-    {title: '状态', key: '', dataIndex: '', align: 'center',render:rec=>rec.engStat==0?"始建":rec.engStat==1?"扩建":""},
-    {title: '工程开工时间', key: 'startDate', dataIndex: 'startDate', align: 'center'},
-    {title: '投入使用时间', key: 'useDate', dataIndex: 'useDate', align: 'center'},
-    {title: '竣工验收时间', key: 'compDate', dataIndex: 'compDate', align: 'center'},
-    {title: '改扩建内容', key: 'content', dataIndex: 'content', align: 'center'},
-    {title: '第几次扩建', key: 'buildNo', dataIndex: 'buildNo', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await construction(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Jsxx;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jzw.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jzw.js
deleted file mode 100644
index 2cebbec..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/jzw.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Descriptions,Table} from "antd";
-import {drainage,dam,transport} from "../../../../../../service/sssq";
-
-
-
-function Jzw({record}) {
-
-  const columns1 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns2 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '堰顶高程', key: 'crestEle', dataIndex: 'crestEle', align: 'center'},
-    {title: '溢流段长或堰顶宽(m)', key: 'buildSize', dataIndex: 'buildSize', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '启用标准', key: 'enableCriteria', dataIndex: 'enableCriteria', align: 'center'},
-  ];
-  const columns3 = [
-    {title: '建筑物名称', key: 'name', dataIndex: 'name', align: 'center',},
-    {title: '洞(孔)身型式', key: 'buildType', dataIndex: 'buildType', align: 'center'},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '数量(条或孔)', key: 'num', dataIndex: 'num', align: 'center'},
-    {title: '进口底槛高程(m)', key: 'inletEle', dataIndex: 'inletEle', align: 'center'},
-    {title: '设计泄洪流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '校核泄洪流量(m³/s)', key: 'caliQ', dataIndex: 'caliQ', align: 'center'},
-    {title: '工作阀门型式', key: 'valveType', dataIndex: 'valveType', align: 'center'},
-    {title: '启闭方式', key: 'ocMethod', dataIndex: 'ocMethod', align: 'center'},
-    {title: '消能方式', key: 'elimMethod', dataIndex: 'elimMethod', align: 'center'},
-  ];
-  const columns4 = [
-    {title: '设计流量(m³/s)', key: 'desQ', dataIndex: 'desQ', align: 'center'},
-    {title: '输水道型式', key: 'transType', dataIndex: 'transType', align: 'center',},
-    {title: '断面尺寸', key: 'sectionSize', dataIndex: 'sectionSize', align: 'center'},
-    {title: '输水道长度(m)', key: 'transLeng', dataIndex: 'transLeng', align: 'center'},
-    {title: '座教', key: 'num', dataIndex: 'num', align: 'center'},
-  ];
-
-  const [tableDataDs, setTableDataDs] = useState([])
-  const [tableDataXs, setTableDataXs] = useState({})
-  const [tableDataSs, setTableDataSs] = useState([])
-
-  const getData=async (params)=>{
-    setTableDataDs(await dam(params))
-    setTableDataXs(await drainage(params))
-    setTableDataSs(await transport(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <div style={{maxHeight:"60vh",overflow:"auto"}}>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>挡水建筑物</div>
-      <Descriptions bordered size="small" column={3} labelStyle={{backgroundColor:'#fff'}}>
-        <Descriptions.Item label="坝型" style={{ width: '16.5%' }}>{tableDataDs[0]?.damType}</Descriptions.Item>
-        <Descriptions.Item label="最大坝高(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damMaxHeig}</Descriptions.Item>
-        <Descriptions.Item label="坝顶高程(m)" style={{ width: '16.5%' }}>{tableDataDs[0]?.damTopElev}</Descriptions.Item>
-        <Descriptions.Item label="坝顶长度(m)">{tableDataDs[0]?.damTopLen}</Descriptions.Item>
-        <Descriptions.Item label="坝顶宽度(m)">{tableDataDs[0]?.damTopWid}</Descriptions.Item>
-        <Descriptions.Item label="坝基防渗体型式">{tableDataDs[0]?.damImpermeableType}</Descriptions.Item>
-        <Descriptions.Item label="副坝座数">{tableDataDs[0]?.subDamNum}</Descriptions.Item>
-        <Descriptions.Item label="副坝总长度(m)">{tableDataDs[0]?.subDamLen}</Descriptions.Item>
-        <Descriptions.Item label="副坝最大坝高(m)">{tableDataDs[0]?.subDamMaxHeig}</Descriptions.Item>
-      </Descriptions>
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>泄水建筑物</div>
-      <div className="table-title" style={{padding:"4px"}}>☆正常溢洪道</div>
-      <Table rowKey="inx"
-             sticky
-             size="small"
-             columns={columns1}
-             pagination={false}
-             dataSource={tableDataXs.normalSpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆非常溢洪道</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns2}
-             pagination={false}
-             dataSource={tableDataXs.emergencySpillwayList}
-      />
-      <div className="table-title" style={{padding:"4px"}}>☆泄洪洞</div>
-      <Table rowKey="key"
-             sticky
-             size="small"
-             columns={columns3}
-             pagination={false}
-             dataSource={tableDataXs.sluiceGateList}
-      />
-      <div className="des-title" style={{fontWeight:"bold",padding:"4px"}}>输水建筑物</div>
-      <Table rowKey="key"
-             sticky
-             size="small "
-             columns={columns4}
-             pagination={false}
-             dataSource={tableDataSs}
-      />
-    </div>
-  )
-}
-
-export default Jzw;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/sjbg.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/sjbg.js
deleted file mode 100644
index f7d62f0..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/sjbg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {file} from "../../../../../../service/sssq";
-
-
-
-function Sjbg({record}) {
-
-  const columns = [
-    {title: '文件名称', key: '', dataIndex: '', align: 'center',render:rec=><span style={{color:"#689FFF"}}>{rec.fileName}</span>},
-    {title: '编制单位', key: 'preparedBy', dataIndex: 'preparedBy', align: 'center'},
-    {title: '编制时间', key: 'preparedTime', dataIndex: 'preparedTime', align: 'center'},
-    {title: '批复部门', key: 'approvalUnit', dataIndex: 'approvalUnit', align: 'center'},
-    {title: '批复时间', key: 'approvalTime', dataIndex: 'approvalTime', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await file(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             bordered
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Sjbg;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/zrtx.js b/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/zrtx.js
deleted file mode 100644
index d78d4ac..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/Skjcxx/zrtx.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
-import {person} from "../../../../../../service/sssq";
-import {repDict} from "../../../../../../utils/dictType"
-
-
-
-function Zrtx({record}) {
-
-  const columns = [
-    {title: '责任人', key: '', dataIndex: '', align: 'center',render:rec=>repDict(rec.repType)},
-    {title: '姓名', key: 'personName', dataIndex: 'personName', align: 'center'},
-    {title: '单位', key: 'orgName', dataIndex: 'orgName', align: 'center'},
-    {title: '职务', key: 'position', dataIndex: 'position', align: 'center'},
-    {title: '联系方式', key: 'tel', dataIndex: 'tel', align: 'center'},
-  ];
-  const [tableData, setTableData] = useState([])
-
-  const getData=async (params)=>{
-    setTableData(await person(params))
-  }
-  useEffect(() => {
-    getData({resCode:record.resCode})
-  }, [record]);
-
-  return (
-    <>
-      <Table rowKey="adcd"
-             sticky
-             columns={columns}
-             pagination={false}
-             dataSource={tableData}
-             scroll={{y:"60vh"}}
-      />
-    </>
-  )
-}
-
-export default Zrtx;
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/index.less b/src/views/fxzb/zzjg/gc/GcTreeSelector/index.less
deleted file mode 100644
index 0e58af7..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/index.less
+++ /dev/null
@@ -1,232 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.GcTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-  .ant-tree-treenode{
-    width: 100%;
-
-    .ant-tree-node-content-wrapper{
-      // width: 100%;
-      // padding-right: 15px;
-      position: static;
-    }
-  }
-}
-// .detail-modal{
-//   .ant-descriptions-item{
-//     border-bottom: 1px solid rgb(232, 232, 232) ;
-//   }
-// }
-.no-matter{
-  opacity: .5;
-}
-
-.tree-container{
-  .ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
-    color:rgba(0, 0, 0, 0.7)
-  }
-}
-.detail-modal{
-  .ant-modal-body{
-
-    .dp-popup-content {
-      position: relative;
-      // box-shadow: 0 1px 2px rgba(0,0,0,.1);
-      pointer-events: auto;
-      //background: rgba(4, 8, 27, 0.9);
-      background: rgba(255, 255, 255, 0.9);
-      border-radius: 0px;
-      padding: 0;
-      margin-top: 20px;
-    }
-    
-    .content-body {
-      color: #333;
-      padding: 0.4rem 0.4rem 0.2rem 0.4rem;
-      position: relative;
-    
-      .cursor-pointer1, .cursor-pointer2, .cursor-pointer3{
-        position: absolute;
-        top:15px;
-        color:#0893FF;
-        cursor:pointer;
-      }
-      .cursor-pointer1{
-        right:145px;
-      }
-      .cursor-pointer2{
-        right:115px;
-      }
-      .cursor-pointer3{
-        right:45px;
-      }
-    
-      .title {
-        display: flex;
-        align-items: center;
-        border-bottom: 1px solid #f0f0f0;
-        padding: 0.2rem 0.6rem 0.4rem 0.6rem;
-        line-height:30px;
-        font-size:16px;
-        background-color: #f7f7f7;
-        color: #007AFD;
-    
-        .icon {
-          width: 1.2rem;
-          height: 1.2rem;
-          flex-shrink: 0;
-          margin-right: 0.5rem;
-        }
-    
-        .name {
-          flex-grow: 1;
-          font-weight:normal;
-          .nameBorder{
-            width: 5px;
-            height: 16px;
-            background-color: #007AFD;
-            margin-right: 10px;
-          }
-        }
-        .flex{
-          display: flex;
-        }
-    
-        .close {
-          flex-shrink: 0;
-          width: 0.8rem;
-          margin: 0 0.1rem 0.1rem 0;
-          cursor: pointer;
-        }
-      }
-    
-      .body {
-        padding: 0.5rem 1rem;
-        .body-row {
-          display: flex;
-          line-height: 2;
-    
-          .row-key {
-            width: 6rem;
-          }
-    
-          .row-value {
-            color: rgb(184, 233, 248)
-          }
-    
-          .row-key-w {
-            width: 10rem;
-          }
-        }
-    
-        .body-row-grid {
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 0.5rem;
-        }
-    
-      }
-        .foot {
-          padding-top: 0.2rem;
-          border-top: 1px solid rgba(36, 136, 223, 0.60);
-          display: flex;
-          justify-content: space-around;
-        }
-    }
-    .dp-popup-tip {
-      border: 10px solid transparent;
-    }
-    
-    
-    .shuichi-border {
-      animation: redred 1000ms 0ms infinite linear;
-    
-      @keyframes redred {
-        0% {
-          fill:  #17abe3;
-        }
-        100% {
-          fill:  #f7d28d;
-        }
-      }
-    }
-    
-    .pulsating-circle {
-      position: absolute;
-      transform: translateX(-50%) translateY(-50%) scaleY(0.6);
-    
-      &:before {
-        content: '';
-        position: relative;
-        display: block;
-        width: 300%;
-        height: 300%;
-        box-sizing: border-box;
-        margin-left: -100%;
-        margin-top: -100%;
-        border-radius: 45px;
-        background-color: #01a4e9;
-        animation: pulse-ring 1.25s cubic-bezier(0.215, 0.61, 0.355, 1) infinite;
-      }
-      
-      &:after {
-        content: '';
-        position: absolute;
-        left: 0; 
-        top: 0;
-        display: block;
-        width: 100%;
-        height: 100%;
-        background-color: rgb(152 218 237);
-        border-radius: 15px;
-        box-shadow: 0 0 8px rgba(0,0,0,.3);
-        animation: pulse-dot 1.25s cubic-bezier(0.455, 0.03, 0.515, 0.955) -.4s infinite;
-      }
-    }
-    
-    .pulsating-circle-blue {
-      &:before {
-        background-color: #01a4e9;
-      }
-    }
-  }
-
-}
-
-@keyframes pulse-ring {
-  0% {
-    transform: scale(.63);
-  }
-  80%, 100% {
-    opacity: 0;
-  }
-}
-
-@keyframes pulse-dot {
-  0% {
-    transform: scale(.8);
-  }
-  50% {
-    transform: scale(1);
-  }
-  100% {
-    transform: scale(.8);
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/zzjg/gc/GcTreeSelector/index.tsx b/src/views/fxzb/zzjg/gc/GcTreeSelector/index.tsx
deleted file mode 100644
index 7d43dfe..0000000
--- a/src/views/fxzb/zzjg/gc/GcTreeSelector/index.tsx
+++ /dev/null
@@ -1,350 +0,0 @@
-import React, { useState, useEffect, } from 'react';
-import {Tree, Input, Checkbox, Spin, Modal,Tabs} from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import Jbxx from './Skjcxx/jbxx'
-import Krqx from './Skjcxx/Krqx'
-import Zrtx from './Skjcxx/zrtx'
-import Jzw from './Skjcxx/jzw'
-import Jsxx from './Skjcxx/jsxx'
-import Gctp from './Skjcxx/gctp'
-import Fxya from './Skjcxx/fxya'
-import Sjbg from './Skjcxx/sjbg'
-import './index.less';
-import {getAdcdTreeData1, getGcTreeData} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setCode?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  setTag?: any,
-  data?: any,
-  clickHandler?:any
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, clickHandler,setCode, setTag, showCheckbox, tableName, hasAlertBox,data }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [itemDetail, setItemDetail] = useState<any>({}) // 树中的每一项的详细信息
-
-  const [open, setOpen] = useState(false)
-  const [keys, setKeys] = useState(1)
-  const TabList = [
-    {
-      key: '1',
-      label: '基本信息',
-    },
-    {
-      key: '2',
-      label: '库容曲线',
-    },
-    {
-      key: '3',
-      label: '责任体系',
-    },
-    {
-      key: '4',
-      label: '建筑物',
-    },
-    {
-      key: '5',
-      label: '建设信息',
-    },
-    {
-      key: '6',
-      label: '工程图片',
-    },
-    {
-      key: '7',
-      label: '防汛预案',
-    },
-    {
-      key: '8',
-      label: '设计报告',
-    },
-  ]
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    const adcdTreedata:any = await getGcTreeData(params);
-
-    const item: any = adcdTreedata?.[0]?.children?.[0]
-    console.log("item",item);
-    if(item){
-      setCode(item.code)
-      setSelectedKeys([item.code])
-      setTag(item.type)
-    }
-
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.sname;
-        // (
-        //   <span  style={{position:'relative'}}>
-        //     {item.sname}
-        //     <div  style={{color:'red',position:'absolute',left:'50px'}}>按钮</div>
-        //   </span>
-        // )
-        item.key = item.code;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue: any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-    
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.code;
-      // if(!adcdLevel){
-      //   const code = selectData.code.substring(0,15);
-      //   if(code.endsWith('000000000')){//县
-      //     adcdVal = selectData.code.substring(0,6);
-      //   }else if(code.endsWith('000000')){//镇
-      //     adcdVal = selectData.code.substring(0,9);
-      //   }else if(code.endsWith('000')){//村
-      //     adcdVal = selectData.code.substring(0,12);
-      //   }else{
-      //     adcdVal = selectData.code;
-      //   }
-      // }else{
-      //   adcdVal = selectData.code;
-      // }
-
-      let params = { code: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if (setCode) {
-        setCode(adcdVal)
-        setTag(selectData.type)
-      }
-    } else {
-      let params = { code: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setCode){
-        setCode("")
-        setTag("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr:any = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.sname.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-    console.log("newarr",newarr);
-    
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-  const onChange = (key:any) => {
-    setKeys(key)
-  }
-  return (
-    <div style={{position:"relative"}} className='GcTreeSelectorStyle '>
-      {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }} className='tree-container'>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              titleRender={(v:any)=>{
-                return (<>
-                    {
-                      v.children?.length > 0?null:
-                      <div  style={{color:'#a8a8a8',position:'absolute',right:'25px'}} onClick={(e)=>{
-                        e.stopPropagation()
-                        setOpen(true)
-                        setItemDetail(v)
-                        clickHandler(v)
-                      }}><FileTextOutlined /></div>
-                    }
-                    <div>{v.title}</div>
-                </>)
-              }}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-            />
-          }
-        </div>
-        <Modal
-          title=""
-          width={1000}
-          open={open}
-          footer={null}
-          onCancel={() => setOpen(false)}
-          className='detail-modal'
-        >
-          <div className="dp-popup-content">
-          <div className="content-body tyb skpop" id='tyb'>
-            <div className="title flexac flex">
-              <div className="name flex flexac">
-                <div className='nameBorder'></div>
-                {data?.resName}
-              </div>
-
-              <Tabs
-                defaultActiveKey="1"
-                type="card"
-                onChange={onChange}
-                items={TabList}
-                tabBarStyle={{margin:0}}
-              />
-            </div>
-            <div style={{backgroundColor:'#fff'}}>
-              {keys == 1 && <Jbxx data={data} />}
-              {keys == 2 && <Krqx record={data} />}
-              {keys == 3 && <Zrtx record={data} />}
-              {keys == 4 && <Jzw record={data} />}
-              {keys == 5 && <Jsxx record={data} />}
-              {keys == 6 && <Gctp record={data} />}
-              {keys == 7 && <Fxya record={data} />}
-              {keys == 8 && <Sjbg record={data} />}
-            </div>
-          </div>
-        </div>
-        </Modal>
-      </div>
-
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/zzjg/gc/form.js b/src/views/fxzb/zzjg/gc/form.js
deleted file mode 100644
index ab79023..0000000
--- a/src/views/fxzb/zzjg/gc/form.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, InputNumber } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { getDictService } from '../../../../service/SelectValue'
-import { validlgtd , validlttd } from '../../../../utils/validators';
-import apiurl from '../../../../service/apiurl';
-import {mobile} from '../../../../utils/validators'
-import AdcdTreeSelect from '../../../../components/Form/AdcdTreeSelect'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import { httppost2 } from '../../../../utils/request';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-
-const ModalForm = ({ mode, record,onEdit,onSave }) => {
-  if(record.startDate && record.startDate ){
-    record.meetDate = [moment(record.startDate), moment(record.endDate)]
-  }
-
-  const [form] = Form.useForm();
-
-
-  const onFinish = async(values) => {
-    if(values.meetDate){
-      values.startDate = moment(values.meetDate[0]).format('YYYY-MM-DD HH:mm:ss')
-      values.endDate = moment(values.meetDate[1]).format('YYYY-MM-DD HH:mm:ss')
-      delete values.meetDate
-    }
-    values.adcd = record.adcd
-    values.year = record.year
-
-
-    if (mode === 'edit') {
-      values.id = record.id
-      onEdit(apiurl.fxzb.sxfd.fxpxb.edit,values)
-    }
-    if (mode === 'save') {
-
-      onSave(apiurl.fxzb.sxfd.fxpxb.save,values)
-    }
-  }
-
-  useEffect(()=>{
-    // getOptions()
-    // if(mode === 'save'){
-    //   form.setFieldsValue('meetDate',moment('2021'))
-    // }
-  },[])
-
-  // const getOptions = async ()=>{
-  //   setSttp(await getDictService({dictType:'sttp'}))
-  //   setFrgrd(await getDictService({dictType:'frgrd'}))
-  //   setStbk(await getDictService({dictType:'stbk'}))
-  //   setUsfl(await getDictService({dictType:'usfl'}))
-  //   setLocality(await getDictService({dictType:'locality'}))
-  // }
-
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训主题"
-                name="theme"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="主办单位"
-                name="organiser"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训方式"
-                name="tcType"
-                rules={[{ required: true }]}
-              >
-                 {/* <NormalSelect disabled={mode!=='save'} style={{width:'100%'}} allowClear options={[]}/> */}
-                 <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="培训时间"
-                name="meetDate"
-                rules={[{ required: true }]}
-              >
-                {/* <DatePicker 
-                  showTime 
-                  format="YYYY-MM-DD HH:mm"  
-                  style={{width:'100%'}}
-                /> */}
-                 <RangePicker  style={{width:'100%'}} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训地点"
-                name="loc"
-                rules={[{ required: true }]}
-              >
-                <Input type='num' disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="培训主要内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'200px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      
-      {/* <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fj"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row> */}
-
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '增加' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-    </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/fxzb/zzjg/gc/index.js b/src/views/fxzb/zzjg/gc/index.js
deleted file mode 100644
index 3b069e4..0000000
--- a/src/views/fxzb/zzjg/gc/index.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Row, Col, Divider, Empty } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { getDictService } from '../../../../service/SelectValue'
-import usePageTable from '../../../../components/crud/usePageTable';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import { dealValue } from '../../../../utils/tools';
-import GcTreeSelector from "../../gczx/ytygc/GcTreeSelector"
-import Form from './form'
-import moment from 'moment';
-import {getAdcdTreeData1, getGcTreeData} from '../../../../service/warn';
-
-const repType = {
-  '1':'行政责任人',
-  '2':'技术责任人',
-  '3': '巡查责任人',
-  '4': '主管部门责任人',
-  '5': '管理单位责任人',
-}
-const sdType = {
-  '1':'属地监管责任人',
-  '2':'行业监管责任人',
-  '3': '安全生产责任人',
-}
-
-
-const Page = () => {
-  const refModal = useRef();
-  const isRender = useRef(true)
-  const [code, setCode] = useState()
-  const [tag, setTag] = useState()
-  const [projectInfo, setProjectInfo] = useState({})
-  
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    {
-      title: '责任类型', key: 'repType', dataIndex: 'repType', width: 200,
-      render: (v) => tag == 1 ? repType[v] : sdType[v]
-    },
-    { title: '姓名', key: 'personName', dataIndex: 'personName', width: 140 },
-    { title: '单位', key: 'orgName', dataIndex: 'orgName', width: 140 },
-    { title: '职务', key: 'position', dataIndex: 'position', width: 150 },
-    { title: '联系方式  ', key: 'tel', dataIndex: 'tel', width: 150 },
-    // {
-    //   title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-    //   render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} view={true} command={(cmd) => () => command(cmd)(row)} />)
-    // },
-  ];
-
-
-  // const command = (type) => (params) => {
-  //   if (type === 'save') {
-  //     // refModal.current.showSave({adcd:adcd,});
-  //   } else if (type === 'edit') {
-  //     refModal.current.showEdit(params);
-  //   } else if (type === 'view') {
-  //     refModal.current.showView(params);
-  //   } else if (type === 'del') {
-  //     refModal.current.onDeleteGet(apiurl.fxzb.sxfd.fxpxb.del+params.id);
-  //   } 
-  // }
-  
-  // return {list: [], totalRow: 0};
-  // createCrudService(apiurl.fxzb.zzjg.gc.page).find_noCode
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.fxzb.zzjg.gc.page).find_noCode);
-
-  // const  { tableProps, search, refresh }  = useMemo(() => {
-  //   if(tag&&code){
-  //     return 
-  //   }
-    
-  // }, [tag, code])
-
-  /**
-   * @description 获取工程相关信息
-   */
-  const getProjectInfo = (params) => {
-    createCrudService(apiurl.sssq.attResBase).delGet({ resCode: params }).then(res => {
-      if (res.code == 200) {
-        let data = res.data
-        setProjectInfo(data)
-      }
-    })
-  }
-   /**
-   * @description 获取水电站相关信息
-   */
-   const getStationInfo = (code) => {
-    createCrudService(apiurl.station.hydropowerStation.list).delGet().then(res => {
-      if (res.code == 200) {
-        let data = res.data.find(item => item.hystCode == code)
-        setProjectInfo(data)
-      }
-    })
-  }
-
-  
-    const clickHandler = (v) => {
-      if (v.type == 1) {
-        getProjectInfo(v.code)
-      } else {
-        getStationInfo(v.code)
-      }
-      // console.log("v",v);
-      // getProjectInfo(v.code)
-      // setProjectInfo({reCode: v.code})
-    }
-  
-  useEffect(()=>{
-    // if(isRender.current){
-    //   isRender.current = false
-    //   return
-    // }
-    console.log("code",code,tag);
-    const params = {
-      search: {
-        code,
-        tag
-      }
-    };
-    if(code && tag){
-      search(params)
-    }
-
-  },[code])
-
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-          <GcTreeSelector
-            setCode={setCode}
-            setTag={setTag}
-            showCheckbox={false}
-            hasAlertBox={false}
-            data={projectInfo}
-            clickHandler={clickHandler}
-            url={getGcTreeData}
-          />
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          {/* <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')}/>
-          </Card> */}
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ y: "calc( 100vh - 400px )"}}/>
-          </div>
-         
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title="防汛培训班"
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/zzjg/gc/toolbar.js b/src/views/fxzb/zzjg/gc/toolbar.js
deleted file mode 100644
index 90d3ab0..0000000
--- a/src/views/fxzb/zzjg/gc/toolbar.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-
-
-
-const ToolBar = ({ setSearchVal, onSave,}) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (val) => {
-    setSearchVal(val);
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="会议年度" name="year">
-            <DatePicker onChange={(v)=>setSearchVal({year:v.format('YYYY')})} picker="year" defaultValue={moment()} format={'YYYY'}/>
-          </Form.Item>
-        </Form>
-
-        {
-          
-          <div>
-            <Button style={{marginRight:'20px'}} size='Default' onClick={onSave}>新增</Button>
-          </div>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/fxzb/zzjg/zq/ZqTreeSelector/index.less b/src/views/fxzb/zzjg/zq/ZqTreeSelector/index.less
deleted file mode 100644
index 2843201..0000000
--- a/src/views/fxzb/zzjg/zq/ZqTreeSelector/index.less
+++ /dev/null
@@ -1,22 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fxzb/zzjg/zq/ZqTreeSelector/index.tsx b/src/views/fxzb/zzjg/zq/ZqTreeSelector/index.tsx
deleted file mode 100644
index a9fb7ed..0000000
--- a/src/views/fxzb/zzjg/zq/ZqTreeSelector/index.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import {Tree, Input, Checkbox, Spin} from 'antd';
-import './index.less';
-import {getAdcdTreeData1, getZzjgAdcdTreeData} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  defaultAdcd?: any;//默认值
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd, showCheckbox, tableName, hasAlertBox, defaultAdcd }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);  
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight,setTreeBoxHeight] = useState({})
-
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    let params = {
-      "level": 4
-    };
-    
-    // const adcdTreedata = await getAdcdTreeData1(params);
-    const adcdTreedata: any = await getZzjgAdcdTreeData(params);
-    const item:any = adcdTreedata?.[0]
-    if(item){
-      // setCode(item.code)
-      // setAdcd(item.code)
-      setSelectedKeys([item.code])
-      // setTag(item.tag)
-    }
-
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.sname;
-        item.key = item.code;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const [adcdLevel,setAdcdLevel] = useState(false);
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.code;
-
-      let params = { adcd: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if (setAdcd) {
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { adcd: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-  useEffect(() => {
-    if(selectedKeys.length>0 && Object.keys(selectedItem).length>0){
-      onSelect(selectedKeys,selectedItem);
-    }
-  }, [adcdLevel]);
-
-  // @ts-ignore
-  const rebuildData = (value, arr) => {
-    if (!arr) {
-      return [];
-    }
-    // @ts-ignore
-    let newarr = [];
-    if (Object.prototype.toString.call(arr) === "[object Array]") {
-      // @ts-ignore
-      arr.forEach((element) => {
-        if (element.adnm.indexOf(value) > -1) {
-          const ab = rebuildData(value, element.children);
-          const obj = {
-            ...element,
-            children: ab,
-          };
-          newarr.push(obj);
-        } else {
-          if (element.children && element.children.length > 0) {
-            const ab = rebuildData(value, element.children);
-            const obj = {
-              ...element,
-              children: ab,
-            };
-            if (ab && ab.length > 0) {
-              newarr.push(obj);
-            }
-          }
-        }
-      });
-    }
-
-    // @ts-ignore
-    setNewTreeData(newarr.length > 0 ? newarr : []);
-    // @ts-ignore
-    return newarr;
-  };
-  // @ts-ignore
-  const fiterData = (event) => {
-    setIsFiter(true);
-    if (treeData.length > 0) {
-      rebuildData(event.target.value, treeData)
-    }
-  };
-
-  return (
-    <div style={{position:"relative"}} className='AdcdTreeSelectorStyle'>
-      {/* {!loading && <Search allowClear style={{ width: "229px" }} placeholder="请输入" onChange={e => fiterData(e)} />} */}
-      {/* <Search
-      placeholder="input search text"
-      enterButton="Search"
-      size="large"
-    /> */}
-      {
-        treeData.length > 0 && showCheckbox && !loading &&
-        <>
-          <div className="checkboxBox">
-            <Checkbox
-              style={{marginLeft:"8px"}}
-              onChange={(e)=>{
-                setAdcdLevel(e.target.checked);
-              }}
-            >仅查询当前级</Checkbox>
-          </div>
-        </>
-      }
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox" style={{...treeBoxHeight,marginTop:showCheckbox?"30px":"0"}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-            />
-          }
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/fxzb/zzjg/zq/index.js b/src/views/fxzb/zzjg/zq/index.js
deleted file mode 100644
index c8545cb..0000000
--- a/src/views/fxzb/zzjg/zq/index.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import { Table, Card, Row, Col, Divider, Empty,Upload } from 'antd';
-import ListSelect from "../../../../components/Form/ListSelect";
-import ZqTreeSelector from "./ZqTreeSelector"
-import ToolBar from './toolbar'
-import apiurl from '../../../../service/apiurl';
-import { createCrudService } from '../../../../components/crud/_';
-import moment from 'moment';
-
-// 页面初始默认查询参数
-const options = {
-  search:{
-    adcd: '422826000000000',
-  },
-};
-
-const Page = () => {
-  const isRender = useRef(true)
-  const [adcd, setAdcd] = useState(options.search.adcd)
-  
-
-  const [id, setId] = useState('')
-  /**
-   * 获取pdf文件
-   */
-  const getPdf = () => {
-    createCrudService(apiurl.fxzb.zzjg.zq.page).insert(adcd).then(res => {
-      if (res.code === 200) {
-        if (res.data) {
-          setId(res.data.fileId)
-        } else {
-          setId("")
-       }
-      }
-    })
-  }
-
-  useEffect(() => {
-    getPdf()
-  },[adcd])
-
-
-  const onFileChange = (fieldId) => {
-    console.log(fieldId);
-    setId(fieldId)
-    // getPdf()
-  }
-  const onDelete = () => {
-    // setId("")
-    getPdf()
-  }
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)'}}>
-            <ZqTreeSelector setAdcd={setAdcd} showCheckbox={false} hasAlertBox={false} defaultAdcd={options.search.adcd}/>
-        </div>
-        <div className='lf CrudAdcdTreeTableBox'>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={{}}
-              onFileChange={onFileChange}
-              adcd={adcd}
-              id={id}
-              onDelete={onDelete}
-            />
-          </Card>
-          {/* <div className="ant-card-body" style={{padding:"20px 0 0 0",height:'600px'}}>
-              <iframe
-                style={{ height: '99%', width: '100%', border: 0 }}
-                src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent('http://223.75.53.141:8000/baseplat-plan/planAttachment/v2/preview?planId='+aab)}`}
-              />
-          </div> */}
-a
-          {
-            id?
-              // <ViewPdfPage viewItem={previewPdf}/>
-              <iframe
-                style={{ height: '99%', width: '100%', border: 0 }}
-                // src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent('http://223.75.53.141:8000/baseplat-plan/planAttachment/v2/preview?planId='+id)}`}
-                src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/bzOrganizationFile/file/download/${id}`)}`}
-              />
-              :
-                <div style={{marginTop:"20vh"}}>
-                  <Empty description={"暂无数据"} />
-                </div>
-          }
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/fxzb/zzjg/zq/toolbar.js b/src/views/fxzb/zzjg/zq/toolbar.js
deleted file mode 100644
index 8b46010..0000000
--- a/src/views/fxzb/zzjg/zq/toolbar.js
+++ /dev/null
@@ -1,144 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, message, Upload } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import { createCrudService } from '../../../../components/crud/_';
-import apiurl from '../../../../service/apiurl';
-import moment from 'moment';
-
-
-
-const ToolBar = ({ setSearchVal, onFileChange, onDelete, adcd, id }) => {
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([])
-  const [isShowUploadBtn, setIsShowUploadBtn] = useState()
-   /**
-   * @description 上传之前的回调
-   */
-  const beforeUpload = (info) => {
-    message.info("文件正在上传")
-    if (info.type != "application/pdf") {
-      message.error("请上传pdf格式的文件")
-      return false
-    }
-    return true
-  }
-  /**
-   * @description 上传文件后的回调
-   * @param {Array} info 
-   */
-  const handleUploadChange = (info) => { 
-    // message.info("文件正在上传")
-    // 防止上传状态一直是uploading
-    setFileList([info.file])
-    const { status } = info.file;
-    console.log("info",info);
-    if (status === 'done') {
-      let params = {
-        adcd,
-        fileId: info.file.response?.data?.fileId,
-      }
-      setIsShowUploadBtn(false)
-      setFileList([info.file])
-      onFileChange(info.file.response?.data?.fileId)
-      createCrudService(apiurl.fxzb.zzjg.zq.save).edit(params).then(res => {
-        if (res.code === 200) {
-          message.success("文件上传成功")
-        }
-      })
-    } else if (status === 'error') {
-      message.error(`文件上传失败`);
-    }
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzOrganizationFile/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  /**
-   * @description 删除文件
-   * @param {String} params 文件fileId
-   */
-  const handleDelte = () => {
-    let fieldId = fileList[0]?.response?.data?.fileId;
-    if (fieldId) {
-      createCrudService(apiurl.fxzb.zzjg.zq.delete + `/${fieldId}`).delGet().then((res) => {
-        if (res.code === 200) {
-          message.success("删除成功")
-          setFileList([])
-          setIsShowUploadBtn(false)
-          onDelete()
-          onFileChange("")
-        } else {
-          message.error("删除失败")
-        }
-      })
-    } else {
-      message.error("请选择要删除的文件")
-    }
-  }
-  useEffect(() => {
-    setIsShowUploadBtn(!id)
-    if (id) {
-      setFileList([{
-        response: {
-          data: {
-            fileId:id
-          }
-      }}])  
-    }
-  }, [id])
-  
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'flex-end',alignItems:'center'}}>
-        {
-          <>
-          <div>
-              {isShowUploadBtn && 
-                <Upload
-                name="file"
-                action="/gunshiApp/xfflood/bzOrganizationFile/file/upload/singleSimple"
-                onChange={handleUploadChange}
-                beforeUpload={beforeUpload}
-                className='upload-file'
-                fileList={fileList}
-              >
-                  <Button
-                    size='Default'
-                    style={{
-                      marginLeft:"-100%"
-                    }}
-                  >上传正式文件(pdf)</Button>
-              </Upload>
-              }
-          </div>
-          
-            <div>
-              {!isShowUploadBtn && <Button style={{marginRight:'20px'}} size='Default' onClick={()=> {download(fileList[0]?.response?.data?.fileId)}}>下载</Button>}
-          </div>
-
-            <div>
-              {!isShowUploadBtn && <Button style={{marginRight:'20px'}} size='Default' onClick={handleDelte}>删除</Button>}
-          </div>
-          </>
-        }
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gbyj/index.js b/src/views/gbyj/index.js
deleted file mode 100644
index 93489dc..0000000
--- a/src/views/gbyj/index.js
+++ /dev/null
@@ -1,266 +0,0 @@
-import React, { useState, useEffect, useMemo,useRef } from 'react'
-import usePageTable from '../../components/crud/usePageTable2';
-import { createCrudService } from '../../components/crud/_';
-import apiurl from '../../service/apiurl';
-import { httppost2,httpget2 } from '../../utils/request';
-import CryptoJS from 'crypto-js';
-import { Card,Table,Button,Radio,Input,Select,Modal,message  } from "antd"
-import ToolBar from "./toolbar"
-import "./index.less"
-export default function Gbyj() {
-    const [searchValue, setSearchVal] = useState()
-    const [switchVisible, setSwitchVisible] = useState(false);
-    const [bbParams, setBbParams] = useState({})
-    const [addOpen, setAddOpen] = useState(false)
-    const [mbParams, setMbParams] = useState({})
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-        { title: '广播站名称', key: 'name', dataIndex: 'name', width: 200, ellipsis: true },
-        {
-          title: '告警内容', key: 'warnContent', dataIndex: 'warnContent', width: 300,ellipsis: true 
-        },
-        { title: '播报时间', key: 'createTime', dataIndex: 'createTime', width: 200 },
-        {
-          title: '播报人员', key: 'createUserName', dataIndex: 'createUserName', width: 200,ellipsis: true
-        },
-    ];
-    const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-    const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gbyj.page).find_noCode);
-    //广播站
-    const [jh, setJh] = useState([])
-    const getJhList = async () => {
-      try {
-        const res = await httppost2(apiurl.gbyj.list)
-        if (res.code == 200) {
-          setJh(res.data.map(item => ({label:item.name,value:item.id})))
-        }
-      } catch (error) {
-        console.log(error);
-        
-      }
-    }
-    const [mbList, setMbList] = useState([])
-
-    const getMbList = async () => {
-        try {
-            const res = await httppost2(apiurl.gbyj.mblist);
-            if(res.code === 200){
-                setMbList(res.data.map(item=>({label:item.content, value:item.id})));
-            }
-        } catch (error) {
-            console.log(error);
-        }
-      
-    }
-
-
-    // 右边添加模版
-    const addMb = async () => {
-        try {
-            const res = await httppost2(apiurl.gbyj.mbsave, { content: bbParams.warnContent });
-            if (res.code == 200) {
-                message.success('添加成功');
-                getMbList();
-            }
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    // 左边添加模版
-    const saveMb = async () => {
-        try {
-            const res = await httppost2(apiurl.gbyj.mbsave, mbParams);
-            if (res.code == 200) {
-                message.success('添加成功');
-                getMbList();
-                setAddOpen(false)
-            }
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    // 删除模版
-    const delMb = async () => {
-        try {
-            const res = await httpget2(apiurl.gbyj.mbDel + `/${bbParams.checkId}`);
-            if (res.code == 200) {
-                message.success('删除成功');
-                getMbList();
-                setBbParams({...bbParams,warnContent:'' })
-            }
-        } catch (error) {
-            console.log(error);
-        }
-    }
-    const handleCheck = (e) => {
-        const text = mbList.find(item => item.value == e.target.value)?.label
-        setBbParams({ ...bbParams, warnContent:text,checkId:e.target.value })
-    }
-
-    const gbzChange = (e) => {
-        setBbParams({...bbParams,stationIds:e})
-    }
-
-    const textChange = (e) => {
-        setBbParams({ ...bbParams, warnContent: e.target.value })
-    }
-
-    // 播报
-   
-    const playGb = () => {
-        setSwitchVisible(true);
-        
-    }
-
-    
-       //md5加密
-    const encryptData = (data) => {
-      const encryptedData = CryptoJS.MD5(data).toString();
-      return encryptedData;
-    }
-    // 确认播报
-    const confirmBb = async () => {
-        const name = localStorage.getItem('userName')
-        const id = localStorage.getItem('userId')
-        const params = {
-            ...bbParams,
-            ctrlPass: encryptData(bbParams?.ctrlPass),
-            createUserId: id,
-            createUserName: name
-        }
-        try {
-            const res = await httppost2(apiurl.gbyj.bb,params);
-            if (res.code == 200) {
-                setSwitchVisible(false);
-                message.success('播报成功');
-                refresh()
-            }
-        } catch (error) {
-            console.log(error);
-        }
-        
-
-    }
-    useEffect(()=>{
-        const params = {
-          search: {
-            ...searchValue,
-          }
-        };
-        search(params)
-    }, [searchValue])
-    
-    useEffect(() => {
-        getMbList()
-        getJhList()
-    }, [])
-    
-  return (
-      <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-          <div className='gb-top'>
-              <div className='gb-top-title'>
-                  <span className='gb-top-icon'></span>
-                   <span style={{fontSize:18}}>广播预警信息查询</span>         
-            </div>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              jh={jh}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 10px 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 700px )"}}/>
-          </div>
-         </div>
-          <div className='gb-bottom'>
-              <div className='gb-bottom-left'>
-                 <div className='gb-top-title'>
-                  <span className='gb-top-icon'></span>
-                   <span style={{fontSize:18,marginRight:20}}>广播模板</span>  
-                   <Button type="primary" onClick={() => setAddOpen(true)}>添加</Button>       
-                   <Button type="primary" onClick={delMb}>删除</Button>       
-                  </div>
-                  <div className='mb-content'>
-                      <Radio.Group
-                          style={{display: 'flex', flexDirection: 'column'}}
-                          options={mbList}
-                          onChange={handleCheck}
-                      />
-                  </div>
-              </div>
-              <div className='gb-bottom-right'>
-               <div className='gb-top-title'>
-                  <span className='gb-top-icon'></span>
-                   <span style={{fontSize:18,marginRight:20}}>编辑播报内容</span>
-                   <Button type="primary" onClick={addMb}>添加为模板</Button>          
-                  </div>
-                  <div className='right-content'>
-                      <div style={{marginRight:10}}>
-                      <Input.TextArea
-                              style={{ width: '100%', minHeight: '150px' }}
-                              allowClear
-                              placeholder='请输入播报内容，或者选择广播模板'
-                              value={bbParams.warnContent}
-                              onChange={textChange}
-                      />
-                      </div>
-                      <div style={{ marginTop: 20 }}>
-                         <div className='gb-top-title'>
-                          <span className='gb-top-icon'></span>
-                           <span style={{fontSize:18,marginRight:20}}>选择广播预警站</span>      
-                          </div>
-                          <div className='station-content'>
-                              <span>已选择：</span>
-                              <Select
-                                mode="tags"
-                                style={{
-                                    width: '70%',
-                                }}
-                                onChange={gbzChange}
-                                options={jh}
-                              />
-                              <Button type="primary" style={{width:"16%"}} onClick={playGb}>播报</Button>   
-                          </div>
-                      </div>
-                    </div>
-              </div>
-          </div>
-          {/* 校验密码 */}
-          <Modal
-        open={switchVisible}
-        width={500}
-        title="输入校验密码"
-        onCancel={()=>{setSwitchVisible(false);}}
-        destroyOnClose
-        onOk={confirmBb}
-      >
-        <div>
-          <div style={{marginBottom:"10px"}}>请输入二次校验密码</div>
-          <div>
-            <Input.Password placeholder='请输入密码' allowClear onChange={(e)=>{setBbParams({...bbParams,ctrlPass:e.target.value})
-            }} />
-          </div>
-        </div>
-          </Modal>
-          {/* 添加模版 */}
-          <Modal
-        open={addOpen}
-        width={500}
-        title="新增"
-        onCancel={()=>{setAddOpen(false);}}
-        destroyOnClose
-        onOk={saveMb}
-      >
-        <div>
-          <div style={{marginBottom:"10px"}}>请输入模版</div>
-          <div>
-            <Input  allowClear onChange={(e)=>{setMbParams({...mbParams,content:e.target.value})
-            }} />
-          </div>
-        </div>
-      </Modal>
-      </div>
-  )
-}
diff --git a/src/views/gbyj/index.less b/src/views/gbyj/index.less
deleted file mode 100644
index c53a780..0000000
--- a/src/views/gbyj/index.less
+++ /dev/null
@@ -1,43 +0,0 @@
-
-.gb-top-title{
-    display: flex;
-    align-items: center;
-    column-gap: 10px;
-    margin-bottom: 20px;
-    .gb-top-icon{
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.gb-bottom{
-    display: flex;
-    // align-items: center;
-    column-gap: 20px;
-    margin-top: 20px;
-    .gb-bottom-left{
-        flex: 1;
-        .mb-content{
-            width: 100%;
-            margin-top: 10px;
-            padding: 10px;
-            height: 300px;
-            overflow-y: auto;
-            border: 1px solid #dfdfdf;
-            .ant-radio-wrapper{
-                margin-bottom: 10px;
-            }
-        }
-    }
-    .gb-bottom-right{
-        flex: 1;
-        .right-content{
-           .station-content{
-            display: flex;
-            align-items: center;
-            column-gap: 10px;
-            margin-top: 25px;
-           }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/gbyj/toolbar.js b/src/views/gbyj/toolbar.js
deleted file mode 100644
index 420d27d..0000000
--- a/src/views/gbyj/toolbar.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Upload, Button,Row, Col, Input, DatePicker, message,Modal } from 'antd';
-import apiurl from '../../service/apiurl';
-import { httppost2 } from '../../utils/request';
-import moment from 'moment';
-import NormalSelect from '../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal,jh}) => {
-  const [form] = Form.useForm();
- 
-  const onFinish = (values) => {
-    let timeRangeSo;
-    if (values.tm) {
-      timeRangeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, timeRangeSo});
-  }
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="告警内容" name="warnContent">
-            <Input allowClear  style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="播报时间" name="tm">
-            <RangePicker
-              allowClear
-              showTime 
-              style={{ width: "350px" }}
-              format={"YYYY-MM-DD HH:mm:ss" }
-            />
-          </Form.Item>
-          <Form.Item label="广播站名称" name="stationId">
-            <NormalSelect allowClear style={{ width: '150px' }} options={jh} />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> 
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-  
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/bzt/index.js b/src/views/gcaqjc/bzt/index.js
deleted file mode 100644
index 39ee4ab..0000000
--- a/src/views/gcaqjc/bzt/index.js
+++ /dev/null
@@ -1,272 +0,0 @@
-import React, { useState, useEffect,useMemo,useRef } from 'react'
-import { Table, Tabs,Modal,message,Tooltip } from 'antd';
-import { useDispatch, useSelector } from 'react-redux'
-import { Rnd } from "react-rnd"
-import { httpget, httpget2, httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import ShenYa from '../../Home/MapCtrl/Pops/ShenYa/index';
-import ShenLiu from '../../Home/MapCtrl/Pops/ShenLiu/index.js';
-import WeiYi from '../../Home/MapCtrl/Pops/WeiYi/index.js';
-import DuanMian from '../../Home/MapCtrl/Pops/DuanMian/index.js';
-import TuLi from '../../Home/TuLi/Tuli6.js';
-import './index.less'
-
-
-export default function Page({isHome}) {
-  const dispatch = useDispatch();
-  const [shouqi,setShouQi] = useState(false)
-  const [syList,setSyList] = useState([])
-  const [slList,setSlList] = useState([])
-  const [wyList,setWyList] = useState([])
-  const [dmList,setDmList] = useState([])
-  const [openSy, setOpenSy] = useState(false)
-  const [openSl, setOpenSl] = useState(false)
-  const [openWy, setOpenWy] = useState(false)
-  const [openDm, setOpenDm] = useState(false)
-
-  const [modalData, setModalData] = useState({})
-
-
-  const columnsSy = [
-    { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
-    { title: '所属断面', key: 'profileName', dataIndex: 'profileName',width: 110,align: "center", ellipsis: true },
-    { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 110, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-    { title: '管水位(m)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true,  render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>  },
-  ]
-
-  const columnsSl = [
-    { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
-    { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-    { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>   },
-  ]
-
-  const columnsWy = [
-    { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 80, ellipsis: true },
-    { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}><div>{v?.slice(5,10)}</div><div>{v?.slice(11,16)}</div></div> },
-    { title: <div><div>X方向</div><div>(mm)</div></div>, key: 'x', dataIndex: 'x',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
-    { title: <div><div>Y方向</div><div>(mm)</div></div>, key: 'y', dataIndex: 'y',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
-    { title: <div><div>H方向</div><div>(mm)</div></div>, key: 'h', dataIndex: 'h',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
-  ]
-
-
-
-  useEffect(()=>{
-    let scale = 1
-    const img = document.getElementById("img");
-    const fun = (e) => {
-      console.log(1111)
-      // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
-      if (e.wheelDelta > 0) {
-      scale += 0.05;
-      img.style.transform = `scale(${scale})`;
-      } else {
-      if (scale == 1) {
-          img.style.left = 0 + "px";
-          img.style.top = 0 + "px";
-      }
-      // 缩放值大于1时,可以缩小,反之亦然
-      if (scale > 1) {
-          scale -= 0.05;
-          img.style.transform = `scale(${scale})`;
-      }
-      }
-  }
-    img.addEventListener("wheel",fun)
-    
-    getSyData()
-    getSlData()
-    getWyData()
-    getDmData()
-    return ()=>{
-      img.removeEventListener("wheel",fun)
-    }
-
-  },[])
-
-
-  const getSyData = async()=>{
-    const {code, data} = await httpget2(apiurl.home.sy)
-    if(code!==200){
-      return
-    }
-    setSyList(data)
-  }
-
-  const getSlData = async()=>{
-    const {code, data} = await httpget2(apiurl.home.sl)
-    if(code!==200){
-      return
-    }
-    setSlList(data)
-  }
-
-  const getWyData = async()=>{
-    const {code, data} = await httpget2(apiurl.home.wy)
-    if(code!==200){
-      return
-    }
-    setWyList(data)
-  }
-
-  const getDmData = async()=>{
-    const {code, data} = await httppost2(apiurl.home.dmList)
-    if(code!==200){
-      return
-    }
-    console.log('断面',data)
-    setDmList(data)
-  }
-
-   
-  return (
-    <div className='gcaqjc_bzt'>
-      <Rnd 
-          default={{
-              x: isHome?250:0,
-              y: 0,
-              width: '100%',
-              height: '100%'
-          }}
-      >
-        <div id='img' style={{width:'72%',height:'98%',position:'absolute',display:'flex'}}>
-          <div style={{position:'relative'}}>
-            <img width={1100} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/bzt5.svg`} alt="" id="img" draggable="false" />
-            {
-              syList.map((item)=>
-                <div className={'gcaqjc_bzt_sy_'+item.stationCode} onClick={()=>{
-                  setOpenSy(true)
-                  setModalData(item)
-                }}>
-                  {item.stationCode}
-                  <img width={20} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${item.status===1?'sy2.png':'sy.png'}`} alt="" id="img" draggable="false" />
-                </div>
-              )
-            }
-            {/* {
-              slList.map((item)=>
-                <div className={'gcaqjc_bzt_sl_'+item.stationCode} onClick={()=>{
-                  setOpenSl(true)
-                  setModalData(item)
-                }}>
-                  {item.stationCode}
-                  <img width={20} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${item.status===1?'sl2.png':'sl.png'}`} alt="" id="img" draggable="false" />
-                </div>
-              )
-            } */}
-            {
-              wyList.map((item)=>
-                <div className={'gcaqjc_bzt_wy_'+item.stationCode} onClick={()=>{
-                  setOpenWy(true)
-                  setModalData(item)
-                }}>
-                  {item.stationCode}
-                  <img width={20} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${(item.xstatus===1||item.ystatus===1||item.hstatus===1)?'wy2.png':'wy.png'}`} alt="" id="img" draggable="false" />
-                </div>
-              )
-            }
-            
-            {/* {
-              dmList.map((item)=>
-                <div className={'gcaqjc_bzt_dm_'+item.profileCode} onClick={()=>{
-                  setOpenDm(true)
-                  setModalData(item)
-                }}>
-                  <Tooltip title={item.profileName}>
-                    <img width={25} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/dm.png`} alt="" id="img" draggable="false" />
-                  </Tooltip>
-                </div>
-              )
-            } */}
-
-
-
-          </div>
-        </div>
-      </Rnd>
-      {
-        !isHome?
-        <div className='gcaqjc_bzt_rightBox' style={{right:shouqi?'-404px':'4px'}}>
-        <Tabs defaultActiveKey="1" style={{padding:'0 5px 5px 5px'}} centered>
-          <Tabs.TabPane tab={<div style={{fontSize:'16px',fontWeight:500,padding:'0 15px'}}>渗压监测</div>} key="1">
-            <div className='gcaqjc_bzt_rightBox_table'>
-              <Table rowKey="stationCode"
-                  sticky
-                  columns={columnsSy}
-                  pagination={false}
-                  dataSource={syList}
-                  scroll={{ y: "650px"}}
-                  onRow={
-                      (data)=>({
-                          onClick:()=>{
-                            setOpenSy(true)
-                            setModalData(data)
-                          }
-                      })
-                  }
-              />
-            </div>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab={<div style={{fontSize:'16px',fontWeight:500,padding:'0 15px'}}>渗流监测</div>} key="2">
-            <div className='gcaqjc_bzt_rightBox_table'>
-              <Table rowKey="stationCode"
-                  sticky
-                  columns={columnsSl}
-                  pagination={false}
-                  dataSource={slList}
-                  scroll={{ y: "650px"}}
-                  onRow={
-                      (data)=>({
-                          onClick:()=>{
-                            setOpenSl(true)
-                            setModalData(data)
-                          }
-                      })
-                  }
-              />
-            </div>
-          </Tabs.TabPane>
-          <Tabs.TabPane tab={<div style={{fontSize:'16px',fontWeight:500,padding:'0 15px'}}>位移监测</div>} key="3">
-            <div className='gcaqjc_bzt_rightBox_table'>
-              <Table rowKey="stationCode"
-                  sticky
-                  columns={columnsWy}
-                  pagination={false}
-                  dataSource={wyList}
-                  scroll={{ y: "650px"}}
-                  onRow={
-                      (data)=>({
-                          onClick:()=>{
-                            setOpenWy(true)
-                            setModalData(data)
-                          }
-                      })
-                  }
-              />
-            </div>
-          </Tabs.TabPane>
-        </Tabs>
-        <div className='gcaqjc_bzt_rightBox_Btn'>
-          <img src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/shouqi.png`} alt="" onClick={()=>setShouQi(!shouqi)}/>
-        </div>
-        </div>:null
-      }
-
-      <div style={{position:'absolute',left:'30px',top:'calc( 100vh - 300px )'}}>
-          <TuLi/>
-      </div>
-
-      <Modal width={1000} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={openSy} onCancel={()=>setOpenSy(false)} destroyOnClose={true}>
-        <ShenYa id={modalData.stationCode} data={modalData} dispatch={dispatch} record={modalData} onCancel={()=>setOpenSy(false)}/>
-      </Modal>
-      <Modal width={1000} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={openSl} onCancel={()=>setOpenSl(false)} destroyOnClose={true}>
-        <ShenLiu id={modalData.stationCode} data={modalData} dispatch={dispatch} record={modalData} onCancel={()=>setOpenSl(false)}/>
-      </Modal>
-      <Modal width={1000} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={openWy} onCancel={()=>setOpenWy(false)} destroyOnClose={true}>
-        <WeiYi id={modalData.stationCode} data={modalData} dispatch={dispatch} record={modalData} onCancel={()=>setOpenWy(false)}/>
-      </Modal>
-      <Modal width={1000} wrapClassName='home_modal'  bodyStyle={{padding:0}}  title={null} closable={false} footer={null} open={openDm} onCancel={()=>setOpenDm(false)} destroyOnClose={true}>
-        <DuanMian id={modalData.profileCode} data={modalData} dispatch={dispatch} record={modalData} onCancel={()=>setOpenDm(false)}/>
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/views/gcaqjc/bzt/index.less b/src/views/gcaqjc/bzt/index.less
deleted file mode 100644
index ff93a65..0000000
--- a/src/views/gcaqjc/bzt/index.less
+++ /dev/null
@@ -1,383 +0,0 @@
-.gcaqjc_bzt{
-    width: 100%;
-    height: 100%;
-    background-color: #ffffff;
-    overflow: hidden;
-    position: relative;
-
-
-    .imgBox {
-        position: relative;
-        width: 1200px;
-        height: 800px;
-        border: 2px solid red;
-        overflow: hidden;
-      }
-   
-      .imgBox img {
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        cursor: pointer;
-      }
-
-    .gcaqjc_bzt_rightBox{
-      width: 400px;
-      background: #f5f7fa; 
-      position: absolute;
-      right: 4px;
-      top: 30px;
-      border-radius: 5px;
-      border: 1px solid #eee;
-    
-
-      .ant-tabs-nav{
-        margin-bottom: 5px;
-      }
-
-      .gcaqjc_bzt_rightBox_table{
-        width: 100%;
-        min-height: 750px;
-        background: #ffffff;
-        border: 1px solid #eee;
-
-
-        .ant-table-thead{
-          th{
-            height: 40px !important;
-            background-color: #e2edfd !important;
-          }
-        }
-        .ant-table-tbody{
-          .ant-table-measure-row{
-            td{
-              padding: 0 !important;
-            }
-          }
-          tr:nth-child(odd) {
-            td{
-              background-color: #f5f8fe !important;
-            }
-          }
-          
-        
-        }
-      }
-    }
-
-    .gcaqjc_bzt_rightBox_Btn{
-      position: absolute;
-      left: -25px;
-      top: 45%;
-      cursor: pointer;
-    }
-
-
-
-    [class*="gcaqjc_bzt_sy"]{
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      color: #00c188;
-      cursor: pointer;
-      left: 0;
-      top: 0;
-    }
-    [class*="gcaqjc_bzt_sl"]{
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      color: #00c188;
-      cursor: pointer;
-      left: 0;
-      top: 0;
-    }
-    [class*="gcaqjc_bzt_wy"]{
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      color: #00c188;
-      cursor: pointer;
-      left: 0;
-      top: 0;
-    }
-    [class*="gcaqjc_bzt_dm"]{
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      color: #00c188;
-      cursor: pointer;
-      left: 0;
-      top: 0;
-    }
-
-    .gcaqjc_bzt_sy_SY01{
-      left: 336px;
-      top: 388px;
-    }
-    .gcaqjc_bzt_sy_SY02{
-      left: 604px;
-      top: 407px;
-    } 
-    .gcaqjc_bzt_sy_SY03{
-      left: 843px;
-      top: 384px;
-    } 
-    .gcaqjc_bzt_sy_SY04{
-      left: 336px;
-      top: 418px;
-    }
-    .gcaqjc_bzt_sy_SY05{
-      left: 604px;
-      top: 436px;
-    }
-    .gcaqjc_bzt_sy_SY06{
-      left: 843px;
-      top: 419px;
-    }
-    .gcaqjc_bzt_sy_SY07{
-      left: 336px;
-      top: 478px;
-    }
-    .gcaqjc_bzt_sy_SY08{
-      left: 604px;
-      top: 494px;
-    }
-    .gcaqjc_bzt_sy_SY09{
-      left: 843px;
-      top: 487px;
-    }
-    .gcaqjc_bzt_sy_SY10{
-      left: 370px;
-      top: 421px;  
-    }
-    .gcaqjc_bzt_sy_SY11{
-      left: 638px;
-      top: 434px;
-    }
-    .gcaqjc_bzt_sy_SY12{
-      left: 875px;
-      top: 417px;
-    }
-    .gcaqjc_bzt_sy_SY13{
-      left: 370px;
-      top: 480px;
-    }
-    .gcaqjc_bzt_sy_SY14{
-      left: 639px;
-      top: 491px;
-    }
-    .gcaqjc_bzt_sy_SY15{
-      left: 878px;
-      top: 484px;
-    }
-
-
-    .gcaqjc_bzt_wy_WY-01{
-      left: 192px;
-      top: 378px;
-    }
-    .gcaqjc_bzt_wy_WY-02{
-      left: 293px;
-      top: 385px;
-    } 
-    .gcaqjc_bzt_wy_WY-03{
-      left: 451px;
-      top: 396px;
-    }
-    .gcaqjc_bzt_wy_WY-04{
-      left: 561px;
-      top: 404px;
-    }
-    .gcaqjc_bzt_wy_WY-05{
-      left: 699px;
-      top: 400px;
-    }
-    .gcaqjc_bzt_wy_WY-07{
-      left: 943px;
-      top: 410px;
-    } 
-    .gcaqjc_bzt_wy_WY-08{
-      left: 192px;
-      top: 408px;
-    }
-    .gcaqjc_bzt_wy_WY-09{
-      left: 293px;
-      top: 415px;
-    } 
-    .gcaqjc_bzt_wy_WY-10{
-      left: 451px;
-      top: 426px;
-    }
-    .gcaqjc_bzt_wy_WY-11{
-      left: 561px;
-      top: 434px;
-    }
-    .gcaqjc_bzt_wy_WY-12{
-      left: 699px;
-      top: 433px;
-    }
-    .gcaqjc_bzt_wy_WY-14{
-      left: 943px;
-      top: 438px;
-    } 
-    .gcaqjc_bzt_wy_WY-15{
-      left: 192px;
-      top: 438px;
-    }
-    .gcaqjc_bzt_wy_WY-16{
-      left: 293px;
-      top: 445px;
-    } 
-    .gcaqjc_bzt_wy_WY-17{
-      left: 451px;
-      top: 456px;
-    }
-    .gcaqjc_bzt_wy_WY-18{
-      left: 561px;
-      top: 464px;
-    }
-    .gcaqjc_bzt_wy_WY-19{
-      left: 699px;
-      top: 460px;
-    }
-    .gcaqjc_bzt_wy_WY-21{
-      left: 943px;
-      top: 474px;
-    } 
-    .gcaqjc_bzt_wy_WY-22{
-      left: 192px;
-      top: 538px;
-    }
-    .gcaqjc_bzt_wy_WY-23{
-      left: 345px;
-      top: 551px;
-    }
-    .gcaqjc_bzt_wy_WY-24{
-      left: 449px;
-      top: 563px;
-    }
-    .gcaqjc_bzt_wy_WY-25{
-      left: 565px;
-      top: 574px;
-    }
-    .gcaqjc_bzt_wy_WY-26{
-      left: 710px;
-      top: 560px;
-    }
-    .gcaqjc_bzt_wy_WY-27{
-      left: 839px;
-      top: 555px;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    
-
-
-    // .gcaqjc_bzt_sl_SL01{
-    //   left: 479px;
-    //   top: 594px;
-    // }
-
-    // .gcaqjc_bzt_sl_SL02{
-    //   left: 679px;
-    //   top: 594px;
-    // }
-
-    // .gcaqjc_bzt_wy_WY-G100{
-    //   left: 394px;
-    //   top: 376px;
-    // }
-    // .gcaqjc_bzt_wy_WY-G101{
-    //   left: 594px;
-    //   top: 376px;
-    // }
-
-    // .gcaqjc_bzt_dm_DM0234205820000010{
-    //   left: 655px;
-    //   top: 379px;
-    // }
-
-    // .gcaqjc_bzt_dm_DM0234205820000011{
-    //   left: 555px;
-    //   top: 379px;
-    // }
-
-    // .gcaqjc_bzt_dm_DM0234205820000012{
-    //   left: 455px;
-    //   top: 379px;
-    // }
-
-    // .gcaqjc_bzt_dm_DM0234205820000013{
-    //   left: 1003px;
-    //   top: 379px;
-    // }
-
-    // .gcaqjc_bzt_dm_DM0234205820000014{
-    //   left: 42px;
-    //   top: 379px;
-    // }
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/gcaqfx/jrx/form.js b/src/views/gcaqjc/gcaqfx/jrx/form.js
deleted file mode 100644
index 8e90d8c..0000000
--- a/src/views/gcaqjc/gcaqfx/jrx/form.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import './index.less'
-import moment from 'moment';
-
-const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => {
-  const uploadUrl = '/gunshiApp/xfflood/quality/evaluate/file/upload/singleSimple'
-  const downloadUrl = '/gunshiApp/xfflood/quality/evaluate/file/download'
-  const url = '/gunshiApp/xfflood/quality/evaluate/file/get'
-  const fileTypes = [
-    {
-      label: '质量评定表',
-      value: 1
-    },
-    {
-      label: '合格证明',
-      value: 2
-    },
-    {
-      label: '鉴定结论',
-      value: 3
-    },
-    {
-      label: '其他',
-      value: 4
-    },
-  ]
-  const [form] = Form.useForm();
-  const [fileIds, setFileIds] = useState([])
-
-   /**
-   * @description 表单重置
-   */
-   const onReset = () => {
-    form.resetFields();
-  };
-  const onFinish = async (values) => {
-    values.contractCode = record.contractCode
-    values.attachList = fileIds
-    if (mode === 'edit') {
-      values.evaluateCode = record.evaluateCode
-      values.createTime = record.createTime
-      onEdit(apiurl.zlaqjd.zlgl.zlpd.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.zlaqjd.zlgl.zlpd.save,values)
-    }
-  }
-  useEffect(() => {
-   form.setFieldValue('createUserName',localStorage.getItem('userName')??'-')
-  }, [])
-  
-  return (
-    <>
-      <div className='basci-title'>基本信息</div>
-     <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-     <Row>
-          <Col span={12}>
-              <Form.Item
-                label="质量评定名称"
-                name="evaluateName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="编号"
-                name="evaluateCode"
-            >
-              <Input allowClear placeholder='请输入' disabled={true}/>
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="类型"
-                name="type"
-              >
-                 <NormalSelect allowClear placeholder='请输入文件名称'  options={fileTypes} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="质量评定点"
-                name="evaluatePoint"
-              >
-                 <Input allowClear placeholder='请输入' disabled={mode==='view'} />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-          <Form.Item
-                label="填报人"
-                name="createUserName"
-              >
-                 <Input allowClear placeholder='请输入' disabled={true}/>
-              </Form.Item>
-          </Col>
-          {
-          mode != "save" &&
-          <Col span={12}>
-          <Form.Item
-                label="填报时间"
-                name="createTime"
-              >
-                 <Input allowClear placeholder='请输入' disabled={true}/>
-              </Form.Item>
-          </Col>
-        }
-        </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="质量评定说明"
-                name="remark"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                保存
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/gcaqjc/gcaqfx/jrx/index.js b/src/views/gcaqjc/gcaqfx/jrx/index.js
deleted file mode 100644
index c124118..0000000
--- a/src/views/gcaqjc/gcaqfx/jrx/index.js
+++ /dev/null
@@ -1,333 +0,0 @@
-import React, { useState, useEffect,useMemo,useRef } from 'react'
-import { Table, Card,Button,message,Popconfirm } from 'antd';
-import ToolBar from './toolbar';
-import { useSelector } from 'react-redux';
-import ReactEcharts from 'echarts-for-react';
-import apiurl from '../../../../service/apiurl';
-import { httppost2, httppost5 } from '../../../../utils/request';
-import { exportFile } from '../../../../utils/tools.js';
-import ListSelect from "../../../../components/Form/ListSelect1";
-import './index.less'
-import jrxOption from "./jrxOptions"
-import { Rnd } from "react-rnd"
-
-export default function Xmzlmb() {
-  const role = useSelector(state => state.auth.role);
-
-  const [code, setCode] = useState([])
-  const [searchVal, setSearchVal] = useState({})
-  const [dataSources, setDateSources] = useState([])
-  const [table2Data, setTable2Data] = useState([])
-  const [dmList, setDmList] = useState([])
-  const [trData, setTrData] = useState([])
-  const [swiper, setSwiper] = useState(false)
-  const [timer, setTimer] = useState(100); // 定时器
-  const [dbType, setDbType] = useState('1')
-  const echartsRef = useRef(null)
-  const jrxOptions = useMemo(() => {
-    if (dataSources && dbType) {
-      return jrxOption(dataSources[0],dbType)
-    } else {
-      return dataSources[0];
-    }
-  }, [dataSources,dbType])
-  
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '时间', key: 'tm', dataIndex: 'tm', width: 150, align: "center" },
-    { title: '库水位(m)', key: 'rz', dataIndex: 'rz', width: 150, align: "center" },
-  ];
-  const zcColumns = [
-    {
-      title: '结果分析', key: 'status', dataIndex: 'status', width: 150, align: "center",
-      render: (rec, record) => <span style={!rec ? {color:"red"}:{}}>{rec == 1 ? "正常" : rec == 0 ? "异常" : ''}</span>
-     },
-  ];
-  const columns1 = useMemo(() => {
-    if (trData.length > 0) { 
-    let newCol =  trData.map(s => ({
-        title: `${s}(m)`,
-        key: s,
-        dataIndex: s,
-        width: 150,
-        align: "center",
-      render: (rec, record) => <span>{rec || "-"}</span>
-    }))
-      return [...columns,...newCol,...zcColumns];
-    } 
-  },[trData])
-  const width = useMemo(() => columns1?.reduce((total, cur) => total + (cur.width), 0), [columns1]);
-  // 单图多线以及数据表的数据
-  const getTableData = async(params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.gcaqfx.jrx.page, params)
-      let newArr = [];
-      let newData = res.data.map((s, i) => {
-       newArr.push(s.list.map(c => ({
-         [c.stationCode]: c.value || '-',
-         tm: c.tm,
-        
-        })))
-        return {
-          tm: s.tm,
-          rz: s.rz,
-          status: s.status || '',
-          inx:i+1
-        }
-      })
-      let filterData = newArr.filter(s => s.length > 0).flat()
-      let result = newData.map(s => {
-        let tm1 = s.tm;
-        let r = filterData.filter(t => {
-         return t.tm == tm1
-        })
-        let obj = {};
-        r.forEach(s1 => {
-         obj = {...s1,...obj}
-        })
-        return {
-          ...s,
-          ...obj,
-        }
-      })
-      // let res1 = result.map(item => ({...item,rz:(item.rz - 100).toFixed(2)})) //为了测试  最后需要删除
-      setDateSources(result)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  // 多图单线数据
-  const getTable2Data = async (params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.czcx.list1, params)
-      setTable2Data(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-      profileName: dmList.find(s => s.id == code).projNm,
-      stationCodes: trData,
-      id:1
-    }
-    httppost5(apiurl.gcaqjc.gcaqfx.jrx.export, params).then(res => {
-      exportFile(`浸润线.xlsx`,res.data)
-  })
-  }
-
-  const getDmList = async () => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.sycx.list)
-      setDmList(res.data.map(s => ({ projNm: s.profileName, id: s.profileCode })));
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  const getDmTree = async() => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.czcx.tree)
-      let filterData = res.data.filter(s => s.profileCode == code)
-      setTrData(filterData[0].children)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-
-  const InitialScroll = (data) => {
-    let index = 0; 
-    const v = document.getElementsByClassName("ant-table-body")[0];
-    if (data.length >= Number(1)) {
-      // 只有当大于10条数据的时候 才会看起滚动
-      const time = setInterval(() => {
-        v.scrollTop += Number(14);
-        if (
-          Math.ceil(v.scrollTop) >= parseFloat((v.scrollHeight - v.clientHeight).toString())
-        ) {
-          v.scrollTop = 0;
-        //   setTimeout(() => { v.scrollTop = 0 }, 1000)
-        }
-        echartsRef.current.getEchartsInstance().setOption(jrxOption(dataSources[index % dataSources.length],dbType))
-        index++;
-      }, Number(1000));
-      setTimer(time); // 定时器保存变量 利于停止
-    }
-  };
-
-  const [scale, setScale] = useState(1)
-  const scaleRef = useRef(null)
-  scaleRef.current = scale;
-  // 放大
-  const zoomIn = () => {
-    const img = document.getElementById("img");
-    scaleRef.current += 0.05 
-    // setScale(scaleRef.current)
-    img.style.transform = `scale(${scaleRef.current})`;
-  }
- 
-    // 缩小
-  const zoomOut = () => {
-      console.log(scaleRef);
-      const img = document.getElementById("img");
-      if (scaleRef.current > 1) {
-        scaleRef.current -= 0.05 
-        // setScale(scaleRef.current)
-      }
-      img.style.transform = `scale(${scaleRef.current})`;
-    }
-  useEffect(() => {
-    if (trData.length > 0 && searchVal) {
-      let params = {
-        stationCodes: trData,
-        ...searchVal
-      }
-      getTableData(params)
-      getTable2Data(params)
-    }
-    
-  }, [trData, searchVal]);
-  
-  useEffect(() => {
-    if (code) {
-      getDmTree()
-    }
-    if (timer) {
-      clearInterval(timer)
-    }
-    if (dmList.length > 0 && code) {
-      let name = dmList.find(s => s.id == code)?.projNm
-      let type = name == "大坝B0+060" ? "1" :
-        name == "大坝B0+090" ? "2" :
-        name == "大坝B0+120" ? "2" : ''
-      setDbType(type)
-    }
-  }, [code])
-  useEffect(() => {
-    getDmList()
-  }, [])
-  
-  useEffect(() => {
-    if (swiper && dataSources.length > 0) {
-      InitialScroll(dataSources)
-    } else {
-      clearInterval(timer)
-    }
-    return () => {
-      clearInterval(timer); // 停止定时器
-    }
-  }, [swiper, dataSources])
-  
-  useEffect(()=>{
-    let scale = 1
-    const img = document.getElementById("img");
-    const fun = (e) => {
-      console.log(1111)
-      // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
-      if (e.wheelDelta > 0) {
-      scale += 0.05;
-      img.style.transform = `scale(${scale})`;
-      } else {
-      if (scale == 1) {
-          img.style.left = 0 + "px";
-          img.style.top = 0 + "px";
-      }
-      // 缩放值大于1时,可以缩小,反之亦然
-      if (scale > 1) {
-          scale -= 0.05;
-          img.style.transform = `scale(${scale})`;
-      }
-      }
-  }
-    img.addEventListener("wheel",fun)
-    return ()=>{
-      img.removeEventListener("wheel",fun)
-    }
-
-  },[])
-  
-  return (
-    <div className='content-box' style={{ backgroundColor: '#fff', height: '100%',display:'flex',padding:'10px' }}>
-      <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 110px)',width:'260px'}}>
-      <ListSelect
-        setAdcd={setCode}
-        listData={dmList}
-          />
-        </div>
-      <div className='AdcdTreeTableBox' style={{width:'calc(100vw - 625px)'}}>
-        <Card
-          className='nonebox'
-          // onMouseOver={() => {
-          //   clearInterval(timer)
-          // }}
-        >
-          <ToolBar
-            setSearchVal={setSearchVal}
-            exportFile={exportExcel}
-            setSwiper={setSwiper}
-            role={role}
-          />
-        </Card>
-        <div className="ant-card-body" style={{ padding: "20px 0 0 0",overflow:"hidden" }}>
-      
-          <div className='body-top' style={{ height: 380, width: "100%", marginTop: 10 }} >
-          <Rnd 
-          default={{
-              x: 0,
-              y: 0,
-              width: '68%',
-              height: 380
-              }}
-              // style={{position:"relative"}}
-              
-            >
-              <div id="img">
-                <div style={{ textAlign: "center", marginBottom: 10,fontSize:20 }}>断面名称:{ dmList.find(s => s.id == code)?.projNm}</div>
-              {/* <div style={{ position: "absolute", top: -38, right: 131,cursor:"pointer",fontWeight:700 }}>
-                <div
-                  style={{ padding: "0px 8px", border: "1px solid #dfdfdf", textAlign: "center" }}
-                  title='放大'
-                  onClick={zoomIn}
-                >
-                  +
-                </div>
-                <div
-                  style={{ padding: "0px 8px", border: "1px solid #dfdfdf", marginTop: 5, textAlign: "center" }}
-                  title='缩小'
-                  onClick={zoomOut}
-                >
-                  -
-                </div>
-              </div>   */}
-          <ReactEcharts
-            option={jrxOptions}
-              style={{ width: "100%", height: 380 }}
-              notMerge={true}
-                ref={echartsRef}
-                
-            />
-              </div>
-        </Rnd>    
-          </div>
-          <div className='body-top' style={{marginTop:60}}>
-           <Table
-              columns={columns1}
-              key="inx"
-              dataSource={dataSources}
-              pagination={false}
-              scroll={{ x: width, y: 250, scrollToFirstRowOnChange: true }}
-              onRow={record => {
-                return {
-                  onClick:() => {echartsRef.current.getEchartsInstance().setOption(jrxOption(record,dbType))}
-                }
-              }}
-          />
-          </div>
-      </div>
-      </div>
-      </div>
-  )
-}
diff --git a/src/views/gcaqjc/gcaqfx/jrx/index.less b/src/views/gcaqjc/gcaqfx/jrx/index.less
deleted file mode 100644
index 119b8dd..0000000
--- a/src/views/gcaqjc/gcaqfx/jrx/index.less
+++ /dev/null
@@ -1,21 +0,0 @@
-
-    .basci-title{
-        display: flex;
-        column-gap: 20px;
-        align-items: center;
-        position: relative;
-        font-size: 16px;
-        margin-bottom: 20px;
-        padding:5px 25px;
-        border-bottom: 1px solid #eee;
-        &::before{
-            position: absolute;
-            top:7px;
-            left:0;
-            content: "";
-            display: block;
-            width: 5px;
-            height: 20px;
-            background-color: #0079fe;
-        }
-    }
diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
deleted file mode 100644
index 58045d2..0000000
--- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
+++ /dev/null
@@ -1,354 +0,0 @@
-
-export default function jrxOptions(data = {}, type = "1") {
-   // const yMin = type == "1" ? 147 : type == "2" ? 146 : 146;
-   // const yMax = type == "1" ? 209 : type == "2" ? 210 : 210;
-   const yMin = type == "1" ? 70 : type == "2" ? 70 : 70;
-   const yMax = type == "1" ? 154 : type == "2" ? 150 : 150;
-   const type1 = ["SY05", "SY06", "SY07", "SY08"]
-   const type2 = ["SY09","SY10","SY11","SY12"]
-   const alltype = type == "1" ? type1 : type == "2" ? type2 : type2;
-   
-    // 字体颜色
-const textColor = '#666'
-    const imageUrl060 = `${process.env.PUBLIC_URL}/assets/images/060.png ` 
-    const imageUrl090 = `${process.env.PUBLIC_URL}/assets/images/090.png `
-   const imageUrl = type == "1" ? imageUrl060 :
-      type == "2" ? imageUrl090 : imageUrl090;
-    const rule = `${process.env.PUBLIC_URL}/assets/images/ruler.png ` 
-   // const xValue = type == "1" ? (((data?.rz - 169) + 0.75 * 14) / 0.75):
-   //    type == "2" ? (((data?.rz - 169) + 0.85 * 14) / 0.85) : (((data?.rz - 169) + 0.85 * 14) / 0.85)
-   
-      const xValue = type == "1" ? (((data?.rz - 99) + 1.1 * 13) / 1.1):
-      type == "2" ? (((data?.rz - 99) + 1 * 14) / 1) : (((data?.rz - 99) + 1 * 14) / 1)
-   const rz = data?.rz ?
-      [[xValue, data?.rz], [0, data?.rz], ] :
-      []
-   const rz1 = data?.rz ?
-         type == "1" ?
-         [[0, 99], [13, 99], [xValue, data?.rz]]:
-         type == "2" ?
-         [[0, 99], [14, 99], [xValue, data?.rz]]
-            :  [[0, 99], [14, 99], [xValue, data?.rz]]
-         :
-      []
-   const gz1 = data[alltype[0]] ?
-      type == "1" ? [[51.6, 85], [51.6, data[alltype[0]]]] :
-         type == "2" ? [[47.5, 85], [47.5, data[alltype[0]]]] :
-            [[47.5, 158], [85, data[alltype[0]]]]
-      : [];
-   // const gz1 = [[51.6, 85],[51.6, 91]];
-   // const gz2 = [[53.6, 85], [53.6, 94]];
-   
-   // const gz3 = [[72.5, 90], [72.5, 95]];
-   // const gz4 = [[84.5, 96], [84.5, 99]];
-
-   
-   const gz2 = data[alltype[1]] ?
-   type == "1" ? [[53.6, 85], [53.6, data[alltype[1]]]] :
-   type == "2" ? [[49.5, 85], [49.5, data[alltype[1]]]] :
-      [[53.6, 158], [53.6, data[alltype[1]]]] :
-      [];
-   
-   const gz3 = data[alltype[2]] ?
-   type == "1" ? [[72.5, 90], [72.5, data[alltype[2]]]] :
-   type == "2" ? [[66.5, 90], [66.5, data[alltype[2]]]] :
-            [[73, 161], [73, data[alltype[2]]]] : [];
-   
-   const gz4 = data[alltype[3]] ?
-   type == "1" ? [[84.5, 96], [84.5, data[alltype[3]]]] :
-   type == "2" ? [[77, 96], [77, data[alltype[3]]]] :
-            [[85, 166], [85, data[alltype[3]]]] : [];
-   
-   const line = data?.rz ?
-      type == "1" ? 
-      [
-         [xValue, data?.rz],
-         [51.6, data[alltype[0]]],
-         [53.6, data[alltype[1]]],
-         [72.5, data[alltype[2]]],
-         [84.5, data[alltype[3]]]
-         ] :
-         type == "2" ?
-      [
-        [xValue, data?.rz],
-        [47.5, data[alltype[0]]],
-        [49.5, data[alltype[1]]],
-        [66.5, data[alltype[2]]],
-        [77, data[alltype[3]]]
-            ] :
-            [
-               [xValue, data?.rz],
-               [51.6, data[alltype[0]]],
-               [53.6, data[alltype[1]]],
-               [73, data[alltype[2]]],
-               [85, data[alltype[3]]]
-             ]
-            : []
-return {
-    toolbox: {
-        show: true,
-        feature: {
-          saveAsImage: {
-            show: true,
-            excludeComponents: ['toolbox'],
-            pixelRatio: 2,
-            name:"测值图"
-          },
-        },
-        right: "10%",
-        top:"4%"
-      },
-   // title: {
-   //    show: true,
-   //    text: "断面名称",
-   //    left: 'center',
-   //    bottom: '-5%',
-   //    // textStyle: {
-   //  },
-    graphic: [
-        {
-          type: 'image',
-        //   id: 'background',
-          left: 'center',
-            // top: '11%',
-            top: 0,
-          bottom:0,
-          z: 1,
-          bounding: 'all',
-          style: {
-            image: imageUrl,
-            width: 1100,
-            height: 380
-          }
-        },
-        {
-            type: 'image',
-          //   id: 'background',
-            left: '7%',
-            bottom:"5%",
-            z: 1,
-            bounding: 'all',
-            style: {
-              image: rule,
-              width: 10,
-              height: 450
-            }
-          }
-      ],
-   grid: {
-    //   top: '10%',
-    //   left: '2%',
-    //   right: '5%',
-    //   bottom: '10%',
-    //    containLabel: true
-       top: '0%',
-       left: '2%',
-       right: '5%',
-       bottom: '0%',
-       containLabel: true
-   },
-   xAxis: {
-       min: 0,
-        max:100,
-       axisLabel: {
-        show:false,
-         // 坐标轴字体颜色
-         color: textColor,
-         fontSize: 18
-      },
-       axisLine: {
-          show:false,
-         lineStyle: {
-            color: textColor
-         }
-      },
-      axisTick: {
-         // y轴刻度线
-         show: false
-      },
-      splitLine: {
-         // 网格
-         show: false
-      },
-      boundaryGap: false
-   },
-   yAxis: {
-      type: 'value',
-      min: yMin,
-       max: yMax,
-       interval:5,
-    //   data:[155,160,180,190,210],
-      nameTextStyle: {
-         color: '#333',
-         fontSize: 18,
-         padding: [0, 0, 0, 80]
-      },
-      axisLabel: {
-         // 坐标轴字体颜色
-         color: textColor,
-          fontSize: 18,
-         formatter: function (value, index,i) {
-            if (index === 0 || value ===  yMax) {
-                return ''; // 隐藏第一个刻度和最后一个刻度
-              } else {
-                return value; // 显示其他刻度
-              }
-          }
-      },
-      axisLine: {
-         show: false
-      },
-      axisTick: {
-         // y轴刻度线
-         show: false
-      },
-      splitLine: {
-         // 网格
-         show: false,
-         lineStyle: {
-            color: '#CCCCCC',
-            type: 'dashed'
-         }
-      }
-   },
-
-    series: [
-       //  和大坝坡面重合的线 斜率为0.75 
-       {
-        
-         type: 'line',
-         symbol: 'none',
-         symbolSize: 10,
-         z: 1,
-         itemStyle: {
-            color: '#fff'
-         },
-         lineStyle: {
-            color: '#fff'
-          },
-               areaStyle: {
-                origin: "end",
-                color: 'rgba(0, 128, 255, 0.3)' // 设置区域填充颜色
-          },
-         data:[...rz,...rz1]
-           
-       },
-      {
-        
-         type: 'line',
-         symbol: 'none',
-         symbolSize: 10,
-         z: 1,
-         itemStyle: {
-            color: '#5487FF'
-         },
-         lineStyle: {
-            color: '#5487FF'
-         },
-         markPoint: {
-            data: [{ type: 'max',x:"20%", coord: [xValue, data?.rz] }],
-            symbol: 'pin',
-            symbolSize: [30, 10],
-            itemStyle: {
-              color: '#fff', // 标注点颜色
-              borderColor: '#ffa500', // 标注点边框颜色
-              borderWidth: 0 // 标注点边框宽度
-            },
-            label: {
-              show: data?.rz ? true : false, // 是否显示标签
-              formatter: "库水位" +data?.rz + "m", // 标签格式
-              color: '#5487FF', // 标签文字颜色
-              fontSize: 12, // 标签文字大小
-            }
-          },
-            data:rz
-       },
-       {
-        
-         type: 'line',
-         symbol: 'none',
-         symbolSize: 10,
-         z: 1,
-         itemStyle: {
-            color: '#5487FF'
-         },
-         lineStyle: {
-            color: '#5487FF'
-         },
-            data:rz1
-        },
-    // 管位
-    {
-        type: 'line',
-        symbol: 'none',
-        symbolSize: 10,
-        z: 1,
-        itemStyle: {
-           color: '#5487FF'
-        },
-        lineStyle: {
-            color: '#5487FF',
-            width:6
-        },
-        data: gz1
-       },  
-       {
-        type: 'line',
-        symbol: 'none',
-        symbolSize: 10,
-        z: 1,
-        itemStyle: {
-           color: '#5487FF'
-        },
-        lineStyle: {
-            color: '#5487FF',
-            width:6
-        },
-        data: gz2
-        },
-        {
-            type: 'line',
-            symbol: 'none',
-            symbolSize: 10,
-            z: 1,
-            itemStyle: {
-               color: '#5487FF'
-            },
-            lineStyle: {
-                color: '#5487FF',
-                width:6
-            },
-            data: gz3
-        },
-        {
-            type: 'line',
-            symbol: 'none',
-            symbolSize: 10,
-            z: 1,
-            itemStyle: {
-               color: '#5487FF'
-            },
-            lineStyle: {
-                color: '#5487FF',
-                width:6
-            },
-            data: gz4
-        },
-        // 管位连接线
-        {
-            type: 'line',
-            symbol: 'none',
-            symbolSize: 10,
-            z: 1,
-            itemStyle: {
-               color: '#5487FF'
-            },
-            lineStyle: {
-                color: '#5487FF',
-            },
-            data: line
-        },
-   ]
-};
-
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/gcaqfx/jrx/toolbar.js b/src/views/gcaqjc/gcaqfx/jrx/toolbar.js
deleted file mode 100644
index b02fb92..0000000
--- a/src/views/gcaqjc/gcaqfx/jrx/toolbar.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Switch  } from 'antd';
-import moment from 'moment';
-import { AppstoreOutlined, BarsOutlined } from '@ant-design/icons'
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ setSearchVal, onSave,setSwiper,exportFile,role }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
- 
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
-  useEffect(() => {
-    let time = [moment().subtract(1,"days"),moment()]
-     let dateSo = {
-       start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-       end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-    }
-    form.setFieldValue("tm",time)
-    setSearchVal({dateTimeRangeSo:dateSo})
-  }, [])
-
-  useEffect(() => {
-    form.setFieldValue("swiper",false)
-  }, [])
-  
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {exportBtn ?  <Form.Item>
-          <Button onClick={()=>exportFile()}>导出</Button>
-          </Form.Item>: null}
-         
-          <Form.Item label="轮播" name="swiper">
-          <Switch onChange={(e) => setSwiper(e)} />
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/gcaqyj/yhyj/index.js b/src/views/gcaqjc/gcaqyj/yhyj/index.js
deleted file mode 100644
index c8ac6d4..0000000
--- a/src/views/gcaqjc/gcaqyj/yhyj/index.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import { useSelector } from 'react-redux';
-
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { httppost2 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const typeObj = {
-    1: "渗压监测",
-    2: "渗流监测",
-    3:"位移监测"
-  }
-  const levelObj = {
-    1: "黄色",
-    2:"红色"
-  }
-
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [total, setTotal] = useState({})
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '告警时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
-    {
-      title: '监测类型', key: 'type', dataIndex: 'type', width: 200, align:"center",
-      render: (rec, record) => <span>{typeObj[rec]}</span>
-    },
-    { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 140 , align:"center"},
-    {
-      title: '告警级别', key: 'level', dataIndex: 'level', width: 200, align:"center",
-      render: (rec,record) => <div style={{position:"relative"}}>
-        <span>{levelObj[rec]}</span>
-        <span style={{
-          position: "absolute",
-          top: 5, left: "28%",
-          width: 10,
-          height: 10,
-          borderRadius: 5,
-          backgroundColor: rec == 1 ? "#e9df1e" : "#d62f28"
-        }}></span>
-      </div>
-    },
-    { title: '监测值(m)', key: 'value', dataIndex: 'value', width: 150, ellipsis: true,align:"center", },
-    {
-      title: '阈值', key: 'phone', dataIndex: 'phone', width: 250, ellipsis: true,align:"center",
-      render: (_, record) => <span>
-        {record.conditionOne || ''}
-        {record.valueOne || ''}
-        {record.condition ? record.condition == 1 ? "且" : "或" : ''}
-        {record.conditionTwo || ''}
-        {record.valueTwo || ''}
-      </span>
-     },
-    { title: '校验规则描述', key: 'ruleDesc', dataIndex: 'ruleDesc', width: 250, ellipsis: true,align:"center", },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.gcaqjc.gcaqyj.yhyj.delete + `/${params.goodsId}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gcaqjc.gcaqyj.yhyj.page).find_noCode);
-
-  const getStaticData = async (params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.gcaqyj.yhyj.total,params.search)
-      setTotal(res.data);
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  useEffect(() => {
-    if (searchVal) {
-      
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      };
-      search(params)
-      getStaticData(params)
-    }
-  }, [searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <div style={{width:"100%",display:"flex",alignContent:"center",columnGap:20}}>
-            <div className='first-card'>
-              <div style={{ display: "flex", flexDirection: "column", alignItems: "center" }}>
-                <span style={{fontSize:20,fontWeight:"bold"}}>黄色预警</span>
-                <span style={{ fontSize: 20, fontWeight: "bold" }}>{ total[1] || ''}</span>
-              </div>
-            </div>
-            <div className='second-card'>
-            <div style={{ display: "flex", flexDirection: "column", alignItems: "center" }}>
-                <span style={{fontSize:20,fontWeight:"bold"}}>红色预警</span>
-                <span style={{fontSize:20,fontWeight:"bold"}}>{ total[2] || ''}</span>
-              </div>
-            </div>
-          </div>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/gcaqyj/yhyj/index.less b/src/views/gcaqjc/gcaqyj/yhyj/index.less
deleted file mode 100644
index d22a6aa..0000000
--- a/src/views/gcaqjc/gcaqyj/yhyj/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js b/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js
deleted file mode 100644
index b10825d..0000000
--- a/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const optionsType = [
-    {
-      label: "渗压监测",
-      value:1
-    },
-    {
-      label: "渗流监测",
-      value:2
-    },
-    {
-      label:"位移监测",
-      value:3
-    },
-  ]
-
-  const optionsLevel = [
-    {
-      label: "黄色",
-      value:1
-    },
-    {
-      label: "红色",
-      value:2
-    },
-  ]
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-  useEffect(() => {
-   let time = [moment().subtract(1,"weeks"),moment()]
-    let dateSo = {
-      start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-      end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-   }
-   form.setFieldValue("tm",time)
-   setSearchVal({dateTimeRangeSo:dateSo})
- }, [])
- 
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="监测类型" name="type">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-          <Form.Item label="测点编号" name="stationCode">
-            <Input allowClear/>
-          </Form.Item>
-          <Form.Item label="预警级别" name="level">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsLevel}
-            />
-          </Form.Item> 
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js b/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
deleted file mode 100644
index 32a9341..0000000
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
+++ /dev/null
@@ -1,391 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal,Radio } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { httppost2 } from '../../../../utils/request';
-
-import moment from 'moment';
-const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
-  const optionsType = [
-    {
-      label: "渗压监测",
-      value:1
-    },
-    {
-      label: "渗流监测",
-      value:2
-    },
-    {
-      label:"位移监测",
-      value:3
-    },
-  ]
-  const optionsLevel = [
-    {
-      label: "黄色告警",
-      value:1
-    },
-    {
-      label: "红色告警",
-      value:2
-    },
-  ]
-
-  const conditionOneType = [
-    {
-      label: ">",
-      value:">"
-    },
-    {
-      label: "<",
-      value:"<"
-    },
-    {
-      label: "=",
-      value:"="
-    },
-    {
-      label: ">=",
-      value:">="
-    },
-    {
-      label: "<=",
-      value:"<="
-    },
-    {
-      label: "!=",
-      value:"!="
-    },
-  ]
- 
-
-  const condition = [
-    {
-      label: "且",
-      value:1
-    },
-    {
-      label: "或",
-      value:2
-    },
-  ]
-
-  const wyOptions = [
-    {
-      label: "X方向",
-      value:"x"
-    },
-    {
-      label: "Y方向",
-      value:"y"
-    },
-    {
-      label: "H方向",
-      value:"h"
-    },
-  ]
-
-  console.log("record",record);
-  const [form] = Form.useForm();
-  const [staCodeList, setStaCodeList] = useState([])
-  const [Condition, setCondition] = useState("")
-  const [types, setTypes] = useState('')
-  const [slStacodeList, setSlStacodeList] = useState([])
-  const onFinish = (values) => {
-    values.valueOne = values.valueOne ? Number(values.valueOne) : ''
-    values.valueTwo = values.valueTwo ? Number(values.valueTwo)  : ''
-    if (mode === 'edit') {
-      values.id = record.id;
-      values.createTime = record.createTime
-      onEdit(apiurl.gcaqjc.gcaqyj.yjgzpz.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.gcaqjc.gcaqyj.yjgzpz.save,values)
-    }
-  
-  }
-
-  const [codeList, setCodeList] = useState([])
-
-  const getwYCode = async () => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.list)
-      setCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode})));
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  const getSlCode = async () => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.slList)
-      setSlStacodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode})));
-    } catch (error) {
-      console.log(error);
-    }
-  }
- const getStationCode = async () => {
-  try {
-    const res = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.list)
-    setStaCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode})));
-  } catch (error) {
-    console.log(error);
-  }
-}
- 
-  useEffect(()=>{
-    if (mode !== "save" ) {
-        // getFileInfo(record)
-      setCondition(record?.condition)
-      setTypes(record.type)
-    }
-  }, [record, mode])
-
-  useEffect(() => {
-    getwYCode()
-    getStationCode()
-    getSlCode()
-  }, [])
-  useEffect(() => {
-    if (mode == "save") {
-        form.setFieldValue("status", 1)
-    }
-  }, [mode])
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="告警类型"
-                name="type"
-                rules={[{ required: true }]}
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear options={optionsType}
-                onChange={(e) => setTypes(e)}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="告警级别"
-                name="level"
-                rules={[{ required: true }]}
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={optionsLevel}
-
-              />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="测点编号"
-                rules={[{ required: true }]}
-                name="stationCode"
-               
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear 
-                options={
-                  types == 3 ? codeList : 
-                    types == 1 ? staCodeList : slStacodeList
-                  } />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="校验规则描述"
-                rules={[{ required: true }]}
-                name="ruleDesc"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-        {types != 3 ?
-          <>
-             <Row>
-          <Col span={12}>
-              <Form.Item
-                label="阈值"
-                name="conditionOne"
-              rules={[{ required: true }]}
-              >
-              
-              <NormalSelect  disabled={mode === 'view'} style={{ width: '100%' }} allowClear options={conditionOneType} />
-            </Form.Item>
-          </Col>
-          <Col span={6}>
-            <Form.Item
-                label=""
-                name="valueOne"
-              rules={[{ required: true }]}
-              >
-              <Input type='num' disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-            </Col>
-          <Col span={6}>
-             <Form.Item
-                label=""
-                name="condition"
-
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={condition}
-                onChange={(e) => { setCondition(e)} }
-              />
-            </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label=""
-                name="conditionTwo"
-                wrapperCol={{span:18,offset:6}}
-                rules={[{ required: Condition ? true : false}]}
-              >
-                <NormalSelect  disabled={mode === 'view' || !Condition} style={{ width: '78%' }} allowClear options={conditionOneType} />
-              </Form.Item>
-          </Col>
-          <Col span={6}>
-            <Form.Item
-                label=""
-                name="valueTwo"
-                rules={[{ required: Condition ? true : false}]}
-              >
-              <Input type='num' disabled={mode === 'view'|| !Condition} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-            </Col>
-        </Row>
-          </>
-          :
-          <>
-             <Row>
-          <Col span={12}>
-              <Form.Item
-                label="阈值"
-                name="direction"
-              rules={[{ required: true }]}
-              >
-              
-              <NormalSelect  disabled={mode === 'view'} style={{ width: '100%' }} allowClear options={wyOptions} />
-            </Form.Item>
-          </Col>
-       
-      </Row>
-      <Row >
-      <Col span={6} >
-            <Form.Item
-                label=""
-                name="conditionOne"
-              rules={[{ required: true }]}
-              wrapperCol={{span:12,offset:12}}
-              >
-              <NormalSelect  disabled={mode === 'view'} style={{ width: '100%' }} allowClear options={conditionOneType} />
-            </Form.Item>
-            </Col>
-       <Col span={4}>
-            <Form.Item
-                label=""
-                name="valueOne"
-                wrapperCol={{span:20,offset:4}}
-                // wrapperCol={{span:20,offset:9}}
-              >
-              <Input type='num' disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-            </Col>    
-          <Col span={3}>
-             <Form.Item
-                label=""
-                name="condition"
-                wrapperCol={{span:12,offset:12}}
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={condition}
-                onChange={(e) => { setCondition(e)} }
-              />
-            </Form.Item>
-          </Col>
-          <Col span={6}>
-              <Form.Item
-                label=""
-                name="conditionTwo"
-                wrapperCol={{span:12,offset:12}}
-                rules={[{ required: Condition ? true : false}]}
-              >
-                <NormalSelect  disabled={mode === 'view' || !Condition} style={{ width: '100%' }} allowClear options={conditionOneType} />
-              </Form.Item>
-          </Col>
-          <Col span={3}>
-            <Form.Item
-                label=""
-                name="valueTwo"
-                // wrapperCol={{span:10,offset:12}}
-                wrapperCol={{span:20,offset:4}}
-                rules={[{ required: Condition ? true : false}]}
-              >
-              <Input type='num' disabled={mode === 'view'|| !Condition} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-            </Col>
-        </Row>
-          </>
-     }
-        <Row>
-          <Col span={12}>
-              <Form.Item
-                label="是否启用"
-                name="status"
-                rules={[{ required: true }]}
-              >
-                 <Radio.Group disabled={mode === 'view'} >
-                  <Radio value={1}>启用</Radio>
-                  <Radio value={0}>不启用</Radio>
-              </Radio.Group>
-              </Form.Item>
-          </Col>  
-      </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '保存' :
-                    mode === "similarSave" ? "保存" :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/index.js b/src/views/gcaqjc/gcaqyj/yjgzpz/index.js
deleted file mode 100644
index 84d974d..0000000
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/index.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ModalForm from './form';
-import ToolBar from './toolbar';
-import { useSelector } from 'react-redux';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const typeObj = {
-    1: "渗压监测",
-    2: "渗流监测",
-    3:"位移监测"
-  }
-  const levelObj = {
-    1: "黄色",
-    2:"红色"
-  }
-
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    {
-      title: '监测类型', key: 'type', dataIndex: 'type', width: 200, align:"center",
-      render: (rec, record) => <span>{typeObj[rec]}</span>
-    },
-    { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 140,align:"center", },
-    {
-      title: '告警级别', key: 'level', dataIndex: 'level', width: 200,align:"center",
-      render: (rec,record) => <div style={{position:"relative"}}>
-        <span>{levelObj[rec]}</span>
-      </div>
-    },
-    { title: '校验规则描述', key: 'ruleDesc', dataIndex: 'ruleDesc', width: 250, ellipsis: true,align:"center" },
-    {
-      title: '阈值', key: 'phone', dataIndex: 'phone', width: 250, ellipsis: true,align:"center",
-      render: (_, record) => <span>
-      {record.direction ? record.direction + "方向" : ''} 
-      {record.conditionOne || ''}
-      {record.valueOne || ''}
-      {record.condition ? record.condition == 1 ? "且" : "或" : ''}
-      {record.conditionTwo || ''}
-      {record.valueTwo || ''}
-    </span>
-     },
-    {
-      title: '是否启用', key: 'status', dataIndex: 'status', width: 250, ellipsis: true,align:"center",
-      render: (rec, record) => <div>{rec == 1 ? "启用" : rec == 0 ? "不启用" : ''}</div>
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-        command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.gcaqjc.gcaqyj.yjgzpz.delete + `/${params.id}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gcaqjc.gcaqyj.yjgzpz.page).find_noCode);
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/index.less b/src/views/gcaqjc/gcaqyj/yjgzpz/index.less
deleted file mode 100644
index d22a6aa..0000000
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js b/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js
deleted file mode 100644
index 3af8ea6..0000000
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const optionsType = [
-    {
-      label: "渗压监测",
-      value:1
-    },
-    {
-      label: "渗流监测",
-      value:2
-    },
-    {
-      label:"位移监测",
-      value:3
-    },
-  ]
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="监测类型" name="type">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-          <Form.Item label="测点编号" name="stationCode">
-            <Input allowClear/>
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/czcx/AdcdTreeSelector/index.less b/src/views/gcaqjc/sjtjcx/czcx/AdcdTreeSelector/index.less
deleted file mode 100644
index 3b94c18..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-.treeBox1{
-  .ant-tree-node-content-wrapper{
-    position: static !important;
-  }
-
-}
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-}
-.no-matter{
-  opacity: 0.5;
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/czcx/AdcdTreeSelector/index.tsx b/src/views/gcaqjc/sjtjcx/czcx/AdcdTreeSelector/index.tsx
deleted file mode 100644
index 8bd6791..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal,Tag, message } from 'antd';
-import { FileTextOutlined } from '@ant-design/icons';
-import './index.less';
-import {getAdcdTreeData7} from '../../../../../service/warn';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  setSigleItem?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  isFetch?: boolean;
-}
-
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd,setSigleItem,isFetch, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({})
-  const [selectedList, setSelectedList] = useState<any>([])
-
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-  
-    const adcdTreedata: any = await getAdcdTreeData7();
-    const item: any = adcdTreedata.map((i: any) => i.children)
-    // if (item) {
-    //   setSelectedKeys(item[0])
-    //   setAdcd(item[0])
-    // }
-    if (adcdTreedata.length > 0) {
-      let res: any = handelTreeData(adcdTreedata);
-      setTreeData(res);
-      setLoading(false);
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-    return data.map((item:any) => {
-        return {
-          title: item.profileName,
-          key: item.profileCode,
-          disabled: true,
-          children: item.children && item.children.length > 0? item.children.map((i:any) => ({title: i,key: i})) : [],
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-
-  const onSelect = (selectedKeysValue: any, info: any) => {
-    let filterData = Array.from(new Set([...selectedList, ...selectedKeysValue]))
-    if (filterData.length > 4) {
-      message.info("最多只能选择4个测点")
-      return;
-    }
-    if (selectedList.includes(selectedKeysValue[0])) {
-      message.info("已选择该测点")
-      return;
-    }
-    setSelectedList(filterData)
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-    setAdcd(filterData)
-    setSigleItem(selectedKeysValue[0])
-  };
-
-  const handleClose = (e: any) => {
-    let newData = selectedList.filter((s: any) => s !== e)
-    setSelectedList(newData);
-    setAdcd(newData);
-  }
-
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-        <div style={{
-        padding: '10px',
-      }}>
-        <span>已选测点：</span>
-        {
-          selectedList.length > 0 && selectedList.map((item: any,i:any) => (
-            <Tag
-              closable
-              key={item}
-              color="#24c8ca"
-              onClose={() => handleClose(item)}
-              style={{marginBottom: '10px'}}
-              >{item}
-              </Tag>
-          ))
-        }
-        
-      </div>
-
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"50px",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null
-      }
-
-      <div className="treeBox1" style={{...treeBoxHeight}}>
-        <div style={{ width: "230px", overflow: "hidden" }}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              // titleRender={(v: any) => {
-              //   return (
-              //     <div>
-              //       <div className={v.status ? "" : "no-matter"}>{v.title}</div>
-              //     </div>
-              //   )
-              // }}
-            />
-          }
-        </div>
-      
-      </div>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/gcaqjc/sjtjcx/czcx/dtOptions.js b/src/views/gcaqjc/sjtjcx/czcx/dtOptions.js
deleted file mode 100644
index fc6acc2..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/dtOptions.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import { max, min } from "moment";
-
-export default function dtOption(code, data) {
-   console.log(code, data);
- const colorArr = ["#8cd6d7","#a7cdde","#f9e397","#5487FF"]   
-    // 字体颜色
-const textColor = '#666'
-
-const maxRz = Math.ceil(Math.max(...code.map(obj => {
-   return  obj?.rz ? obj?.rz:0
- })))
- const minRz = Math.floor(Math.min(...code.map(obj => {
-   return  obj?.rz? obj?.rz :300
- })))
- 
-   const cydata = data.map(item => code.map(o => o[item]))
-   const mincy = Math.floor(Math.min(...cydata.flat().filter(item => item !="")));
-   const maxcy = Math.ceil(Math.max(...cydata.flat().filter(item => item !="")));
-let dataList = data.map((item,i) => (
-    {
-        name: `${item}测压管水位`,
-        type: 'line',
-        yAxisIndex: 0,
-        symbol: 'circle',
-        smooth: true,
-        symbolSize: 5,
-        z: 1,
-        itemStyle: {
-           color: colorArr[i]
-        },
-        lineStyle: {
-           color: colorArr[i]
-        },
-       data: code.map(s => s[item])
-     
-    }))
-let rzList =  {
-    name: `库水位`,
-    type: 'line',
-    yAxisIndex: 1,
-    symbol: 'circle',
-    smooth: true,
-    symbolSize: 5,
-    z: 1,
-    itemStyle: {
-       color: "#f5cfc0"
-    },
-    lineStyle: {
-       color: "#f5cfc0"
-    },
-   data: code.map(s => s.rz)
-}
-    return {
-        toolbox: {
-            show: true,
-            feature: {
-              saveAsImage: {
-                show: true,
-                excludeComponents: ['toolbox'],
-                pixelRatio: 2,
-                name:"测值图"
-              }
-            },
-            right: "14%",
-            top:"5%"
-          },
-    legend: {
-        top: "4%",
-        y: "center",
-        itemWidth: 30,
-        itemHeight: 15,
-        itemGap: 15,
-        textStyle: {
-           fontSize: 12,
-           color: "#000",
-           padding: [0, 0, 0, 6],
-        },
-     },
-   tooltip: {
-      trigger: 'axis'
-   },
-   grid: {
-      top: '20%',
-      left: '5%',
-      right: '10%',
-      bottom: '20%',
-      containLabel: true
-   },
-   xAxis: {
-      type: 'category',
-      data:code.map(item => item.tm),
-      axisLabel: {
-         // 坐标轴字体颜色
-         color: textColor,
-         fontSize: 18
-      },
-      axisLine: {
-         lineStyle: {
-            color: textColor
-         }
-      },
-      axisTick: {
-         // y轴刻度线
-         show: true
-      },
-      splitLine: {
-         // 网格
-         show: false
-      },
-      boundaryGap: false
-   },
-    yAxis: [
-        {
-            type: 'value',
-          min: mincy,
-            max:maxcy,
-            name: '测值（m）',
-            nameTextStyle: {
-               color: '#333',
-               fontSize: 18,
-               padding: [0, 0, 0, 80]
-            },
-            axisLabel: {
-               // 坐标轴字体颜色
-               color: textColor,
-               fontSize: 18
-            },
-            axisLine: {
-               show: true
-            },
-            axisTick: {
-               // y轴刻度线
-               show: false
-            },
-            splitLine: {
-               // 网格
-               show: true,
-               lineStyle: {
-                  color: '#CCCCCC',
-                  type: 'dashed'
-               }
-            }
-        },
-        {
-            type: 'value',
-            min: minRz,
-            max: maxRz,
-            name: '库水位（m）',
-            nameTextStyle: {
-               color: '#333',
-               fontSize: 18,
-               padding: [0, 0, 0, 80]
-            },
-            axisLabel: {
-               // 坐标轴字体颜色
-               color: textColor,
-               fontSize: 18
-            },
-            axisLine: {
-               show: true
-            },
-            axisTick: {
-               // y轴刻度线
-               show: false
-            },
-            splitLine: {
-               // 网格
-               show: true,
-               lineStyle: {
-                  color: '#CCCCCC',
-                  type: 'dashed'
-               }
-            }
-         },
-   ],
-
-    series:[...dataList, rzList]
-};
-
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js b/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
deleted file mode 100644
index 434c92f..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-export default function dtOption(doubleData) {  
-   console.log("doubleData", doubleData);
-   const maxRz = Math.ceil(Math.max(...doubleData?.detailVos?.map(o => o.rz)))
-   const minRz = Math.floor(Math.min(...doubleData?.detailVos?.map(o => o.rz)))
-   const maxcy = Math.ceil(Math.max(...doubleData?.detailVos?.map(o => o.value)))
-   const mincy = Math.floor(Math.min(...doubleData?.detailVos?.map(o => o.value)))
-   console.log(maxRz,minRz,maxcy,mincy);
-    // 字体颜色
-const textColor = '#666'
-   return {
-      title: {
-         text: `${doubleData?.stationCode}测压管水位过程线`,
-         bottom: "5%",
-         left: "40%",
-         textStyle: {
-            fontWeight: "normal",
-            fontSize:14
-         }
-       },
-        toolbox: {
-            show: true,
-            feature: {
-              saveAsImage: {
-                show: true,
-                excludeComponents: ['toolbox'],
-                pixelRatio: 2,
-                name:`${doubleData?.stationCode}测压管水位过程线`
-              }
-            },
-            right: "20%",
-            top:"5%"
-          },
-    legend: {
-        top: "4%",
-        y: "center",
-        itemWidth: 30,
-        itemHeight: 15,
-        itemGap: 15,
-        textStyle: {
-           fontSize: 12,
-           color: "#000",
-           padding: [0, 0, 0, 6],
-        },
-     },
-   tooltip: {
-      trigger: 'axis'
-   },
-   grid: {
-      top: '20%',
-      left: '5%',
-      right: '10%',
-      bottom: '20%',
-      containLabel: true
-   },
-   xAxis: {
-      type: 'category',
-      data:doubleData?.detailVos?.map(s =>s.tm),
-      axisLabel: {
-         // 坐标轴字体颜色
-         color: textColor,
-         fontSize: 18
-      },
-      axisLine: {
-         lineStyle: {
-            color: textColor
-         }
-      },
-      axisTick: {
-         // y轴刻度线
-         show: true
-      },
-      splitLine: {
-         // 网格
-         show: false
-      },
-      boundaryGap: false
-   },
-    yAxis: [
-        {
-            type: 'value',
-            min: mincy,
-            max: maxcy,
-            name: '测压管水位（m）',
-            nameTextStyle: {
-               color: '#333',
-               fontSize: 18,
-               padding: [0, 0, 0, 80]
-            },
-            axisLabel: {
-               // 坐标轴字体颜色
-               color: textColor,
-               fontSize: 18
-            },
-            axisLine: {
-               show: true
-            },
-            axisTick: {
-               // y轴刻度线
-               show: false
-            },
-            splitLine: {
-               // 网格
-               show: true,
-               lineStyle: {
-                  color: '#CCCCCC',
-                  type: 'dashed'
-               }
-            }
-        },
-        {
-            type: 'value',
-            min: minRz,
-            max: maxRz,
-            name: '库水位（m）',
-            nameTextStyle: {
-               color: '#333',
-               fontSize: 18,
-               padding: [0, 0, 0, 80]
-            },
-            axisLabel: {
-               // 坐标轴字体颜色
-               color: textColor,
-               fontSize: 18
-            },
-            axisLine: {
-               show: true
-            },
-            axisTick: {
-               // y轴刻度线
-               show: false
-            },
-            splitLine: {
-               // 网格
-               show: true,
-               lineStyle: {
-                  color: '#CCCCCC',
-                  type: 'dashed'
-               }
-            }
-         },
-   ],
-
-       series: [
-         {
-            name: doubleData?.stationCode,
-            type: 'line',
-            yAxisIndex: 0,
-            symbol: 'circle',
-            smooth: true,
-            symbolSize: 5,
-            z: 1,
-            itemStyle: {
-               color: "#56c0c2"
-            },
-            lineStyle: {
-               color: "#56c0c2"
-            },
-           data: doubleData?.detailVos?.map(s =>s.value)
-         
-          },
-          {
-            name: `库水位`,
-            type: 'line',
-            yAxisIndex: 1,
-            symbol: 'circle',
-            smooth: true,
-            symbolSize: 5,
-            z: 1,
-            itemStyle: {
-               color: "#4c9bef"
-            },
-            lineStyle: {
-               color: "#4c9bef"
-            },
-           data: doubleData?.detailVos?.map(s =>s.rz)
-        }
-    ]
-};
-
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/czcx/form.js b/src/views/gcaqjc/sjtjcx/czcx/form.js
deleted file mode 100644
index 8e90d8c..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/form.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import './index.less'
-import moment from 'moment';
-
-const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => {
-  const uploadUrl = '/gunshiApp/xfflood/quality/evaluate/file/upload/singleSimple'
-  const downloadUrl = '/gunshiApp/xfflood/quality/evaluate/file/download'
-  const url = '/gunshiApp/xfflood/quality/evaluate/file/get'
-  const fileTypes = [
-    {
-      label: '质量评定表',
-      value: 1
-    },
-    {
-      label: '合格证明',
-      value: 2
-    },
-    {
-      label: '鉴定结论',
-      value: 3
-    },
-    {
-      label: '其他',
-      value: 4
-    },
-  ]
-  const [form] = Form.useForm();
-  const [fileIds, setFileIds] = useState([])
-
-   /**
-   * @description 表单重置
-   */
-   const onReset = () => {
-    form.resetFields();
-  };
-  const onFinish = async (values) => {
-    values.contractCode = record.contractCode
-    values.attachList = fileIds
-    if (mode === 'edit') {
-      values.evaluateCode = record.evaluateCode
-      values.createTime = record.createTime
-      onEdit(apiurl.zlaqjd.zlgl.zlpd.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.zlaqjd.zlgl.zlpd.save,values)
-    }
-  }
-  useEffect(() => {
-   form.setFieldValue('createUserName',localStorage.getItem('userName')??'-')
-  }, [])
-  
-  return (
-    <>
-      <div className='basci-title'>基本信息</div>
-     <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-     <Row>
-          <Col span={12}>
-              <Form.Item
-                label="质量评定名称"
-                name="evaluateName"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="编号"
-                name="evaluateCode"
-            >
-              <Input allowClear placeholder='请输入' disabled={true}/>
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="类型"
-                name="type"
-              >
-                 <NormalSelect allowClear placeholder='请输入文件名称'  options={fileTypes} disabled={mode==='view'}/>
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="质量评定点"
-                name="evaluatePoint"
-              >
-                 <Input allowClear placeholder='请输入' disabled={mode==='view'} />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-          <Form.Item
-                label="填报人"
-                name="createUserName"
-              >
-                 <Input allowClear placeholder='请输入' disabled={true}/>
-              </Form.Item>
-          </Col>
-          {
-          mode != "save" &&
-          <Col span={12}>
-          <Form.Item
-                label="填报时间"
-                name="createTime"
-              >
-                 <Input allowClear placeholder='请输入' disabled={true}/>
-              </Form.Item>
-          </Col>
-        }
-        </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="质量评定说明"
-                name="remark"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                保存
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/gcaqjc/sjtjcx/czcx/index.js b/src/views/gcaqjc/sjtjcx/czcx/index.js
deleted file mode 100644
index 2b80bd2..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/index.js
+++ /dev/null
@@ -1,218 +0,0 @@
-import React, { useState, useEffect,useMemo,useRef } from 'react'
-import { Table, Card,Button,message,Popconfirm } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ReactEcharts from 'echarts-for-react';
-import AdcdTreeSelector from "./AdcdTreeSelector";
-import apiurl from '../../../../service/apiurl';
-import { httppost2 } from '../../../../utils/request';
-import './index.less'
-import dtOption from './dtOptions';
-import dtOption1 from './dtOptions1';
-export default function Xmzlmb() {
-  const role = useSelector(state => state.auth.role);
-  const [code, setCode] = useState([])
-  const [searchVal, setSearchVal] = useState()
-  const [selected, setSelected] = useState("多图单线")
-  const [dataSources, setDateSources] = useState([])
-  const [sigleItem, setSigleItem] = useState("")
-  const [table2Data, setTable2Data] = useState([])
-
-  const dtoption = useMemo(() => {
-    if (dataSources.length > 0 && code.length > 0) {
-      let obj = {};
-      code.forEach(item => {
-        obj = {
-          ...obj,
-          [item]:''
-        }
-      })
-      let newData = dataSources.map(item => ({
-        ...obj,
-        ...item,
-      }))
-      return dtOption(newData,code);
-    } 
-  }, [dataSources, code])
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-  ];
-  const columnTime = [
-    { title: '时间', key: 'tm', dataIndex: 'tm', width: 150, align: "center" },
-  ];
-  const ksColumns = [
-    { title: '库水位(m)', key: 'rz', dataIndex: 'rz', width: 150, align: "center" },
-  ];
-  const columns1 = useMemo(() => {
-    if (code.length > 0) { 
-    let newCol =  code.map(s => ({
-        title: `${s}测压管水位(m)`,
-        key: s,
-        dataIndex: s,
-        width: 150,
-        align: "center",
-      render: (rec, record) => <span>{rec || "-"}</span>
-    }))
-      return [...columns,...columnTime,...newCol,...ksColumns]
-    } 
-  },[code])
-  const width = useMemo(() => columns1?.reduce((total, cur) => total + (cur.width), 0), [columns1]);
-  // 单图多线以及数据表的数据
-  const getTableData = async(params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.czcx.list, params)
-      let newArr = [];
-      let newData = res.data.map((s, i) => {
-       newArr.push(s.list.map(c => ({
-         [c.stationCode]: c.value || '-',
-         tm:c.tm
-        })))
-        return {
-          tm: s.tm,
-          rz: s.rz,
-          inx:i+1
-        }
-      })
-      let filterData = newArr.filter(s => s.length > 0).flat()
-      let result = newData.map(s => {
-        let tm1 = s.tm;
-        let r = filterData.filter(t => {
-         return t.tm == tm1
-        })
-        let obj = {};
-        r.forEach(s1 => {
-         obj = {...s1,...obj}
-        })
-        return {
-          ...s,
-          ...obj,
-        }
-      })
-      setDateSources(result)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  // 多图单线数据
-  const getTable2Data = async (params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.czcx.list1, params)
-      setTable2Data(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const onChecked = (e) => {
-    setSelected(e)
-  }
-  useEffect(() => {
-    if (code && searchVal) {
-      let params = {
-        stationCodes: code,
-        ...searchVal
-      }
-      // debugger
-      getTableData(params)
-      getTable2Data(params)
-    }
-    
-  }, [code,searchVal]);
-  return (
-    <div className='content-box' style={{ backgroundColor: '#fff', height: '100%',display:'flex',padding:'10px' }}>
-      <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)',width:'340px'}}>
-        <AdcdTreeSelector hasAlertBox={false} setAdcd={setCode} setSigleItem={setSigleItem } />
-        </div>
-      <div className='AdcdTreeTableBox' style={{width:'calc(100vw - 702px)'}}>
-         <Card className='nonebox'>
-          <ToolBar
-            setSearchVal={setSearchVal}
-            onChecked={onChecked}
-            role={role}
-          />
-        </Card>
-        <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-          {
-            selected == "数据表" ? 
-              code.length > 0 ?
-           <Table
-            columns={columns1}
-            dataSource={dataSources}
-            scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-            pagination={false}
-                /> :
-                <div style={{ textAlign: "center", margin: "10%" }}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-              :
-              selected == "单图多线" ? 
-                code.length > 0 ?
-                  <div style={{width:"100%",height:810}}>
-                     <ReactEcharts
-                      option={dtoption || {}}
-                      style={{ width: "100%", height: '100%' }}
-                      notMerge={true}
-                    />
-                  </div> 
-               :
-                  <div style={{ textAlign: "center", margin: "10%" }}>
-              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                  </div> : 
-                 selected == "多图单线" ? 
-                 table2Data?.length > 0 ?
-                    <div style={{ width: "100%", maxHeight: 810, overflowY: "auto" }}>
-                      {
-                        table2Data?.map(item => {
-                          let data = item?.detailVos 
-                          if (data?.length > 0) {
-                            return (
-                              <div key={item?.stationCode} style={{ display: "flex"}}>
-                              <div style={{flex:1}}>
-                              <ReactEcharts
-                               option={dtOption1(item)}
-                               style={{ width: "100%", height: 400 }}
-                               notMerge={true}
-                                />
-                              </div>
-                              <div style={{
-                                width: 200,
-                                display: "flex",
-                                flexDirection: "column",
-                                rowGap: 35,
-                                fontSize: 16,
-                                marginTop: "6%",
-                                marginLeft: "-5%",
-                                letterSpacing:"1px",
-                              }}>
-                                <div>最大值：{ item?.maxValue}</div>
-                                <div>时间：{item?.maxTm}</div>
-                                <div>最小值：{item?.minValue}</div>
-                                <div>时间：{ item?.minTm}</div>
-                              </div>
-                            </div>
-  
-                            )
-                          } else {
-                            return (
-                              <div style={{ textAlign: "center", margin: "10%" }}>
-                              <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                                  </div>
-                            )
-                          }
-                        }
-                          
-                        )
-                      }
-                   </div> 
-                :
-                   <div style={{ textAlign: "center", margin: "10%" }}>
-               <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                   </div> : null
-          }
-        
-        </div>
-        
-      </div>
-    </div>
-  )
-}
diff --git a/src/views/gcaqjc/sjtjcx/czcx/index.less b/src/views/gcaqjc/sjtjcx/czcx/index.less
deleted file mode 100644
index 9d0ab3b..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/index.less
+++ /dev/null
@@ -1,21 +0,0 @@
-
-    .basci-title{
-        display: flex;
-        column-gap: 20px;
-        align-items: center;
-        position: relative;
-        font-size: 16px;
-        margin-bottom: 20px;
-        padding:5px 25px;
-        border-bottom: 1px solid #eee;
-        &::before{
-            position: absolute;
-            top:7px;
-            left:0;
-            content: "";
-            display: block;
-            width: 5px;
-            height: 20px;
-            background-color: #0079fe;
-        }
-    }
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/czcx/toolbar.js b/src/views/gcaqjc/sjtjcx/czcx/toolbar.js
deleted file mode 100644
index 98add20..0000000
--- a/src/views/gcaqjc/sjtjcx/czcx/toolbar.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm,Segmented  } from 'antd';
-import moment from 'moment';
-import { AppstoreOutlined, BarsOutlined } from '@ant-design/icons'
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ setSearchVal, onSave, onChecked,role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-  const [checked, setChecked] = useState("多图单线")
-  const options = [
-    {
-      label: "多图单线",
-      value: "多图单线",
-      icon:<BarsOutlined />,
-    },
-    {
-      label: "单图多线",
-      value: "单图多线",
-      icon:<BarsOutlined />,
-    },
-    {
-      label: "数据表",
-      value: "数据表",
-      icon:<BarsOutlined />,
-    },
-  ]
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
-  useEffect(() => {
-    let time = [moment().subtract(1,"months"),moment()]
-     let dateSo = {
-       start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-       end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-    }
-    form.setFieldValue("tm",time)
-    setSearchVal({dateTimeRangeSo:dateSo})
-  }, [])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          <Form.Item
-            wrapperCol={{span:14,offset:10}}
-          >
-            <Segmented
-              options={options}
-              onChange={(e) => {
-                setChecked(e);
-                onChecked(e)
-              }}
-              value={checked}
-            />
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/ndsltjb/index.js b/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
deleted file mode 100644
index 138a024..0000000
--- a/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
+++ /dev/null
@@ -1,215 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import { exportFile } from '../../../../utils/tools.js';
-import { httppost2,httppost5 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-
-  const [searchVal, setSearchVal] = useState(false)
-  const [dataSource, setDataSource] = useState([])
-  const [dmName, setDmName] = useState("")
-  const [trData, setTrData] = useState([])
-  const [table2Data, setTable2Data] = useState([])
-  const [loading, setLoading] = useState(false)
-  const columns1 = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-  ];
-  const columns2 = [
-    { title: '监测日期', key: 'tm', dataIndex: 'tm', width: 150, align:"center" },
-  ];
-  const columns3 = [
-    {
-      title: '库水位(m)', key: 'rz', dataIndex: 'rz', width: 100, align: "center",
-      render: (rec, record) => <span>{ rec ?? "-"}</span>
-     },
-  ];
-  const columns4 = [
-    {
-      title: '降雨量(mm)', key: 'drp', dataIndex: 'drp', width: 120, align: "center",
-      render: (rec, record) => <span>{ rec ?? "-"}</span>
-    },
-  ];
- 
-  const getDmTree = async() => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndsltjb.list)
-      setTrData(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const newCols = useMemo(() => {
-    if (trData.length > 0) {
-      let dm = {
-        title: `渗流量(L/s)`,
-        width: 100,
-        align: "center",
-        children: trData?.map(item => ({
-          title: item.stationCode,
-          key: item.stationCode,
-          dataIndex: item.stationCode,
-          width: 100,
-          align: "center",
-          render: (rec, record) => <span>{rec?? "-"}</span>
-        }))
-      }
-      return [...columns1,...columns2, dm,...columns3, ...columns4]
-    }
-    
-  }, [dmName,trData])
-  
-  const getTableData = async (params) => {
-    setLoading(true)
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndsytjb.page, params)
-      setLoading(false)
-      let newArr = [];
-      let newData = res.data?.map((s, i) => {
-       newArr.push(s.list?.map(c => ({
-         [c.stationCode]: c.value || '-',
-         tm:c.tm
-        })))
-        return {
-          drp:s.drp,
-          tm: s.tm,
-          rz: s.rz,
-          inx:i+1
-        }
-      })
-      let filterData = newArr?.filter(s => s.length > 0).flat()
-      let result = newData?.map(s => {
-        let tm1 = s.tm;
-        let r = filterData.filter(t => {
-         return t.tm == tm1
-        })
-        let obj = {};
-        r.forEach(s1 => {
-         obj = {...s1,...obj}
-        })
-        return {
-          ...s,
-          ...obj,
-        }
-      })
-      setDataSource(result)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const width = useMemo(() => {
-    return  newCols?.reduce((total, cur) => total + (cur.width), 0)
-  }, [newCols]);
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-      stationCodes: trData.map(s => s.stationCode),
-      type:2,
-      id:1
-    }
-    httppost5(apiurl.gcaqjc.sjtjcx.ndsytjb.export, params).then(res => {
-      exportFile(`年度渗流量统计表.xlsx`,res.data)
-  })
-  }
-  const getTable2Data = async (params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndsytjb.list1, params)
-      setTable2Data(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  useEffect(() => {
-    if (trData && trData.length > 0) {
-      const params = {
-        ...searchVal,
-        stationCodes: trData.map(s => s.stationCode),
-        type:2
-      };
-      getTableData(params)
-      
-    }
-  }, [searchVal,trData])
-  
-  useEffect(() => {
-    if (trData && trData?.length > 0) { 
-      let params = {
-        ...searchVal,
-        stationCodes:trData.map(s => s.stationCode),
-        type:2
-      }
-      getTable2Data(params)
-    }
-  }, [trData,searchVal])
-  
-  useEffect(() => {
-    getDmTree()
-  }, [])
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"10px",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              columns={newCols}
-              rowKey="inx"
-              loading={loading}
-              scroll={{ x: width, y: "calc( 100vh - 500px )" }}
-              dataSource={dataSource}
-              pagination={false}
-              summary={(pageData) => {
-                return(
-                  <Table.Summary fixed>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0}  align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell  index={1} align='center'>最大值</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.maxValue ?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>日期</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.maxTm?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row >
-                      <Table.Summary.Cell index={0} align='center' className='total-col'>全年度特征值统计</Table.Summary.Cell>
-                      <Table.Summary.Cell  index={1} align='center'>最小值</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.minValue ?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>日期</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.minTm?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>年变幅</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.diff?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                  </Table.Summary>
-                )
-              }}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/sjtjcx/ndsltjb/index.less b/src/views/gcaqjc/sjtjcx/ndsltjb/index.less
deleted file mode 100644
index 7da750d..0000000
--- a/src/views/gcaqjc/sjtjcx/ndsltjb/index.less
+++ /dev/null
@@ -1,75 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
-.footer-sy{
-    font-size: 14px;
-    margin-top: 10px;
-    .footer-box{
-        display: flex;
-    }
-    .left-content{
-        width: 210px;
-        height: 150px;
-        background: #E0EDFF ;
-        padding: 4px 0;
-        text-align: center;
-        line-height: 150px;
-    }
-    .right-content{
-        flex: 1;
-        text-align: center;
-    }
-    .footer-row{
-      display: flex;
-      justify-content: space-between;
-      .footer-item{
-        // flex: 0.5;
-        width: 190px;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-      .footer-item1{
-        width: 200px;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-    }
-  }
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js
deleted file mode 100644
index ac12227..0000000
--- a/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-const ToolBar = ({ setSearchVal, setDmName, exportFile,role }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = moment(values.tm).format('YYYY')
-    }
-    delete values.tm
-    setSearchVal({ ...values, year: dateSo });
-  }
- 
-
-  useEffect(() => {
-   let time = moment()
-   form.setFieldValue("tm", time)
-   setSearchVal({ year: moment().format("YYYY")})
-}, [])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="上报时间" name="tm">
-            <DatePicker 
-              allowClear
-              picker="year" 
-              style={{ width: "200px" }}
-              format={'YYYY'}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {exportBtn ?  <Form.Item>
-          <Button onClick={()=>exportFile()}>导出</Button>
-          </Form.Item>: null}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/ndsytjb/index.js b/src/views/gcaqjc/sjtjcx/ndsytjb/index.js
deleted file mode 100644
index 0c6c59b..0000000
--- a/src/views/gcaqjc/sjtjcx/ndsytjb/index.js
+++ /dev/null
@@ -1,217 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import { useSelector } from 'react-redux';
-
-import apiurl from '../../../../service/apiurl';
-import { exportFile } from '../../../../utils/tools.js';
-import { httppost2,httppost5 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const [searchVal, setSearchVal] = useState(false)
-  const [dataSource, setDataSource] = useState([])
-  const [dmName, setDmName] = useState("")
-  const [trData, setTrData] = useState()
-  const [table2Data, setTable2Data] = useState([])
- const [loading, setLoading] = useState(false)
-  const columns1 = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-    }
-  ];
-  const columns2 = [
-    {
-      title: '监测日期', key: 'tm', dataIndex: 'tm', width: 150, align: "center",
-    },
-  ];
-  const columns3 = [
-    {
-      title: '库水位(m)', key: 'rz', dataIndex: 'rz', width: 100, align: "center",
-      render: (rec, record) => <span>{ rec ?? "-"}</span>
-     },
-  ];
-  const columns4 = [
-    {
-      title: '降雨量(mm)', key: 'drp', dataIndex: 'drp', width: 120, align: "center",
-      render: (rec, record) => <span>{ record?.drp ?? "-"}</span>
-    },
-  ];
-  const getDmTree = async() => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.czcx.tree)
-      let filterData = res.data.filter(s => s.profileName == dmName)
-      setTrData(filterData[0])
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const newCols = useMemo(() => {
-    if (dmName && trData) {
-      let dm = {
-        title: `${dmName}断面测压管水位(m)`,
-        children: trData?.children?.map(item => ({
-          title: item,
-          key: item,
-          dataIndex: item,
-          width: 100,
-          align: "center",
-          render: (rec, record) => <span>{rec?? "-"}</span>
-        }))
-      }
-      return [...columns1,...columns2, dm,...columns3, ...columns4]
-    }
-    
-  }, [dmName,trData])
-  
-  const getTableData = async (params) => {
-    setLoading(true)
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndsytjb.page, params)
-      setLoading(false)
-      let newArr = [];
-      let newData = res.data?.map((s, i) => {
-       newArr.push(s.list?.map(c => ({
-         [c.stationCode]: c.value || '-',
-         tm:c.tm
-        })))
-        return {
-          drp:s.drp,
-          tm: s.tm,
-          rz: s.rz,
-          inx:i+1
-        }
-      })
-      let filterData = newArr?.filter(s => s.length > 0).flat()
-      let result = newData?.map(s => {
-        let tm1 = s.tm;
-        let r = filterData.filter(t => {
-         return t.tm == tm1
-        })
-        let obj = {};
-        r.forEach(s1 => {
-         obj = {...s1,...obj}
-        })
-        return {
-          ...s,
-          ...obj,
-        }
-      })
-      setDataSource(result)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const width = useMemo(() => {
-    return  newCols?.reduce((total, cur) => total + (cur.width), 0)
-  }, [newCols]);
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-      profileName: dmName,
-      stationCodes: trData?.children,
-      id:1
-    }
-    httppost5(apiurl.gcaqjc.sjtjcx.ndsytjb.export, params).then(res => {
-      exportFile(`年度渗压统计表.xlsx`,res.data)
-  })
-  }
-  const getTable2Data = async (params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndsytjb.list1, params)
-      setTable2Data(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  useEffect(() => {
-    if (trData && trData?.children) {
-      const params = {
-        ...searchVal,
-        stationCodes: trData?.children,
-      };
-      getTableData(params)
-      
-    }
-  }, [searchVal,trData])
-
-  useEffect(() => {
-    getDmTree()
-  }, [dmName])
-  
-  useEffect(() => {
-    if (trData && trData?.children) { 
-      let params = {
-        stationCodes: trData?.children,
-        ...searchVal
-      }
-      getTable2Data(params)
-    }
-  }, [trData,searchVal])
-
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"10px",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              setDmName={setDmName}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              columns={newCols}
-              rowKey="inx"
-              loading={loading}
-              scroll={{ x: width, y: "calc( 100vh - 500px )" }}
-              dataSource={dataSource}
-              pagination={false}
-              summary={(pageData) => {
-                return(
-                  <Table.Summary fixed>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0}  align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell  index={1} align='center'>最大值</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.maxValue ?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>日期</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.maxTm?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row >
-                      <Table.Summary.Cell index={0} align='center' className='total-col'>全年度特征值统计</Table.Summary.Cell>
-                      <Table.Summary.Cell  index={1} align='center'>最小值</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.minValue ?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>日期</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.minTm?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>年变幅</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.diff?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                  </Table.Summary>
-                )
-              }}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/sjtjcx/ndsytjb/index.less b/src/views/gcaqjc/sjtjcx/ndsytjb/index.less
deleted file mode 100644
index 929f299..0000000
--- a/src/views/gcaqjc/sjtjcx/ndsytjb/index.less
+++ /dev/null
@@ -1,80 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
-.footer-sy{
-    font-size: 14px;
-    margin-top: 10px;
-    .footer-box{
-        display: flex;
-    }
-    .left-content{
-        width: 210px;
-        height: 150px;
-        background: #E0EDFF ;
-        padding: 4px 0;
-        text-align: center;
-        line-height: 150px;
-    }
-    .right-content{
-        flex: 1;
-        text-align: center;
-    }
-    .footer-row{
-      display: flex;
-      justify-content: space-between;
-      .footer-item{
-        // flex: 0.5;
-        width: 190px;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-      .footer-item1{
-        width: 200px;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-    }
-    
-  }
-  .total-col{
-    display: block !important;
-    width: 200px !important;
-  }
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
deleted file mode 100644
index 4c98bcd..0000000
--- a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-const ToolBar = ({ setSearchVal, setDmName, exportFile,role }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-  const [dmList, setDmList] = useState([])
-  const getDmList = async () => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.sycx.list)
-      setDmList(res.data.map(s=>({label:s.profileName,value:s.profileCode})));
-    } catch (error) {
-      console.log(error);
-    }
-  } 
- 
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = moment(values.tm).format('YYYY')
-    }
-    delete values.tm
-    setSearchVal({ ...values, year: dateSo });
-    setDmName(dmList.find(item => item.value == values.profileCode).label)
-  }
-
-
- useEffect(() => {
-   getDmList()
- }, [])
- 
-
-  useEffect(() => {
-   let time = moment()
-    if (dmList.length > 0) { 
-      form.setFieldValue("tm", time)
-      form.setFieldValue("profileCode",dmList[0].value)
-      setSearchVal({ year: moment().format("YYYY"), profileCode: dmList[0].value })
-      setDmName(dmList[0].label)
-    }
-}, [dmList])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="上报时间" name="tm">
-            <DatePicker 
-              allowClear
-              picker="year" 
-              style={{ width: "200px" }}
-              format={'YYYY'}
-            />
-          </Form.Item>
-          <Form.Item label="监测断面" name="profileCode">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={dmList}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null}
-          <Form.Item>
-          <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {exportBtn ?  <Form.Item>
-          <Button onClick={()=>exportFile()}>导出</Button>
-          </Form.Item>: null}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
deleted file mode 100644
index 2156dc5..0000000
--- a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
+++ /dev/null
@@ -1,208 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import { exportFile } from '../../../../utils/tools.js';
-import { httppost2,httppost5 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-
-  const [searchVal, setSearchVal] = useState(false)
-  const [dataSource, setDataSource] = useState([])
-  const [trData, setTrData] = useState([])
-  const [table2Data, setTable2Data] = useState([])
-  const [loading, setLoading] = useState(false)
-  const wyList = ["X","Y","H"]
-  const columns1 = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-  ];
-  const columns2 = [
-    { title: '监测日期', key: 'tm', dataIndex: 'tm', width: 150, align:"center" },
-  ];
- 
- 
-  const getDmTree = async() => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndwytjb.list)
-      setTrData(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const newCols = useMemo(() => {
-    if (trData.length > 0) {
-      let dm = trData?.map(item => (
-        {
-          title: item.stationCode,
-          width: 100,
-          align: "center",
-          children: wyList?.map(s => ({
-            title: s,
-            key: `${s}_${item.stationCode}`,
-            dataIndex: `${s}_${item.stationCode}`,
-            width: 100,
-            align: "center",
-            render: (rec, record) => <span>{rec?? "-"}</span>
-          }))
-        }
-      ))
-      return [...columns1,...columns2, ...dm]
-    }
-    
-  }, [trData])
-  
-  const getTableData = async (params) => {
-    setLoading(true)
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndwytjb.page, params)
-      setLoading(false)
-      let newArr = [];
-      let newData = res.data?.map((s, i) => {
-        newArr.push(s.list?.map((c, i) => ({
-          [c.stationCode]: c.value || '-',
-           [`X_${c.stationCode}`]:c.x || '-',
-           [`Y_${c.stationCode}`]:c.y || '-',
-           [`H_${c.stationCode}`]:c.h || '-',
-         tm: c.tm,
-        })))
-        return {
-          tm: s.tm,
-          inx:i+1
-        }
-      })
-      let filterData = newArr?.filter(s => s.length > 0).flat()
-      let result = newData?.map(s => {
-        let tm1 = s.tm;
-        let r = filterData.filter(t => {
-         return t.tm == tm1
-        })
-        let obj = {};
-        r.forEach(s1 => {
-         obj = {...s1,...obj}
-        })
-        return {
-          ...s,
-          ...obj,
-        }
-      })
-      setDataSource(result)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const width = useMemo(() => {
-    if (newCols?.length > 0) {
-      return  newCols?.reduce((total, cur) => total + (cur.width), 0)
-      
-    }
-  }, [newCols]);
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-      stationCodes: trData.map(s => s.stationCode),
-      type:2,
-      id:1
-    }
-    httppost5(apiurl.gcaqjc.sjtjcx.ndwytjb.export, params).then(res => {
-      exportFile(`年度位移统计表.xlsx`,res.data)
-  })
-  }
-  const getTable2Data = async (params) => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.ndwytjb.list1, params)
-      setTable2Data(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  useEffect(() => {
-    if (trData && trData.length > 0) {
-      const params = {
-        ...searchVal,
-        stationCodes: trData.map(s => s.stationCode),
-      };
-      getTableData(params)
-      
-    }
-  }, [searchVal,trData])
-  
-  useEffect(() => {
-    if (trData && trData?.length > 0) { 
-      let params = {
-        ...searchVal,
-        stationCodes:trData.map(s => s.stationCode),
-      }
-      getTable2Data(params)
-    }
-  }, [trData])
-  
-  useEffect(() => {
-    getDmTree()
-  }, [])
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"10px",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              columns={newCols}
-              rowKey="inx"
-              loading={loading}
-              scroll={{ x: width, y: "calc( 100vh - 500px )" }}
-              dataSource={dataSource}
-              pagination={false}
-              summary={(pageData) => {
-                return(
-                  <Table.Summary fixed>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0}  align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell  index={1} align='center'>最大值</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.maxValue ?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>日期</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.maxTm?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row >
-                      <Table.Summary.Cell index={0} align='center' className='total-col'>全年度特征值统计</Table.Summary.Cell>
-                      <Table.Summary.Cell  index={1} align='center'>最小值</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.minValue ?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>日期</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.minTm?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={0} align='center' ></Table.Summary.Cell>
-                      <Table.Summary.Cell index={1} align='center'>年变幅</Table.Summary.Cell>
-                      {table2Data?.length > 0 && table2Data.map((item,i) =>
-                        <Table.Summary.Cell index={i +1} align='center'>{item?.diff?? "-"}</Table.Summary.Cell>)}
-                    </Table.Summary.Row>
-                  </Table.Summary>
-                )
-              }}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/index.less b/src/views/gcaqjc/sjtjcx/ndwytjb/index.less
deleted file mode 100644
index 7da750d..0000000
--- a/src/views/gcaqjc/sjtjcx/ndwytjb/index.less
+++ /dev/null
@@ -1,75 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
-.footer-sy{
-    font-size: 14px;
-    margin-top: 10px;
-    .footer-box{
-        display: flex;
-    }
-    .left-content{
-        width: 210px;
-        height: 150px;
-        background: #E0EDFF ;
-        padding: 4px 0;
-        text-align: center;
-        line-height: 150px;
-    }
-    .right-content{
-        flex: 1;
-        text-align: center;
-    }
-    .footer-row{
-      display: flex;
-      justify-content: space-between;
-      .footer-item{
-        // flex: 0.5;
-        width: 190px;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-      .footer-item1{
-        width: 200px;
-        text-align: center;
-        .footer-name{
-          background: #E0EDFF ;
-          padding: 4px 0;
-        }
-        .footer-num{
-          padding: 4px 0;
-        }
-      }
-    }
-  }
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js
deleted file mode 100644
index 431ffeb..0000000
--- a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-const ToolBar = ({ setSearchVal, setDmName, exportFile, role }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = moment(values.tm).format('YYYY')
-    }
-    delete values.tm
-    setSearchVal({ ...values, year: dateSo });
-  }
- 
-
-  useEffect(() => {
-   let time = moment()
-   form.setFieldValue("tm", time)
-   setSearchVal({ year: moment().format("YYYY")})
-}, [])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="上报时间" name="tm">
-            <DatePicker 
-              allowClear
-              picker="year" 
-              style={{ width: "200px" }}
-              format={'YYYY'}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {exportBtn ?  <Form.Item>
-          <Button onClick={()=>exportFile()}>导出</Button>
-          </Form.Item>: null}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/sljc/index.js b/src/views/gcaqjc/sjtjcx/sljc/index.js
deleted file mode 100644
index d335f8a..0000000
--- a/src/views/gcaqjc/sjtjcx/sljc/index.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { httppost2 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '上报时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
-    { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 200, align:"center"},
-    {
-      title: '通道号', key: 'chan', dataIndex: 'chan', width: 200, align:"center",
-    },
-    { title: '水深(mm)', key: 'l', dataIndex: 'l', width: 200, ellipsis: true,align:"center", },
- 
-    { title: '流量(L/s)', key: 'q', dataIndex: 'q', width: 250, ellipsis: true,align:"center", },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.gcaqjc.gcaqyj.yhyj.delete + `/${params.goodsId}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gcaqjc.sjtjcx.slcx.page).find_noCode);
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/sjtjcx/sljc/index.less b/src/views/gcaqjc/sjtjcx/sljc/index.less
deleted file mode 100644
index d22a6aa..0000000
--- a/src/views/gcaqjc/sjtjcx/sljc/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js b/src/views/gcaqjc/sjtjcx/sljc/toolbar.js
deleted file mode 100644
index 9c1e86e..0000000
--- a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-  const [form] = Form.useForm();
-
-
-  const onValuesChange = (e) => {
-    switch (e.ranger) {
-      case 1:
-        form.setFieldValue("tm",[moment().startOf("day"),moment()])
-        break;
-      case 2:
-          form.setFieldValue("tm",[moment().subtract(7, 'days'),moment()])
-        break;
-      case 3:
-          form.setFieldValue("tm",[moment().subtract(1, 'months'),moment()])
-        break;
-      case 4:
-          form.setFieldValue("tm",[moment().subtract(3, 'months'),moment()])
-        break;
-      case 5:
-          form.setFieldValue("tm",[moment().subtract(1, 'years'),moment()])
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
- 
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item label="常用时段" name="ranger">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          <Form.Item>
-          <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/syjc/index.js b/src/views/gcaqjc/sjtjcx/syjc/index.js
deleted file mode 100644
index d20b746..0000000
--- a/src/views/gcaqjc/sjtjcx/syjc/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { httppost2 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '上报时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
-    { title: '监测断面', key: 'profileName', dataIndex: 'profileName', width: 200, ellipsis: true, align:"center" },
-    { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 200, align:"center"},
-    {
-      title: '通道号', key: 'chan', dataIndex: 'chan', width: 200, align:"center",
-    },
-    { title: '测压管水位(m)', key: 'value', dataIndex: 'value', width: 200, ellipsis: true,align:"center", },
- 
-    { title: '渗压(KPa)', key: 'press', dataIndex: 'press', width: 200, ellipsis: true,align:"center", },
-    { title: '振弦(Hz)', key: 'vib', dataIndex: 'vib', width: 250, ellipsis: true,align:"center", },
-    { title: '温度(°C)', key: 'temp', dataIndex: 'temp', width: 250, ellipsis: true,align:"center", },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.gcaqjc.gcaqyj.yhyj.delete + `/${params.goodsId}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gcaqjc.sjtjcx.sycx.page).find_noCode);
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/sjtjcx/syjc/index.less b/src/views/gcaqjc/sjtjcx/syjc/index.less
deleted file mode 100644
index d22a6aa..0000000
--- a/src/views/gcaqjc/sjtjcx/syjc/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js
deleted file mode 100644
index f132bd9..0000000
--- a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-  const [form] = Form.useForm();
-  const [dmList, setDmList] = useState([])
-  const [codeList, setCodeList] = useState([])
-  
-  const getDmList = async () => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.sycx.list)
-      setDmList(res.data.map(s=>({label:s.profileName,value:s.profileCode})));
-    } catch (error) {
-      console.log(error);
-    }
-  } 
-
-  const getStationCode = async () => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.list)
-      setCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode})));
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const onValuesChange = (e) => {
-    switch (e.ranger) {
-      case 1:
-        form.setFieldValue("tm",[moment().startOf("day"),moment()])
-        break;
-      case 2:
-          form.setFieldValue("tm",[moment().subtract(7, 'days'),moment()])
-        break;
-      case 3:
-          form.setFieldValue("tm",[moment().subtract(1, 'months'),moment()])
-        break;
-      case 4:
-          form.setFieldValue("tm",[moment().subtract(3, 'months'),moment()])
-        break;
-      case 5:
-          form.setFieldValue("tm",[moment().subtract(1, 'years'),moment()])
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
- useEffect(() => {
-   getDmList()
-   getStationCode()
- }, [])
- 
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item label="常用时段" name="ranger">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-          <Form.Item label="监测断面" name="profileCode">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={dmList}
-            />
-          </Form.Item>
-          <Form.Item label="测点编号" name="stationCode">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={codeList}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          <Form.Item>
-          <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/wyjc/index.js b/src/views/gcaqjc/sjtjcx/wyjc/index.js
deleted file mode 100644
index 5a15d95..0000000
--- a/src/views/gcaqjc/sjtjcx/wyjc/index.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { httppost2 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '监测时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
-    { title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 200, align:"center"},
-    {
-      title: 'X方向表面位移(mm)', key: 'x', dataIndex: 'x', width: 200, align:"center",
-    },
-    { title: 'Y方向表面位移(mm)', key: 'y', dataIndex: 'y', width: 200, ellipsis: true,align:"center", },
- 
-    { title: 'H方向表面位移(mm)', key: 'h', dataIndex: 'h', width: 200, ellipsis: true,align:"center", },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.gcaqjc.gcaqyj.yhyj.delete + `/${params.goodsId}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gcaqjc.sjtjcx.wycx.page).find_noCode);
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gcaqjc/sjtjcx/wyjc/index.less b/src/views/gcaqjc/sjtjcx/wyjc/index.less
deleted file mode 100644
index d22a6aa..0000000
--- a/src/views/gcaqjc/sjtjcx/wyjc/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
\ No newline at end of file
diff --git a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js b/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js
deleted file mode 100644
index 1efbec3..0000000
--- a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { getDictService } from '../../../../service/SelectValue'
-import AdcdFuzzyTreeSelect from '../../../../components/Form/AdcdFuzzyTreeSelect';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { config } from '../../../../config';
-import moment from 'moment';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-  const [form] = Form.useForm();
-
-  const [codeList, setCodeList] = useState([])
-
-  const getStationCode = async () => {
-    try {
-      const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.list)
-      setCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode})));
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const onValuesChange = (e) => {
-    switch (e.ranger) {
-      case 1:
-        form.setFieldValue("tm",[moment().startOf("day"),moment()])
-        break;
-      case 2:
-          form.setFieldValue("tm",[moment().subtract(7, 'days'),moment()])
-        break;
-      case 3:
-          form.setFieldValue("tm",[moment().subtract(1, 'months'),moment()])
-        break;
-      case 4:
-          form.setFieldValue("tm",[moment().subtract(3, 'months'),moment()])
-        break;
-      case 5:
-          form.setFieldValue("tm",[moment().subtract(1, 'years'),moment()])
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
- useEffect(() => {
-   getStationCode()
- }, [])
- 
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item label="常用时段" name="ranger">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-          <Form.Item label="测点编号" name="stationCode">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={codeList}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          <Form.Item>
-          <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gxsl/dxnjyzl/form.js b/src/views/gxsl/dxnjyzl/form.js
deleted file mode 100644
index 9009943..0000000
--- a/src/views/gxsl/dxnjyzl/form.js
+++ /dev/null
@@ -1,329 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import "./index.less"
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-const optionsType = Array(12).fill(0).map((item,i) => ({label: (i+1)  + "月",value: i + 1}))
-const EditableCell = ({
-  editing,
-  dataIndex,
-  title,
-  inputType,
-  record,
-  index,
-  children,
-  ...restProps
-}) => {
-  const inputNode = inputType === 'select' ?
-    <NormalSelect allowClear options={optionsType} style={{ textAlign: "center",width:150 }} /> :
-    <InputNumber style={{ textAlign: "center",width:150  }} min={0} />;
-  return (
-    <td {...restProps}>
-      {editing ? (
-        <Form.Item
-          name={dataIndex}
-          wrapperCol={[24]}
-          style={{
-            margin: 0,
-          }}
-        >
-          {inputNode}
-        </Form.Item>
-      ) : (
-        children
-      )}
-    </td>
-  );
-};
-
-const ModalForm = ({ mode, record, onEdit, onSave}) => {
-  const [editingKey, setEditingKey] = useState('');
-  const [form] = Form.useForm();
-  const [details, setDetails] = useState([])
-  const [disabled, setDisabled] = useState(false)
-  const detailsRef = useRef(null)
-  detailsRef.current = details
-  const [form1] = Form.useForm()
-  const isEditing = (record) => {
-     return record.id === editingKey;
-  }
-
-  const columns = [
-    {
-      title: '月份',
-      key: 'month',
-      dataIndex: 'month',
-      width: 150
-      , align: "center",
-      editable: true,
-    },
-    {
-      title: '降雨量',
-      key: 'drp',
-      dataIndex: 'drp',
-      width: 100,
-      align: "center",
-      editable: true,
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (_, record) => {
-        const editable = isEditing(record);
-        return editable ? (
-          <span>
-            <Typography.Link
-              onClick={() => save(record.id)}
-              style={{
-                marginRight: 8,
-              }}
-            >
-              完成
-            </Typography.Link>
-           
-          </span>
-        ) : (
-            <div style={{display:"flex",justifyContent:"center",columnGap:10}}>
-              <Typography.Link disabled={editingKey !== ''} onClick={() => edit1(record)}>
-            编辑
-            </Typography.Link>
-               <Popconfirm title="确定要删除?" onConfirm={()=>handleDelete(record.id)}>
-              <a>删除</a>
-            </Popconfirm>
-            </div>
-          
-            
-        );
-      },
-    },
-  ]
-  const newColumns = useMemo(() => {
-    let data = columns;
-    if (mode == "view") {
-      data.pop();
-      return data
-    } else {
-      return data;
-    }
-  }, [mode,editingKey])
-  const edit1 = (record) => {
-    setDisabled(true)
-    form1.setFieldsValue({
-      month: '',
-      drp:'',
-      ...record,
-    });
-    setEditingKey(record.id);
-  };
-
-  const save = async (key) => {
-    setDisabled(false)
-    try {
-      const row = await form1.validateFields();
-      const newData = [...details];
-      const index = newData.findIndex((item) => key === item.id);
-      if (index > -1) {
-        const item = newData[index];
-        newData.splice(index, 1, {
-          ...item,
-          ...row,
-          type: 2,
-          year:form.getFieldValue("year")
-        });
-        let total = newData.reduce((total,cur) => total + Number(cur.drp),0)
-        form.setFieldValue("drp",total?.toFixed(1))
-        setDetails(newData);
-        detailsRef.current = newData
-        setEditingKey('');
-      } else {
-        newData.push(row);
-        setDetails(newData);
-        detailsRef.current = newData
-        setEditingKey('');
-      }
-    } catch (errInfo) {
-      console.log('Validate Failed:', errInfo);
-    }
-  };
-  const mergedColumns = newColumns.map((col) => {
-    if (!col.editable) {
-      return col;
-    }
-    return {
-      ...col,
-      onCell: (record) => ({
-        record,
-        inputType: col.dataIndex === 'month' ? 'select' : 'text',
-        dataIndex: col.dataIndex,
-        title: col.title,
-        editing: isEditing(record),
-      }),
-    };
-  });
-  
-  const handleAddRow = () => {
-    setDisabled(true)
-    const newData = {
-      id: (details.length + 1).toString(),
-      month: '',
-      drp:''
-    };
-    form1.setFieldsValue(newData)
-    setDetails([...details, newData]);
-    detailsRef.current = [...details, newData]
-    setEditingKey(newData.id);
-};
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const handleDelete = (key) => {
-    const newData = detailsRef.current.filter((item) => item.id !== key);
-    setDetails(newData);
-    detailsRef.current = newData
-    let total = newData.reduce((total,cur) => total + Number(cur.drp),0)
-     form.setFieldValue("drp",total?.toFixed(1))
-  };  
-  
-  const types = [
-    {
-      label: "枯",
-      value:1
-    },
-    {
-      label: "偏枯",
-      value:2
-    },
-    {
-      label: "平",
-      value:3
-    },
-    {
-      label: "偏丰",
-      value:4
-    },
-    {
-      label: "丰",
-      value:5
-    },
-  ]
-  const onfinish = () => {
-    let values = form.getFieldsValue();
-    values.list = details;
-    values.type = 1
-    if (mode === 'edit') {
-      values.id = record.id
-      onEdit(apiurl.gsxl.dxnjyzl.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.gsxl.dxnjyzl.save,values)
-    }
-  }
-
-  useEffect(() => {
-    if (mode !== "save") { 
-      let total = record.list.reduce((total, cur) => total + cur.drp, 0)
-      form.setFieldsValue({ ...record, drp: total?.toFixed(1), year: record.year + '' })
-      setDetails(record.list)
-      detailsRef.current = record.list
-    }
-
- }, [record,mode])
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="典型年份"
-                name="year"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[{ required: true }]}
-              >
-                <DatePicker disabled={mode==='view'} style={{width:'100%'}} allowClear format={"YYYY"} picker="year"/>
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="降雨量(mm)"
-                name="drp"
-              >
-               <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="丰平枯"
-                name="status"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-               <NormalSelect allowClear style={{ width:'100%' }} options={types} disabled={mode==='view'} />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="月降雨量"
-                name=""
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              </Form.Item>
-          </Col> 
-      </Row>
-      </Form>
-          {mode != "view" ?<div style={{display:"flex",justifyContent:"flex-end",marginBottom:10}}>
-            <Button onClick={handleAddRow} type='primary' disabled={disabled}>添加</Button>
-          </div>:null}
-      <Form form={form1} component={false}>
-        <Table
-          rowKey="id"
-          components={{
-            body: {
-              // row: EditableRow,
-              cell: EditableCell,
-            },
-          }}
-          columns={mergedColumns}
-          dataSource={details}
-          // scroll={{ x: width, y: "calc( 100vh - 100px )" }}
-          pagination={false}
-        />
-
-{
-        mode==='view'?null:(
-          <div style={{marginTop:20}}>
-          <Form.Item wrapperCol={{span:2,offset:22}}>
-                <Button
-                  type="primary"
-                  onClick={onfinish}
-                  disabled={disabled}
-                >
-                  {mode === 'save' ? '保存' :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </div>
-        )
-      }
-        </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/gxsl/dxnjyzl/index.js b/src/views/gxsl/dxnjyzl/index.js
deleted file mode 100644
index d4c77b9..0000000
--- a/src/views/gxsl/dxnjyzl/index.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
-
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
-  const expandedRowRender = (record) => {
-    const columns = [
-      {
-        title: '月份',
-        dataIndex: 'month',
-        key: 'month',
-        align: "center",
-        width:200
-      },
-      {
-        title: '降雨量(mm)',
-        dataIndex: 'drp',
-        align:"center",
-        key: 'drp',
-        width:200
-      },
-      {
-        title: '',
-        dataIndex: '',
-        align:"",
-        key: '',
-        width:200
-      },
-      {
-        title: '',
-        dataIndex: '',
-        align:"center",
-        key: '',
-        width:200
-      },
-    ];
-    return <Table columns={columns} dataSource={record.list} pagination={false} rowKey="id"/>;
-  };
-
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [isFetch, setIsFetch] = useState(false)
-  const columns = [
-    { title: '典型年份', key: 'year', dataIndex: 'year',align:"center" },
-    {
-      title: '年降雨量(mm)', key: 'drp', dataIndex: 'drp',align:"center",
-    },
-    {
-      title: '丰平枯', key: 'status', dataIndex: 'status', align: "center",
-      render: (rec, record) => <span style={{color:(rec == 1 || rec == 2) ? "red" : (rec == 4 || rec == 5) ? "green" : "#000"}}>{
-        rec == 1 ? "枯" :
-          rec == 2 ? "偏枯" :
-            rec == 3 ? "平" :
-              rec == 4 ? "偏丰" :
-              rec == 5 ? "丰" : ''
-          }</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.gsxl.dxnjyzl.delete + `/${params.id}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gsxl.dxnjyzl.page).find_noCode);
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-  setIsFetch(!isFetch)
-}
-
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table
-              columns={columns}
-              rowKey="id"
-              expandable={{
-                expandedRowRender,
-                defaultExpandedRowKeys: ['0'],
-              }}
-              {...tableProps}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gxsl/dxnjyzl/index.less b/src/views/gxsl/dxnjyzl/index.less
deleted file mode 100644
index d647b59..0000000
--- a/src/views/gxsl/dxnjyzl/index.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-   
-}
\ No newline at end of file
diff --git a/src/views/gxsl/dxnjyzl/toolbar.js b/src/views/gxsl/dxnjyzl/toolbar.js
deleted file mode 100644
index ebac984..0000000
--- a/src/views/gxsl/dxnjyzl/toolbar.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增") || true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询") || true;  
-  const [form] = Form.useForm();
-  const types = [
-    {
-      label: "枯",
-      value:1
-    },
-    {
-      label: "偏枯",
-      value:2
-    },
-    {
-      label: "平",
-      value:3
-    },
-    {
-      label: "偏丰",
-      value:4
-    },
-    {
-      label: "丰",
-      value:5
-    },
-  ]
-  const onFinish = (values) => {
-    setSearchVal({...values});
-  }
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="丰平枯" name="status">
-            <NormalSelect allowClear style={{ width: '150px' }} options={types} />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gxsl/gsnlfx/KrLine.js b/src/views/gxsl/gsnlfx/KrLine.js
deleted file mode 100644
index 64a50a3..0000000
--- a/src/views/gxsl/gsnlfx/KrLine.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import React,{useEffect,useMemo,useState} from 'react'
-import { Button, DatePicker, Table,message } from 'antd';
-import { createCrudService } from '../../../components/crud/_';
-import usePageTable from '../../../components/crud/usePageTable2';
-import moment from 'moment';
-import apiurl from '../../../service/apiurl';
-import {reservoirmonitor} from '../../../service/sssq'
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption';
-const {RangePicker} = DatePicker;
-export default function KrLine({ record }) {
-    const tm = [
-        moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }),
-        moment().add(1, 'hour').set({ minute: 0, second: 0 }),
-    ];
-    const stm = moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:ss");
-    const etm = moment().add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:ss");
-    const columns = [
-        {title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')},
-        {
-          title: '水位(m)', key: 'rz', dataIndex: 'rz', align: 'center',
-          render: (rec) => <span>{rec ? rec.toFixed(2) :  "-"}</span>},
-        {
-          title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center',
-          render: (rec) => <span>{rec ??"-"}</span>,
-        },
-    ];
-    const [data, setData] = useState([]);
-    const [params, setParams] = useState({})
-    const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.sssq.reservoirmonitor1).find_noCode);
-    const option = useMemo(() => {
-        return drpOption({data});
-      }, [data])
-    const searchTm = (e) => {
-      if (!e) {
-        setParams({...params, tm: "" })
-      } else {
-        setParams({
-          ...params,
-          stm: e[0].format("YYYY-MM-DD HH:mm:ss"),
-          etm: e[1].format("YYYY-MM-DD HH:mm:ss"),
-          tm:e,
-        })
-        
-      }
-    };
-    
-  const doSearch = () => {
-    if (!params?.tm) {
-        message.warning('请选择查询时间段')
-        return;
-      }
-      const exportParams={
-        ...params,
-        stm: params.tm[0].format("YYYY-MM-DD HH:mm:ss"),
-        etm: params.tm[1].format("YYYY-MM-DD HH:mm:ss"),
-        tm:params.tm,
-      }
-        search({ search: exportParams })
-        // debugger;
-        getData(exportParams)
-      }
-    
-    
-      const getData = async (params) => {
-        setData(await reservoirmonitor(params));
-      }
-    useEffect(() => {
-        const params = {
-            search: {
-                stm,
-                etm,
-                stcd:record.stcd
-            }
-        }
-        if (record?.stcd) {
-            search(params)
-            getData({stcd:record.stcd,...params.search})
-            setParams({tm,stcd:record.stcd}) 
-        }
-      }, [record])
-  return (
-      <div>
-            <div className="top-toobar" style={{marginBottom:20,width:"100%"}}>
-            <RangePicker showTime allowClear style={{width: "330px"}}
-                         onChange={searchTm}
-                         format="YYYY-MM-DD HH:mm"
-                         value={params.tm}
-            />
-            <Button type="primary" onClick={doSearch} style={{marginLeft: "10px"}}>查询</Button>
-            <Button  onClick={()=>setParams({...params,tm,stm,etm})} style={{marginLeft: "10px"}}>重置</Button>
-          </div>
-          <div style={{width:"100%"}}>
-              
-              <Table
-                  columns={columns}
-                  rowKey="inx"
-                  {...tableProps}
-                  scroll={{ y: "calc( 100vh - 700px )" }}
-                  style={{height:"calc( 100vh - 650px )"}}
-              />
-              <div className="top-right" style={{height:"40vh",marginTop:40}}>
-              {
-            data.length > 0 ?
-              <ReactEcharts
-                option={option}
-                style={{width: "100%", height: '100%'}}
-              /> : <div style={{textAlign: "center", margin: "10%"}}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-          }
-        </div>
-           </div>
-            
-    </div>
-  )
-}
diff --git a/src/views/gxsl/gsnlfx/drpOption.js b/src/views/gxsl/gsnlfx/drpOption.js
deleted file mode 100644
index 36685d5..0000000
--- a/src/views/gxsl/gsnlfx/drpOption.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import echarts from 'echarts/lib/echarts'
-
-export default function drpOption ({
-  data,
-}) {
-  const maxVal = Math.max(...data.map(obj => obj.drp))
-  // const minVal = Math.min(...data.map(obj => obj.drp))
-  const maxSw = Math.ceil(Math.max(...data.map(obj => obj.rz)))
-  const minSw = Math.floor(Math.min(...data.map(obj => obj.rz)))
-  const maxKr = Math.max(...data.map(obj => obj.w))
-  const minKr = Math.min(...data.map(obj => obj.w))
-  return {
-    tooltip: {
-      trigger: 'axis'
-    },
-    grid: {
-      top: '18%',
-      left: '5%',
-      right: '5%',
-      width: '90%',
-      height: '70%'
-    },
-    legend: {
-      // 显示图例
-      show: true,
-      left:60
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: true,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter: val => val.substr('2020-'.length, 11)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5
-          }
-        },
-        axisTick: {
-          show: false
-        }
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'left',
-        name: '水位(m)',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minSw,
-        max: maxSw
-      },
-      {
-        type: 'value',
-        position: 'right',
-        name: '库容(万m³)',
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minKr - 0.1,
-        max: maxKr + 0.1
-      }
-    ],
-    series: [
-      {
-        yAxisIndex:0,
-        name: '水位',
-        type: 'line',
-        symbol: 'none',
-        color: '#0AE0B5',
-        label: {
-          show: false
-        },
-        data: data.map(o => o.rz ? o.rz.toFixed(2):null )
-      },
-      {
-        yAxisIndex:1,
-        name: '库容',
-        type: 'line',
-        color: '#007AFD',
-        symbol: 'none',
-        showSymbol: false,
-        label: {
-          show: false
-        },
-        data: data.map(o => o.w)
-      }
-    ]
-  }
-}
diff --git a/src/views/gxsl/gsnlfx/index.js b/src/views/gxsl/gsnlfx/index.js
deleted file mode 100644
index 0fd7124..0000000
--- a/src/views/gxsl/gsnlfx/index.js
+++ /dev/null
@@ -1,236 +0,0 @@
-
-import React, { useEffect, useState,useMemo } from 'react'
-import { Button ,Modal,Form,Row,Col} from "antd"
-import { reservoirlist, } from "../../../service/sssq";
-import apiurl from '../../../service/apiurl';
-import MyImg from '../../Home/MapCtrl/components/Skssjc/myImg'
-import { httppost2, httpget2, httppost5 } from '../../../utils/request';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-import KrLine from './KrLine';
-import "./index.less"
-export default function Gsnlfx() {
-    const month = moment().month() + 1;
-    const optionsType = Array(12 - month + 1).fill(0).map((item,i) => ({label: (i + month)  + "月",value: i + month}))
-    const typeObj = {
-        1: "枯 ",
-        2: "偏枯 ",
-        3: "平",
-        4: "偏丰",
-        5:"丰"
-    }
-    const [form] = Form.useForm()
-    const [tableData, setTableData] = useState([])
-    const [ssgData, setSsGData] = useState({}) //输水管数据
-    const [gsDays, setGsDays] = useState()
-    const [lslOpen, setLslOpen] = useState(false)
-    const [simailarData, setSimailarData] = useState([])
-    const [lslData, setlslData] = useState(null)
-
-    const getData = async (params) => {
-        setTableData(await reservoirlist(params));
-    }
-         // 相似年下拉
-   const getSimilarData = async() => {
-            try {
-                const res = await httppost2(apiurl.gsxl.zfzl.similar)
-                setSimailarData(res.data.map(item => ({
-                    label: item.year + "年" + `(${typeObj[item.status]},${item.drp}mm)`,
-                    value:item.year
-                })))
-            } catch (error) {
-                console.log(error);
-            }
-    }
-      // 输水管流量数据
-      const getInputData = async() => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.input)
-            const ssg = res.data.find(item => item.sttp == "PQ");
-            const fsg = res.data.find(item => item.sttp == "QQ");
-            setSsGData({ssg,fsg})
-        } catch (error) {
-            console.log(error);
-        }
-    }
-    
-     // 获取可供水时间
-     const getWaterTimeData = async(params={}) => {
-        try {
-            const res = await httpget2(apiurl.gsxl.zfzl.kyTime,params)
-            let r = {
-                type: "可供水天数",
-                value: Object.keys(res.data)[0],
-                tm: Object.values(res.data)[0]
-            }
-            setGsDays(r)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-    const providerWater = useMemo(() => {
-        if (tableData[0]?.nowCap && tableData[0]?.deadCap) {
-          let num = (tableData[0]?.nowCap - tableData[0]?.deadCap).toFixed(2)
-            return num
-        } else {
-          return "--"
-          }
-    }, [tableData])
-    
-    const generate = () => {
-        setLslOpen(true)
-    }
-
-    const computerResult = async() => {
-        const values = form.getFieldsValue();
-        try {
-            const res = await httpget2(apiurl.gsxl.gsWater, values)
-            if (res.code == 200) {
-                setLslOpen(false);
-                setlslData(res.data.toFixed(2))
-                getWaterTimeData(values)
-            }
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-    useEffect(() => {
-        let option = {
-          sources: ["SW", "SK"],
-          args: "",
-        };
-        getData(option)
-        getInputData()
-        getWaterTimeData()
-        getSimilarData()
-      }, [])
-  return (
-      <div div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-          <div className="gsnl-content">
-              <div className='content-left'>
-                  <div className='gb-top-title'>
-                      <span className='gb-top-icon'></span>
-                       <span style={{fontSize:18}}>供水能力分析</span>         
-                  </div>
-                  <div className='content-card'>
-                      <div className='card-item'>
-                          <div className='card-title'>
-                              <img alt='' src={`${process.env.PUBLIC_URL}/assets/images/ksw.jpg`} />
-                              <span>当前库水位（m）</span>
-                          </div>
-                          <div className='card-value'>
-                              <span className='nl-value'>{tableData[0]?.rz ?? "-"}</span>
-                              <span className='nl-time'>（{tableData[0]?.drpTm ?? "--"}）</span>
-                          </div>
-                      </div>
-                      <div className='card-item'>
-                      <div className='card-title'>
-                              <img alt='' src={`${process.env.PUBLIC_URL}/assets/images/gsl.jpg`} />
-                              <span>可供水量（万m³）</span>
-                          </div>
-                          <div className='card-value'>
-                              <span className='nl-value'>{providerWater}</span>
-                              <span className='nl-time'>（{tableData[0]?.drpTm ?? "--"}）</span>
-                          </div>
-                      </div>
-                      <div className='card-item'>
-                      <div className='card-title'>
-                              <img alt='' src={`${process.env.PUBLIC_URL}/assets/images/ggll.jpg`} />
-                              <span>灌溉流量（m³/s）</span>
-                          </div>
-                          <div className='card-value'>
-                              <span className='nl-value'>{ssgData?.ssg?.v ?? "--"}</span>
-                              <span className='nl-time'>（{ssgData?.ssg?.tm ?? "--"}）</span>
-                          </div>
-                      </div>
-                      <div className='card-item'>
-                      <div className='card-title'>
-                              <img alt='' src={`${process.env.PUBLIC_URL}/assets/images/scll.jpg`} />
-                              <span>水厂流量（m³/s）</span>
-                          </div>
-                          <div className='card-value'>
-                          <span className='nl-value'>{ssgData?.fsg?.v ?? "--"}</span>
-                          <span className='nl-time'>（{ssgData?.fsg?.tm ?? "--"}）</span>
-                          </div>
-                      </div>
-                      <div className='card-item'>
-                      <div className='card-title'>
-                              <img alt='' src={`${process.env.PUBLIC_URL}/assets/images/yclsl.jpg`} />
-                              <span>预测来水量（万m³）</span>
-                          </div>
-                          <div className='yc-content'>
-                              <span className='yc-input'>{lslData ?? "预测生成"}</span>
-                              <Button
-                                  type='primary'
-                                  style={{ width: "30%", marginBottom: 10, marginLeft: "40%" }}
-                                  onClick={generate}
-                              >预测生成</Button>
-                          </div>
-                      </div>
-                      <div className='card-item'>
-                      <div className='card-title' style={{marginBottom:30}}>
-                              <img alt='' src={`${process.env.PUBLIC_URL}/assets/images/gsts.jpg`} />
-                              <span>可供水天数（天）</span>
-                          </div>
-                          <div className='card-value'>
-                              <span className='nl-value'>{gsDays?.value ?? "--"}</span>
-                              <span className='nl-time'>（{gsDays?.tm ?? "--"}）</span>
-                          </div>
-                          {/* <div className='yc-content'>
-                              <Button type='primary' style={{width:"30%",marginBottom:10,marginLeft:"40%"}}>计算</Button>
-                          </div> */}
-                      </div>
-                      <MyImg  record={tableData[0] || {}}/>
-                  </div>
-              </div>   
-              <div className='content-right'>
-              <div className='gb-top-title'>
-                      <span className='gb-top-icon'></span>
-                       <span style={{fontSize:18}}>库容过程线</span>         
-                  </div>
-                  <KrLine record={tableData[0] || {}}/>
-              </div>   
-          </div>
-          
-          <Modal
-              title="预测来水量"
-              open={lslOpen}
-              onCancel={() => setLslOpen(false)}
-              width={500}
-              okText="计算"
-              destroyOnClose
-              onOk={computerResult}
-          >
-              <Form form={form}>
-                  <Row>
-                      <Col span={24}>
-                      <Form.Item
-                      label="选择相似年"
-                      name="year"
-                      rules={[{ required: true }]}
-                      wrapperCol={{span:19}}
-                      labelCol={{span:6}}
-                  >
-                      <NormalSelect options={simailarData} allowClear/>
-                  </Form.Item >
-                      </Col>
-                  </Row>
-                  <Row>
-                  <Col span={24}>
-                      <Form.Item
-                      label="预测截止月份"
-                      name="month"
-                      rules={[{ required: true }]}
-                      wrapperCol={{span:19}}
-                      labelCol={{span:6}}
-                  >
-                    <NormalSelect options={optionsType} allowClear/>
-                  </Form.Item>
-                   </Col>
-                  </Row>
-              </Form> 
-          </Modal>
-      </div>
-  )
-}
diff --git a/src/views/gxsl/gsnlfx/index.less b/src/views/gxsl/gsnlfx/index.less
deleted file mode 100644
index 381daa8..0000000
--- a/src/views/gxsl/gsnlfx/index.less
+++ /dev/null
@@ -1,83 +0,0 @@
-.gb-top-title{
-    display: flex;
-    align-items: center;
-    column-gap: 10px;
-    margin-bottom: 10px;
-    .gb-top-icon{
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.gsnl-content{
-    display: flex;
-    column-gap: 10px;
-    padding-right:10px;
-    .content-left{
-        width: 700px;
-        padding: 10px;
-        border: 1px solid #dfdfdf;
-        border-radius: 5px;
-        overflow-y: auto;
-        height: calc( 100vh - 100px);
-        .content-card{
-            display: flex;
-            flex-wrap: wrap;
-            column-gap: 20px;
-            padding-top: 10px;
-            .card-item{
-                width: 325px;
-                border: 1px solid #dfdfdf;
-                border-radius: 5px;
-                margin-bottom: 20px;
-                padding: 10px;
-                padding-bottom: 0;
-                box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.4);
-                .card-title{
-                    display: flex;
-                    align-items: center;
-                    column-gap: 10px;
-                    font-size: 18px;
-                    margin-bottom: 10px;
-                }
-                .card-value{
-                    display: flex;
-                    align-items: baseline;
-                    flex-wrap: nowrap;
-                    .nl-value{
-                        font-size: 36px;
-                        font-weight: 700;
-                        color:#02a7f0;
-                    }
-                    .nl-time{
-                        font-size: 14px;
-                        font-weight: bold;
-                    }
-                }
-                img{
-                    width: 40px;
-                }
-            }
-
-            .yc-content{
-                display: flex;
-                flex-direction: column;
-                .yc-input{
-                    display: inline-block;
-                    width: 80%;
-                    height: 40px;
-                    padding: 10px;
-                    border-radius: 5px;
-                    background-color: #f0f6ff;
-                    margin-bottom: 15px;
-                }
-            }
-        }
-    }
-    .content-right{
-        width: 850px;
-        border: 1px solid #dfdfdf;
-        padding: 10px;
-        border-radius: 5px;
-    }
-}
\ No newline at end of file
diff --git a/src/views/gxsl/gstjfx/gsOption.js b/src/views/gxsl/gstjfx/gsOption.js
deleted file mode 100644
index e1212e0..0000000
--- a/src/views/gxsl/gstjfx/gsOption.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import "echarts/extension/bmap/bmap"
-
-
-export default function drpOption (data) {
-  console.log('data', data)
-  const maxSt = Math.ceil(Math.max(...data.map(obj => {
-    return  obj?.ecologyV ? obj?.ecologyV:0
-  })))
-  const minSt = Math.floor(Math.min(...data.map(obj => {
-    return  obj?.ecologyV? obj?.ecologyV :300
-  })))
-  const maxSh = Math.ceil(Math.max(...data.map(obj => {
-    return  obj?.lifeV ? obj?.lifeV:0
-  })))
-  const minSh = Math.floor(Math.min(...data.map(obj => {
-    return  obj?.lifeV? obj?.lifeV :300
-  })))
-  const minY = Math.min(minSt, minSh);
-  const maxY = Math.min(maxSt, maxSh);
-  
-  return {
-    toolbox: {
-      show: true,
-      feature: {
-        saveAsImage: {
-          show: true,
-          excludeComponents: ['toolbox'],
-          pixelRatio: 2,
-          name:"供水"
-        }
-      },
-      right: "14%",
-      top:"5%"
-    },
-    tooltip: {
-      trigger: 'axis'
-    },
-    grid: [
-      {
-        top: '18%',
-        left: '10%',
-        right: '12%',
-        bottom:"12%"
-        // width: '80%',
-        // height: '35%'
-      },
-    ],
-    legend: {
-      // 显示图例
-      show: true,
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          // formatter:function(val)  
-          // {  
-          //   let value = val.substr('2020-'.length, 11)
-          //     var ret = "";//拼接加\n返回的类目项  
-          //     var maxLength = 6;//每项显示文字个数  
-          //     var valLength = value.length;//X轴类目项的文字个数  
-          //     var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数  
-          //     if (rowN > 1)//如果类目项的文字大于5,  
-          //     {  
-          //         for (var i = 0; i < rowN; i++) {  
-          //             var temp = "";//每次截取的字符串  
-          //             var start = i * maxLength;//开始截取的位置  
-          //             var end = start + maxLength;//结束截取的位置  
-          //        //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧  
-          //             temp = value.substring(start, end) + "\n";  
-          //             ret += temp; //凭借最终的字符串  
-          //         }  
-          //         return ret;  
-          //     }  
-          //     else {  
-          //          return value;  
-          //     }  
-          // }  
-       
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5
-          }
-        },
-        axisTick: {
-          show: false
-        }
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        // gridIndex:0,
-        position: 'left',
-        // name: '水位(m)',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minY,
-        max: maxY
-      },
-    ],
-    series: [
-      {
-        name: '发电灌溉',
-        type: 'line',
-        symbol: 'none',
-        smooth: true,
-        color: '#1283e3',
-        label: {
-          show: false
-        },
-        data: data.map(o => o.ecologyV)
-      },
-      {
-        name: '水厂取水',
-        type: 'line',
-        smooth: true,
-        color: '#36e9e9',
-        symbol: 'none',
-        data: data.map(o =>o.lifeV)
-      }
-    ]
-  }
-}
-
-
-
diff --git a/src/views/gxsl/gstjfx/index.js b/src/views/gxsl/gstjfx/index.js
deleted file mode 100644
index 667dfde..0000000
--- a/src/views/gxsl/gstjfx/index.js
+++ /dev/null
@@ -1,338 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import { useSelector } from 'react-redux';
-import TjToolBar from './toolbar1';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { exportFile } from '../../../utils/tools.js';
-import { httppost2, httppost5 } from '../../../utils/request';
-import ReactEcharts from 'echarts-for-react';
-import gsOption from './gsOption';
-import tjOption from './tjOption';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
-    {
-      title: '发电灌溉',
-      align: "center",
-      children: [
-        {
-          title: '流量(m³/s)',
-          key: "ecologyQ",
-          dataIndex:"ecologyQ",
-          align: "center",
-        },
-        {
-          title: '水量(万m³)',
-          key: "ecologyV",
-          dataIndex:"ecologyV",
-          align: "center",
-        }
-      ]
-    },
-    {
-      title: '水厂取水',
-      align: "center",
-      children: [
-        {
-          title: '流量(m³/s)',
-          key: "lifeQ",
-          dataIndex:"lifeQ",
-          align: "center",
-        },
-        {
-          title: '水量(万m³)',
-          key: "lifeV",
-          dataIndex:"lifeV",
-          align: "center",
-        }
-      ]},  
-    {
-      title: '小计(万m³)', key: 'sumV', dataIndex: 'sumV',ellipsis: true, align: "center",
-      render: (rec, record) => <span style={{color:"#ffa171"}}>{rec}</span>
-     },
-  ];
-
-  const tjColumns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '时间', key: 'tm', dataIndex: 'tm', width: 100, ellipsis: true, align:"center" },
-    {
-      title: '发电灌溉',
-      align: "center",
-      children: [
-        {
-          title: '年度占比',
-          key: "ecologyYearRateV",
-          dataIndex:"ecologyYearRateV",
-          align: "center",
-        },
-   
-        {
-          title: '水量(万m³)',
-          key: "ecologyV",
-          dataIndex:"ecologyV",
-          align: "center",
-          width:100
-        },
-        {
-          title: '同比',
-          key: "ecologyYoyV",
-          dataIndex:"ecologyYoyV",
-          align: "center",
-          render: (rec, record) => <span style={{
-            color: rec.includes("↑") ? "#38fb45" :
-            rec.includes("↓") ? "#e4766b" : "#000"
-            
-          }}>{rec}</span>
-        },
-        {
-          title: '环比',
-          key: "ecologyQoqV",
-          dataIndex:"ecologyQoqV",
-          align: "center",
-          render: (rec, record) => <span style={{
-            color: rec.includes("↑") ? "#38fb45" :
-            rec.includes("↓") ? "#e4766b" : "#000"
-            
-          }}>{rec}</span>
-        }
-      ]
-    },
-    {
-      title: '水厂取水',
-      align: "center",
-      children: [
-        {
-          title: '年度占比',
-          key: "lifeYearRateV",
-          dataIndex:"lifeYearRateV",
-          align: "center",
-        },
-   
-        {
-          title: '水量(万m³)',
-          key: "lifeV",
-          dataIndex:"lifeV",
-          align: "center",
-          width: 100,
-          
-        },
-        {
-          title: '同比',
-          key: "lifeYoyV",
-          dataIndex:"lifeYoyV",
-          align: "center",
-          render: (rec, record) => <span style={{
-            color: rec.includes("↑") ? "#38fb45" :
-            rec.includes("↓") ? "#e4766b" : "#000"
-            
-          }}>{rec}</span>
-        },
-        {
-          title: '环比',
-          key: "lifeQoqV",
-          dataIndex:"lifeQoqV",
-          align: "center",
-          render: (rec, record) => <span style={{
-            color: rec.includes("↑") ? "#38fb45" :
-            rec.includes("↓") ? "#e4766b" : "#000"
-            
-          }}>{rec}</span>
-        }
-      ]},  
-  ];
-  const [searchVal, setSearchVal] = useState(false)
-  const [tjSearchVal, setTjSearchVal] = useState()
-  const [mode, setMode] = useState('')
-  const [krlist, setkrList] = useState([]) //供水图表数据
-  const [tjlist, setTjList] = useState([]) //统计分析表格和图表数据
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gsxl.gstjfx.gspage).find_noCode);
-  
-  const exportExcel = () => {
-    let pageSo = {
-      pageNumber: tableProps.pagination.current,
-      pageSize:tableProps.pagination.pageSize
-    }
-    let params = {
-      ...searchVal,
-      searchType:mode,
-      pageSo
-    }
-    httppost5(apiurl.gsxl.gstjfx.gsexport, params).then(res => {
-      exportFile(`供水水方统计表.xlsx`,res.data)
-  })
-  }
-
-  const tjExportExcel = () => {
-    httppost5(`${apiurl.gsxl.gstjfx.tjexport}?year=${tjSearchVal.year}`).then(res => {
-      exportFile(`统计分析表.xlsx`,res.data)
-  })
-  }
-  const getGsChartData = async (parmas) => {
-    try {
-      const res =await httppost2(apiurl.gsxl.gstjfx.gschartList, parmas)
-      setkrList(res.data)
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  const getTjData = async (parmas) => {
-    try {
-      const res = await httppost2(`${apiurl.gsxl.gstjfx.tjlist}?year=${parmas.year}`)
-      setTjList(res.data.map((item,i) => ({...item,inx:i + 1})))
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const gsoptions = useMemo(() => {
-    if (krlist.length > 0) {
-        return gsOption(krlist)
-    } else {
-        return []
-    }
-  }, [krlist])
-  const sumObj = useMemo(() => {
-    let obj = {};
-    if (tableProps.dataSource.length > 0) {
-      obj.stgs = tableProps.dataSource.reduce((total, cur) => (cur.ecologyV) + total, 0)
-      obj.shgs = tableProps.dataSource.reduce((total, cur) => (cur.lifeV) + total, 0)
-      obj.zj = tableProps.dataSource.reduce((total, cur) => (cur.sumV) + total, 0)
-      return obj
-    } else {
-      return "1"
-    }
-  }, [tableProps])
-
-    // 统计饼形图
-  const tjOptions = useMemo(() => {
-    let obj = {};
-    if (tjlist.length > 0) {
-      obj.stgs = tjlist.reduce((total, cur) => Number((cur.ecologyV)) + total, 0)
-      obj.shgs = tjlist.reduce((total, cur) => Number((cur.lifeV)) + total, 0)
-      obj.zj = obj.stgs + obj.shgs
-      return tjOption(obj)
-    } else {
-      return ""
-    }
-  }, [tjlist])
-  useEffect(() => {
-    const params = {
-      search: {
-        ...searchVal,
-        searchType: mode,
-        isAsc: false,
-        orderField:"tm"
-      }
-    };
-    search(params)
-    getGsChartData({...params?.search, isAsc: true, })
-  }, [searchVal, mode])
-
-  useEffect(() => {
-    if (tjSearchVal) {
-      getTjData(tjSearchVal)
-    }
-  }, [tjSearchVal])
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <div className='gsTitle' style={{display:"flex",alignItems:"center",columnGap:15,marginBottom:20}}>
-            <img
-              alt=''
-              src={`${process.env.PUBLIC_URL}/assets/gs.png`}
-              style={{width:30}}
-            /> 
-            <span style={{fontSize:18}}>供水水方</span>
-          </div>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              exportFile={exportExcel}
-              setMode={(e)=>setMode(String(e))}
-              role={role}
-            />
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <div className='gs-content' style={{display:"flex",columnGap:30}}>
-                <div style={{width:800}}>
-                  <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ y: "calc( 100vh - 400px )"}}/> 
-              </div>
-              <div style={{flex:1}}>
-                <div style={{color:"#ffa87c",display:"flex",columnGap:20}}>
-                    <div className='des-title'>
-                    <div>发电灌溉总合计(万m³)：</div>
-                    <div style={{margin:"10px 0"}}>水厂取水总合计(万m³)：</div>
-                    <div>供水总合计(万m³)：</div>
-                  </div>
-                  <div className='des-title'>
-                    <div>{sumObj?.stgs?.toFixed(2)}</div>
-                    <div style={{margin:"10px 0"}}>{sumObj?.shgs?.toFixed(2)}</div>
-                    <div>{sumObj?.zj?.toFixed(2)}</div>
-                    </div>
-                </div>
-                <div className='gs-charts'>
-              {
-                  krlist.length > 0 ?
-                    <ReactEcharts
-                      option={gsoptions}
-                      style={{width: "100%", height: 360}}
-                      notMerge={true}
-                    /> : <div style={{textAlign: "center", margin: "10%"}}>
-                      <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                    </div>
-                }
-              </div>
-              </div>
-             
-            </div>
-            <div className='tj-box' style={{ marginTop: 20 }}>
-                <div className='tj-title' style={{display:"flex",alignItems:"center",columnGap:15,marginBottom:20}}>
-                <img
-                  alt=''
-                  src={`${process.env.PUBLIC_URL}/assets/tj.png`}
-                  style={{width:30}}
-                /> 
-                <span style={{fontSize:18}}>统计分析</span>
-              </div>
-                <TjToolBar
-                  setSearchVal={setTjSearchVal}
-                  exportFile={tjExportExcel}
-                  role={role}
-              />
-              <div className='gs-content' style={{ display: "flex", columnGap: 30, margin: "10px 0" }}>
-              <div style={{width:800}}>
-                <Table
-                  columns={tjColumns}
-                  rowKey="inx"
-                  dataSource={tjlist}
-                  pagination={false}
-                  scroll={{ y: "calc( 100vh - 400px )" }} /> 
-              </div>
-                <div style={{ flex: 1 }}>
-                {
-                  tjlist.length > 0 ?
-                    <ReactEcharts
-                      option={tjOptions}
-                      style={{width: "100%", height: 460}}
-                      notMerge={true}
-                    /> : <div style={{textAlign: "center", margin: "10%"}}>
-                      <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                    </div>
-                }
-              </div>
-               </div>
-              </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/gxsl/gstjfx/index.less b/src/views/gxsl/gstjfx/index.less
deleted file mode 100644
index fde985b..0000000
--- a/src/views/gxsl/gstjfx/index.less
+++ /dev/null
@@ -1,47 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
-
-.gstime-type {
-    margin-left: 1rem;
-    display: flex;
-    cursor: pointer;
-    div {
-      width: 60px;
-      text-align: center;
-      border: 1px solid #cccccc;
-      padding: 4px 0;
-    }
-
-    .active {
-      color: #5FB7FF;
-      background: #F0F7FF;
-      border: 1px solid #5FB7FF;
-    }
-  }
\ No newline at end of file
diff --git a/src/views/gxsl/gstjfx/tjOption.js b/src/views/gxsl/gstjfx/tjOption.js
deleted file mode 100644
index 144a424..0000000
--- a/src/views/gxsl/gstjfx/tjOption.js
+++ /dev/null
@@ -1,116 +0,0 @@
-export default function tjOption(obj) {
-let title = "总计";
-let color = ["#73a0fa", "#52c1f5"];
-let echartData = [
-  {
-    name: "发电灌溉",
-    value: parseFloat(obj?.shgs?.toFixed(2))
-  },
-  {
-    name: "水厂取水",
-    value: parseFloat(obj?.stgs?.toFixed(2)),
-  },
-];
-
-let formatNumber = function (num) {
-  let reg = /(?=(\B)(\d{3})+$)/g;
-  return num.toString().replace(reg, ",");
-};
-let total = echartData.reduce((a, b) => {
-  return a + b.value * 1;
-}, 0);
-let percentFormat = function (num){
-    return ((num / total) * 100)?.toFixed(2).toString() + "%";
-}
-return{
-  color: color,
-
-  title: [
-    {
-      text: "{name|" + title + "}\n{val|" + formatNumber(total) + "}{unit|"  + "万m³" + "}",
-      top: "center",
-      left: "center",
-      textStyle: {
-        rich: {
-          name: {
-            fontSize: 16,
-            fontWeight: "bold",
-            color: "#007afd",
-            padding: [10, 0],
-          },
-          val: {
-            fontSize: 28,
-            fontWeight: "bold",
-            padding: [0, 5],
-            color: "#333333",
-          },
-          unit:{
-              fontSize: 12,
-              color:"#000"
-          }
-        },
-      },
-    },
-  ],
-  series: [
-    {
-      type: "pie",
-      radius: ["40%", "60%"],
-      center: ["50%", "50%"],
-      data: echartData,
-      hoverAnimation: false,
-      itemStyle: {
-        normal: {
-        //   borderColor: bgColor,
-          borderWidth: 2,
-        },
-      },
-      labelLine: {
-        normal: {
-          length: 80,
-        //   length2: 120,
-          lineStyle: {
-            color: "#e6e6e6",
-          },
-        },
-      },
-      label: {
-        normal: {
-          formatter: (params) => {
-            return (
-              "{name|" +
-              params.name +
-              ':'+"}{value|" +
-              percentFormat(params.value)+
-              "}\n{total|" +
-              formatNumber(params.value) + '' +'万m³'+
-              "}"
-            ); 
-          },
-        //   padding: [0, -100, 25, -100],
-          rich: {
-            name: {
-              fontSize: 16,
-              padding: [0, 5, 10, 4],
-              color: "#666666",
-            },
-            value: {
-              fontSize: 14,
-                color: "#333333",
-                padding: [0, 0, 10, 4],
-              
-              },
-              total: {
-              fontSize: 14,    
-              color: "#333333",
-              align:"left",
-              lineHeight:23
-            }
-          },
-        },
-      },
-    },
-  ],
-};
-
-}
\ No newline at end of file
diff --git a/src/views/gxsl/gstjfx/toolbar.js b/src/views/gxsl/gstjfx/toolbar.js
deleted file mode 100644
index 8ffa50e..0000000
--- a/src/views/gxsl/gstjfx/toolbar.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-import clsx from "clsx";
-
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, setMode, exportFile,role  }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出");
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-  const [form] = Form.useForm();
-  const [current, setCurrent] = useState(1)
-
-  const onValuesChange = (e) => {
-    switch (e.ranger) {
-      case 1:
-        form.setFieldValue("tm",[moment().startOf("day"),moment()])
-        break;
-      case 2:
-          form.setFieldValue("tm",[moment().subtract(7, 'days'),moment()])
-        break;
-      case 3:
-          form.setFieldValue("tm",[moment().subtract(1, 'months'),moment()])
-        break;
-      case 4:
-          form.setFieldValue("tm",[moment().subtract(3, 'months'),moment()])
-        break;
-      case 5:
-          form.setFieldValue("tm",[moment().subtract(1, 'years'),moment()])
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        startTime: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        endTime: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, ...dateSo});
-  }
-
- useEffect(() => {
-   setMode(current)
- }, [current])
-  
-  useEffect(() => {
-    let time = [moment().subtract(7,"days"),moment()]
-     let dateSo = {
-      startTime:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-      endTime:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-    }
-    form.setFieldValue("tm",time)
-    setSearchVal(dateSo)
-  }, [])
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm"
-            />
-          </Form.Item>
-          <Form.Item label="常用时段" name="ranger">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-            {exportBtn ? <Form.Item>
-              <Button onClick={()=>exportFile()}>导出</Button>
-          </Form.Item> : null }
-          <Form.Item>
-          <div className="gstime-type">
-          {
-            ['小时', '日',"月","年"].map((item, index) => (
-              <div className={clsx({active: (index + 1) === current})} onClick={() => setCurrent(index + 1)}>{item}</div>
-            ))
-          }
-        </div>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gxsl/gstjfx/toolbar1.js b/src/views/gxsl/gstjfx/toolbar1.js
deleted file mode 100644
index 3fc6c9c..0000000
--- a/src/views/gxsl/gstjfx/toolbar1.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-import clsx from "clsx";
-const ToolBar = ({ setSearchVal, exportFile, role }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出");
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    // setSearchVal({...values,year: String(values.year)});
-    setSearchVal({...values,year: moment(values.year).format("YYYY")});
-  }
-  
-  useEffect(() => {
-    let time = moment()
-    form.setFieldValue("year",time)
-    setSearchVal({year:time.format("YYYY")})
-  }, [])
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="年度" name="year">
-          <DatePicker allowClear picker="year" />
-          </Form.Item>
-         
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          {exportBtn ? <Form.Item>
-              <Button onClick={()=>exportFile()}>导出</Button>
-          </Form.Item> : null }
-          <Form.Item>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gxsl/zfjk/detailModal.js b/src/views/gxsl/zfjk/detailModal.js
deleted file mode 100644
index 2e06720..0000000
--- a/src/views/gxsl/zfjk/detailModal.js
+++ /dev/null
@@ -1,330 +0,0 @@
-import React,{useState,useEffect} from 'react'
-import { Button, DatePicker, Input, Modal, Radio, Table, Tabs,Empty, message } from 'antd'
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { httpget2,httppost2,httppost5 } from '../../../utils/request'
-import apiurl from '../../../service/apiurl.js'
-import { exportFile } from '../../../utils/tools.js';
-import SearchBar from "./toolbar"
-import SearchBar1 from "./toolbar1"
-import HFivePlayer from '../../../components/video1Plary.js'
-import VideoControler from '../../../components/VideoControler';
-export default function DetailModal({ zfType,setVideoOpen, detailInfo, setSwitchVisible, open }) {
-    const columnsHistory = [
-        { title: '序号', key: 'inx',dataIndex: 'inx', align: 'center' },
-        { title: '闸阀名称', key: 'valveName', dataIndex: 'valveName', align: 'center' },
-        { title: '开关状态', key: 'status', dataIndex: 'status', align: 'center' },
-        { title: '操作时间', key: 'tm', dataIndex: 'tm', align: 'center' },
-  ]
-  const columnsLog = [
-    { title: '序号', key: 'inx',dataIndex: 'inx', align: 'center' },
-    { title: '闸阀名称', key: 'valveName', dataIndex: 'valveName', align: 'center' },
-    { title: '操作人', key: 'opUserName', dataIndex: 'opUserName', align: 'center' },
-    { title: '操作内容', key: 'opContent', dataIndex: 'opContent', align: 'center' },
-    { title: '操作时间', key: 'tm', dataIndex: 'tm', align: 'center' },
-    { title: '设定开度', key: 'status', dataIndex: 'status', align: 'center' },
-    { title: '操作前开度', key: 'beforeStatus', dataIndex: 'beforeStatus', align: 'center' },
-]
-    const [type, setType] = useState("1");
-    const [selectItem, setSelectItem] = useState('')
-    const [videoArr, setvideoArr] = useState({})
-    const [zfInfo, setZfInfo] = useState({})
-    const [searchVal, setSearchVal] = useState('') // 开度历史
-    const [searchValLog, setSearchValLog] = useState('') // 操作日志
-    
-    const [videoList, setVideoList] = useState([])
-    const [controlerParams, setControlerParams] = useState()
-    const [isShow, setIsShow] = useState(false)
-  const { tableProps, search} = usePageTable(createCrudService(apiurl.gsxl.zfzl.kgpage).find_noCode);
-  const { tableProps:tableProps1, search:search1 } = usePageTable(createCrudService(apiurl.gsxl.zfzl.logpage).find_noCode);
-  
-    const radioChange = (e) =>{
-        setType(e.target.value);
-    };
-
-     // 视频播放
-     const videoPlay = (params) => {
-        setSelectItem(params.name)
-       getVideoSrc(params?.indexCode)
-       setControlerParams(params)
-    }
-      // 获取视频流
-      const getVideoSrc = async (current) => {
-        const res = await httpget2(`${apiurl.gsxl.zfzl.videosrc}${current}`)
-        if (res.code == 200 && res.data?.length !== 0) {
-          setvideoArr({src:res.data})
-        }else{
-          setvideoArr({})
-        }
-    }
-        // 闸阀信息表
-    const getZfinfo = async (params) => {
-        try {
-            const res = await httpget2(apiurl.gsxl.zfzl.info,params)
-            setZfInfo(res.data)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-      // 开关历史信息表
-  const exportExcel = () => {
-    let exportName = type === "3" ? "闸阀操作日志表.xlsx" :"闸阀开度历史表.xlsx"
-    let search = type === "3" ? searchValLog : searchVal
-    let pageSo = {
-      pageNumber: type === "3" ? tableProps1.pagination.current:tableProps.pagination.current,
-      pageSize:type === "3" ? tableProps1.pagination.pageSize : tableProps.pagination.pageSize
-    }
-    let api = type === "3" ? apiurl.gsxl.zfzl.export1 : apiurl.gsxl.zfzl.export
-    let params = {
-      ...search,
-      valveCode: detailInfo?.valveCode,
-      pageSo
-    }
-    httppost5(api, params).then(res => {
-      exportFile(exportName,res.data)
-  })
-    }
-    
-     // 获取视频列表
-     const getVideoList = async (params) => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.videoList,params)
-            setVideoList(res.data)
-            setSelectItem(res.data[0]?.name)
-            getVideoSrc(res.data[0]?.indexCode)
-            setControlerParams(res.data[0])
-            
-        } catch (error) {
-            console.log(error);
-        }
-    }
-    const clickSwitch = (val) => {
-        setSwitchVisible(true);
-  };
-  const [realQData, setRealQData] = useState()
-  // 获取实时流量
-  const getRealQData = async () => {
-
-    try {
-      const res = await httpget2(apiurl.gsxl.zfzl.realQ,{ valveCode: detailInfo?.valveCode })
-      setRealQData(res.data)
-    } catch (error) {
-      
-    }
-  }
-    // 云台控制
-    const onOperation = async(params) => {
-      let data = {
-          ...params,
-          indexCode: controlerParams?.indexCode,
-          action:0
-      }
-      try {
-          const res = await httppost2(apiurl.spjk1.aiWarn.controler,data)
-      } catch (error) {
-          console.log(error);
-      }
-  }
-    useEffect(() => {
-        if (detailInfo) {
-            getZfinfo({ valveCode: detailInfo.valveCode })
-            getVideoList({ valveCode: detailInfo.valveCode })
-      }
-    }, [detailInfo])
-    
-    useEffect(() => {
-      if (type == "2") {
-          search({
-              search: {
-                  valveCode: detailInfo?.valveCode,
-                  ...searchVal,
-              }
-          })
-
-      }
-      if (type == "3") {
-        search1({
-            search: {
-                valveCode: detailInfo?.valveCode,
-                ...searchValLog,
-            }
-        })
-
-    }
-    }, [searchVal, type, detailInfo, searchValLog])
-  
-    useEffect(() => {
-      if (zfType == 3) {
-        getRealQData()
-      }
-    }, [zfType])
-  return (
-      <div>
-          <Radio.Group onChange={radioChange} defaultValue="1" buttonStyle="solid" className="longRadio">
-          <Radio.Button value="1">闸阀信息</Radio.Button>
-          <Radio.Button value="2">开度历史</Radio.Button>
-          {detailInfo?.manualOperation ? <Radio.Button value="3">操作日志</Radio.Button> : null}
-        </Radio.Group>
-
-        {
-          type==="1"?
-          <div className="content">
-            <div className="infoDiv">
-              <div className="imgDiv">
-                {
-                  zfType === 2?
-                    <img src={`${process.env.PUBLIC_URL}/assets/fa.png`} alt=""/>:
-                    zfType === 1?<img src={`${process.env.PUBLIC_URL}/assets/hsf.jpg`} alt=""/>:
-                      <img src={`${process.env.PUBLIC_URL}/assets/tjf.png`} alt=""/>
-                }
-                <div className="tips tips1">
-                  开关状态：<span style={detailInfo.status && detailInfo.status !="关" ?{color:"#0AC64A",fontWeight:"bold"}:{}}>{detailInfo.status || "关"}</span>
-                </div>
-                 {zfType == 3 ?<div className="tips tips3">
-                  <div>实时流量：</div>
-                  <div>{realQData??"-"} m³/s</div>
-                </div>:null}
-                <div className="tips tips2">
-                  <div>采集时间：</div>
-                  <div>{detailInfo?.tm}</div>
-                </div>
-
-               {detailInfo?.manualOperation ?<div className="control">
-                  <p>闸阀控制：</p>
-                  <div style={{margin:"0 0 0 10px"}}>
-                                      <Button type="primary" style={{ margin: "0 30px 0 10px" }}
-                                          onClick={() => clickSwitch("开启")}
-                                      >调节</Button>
-                    {/* <Button type="primary" onClick={()=>clickSwitch("关闭")}>关闭</Button> */}
-                  </div> 
-                </div> : null}
-              </div>
-
-              <div className="txtDiv">
-                <div className="txt">
-                  <p>视频监控</p>
-                  <div>
-                  <div className="videoDiv">
-                    <div>
-                        {
-                            videoList.length > 0 ? videoList.map(item =>{
-                                return <button
-                                    style={{
-                                        width: "100px",
-                                        whiteSpace: "pre-wrap",
-                                        maxHeight: 100,
-                                        background: selectItem == item.name ? "#0893ff" : "none",
-                                        // background: "none",
-
-                                        border: "none",
-                                        color: selectItem == item.name ? "#fff" : "000",
-                                        // color:  "000",
-
-                                        cursor:"pointer"
-                                    }}
-                                    key={item?.valveCode}
-                                    mulitline={true}
-                                    onClick={()=>videoPlay(item)}
-                                >
-                                    {item?.name}</button>
-                                
-                            } ) : null
-                        }
-                    
-                    </div>
-                    <div>
-                        {videoArr?.src &&
-                          <div
-                            className="content-video"
-                            style={{  width: "100%", height: 300,cursor: "pointer"  }}
-                            onClick={() => {
-                              if (controlerParams.type == 1) {
-                                setVideoOpen(true)
-                                setIsShow(!isShow)
-                              }
-                            }}
-                          >
-                          <HFivePlayer size={1} wsUrl={videoArr} playerID={'121'} />
-                          <div style={{textAlign:"right"}}>注：单机视频显示/隐藏云台</div>
-                        </div>}
-                        {!videoArr?.src && <Empty style={{ position: 'absolute', top: '200px', }} description={false} />}
-                    </div>
-                  </div>
-                  {open && isShow ?  <div className='video-controler'>
-                     <VideoControler selectItem={controlerParams} onOperation={onOperation} />
-                    </div> : null}   
-                  </div>
-
-                  <p style={{marginTop:"10px"}}>基本信息</p>
-                  <div style={{width:"500px"}}>
-                    <div>
-                      <div>型号：</div>
-                      <div>{zfInfo?.model}</div>
-                    </div>
-                    <div>
-                      <div>规格：</div>
-                      {
-                        zfType === 1?
-                          <div>{zfInfo?.spe}</div>:
-                            <div>{zfInfo?.spe}</div>
-                      }
-                    </div>
-                    <div>
-                      <div>生产厂家：</div>
-                      <div>{zfInfo?.manufacturer}</div>
-                    </div>
-                    <div>
-                      <div>联系人：</div>
-                      <div>{zfInfo?.contacts}</div>
-                    </div>
-                    <div>
-                      <div>联系电话：</div>
-                      <div>{zfInfo?.contactCell}</div>
-                    </div>
-                    <div>
-                      <div>结构长度：</div>
-                      <div>{zfInfo?.len}</div>
-                    </div>
-                    <div>
-                      <div>法兰尺寸：</div>
-                      <div>{zfInfo?.flangeLen}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div> :
-          type === "2" ?
-            <div style={{ marginTop: "20px" }}>
-            <SearchBar  
-            setSearchVal={setSearchVal}
-                exportFile={exportExcel}
-                searchVal={searchVal}
-             />
-            <Table 
-            columns={columnsHistory} 
-            rowKey="inx"
-            {...tableProps}
-            scroll={{ y: "calc( 100vh - 400px )" }}
-              />
-          </div> : 
-            type === "3" ? 
-            <div style={{ marginTop: "20px" }}>
-            <SearchBar1  
-            setSearchVal={setSearchValLog}
-            exportFile={exportExcel}
-            searchValLog={searchValLog}
-             />
-            <Table 
-            columns={columnsLog} 
-            rowKey="inx"
-            {...tableProps1}
-            scroll={{ y: "calc( 100vh - 400px )" }}
-              />
-          </div> :null
-          }
-      
-    </div>
-  )
-}
diff --git a/src/views/gxsl/zfjk/index.js b/src/views/gxsl/zfjk/index.js
deleted file mode 100644
index 4943fd3..0000000
--- a/src/views/gxsl/zfjk/index.js
+++ /dev/null
@@ -1,252 +0,0 @@
-import React,{useState,useEffect,useMemo} from 'react'
-import HFivePlayer from '../../../components/video1Plary.js'
-import {  Modal,Table,Input,message} from 'antd'
-import { httpget2,httppost2,httppost5 } from '../../../utils/request'
-import apiurl from '../../../service/apiurl.js'
-import DetailModal from './detailModal.js'
-import NormalSelect from '../../../components/Form/NormalSelect';
-import CryptoJS from 'crypto-js';
-import clsx from 'clsx'
-import "./index.less"
-import VideoControler from '../../../components/VideoControler/index.js'
-export default function Zfjk() {
-    const zfcolumns = [
-        { title: '闸阀名称', key: 'valveName', dataIndex: 'valveName', align: 'center' },
-        {
-            title: '当前开关状态', key: 'status', dataIndex: 'status', align: 'center',
-            render: (rec, record) => <span style={{color:rec == "关" ? "#d9001b":"#03b615"}}>{rec}</span>
-         },
-        { title: '数据采集时间', key: 'tm', dataIndex: 'tm', align: 'center',width:200, },
-        {
-            title: '操作', key: 'operator', dataIndex: 'operator', align: 'center',width:50,
-            render: (rec, record) => <span
-                style={{ color: "#02a7f0", cursor: "pointer" }}
-                onClick={() => {zhafaClick(record) }}>{ record?.manualOperation ? "控制" : "详情"}</span>
-        },
-    ]
-    const [videoList, setVideoList] = useState([])
-    const [zflist, setZflist] = useState([])
-    const [modalTitle, setModalTitle] = useState("")
-    const [zfType, setZfType] = useState("1");
-    const [zfVisible, setZfVisible] = useState(false)
-    const [detailInfo, setDetailInfo] = useState({})
-    const [tjParams, setTjParams] = useState({}) //调节闸阀参数
-    const [switchVisible, setSwitchVisible] = useState(false);
-    const [current, setCurrent] = useState()
-    const [selectItem, setSelectItem] = useState({})
-    const [videoOpen, setVideOpen] = useState(false)
-    const [isShow, setIsShow] = useState(false)
-    const tjOptions = Array(11).fill(0).map((item, i) => ({
-        label: i == 0 ? "0%" : i + "0%",
-        value:i == 0 ? "0%" : i + "0%"
-    }))
-
-
-    const width = useMemo(() => zfcolumns.reduce((total, cur) => total + (cur.width), 0), [zfcolumns]);
-   
-
-       // 获取视频流
-    const getVideoSrc = async (arr) => {
-           const newwArr = arr.map(item => {
-            return {...item,promise:httpget2(`${apiurl.gsxl.zfzl.videosrc}${item.indexCode}`)}
-           })
-           const fetchArr = newwArr.map(item => item.promise)
-           Promise.all(fetchArr).then(res => {
-               const srcArr = res.map((s, i) => ({
-                   name: newwArr[i].name,
-                   src: s.data,
-                   id: newwArr[i].id,
-                   indexCode: newwArr[i].indexCode,
-                   type:newwArr[i].type
-               }))
-               setVideoList(srcArr)
-           }).catch(err => console.log(err))
-    }
-     // 获取视频列表
-     const getVideoList = async () => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.videoList)
-            getVideoSrc(res.data)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-     // 闸阀列表
-     const getZfList = async () => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.list)
-            setZflist(res.data)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    const zhafaClick = (val) => {
-        const type = val.valveName.includes("电动活塞阀") ? 1 :
-            val.valveName.includes("电动蝶阀") ? 2 :
-            val.valveName.includes("生活供水调节阀") ? 3 : ''
-        setModalTitle(val.valveName);
-        setZfVisible(true);
-        setZfType(type);
-        setDetailInfo(val)
-
-     
-    };
-
-       //md5加密
-       const encryptData = (data) => {
-        const encryptedData = CryptoJS.MD5(data).toString();
-        return encryptedData;
-      }
-     // 调节闸阀
-     const confirmTj = async () => {
-        let params = {
-            ...tjParams,
-            valveCode: detailInfo?.valveCode,
-            key: encryptData(tjParams?.key)
-        }
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.tjzf, params)
-            if (res.code == 200) {
-                message.success(res.data)
-                getZfList()
-                setSwitchVisible(false)
-            }
-        } catch (error) {
-            
-        }
-    }
-    let timer = null;
-     // 云台控制
-     const onOperation = async(params) => {
-        let data = {
-            ...params,
-            indexCode: selectItem?.indexCode,
-            action:0
-        }
-        try {
-            const res = await httppost2(apiurl.spjk1.aiWarn.controler, data)
-            if (res.code == 200) {
-                if(timer) clearTimeout(timer)
-                timer = setTimeout(() => {
-                    onOperation1(params)
-                },500)
-            }
-        } catch (error) {
-            console.log(error);
-         }
-    }
-
-    const onOperation1 = async(params) => {
-        let data = {
-            ...params,
-            indexCode: selectItem?.indexCode,
-            action:1
-        }
-        try {
-            const res = await httppost2(apiurl.spjk1.aiWarn.controler,data)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-    useEffect(() => {
-        getVideoList()
-        getZfList()
-    }, [])
-    
-  return (
-      <div  style={{display:"flex",columnGap:10}}>
-          <div className='left-box'>
-              <div className='zf-title'>
-              <div className='dot'></div>
-              <div>视频监控</div>
-              </div>
-              <div className='jk-content'>
-                  {
-                      videoList.length > 0 ? videoList.map((item,index) => {
-                          return(
-                              <div
-                                  className={clsx({ 'jk-box': true, "active": current == index })}
-                                  key={item?.id}
-                                  onClick={() => { setCurrent(index); setSelectItem(item); setIsShow(!isShow);}}
-                              >
-                            <div className='jk-title'>
-                                <img alt='' src={`${process.env.PUBLIC_URL}/assets/images/jk.png`} />
-                                <span>{item?.name}</span>
-                            </div>
-                            <div className='jk-video'>
-                                 <HFivePlayer 
-                                 size={1} 
-                                 wsUrl={{ src:item?.src}} 
-                                 playerID={item?.id} />
-                             <div style={{textAlign:"right"}}>注：单击视频显示/隐藏云台</div>
-                                 
-                            </div>
-                      </div>
-                          )
-                      })
-                 :null
-                  }
-              </div>
-          </div>
-          <div className='right-box'>
-          <div className='zf-title'>
-              <div className='dot'></div>
-              <div>闸阀控制</div>
-              </div>
-              <div className='zf-table'>
-                <Table 
-                  columns={zfcolumns} 
-                  rowKey="valveCode"
-                  dataSource={zflist}
-                  pagination={false}
-                  scroll={{ x: width, y: "calc( 100vh - 100px )" }} />
-              </div>
-              {(selectItem.type == 1 && isShow) ?<div style={{position:"absolute",bottom:5,left:0,width:"100%"}}>
-                  <VideoControler
-                       selectItem={selectItem}
-                       onOperation={onOperation}
-                  />
-              </div>:null}
-          </div>
-            {/*闸阀弹窗*/}
-      <Modal
-        open={zfVisible}
-        footer={null}
-        width={1040}
-        title={modalTitle}
-        className="zfviewModal"
-              onCancel={() => { setZfVisible(false);setVideOpen(false) }}
-        destroyOnClose
-      >
-              <DetailModal
-                  zfType={zfType}
-                  detailInfo={detailInfo}
-                  setSwitchVisible={(e) => { setSwitchVisible(e) }}
-                  setVideoOpen={setVideOpen}
-                  open={videoOpen}
-              />
-          </Modal>
-            {/*点击闸阀弹窗里的开启、关闭按钮弹出的弹出*/}
-         <Modal
-        open={switchVisible}
-        width={400}
-        title="调节闸阀"
-        onCancel={()=>{setSwitchVisible(false);}}
-        destroyOnClose
-        onOk={confirmTj}
-      >
-        <div>
-        <div style={{display:"flex",columnGap:10,alignItems:"center",marginBottom:10}}>
-            <div>调节开度：</div>
-            <NormalSelect allowClear options={tjOptions} style={{width:130}} onChange={(e)=>setTjParams({...tjParams,status:e})} />
-          </div>
-          <div style={{marginBottom:"10px"}}>请输入密码进行调节操作</div>
-          <div>
-            <Input.Password placeholder='请输入密码' allowClear onChange={(e)=>setTjParams({...tjParams,key:e.target.value})} />
-          </div>
-        </div>
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/views/gxsl/zfjk/index.less b/src/views/gxsl/zfjk/index.less
deleted file mode 100644
index c322078..0000000
--- a/src/views/gxsl/zfjk/index.less
+++ /dev/null
@@ -1,67 +0,0 @@
-.left-box{
-    flex:1;
-    background-color: #fff;
-    height: calc(100vh - 88px);
-    padding: 10px;
-    overflow-y: auto;
-    .zf-title{
-        display: flex;
-        column-gap: 10px;
-        align-items: center;
-        .dot{
-            width: 5px;
-            height: 15px;
-            background-color: #02a7f0;
-        }
-    }
-    .jk-content{
-        display: flex;
-        // column-gap: 10px;
-        margin-top: 10px;
-        .jk-box{
-            width: 500px;
-            border: 1px solid #eeeeee;
-            margin-bottom: 20px;
-            margin-right: 10px;
-            cursor: pointer;
-            .jk-title{
-                display: flex;
-                column-gap: 10px;
-                align-items: center;
-                padding: 10px;
-                border-bottom: 1px solid #eeeeee;
-                img{
-                    width: 15px;
-                    height: 15px;
-                }
-            }
-            .jk-video{
-                width: 100%;
-                height: calc(400px - 30px);
-                // margin: 10px 0;
-            }
-        }
-        .active{
-            border-color: red;
-        }
-    }
-}
-.right-box{
-    width:550px;
-    background-color: #fff;
-    height: calc(100vh - 88px);
-    padding: 10px;
-    position: relative;
-    .zf-title{
-        display: flex;
-        column-gap: 10px;
-        align-items: center;
-        margin-bottom: 20px;
-        .dot{
-            width: 5px;
-            height: 15px;
-            background-color: #02a7f0;
-        }
-    }
-  
-}
\ No newline at end of file
diff --git a/src/views/gxsl/zfjk/toolbar.js b/src/views/gxsl/zfjk/toolbar.js
deleted file mode 100644
index a27ae15..0000000
--- a/src/views/gxsl/zfjk/toolbar.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm,Segmented  } from 'antd';
-import moment from 'moment';
-import { AppstoreOutlined, BarsOutlined } from '@ant-design/icons'
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ setSearchVal, searchVal,exportFile }) => {
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm1) {
-      dateSo = {
-        start: moment(values.tm1[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm1[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm1
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
-  // useEffect(() => {
-  //   let time = [moment().subtract(1,"months"),moment()]
-  //    let dateSo = {
-  //      start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-  //      end:moment(time[1]).format('YYYY-MM-DD 00:00:00'),
-  //   }
-  //   form.setFieldValue("tm",time)
-  //   setSearchVal({dateTimeRangeSo:dateSo})
-  // }, [])
-  useEffect(() => {
-    if (searchVal) {
-      let time = [moment(searchVal.dateTimeRangeSo?.start),moment(searchVal.dateTimeRangeSo?.end)]
-      form.setFieldValue("tm1",time)
-    }
-    // setSearchVal({dateTimeRangeSo:dateSo})
-  }, [searchVal])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="时间段" name="tm1">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item >
-            <Button
-              type='primary'
-              htmlType="submit"
-            >查询</Button>
-          </Form.Item>
-          <Form.Item >
-            <Button
-              onClick={()=>exportFile()}
-            >导出</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gxsl/zfjk/toolbar1.js b/src/views/gxsl/zfjk/toolbar1.js
deleted file mode 100644
index 71ffe4c..0000000
--- a/src/views/gxsl/zfjk/toolbar1.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm,Segmented  } from 'antd';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ setSearchVal, onSave,exportFile,type,searchValLog }) => {
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
-
-  useEffect(() => {
-    // let time = [moment().subtract(1,"months"),moment()]
-    //  let dateSo = {
-    //    start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-    //    end:moment(time[1]).format('YYYY-MM-DD 00:00:00'),
-    // }
-    if (searchValLog) {
-      let time = [moment(searchValLog.dateTimeRangeSo?.start),moment(searchValLog.dateTimeRangeSo?.end)]
-      form.setFieldValue("tm",time)
-    }
-    // setSearchVal({dateTimeRangeSo:dateSo})
-  }, [searchValLog])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item >
-            <Button
-              type='primary'
-              htmlType="submit"
-            >查询</Button>
-          </Form.Item>
-          <Form.Item >
-            <Button
-              onClick={()=>exportFile()}
-            >导出</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gxsl/zfzl/drpOption.js b/src/views/gxsl/zfzl/drpOption.js
deleted file mode 100644
index bd93d09..0000000
--- a/src/views/gxsl/zfzl/drpOption.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import "echarts/extension/bmap/bmap"
-
-
-export default function drpOption (data,flLowLimLev,
-  desFloodLev,
-  calFloodLev) {
-  console.log('data', data)
-  const maxVal = 300
-
-  const maxSw = Math.ceil(Math.max(...data.map(obj => {
-    return  obj?.rz ? obj?.rz:0
-  })))
-  const minSw = Math.floor(Math.min(...data.map(obj => {
-    return  obj?.rz? obj?.rz :300
-  })))
-  const maxKr = Math.max(...data.map(obj => {
-    return obj.w ? obj.w : 300
-  }))
-  const minKr = Math.min(...data.map(obj => {
-    return obj.w ? obj.w : 0
-  }))
-  return {
-    tooltip: {
-      trigger: 'axis'
-    },
-    grid: [
-      {
-        top: '18%',
-        left: '10%',
-        right: '12%',
-        bottom:"12%"
-        // width: '80%',
-        // height: '35%'
-      },
-    ],
-    legend: {
-      // 显示图例
-      show: true,
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        inverse: true,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter:function(val)  
-          {  
-            let value = val.substr('2020-'.length, 11)
-              var ret = "";//拼接加\n返回的类目项  
-              var maxLength = 6;//每项显示文字个数  
-              var valLength = value.length;//X轴类目项的文字个数  
-              var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数  
-              if (rowN > 1)//如果类目项的文字大于5,  
-              {  
-                  for (var i = 0; i < rowN; i++) {  
-                      var temp = "";//每次截取的字符串  
-                      var start = i * maxLength;//开始截取的位置  
-                      var end = start + maxLength;//结束截取的位置  
-                 //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧  
-                      temp = value.substring(start, end) + "\n";  
-                      ret += temp; //凭借最终的字符串  
-                  }  
-                  return ret;  
-              }  
-              else {  
-                   return value;  
-              }  
-          }  
-       
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5
-          }
-        },
-        axisTick: {
-          show: false
-        }
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        // gridIndex:0,
-        position: 'left',
-        name: '水位(m)',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minSw,
-        max: maxSw
-      },
-      {
-        type: 'value',
-        // gridIndex:1,
-        position: 'right',
-        name: '库容(万m³)',
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minKr - 0.1,
-        max: maxKr + 0.1
-      }
-    ],
-    series: [
-      {
-        name: '水位',
-        yAxisIndex:0,
-        type: 'line',
-        symbol: 'none',
-        color: '#0AE0B5',
-        label: {
-          show: false
-        },
-        data: data.map(o => o.rz)
-      },
-      {
-        name: '库容',
-        yAxisIndex:1,
-        type: 'line',
-        color: '#007AFD',
-        symbol: 'none',
-        data: data.map(o =>o.w)
-      }
-    ]
-  }
-}
-
-
-
diff --git a/src/views/gxsl/zfzl/gsDetail.js b/src/views/gxsl/zfzl/gsDetail.js
deleted file mode 100644
index 520f953..0000000
--- a/src/views/gxsl/zfzl/gsDetail.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import React,{useState,useEffect} from 'react'
-import { Descriptions, Checkbox, Table, Form, Row, Col, DatePicker } from 'antd'
-import NormalSelect from '../../../components/Form/NormalSelect'
-import moment from 'moment';
-import { httppost2,httpget2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-export default function GsDetail({rzDetail,ssGTableDatat}) {
-const { MonthPicker } = DatePicker;
-const month = moment().month() + 1;
-const optionsType = Array(12 - month + 1).fill(0).map((item,i) => ({label: (i + month)  + "月",value: i + month}))
-    const [form]  = Form.useForm()
-    const typeObj = {
-        1: "枯 ",
-        2: "偏枯 ",
-        3: "平",
-        4: "偏丰",
-        5:"丰"
-    }
-    const swArr = [
-        { label: "实时水位(m)", name: "rz" },
-        { label: "实时库容(万m³)", name: "nowCap" },
-        { label: "死水位(m)", name: "deadLev" },
-        { label: "死库容(万m³)", name: "deadCap" },
-        ]
-    const waterColumns =  [
-        {
-            title: '数据类型', key: 'type', dataIndex: 'type', align: 'center',
-            render: (rec, record) => <span style={record.type == "可供水天数" ?{color:"#0079fe"}:{}}>{rec}</span>
-         },
-        {
-            title: '采集值', key: 'value', dataIndex: 'value', align: 'center',
-            render: (rec, record) => {
-                return (
-                    <>
-                        <span style={record.type == "可供水天数" ?{color:"#0079fe"}:{}}>{rec}</span>&nbsp;
-                        {record.type == "可供水天数" ? <span style={{color:"#f69a23",fontSize:12}}>({ record.tm})</span> : null}
-                    </>
-                )
-                
-            }
-         },
-        {
-            title: '数据采集时间', key: 'tm', dataIndex: 'tm', align: 'center',
-            render: (rec, record) => <span>{record.type == "可供水天数" ? "" : rec}</span>
-        },
-    ]
-    const [dataSource, setDataSource] = useState([])
-    const [showForm, setShowForm] = useState(false)
-    const [simailarData, setSimailarData] = useState([])
-    const [gsParams, setGsParams] = useState({})
-    const [gsDays, setGsDays] = useState()
-        // 相似年下拉
-        const getSimilarData = async() => {
-            try {
-                const res = await httppost2(apiurl.gsxl.zfzl.similar)
-                setSimailarData(res.data.map(item => ({
-                    label: item.year + "年" + `(${typeObj[item.status]},${item.drp}mm)`,
-                    value:item.year
-                })))
-            } catch (error) {
-                console.log(error);
-            }
-    }
-    // 获取可供水时间
-    const getWaterTimeData = async(params={}) => {
-        try {
-            const res = await httpget2(apiurl.gsxl.zfzl.kyTime,params)
-            let r = {
-                type: "可供水天数",
-                value: Object.keys(res.data)[0],
-                tm: Object.values(res.data)[0]
-            }
-            setGsDays(r)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    const valueChange = (e) => {
-        setGsParams({
-            month: e.month || gsParams?.month,
-            year: e.year || gsParams?.year
-        })
-    }
-    useEffect(() => {
-        if (rzDetail && ssGTableDatat && gsDays) {
-            const lljData = ssGTableDatat.map(item => ({
-                type: item.valveName,
-                value: item?.q,
-                tm:item?.tm
-            }))
-            const swData = swArr.map(item => ({
-                type: item.label,
-                value: rzDetail[item.name],
-                tm:rzDetail?.tm
-            }))
-            setDataSource([...swData,...lljData,gsDays])
-        } else {
-            setDataSource([])
-     }
-    }, [rzDetail,ssGTableDatat,gsDays])
-    
-   useEffect(() => {
-    getSimilarData()
-   }, [])
-    
-   useEffect(() => {
-    getWaterTimeData(gsParams)
-   }, [gsParams])
-  return (
-      <div>
-          <div style={{marginTop:-10}}>
-              <Descriptions column={1} colon={false} contentStyle={{color:"#da4556",fontSize:16,marginBottom:5}} labelStyle ={{color:"#da4556",fontSize:16}} >
-                  <Descriptions.Item label={<span>可供水量</span>} span={1} >
-                  = 实时库容 - 死库容 + 预测来水量
-                  </Descriptions.Item>
-                  <Descriptions.Item label="小时水量" span={1}>
-                  = (输水管流量 + 放水管流量)*3600
-                  </Descriptions.Item>
-                  <Descriptions.Item label="可供水小时数" span={1}>
-                  = 可供水量 / 小时水量
-                  </Descriptions.Item>
-                  <Descriptions.Item label="可供水天数" span={1}>
-                  = 可供水小时数换算为天数
-                  </Descriptions.Item>
-              </Descriptions>
-          </div>
-          <div style={{marginTop:10}}>
-              <div style={{margin:"5px 0"}}>
-                  <Checkbox onChange={(e) => {
-                      setShowForm(e.target.checked);
-                      setGsParams({});
-                      form.resetFields();
-                  }}>参考相似年降雨量预测来水量</Checkbox>
-              </div>
-              {showForm? <div>
-              <Form form={form} onValuesChange={valueChange} >
-                  <Row>
-                      <Col span={12}>
-                      <Form.Item
-                      label="选择相似年"
-                      name="year"
-                      rules={[{ required: true }]}
-                  >
-                      <NormalSelect options={simailarData} allowClear/>
-                  </Form.Item >
-                      </Col>
-                      <Col span={12}>
-                      <Form.Item
-                      label="预测截止月份"
-                      name="month"
-                      rules={[{ required: true }]}
-                      labelCol={{span:12,offset:0}}
-                  >
-                    <NormalSelect options={optionsType} allowClear/>
-                  </Form.Item>
-                   </Col>
-              </Row>
-              </Form>  
-              </div> :null}
-          </div>
-          <Table 
-            columns={waterColumns} 
-            rowKey="value"
-            dataSource={dataSource}
-            pagination={false}
-             />
-    </div>
-  )
-}
diff --git a/src/views/gxsl/zfzl/gsOptions.js b/src/views/gxsl/zfzl/gsOptions.js
deleted file mode 100644
index 83d53bd..0000000
--- a/src/views/gxsl/zfzl/gsOptions.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-
-export default function gsOption(GsCharts) {
-    return {
-        grid: {
-          top: "24%",
-          bottom: "10%", //也可设置left和right设置距离来控制图表的大小
-        },
-        tooltip: {
-          trigger: "axis",
-        },
-        legend: {
-          textStyle: {
-            color: "#000",
-            },
-            right: "10%",
-        },
-        xAxis: {
-          data: [
-            "生态供水",
-            "生活供水",
-          ],
-          axisLine: {
-            show: true, //隐藏X轴轴线
-          },
-          axisTick: {
-            show: true, //隐藏X轴刻度
-          },
-          axisLabel: {
-            show: true,
-          },
-        },
-        yAxis: [
-          {
-            type: "value",
-            name: "万m³",
-            nameTextStyle: {
-              color: "#000",
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    type:"dotted"
-                }
-            },
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              show: false,
-              lineStyle: {
-                color: "#000",
-              },
-            },
-            axisLabel: {
-              show: true,
-              textStyle: {
-                color: "#000",
-              },
-            },
-          },
-        ],
-        series: [
-          {
-            name: "时段供水",
-            type: "bar",
-            barWidth: 28,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#4e92f7",
-                  },
-                  {
-                    offset: 1,
-                    color: "#94bdfa",
-                  },
-                ]),
-              },
-                },
-                label: {
-                    show: true,
-                    position: "top",
-                    distance: 5,
-                    fontSize: 14,
-                    color: "#000",
-                  },
-            data: [GsCharts?.QQ,GsCharts?.PQ],
-          },
-        ],
-      };
-}
\ No newline at end of file
diff --git a/src/views/gxsl/zfzl/index.js b/src/views/gxsl/zfzl/index.js
deleted file mode 100644
index b665ba8..0000000
--- a/src/views/gxsl/zfzl/index.js
+++ /dev/null
@@ -1,1008 +0,0 @@
-import React, { useState, useEffect,useMemo } from 'react'
-import { Button, DatePicker, Input, Modal, Radio, Table, Tabs,Empty, message } from 'antd'
-import { BarsOutlined } from '@ant-design/icons';
-import apiurl from '../../../service/apiurl';
-import ReactEcharts from 'echarts-for-react';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2, httpget2, httppost5 } from '../../../utils/request';
-import HFivePlayer from '../../../components/video1Plary.js'
-import SearchBar from "./toolbar"
-import SearchBar1 from "./toolbar1"
-import moment from "moment"
-import krOptions from "./drpOption"
-import gsOptions from "./gsOptions"
-import { exportFile, numberFormat } from '../../../utils/tools.js';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import {reservoirlist} from "../../../service/sssq";
-import CryptoJS from 'crypto-js';
-import SgDetail from './shuiguan'
-import GsDetail from './gsDetail';
-import "./index.less"
-import VideoControler from '../../../components/VideoControler';
-import clsx from "clsx"
-
-const {RangePicker} = DatePicker
-export default function Zfzl() {
-  const columnsHistory = [
-    { title: '序号', key: 'inx',dataIndex: 'inx', align: 'center' },
-    { title: '闸阀名称', key: 'valveName', dataIndex: 'valveName', align: 'center' },
-    { title: '开关状态', key: 'status', dataIndex: 'status', align: 'center' },
-    { title: '操作时间', key: 'tm', dataIndex: 'tm', align: 'center' },
-]
-const columnsLog = [
-{ title: '序号', key: 'inx',dataIndex: 'inx', align: 'center' },
-{ title: '闸阀名称', key: 'valveName', dataIndex: 'valveName', align: 'center' },
-{ title: '操作人', key: 'opUserName', dataIndex: 'opUserName', align: 'center' },
-{ title: '操作内容', key: 'opContent', dataIndex: 'opContent', align: 'center' },
-{ title: '操作时间', key: 'tm', dataIndex: 'tm', align: 'center' },
-{ title: '设定开度', key: 'status', dataIndex: 'status', align: 'center' },
-{ title: '操作前开度', key: 'beforeStatus', dataIndex: 'beforeStatus', align: 'center' },
-]
-
-    const zfcolumns = [
-        { title: '闸阀名称', key: 'valveName', dataIndex: 'valveName', align: 'center' },
-        { title: '开关状态', key: 'status', dataIndex: 'status', align: 'center',width:70 },
-        { title: '数据采集时间', key: 'tm', dataIndex: 'tm', align: 'center',
-          render: (rec, record) => <span style={record.flag == 1 ?{color:"red"}:{}}>{rec}</span>
-         },
-    ]
-
-    const krcolumns = [
-        {title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')},
-        {
-          title: '水位(m)', key: 'rz', dataIndex: 'rz', align: 'center',
-          render: (rec) => <span>{rec ? rec.toFixed(2) :  "-"}</span>},
-        {
-          title: '库容(万m³)', key: 'w', dataIndex: 'w', align: 'center',
-          render: (rec) => <span>{rec ??"-"}</span>,
-        },
-    ]
-   
-    const gzcolumns = [
-        { title: '流量计名称', key: 'valveName', dataIndex: 'valveName', align: 'center' },
-        { title: '实时流量(m³/s)', key: 'q', dataIndex: 'q', align: 'center' },
-        { title: '数据采集时间', key: 'tm', dataIndex: 'tm', align: 'center' },
-    ]
-    const tjOptions = Array(11).fill(0).map((item, i) => ({
-        label: i == 0 ? "0%" : i + "0%",
-        value:i == 0 ? "0%" : i + "0%"
-    }))
-    const [zfType, setZfType] = useState(1)
-    const [modalTitle, setModalTitle] = useState("")
-    const [type, setType] = useState("1");
-    const [zfVisible, setZfVisible] = useState(false)
-    const [searchVal, setSearchVal] = useState({})
-    const [zflist, setZflist] = useState([])
-    const [krlist, setKrlist] = useState([])
-    const [switchVisible, setSwitchVisible] = useState(false);
-    const [krParams, setKrParams] = useState({})
-    const [activeKeys, setActiveKey] = useState("1")
-    const [showTab, setShowTab] = useState(true)
-    const [zfInfo, setZfInfo] = useState({})
-    const [valueCode, setValueCode] = useState("")
-    const [selectItem, setSelectItem] = useState('')
-    const [videoArr, setvideoArr] = useState({})
-    const [tjParams, setTjParams] = useState({}) //调节闸阀参数
-    const [ssgData, setSsGData] = useState([]) //输水管数据
-    const [shuiguanOpen, setShuiguanOpen] = useState(false) //输水管-送水管open
-    const [sgTitle, setSgTitle] = useState("") //水管标题
-    const [sgDetail, setSgDetail] = useState({}) //水管详细
-    const [ssGTableDatat, setSsGTableData] = useState([]) //右侧流量计表格
-    const [gsOpen, setGsOpen] = useState(false) //预计可供水弹框
-    const [rzDetail, setRzDetail] = useState([]) //水位 死水位 库容数据
-    // 视频列表
-  const [videoList, setVideoList] = useState([])
-  const [searchValLog, setSearchValLog] = useState('') // 操作日志
-  const [gsParams, setGsParams] = useState({
-    start: moment().subtract(7, "days"),
-    end:moment()
-  })
-  const [GsCharts, setGScharts] = useState()
-  const [controlerParams, setControlerParams] = useState()
-  const [videoOpen, setVideoOpen] = useState(false) //云台控制弹框
-  
-    const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gsxl.zfzl.kgpage).find_noCode);
-  const { tableProps:tableProps1, search:search1 } = usePageTable(createCrudService(apiurl.gsxl.zfzl.logpage).find_noCode);
-    
-    const options = useMemo(() => {
-        if (krlist.length > 0) {
-            return krOptions(krlist)
-        } else {
-            return []
-        }
-    },[krlist])
- 
-  const gsoptions = useMemo(() => {
-    if (GsCharts) {
-      return gsOptions(GsCharts)
-      }
-  },[GsCharts])
-    const getData = async (params) => {
-        let data = await reservoirlist(params)
-        setRzDetail(data[0]);
-      }
-      
-      
-    // 可供水量
-  const providerWater = useMemo(() => {
-    if (rzDetail?.nowCap && rzDetail?.deadCap) {
-      let num = (rzDetail?.nowCap - rzDetail?.deadCap).toFixed(2)
-        return numberFormat(Number(num)) 
-    } else {
-      return "-"
-      }
-  }, [rzDetail])
-  
-  // 当前库容
-  const realZ = useMemo(() => {
-    if (rzDetail?.nowCap) {
-      return numberFormat(Number(rzDetail?.nowCap))
-    } else {
-      return "-"
-    }
-  }, [rzDetail]) 
-
-  // 死库容
-  const deadCapt = useMemo(() => {
-    if (rzDetail?.deadCap) {
-      return numberFormat(Number(rzDetail?.deadCap))
-    } else {
-      return "-"
-    }
-  }, [rzDetail]) 
-    const lljClick = (val,obj) => {
-        setSgTitle(val)
-        setShuiguanOpen(true)
-        setSgDetail(obj)
-    };
-    
-    const radioChange = (e) =>{
-        setType(e.target.value);
-    };
-    
-    const clickSwitch = (val) => {
-        setSwitchVisible(true);
-    };
-    
-    // 闸阀列表
-    const getZfList = async () => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.list)
-            setZflist(res.data)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-     // 库容列表
-     const getKrList = async (params) => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.krlist,params)
-            setKrlist(res.data)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-        // 闸阀信息表
-    const getZfinfo = async (params) => {
-            try {
-                const res = await httpget2(apiurl.gsxl.zfzl.info,params)
-                setZfInfo(res.data)
-            } catch (error) {
-                console.log(error);
-            }
-        }
-    const fm = useMemo(() => {
-        let obj = {};
-        if (zflist.length > 0) {
-            obj = {
-                ["电动活塞阀1"]: zflist.find(item => item.valveName.includes("电动活塞阀1")),
-                ["电动活塞阀2"]: zflist.find(item => item.valveName.includes("电动活塞阀3")),
-                ["电动活塞阀3"]: zflist.find(item => item.valveName.includes("电动活塞阀3")),
-                ["电动蝶阀1"]: zflist.find(item => item.valveName.includes("电动蝶阀1")),
-                ["电动蝶阀2"]: zflist.find(item => item.valveName.includes("电动蝶阀2")),
-                ["电动蝶阀3"]: zflist.find(item => item.valveName.includes("电动蝶阀3")),
-                ["生活供水调节阀1"]: zflist.find(item => item.valveName.includes("生活供水调节阀1")),
-                ["生活供水调节阀2"]: zflist.find(item => item.valveName.includes("生活供水调节阀2")),               
-            }
-
-            return obj
-        } else {
-            return obj
-        }
-    }, [zflist])
-
-    // 点击某个阀门
-    const zhafaClick = (val, type) => {
-        setModalTitle(val);
-        setZfVisible(true);
-        setZfType(type);
-        getZfinfo({ valveCode: fm[val]?.valveCode })
-        setValueCode(fm[val])
-        getVideoList()
-    };
-    // 开关历史信息表
-  const exportExcel = () => {
-    let exportName = type === "3" ? "闸阀操作日志表.xlsx" :"闸阀开度历史表.xlsx"
-    let search = type === "3" ? searchValLog : searchVal
-    let pageSo = {
-      pageNumber: type === "3" ? tableProps1.pagination.current:tableProps.pagination.current,
-      pageSize:type === "3" ? tableProps1.pagination.pageSize : tableProps.pagination.pageSize
-    }
-    let api = type === "3" ? apiurl.gsxl.zfzl.export1 : apiurl.gsxl.zfzl.export
-        let params = {
-          ...search,
-          valveCode: valueCode?.valveCode,
-          pageSo
-        }
-        httppost5(api, params).then(res => {
-          exportFile(exportName,res.data)
-      })
-    }
-    // 获取视频列表
-    const getVideoList = async () => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.videoList,{valveCode:valueCode?.valveCode})
-            setVideoList(res.data)
-            setControlerParams(res.data[0])
-            setSelectItem(res.data[0]?.name)
-            getVideoSrc(res.data[0]?.indexCode)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-    // 获取视频流
-    const getVideoSrc = async (current) => {
-        const res = await httpget2(`${apiurl.gsxl.zfzl.videosrc}${current}`)
-        if (res.code == 200 && res.data?.length !== 0) {
-          setvideoArr({src:res.data})
-        }else{
-          setvideoArr({})
-        }
-      }
-
-      const [isShow, setIsShow] = useState(false)
-    // 视频播放
-    const videoPlay = (params) => {
-        setSelectItem(params.name)
-        getVideoSrc(params?.indexCode)
-      setControlerParams(params)
-      setIsShow(false)
-    }
-
-      //md5加密
-      const encryptData = (data) => {
-        const encryptedData = CryptoJS.MD5(data).toString();
-        return encryptedData;
-      }
-    // 调节闸阀
-    const confirmTj = async () => {
-        let params = {
-            ...tjParams,
-            valveCode: valueCode?.valveCode,
-            key: encryptData(tjParams?.key)
-        }
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.tjzf, params)
-            if (res.code == 200) {
-                message.success(res.data)
-                getZfList()
-                setSwitchVisible(false)
-            }
-        } catch (error) {
-            
-        }
-    }
-
-    // 输水管流量数据
-    const getInputData = async() => {
-        try {
-            const res = await httppost2(apiurl.gsxl.zfzl.input)
-            const tableData = res.data.map(item => ({
-                stcd: item.stcd,
-                q: item.q,
-                tm: item.tm,
-                valveName:item.sttp == "PQ" ? "输水管流量" : "放水管流量"
-            }))
-            setSsGData(res.data)
-            setSsGTableData(tableData)
-        } catch (error) {
-            console.log(error);
-        }
-  }
-    // 供水数据
-    const getGsStaData = async(params) => {
-      try {
-          const res = await httppost2(apiurl.gsxl.zfzl.gsStatic,params)
-          setGScharts(res.data)
-      } catch (error) {
-          console.log(error);
-      }
-  }
-
-  let timer = null;
-   // 云台控制
-   const onOperation = async(params) => {
-    let data = {
-        ...params,
-        indexCode: controlerParams?.indexCode,
-        action:0
-    }
-    try {
-      const res = await httppost2(apiurl.spjk1.aiWarn.controler, data)
-      if (res.code == 200) {
-        if(timer) clearTimeout(timer)
-        timer = setTimeout(() => {
-            onOperation1(params)
-        },500)
-    }
-    } catch (error) {
-        console.log(error);
-    }
-  }
-  const onOperation1 = async(params) => {
-    let data = {
-        ...params,
-        indexCode: controlerParams?.indexCode,
-        action:1
-    }
-    try {
-      const res = await httppost2(apiurl.spjk1.aiWarn.controler, data)
-    } catch (error) {
-        console.log(error);
-    }
-  }
-  
-  const [realQData, setRealQData] = useState()
-  // 获取实时流量
-  const getRealQData = async () => {
-
-    try {
-      const res = await httpget2(apiurl.gsxl.zfzl.realQ,{ valveCode: valueCode?.valveCode })
-      setRealQData(res.data)
-    } catch (error) {
-      
-    }
-  }
-    useEffect(() => {
-        getZfList()
-        getInputData()
-        let option = {
-            sources: ["SW", "SK"],
-            args: "",
-          };
-          getData(option)
-    }, [])
-    
-  useEffect(() => {
-    if (zfType == 3) {
-      getRealQData()
-    }
-  }, [zfType])
-  
-    useEffect(() => {
-        if (activeKeys == "2") {
-            let option = {
-                stcd: "716119601",
-                etm: moment().format("YYYY-MM-DD 00:00:00"),
-                stm: moment().subtract(1, 'weeks').format("YYYY-MM-DD 23:59:59"),
-              }
-            setKrParams(option)
-            getKrList(option)
-      }
-    }, [activeKeys])
-
-    useEffect(() => {
-        if (type == "2") {
-            search({
-                search: {
-                    valveCode: valueCode?.valveCode,
-                    ...searchVal,
-                }
-            })
-
-      } 
-      if (type == "3") {
-        search1({
-            search: {
-                valveCode: valueCode?.valveCode,
-                ...searchValLog,
-            }
-        })
-
-    }
-    }, [searchVal,type,valueCode,searchValLog])
-    
-  useEffect(() => {
-    if (gsParams) {
-      let params = {
-        start:moment(gsParams.start).format("YYYY-MM-DD 00:00:00"),
-        end:moment(gsParams.end).format("YYYY-MM-DD 23:59:59"),
-      }
-      getGsStaData(params)
-    }
-  }, [gsParams])
-  
-    
-  return (
-      <div className='content-body common-style'>
-          <div className="zfzlImg">
-        <div className="zfBox">
-          <div className="zf zf1" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("电动活塞阀1", 1)}
-                className={fm["电动活塞阀1"]?.status && fm["电动活塞阀1"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips">
-                <div>电动活塞阀1</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["电动活塞阀1"]?.status && fm["电动活塞阀1"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["电动活塞阀1"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="zf zf2" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("电动活塞阀2", 1)}
-                className={fm["电动活塞阀2"]?.status && fm["电动活塞阀2"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips">
-                <div>电动活塞阀2</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["电动活塞阀2"]?.status && fm["电动活塞阀2"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["电动活塞阀2"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="zf zf3" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("电动活塞阀3", 1)}
-                className={fm["电动活塞阀3"]?.status && fm["电动活塞阀3"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips">
-                <div>电动活塞阀3</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["电动活塞阀3"]?.status && fm["电动活塞阀3"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["电动活塞阀3"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div className="hsfBox">
-          <div className="hsf hsf1" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("电动蝶阀1", 2)}
-                className={fm["电动蝶阀1"]?.status && fm["电动蝶阀1"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips">
-                <div>电动蝶阀1</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["电动蝶阀1"]?.status && fm["电动蝶阀1"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["电动蝶阀1"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="hsf hsf2" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("电动蝶阀2", 2)}
-                className={fm["电动蝶阀2"]?.status && fm["电动蝶阀2"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips">
-                <div>电动蝶阀2</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["电动蝶阀2"]?.status && fm["电动蝶阀2"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["电动蝶阀2"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="hsf hsf3" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("电动蝶阀3", 2)}
-                className={fm["电动蝶阀3"]?.status && fm["电动蝶阀3"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips">
-                <div>电动蝶阀3</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["电动蝶阀3"]?.status && fm["电动蝶阀3"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["电动蝶阀3"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div className="lljBox">
-          <div className="llj llj1" >
-            <div>
-              <img src={`${process.env.PUBLIC_URL}/assets/llj.png`} alt="" onClick={()=>lljClick("输水管流量",ssgData.find(s => s.sttp == "PQ"))}/>
-              <div className="tips1">
-                <div>输水管流量</div>
-                <div className="state">
-                  <div style={{whiteSpace:'nowrap'}}>实时流量：</div>
-                  <div>{ssgData.find(s => s.sttp == "PQ")?.q}m³/s</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="llj llj2" >
-            <div>
-              <img src={`${process.env.PUBLIC_URL}/assets/llj.png`} alt="" onClick={()=>lljClick("放水管流量",ssgData.find(s => s.sttp == "QQ"))}/>
-              <div className="tips1">
-                <div>放水管流量</div>
-                <div className="state">
-                  <div style={{whiteSpace:'nowrap'}}>实时流量：</div>
-                  <div>{ssgData.find(s => s.sttp == "QQ")?.q}m³/s</div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div className="llj llj3">
-            <div>
-              <img src={`${process.env.PUBLIC_URL}/assets/qsb.png`} alt=""/>
-              <div className="tips1">
-                <div>潜水泵</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={{color:"#0CF958"}}>开</div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div className="llj llj4" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("生活供水调节阀1", 3)}
-                className={fm["生活供水调节阀1"]?.status && fm["生活供水调节阀1"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips1">
-                <div>生活供水调节阀1</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["生活供水调节阀1"]?.status && fm["生活供水调节阀1"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["生活供水调节阀1"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="llj llj5" >
-            <div>
-              <img
-                src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`}
-                alt=""
-                onClick={() => zhafaClick("生活供水调节阀2", 3)}
-                className={fm["生活供水调节阀2"]?.status && fm["生活供水调节阀2"]?.status != "关"? "img-animal":''}
-              />
-              <div className="tips1">
-                <div>生活供水调节阀2</div>
-                <div className="state">
-                  <div>开关状态：</div>
-                  <div style={fm["生活供水调节阀2"]?.status && fm["生活供水调节阀2"]?.status != "关" ? 
-                  {color:"#0CF958"} : {}}>
-                    {fm["生活供水调节阀2"]?.status || "关"}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        {/*水库实时水位*/}
-        <div className="zBox">
-          <div>水库实时水位：{rzDetail?.rz}m</div>
-          <div>库容：{realZ.value}{realZ.unit}m³</div>
-          <div style={{display:"flex",columnGap:10,alignItems:"center"}}>
-            <span>可供水量：{providerWater.value}{ providerWater.unit}m³</span>
-            <Button 
-                type="primary"
-                size='small'
-                style={{ borderRadius: 5, marginBottom: 3 }}
-                onClick={() => setGsOpen(true)}
-            >预计可供水时间</Button>
-          </div>
-        </div>
-          {/*死水位 死库容*/}
-          <div className="zBox zBox1">
-          <div>死水位：{rzDetail?.deadLev}m</div>
-          <div>死库容：{deadCapt.value}{deadCapt.unit}m³</div>
-        </div>
-          </div>
-             {/*图例*/}
-      <div className="legend">
-        <div className="title">图例</div>
-        <div className="box">
-          <img src={`${process.env.PUBLIC_URL}/assets/zhafa.jpg`} alt=""/>
-          <div style={{lineHeight:"20px"}}>闸阀</div>
-        </div>
-        <div className="box">
-          <img className="img" src={`${process.env.PUBLIC_URL}/assets/llj.png`} alt=""/>
-          <div>流量计</div>
-        </div>
-        <div className="box">
-          <img className="img" src={`${process.env.PUBLIC_URL}/assets/qsb.png`} alt=""/>
-          <div>潜水泵</div>
-        </div>
-          </div>
-          <div style={{
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent:"center",
-                  width: 25,
-                  height: 50,
-                  backgroundColor: "#3b7cff",
-                  position: "fixed",
-                  top: "40%",
-                  right: showTab ? "22.5%" : 0,
-                  cursor: "pointer",
-          }}
-          onClick={()=>setShowTab(!showTab)}
-          ><BarsOutlined style={{ color: "#fff" }} /></div>
-          {
-              showTab ?  <div className="rightBox">
-              <Tabs defaultActiveKey="1" onChange={(e)=>setActiveKey(e)}>
-              <Tabs.TabPane tab="概况" key="1">
-                  <div>
-                    <div className="title">
-                      <div className="dot"></div>
-                      <div style={{lineHeight:"30px"}}>供水统计</div>
-                      <div className="timeBox">
-                      <RangePicker
-                          allowClear
-                          format="YYYY-MM-DD"
-                          style={{ width: "220px" }}
-                          value={[gsParams.start,gsParams.end]}
-                          onChange={(e) => setGsParams({start:e[0],end:e[1]})}
-                        />
-                      </div>
-                     
-                    </div>
-                    <div className='gs-echarts'>
-                      {
-                  GsCharts && JSON.stringify(GsCharts) !="{}" ?
-                    <ReactEcharts
-                      option={gsoptions}
-                      style={{width: "100%", height: 200}}
-                      notMerge={true}
-                    /> : <div style={{textAlign: "center", margin: "10%"}}>
-                      <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                    </div>
-                }
-                      </div>
-                  </div>
-                  <div>
-                    <div className="title"><div className="dot"></div>闸阀列表</div>
-                    <Table 
-                  columns={zfcolumns} 
-                  rowKey="valveCode"
-                  dataSource={zflist}
-                  pagination={false}
-                  scroll={{ y: "calc( 100vh - 400px )" }}
-                    />
-                  </div>
-      
-                  <div>
-                    <div className="title"><div className="dot"></div>流量计列表</div>
-                    <Table 
-                  columns={gzcolumns} 
-                  rowKey="stcd"
-                  dataSource={ssGTableDatat}
-                  pagination={false}
-                //   scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-                    />
-                  </div>
-                </Tabs.TabPane>
-                <Tabs.TabPane tab="库容过程线" key="2">
-              
-                  <div>
-                    <div className="title">
-                      <div className="dot"></div>
-                      <div style={{lineHeight:"30px"}}>库容过程线</div>
-                      <div className="timeBox">
-                        <RangePicker 
-                          allowClear
-                          format="YYYY-MM-DD" style={{ width: "220px" }}
-                          value={[moment(krParams.stm),moment(krParams.etm)]}
-                          onChange={(e) => {
-                              setKrParams({
-                                  ...krParams,
-                                  stm: moment(e[0]).format("YYYY-MM-DD 00:00:00"),
-                                  etm: moment(e[1]).format("YYYY-MM-DD 23:59:59"),
-                              })
-                              getKrList(
-                                  {
-                                    ...krParams,
-                                  stm: moment(e[0]).format("YYYY-MM-DD 00:00:00"),
-                                  etm: moment(e[1]).format("YYYY-MM-DD 23:59:59")})
-                          }}
-                        />
-                      </div>
-                    </div>
-                    <div>
-                    {
-                  krlist.length > 0 ?
-                    <ReactEcharts
-                      option={options}
-                      style={{width: "100%", height: 250}}
-                      notMerge={true}
-                    /> : <div style={{textAlign: "center", margin: "10%"}}>
-                      <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                    </div>
-                }
-                    </div>
-                  </div>
-      
-                  <div style={{marginTop:"20px"}}>
-                  <Table 
-                  columns={krcolumns} 
-                  rowKey="rz"
-                  dataSource={krlist}
-                  pagination={false}
-                  scroll={{  y: "calc( 100vh - 570px )" }}
-                    />
-                  </div>
-              
-                </Tabs.TabPane>
-              </Tabs>
-             
-            </div> : null
-          }
-        {/*闸阀弹窗*/}
-      <Modal
-        open={zfVisible}
-        footer={null}
-        width={1040}
-        title={modalTitle}
-        className="zfviewModal"
-        onCancel={() => { setZfVisible(false); setType("1"); setVideoOpen(false);}}
-        destroyOnClose
-      >
-        <Radio.Group onChange={radioChange} defaultValue="1" buttonStyle="solid" className="longRadio">
-          <Radio.Button value="1">闸阀信息</Radio.Button>
-          <Radio.Button value="2">开度历史</Radio.Button>
-          {valueCode?.manualOperation  ? <Radio.Button value="3">操作日志</Radio.Button> : null}
-        </Radio.Group>
-        {
-          type==="1"?
-          <div className="content">
-            <div className="infoDiv">
-              <div className="imgDiv">
-                {
-                  zfType === 2?
-                    <img src={`${process.env.PUBLIC_URL}/assets/fa.png`} alt=""/>:
-                    zfType === 1?<img src={`${process.env.PUBLIC_URL}/assets/hsf.jpg`} alt=""/>:
-                      <img src={`${process.env.PUBLIC_URL}/assets/tjf.png`} alt=""/>
-                }
-                <div className="tips tips1">
-                  开关状态：<span style={fm[modalTitle]?.status && fm[modalTitle]?.status !="关" ?{color:"#0AC64A",fontWeight:"bold"}:{}}>{fm[modalTitle]?.status || "关"}</span>
-                  </div>
-                  {zfType == 3 ?<div className="tips tips3">
-                  <div>实时流量：</div>
-                  <div>{realQData??"-"} m³/s</div>
-                </div>:null}
-                <div className={clsx({"tips":true, "tips2":zfType == 3,"tips3":zfType != 3})}>
-                  <div>采集时间：</div>
-                  <div>{fm[modalTitle]?.tm}</div>
-                </div>
-
-               {valueCode?.manualOperation ?<div className="control">
-                  <p>闸阀控制：</p>
-                  <div style={{margin:"0 0 0 10px"}}>
-                    <Button type="primary" style={{margin:"0 30px 0 10px"}} onClick={()=>clickSwitch("开启")}>调节</Button>
-                    {/* <Button type="primary" onClick={()=>clickSwitch("关闭")}>关闭</Button> */}
-                  </div> 
-                </div> : null}
-              </div>
-
-              <div className="txtDiv">
-                <div className="txt">
-                    <p>视频监控</p>
-                    <div >
-                  <div className="videoDiv" >
-                    <div>
-                        {
-                            videoList.length > 0 ? videoList.map(item =>{
-                                return <button
-                                    style={{
-                                        width: "100px",
-                                        whiteSpace: "pre-wrap",
-                                        maxHeight: 100,
-                                        background: selectItem == item.name ? "#0893ff" : "none",
-                                        border: "none",
-                                        color: selectItem == item.name ? "#fff" : "000",
-                                        cursor:"pointer"
-                                    }}
-                                    key={item?.valveCode}
-                                    mulitline={true}
-                                    onClick={()=>videoPlay(item)}
-                                >
-                                    {item?.name}</button>
-                                
-                            } ) : null
-                        }
-                    
-                    </div>
-                    <div>
-                        {videoArr?.src &&
-                          <div
-                            className="content-video"
-                            style={{ width: "100%", height: 300,cursor: "pointer" }}
-                            onClick={() => {
-                              if (controlerParams.type == 1) {
-                                setVideoOpen(true)
-                                setIsShow(!isShow)
-                              }
-                            }}
-                          >
-                          <HFivePlayer size={1} wsUrl={videoArr} playerID={'111'} />
-                          <div style={{textAlign:"right"}}>注：单击视频显示/隐藏云台</div>
-                        </div>}
-                        {!videoArr?.src && <Empty style={{ position: 'absolute', top: '200px', }} description={false} />}
-                    </div>       
-                    </div>
-                   {videoOpen && isShow ?  <div className='video-controler'>
-                     <VideoControler selectItem={controlerParams} onOperation={onOperation} />
-                    </div> : null}
-                    </div>
-                  <p style={{marginTop:"10px"}}>基本信息</p>
-                  <div style={{width:"500px"}}>
-                    <div>
-                      <div>型号：</div>
-                      <div>{zfInfo?.model}</div>
-                    </div>
-                    <div>
-                      <div>规格：</div>
-                      {
-                        zfType === 1?
-                          <div>{zfInfo?.spe}</div>:
-                            <div>{zfInfo?.spe}</div>
-                      }
-                    </div>
-                    <div>
-                      <div>生产厂家：</div>
-                      <div>{zfInfo?.manufacturer}</div>
-                    </div>
-                    <div>
-                      <div>联系人：</div>
-                      <div>{zfInfo?.contacts}</div>
-                    </div>
-                    <div>
-                      <div>联系电话：</div>
-                      <div>{zfInfo?.contactCell}</div>
-                    </div>
-                    <div>
-                      <div>结构长度：</div>
-                      <div>{zfInfo?.len}</div>
-                    </div>
-                    <div>
-                      <div>法兰尺寸：</div>
-                      <div>{zfInfo?.flangeLen}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            </div> :
-            type === "2" ?
-            <div style={{ marginTop: "20px" }}>
-            <SearchBar  
-            setSearchVal={setSearchVal}
-            exportFile={exportExcel}
-            searchVal={searchVal}
-            
-             />
-            <Table 
-            columns={columnsHistory} 
-            rowKey="inx"
-            {...tableProps}
-            scroll={{ y: "calc( 100vh - 400px )" }}
-              />
-              </div> :
-              type === "3" ?
-              <div style={{ marginTop: "20px" }}>
-              <SearchBar1  
-              setSearchVal={setSearchValLog}
-              exportFile={exportExcel}
-              searchValLog={searchValLog}
-               />
-              <Table 
-              columns={columnsLog} 
-              rowKey="inx"
-              {...tableProps1}
-              scroll={{ y: "calc( 100vh - 400px )" }}
-                />
-            </div> :null
-        }
-      </Modal>
-      
-         {/*点击闸阀弹窗里的开启、关闭按钮弹出的弹出*/}
-         <Modal
-        open={switchVisible}
-        width={400}
-        title="调节闸阀"
-        onCancel={()=>{setSwitchVisible(false);}}
-        destroyOnClose
-        onOk={confirmTj}
-      >
-        <div>
-        <div style={{display:"flex",columnGap:10,alignItems:"center",marginBottom:10}}>
-            <div>调节开度：</div>
-            <NormalSelect allowClear options={tjOptions} style={{width:130}} onChange={(e)=>setTjParams({...tjParams,status:e})} />
-          </div>
-          <div style={{marginBottom:"10px"}}>请输入密码进行调节操作</div>
-          <div>
-            <Input.Password placeholder='请输入密码' allowClear onChange={(e)=>setTjParams({...tjParams,key:e.target.value})} />
-          </div>
-        </div>
-      </Modal>
-      
-          {/* 放水管和输水管弹框 */}
-          <Modal
-            open={shuiguanOpen}
-            width={1000}
-            title={sgTitle}
-              onCancel={() => { setShuiguanOpen(false) }}
-              footer={null}
-            destroyOnClose
-      >
-           <div >
-              <SgDetail record={sgDetail}/>
-              </div>
-          </Modal>
-          
-          {/* 可供水时间弹框 */}
-          <Modal
-            open={gsOpen}
-            width={600}
-            title="预计可供水时间"
-              onCancel={() => { setGsOpen(false) }}
-              footer={null}
-            destroyOnClose
-      >
-           <div >
-                  <GsDetail rzDetail={rzDetail} ssGTableDatat={ssGTableDatat} />
-              </div>
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/views/gxsl/zfzl/index.less b/src/views/gxsl/zfzl/index.less
deleted file mode 100644
index 6474674..0000000
--- a/src/views/gxsl/zfzl/index.less
+++ /dev/null
@@ -1,459 +0,0 @@
-.common-style{
-    background: #749ed0;
-    width: calc(100vw - 300px);
-    height: calc(100vh - 44px);
-    position: absolute;
-    top: 64px;
-    // left: -20px;
-  
-    .zfzlImg{
-      .img-animal{
-        // transition: transform 0.4s ease-out;
-        // &:hover{
-        //   transform: rotate(360deg);
-        // }
-        animation: rotate 1s linear infinite;
-      }
-      background: url("../../../../public/assets/zfzlImg.png") 0 0 no-repeat;
-      background-size: cover;
-      /*width: 45vw;
-      height: 80vh;*/
-      width: 810px;
-      height: 805px;
-      margin-left: 7vw;
-      padding:215px 0 0 70px;
-      position: relative;
-      .tips,.tips1{
-        position: absolute;
-        height: 65px;
-        background: #1E5491;
-        border-radius: 6px;
-        color: #fff;
-        padding: 8px 7px;
-        letter-spacing: 1px;
-        .state{
-          display: flex;
-        }
-      }
-      .tips{
-        width: 150px;
-      }
-      .tips1{
-        width: 160px;
-      }
-  
-      .zf{
-        display: flex;
-        flex-direction: row;
-        height:120px;
-        align-items: center;
-        justify-content: center;
-        //cursor:pointer;
-        img{
-          width: 30px;
-          border-radius: 50%;
-        }
-      }
-      .zf1,.zf2,.zf3{
-        >div{
-          position: relative;
-          cursor: pointer;
-          .tips{
-            left: -155px;
-            top: -52px;
-          }
-        }
-      }
-  
-      .hsfBox{
-        .hsf{
-          position: absolute;
-          height:120px;
-          >div{
-            cursor:pointer;
-          }
-          img{
-            width: 30px;
-            border-radius: 50%;
-          }
-        }
-        .hsf1{
-          top: 260px;
-          right: 280px;
-        }
-        .hsf2{
-          top: 380px;
-          right: 280px;
-        }
-        .hsf3{
-          top: 500px;
-          right: 280px;
-        }
-        .tips{
-          left: 35px;
-          top: -50px;
-        }
-      }
-  
-      .lljBox{
-        margin: 75px 0 0 35px;
-        .llj{
-          position: absolute;
-          cursor:pointer;
-          img{
-            width: 26px;
-            border-radius: 50%;
-          }
-        }
-        .llj1{
-          width: 220px;
-          right: -70px;
-          bottom: 140px;
-          .tips1{
-            right: 37px;
-            top: -55px;
-          }
-        }
-        .llj2{
-          width: 120px;
-          right: 30px;
-          bottom: 105px;
-          .tips1{
-            right: -64px;
-            top: 15px;
-          }
-        }
-        .llj3{
-          width: 120px;
-          right: 180px;
-          bottom: 125px;
-          .tips1{
-            right: -20px;
-            top: -60px;
-            width: 120px;
-          }
-        }
-  
-        .llj4{
-          width: 120px;
-          right: -185px;
-          bottom: 105px;
-          .tips1{
-            right: -28px;
-            top: -70px;
-            width: 145px;
-          }
-        
-        }
-        .llj5{
-            width: 120px;
-            right: -185px;
-            bottom: 0;
-            .tips1{
-              right: -28px;
-              top: -70px;
-              width: 145px;
-            }
-          }
-      }
-    }
-  
-    .zBox{
-      >div{
-        color: #F9FA02;
-        font-weight: 600;
-      }
-      border-bottom: 1px solid #4672C4;
-      position: absolute;
-      left: -8px;
-      top: 240px;
-      width: 54%;
-      font-size: 14px;
-    }
-    .zBox1{
-      width: 34%;
-        >div{
-            color: #d9001b;
-          }
-          border-color: #d9001b;
-          top: 435px;
-    }
-  
-    .legend{
-      position: absolute;
-      left: 3vw;
-      bottom: 4vw;
-      background: #6E8197;
-      border-radius: 8px;
-      width: 130px;
-      height: 148px;
-      text-align: center;
-      .title{
-        color: #fff;
-        font-size: 14px;
-        letter-spacing: 1px;
-        border-bottom: 1px solid #fff;
-        height: 30px;
-        line-height: 30px;
-      }
-      .box{
-        display:flex;
-        margin-top:10px;
-        img{
-          width: 24px;
-          height: 24px;
-          border-radius: 50%;
-          margin:-2px 10px 0 20px;
-        }
-        .img{
-          width: 26px;
-          height: 26px;
-          margin:1px 7px 0 18px;
-        }
-        div{
-          color: #fff;
-          font-size: 14px;
-          letter-spacing: 1px;
-          line-height: 25px;
-        }
-      }
-    }
-  
-    .rightBox{
-      width: 22vw;
-      //height: 70vh;
-      min-width: 300px;
-      // min-height: 600px;
-      background: #fff;
-      position: absolute;
-      right: 1vw;
-      top: 3vh;
-      color: #000;
-      padding-left:10px ;
-      .radioBox{
-        position: absolute;
-        top:-35px;
-        // .ant-radio-button-wrapper-checked{
-        //   background: #409EFF;
-        //   color: #fff;
-        // }
-      }
-      .title{
-        // color: #fff;
-        width: 96%;
-        margin-left: 2%;
-        padding: 10px;
-        font-size: 14px;
-        display: flex;
-        border-bottom: 1px dotted #000;
-        margin-bottom: 8px;
-        .dot{
-          width: 10px;
-          height: 10px;
-          border-radius: 50%;
-          background: #61AACE;
-          margin: 8px 10px 0 0;
-        }
-        .timeBox{
-          width:calc( 100% - 90px );
-          display: flex;
-          justify-content: end;
-        //   .ant-picker{
-        //     background:transparent;
-        //     border:0;
-        //   }
-        //   .ant-picker-input > input, .anticon svg{
-        //     color: #fff;
-        //   }
-        }
-      }
-  
-      .listBox,.listBox1{
-        .topTxt{
-          display: flex;
-          flex-direction: row;
-          color: #fff;
-          border: 1px solid #3A8ADE;
-          margin-top: 4px;
-          >div{
-            width: 30%;
-            text-align:center;
-            height: 30px;
-            line-height: 30px;
-            letter-spacing: 1px;
-            font-size: 14px;
-          }
-        }
-        .txt{
-          display: flex;
-          flex-direction: row;
-          color: #fff;
-          border-bottom: 1px solid #3A8ADE;
-          background: #29486B;
-          >div{
-            width: 30%;
-            text-align:center;
-            height: 40px;
-            line-height: 40px;
-            letter-spacing: 1px;
-            font-size: 14px;
-          }
-        }
-      }
-      .listBox1{
-        .topTxt, .txt{
-          >div {
-            width: 33.3%;
-          }
-        }
-      }
-    }
-  
-    @media screen and (max-width:1500px){
-      .rightBox{
-        zoom: 0.86;
-      }
-      .zfzlImg{
-        zoom: 0.86;
-      }
-    }
-  }
-  .zfviewModal{
-    top: 6vh !important;
-    td{
-      padding: 7px 16px !important;
-    }
-    .content{
-      // height: calc( 100% - 30px );
-      max-height: 700px;
-      overflow-y: auto;
-      >div{
-        display: flex;
-        overflow: hidden;
-      }
-    }
-    .ant-modal-body{
-      //height: 75vh;
-      min-height: 600px;
-    }
-    .infoDiv{
-      height: 100%;
-      >div{
-        display: flex;
-      }
-      .imgDiv{
-        position: relative;
-        transform: translate(0, 0);
-      
-        img{
-          width: 450px;
-          height: 450px;
-          margin-left: -40px;
-          margin-top: 45px;
-        }
-        .tips{
-          position: absolute;
-          width: 140px;
-          background: #DAECFD;
-          box-shadow: 0 0 2px 2px #f5f5f5;
-          padding: 5px 10px;
-        }
-        .tips1{
-          right: -35px;
-          top:50px;
-        }
-        .tips2{
-          right: -35px;
-          top:175px;
-          white-space: nowrap;
-        }
-        .tips3{
-          right: -35px;
-          top:100px;
-          white-space: nowrap;
-        }
-      }
-      .txtDiv{
-        width: 500px;
-        margin-left: 60px;
-        .videoDiv{
-          display: flex;
-          width: 500px;
-          // flex-wrap: wrap;
-          height: 300px;
-          >div{
-            &:nth-child(1){
-              display: block;
-              width: 60px;
-            }
-            &:nth-child(2){
-              width: 370px;
-              margin-left: 50px;
-              img{
-                width: 100%;
-              }
-            }
-          }
-        }
-        p{
-          width: 100%;
-          margin-bottom: 10px;
-        }
-        .txt{
-          width: 500px;
-          >div{
-            background: #F7F7F7;
-            border: 1px solid #707070;
-            padding: 10px;
-            padding-bottom: 20px;
-            >div{
-              display: flex;
-              margin-bottom: 5px;
-              letter-spacing: 1px;
-            }
-          }
-          .label{
-            width: 82px;
-          }
-          .longTxt{
-            width: 240px;
-          }
-        }
-      }
-    }
-  
-    .lljDiv{
-      display: flex;
-      .echartsBox{
-        margin-left: 30px;
-      }
-    }
-  
-    .control{
-      background: #F7F7F7;
-      border: 1px solid #707070;
-      padding: 15px 10px;
-      // position: absolute;
-      position: fixed;
-      // left: 30px;
-      // bottom: 36px;
-      left:10%;
-      bottom:6%;
-      // width: 100%;
-      width: 90%;
-      height: 65px;
-      display: flex;
-      p{
-        margin-top: 3px;
-      }
-    }
-  }
-
-  @keyframes rotate{
-    0%{
-      transform: rotate(0deg);
-    }
-    100%{
-      transform: rotate(360deg);
-    }
-  }
\ No newline at end of file
diff --git a/src/views/gxsl/zfzl/shuiguan/TableData.js b/src/views/gxsl/zfzl/shuiguan/TableData.js
deleted file mode 100644
index 787a55b..0000000
--- a/src/views/gxsl/zfzl/shuiguan/TableData.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import {Table} from 'antd';
-import React, { useEffect, useState } from 'react';
-import moment from 'moment';
-import { render } from 'react-dom';
-
-
-const Tabledata = ({ data, current }) => {
-  const columns = [
-    {title: '序号', key: 'inx', dataIndex: 'inx', align: 'center',},
-    {
-      title: '数据时间', key: 'tm', dataIndex: 'tm', align: 'center',
-      render:(rec) => <span>{rec ? moment(rec).format("YYYY-MM-DD HH:mm") : "-"}</span>
-    },
-    {
-      title: '流量(m³/s)', key: 'q', dataIndex: 'q', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-    {
-      title: '水量(m³)', key: 'v', dataIndex: 'v', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
-    },
-  ];
-
- 
-  const [tableData, setTableData] = useState([])
-  useEffect(() => {
-    if (data.length > 0) { 
-      setTableData(data)
-    } else {
-      setTableData([])
-    }
-  },[data])
-  return (
-    <>
-      <Table
-        rowKey="adcd"
-        columns={columns}
-        pagination={false}
-        dataSource={tableData}
-      />
-
-    </>
-  )
-
-}
-
-export default Tabledata
\ No newline at end of file
diff --git a/src/views/gxsl/zfzl/shuiguan/drpOption.js b/src/views/gxsl/zfzl/shuiguan/drpOption.js
deleted file mode 100644
index fce1300..0000000
--- a/src/views/gxsl/zfzl/shuiguan/drpOption.js
+++ /dev/null
@@ -1,182 +0,0 @@
-
-import { useMemo } from 'react';
-import echarts from 'echarts/lib/echarts';
-
-export default function DrpOption(data, num) {
-  console.log("num", num);
-  const minL = Math.floor(Math.min(...data?.map(s => s.q)));
-  const maxL = Math.ceil(Math.max(...data?.map(s => s.q)));
-  const minS = Math.floor(Math.min(...data?.map(s => s.v)));
-  const maxS = Math.ceil(Math.max(...data?.map(s => s.v)));
-  // let totalDrp = 0;
-  // const DRPLEVEL = [10, 20, 50, 100, 250];
-  // const maxVal = DRPLEVEL.find(o => o > totalDrp);
-  // const xMaxVal = echartData?.actual ? DRPLEVEL.find(o => {
-  //   let max = Math.max(...echartData?.actual || [])
-  //   return o > max
-  // }):maxVal
-  // // const xMaxVal = Math.ceil(Math.max(...echartData.actual)) + 2
-  // const yMaxVal = echartData?.actual ? DRPLEVEL.find(o => {
-  //   let max = Math.max(...echartData?.total) 
-  //  return  o > max
-  // }): maxVal
-  return {
-    title: {
-      text: `时段总水量:${num.value}${num.unit}m³`,
-      top: "2%",
-      right: "12%",
-      textStyle: {
-         fontWeight: "normal",
-         fontSize:14
-      }
-    },
-    tooltip: {
-      trigger: 'axis',
-      // formatter: function (params) {
-      //   var res = `${params[0].name.substr('2020-10-14 '.length, 2)}时降雨: ${params[0].data}mm<br />累计降雨: ${params[1].data}mm`;
-      //   return res;
-      // }
-    },
-    grid:  {
-      // x: 40,
-      // y: 30,
-      // x2: 30,
-      // y2: 28,
-      top: '20%',
-      left: '10%',
-      right: '10%',
-      bottom: '10%',
-      borderWidth: 0
-    },
-    legend: {
-      // 显示图例
-      show: true,
-      top: "8%",
-      // 图例的位置
-      // data: ['实测', '累计']
-    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        data: data?.map(item => item.tm),
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 14,
-          formatter: val => val.substr(0,'2020-11-11 11:11'.length)
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.5,
-          }
-        },
-        axisTick: {
-          show: false,
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        position: 'left',
-        name:"流量(m³/s)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minL,
-        max: maxL
-        // max: xMaxVal
-      },
-      {
-        type: 'value',
-        position: 'right',
-        name:"水量(m³)",
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dashed'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minS - 1,
-        max: maxS
-      }
-    ],
-  
-    series: [
-     
-      {
-        name:'流量',
-        type:'line',
-        smooth: true,
-        showSymbol: false,
-        symbol: false,
-        itemStyle: {
-          normal: {
-            color: "#FAC858",
-          }
-        },
-        lineStyle: {
-          normal: {
-            width: 3,
-            shadowColor: 'rgba(0,0,0,0.4)',
-            shadowBlur: 10,
-            shadowOffsetY: 10
-          }
-        },
-        markPoint: {
-          data: [{
-            name: '最大值',
-            type: 'max',
-          }],
-        },
-        data: data?.map(s => s.q),
-      },
-      {
-        name: '水量',
-        type: 'bar',
-        yAxisIndex:1,
-        barWidth: '10%',
-        data: data?.map(s => s.v),
-        itemStyle: {
-          normal: {
-            color:"#5773c7"
-          },
-        },
-        label: {
-          show: false,
-        },
-      },
-    ]
-  };
-}
diff --git a/src/views/gxsl/zfzl/shuiguan/index.js b/src/views/gxsl/zfzl/shuiguan/index.js
deleted file mode 100644
index 6bef182..0000000
--- a/src/views/gxsl/zfzl/shuiguan/index.js
+++ /dev/null
@@ -1,193 +0,0 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Button, DatePicker, Form, Descriptions} from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import moment from 'moment'
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import './index.less'
-import TableData from './TableData'
-import drpOption from './drpOption';
-import { httppost2,httppost5 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import { exportFile,numberFormat } from '../../../../utils/tools.js';
-
-const {RangePicker} = DatePicker;
-
-function DrpSearch({record}) {
-console.log("record",record);
-
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-  const [data, setData] = useState([]);
-  const [params, setParams] = useState({tm:[]})
-  const [current, setCurrent] = useState(0);
-
-  const option = useMemo(() => {
-    let num = 0;
-    if (data.length > 0) {
-      data.forEach(s => {
-        num += Number(s.v)
-      })
-      return drpOption(data, numberFormat(num));
-     }
-  }, [data])
-
-  const searchTm = (e) => {
-    setParams({
-      ...params,
-      tm:e,
-    })
-  };
-  const doSearch = () => {
-    let data = {
-      ...params,
-      startTime:params.tm[0].format("YYYY-MM-DD HH:mm:00"),
-      endTime: params.tm[1].format("YYYY-MM-DD HH:mm:00"),
-    }
-    getData(data)
-  }
-  const optionChange = (e) => {
-    onValuesChange(e)
-  }
-  const onValuesChange = (e) => {
-    switch (e) {
-      case 1:
-        setParams({ ...params, tm: [moment().startOf("day"), moment()] })
-        break;
-      case 2:
-        setParams({ ...params, tm: [moment().subtract(7, 'days'), moment()] })
-        break;
-      case 3:
-        setParams({ ...params, tm: [moment().subtract(1, 'months'),moment()] })
-        break;
-      case 4:
-        setParams({ ...params, tm: [moment().subtract(3, 'months'),moment()]})
-        break;
-      case 5:
-        setParams({ ...params, tm: [moment().subtract(1, 'years'),moment()]})
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const exportExcel = () => {
-    const name = record?.sttp == "PQ" ? "输水管" : "放水管"
-    let data = {
-      ...params,
-      stcd: record.stcd,
-      isAsc: false,
-      orderField: "tm",
-      startTime:params.tm[0].format("YYYY-MM-DD HH:mm:00"),
-      endTime: params.tm[1].format("YYYY-MM-DD HH:mm:00"),
-      tm:undefined
-    }
-
-    httppost5(apiurl.home.export, data).then(res => {
-      exportFile(`${name}流量.xlsx`,res.data)
-  })
-  }
-  const getData = async (params) => {
-    let data = {
-      ...params,
-      stcd: record.stcd,
-      isAsc: false,
-      orderField: "tm",
-      tm:undefined
-    }
-   try {
-     const res = await httppost2(apiurl.home.gsPage, data)
-     if (res.data.length > 0) {
-       setData(res.data.map((item, i) => ({ ...item, inx: i + 1 })))
-     } else {
-       setData([])
-     }
-   } catch (error) {
-    console.log(error);
-   }
-  }
-
-  useEffect(() => {
-    let option = "";
-    if (record?.stcd) {
-      option = {
-        stcd: record?.stcd,
-        startTime: params?.startTime || moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm:00"), 
-        endTime: params?.endTime || moment().add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:00"),
-        tm:[moment().subtract(7, 'days'), moment()]
-      }
-      setParams(option)
-      getData(option)
-    }
-
-
-  }, [current,record])
-
-
-  return (
-    <div style={{width: "98%", height: '56vh'}}>
-      <div className="top">
-        <div style={{ display: "flex", columnGap: 10, alignItems: "center" }}>
-          <span>时间段：</span>
-        <RangePicker
-          showTime
-          allowClear
-          style={{ width: "370px" }}
-          defaultValue={params.tm}
-          onChange={searchTm}
-          format="YYYY-MM-DD HH:mm"
-          value={params.tm} 
-        />
-        </div>
-        <div style={{ display: "flex", columnGap: 10, alignItems: "center",margin:"0 20px" }}>
-          <span>常用时段：</span>
-          <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-              onChange={(e)=>optionChange(e)}
-            />
-        </div>
-        <Button type="primary" onClick={doSearch} style={{ marginLeft: "10px" }}>查询</Button>
-        <Button  onClick={exportExcel} style={{marginLeft: "10px"}}>导出</Button>
-      </div>
-      <div className="mid">
-        <div className="mid-left">
-          <TableData data={data} current={current}/>
-        </div>
-        <div className="mid-right">
-          {
-            data?.length > 0 ?
-              <ReactEcharts
-                option={option}
-                style={{width: "100%", height: '100%'}}
-              /> : <div style={{textAlign: "center", margin: "10%"}}>
-                <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-              </div>
-          }
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default DrpSearch
diff --git a/src/views/gxsl/zfzl/shuiguan/index.less b/src/views/gxsl/zfzl/shuiguan/index.less
deleted file mode 100644
index 9977027..0000000
--- a/src/views/gxsl/zfzl/shuiguan/index.less
+++ /dev/null
@@ -1,65 +0,0 @@
-.top {
-  display: flex;
-  align-items: center;
-
-  .time-type {
-    margin-left: 10rem;
-    display: flex;
-
-    div {
-      width: 80px;
-      text-align: center;
-      border: 1px solid #cccccc;
-      padding: 8px 0;
-    }
-
-    .active {
-      color: #5FB7FF;
-      background: #F0F7FF;
-      border: 1px solid #5FB7FF;
-    }
-  }
-}
-
-.mid {
-
-  margin-top: 10px;
-  display: flex;
-  justify-content: space-between;
-  height: 90%;
-  .mid-left {
-    border: 1px solid #eee;
-    width: 47%;
-    height: 100%;
-    overflow: auto;
-  }
-
-  .mid-right {
-    width: 52%;
-    height: 100%;
-    .react-chart {
-      width: 100%;
-      height: 300px;
-    }
-  }
-}
-
-.footer{
-  font-size: 14px;
-  margin-top: 40px;
-  .footer-row{
-    display: flex;
-    justify-content: space-between;
-    .footer-item{
-      flex: 1;
-      text-align: center;
-      .footer-name{
-        background: #E0EDFF ;
-        padding: 4px 0;
-      }
-      .footer-num{
-        padding: 4px 0;
-      }
-    }
-  }
-}
diff --git a/src/views/gxsl/zfzl/toolbar.js b/src/views/gxsl/zfzl/toolbar.js
deleted file mode 100644
index a27ae15..0000000
--- a/src/views/gxsl/zfzl/toolbar.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm,Segmented  } from 'antd';
-import moment from 'moment';
-import { AppstoreOutlined, BarsOutlined } from '@ant-design/icons'
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ setSearchVal, searchVal,exportFile }) => {
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm1) {
-      dateSo = {
-        start: moment(values.tm1[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm1[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm1
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
-  // useEffect(() => {
-  //   let time = [moment().subtract(1,"months"),moment()]
-  //    let dateSo = {
-  //      start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-  //      end:moment(time[1]).format('YYYY-MM-DD 00:00:00'),
-  //   }
-  //   form.setFieldValue("tm",time)
-  //   setSearchVal({dateTimeRangeSo:dateSo})
-  // }, [])
-  useEffect(() => {
-    if (searchVal) {
-      let time = [moment(searchVal.dateTimeRangeSo?.start),moment(searchVal.dateTimeRangeSo?.end)]
-      form.setFieldValue("tm1",time)
-    }
-    // setSearchVal({dateTimeRangeSo:dateSo})
-  }, [searchVal])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="时间段" name="tm1">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item >
-            <Button
-              type='primary'
-              htmlType="submit"
-            >查询</Button>
-          </Form.Item>
-          <Form.Item >
-            <Button
-              onClick={()=>exportFile()}
-            >导出</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/gxsl/zfzl/toolbar1.js b/src/views/gxsl/zfzl/toolbar1.js
deleted file mode 100644
index 71ffe4c..0000000
--- a/src/views/gxsl/zfzl/toolbar1.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker, Popconfirm,Segmented  } from 'antd';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({ setSearchVal, onSave,exportFile,type,searchValLog }) => {
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
-
-  useEffect(() => {
-    // let time = [moment().subtract(1,"months"),moment()]
-    //  let dateSo = {
-    //    start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-    //    end:moment(time[1]).format('YYYY-MM-DD 00:00:00'),
-    // }
-    if (searchValLog) {
-      let time = [moment(searchValLog.dateTimeRangeSo?.start),moment(searchValLog.dateTimeRangeSo?.end)]
-      form.setFieldValue("tm",time)
-    }
-    // setSearchVal({dateTimeRangeSo:dateSo})
-  }, [searchValLog])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item >
-            <Button
-              type='primary'
-              htmlType="submit"
-            >查询</Button>
-          </Form.Item>
-          <Form.Item >
-            <Button
-              onClick={()=>exportFile()}
-            >导出</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/monitor/_.ts b/src/views/monitor/_.ts
deleted file mode 100644
index a225387..0000000
--- a/src/views/monitor/_.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { DemoCamera } from "../../models/_";
-import useRequest from "../../utils/useRequest";
-import type { DataNode, TreeProps } from 'antd/es/tree';
-import { useEffect, useMemo } from "react";
-
-export type PageContext = {
-  data: DemoCamera[] | undefined;
-  loading: boolean;
-  treeNodes: DataNode[];
-};
-
-export function usePageContext(): PageContext {
-  const { data, loading } = useRequest<DemoCamera[]>(() => fetch('/demo/deviceList.json').then(resp => resp.json()));
-
-  const treeNodes = useMemo<DataNode[]>(() => {
-    if (!data) {
-      return [];
-    }
-
-    const dMap: { [key: string]: DemoCamera } = {};
-    const cMap: { [key: string]: boolean } = {};
-    for (const o of data) {
-      if (!o.cameraList?.length) {
-        continue;
-      }
-      const key = o.regionIndexCode;
-      const fList: any = [];
-      for (const c of o.cameraList) {
-        if (!cMap[c.indexCode]) {
-          fList.push(c);
-          cMap[c.indexCode] = true;
-        }
-      }
-      if (dMap[key]) {
-        dMap[key].cameraList = dMap[key].cameraList.concat(fList);
-      } else {
-        dMap[key] = o;
-        dMap[key].cameraList = fList;
-      }
-    }
-
-    return Object.values(dMap).map(o => ({
-      title: o.deviceName,
-      key: o.regionIndexCode,
-      selectable: false,
-      children: o.cameraList.map(c => ({
-        title: c.channelName,
-        key: c.indexCode
-      }))
-    })).filter(o => o.children?.length);
-  }, [data]);
-
-  return {
-    data,
-    treeNodes,
-    loading,
-  }
-}
diff --git a/src/views/monitor/index.tsx b/src/views/monitor/index.tsx
deleted file mode 100644
index a80fa86..0000000
--- a/src/views/monitor/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Empty, Input, Layout, Tree } from 'antd'
-import React, { useState } from 'react'
-import { DownCircleFilled } from '@ant-design/icons';
-import { usePageContext } from './_';
-import { Key } from 'antd/lib/table/interface';
-import VideoReal from '../../components/common/VideoReal';
-
-const MonitorPage = () => {
-  const ctx = usePageContext();
-
-  const [indexCode, setindexCode] = useState<string | undefined>(undefined);
-
-  const setCode = (keys: Key[]) => {
-    if (!keys?.length) {
-      return;
-    }
-
-    setindexCode(`${keys[0]}`);
-  }
-
-  return (
-    <Layout style={{ height: '100%' }}>
-      <Layout.Sider style={{ background: '#fbfbfb', padding: 16 }} width={360}>
-        <div style={{ background: '#fff', height: '100%', borderRadius: 8, boxShadow: '0 0 2px 2px #f5f5f5', display: 'flex', flexDirection: 'column' }}>
-          <div style={{ borderBottom: '2px solid #f0f3f7', padding: 16 }}>
-            <Input.Search enterButton='搜索' size='large' placeholder='请输入关键字' />
-          </div>
-          <div className='tree-select' style={{ flex: 1, padding: 16, overflowY: 'auto' }}>
-            <Tree
-              showLine
-              switcherIcon={<DownCircleFilled style={{ fontSize: 14 }} />}
-              treeData={ctx.treeNodes}
-              onSelect={setCode}
-            />
-          </div>
-        </div>
-      </Layout.Sider>
-      <Layout.Content style={{ background: '#fbfbfb', padding: '16px 16px 16px 0' }}>
-        {
-          indexCode ? (
-            <VideoReal cameraIndexCode={indexCode} />
-          ) : (
-            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%' }}>
-              <Empty description='请选择监测站点'></Empty>
-            </div>
-          )
-        }
-      </Layout.Content>
-    </Layout>
-  )
-}
-
-export default MonitorPage
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/aqjcgl/form.js b/src/views/rcgl/aqgl/aqjcgl/form.js
deleted file mode 100644
index 7321ad9..0000000
--- a/src/views/rcgl/aqgl/aqjcgl/form.js
+++ /dev/null
@@ -1,354 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const checkOptions = [
-    {label:"日常检查",value:1},
-    {label:"年度检查",value:2},
-    {label:"特别检查",value:3},
-    {label:"临时检查",value:4},
-  ]
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/safety/check/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.eventsDate = values.eventsDate?moment(values.eventsDate).format("YYYY-MM-DD 00:00:00"):''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.aqgl.aqjcgl.edit,values)
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.rcgl.aqgl.aqjcgl.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="检查日期"
-                name="checkDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-          <Col span={12}>
-              <Form.Item
-                label="安全检查类型"
-                name="checkType"
-              >
-              <NormalSelect disabled={mode === 'view'} style={{ width: '100%' }} allowClear options={checkOptions} />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="名称"
-                name="name"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="检查单位"
-                name="checkOrg"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="检查人员"
-                name="checkUser"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>          
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="主要检查内容"
-                name="checkContent"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="发现的主要问题"
-                name="mainProblem"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理意见与建议"
-                name="handleSuggestion"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label="问题整改情况"
-                name="recityDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row> 
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/safety/check/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/safety/check/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/aqgl/aqjcgl/index.js b/src/views/rcgl/aqgl/aqjcgl/index.js
deleted file mode 100644
index 883d801..0000000
--- a/src/views/rcgl/aqgl/aqjcgl/index.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const checkType = {
-    1: "日常检查",
-    2: "年度检查",
-    3: "特别检查",
-    4:"临时检查"
-  }
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '检查日期', key: 'checkDate', dataIndex: 'checkDate', width: 140,},
-    { title: '名称', key: 'name', dataIndex: 'name', width: 200 },
-    {
-      title: '安全检查类型', key: 'checkType', dataIndex: 'checkType', width: 200,
-      render: (value) => <span>{value ? checkType[value] : ''}</span>
-    },
-    {title: '检查单位', key: 'checkOrg', dataIndex: 'checkOrg', width: 200},
-    {title: '检查人员', key: 'checkUser', dataIndex: 'checkUser', width: 200},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.aqgl.aqjcgl.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.aqgl.aqjcgl.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/aqgl/aqjcgl/index.less b/src/views/rcgl/aqgl/aqjcgl/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/aqgl/aqjcgl/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/aqjcgl/toolbar.js b/src/views/rcgl/aqgl/aqjcgl/toolbar.js
deleted file mode 100644
index fcb511e..0000000
--- a/src/views/rcgl/aqgl/aqjcgl/toolbar.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-  useEffect(() => {
-    let dateSo = {
-      start: moment().startOf("year").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 23:59:59')
-    }
-    form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
-    setSearchVal({ dateSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="检查日期" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="名称" name="name">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/aqjdtz/form.js b/src/views/rcgl/aqgl/aqjdtz/form.js
deleted file mode 100644
index c5c4ef7..0000000
--- a/src/views/rcgl/aqgl/aqjdtz/form.js
+++ /dev/null
@@ -1,375 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const checkOptions = [
-    {label:"一类坝",value:1},
-    {label:"二类坝",value:2},
-    {label:"三类坝",value:3},
-  ]
-
-  const identifyOrgTypeOptions = [
-    {label:"勘察设计",value:1},
-    {label:"工程咨询",value:2},
-    {label:"部门认定",value:3},
-  ]
-
-  const identifyOrgQuaOptions = [
-    {label:"甲级",value:1},
-    {label:"乙级",value:2},
-    {label:"丙级",value:3},
-    {label:"其他",value:4},
-  ]
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/safety/identify/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.identifyDate = values.identifyDate ? moment(values.identifyDate).format("YYYY-MM-DD 00:00:00") : ''
-    values.reportPrintDate = values.reportPrintDate ? moment(values.reportPrintDate).format("YYYY-MM-DD 00:00:00") : ''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.aqgl.aqjdtz.edit,values)
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.rcgl.aqgl.aqjdtz.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="鉴定日期"
-                name="identifyDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-          <Col span={12}>
-              <Form.Item
-                label="大坝安全评定类别"
-                name="identifyType"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-                labelCol={{style:{marginLeft:-10}}}
-              >
-              <NormalSelect disabled={mode === 'view'} style={{ width: '99%' }} allowClear options={checkOptions} />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="鉴定承担单位"
-                name="identifyOrg"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="承担单位类型"
-                name="identifyOrgType"
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={identifyOrgTypeOptions} />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="承担单位资质"
-                name="identifyOrgQua"
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={identifyOrgQuaOptions} />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="鉴定审定部门"
-                name="identifyAuditOrg"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="报告书印发日期"
-                name="reportPrintDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-          <Col span={12}>
-              <Form.Item
-                label="报告书印发文号"
-                name="reportPrintNumber"
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>          
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="工程存在主要问题"
-                name="mainProblem"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="安全鉴定结论"
-                name="identifyResult"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/safety/identify/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传 （最大50M）</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/safety/identify/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/aqgl/aqjdtz/index.js b/src/views/rcgl/aqgl/aqjdtz/index.js
deleted file mode 100644
index 6d97bd0..0000000
--- a/src/views/rcgl/aqgl/aqjdtz/index.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const checkType = {
-    1: "一类坝",
-    2: "二类坝",
-    3: "三类坝",
-  }
-  const identifyType = {
-    1: "甲级",
-    2: "乙级",
-    3: "丙级",
-    4:"其他"
-  }
-  const refModal = useRef();
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '鉴定日期', key: 'identifyDate', dataIndex: 'identifyDate', width: 140,},
-    {
-      title: '大坝安全评定类别', key: 'identifyType', dataIndex: 'identifyType', width: 200,
-      render: (value) => <span>{value ? checkType[value] : ''}</span>
-     },
-    {
-      title: '鉴定承担单位', key: 'identifyOrg', dataIndex: 'identifyOrg', width: 200,
-    },
-    {
-      title: '承担单位资质', key: 'identifyOrgQua', dataIndex: 'identifyOrgQua', width: 200,
-      render: (value) => <span>{value ? identifyType[value] : ''}</span>
-      
-    },
-    {title: '鉴定审定部门', key: 'identifyAuditOrg', dataIndex: 'identifyAuditOrg', width: 200},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-          edit={true}
-          del={true}
-          view={true}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.aqgl.aqjdtz.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.aqgl.aqjdtz.page).find_noCode1);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-  useEffect(() => {
-    search()
-  }, [])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/aqgl/aqjdtz/index.less b/src/views/rcgl/aqgl/aqjdtz/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/aqgl/aqjdtz/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/aqjdtz/toolbar.js b/src/views/rcgl/aqgl/aqjdtz/toolbar.js
deleted file mode 100644
index fcd1e52..0000000
--- a/src/views/rcgl/aqgl/aqjdtz/toolbar.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
- 
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave} type='primary'>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/aqsgdj/form.js b/src/views/rcgl/aqgl/aqsgdj/form.js
deleted file mode 100644
index 4d6412a..0000000
--- a/src/views/rcgl/aqgl/aqsgdj/form.js
+++ /dev/null
@@ -1,484 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const accidentOptions = [
-    {label:"一般事故",value:1},
-    {label:"较大事故",value:2},
-    {label:"重大事故",value:3},
-    {label:"特别重大事故",value:4},
-  ]
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  const [imgloading, setImgLoading] = useState(false)
-  const [imgfileList, setImgFileList] = useState([]) //上传文件列表
-
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/safety/accident/reg/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.accidentDate = values.accidentDate?moment(values.accidentDate).format("YYYY-MM-DD HH:mm:00"):''
-    values.closeCaseDate = values.closeCaseDate?moment(values.closeCaseDate).format("YYYY-MM-DD 00:00:00"):''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    let oldFiles1 = imgfileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.accidentHandle = oldFiles;
-      values.accidentPic = oldFiles1;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.aqgl.aqsgdj.edit,values)
-    }
-    if (mode === 'save') {
-      values.accidentHandle = oldFiles;
-      values.accidentPic = oldFiles1;
-      onSave(apiurl.rcgl.aqgl.aqsgdj.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-  }
-  
-  const imgbeforeUpload = (file) => {
-    const isJpgOrPng =
-      file.type === 'image/jpeg' ||
-      file.type === 'image/jpg' ||
-      file.type === 'image/png';
-    
-    if (!isJpgOrPng) {
-      message.error('请上传图片格式的文件！');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 5;
-    if (!isLt2M) {
-      message.error('图片大小需小于5M!');
-    }
-    return isJpgOrPng && isLt2M ? true : Upload.LIST_IGNORE;
-  };
-
-  const imgdeleteFile = (fileId) => {
-    let filterFile = imgfileList.filter(item => item.response?.data?.fileId !== fileId);
-    setImgFileList(filterFile)
-  }
-  const imgfileChange = (info) => {
-    console.log("info",info);
-    if (info.file.status === "done") {
-      setImgLoading(false);
-    }
-    if (info.file.status === "uploading") {
-      setImgLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setImgLoading(false);
-    }
-    setImgFileList(info.fileList)
-  }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.accidentHandle?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      const imgFile1 = record?.accidentPic?.map(o => ({
-        name: o.fileName,
-        response: {
-              data: {
-                filePath: o.filePath,
-                fileId:o.fileId
-              }
-            },
-    }))
-      setFileList(imgFile)
-      setImgFileList(imgFile1)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <div style={{maxHeight:"70vh",overflowY:"auto"}}>
-       <div style={{marginBottom:20,borderBottom:"1px solid #dfdfdf",width:"100%",paddingBottom:5}}><span style={{padding:"0px 3px",backgroundColor:"#0079fe",marginRight:20}}></span> 基本信息</div>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="事故名称"
-                name="name"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="事故发生时间"
-                name="accidentDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm'} style={{width:'100%'}} allowClear showTime />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="事故级别"
-                name="accidentLevel"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={accidentOptions} />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="事故情况描述"
-                name="accidentDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                 <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="直接经济损失(万元)"
-                name="economicLosses"
-              labelCol={{style:{whiteSpace: "wrap",textAlign:"center", width: 120}}}
-                
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="死亡人数"
-                name="deadNumber"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="受伤人数"
-                name="injureNumber"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="现场图片"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                action="/gunshiApp/tsg/safety/accident/reg/file/upload/singleSimple"
-                onChange={imgfileChange}
-                beforeUpload={imgbeforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={imgfileList}
-                  disabled={imgloading}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.jpg .png 
-                </p>
-              </Dragger>
-              }
-              <Row gutter={[16]}>
-                {
-                   loading ? <span>文件正在上传中，请等待</span> :
-                  imgfileList.length > 0 && imgfileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                          </div>
-                        <div
-                          className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'}
-                          onClick={() => imgdeleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined
-                          />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-      <div style={{ marginBottom: 20, borderBottom: "1px solid #dfdfdf", width: "100%", paddingBottom: 5 }}><span style={{ padding: "0px 3px", backgroundColor: "#0079fe", marginRight: 20 }}></span>事故处理</div>          
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="事故调查单位"
-                name="investOrg"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="事故结案日期"
-                name="closeCaseDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>       
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="事故调查情况"
-                name="investDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理结果"
-                name="handleResult"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="事故调查及处理资料"
-                name="fieldId"
-                // labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              labelCol={{style:{whiteSpace: "wrap",textAlign:"center", width: 120}}}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/safety/accident/reg/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList?.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/safety/accident/reg/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/aqgl/aqsgdj/index.js b/src/views/rcgl/aqgl/aqsgdj/index.js
deleted file mode 100644
index 175030b..0000000
--- a/src/views/rcgl/aqgl/aqsgdj/index.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const level = {
-    1: "一般事故",
-    2: "较大事故",
-    3: "重大事故",
-    4:"特别重大事故"
-  }
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '事故发生时间', key: 'accidentDate', dataIndex: 'accidentDate', width: 140,},
-    { title: '事故名称', key: 'name', dataIndex: 'name', width: 200, ellipsis: true },
-    {title: '事故情况描述', key: 'accidentDesc', dataIndex: 'accidentDesc', width: 300},
-    {
-      title: '事故级别', key: 'accidentLevel', dataIndex: 'accidentLevel', width: 200,
-      render: (value) => <span>{value ? level[value] : ''}</span>
-    },
-    {title: '直接经济损失(万元)', key: 'economicLosses', dataIndex: 'economicLosses', width: 150},
-    {title: '死亡人数', key: 'deadNumber', dataIndex: 'deadNumber', width: 100},
-    {title: '受伤人数', key: 'injureNumber', dataIndex: 'injureNumber', width: 100},
-    {title: '事故结案日期', key: 'closeCaseDate', dataIndex: 'closeCaseDate', width: 100},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.aqgl.aqsgdj.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.aqgl.aqsgdj.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/aqgl/aqsgdj/index.less b/src/views/rcgl/aqgl/aqsgdj/index.less
deleted file mode 100644
index 09c3898..0000000
--- a/src/views/rcgl/aqgl/aqsgdj/index.less
+++ /dev/null
@@ -1,47 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
-.view-file{
-    margin-left: 0 !important;
-}
-// .ant-form-item-label {
-//     display: flex;
-//     justify-content: flex-end;
-//     line-height: 16px;  //这个数值视具体情况而定
-//     label {            //这是关键
-//       white-space: normal;
-//       text-align: right;
-//       padding-right: 32px;
-//       font-size: 14px;
-//       &:after {          
-//         content: none !important;      //解决上面的样式label后面会有空格
-//       }
-//     }
-//   }
diff --git a/src/views/rcgl/aqgl/aqsgdj/toolbar.js b/src/views/rcgl/aqgl/aqsgdj/toolbar.js
deleted file mode 100644
index 1e8da50..0000000
--- a/src/views/rcgl/aqgl/aqsgdj/toolbar.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-  useEffect(() => {
-    let dateSo = {
-      start: moment().startOf("year").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 23:59:59')
-    }
-    form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
-    setSearchVal({ dateSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="事故发生日期" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="事故名称" name="name">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/aqyhpc/form.js b/src/views/rcgl/aqgl/aqyhpc/form.js
deleted file mode 100644
index 6c80382..0000000
--- a/src/views/rcgl/aqgl/aqyhpc/form.js
+++ /dev/null
@@ -1,316 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/safety/hazard/invest/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    const userId =  localStorage.getItem('userId')
-    const userName = localStorage.getItem('userName')
-    values.reportUserId = userId;
-    values.reportUserName = userName;
-    values.eventsDate = values.eventsDate ? moment(values.eventsDate).format("YYYY-MM-DD 00:00:00") : ''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.aqgl.aqyhpc.edit,values)
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.rcgl.aqgl.aqyhpc.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="隐患发现日期"
-                name="hazardDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="隐患描述"
-                name="hazardDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="位置描述"
-                name="locationDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="整改完成日期"
-                name="recityFinishDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-   
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>          
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="整改完成情况"
-                name="recityDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/safety/hazard/invest/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/safety/hazard/invest/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/aqgl/aqyhpc/index.js b/src/views/rcgl/aqgl/aqyhpc/index.js
deleted file mode 100644
index 6194d08..0000000
--- a/src/views/rcgl/aqgl/aqyhpc/index.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '隐患发现日期', key: 'hazardDate', dataIndex: 'hazardDate', width: 140,},
-    { title: '隐患描述', key: 'hazardDesc', dataIndex: 'hazardDesc', width: 250, ellipsis: true },
-    {title: '位置描述', key: 'locationDesc', dataIndex: 'locationDesc', width: 200},
-    {title: '整改完成时间', key: 'recityFinishDate', dataIndex: 'recityFinishDate', width: 200},
-    {title: '整改完成情况', key: 'recityDesc', dataIndex: 'recityDesc', width: 100},
-    {title: '上报人', key: 'reportUserName', dataIndex: 'reportUserName', width: 100},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.aqgl.aqyhpc.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.aqgl.aqyhpc.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/aqgl/aqyhpc/index.less b/src/views/rcgl/aqgl/aqyhpc/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/aqgl/aqyhpc/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/aqyhpc/toolbar.js b/src/views/rcgl/aqgl/aqyhpc/toolbar.js
deleted file mode 100644
index 8bdf364..0000000
--- a/src/views/rcgl/aqgl/aqyhpc/toolbar.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-  useEffect(() => {
-    let dateSo = {
-      start: moment().startOf("year").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 23:59:59')
-    }
-    form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
-    setSearchVal({ dateSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="隐患发现日期" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="隐患描述" name="name">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/cxjgtz/form.js b/src/views/rcgl/aqgl/cxjgtz/form.js
deleted file mode 100644
index 417bcfd..0000000
--- a/src/views/rcgl/aqgl/cxjgtz/form.js
+++ /dev/null
@@ -1,371 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const checkOptions = [
-    {label:"地方自行组织",value:1},
-    {label:"中央规划",value:2},
-  ]
-
-  const statusOptions = [
-    {label:"施工中",value:1},
-    {label:"已完工",value:2},
-  ]
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/safety/reinforcement/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.finishDate = values.finishDate ? moment(values.finishDate).format("YYYY-MM-DD 00:00:00") : ''
-    values.operationDate = values.operationDate ? moment(values.operationDate).format("YYYY-MM-DD 00:00:00") : ''
-    values.startDate = values.startDate ? moment(values.startDate).format("YYYY-MM-DD 00:00:00") : ''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.aqgl.cxjgtz.edit,values)
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.rcgl.aqgl.cxjgtz.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="组织方式"
-                name="organizationWay"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect disabled={mode === 'view'} style={{ width: '100%' }} allowClear options={checkOptions} />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="工程状态"
-                name="projectStatus"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-                // labelCol={{style:{marginLeft:-10}}}
-              >
-              <NormalSelect disabled={mode === 'view'} style={{ width: '100%' }} allowClear options={statusOptions} />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="开工日期"
-                name="startDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-          <Col span={12}>
-              <Form.Item
-                label="竣工日期"
-                name="finishDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-       
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-         
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="投运日期"
-                name="operationDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-          <Col span={12}>
-              <Form.Item
-                label="总投资(万元)"
-                name="totalInvestment"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="设计单位"
-                name="designOrg"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="施工单位"
-                name="constructOrg"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>          
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="监理单位"
-                name="controlOrg"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="主要建设内容"
-                name="constructContent"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/safety/reinforcement/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传 （最大50M）</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/safety/reinforcement/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/aqgl/cxjgtz/index.js b/src/views/rcgl/aqgl/cxjgtz/index.js
deleted file mode 100644
index f7a8561..0000000
--- a/src/views/rcgl/aqgl/cxjgtz/index.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const checkType = {
-    1: "地方自行组织",
-    2: "中央规划",
-  }
-  const identifyType = {
-    1: "施工中",
-    2: "已完工",
-  }
-  const refModal = useRef();
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '最近一次加固开工日期', key: 'startDate', dataIndex: 'startDate', width: 240,},
-    {title: '竣工日期', key: 'finishDate', dataIndex: 'finishDate', width: 200,},
-    {
-      title: '组织方式', key: 'organizationWay', dataIndex: 'organizationWay', width: 200,
-      render: (value) => <span>{value ? checkType[value] : ''}</span>
-    },
-    {
-      title: '工程状态', key: 'projectStatus', dataIndex: 'projectStatus', width: 200,
-      render: (value) => <span>{value ? identifyType[value] : ''}</span>
-      
-    },
-    {title: '投运日期', key: 'operationDate', dataIndex: 'operationDate', width: 200},
-    {title: '总投资(万元)', key: 'totalInvestment', dataIndex: 'totalInvestment', width: 200},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.aqgl.cxjgtz.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.aqgl.cxjgtz.page).find_noCode1);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-  useEffect(() => {
-    search()
-  }, [])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/aqgl/cxjgtz/index.less b/src/views/rcgl/aqgl/cxjgtz/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/aqgl/cxjgtz/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/cxjgtz/toolbar.js b/src/views/rcgl/aqgl/cxjgtz/toolbar.js
deleted file mode 100644
index fcd1e52..0000000
--- a/src/views/rcgl/aqgl/cxjgtz/toolbar.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
- 
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave} type='primary'>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.less b/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.less
deleted file mode 100644
index ac6ad25..0000000
--- a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,47 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-.treeBox1{
-  .ant-tree-node-content-wrapper{
-    position: static !important;
-  }
-  .hover-ele{
-    &:hover{
-      color:#259dff
-    }
-  }
-}
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-
-  .treeTitle {
-    display: flex;
-    justify-content: space-between;
-    .treeBtn {
-        display: none;
-    }
-}
-.treeTitle:hover {
-    .treeBtn {
-        display: flex;
-    }
-}
-}
-.no-matter{
-  opacity: 0.5;
-}
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx b/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx
deleted file mode 100644
index b947580..0000000
--- a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,311 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal,Form,Col,Row,message,Space } from 'antd';
-import { EditOutlined,PlusCircleOutlined, DeleteOutlined,ExclamationCircleOutlined} from '@ant-design/icons';
-import './index.less';
-import { formItemLayout, btnItemLayout } from '../../../../../components/crud/FormLayoutProps';
-import { getVideoTreeData } from '../../../../../service/warn';
-import apiurl from '../../../../../service/apiurl';
-import { httppost3,httpget6 } from '../../../../../utils/request';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  onChangeOpen?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  isFetch?: boolean;
-}
-const { confirm } = Modal;
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({});
-  const [jdOpen, setJdOpen] = useState(false)
-  const [form] = Form.useForm();
-  const [mode, setMode] = useState('')
-  const [itemDetail, setItemDetail] = useState<any>({})
-  const [orderMax, setOrderMax] = useState<any>(0)
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    const adcdTreedata: any = await getVideoTreeData();
-    const item:any = adcdTreedata
-    if (item) {
-      setSelectedKeys([item[0]?.id])
-      setAdcd(item[0]?.id)
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-      setOrderMax(Math.max(...adcdTreedata.map((item:any) => item?.orderIndex)))
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.name;
-        item.key = item.id;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.key;
-
-      let params = { id: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { id: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-
-
-
-
-  // 删除
-  const deleteJd = (v: any) => {
-    confirm({
-      title: '删除',
-      icon: <ExclamationCircleOutlined />,
-      content: '确认删除此数据',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk: async() => {
-        try {
-          const res = await httpget6(apiurl.rcgl.aqgl.fxgkqd.deleteTree + `/${v.id}`)
-          if (res.code === 200) { 
-            message.success('删除成功');
-            getCustomerTreeData();
-          } 
-          if (res.code === 400) { 
-            message.error(res.description);
-          }
-        } catch (error) {
-          console.log(error);
-        }
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  }
- 
-  // 新增节点
-  const saveJd = (v: any) => {
-    if (v) {
-      //  form.setFieldValue('name', v.title);
-       setItemDetail(v);
-    }
-    setJdOpen(true);
-    setMode("save");
-  }
-
-  // 编辑节点
-  const editJd = (v: any) => { 
-    setJdOpen(true);
-    form.setFieldsValue(v);
-    setMode("edit");
-    setItemDetail(v);
-  }
-
-  const onOk = async () => { 
-    const name = form.getFieldValue('name').replace(/\s/g,"");
-    if(!name) return
-    const url = mode == "save" ? apiurl.rcgl.aqgl.fxgkqd.saveTree : apiurl.rcgl.aqgl.fxgkqd.editTree;
-    let saveParams = {
-      name,
-      parentId: itemDetail?.id || undefined,
-      orderIndex:itemDetail?.orderIndex || orderMax
-    }
-    let editParams = {
-      ...itemDetail,
-      name
-   } 
-    try {
-      const res = await httppost3(url, mode == "save" ? saveParams:editParams)
-      if (res.code == 200) {
-        message.success(mode == "save" ? '新增成功' : '编辑成功');
-        setJdOpen(false);
-        getCustomerTreeData();
-        form.resetFields();
-      } else if (res.code == 400) {
-        message.error(res.description);
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-      <div
-        style={{
-        padding: '10px',
-        color: "#409eff",
-        borderBottom: "1px solid #dfdfdf",
-        marginBottom: 20,
-        cursor: "pointer"
-        }}
-        onClick={saveJd}
-      >新增</div>
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"35%",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null 
-      }
-
-      <div className="treeBox1" style={{...treeBoxHeight,marginTop:"10px"}}>
-        <div style={{ width: "300px"}}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              showLine={true}
-              titleRender={(v: any) => {
-                return (
-                    <div
-                      style={{width:200}}
-                      className='treeTitle'
-                        >
-                        <span>{v.title}</span>
-                       <Space 
-                        size={4}
-                        className='treeBtn'
-                        >
-                          <PlusCircleOutlined
-                               style={{ fontSize: 15 }}
-                               title='新增'
-                               onClick={(e) => {
-                                 e.stopPropagation();
-                                 saveJd(v);
-                               }}
-                               className='hover-ele'
-                             />
-                          <EditOutlined
-                            title='编辑'
-                            style={{ fontSize: 15 }}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              editJd(v);
-                            }}
-                            className='hover-ele'
-                          />
-                          <DeleteOutlined
-                            title='删除'
-                            style={{ fontSize: 15 }}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              deleteJd(v);
-                            }}
-                            className='hover-ele'
-                          />
-                       
-                      </Space>
-                      </div>
-                )
-              }}
-            />
-          }
-        </div>
-      
-      </div>
-      <Modal
-        open={jdOpen}
-        title={mode == "save" ? "新增" : '编辑'}
-        destroyOnClose
-        onCancel={() => { setJdOpen(false); form.resetFields()}}
-        onOk={onOk}
-      >
-        <Form form={form} {...formItemLayout}>
-          <Row>
-            <Col span={24}>
-              <Form.Item
-                label="管控区域"
-                name="name"
-                rules={[{required: true}]}
-              >
-            <Input  allowClear/>
-           </Form.Item>
-            </Col>
-          </Row>
-        </Form>
-      </Modal>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/rcgl/aqgl/fxgkqd/form.js b/src/views/rcgl/aqgl/fxgkqd/form.js
deleted file mode 100644
index 74d62dc..0000000
--- a/src/views/rcgl/aqgl/fxgkqd/form.js
+++ /dev/null
@@ -1,414 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, TreeSelect, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const riskOptions = [
-    {label:"低风险",value:1},
-    {label:"一般风险",value:2},
-    {label:"较大风险",value:3},
-    {label:"重大风险",value:4},
-  ]
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-
-  const [deptList, setDeptList] = useState([])
-  const [deptUserList, setDeptUserList] = useState([])
-  const [resultOptions, setResultOptions] = useState([])
-  
-// 获取造成后果list
-const getResultList = async() => {
-  try {
-    const result = await httpget2(apiurl.rcgl.aqgl.fxgkqd.dictionary,{dictCd:"result"});
-    if (result.code == 200) {
-     setResultOptions(result.data.map(item => ({label:item.dictNm,value:item.id})));
-    }
-    
-  } catch (error) {
-    console.log(error);
-  }
-}
-  // 获取部门数据
-  const getDeptList = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist);
-      if (result.code == 200) {
-        setDeptList(result.data);
-        getDeptUser()
-      }
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-   // 获取部门人员数据
-   const getDeptUser = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:9999});
-      if (result.code == 200) {
-        setDeptUserList(result.rows)
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/risk/info/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-    const dicId = values?.result?.map(item=> ({sysDictId:item}))
-    values.menuId = record.code;
-    values.result = dicId;
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.aqgl.fxgkqd.edit,{...record,...values});
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.rcgl.aqgl.fxgkqd.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-  }
-  
-  const buildTree = (data, parentId) => {
-    let tree = [];
-    data.forEach((node) => {
-        node.title = node.deptName;
-        node.key = node.deptId;
-        
-        if (node.parentId === parentId) {
-        let children = buildTree(data, node.deptId);
-        if (children.length) {
-            node.children = children;
-        }
-        tree.push(node);
-        }
-    });
-    return tree;
-}
-  const handleTreeList = (dept, user) => {
-    const deptArr = dept.map(item => {
-      return {
-        ...item,
-        value: item.deptId,
-        title: item.deptName,
-        disabled: item.userId ? false : true,
-        children: user.filter(u => u.deptId == item.deptId).map(u => ({
-          ...u,
-          value: u.userId,
-          title: u.nickName
-        }))
-      }
-    }) 
-    console.log("deptArr",deptArr);
-    const treelist = buildTree(deptArr,0)
-    return treelist
-  }
-  const treeList = useMemo(() => {
-    if (deptUserList?.length > 0 && deptList?.length > 0) {
-        return handleTreeList(deptList,deptUserList)
-    } else {
-      return []
-    }
-  }, [deptUserList, deptList])
-  
-
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-        setFileList(imgFile)
-        form.setFieldValue("result",record?.result?.map(item => item.sysDictId))
-      }
-    }, [record, mode])
-
-    useEffect(() => {
-      getDeptList()
-      getResultList()
-    }, [])
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="风险辨识名称"
-                name="name"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="可能导致的后果"
-                name="result"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={resultOptions}
-                mode="multiple"
-              />
-              </Form.Item>
-          </Col> 
-      </Row>          
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="风险等级"
-                name="riskLevel"
-              >
-              <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={riskOptions} />
-              </Form.Item>
-          </Col> 
-          <Col span={12}>
-              <Form.Item
-                label="责任人"
-                name="reponserId"
-              >
-                <TreeSelect
-                   showSearch
-                   disabled={mode==='view'}
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-                   treeData={treeList}
-                   treeNodeFilterProp='title'
-               />
-              </Form.Item>
-          </Col> 
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="主要防范措施"
-                name="preventMeasure"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/risk/info/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传 （最大50M）</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/risk/info/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/aqgl/fxgkqd/index.js b/src/views/rcgl/aqgl/fxgkqd/index.js
deleted file mode 100644
index 19401ae..0000000
--- a/src/views/rcgl/aqgl/fxgkqd/index.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import AdcdTreeSelector from "./AdcdTreeSelector";
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import moment from 'moment';
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  console.log(role);
-  
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const checkType = {
-    1: "低风险",
-    2: "一般风险",
-    3: "较大风险",
-    4:"重大风险"
-  }
-  const risk = {
-    1: "low",
-    2: "yiban",
-    3: "jiaoda",
-    4:"zhongda"
-  }
-  const refModal = useRef();
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '风险辨识名称', key: 'name', dataIndex: 'name', width: 240,align: 'center',},
-    {
-      title: '风险等级', key: 'riskLevel', dataIndex: 'riskLevel', width: 200,align: 'center',
-      render: (value) => <span>{value ? checkType[value] : ''}</span>
-    },
-    {
-      title: '风险标识', key: 'riskLevel', dataIndex: 'riskLevel', width: 150,align: 'center',
-      render: (value) => <div>{value ?
-        <img src={`${process.env.PUBLIC_URL}/assets/xyt/rcgl/${risk[value]}.svg`}
-      alt='' /> : ''}</div>
-    },
-    {
-      title: '可能导致的后果', key: 'result', dataIndex: 'result', width: 250, ellipsis: true,align: 'center',
-      render: (value) => <span>{value ? value.map(item => item.dictNm).join():''}</span>
-    },
-    {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 300,ellipsis: true,align: 'center',},
-    {
-      title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200, align: 'center',
-      render: (v) => <span>{v ? moment(v).format("YYYY-MM-DD"): ''}</span>
-    },
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  const [code, setCode] = useState()
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {   
-      refModal.current.showSave({code});
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params,code });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.aqgl.fxgkqd.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.aqgl.fxgkqd.page).find_noCode);
-
-
-  useEffect(() => {
-    if (code) {
-      let params = {
-        search: {
-           menuId:code,
-          orderField: "createDate",
-          isAsc: false
-          }
-        };
-      search(params)
-    }
-  }, [code]);
-  
-  
-  return (
-    <>
-       <div className='content-box' style={{ backgroundColor: '#fff', height: '100%',display:'flex',padding:'10px' }}>
-      <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)',width:'340px'}}>
-         <AdcdTreeSelector hasAlertBox={false} setAdcd={setCode}/>
-        </div>
-      <div className='AdcdTreeTableBox' style={{flex:1,overflowX:"auto"}}>
-         <Card className='nonebox'>
-          <ToolBar
-              onSave={command('save')}
-              role={role}
-          />
-        </Card>
-       
-        <Table
-          columns={columns}
-          rowKey="id"
-          {...tableProps}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-        />
-              
-   
-      </div>
-      
-      <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-      />
-    </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/aqgl/fxgkqd/index.less b/src/views/rcgl/aqgl/fxgkqd/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/aqgl/fxgkqd/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/aqgl/fxgkqd/toolbar.js b/src/views/rcgl/aqgl/fxgkqd/toolbar.js
deleted file mode 100644
index 75f21a9..0000000
--- a/src/views/rcgl/aqgl/fxgkqd/toolbar.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  console.log("role",role);
-  
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
- 
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave} type='primary'>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/rjswnbb/index.js b/src/views/rcgl/btbb/rjswnbb/index.js
deleted file mode 100644
index cd442d7..0000000
--- a/src/views/rcgl/btbb/rjswnbb/index.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { exportFile } from '../../../../utils/tools.js';
-import { httppost2, httppost5 } from '../../../../utils/request';
-import { ylFontColor } from '../../../../utils/dictType'
-import "./index.less"
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '日期', key: 'date', dataIndex: 'date', width: 200, align: "center", fixed: "left" },
-    ...Array(12).fill(0).map((item,index) => ({
-      title: `${index+1}月`,
-      key: `drpM${index+1}`,
-      dataIndex: `drpM${index+1}`,
-      width: 90,
-      align: "center",
-      render: (text, record) => <span>{text ?? '-'}</span>
-
-    }))
-  ];
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const [data, setData] = useState([])
-  const [staData, setStaData] = useState({})
-  const getData = async (params) => {
-    try {
-      const res = await httppost2(apiurl.rcgl.btbb.rjswnbb.page, params)
-      if (res.code == 200) { 
-        setData(res.data)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-    }
-    httppost5(apiurl.rcgl.btbb.rjswnbb.export, params).then(res => {
-      exportFile(`日均水位年报表.xlsx`,res.data)
-  })
-  }
-
-  const getStaData = async (params) => {
-    let obj = {};
-     try {
-      const res = await httppost2(apiurl.rcgl.btbb.rjswnbb.sta, params)
-      if (res.code == 200) { 
-         res.data.list?.forEach(item => {
-           if (!obj[item.date]) {
-            let arr = Object.keys(item)
-            arr.splice(0,2)
-            obj[item.date] = arr.map(o => ({[o]:item[o]}))
-           } 
-         })
-         setStaData({...res.data,list:obj})
-      }
-     } catch (error) {
-      console.log(error);
-     }
-   }
-
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-          ...searchVal,
-      }; 
-      getData(params)
-      getStaData(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"10px",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              title={() => (
-                <>
-                  <h2 style={{ textAlign: "center" }}>檀树岗水库{searchVal?.year}年日平均水位年报表</h2>
-                  <div style={{ textAlign: "right" }}>单位：m</div>
-                </>
-              )}
-              columns={columns}
-              rowKey="date"
-              dataSource={data}
-              pagination={false}
-              scroll={{ x: width, y: "calc( 100vh - 600px )" }}
-              summary={(pageData) => {
-                return(
-                  <Table.Summary fixed>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={100} align='center'  className="xyt-custom-cell">
-                        <div className='table-summary-ceil'>
-                          <div className='summary-left'></div>
-                          <div className='summary-right'>平均</div>
-                        </div>
-                      </Table.Summary.Cell>
-                      {staData?.list?.["平均"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={121} align='center' className="xyt-custom-cell">
-                        <div className='table-summary-ceil'>
-                          <div className='summary-left'></div>
-                          <div className='summary-right'>最高</div>
-                        </div>
-                      </Table.Summary.Cell>
-                      {staData?.list?.["最高"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={46} align='center' className="xyt-custom-cell">
-                        <div className='table-summary-ceil'>
-                          <div className='summary-left'>月统计</div>
-                          <div className='summary-right'>最高日期</div>
-                        </div>
-                      </Table.Summary.Cell>
-                      {staData?.list?.["最高日期"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={156} align='center' className="xyt-custom-cell">
-                        <div className='table-summary-ceil'>
-                          <div className='summary-left'></div>
-                          <div className='summary-right'>最低</div>
-                        </div>
-                      </Table.Summary.Cell>
-                      {staData?.list?.["最低"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={155} align='center' className="xyt-custom-cell" >
-                        <div className='table-summary-ceil'>
-                          <div className='summary-left'></div>
-                          <div className='summary-right'>最低日期</div>
-                        </div>
-                      </Table.Summary.Cell>
-                      {staData?.list?.["最低日期"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                        <Table.Summary.Cell index={200} align='center' >年统计</Table.Summary.Cell>
-                        <Table.Summary.Cell index={1} align='center' >最高水位</Table.Summary.Cell>
-                        <Table.Summary.Cell index={2} align='center' colSpan={3}>{staData?.max}</Table.Summary.Cell>
-                        <Table.Summary.Cell index={3} align='center'>最低水位</Table.Summary.Cell>
-                        <Table.Summary.Cell index={4} align='center' colSpan={3}>{staData?.min}</Table.Summary.Cell>
-                        <Table.Summary.Cell index={3} align='center'>平均水位</Table.Summary.Cell>
-                        <Table.Summary.Cell index={4} align='center' colSpan={3}>{staData?.avg}</Table.Summary.Cell>
-                    </Table.Summary.Row>
-                  </Table.Summary>
-                )
-              }}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/btbb/rjswnbb/index.less b/src/views/rcgl/btbb/rjswnbb/index.less
deleted file mode 100644
index 704ccf1..0000000
--- a/src/views/rcgl/btbb/rjswnbb/index.less
+++ /dev/null
@@ -1,50 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
-.ant-table-summary {
-    .xyt-custom-cell{
-        padding: 0 !important;
-    }
-  
-  }
-.table-summary-ceil{
-    display: flex;
-    height: 34px;
-    .summary-left{
-        line-height: 2.1;
-        width: 100px;
-        border-right: 1px solid #f0f0f0;
-    }
-    .summary-right{
-        flex:1;
-        text-align: center;
-        line-height: 2.1;
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/rjswnbb/toolbar.js b/src/views/rcgl/btbb/rjswnbb/toolbar.js
deleted file mode 100644
index 3308049..0000000
--- a/src/views/rcgl/btbb/rjswnbb/toolbar.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true;
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.year) {
-      dateSo = moment(values.year).format('YYYY')
-    }
-    delete values.year
-    setSearchVal({...values, year:Number(dateSo)});
-  }
-
-  useEffect(() => {
-    form.setFieldValue("year", moment())
-    setSearchVal({year: moment().format('YYYY')})
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="年份" name="year">
-        <DatePicker 
-              allowClear
-              style={{ width: "150px" }}
-              picker="year"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            exportBtn ?
-              <Form.Item>
-                <Button onClick={()=>exportFile()}>导出</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/rjynbb/index.js b/src/views/rcgl/btbb/rjynbb/index.js
deleted file mode 100644
index f3efd67..0000000
--- a/src/views/rcgl/btbb/rjynbb/index.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { exportFile } from '../../../../utils/tools.js';
-import { httppost2, httppost5 } from '../../../../utils/request';
-import { ylFontColor } from '../../../../utils/dictType'
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '日期', key: 'date', dataIndex: 'date', width: 120, align: "center", fixed: "left" },
-    ...Array(12).fill(0).map((item,index) => ({
-      title: `${index+1}月`,
-      key: `drpM${index+1}`,
-      dataIndex: `drpM${index+1}`,
-      width: 100,
-      align: "center",
-      render: (text, record) => <span style={{color:ylFontColor(text)}}>{text ?? '-'}</span>
-    }))
-  ];
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const [data, setData] = useState([])
-  const [staData, setStaData] = useState({})
-  const getData = async (params) => {
-    try {
-      const res = await httppost2(apiurl.rcgl.btbb.rjylnbb.page, params)
-      if (res.code == 200) { 
-        setData(res.data)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-    }
-    httppost5(apiurl.rcgl.btbb.rjylnbb.export, params).then(res => {
-      exportFile(`日降雨量年报表.xlsx`,res.data)
-  })
-  }
-
-  const getStaData = async (params) => {
-    let obj = {};
-     try {
-      const res = await httppost2(apiurl.rcgl.btbb.rjylnbb.sta, params)
-      if (res.code == 200) { 
-         res.data.list?.forEach(item => {
-           if (!obj[item.date]) {
-            let arr = Object.keys(item)
-            arr.splice(0,1)
-            obj[item.date] = arr.map(o => ({[o]:item[o]}))
-          }
-         })
-         setStaData({...res.data,list:obj})
-      }
-     } catch (error) {
-      console.log(error);
-      
-     }
-   }
-
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-          ...searchVal,
-      }; 
-      getData(params)
-      getStaData(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"10px",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              title={() => (
-                <>
-                  <h2 style={{ textAlign: "center" }}>檀树岗水库{searchVal?.year}年日降雨年报表</h2>
-                  <div style={{ textAlign: "right" }}>单位：mm</div>
-                </>
-              )}
-              columns={columns}
-              rowKey="date"
-              dataSource={data}
-              pagination={false}
-              scroll={{ x: width, y: "calc( 100vh - 600px )" }}
-              summary={(pageData) => {
-                return(
-                  <Table.Summary fixed>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={100} align='center' >月降雨量</Table.Summary.Cell>
-                      {staData?.list?.["月降雨量"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={21} align='center' >降雨日数</Table.Summary.Cell>
-                      {staData?.list?.["降雨日数"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={22} align='center' >最大日量</Table.Summary.Cell>
-                      {staData?.list?.["最大日量"]?.map((item, index) => (
-                        <Table.Summary.Cell index={index + 1} align='center'>{item[`drpM${index + 1}`]}</Table.Summary.Cell>
-                      )
-                      )}
-                    </Table.Summary.Row>
-                    <Table.Summary.Row>
-                      <Table.Summary.Cell index={12} align='center' >年统计</Table.Summary.Cell>
-                        <Table.Summary.Cell index={1} align='center' colSpan={3}>降水量</Table.Summary.Cell>
-                        <Table.Summary.Cell index={2} align='center' colSpan={3}>{staData?.drpSum}</Table.Summary.Cell>
-                        <Table.Summary.Cell index={3} align='center' colSpan={3}>降雨日数</Table.Summary.Cell>
-                        <Table.Summary.Cell index={4} align='center' colSpan={3}>{staData?.dayCount}</Table.Summary.Cell>
-                    </Table.Summary.Row>
-                  </Table.Summary>
-                )
-              }}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/btbb/rjynbb/index.less b/src/views/rcgl/btbb/rjynbb/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/btbb/rjynbb/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/rjynbb/toolbar.js b/src/views/rcgl/btbb/rjynbb/toolbar.js
deleted file mode 100644
index 3308049..0000000
--- a/src/views/rcgl/btbb/rjynbb/toolbar.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true;
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.year) {
-      dateSo = moment(values.year).format('YYYY')
-    }
-    delete values.year
-    setSearchVal({...values, year:Number(dateSo)});
-  }
-
-  useEffect(() => {
-    form.setFieldValue("year", moment())
-    setSearchVal({year: moment().format('YYYY')})
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="年份" name="year">
-        <DatePicker 
-              allowClear
-              style={{ width: "150px" }}
-              picker="year"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            exportBtn ?
-              <Form.Item>
-                <Button onClick={()=>exportFile()}>导出</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/sdjyrbb/index.js b/src/views/rcgl/btbb/sdjyrbb/index.js
deleted file mode 100644
index 4b1f1f8..0000000
--- a/src/views/rcgl/btbb/sdjyrbb/index.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { exportFile } from '../../../../utils/tools.js';
-import { httppost2, httppost5 } from '../../../../utils/request';
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '日期', key: 'date', dataIndex: 'date', width: 120, align: "center", fixed: "left" },
-    ...Array(16).fill(0).map((item,index) => ({
-      title: `${index+9}时`,
-      key: `drpH${index+9}`,
-      dataIndex: `drpH${index+9}`,
-      width: 80,
-      align: "center",
-      sorter:  (a, b) => a[`drpH${index+9}`] - b[`drpH${index+9}`]
-    })),
-    ...Array(8).fill(0).map((item,index) => ({
-      title: `${index+1}时`,
-      key: `drpH${index+1}`,
-      dataIndex: `drpH${index+1}`,
-      width: 80,
-      align: "center",
-      sorter:  (a, b) => a[`drpH${index+1}`] - b[`drpH${index+1}`]
-    })),
-    { title: '日累计', key: 'drpD', dataIndex: 'drpD', width: 100, align: "center",sorter: (a, b) => a.drpD - b.drpD, },
-
-  ];
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const [data, setData] = useState([])
-  const getData = async (params) => {
-    try {
-      const res = await httppost2(apiurl.rcgl.btbb.sdjyrbb.page, params)
-      if (res.code == 200) { 
-        setData(res.data)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-    }
-    httppost5(apiurl.rcgl.btbb.sdjyrbb.export, params).then(res => {
-      exportFile(`时段降雨日报表.xlsx`,res.data)
-  })
-  }
-
-  const formatDate = (date1) => {
-    const date = new Date(date1);
-    const year = date.getFullYear();
-    const month = date.getMonth() + 1;
-    const day = date.getDate();
-    
-    return year + '年' + month + '月' + day + '日';
-  }
-
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-          ...searchVal,
-      }; 
-      getData(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"10px",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              title={() => (
-                <>
-                  <h2 style={{ textAlign: "center" }}>{formatDate(searchVal.start)}-{formatDate(searchVal.end)}小时降雨量日报表</h2>
-                  <div style={{ textAlign: "right" }}>单位：mm</div>
-                </>
-              )}
-              columns={columns}
-              rowKey="date"
-              dataSource={data}
-              pagination={false}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/btbb/sdjyrbb/index.less b/src/views/rcgl/btbb/sdjyrbb/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/btbb/sdjyrbb/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/sdjyrbb/toolbar.js b/src/views/rcgl/btbb/sdjyrbb/toolbar.js
deleted file mode 100644
index 68003ea..0000000
--- a/src/views/rcgl/btbb/sdjyrbb/toolbar.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true;
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, ...dateSo});
-  }
-
-  useEffect(() => {
-    let dateSo = {
-      start: moment().subtract(1,"weeks").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 00:00:00')
-    }
-    form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
-    setSearchVal(dateSo)
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="日期" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            exportBtn ?
-              <Form.Item>
-                <Button onClick={()=>exportFile()}>导出</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/sdswrbb/index.js b/src/views/rcgl/btbb/sdswrbb/index.js
deleted file mode 100644
index d930676..0000000
--- a/src/views/rcgl/btbb/sdswrbb/index.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { exportFile } from '../../../../utils/tools.js';
-import { httppost2, httppost5 } from '../../../../utils/request';
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '日期', key: 'date', dataIndex: 'date', width: 120, align: "center", fixed: "left" },
-    ...Array(24).fill(0).map((item,index) => ({
-      title: `${index}时` ,
-      key: index == 0 ? `rzH24`:`rzH${index}`,
-      dataIndex: index == 0 ? `rzH24`:`rzH${index}`,
-      width: 80,
-      align: "center",
-      sorter:  (a, b) => a[index == 0 ? `rzH24`:`rzH${index}`] - b[index == 0 ? `rzH24`:`rzH${index}`]
-    })),
-    { title: '平均', key: 'rzAvg', dataIndex: 'rzAvg', width: 100, align: "center",sorter: (a, b) => a.rzAvg - b.rzAvg, },
-
-  ];
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const [data, setData] = useState([])
-  const getData = async (params) => {
-    try {
-      const res = await httppost2(apiurl.rcgl.btbb.sdswrbb.page, params)
-      if (res.code == 200) { 
-        setData(res.data)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-    }
-    httppost5(apiurl.rcgl.btbb.sdswrbb.export, params).then(res => {
-      exportFile(`时段水位日报表.xlsx`,res.data)
-  })
-  }
-
-  const formatDate = (date1) => {
-    const date = new Date(date1);
-    const year = date.getFullYear();
-    const month = date.getMonth() + 1;
-    const day = date.getDate();
-    
-    return year + '年' + month + '月' + day + '日';
-  }
-
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-          ...searchVal,
-      }; 
-      getData(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"10px",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              title={() => (
-                <>
-                  <h2 style={{ textAlign: "center" }}>{formatDate(searchVal.start)}-{formatDate(searchVal.end)}时段水位日报表</h2>
-                  <div style={{ textAlign: "right" }}>单位：m</div>
-                </>
-              )}
-              columns={columns}
-              rowKey="date"
-              dataSource={data}
-              pagination={false}
-              scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/btbb/sdswrbb/index.less b/src/views/rcgl/btbb/sdswrbb/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/btbb/sdswrbb/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/btbb/sdswrbb/toolbar.js b/src/views/rcgl/btbb/sdswrbb/toolbar.js
deleted file mode 100644
index 68003ea..0000000
--- a/src/views/rcgl/btbb/sdswrbb/toolbar.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true;
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, ...dateSo});
-  }
-
-  useEffect(() => {
-    let dateSo = {
-      start: moment().subtract(1,"weeks").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 00:00:00')
-    }
-    form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
-    setSearchVal(dateSo)
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="日期" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            exportBtn ?
-              <Form.Item>
-                <Button onClick={()=>exportFile()}>导出</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/byfz/bypc/form.js b/src/views/rcgl/byfz/bypc/form.js
deleted file mode 100644
index 95b7b5d..0000000
--- a/src/views/rcgl/byfz/bypc/form.js
+++ /dev/null
@@ -1,320 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import apiurl from '../../../../service/apiurl';
-import FormComponent from "./formCom"
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-import { httpget2 } from '../../../../utils/request';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const [form] = Form.useForm();
-  const [data, setData] = useState([])
-  const [details, setDetails] = useState()
-  const [imgVisible, setImgVisible] = useState(false)
-  const [imgList, setImgList] = useState([])
-  const [videoOpen, setVideoOpen] = useState(false)
-  const [videoParams, setVideoParams] = useState({})
-  const refModal = useRef();
-  const isHarms = {
-    0: "无危害",
-    1: "有危害",
-  }
-  const isDangers = {
-    0: "否",
-    1: "是",
-  }
-  const columns = [
-    { title: '部位', key: 'position', dataIndex: 'position', width: 100, align: "center" },
-    {
-      title: '危害情况', key: 'isHarm', dataIndex: 'isHarm', width: 140,
-      render: (value, row) =>(
-        <span >{isHarms[value]}</span>)
-    },
-    {
-      title: '活动迹象', key: 'actSign', dataIndex: 'actSign', width: 300,ellipsis:true,
-      render: (value) => <span>{value ? value.map(item=> item.dictNm).join() : ''}</span>
-     },
-    {
-      title: '桩号', key: 'pileNumber', dataIndex: 'pileNumber', width: 200,  
-    },
-    {
-      title: '普查长度(m)', key: 'surveyLen', dataIndex: 'surveyLen', width: 200,
-    },
-    {
-      title: '是否致险', key: 'isDanger', dataIndex: 'isDanger', width: 100,
-      render: (value, row) =>(
-        <span >{value? isDangers[value] : ''}</span>)
-    },
-    {title: '渗漏处数', key: 'leakage', dataIndex: 'leakage', width: 100},
-    {title: '穿坝处数', key: 'damCross', dataIndex: 'damCross', width: 100},
-    {title: '跌窝处数', key: 'fallNest', dataIndex: 'fallNest', width: 100},
-    {
-      title: '是否已处置', key: 'isHandle', dataIndex: 'isHandle', width: 100,
-      render: (value, row) =>(
-        <span >{value? isDangers[value] : ''}</span>)
-    },  
-    { title: '处置情况说明', key: 'handleDesc', dataIndex: 'handleDesc', width: 200 },
-    {
-      title: '现场图片', key: 'pics', dataIndex: 'pics', width: 100,
-      render: (value) => <div>{value ? <a onClick={()=>reviewPic(value)}> { value.length} </a>: ''}</div>
-    },  
-    {
-      title: '现场视频', key: 'videos', dataIndex: 'videos', width: 100,
-      render: (value) => <div>{value ? <a onClick={()=>reviewVideo(value)}> { value.length} </a>: ''}</div>
-    },  
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={mode != "view" ? true :false}
-        del={mode != "view" ? true :false}
-        view={true}
-         command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-
-  const surveyType = [
-    {label:"日常检查排查",value:1},
-    {label:"定期普查",value:2},
-    {label:"专项调查",value:3},
-  ]
-  const surveyWay = [
-    {label:"人工排查法",value:1},
-    {label:"引诱法",value:2},
-    {label:"仪器探测法",value:3},
-    {label:"其他",value:4},
-  ]
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-
-  const reviewPic = (arrPic) => {
-    if (arrPic.length > 0) {
-      setImgVisible(true)
-      setImgList(arrPic)
-    }
-  }
- 
-  const reviewVideo = (arrVideo) => {
-    if (arrVideo.length > 0) {
-      setVideoOpen(true)
-      setVideoParams(arrVideo[0])
-    }
-  }
-   const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      const filterData =  data.filter(item => item.id != params.id) 
-      setData(filterData)
-    }
-  }
- 
-  const onfinish = (values) => {
-    const userId =  localStorage.getItem('userId')
-    values.reportDate = values.reportDate?moment(values.reportDate).format("YYYY-MM-DD"):''
-    values.details = data
-    values.userId = userId
-    if (mode === 'edit') {
-      values.id = record.id;
-      onEdit(apiurl.rcgl.byfz.bypc.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.byfz.bypc.save,values)
-    }
-  }
-
-  // 获取详情数据
-  const getDetailsData = async (id) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.byfz.bypc.detail + `/${id}`)
-      if (res.code === 200) { 
-        setData(res.data?.details || [])
-      } 
-    } catch (error) {
-      message.error('获取数据失败')
-    }
-  }
-    useEffect(() => {
-      if (mode != 'save') {
-        getDetailsData(record?.id)
-      }
-    }, [record, mode])
-
-  useEffect(() => {
-    if (mode == 'save') { 
-      const name = localStorage.getItem('userName')
-      form.setFieldValue("reportUserName", name)
-      form.setFieldValue("reportDate", moment())
-    }
-  }, [mode])
-  
-  useEffect(() => {
-    // 判断是新增还是编辑
-    if (details) {
-      if (details.mode == "edit") {
-        const filterData = data.map(item => {
-          if (item.id === details.id) {
-            return {...item, ...details,}
-          }
-          return item
-        })
-        setData(filterData)
-      } else {
-        setData([details,...data])
-    }
-    }
-    
-    }, [details])
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={8}>
-              <Form.Item
-                label="普查类型"
-                name="surveyType"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={surveyType}
-              />
-              </Form.Item>
-          </Col> 
-          <Col span={8}>
-              <Form.Item
-                label="普查方式"
-                name="surveyWay"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={surveyWay}
-              />
-              </Form.Item>
-          </Col> 
-          <Col span={8}>
-              <Form.Item
-                label="填报日期"
-                name="reportDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker disabled={true} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>
-           
-      <Row>
-          <Col span={8}>
-              <Form.Item
-                label="填报人"
-                name="reportUserName"
-              >
-              <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        {mode != "view" ? 
-           <Button
-           type="primary"
-           style={{ marginLeft: "87%", marginBottom: "1%" }}
-           onClick={() => refModal.current.showSave()}
-         >添加</Button> : null
-        }
-        <Table
-          columns={columns}
-          rowKey="id"
-          dataSource={data}
-          pagination={false}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-        />
-                
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item wrapperCol={{span:3,offset:21}} style={{marginTop:"4%"}}>
-            <Button type="primary" htmlType="submit" >
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={FormComponent}
-          onCrudSuccess={setDetails}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-           <div style={{ display: "none" }}>
-        <Image.PreviewGroup
-            preview={{
-              visible:imgVisible,
-              onVisibleChange: (vis) => setImgVisible(vis),
-            }}
-        >
-          {
-              imgList.length > 0 ? imgList.map(item => (
-                <Image src={ url + item.filePath} key={item?.id}/>
-            ))
-            : null
-          }
-
-        </Image.PreviewGroup>
-
-      </div>
-      <Modal
-        open={videoOpen}
-        width={800}
-        title="视频预览"
-        footer={null}
-        onCancel={() => setVideoOpen(false)}
-      >
-        <video
-          controls
-          src={url + videoParams?.filePath}
-          style={{width:"100%",height:"100%"}}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/byfz/bypc/formCom.js b/src/views/rcgl/byfz/bypc/formCom.js
deleted file mode 100644
index d022bb1..0000000
--- a/src/views/rcgl/byfz/bypc/formCom.js
+++ /dev/null
@@ -1,503 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,VideoCameraOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-import { httpget2 } from '../../../../utils/request';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const ModalForm = ({ mode, record, onEdit, onSave, submit }) => {
-  const [resultOptions, setResultOptions] = useState([])
-  const isHarm = [
-    {label:"无危害",value:0},
-    {label:"有危害",value:1},
-  ]
-  const isDanger = [
-    {label:"否",value:0},
-    {label:"是",value:1},
-  ]
-  const [form] = Form.useForm();
-  const [imgloading, setImgLoading] = useState(false)
-  const [imgfileList, setImgFileList] = useState([]) //上传文件列表
-  const [videoFileList, setVideoFileList] = useState([]) //上传文件列表
-  const [videoLoading, setVideoLoading] = useState(false)
-  const [videoOpen, setVideoOpen] = useState(false)
-  const [videoParams, setVideoParams] = useState({})
-  const [danger, setDanger] = useState()
-  const [handle, setHandle] = useState()
-  const [harm, setHarm] = useState()
-  const videoDeleteFile = (fileId) => {
-    let filterFile = videoFileList.filter(item => item.response?.data?.fileId !== fileId);
-    setVideoFileList(filterFile)
-  }
-  const videoBeforeUpload = (file) => {
-    if (videoFileList.length == 1) {
-      message.warning('只能上传一个视频！');
-      return false;
-    }
-    const isJpgOrPng =
-      file.type === 'video/mp4' ||
-      file.type === 'video/avi';
-    if (!isJpgOrPng) {
-      message.error('请上传视频格式的文件！');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 50;
-    if (!isLt2M) {
-      message.error('视频大小需小于50M!');
-    }
-    return isJpgOrPng && isLt2M  ? true : Upload.LIST_IGNORE;
-  };
-  const videoFileChange = (info) => {
-    if (info.file.status === "done") {
-      setVideoLoading(false);
-    setVideoFileList(info.fileList)
-    }
-    if (info.file.status === "uploading") { 
-      setVideoLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setVideoLoading(false);
-    }
-    setVideoFileList(info.fileList)
-  }
-
-  // 获取活动轨迹list
-const getResultList = async() => {
-  try {
-    const result = await httpget2(apiurl.rcgl.byfz.bypc.dictionary,{dictCd:"actSign"});
-    if (result.code == 200) {
-     setResultOptions(result.data.map(item => ({label:item.dictNm,value:item.id})));
-    }
-    
-  } catch (error) {
-    console.log(error);
-  }
-}
-  const idGen = () => {
-    return window.performance.now().toString().replace('.', '');
- }
-  const onfinish = (values) => {
-    const dicId = values.actSign.map(item=> ({sysDictId:item,dictNm:resultOptions.find(o => o.value == item)?.label}))
-    let imgFiles = imgfileList.map(item => ({
-      fileId: item.response?.data?.fileId,
-      fileName: item.response?.data?.fileName,
-      filePath: item.response?.data?.filePath,
-    }))
-    let videoFiles = videoFileList.map(item => ({
-      fileId: item.response?.data?.fileId,
-      fileName: item.response?.data?.fileName,
-      filePath: item.response?.data?.filePath,
-    }))
-    values.pics = imgFiles;
-    values.videos = videoFiles;
-    values.actSign = dicId;
-
-    if (mode === 'edit') {
-      submit({...record,...values,mode:'edit' })
-    }
-    if (mode === 'save') {
-      submit({...values,id:idGen(),mode:'save' })
-    }
-  }
-  
-  const imgbeforeUpload = (file) => {
-    const isJpgOrPng =
-      file.type === 'image/jpeg' ||
-      file.type === 'image/jpg' ||
-      file.type === 'image/png';
-    
-    if (!isJpgOrPng) {
-      message.error('请上传图片格式的文件！');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 5;
-    if (!isLt2M) {
-      message.error('图片大小需小于5M!');
-    }
-    return isJpgOrPng && isLt2M ? true : Upload.LIST_IGNORE;
-  };
-
-  const imgdeleteFile = (fileId) => {
-    let filterFile = imgfileList.filter(item => item.response?.data?.fileId !== fileId);
-    setImgFileList(filterFile)
-  }
-  const imgfileChange = (info) => {
-    console.log("info",info);
-    if (info.file.status === "done") {
-      setImgLoading(false);
-    }
-    if (info.file.status === "uploading") {
-      setImgLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setImgLoading(false);
-    }
-    setImgFileList(info.fileList)
-  }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.pics?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-        }))
-        const videoFile = record?.videos?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-        }))
-        setImgFileList(imgFile)
-        setVideoFileList(videoFile)
-        setDanger(record?.isDanger)
-        setHandle(record?.isHandle)
-        setHarm(record?.isHarm)
-      }
-    }, [record, mode])
-
- useEffect(() => {
-   const name = localStorage.getItem('userName')
-   const sign = record?.actSign ? record?.actSign.map(item => item.sysDictId) : []
-   form.setFieldValue("reportUserName", name)
-   form.setFieldValue("actSign", sign)
-   getResultList()
- }, [])
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="部位"
-                name="position"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <Input  style={{width:'100%'}} allowClear disabled={mode === 'view'} />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="危害情况"
-                name="isHarm"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect
-                style={{ width: '100%' }}
-                allowClear
-                options={isHarm}
-                disabled={mode === 'view'}
-                onChange={(e) => setHarm(e)}
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="活动迹象"
-                name="actSign"
-              >
-              <NormalSelect
-                mode="multiple"
-                allowClear
-                style={{ width: '100%' }}
-                options={resultOptions}
-                disabled={( mode === 'view' || harm == 0) ? true : false}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="桩号"
-                name="pileNumber"
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={(mode === 'view' || harm == 0) ? true : false}
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="普查长度(m)"
-                name="surveyLen"
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={( mode === 'view' || harm == 0) ? true : false}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="是否致险"
-                name="isDanger"
-              >
-              <NormalSelect
-                allowClear
-                style={{ width: '100%' }}
-                options={isDanger}
-                disabled={(mode === 'view' || harm == 0) ? true : false}
-                onChange={(e) => setDanger(e)}
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="渗漏处数"
-                name="leakage"
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={harm == 0 ? true : 
-                  (!danger) ? true :
-                    mode === 'view' ? true : false
-                }
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="穿坝处数"
-                name="damCross"
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={harm == 0 ? true : 
-                  (!danger) ? true :
-                    mode === 'view' ? true : false
-                }
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="跌窝处数"
-                name="fallNest"
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={harm == 0 ? true : 
-                  (!danger) ? true :
-                    mode === 'view' ? true : false
-                }
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="是否已处置"
-                name="isHandle"
-              >
-              <NormalSelect
-                allowClear
-                style={{ width: '100%' }}
-                options={isDanger}
-                disabled={(mode === 'view' || harm == 0) ? true : false}
-                onChange={(e) => setHandle(e)}
-              />
-              </Form.Item>
-          </Col>
-      </Row>           
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处置情况说明"
-                name="handleDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-                disabled={harm == 0 ? true : 
-                  (!handle) ? true :
-                    mode === 'view' ? true : false
-                }
-              />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="现场图片"
-                name="picId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/termite/survey/file/upload/singleSimple"
-                onChange={imgfileChange}
-                beforeUpload={imgbeforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={imgfileList}
-                  disabled={imgloading}
-              >
-                   <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.jpg .png 
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-              {
-                   imgloading ? <span>文件正在上传中，请等待</span> :
-                  imgfileList.length > 0 && imgfileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                          </div>
-                        <div
-                          className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'}
-                          onClick={() => imgdeleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined
-                          />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-       </Row>
-       <Row>
-          <Col span={24}>
-              <Form.Item
-                label="视频资料"
-                name="videofieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                action="/gunshiApp/tsg/termite/survey/file/upload/singleSimple"
-                onChange={videoFileChange}
-                beforeUpload={videoBeforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                fileList={videoFileList}
-                maxCount={1}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传(最大50M)</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.mp4 .avi
-                </p>
-              </Dragger>
-              }
-              <Row gutter={[16]}>
-                {
-                   videoLoading ? <span>文件正在上传中，请等待</span> :
-                  videoFileList.length > 0 && videoFileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                        <div
-                            onClick={() => { setVideoOpen(true); setVideoParams(file)}}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <VideoCameraOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                            <span>{file.name}</span>
-                          </div>
-                        <div
-                          className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'}
-                          onClick={() => videoDeleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined
-                          />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-
-      <Modal
-        open={videoOpen}
-        width={800}
-        title="视频预览"
-        footer={null}
-        onCancel={() => setVideoOpen(false)}
-      >
-        <video
-          controls
-          src={url + videoParams?.response?.data?.filePath}
-          style={{width:"100%",height:"100%"}}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/byfz/bypc/index.js b/src/views/rcgl/byfz/bypc/index.js
deleted file mode 100644
index 41e0d69..0000000
--- a/src/views/rcgl/byfz/bypc/index.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")|| true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")|| true;
-  const surveyType = {
-    1: "日常检查排查",
-    2: "定期普查",
-    3:"专项调查"
-  }
-  const surveyWay = {
-    1: "人工排查法",
-    2: "引诱法",
-    3: "仪器探测法",
-    4:"其他"
-  }
-  const isHarm = {
-    0: "无危害",
-    1: "有危害",
-  }
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({})
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '填报日期', key: 'reportDate', dataIndex: 'reportDate', width: 140,},
-    {
-      title: '普查类型', key: 'surveyType', dataIndex: 'surveyType', width: 200, 
-      render: (value) => <span>{value ? surveyType[value] : ''}</span>
-     },
-    {
-      title: '普查方式', key: 'surveyWay', dataIndex: 'surveyWay', width: 200,
-      render: (value) => <span>{value ? surveyWay[value] : ''}</span>
-      
-    },
-    {
-      title: '危害情况', key: 'isHarm', dataIndex: 'isHarm', width: 200,
-      render: (value, row) =>(
-        <span style={row.harmNum > 0 ? { color: "red" } : {}}>{isHarm[row.harmNum > 0 ? 1 : 0]}</span>)
-    },
-    {title: '白蚁危害处数', key: 'harmNum', dataIndex: 'harmNum', width: 100},
-    {title: '已处置处数', key: 'handleNum', dataIndex: 'handleNum', width: 100},
-    {title: '上报人', key: 'reportUserName', dataIndex: 'reportUserName', width: 100},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.byfz.bypc.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.byfz.bypc.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/byfz/bypc/index.less b/src/views/rcgl/byfz/bypc/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/byfz/bypc/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/byfz/bypc/toolbar.js b/src/views/rcgl/byfz/bypc/toolbar.js
deleted file mode 100644
index 320c1e4..0000000
--- a/src/views/rcgl/byfz/bypc/toolbar.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.year) {
-      dateSo = moment(values.year).format('YYYY')
-    }
-    delete values.year
-    setSearchVal({...values, year:Number(dateSo)});
-  }
-
-//   useEffect(() => {
-//     let dateSo = {
-//       start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'),
-//       end: moment().format('YYYY-MM-DD 00:00:00')
-//     }
-//     form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
-//     setSearchVal({ dateSo })
-//  }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="年份" name="year">
-            <DatePicker 
-              allowClear
-              style={{ width: "150px" }}
-              picker="year"
-            />
-          </Form.Item>
-          <Form.Item label="危害情况" name="isHarm">
-            <NormalSelect
-              allowClear
-              style={{ width: '150px' }}
-              options={[{ label: "无危害 ", value: 0 },{ label: "有危害 ", value: 1 }]} />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/byfz/fzxc/form.js b/src/views/rcgl/byfz/fzxc/form.js
deleted file mode 100644
index 9ac79fb..0000000
--- a/src/views/rcgl/byfz/fzxc/form.js
+++ /dev/null
@@ -1,145 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col, Upload,message,Image } from 'antd';
-import {PaperClipOutlined,DeleteOutlined} from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../service/apiurl';
-const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => {
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [loading, setLoading] = useState(false)
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-     setFileList(info.fileList)
-    }
-    if (info.file.status === "uploading") { 
-        setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-        setLoading(false);
-    }
-     setFileList(info.fileList)
-  }
-
-  const beforeUpload = (file) => {
-    if (fileList.length == 1) {
-      message.error("只能上传一张图片!")
-      return false;
-    }
-    const isJpgOrPng =
-      file.type === 'image/jpeg' ||
-      file.type === 'image/jpg' ||
-      file.type === 'image/png';
-    if (!isJpgOrPng) {
-      message.error('请上传jpeg/png/jpg格式的图片!');
-    }
-    return isJpgOrPng
-  };
-
-  const onFinish = async (values) => {
-    let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-    values.pic = oldFiles[0];
-    delete values.files
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.byfz.fzxc.picSave,values)
-    }
-  }
-
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-}
-  
-  return (
-    <>
-    <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="图片标题"
-                name="picTitle"
-                labelCol={{ span: 3, offset: 0 }}
-                wrapperCol={{span:20,offset:0}}
-                rules={[{ required: true }]}
-              >
-             <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col>
-        
-      </Row>
-      <Row>
-          <Col span={24}>
-          <Form.Item
-                label="图片"
-                name="files"
-                labelCol={{ span: 3, offset: 0 }}
-                wrapperCol={{span:21,offset:0}}
-                rules={[{ required: true }]}
-            >
-               <Upload 
-                name='file'
-                action="/gunshiApp/tsg/termite/pic/file/upload/singleSimple"
-                onChange={fileChange}
-                fileList={fileList}
-                disabled={loading}
-                showUploadList={false}
-                beforeUpload={beforeUpload}
-              >
-                {mode == "view" ? null :
-              <div style={{display:"flex",alignItems:"center",columnGap:10,color:"#4f85ec",cursor:"pointer"}}>
-              <PaperClipOutlined />
-                    <a style={{ cursor: "pointer" }}>上传图片
-                      <span style={{ marginLeft:10,color:"#dfdfdf" }}>(支持扩展名：.jpg .png)</span></a>
-              </div>
-                }
-          </Upload>
-          </Form.Item>  
-          </Col>
-        </Row> 
-        <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item' : 'file-item'}>
-                          <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                        </div>
-                        {mode !== "view" && 
-                          <div
-                            className="delete-icon"
-                            onClick={() => deleteFile(file.response?.data?.fileId)}
-                          >
-                              <DeleteOutlined />
-                          </div>
-                        }
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-        </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/byfz/fzxc/index.js b/src/views/rcgl/byfz/fzxc/index.js
deleted file mode 100644
index 6d3bf55..0000000
--- a/src/views/rcgl/byfz/fzxc/index.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Upload, message,Image,Button,Popconfirm,Modal } from 'antd';
-import {PaperClipOutlined,DownloadOutlined,DeleteOutlined,ExclamationCircleOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import { httpget2,httppost2 } from '../../../../utils/request';
-import "./index.less"
-const { confirm } = Modal;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  console.log("role",role);
-  
-  const uploadBtn = role?.rule?.find(item => item.menuName == "上传") || true;
-  const refModal = useRef();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [loading, setLoading] = useState(false)
-  const [zlList, setZlList] = useState([])
-  const [data, setData] = useState([])
-  const fileType = {
-    "jpg": 'pic',
-    "png": 'pic',
-    "jpeg": 'pic',
-    "gif": 'gif',
-    "xlsx": 'excel',
-    "xls": 'excel',
-    "doc": 'word',
-    "docx": 'word',
-    "ppt": 'PPT',
-    "pptx": 'PPT',
-    "pdf": 'pdf',
-  }
-
-  const iconFile = (name) => {
-    let icon;
-    const type = name.split('.').pop();
-    icon = fileType[type]
-   return icon
-  }
-
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-      getFileList()
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-     }
-    setFileList(info.fileList)
-  }
-
-  const getFileList = async () => {
-    try {
-      const res = await httpget2(apiurl.rcgl.byfz.fzxc.list)
-      if (res.code == 200) {
-        setZlList(res.data)
-
-      }
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const getPicList = async () => {
-    try {
-      const res = await httppost2(apiurl.rcgl.byfz.fzxc.picList)
-      if (res.code == 200) {
-        setData(res.data)
-      }
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/termite/adver/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-
-  const deleteFile = async (id, type) => {
-    const urlRequest = type == "file" ? apiurl.rcgl.byfz.fzxc.delete : apiurl.rcgl.byfz.fzxc.picDelete
-    confirm({
-      title: '删除',
-      icon: <ExclamationCircleOutlined />,
-      content: '确认删除此数据',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk: async() => {
-        try {
-          const res = await httpget2(urlRequest + `/${id}`)
-          if (res.code == 200) {
-            message.success('删除成功');
-            if (type == "file") {
-              getFileList()
-            }
-            if (type == "pic") {
-              getPicList()
-            }
-          }
-        } catch (error) {
-          console.log(error);
-        }
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-   
-  
-  }
-  const bytesToKB = (bytes) => {
-    return (bytes / 1024).toFixed(2);
-  }
- 
-  
-  useEffect(() => {
-    getFileList();
-    getPicList();
-  }, [])
-  return (
-    <>
-       <div className='content-box' style={{height: '100%',display:'flex',padding:'10px',paddingTop:0 }}>
-      <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 90px)',width:'350px', backgroundColor: '#fff',padding:10,marginRight:10 }}>
-        <div className='comomn1-title'>
-            <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-            <span>宣传资料</span>
-            {uploadBtn ? <Upload 
-              name='file'
-              action="/gunshiApp/tsg/termite/adver/file/upload/singleSimple"
-              onChange={fileChange}
-              fileList={fileList}
-              disabled={loading}
-              showUploadList={false}
-            >
-              <div style={{display:"flex",alignItems:"center",columnGap:5,color:"#4f85ec"}}>
-              <PaperClipOutlined />
-                <a style={{cursor:"pointer"}}>上传</a>
-              </div>
-            </Upload> : null}
-        </div>
-          <div className='xczl-list'>
-            {
-               loading ? <span>文件正在上传中，请等待</span> :
-              zlList.length > 0 ? zlList.map(item => (
-                <div className='xczl-item'>
-                <div className='item-left'>
-                  <img alt='' src={`${process.env.PUBLIC_URL}/assets/xyt/rcgl/${iconFile(item.fileName)}.png`} />
-                  <div className='item-name'>
-                      {item?.fileName}
-                      <div style={{fontSize:12,color:"#bfbfbf"}}>{ bytesToKB(item?.fileLength) || ''}KB</div>
-                  </div>
-                    
-                </div>
-                <div className='item-right'>
-                    <DownloadOutlined
-                      style={{ fontSize: 15, cursor: "pointer"}}
-                      title="下载"
-                      onClick={() => download(item.fileId)}
-                    />
-                      <DeleteOutlined
-                        style={{ fontSize: 15, cursor: "pointer" }}
-                        title="删除" 
-                        onClick={() => deleteFile(item.fileId,"file")}
-                      />
-                </div>
-              </div>
-              )):null
-            }
-        </div>
-        </div>
-      <div className='AdcdTreeTableBox' style={{flex:1,overflowX:"auto", backgroundColor: '#fff',padding:6 }}>
-          <div className='comomn1-title'>
-            <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-            <span>宣传图片墙</span>
-            {uploadBtn ?  <Button
-              type="primary"
-              style={{ marginLeft: "auto", marginRight: 100 }}
-              onClick={() => refModal.current.showSave()}
-            >上传</Button> : null}
-           
-          </div>     
-          <div className='pic1-box'>
-         {
-          data.length> 0 ? 
-          data.map(item => {
-            return (
-              <div className='pic-item'>
-                <Image
-                  src={url + item?.pic?.filePath}
-                  style={{
-                    width: 340,
-                    height: 270,
-                    margin:10
-                  }}
-                />
-                <div className='pic-title'>
-                  <span style={{flex:1,textAlign:"center"}}>{item?.picTitle}</span>
-                  <DeleteOutlined
-                    style={{ width: 20, cursor: "pointer" }}
-                    onClick={() => deleteFile(item.id,"pic")}
-                  />
-                </div>
-                </div>
-              )
-          })
-          :
-          <div style={{textAlign: "center", margin: "10%",width:"100%"}}>
-            <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt="" />
-          </div>
-         }
-         </div>
-      </div>
-      
-      <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={getPicList}
-      />
-    </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/byfz/fzxc/index.less b/src/views/rcgl/byfz/fzxc/index.less
deleted file mode 100644
index 5ee3bad..0000000
--- a/src/views/rcgl/byfz/fzxc/index.less
+++ /dev/null
@@ -1,71 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.comomn1-title{
-    display: flex;
-    align-items: center;
-    column-gap: 10px;
-    // padding: 0px 10px;
-}
-.xczl-list{
-    margin-top: 10px;
-    padding: 10px 5px;
-    overflow-y: auto;
-    height: 100%;
-    .xczl-item{
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-bottom: 15px;
-        .item-left{
-            display: flex;
-            column-gap: 10px;
-            align-items: center;
-            img{
-                width: 25px;
-                height: 25px;
-            }
-        }
-        .item-right{
-            display: flex;
-            column-gap: 5px;
-        }
-    }
-}
-
-.pic1-box{
-    width: 100%;
-    display: flex;
-    column-gap: 10px;
-    padding: 5px;
-    flex-wrap: wrap;
-    overflow-y: auto;
-    max-height: calc(100vh - 200px);
-    .pic-item{
-        border: 1px solid #dfdfdf;
-        margin-bottom: 10px;
-        // padding: 10px;
-        .pic-title{
-            display: flex;
-            // justify-content: center;
-            align-items: center;
-            width: 100%;
-            padding: 5px 10px;
-            border-top: 1px solid #dfdfdf;
-        }
-    }
-}
diff --git a/src/views/rcgl/byfz/fzxc/toolbar.js b/src/views/rcgl/byfz/fzxc/toolbar.js
deleted file mode 100644
index e68cf37..0000000
--- a/src/views/rcgl/byfz/fzxc/toolbar.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  console.log("role",role);
-  
-  const addBtn = role?.rule?.find(item => item.menuName == "新增") || true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
- 
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave} type='primary'>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/gcdsj/form.js b/src/views/rcgl/gcdsj/form.js
deleted file mode 100644
index 65c6f6e..0000000
--- a/src/views/rcgl/gcdsj/form.js
+++ /dev/null
@@ -1,297 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../service/apiurl';
-
-import NormalSelect from '../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-import { createCrudService } from '../../../components/crud/_';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.eventsDate = values.eventsDate?moment(values.eventsDate).format("YYYY-MM-DD 00:00:00"):''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.gcdsj.edit,values)
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.rcgl.gcdsj.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="名称"
-                name="name"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="发生日期"
-                name="eventsDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="事件类型"
-                name="eventsType"
-              >
-               <NormalSelect
-                allowClear
-                disabled={mode==='view'}
-                style={{ width: "100%" }}
-                options={[{label:"综合大事记",value:1},{label:"专题大事记",value:2}]}
-               />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="事件内容描述"
-                name="eventsDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-     
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/projectEvents/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/gcdsj/index.js b/src/views/rcgl/gcdsj/index.js
deleted file mode 100644
index ab8807f..0000000
--- a/src/views/rcgl/gcdsj/index.js
+++ /dev/null
@@ -1,223 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑");
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-  const delBtn = role?.rule?.find(item => item.menuName == "删除");
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [isFetch, setIsFetch] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '名称', key: 'name', dataIndex: 'name', width: 250, ellipsis: true },
-    {
-      title: '发生日期', key: 'eventsDate', dataIndex: 'eventsDate', width: 140,
-    },
-    {
-      title: '事件类型', key: 'eventsType', dataIndex: 'eventsType', width: 140,
-      render: (value) => <span>{value == 1 ? "综合大事记" : value == 2 ? "专题大事记" : ''}</span>,
-    },
-    {
-      title: '事件内容描述', key: 'eventsDesc', dataIndex: 'eventsDesc', width: 300},
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.gcdsj.delete + `/${params.id}`);
-    }
-  }
-  
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.gcdsj.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-  setIsFetch(!isFetch)
-}
-
-  
-const viewPdf = (params) => {
-  setIframeSrc(params)
-  setPdfViewOPen(true)
-}
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Tabs defaultActiveKey="1">
-              <Tabs.TabPane tab="列表" key="1">
-                 <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-              </Tabs.TabPane>
-              <Tabs.TabPane tab="时间轴" key="2">
-                <div className='time-line'>
-                  <Timeline>
-                    {tableProps.dataSource.map((item, index) => (
-                      <Timeline.Item key={index}>
-                        <div className='time-line-item'>
-                        <span style={{width:100}}>{item.eventsDate}</span>
-                          <div className='item-right'>
-                            <span>{item.eventsDesc}</span>
-                            <div style={{ display: "flex"}}>
-                              <span>附件：</span>
-                            <Row gutter={[16]} style={{flex:1}}>
-               {
-                  item.files.length > 0 && item.files.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"100%"}}>
-                          <div className='file-description'>
-                          {file.fileName.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.fileName.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.fileName.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.fileName.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file?.filePath} alt='' />
-                            }
-                            <span>{file.fileName}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-                            </Row>
-                            </div>
-                        </div>
-                        </div>
-                      </Timeline.Item>
-                    ))}
-                  </Timeline>
-                 </div>
-              </Tabs.TabPane>
-            </Tabs>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/gcdsj/index.less b/src/views/rcgl/gcdsj/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/gcdsj/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/gcdsj/toolbar.js b/src/views/rcgl/gcdsj/toolbar.js
deleted file mode 100644
index 9b389df..0000000
--- a/src/views/rcgl/gcdsj/toolbar.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="名称" name="name">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="发生日期" name="tm">
-            <RangePicker
-              allowClear
-              showTime 
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khmbgl/Zbform.js b/src/views/rcgl/jdkh/khmbgl/Zbform.js
deleted file mode 100644
index d63dd57..0000000
--- a/src/views/rcgl/jdkh/khmbgl/Zbform.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import React,{useState,useEffect,useRef} from 'react'
-import { Table, Input,Form,Button,Row,Col} from "antd"
-import NormalSelect from '../../../../components/Form/NormalSelect'
-import { getjdTreeData } from '../../../../service/warn';
-import { formItemLayout } from '../../../../components/crud/FormLayoutProps';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {handleData} from "../../../../utils/tools"
-import apiurl from '../../../../service/apiurl';
-
-export default function Zbform({onSubmit,selectKeys}) {
-    const [form] = Form.useForm()
-    const [catogoryData, setCatogoryData] = useState([])
-    const columns = [
-        {
-          title: "考核类目",
-          dataIndex: "name",
-          key:"name",
-          width: 150,
-          align: "center",
-          onCell: (row) => ({ rowSpan: row.rowSpan || 0 })
-        },
-        {
-            title: '指标编号',
-            key: 'indicatorCode',
-            dataIndex: 'indicatorCode',
-            width: 250,
-            align: "center",
-          },
-        {
-          title: '指标名称',
-          key: 'indicatorName',
-          dataIndex: 'indicatorName',
-          width: 250,
-          align: "center",
-        },
-        {
-          title: '标准分数',
-          key: 'standardScore',
-          dataIndex: 'standardScore',
-          width: 100,
-          align: "center",
-        },
-    ]
-    const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.jdkh.khmbgl.choose).find_noCode,{pageSize:9999});
-    const [tableData, setTableData] = useState([])
-    const [selectedRowKeys1, setselectedRowKeys1] = useState([])
-    const [zbTable, setZbtable] = useState({})
-    const selectKeyRef = useRef()
-    const getCatogoryData = async () => {
-        try {
-            const res = await getjdTreeData();
-            setCatogoryData(res.map(item => ({ label: item.name, value: item.id })))
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-   
-    const onfinish = (values) => {
-      const params = {
-            search: {
-              menuId: values.menuId,
-              name: values.name
-          }
-        }
-        search(params)
-    }
-
-       // 选择某行的回调
-  const rowChange1 = (selectedRowKeys, selectedRows, info) => {
-        setselectedRowKeys1([...selectedRowKeys])
-        selectKeyRef.current = selectedRowKeys
-        setZbtable({keys:selectedRowKeys,data:selectedRows})
-  }
-    useEffect(() => {
-        getCatogoryData()
-        search()
-        
-    }, [])
-
- 
-    useEffect(() => {
-        if (tableProps.dataSource.length > 0) {
-            const data = handleData(tableProps.dataSource, "name")
-          setTableData(data)
-     }
-    }, [tableProps.dataSource])
-
-    useEffect(() => {
-        if (selectKeys.length > 0) {
-            setselectedRowKeys1(selectKeys)
-        }
-    }, [selectKeys])
-    
-    
-  return (
-      <div>
-          <Form
-              form={form}
-             {...formItemLayout}
-              onFinish={onfinish}
-          >
-           <Row>
-                  <Col span={9}>
-                    <Form.Item label="考核类目" name="menuId">
-                       <NormalSelect allowClear style={{ width: '100%' }} options={catogoryData} />
-                   </Form.Item>
-                  </Col>
-                  <Col span={9}>
-                  <Form.Item label="指标名称" name="name">
-                      <Input allowClear  style={{width:'100%'}}/>
-                   </Form.Item>
-                  </Col>
-                  <Col span={6}>
-                  <Form.Item >
-                     <Button type="primary" htmlType="submit" style={{marginRight:10}}>查询</Button>
-                     <Button onClick={() => form.resetFields()}>重置</Button>
-                   </Form.Item>
-                  </Col>
-           </Row>
-          </Form>
-          <Table
-              columns={columns}
-              rowKey="id"
-              {...tableProps}
-              dataSource={tableData}
-              scroll={{ y: "calc( 100vh - 400px )"}}
-              pagination={false}
-              rowSelection={{
-                type: "checkbox",
-                onChange: rowChange1,
-                selectedRowKeys: selectedRowKeys1,
-                preserveSelectedRowKeys:true
-              }}
-          />
-           <div style={{display:"flex", marginTop: 10 }}>
-            <Button type='primary' style={{marginLeft:"auto"}} onClick={() =>onSubmit(zbTable)}>提交</Button>
-           </div>
-    </div>
-  )
-}
diff --git a/src/views/rcgl/jdkh/khmbgl/form.js b/src/views/rcgl/jdkh/khmbgl/form.js
deleted file mode 100644
index 8bf395b..0000000
--- a/src/views/rcgl/jdkh/khmbgl/form.js
+++ /dev/null
@@ -1,314 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Table, Col, Popconfirm, InputNumber,Image,Modal,Typography, message} from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import ZbForm from "./Zbform";
-import moment from 'moment';
-import {handleData} from "../../../../utils/tools"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
- console.log("record",record);
- 
-  const columns = [
-    {
-      title: "考核类目",
-      dataIndex: "name",
-      key:"name",
-      width: 150,
-      align: "center",
-      onCell: (row) => ({ rowSpan: row.rowSpan || 0 })
-    },
-    {
-      title: '指标名称',
-      key: 'indicatorName',
-      dataIndex: 'indicatorName',
-      width: 250,
-      align: "center",
-    },
-    {
-      title: '标准分数',
-      key: 'standardScore',
-      dataIndex: 'standardScore',
-      width: 100,
-      align: "center",
-    },
-    {
-      title: '操作', key: 'operation1', width: 240, fixed: 'right', align: 'center',
-      render: (_, record) => {
-        return (
-            <div>
-              <Popconfirm
-                title="确定要删除?"
-                onConfirm={() => handleDelete(record.id)}
-              >
-              <a>删除</a>
-            </Popconfirm>
-            </div> 
-        )
-      },
-    },
-  ]
-
-  const templateFreqOptions = [
-    {
-      label: "年度",
-      value:1
-    },
-    {
-      label: "季度",
-      value:2
-    },
-    {
-      label: "月度",
-      value:3
-    },
-  ]
-  const [form] = Form.useForm();
-  const [standardScore1, setStandardScore] = useState('')
-  const [zbOpen, setZbOpen] = useState(false)
-  const [tableData, setTableData] = useState([])
-  const [selectKeys, setSelectKeys] = useState([])
-  const tableDataRef = useRef(null)
-  tableDataRef.current = tableData;
-  const newColumns = useMemo(() => {
-    let data = columns;
-    if (mode == "view") {
-      data.pop();
-      return data
-    } else {
-      return data;
-    }
-  }, [mode])
-  const handleAddRow = () => {
-    setZbOpen(true)
-   
-  };
-  
-
-  const handleDelete = (key) => {
-    const newData = tableDataRef.current.filter((item) => item.id !== key);
-    newData.forEach(item => {
-      if (item.rowSpan) delete item.rowSpan;
-    })
-    const result = handleData(newData, "name")
-    setTableData(result)
-    setSelectKeys(newData.map(item => item.id))
-    let total = newData.reduce((total,cur) => total + Number(cur.standardScore),0)
-    setStandardScore(total)
-    form.setFieldValue("excellentScore",(total * 0.92).toFixed(2))
-    form.setFieldValue("goodScore",(total * 0.85).toFixed(2))
-    form.setFieldValue("passScore",(total * 0.70).toFixed(2))
-  }; 
-
-
-  const onfinish = (values) => {
-    // 校验等级划分
-    if (values.excellentScore == undefined) {
-      message.error("优秀分数不能为空")
-      return
-    }
-    if (values.goodScore == undefined) {
-      message.error("良好分数不能为空")
-      return
-    }
-    if (values.passScore == undefined) {
-      message.error("合格分数不能为空")
-      return
-    }
-    const userId =  localStorage.getItem('userId')
-    const userName =  localStorage.getItem('userName')
-    values.indicatorIds = selectKeys;
-    values.standardScore = standardScore1;
-    values.createUserId = userId
-    values.createUserName = userName
-    if (mode === 'edit') {
-      onEdit(apiurl.rcgl.jdkh.khmbgl.edit,{...record,...values})
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.jdkh.khmbgl.save,values)
-    }
-  }
-
-
-  const onSubmit = (data) => {
-    setZbOpen(false)
-    // 重新对数据做处理
-    data.data.forEach(item => {
-      if (item?.rowSpan) delete item.rowSpan;
-    })
-    const result = handleData(data.data, "name")
-    let total = data.data.reduce((total,cur) => total + Number(cur.standardScore),0)
-    setStandardScore(total)
-    setTableData(result)
-    setSelectKeys(data.keys)
-    // 自动填充等级划分
-    form.setFieldValue("excellentScore",(total * 0.92).toFixed(2))
-    form.setFieldValue("goodScore",(total * 0.85).toFixed(2))
-    form.setFieldValue("passScore",(total * 0.70).toFixed(2))
- }
- 
-  const getZbTableData = async(id) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.jdkh.khmbgl.info + `/${id}`)
-      if (res.code == 200) {
-        let total = res.data.reduce((total,cur) => total + Number(cur.standardScore),0)
-        setStandardScore(total)
-        setSelectKeys(res.data.map(item => item.id))
-        res.data.forEach(item => {
-          if (item.rowSpan) delete item.rowSpan;
-        })
-        const result = handleData(res.data, "name")
-        setTableData(result)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-  useEffect(() => {
-    if (mode !== "save") { 
-      getZbTableData(record.id)
-    }
-
- }, [record,mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="模板名称"
-                name="templateName"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="考核频次"
-                name="templateFreq"
-              >
-              <NormalSelect disabled={mode==='view'} style={{ width: '100%' }} allowClear options={templateFreqOptions} />
-              </Form.Item>
-          </Col>
-      </Row>
- 
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="考核内容"
-              >
-              <Button
-                type="primary"
-                disabled={mode == "view"}
-                onClick={handleAddRow}
-                style={{ width: '30%' }}>添加指标</Button>
-              </Form.Item>
-          </Col> 
-        </Row>
-      <div style={{display:"flex",justifyContent:"space-between"}}>
-        <span style={{ marginLeft: "auto" }}>标准分数：{ standardScore1}</span>
-      </div>
-      <Table
-          rowKey="id"
-          columns={newColumns}
-          dataSource={tableData}
-          scroll={{ y: "calc( 100vh - 400px )"}}
-          pagination={false}
-        />
-        <Row style={{marginTop:20}}>
-          <Col span={8}>
-            <Form.Item label="等级划分" >
-              <Form.Item label={<span style={{fontWeight:"bold"}}>优秀</span>}  required colon={false}>
-              <Form.Item name="excellentScore" noStyle>
-                  <InputNumber
-                    min={0}
-                    max={standardScore1}
-                    style={{ width: "45%" }}
-                    disabled={mode == "view"}
-                  />
-              </Form.Item>
-              <span className="ant-form-text"> 分及以上</span>
-              </Form.Item>
-            </Form.Item>
-          </Col>
-          <Col span={8}>
-            <Form.Item >
-            <Form.Item label={<span style={{fontWeight:"bold"}}>良好</span>} required colon={false}>
-              <Form.Item name="goodScore" noStyle >
-                  <InputNumber
-                    min={0}
-                    max={standardScore1}
-                    style={{ width: "45%" }}
-                    disabled={mode == "view"}
-                  />
-              </Form.Item>
-              <span className="ant-form-text"> 分及以上</span>
-              </Form.Item>
-            </Form.Item>
-          </Col>
-          <Col span={8}>
-            <Form.Item >
-            <Form.Item label={<span style={{fontWeight:"bold"}}>合格</span>} required colon={false}>
-              <Form.Item name="passScore" noStyle >
-                  <InputNumber
-                    min={0}
-                    max={standardScore1}
-                    style={{ width: "45%" }}
-                    disabled={mode == "view"}
-                  />
-              </Form.Item>
-              <span className="ant-form-text"> 分及以上</span>
-              </Form.Item>
-            </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-         
-          <Form.Item wrapperCol={{span:2,offset:22}}>
-            <Button type="primary" htmlType="submit" >
-                  {mode === 'save' ? '保存' :
-                    '修改'}
-            </Button>
-          </Form.Item>
-       
-        )
-      }
-      </Form>
-
-      <Modal
-        open={zbOpen}
-        width={1000}
-        destroyOnClose
-        footer={null}
-        onCancel={() => {
-          setZbOpen(false)
-        }}
-        title="选择指标"
-      >
-        <ZbForm onSubmit={onSubmit} selectKeys={selectKeys} />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/jdkh/khmbgl/index.js b/src/views/rcgl/jdkh/khmbgl/index.js
deleted file mode 100644
index 33e1eb5..0000000
--- a/src/views/rcgl/jdkh/khmbgl/index.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image,Switch } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
-  const refModal = useRef();
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '模板名称', key: 'templateName', dataIndex: 'templateName', width: 200,align: "center"},
-    {
-      title: '考核频次', key: 'templateFreq', dataIndex: 'templateFreq', width: 200, align: "center",
-      render: (value) => <span>{value == 1? '年度' : value == 2 ? "季度": value == 3 ? "月度" : ''}</span>
-    },
-    {
-      title: '标准分数', key: 'standardScore', dataIndex: 'standardScore', width: 200,align: "center" },
-    {
-      title: '是否启用', key: 'status', dataIndex: 'status', width: 200,align: "center",
-      render: (v, r) => <Switch
-      checkedChildren="启用"
-      unCheckedChildren="禁用"
-      checked={v == 0 ? true : false} onChange={(e) => { 
-        onEdit(apiurl.rcgl.jdkh.khmbgl.stop,{id:r.id, status:e ? 0 : 1})
-      }} />
-    },
-    {title: '创建日期', key: 'createTime', dataIndex: 'createTime', width: 200,align: "center"},
-    {title: '创建人', key: 'indicatorCode', dataIndex: 'createUserName', width: 100,align: "center"},
-
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={(editBtn && !row?.isUsed) ? true : false}
-        del={(delBtn && !row?.isUsed) ? true : false}
-        view={true}
-        command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  const [searchVal, setSearchVal] = useState({})
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-
- 
-  const command = (type) => (params) => {
-    if (type === 'save') {   
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.jdkh.khmbgl.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.jdkh.khmbgl.page).find_noCode);
-
-  const onEdit = (path,values) => {
-    createCrudService(path).edit(values).then((result) => {
-      if (result?.code === 200) {
-        refresh()
-      }
-    })
-  }
-  useEffect(() => {
-    if (searchVal) {
-      let params = {
-        search: {
-           ...searchVal
-          }
-        };
-      search(params)
-    }
-  }, [searchVal]);
-  
-  
-  return (
-    <>
-       <div className='content-box' style={{ backgroundColor: '#fff', height: '100%',padding:'10px' }}>
-      <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-         <Card className='nonebox'>
-          <ToolBar
-              onSave={command('save')}
-              setSearchVal={setSearchVal}
-              role={role}
-          />
-        </Card>
-        <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-      </div>
-      
-      <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-      />
-    </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/jdkh/khmbgl/toolbar.js b/src/views/rcgl/jdkh/khmbgl/toolbar.js
deleted file mode 100644
index 977b0c0..0000000
--- a/src/views/rcgl/jdkh/khmbgl/toolbar.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    setSearchVal({...values});
-  }
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="模板名称" name="name">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-           <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-        {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave} >新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khrwgl/PfDetail.js b/src/views/rcgl/jdkh/khrwgl/PfDetail.js
deleted file mode 100644
index fa3a56b..0000000
--- a/src/views/rcgl/jdkh/khrwgl/PfDetail.js
+++ /dev/null
@@ -1,714 +0,0 @@
-import React,{useState,useEffect,useRef,useContext,useMemo} from 'react'
-import { Table, Radio,Switch,Button,Form,message, InputNumber,DatePicker,Upload,Row,Col,Image,Modal,Input} from "antd"
-import { EditOutlined,DeleteOutlined,EyeOutlined } from '@ant-design/icons';
-import { httpget2, httppost2 } from '../../../../utils/request'
-import { handleData } from "../../../../utils/tools"
-import apiurl from '../../../../service/apiurl'
-import PfViewModal from "./pfViewModal"
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import moment from 'moment'
-const { Dragger } = Upload;
-
-export default function PfDetail({ record, Item, refresh, onCancel,tabs }) {
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-    const EditableContext = React.createContext(null);
-const EditableRow = ({ index, ...props }) => {
-  const [form] = Form.useForm();
-  return (
-    <Form form={form} component={false}>
-      <EditableContext.Provider value={form}>
-        <tr {...props} />
-      </EditableContext.Provider>
-    </Form>
-  );
-};
-    const EditableCell = ({
-        title,
-        editable,
-        children,
-        dataIndex,
-        record,
-        handleSave,
-        ...restProps
-      }) => {
-        const [editing, setEditing] = useState(false);
-        const inputRef = useRef(null);
-        const form = useContext(EditableContext);
-        useEffect(() => {
-          if (editing) {
-            inputRef.current.focus();
-          }
-        }, [editing]);
-        const toggleEdit = () => {
-            if(Item.view) return
-          setEditing(!editing);
-          form.setFieldsValue({
-            [dataIndex]: record[dataIndex],
-          });
-        };
-        const save = async () => {
-          try {
-            const values = await form.validateFields();
-              toggleEdit();
-            handleSave({
-              ...record,
-              ...values,
-            });
-          } catch (errInfo) {
-            console.log('Save failed:', errInfo);
-          }
-        };
-        let childNode = children;
-        if (editable) {
-          childNode = editing ? (
-           <Form form={form}>
-            <Form.Item
-              style={{
-                margin: 0,
-              }}
-              name={dataIndex}
-            >
-              <InputNumber min={0} max={record?.standardScore} controls={false} ref={inputRef} onPressEnter={save} onBlur={save} />
-            </Form.Item>
-                  
-           </Form> 
-          ) : (
-            <div
-              className="editable-cell-value-wrap"
-              style={{
-                paddingRight: 24,
-              }}
-              onClick={toggleEdit}
-            >
-              {children}
-            </div>
-          );
-        }
-        return <td {...restProps}>{childNode}</td>;
-    };
-    
-     // 总分
-  const [tableData, setTableData] = useState([])
-     const score = useMemo(() => tableData?.reduce((total, cur) => total + (cur?.assessScore ?? 0), 0), [tableData]);
-    const columns = [
-        {
-          title: "考核类目",
-          dataIndex: "name",
-          key:"name",
-          width: 150,
-          align: "center",
-          onCell: (row) => ({ rowSpan: row.rowSpan || 0 })
-        },
-        {
-          title: '指标名称',
-          key: 'indicatorName',
-          dataIndex: 'indicatorName',
-          width: 200,
-          align: "center",
-        },
-        {
-          title: '标准分数',
-          key: 'standardScore',
-          dataIndex: 'standardScore',
-          width: 70,
-          align: "center",
-        },
-        {
-            title: `考核得分(${score ?? ''})`,
-            key: 'assessScore',
-            dataIndex: 'assessScore',
-            width: 80,
-            align: "center",
-            editable: true,
-        },
-        {
-            title: '是否需要整改',
-            key: 'isNeedRectify1',
-            dataIndex: 'isNeedRectify1',
-            width: 150,
-            align: "center",
-            render: (text, row) => {
-              const checked = compareScore(row) 
-                return (
-                    <>
-                    <Switch
-                        checkedChildren="是"
-                        unCheckedChildren="否"
-                        checked={checked}
-                    />
-                    
-                    {(checked && !Item.view) ? <EditOutlined
-                        title='编辑'
-                        style={{ marginLeft: 10, cursor: 'pointer' }}
-                        onClick={() => { zgCallback(row) }}
-                    /> : (checked && Item.view) ?
-                        <EyeOutlined
-                            title='查看'
-                            style={{ marginLeft: 10, cursor: 'pointer' }}
-                            onClick={() => { zgView(row) }}
-                        /> : null
-                    }
-                   
-                    </>
-                )
-            }
-        },
-    ]
-    const components = {
-        body: {
-          row: EditableRow,  
-          cell: EditableCell,
-        },
-      };
-    const newcolumns = columns.map((col) => {
-        if (!col.editable) {
-          return col;
-        }
-        return {
-          ...col,
-          onCell: (record) => ({
-            record,
-            editable: col.editable,
-            dataIndex: col.dataIndex,
-            title: col.title,
-            handleSave,
-          }),
-        };
-    });
-    const handleSave = (row) => {
-        const newData = [...tableData];
-        const index = newData.findIndex((item) => row.id === item.id);
-        const item = newData[index];
-        newData.splice(index, 1, {
-          ...item,
-          ...row,
-        });
-        setTableData(newData);
-        tableDataRef.current = newData
-    };
-
-
-    const tableDataRef = useRef(null)
-    const getZbTableData = async (id, type) => {
-        const url = type == 1 ? apiurl.rcgl.jdkh.khmbgl.info :
-            apiurl.rcgl.jdkh.khrwgl.pfDetail 
-        try {
-          const res = await httpget2(url + `/${id}`)
-          if (res.code == 200) {
-            res.data.forEach(item => {
-              if (item.rowSpan) delete item.rowSpan;
-            })
-            const result = handleData(res.data, "name")
-              setTableData(result)
-              tableDataRef.current = result;
-          }
-        } catch (error) {
-          console.log(error);
-        }
-    }
-      
-    // 分数进行比较
-    const compareScore = (row) => {
-        let isBelowStandard = false;
-        if (Item.tabs != 2) {
-            isBelowStandard = row.standardScore > row.assessScore ? true : false;
-            return isBelowStandard;
-        } else {
-            for (let i = 0; row[`assessScore${i}`] !== undefined; i++) {
-                if (row[`assessScore${i}`] < row.standardScore) {
-                    isBelowStandard = true;
-                    break;
-                }
-            }
-        }
-        return isBelowStandard
-    }
-    // 处理清单任务查看详情
-    const handleTableData = (obj) => {
-        let rrlts = {};
-        const arr = Object.values(obj).map(item => {
-            item.map((it, index) => {
-                it['teamUserName' + index] = it.teamUserName;
-                it['assessScore' + index] = it.assessScore;
-                it['problemDesc' + index] = it.problemDesc;
-                it['rectifyRequirement' + index] = it.rectifyRequirement;
-                it['rectifyLastDate' + index] = it.rectifyLastDate;
-                it['files' + index] = it.files;
-                it["count"] = index +1;
-                rrlts = { ...rrlts, ...it }
-            })
-            return rrlts
-        })
-        return arr
-    }
-
-    const handleTableData2 = (obj) => {
-      const names = Object.values(obj)?.[0]?.map(o=>o.teamUserName)
-      const obj2 = {}
-      for(let key in obj){
-        const arr = []
-        names?.map((name)=>{
-          obj?.[key]?.map((item)=>{
-            if(name===item.teamUserName){
-              arr.push(item)
-            }
-          })
-        })
-        obj2[key] = arr
-      }
-      return obj2
-    }
-    // 获取清单查看数据
-    const [qdColumns, setQdColumns] = useState(newcolumns)
-    const [qdWidth, setQdWidth] = useState()
-    const getQdViewData = async (id) => {
-        try {
-            const res = await httpget2(apiurl.rcgl.jdkh.khrwgl.qdView + `/${id}`)
-            if (res.code == 200) {
-                const linshi = handleTableData2(res.data)//将接口里用户的顺序统一
-                const result = handleTableData(linshi);
-                const insertCols = [];
-                 result.forEach((item, index, arr) => {
-                    const total  = arr?.reduce((total, cur) => total + (cur["assessScore" + index] || 0), 0)
-                    if (item["teamUserName" + index]) {
-                        insertCols.push( {
-                            title: item['teamUserName' + index] + `(${total})`,
-                            key: "assessScore" + index,
-                            dataIndex: "assessScore" + index,
-                            width: 80,
-                            align: "center",
-                        })
-                    }
-                 })
-                // 综合得分
-                const zfScore = result?.reduce((total,cur) => total + (cur?.indicatorScore || 0),0 )
-                insertCols.push({
-                    title: "综合得分" +  `(${zfScore})`,
-                    key: "indicatorScore",
-                    dataIndex: "indicatorScore",
-                    width: 100,
-                    align: "center",
-                    render: (v, r) => (
-                        <div style={{display:"flex",columnGap:10,justifyContent:"center"}}>
-                            <span>{record?.scoreWay ==1 ? "取最低": record?.scoreWay ==2 ? "平均" : ''}</span>
-                            <span>{v}</span>
-                        </div>
-                    )
-                })
-                columns.splice(3, 1, ...insertCols)
-                const width = columns?.reduce((total, cur) => total + (cur?.width || 0), 0);
-                setQdWidth(width)
-                setQdColumns(columns)
-                result.forEach(item => {
-                    if (item.rowSpan) delete item.rowSpan;
-                  })
-                const newData = handleData(result, "name")
-                setTableData(newData)
-             
-            }
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-
-    // 重置评分
-    const resetPf = () => {
-        const newData = [...tableData];
-        newData.forEach(item => {
-            item.assessScore = ''
-        })
-        setTableData(newData)
-        tableDataRef.current = newData
-    }
-   
-    // 保存评分
-    const savepf = async () => {
-        const params = {
-            taskId: record.id,
-            score,
-            ratings: tableData.map(item => ({
-                indicatorId: item.indicatorId,
-                standardScore: item.standardScore,
-                assessScore: item.assessScore,
-                teamId: Item.id,
-                isNeedRectify: item.isNeedRectify || 0,
-                problemDesc: item.problemDesc,
-                rectifyRequirement: item.rectifyRequirement,
-                rectifyLastDate: item.rectifyLastDate,
-                files: item.files,
-                fileList:undefined,
-                rectifyStatus:0
-            }))
-        }
-        try {
-            const res =await httppost2(apiurl.rcgl.jdkh.khrwgl.savePf, params)
-            if (res.code == 200) {
-                message.success("保存成功")
-                refresh()
-            } else {
-                message.error("保存失败")
-            }
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    // 确认完成
-  const confirm = async () => {
-    const ratings = tableData.some(item => item.standardScore > item.assessScore && !item.problemDesc)
-    debugger
-    if (ratings) {
-      message.error("存在未填报整改要求问题")
-      return
-    }
-        const params = {
-            taskId: record.id,
-            score,
-            ratings: tableData.map(item => ({
-                indicatorId: item.indicatorId,
-                standardScore: item.standardScore,
-                assessScore: item.assessScore,
-                teamId: Item.id,
-                isNeedRectify: item.isNeedRectify || 0,
-                problemDesc: item.problemDesc,
-                rectifyRequirement: item.rectifyRequirement,
-                rectifyLastDate: item.rectifyLastDate,
-                files: item.files,
-                fileList:undefined,
-                rectifyStatus:0
-            }))
-      }
-        if(tableData.length>0){
-          let flag = true //fasle有未评分的
-          params.ratings?.map((item)=>{
-            if(item.assessScore==null){
-              flag = false
-            }
-          })
-          if(!flag){
-            message.error('请输入全部考核评分')
-            return
-          }
-        }
-        try {
-            const res = await httppost2(apiurl.rcgl.jdkh.khrwgl.confirmpf, params)
-            if (res.code == 200) { 
-                message.success("评分完成")
-                refresh()
-                onCancel()
-            }
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-
-    // 查看评分详情
-    const [zgViewOpen, setzgViewOpen] = useState(false)
-    const zgView = (record) => {
-        setzgViewOpen(true)
-        setZgItem(record)
-    }
-   const [clickItem, setClickItem] = useState()
-    // 点击某一行的回调
-  const handleRowClick = (record) => {
-        setClickItem(record)
-    }
-    const handleRadioChange = (e) => {
-      if (e.target.value == 1) {
-        if (tabs == 2) {
-          getQdViewData(Item?.id)
-        } else {
-          getZbTableData(Item?.id,2)
-        }
-      } else {
-        const newData = tabs == 2 ? tableData.filter(item => item.standardScore > item.indicatorScore) :
-        tableData.filter(item => item.standardScore > item.assessScore)
-        newData.forEach(item => {
-          if (item.rowSpan) delete item.rowSpan;
-        })
-      const res = handleData(newData, "name")
-          setTableData(res);
-      }
-    }
-
-    // 整改
-    const [zgOpen, setZgOpen] = useState(false)
-    const [form1] = Form.useForm();
-    const [loading, setLoading] = useState(false)
-    const [imgloading, setImgLoading] = useState(false)
-    const [imgfileList, setImgFileList] = useState([]) //上传文件列表
-
-  const [zgItem, setZgItem] = useState("")
-  const zgCallback = (e) => {
-    
-        setZgOpen(true)
-        setZgItem(e)  
-    }
-
-    const imgbeforeUpload = (file) => {
-        const isJpgOrPng =
-          file.type === 'image/jpeg' ||
-          file.type === 'image/jpg' ||
-          file.type === 'image/png';
-        
-        if (!isJpgOrPng) {
-          message.error('请上传图片格式的文件！');
-        }
-        const isLt2M = file.size / 1024 / 1024 < 5;
-        if (!isLt2M) {
-          message.error('图片大小需小于5M!');
-        }
-        return isJpgOrPng && isLt2M ? true : Upload.LIST_IGNORE;
-      };
-    const imgdeleteFile = (fileId) => {
-        let filterFile = imgfileList.filter(item => item.response?.data?.fileId !== fileId);
-        setImgFileList(filterFile)
-      }
-      const imgfileChange = (info) => {
-        console.log("info",info);
-        if (info.file.status === "done") {
-          setImgLoading(false);
-        }
-        if (info.file.status === "uploading") {
-          setImgLoading(true);
-        }
-        if (info.file.status === "error") {
-          message.error("文件上传失败")
-          setImgLoading(false);
-        }
-        setImgFileList(info.fileList)
-    }
-    // 整改数据
-  const onfinish = (values) => {
-   
-        let files = imgfileList.map(item => ({ fileId: item.response?.data?.fileId }))
-        values.files = files;
-        values.isNeedRectify = 1;
-        values.fileList = imgfileList.map(item => item.response.data);
-        const newData = tableData.map(item => {
-            if (item.id == zgItem.id) {
-                return {...item, ...values}
-            } else {
-                return item
-            }
-        })
-        setTableData(newData)
-        setZgOpen(false)
-        setZgItem("")
-        form1.resetFields();
-    }
-  
-    // 获取指标表格数据
-    useEffect(() => {
-        // if (Item.type != "start") {
-        //     if (tabs == 2) {
-        //         getQdViewData(Item?.id)
-        //     } else {
-        //         getZbTableData(Item?.id,2)
-        //     }
-        // } else {
-        //     getZbTableData(record?.templateId,1)
-            
-      // }
-          if (tabs == 2) {
-                getQdViewData(Item?.id)
-            } else {
-                getZbTableData(Item?.id,2)
-            }
-    }, [record, Item])
-    
-    useEffect(() => {
-        const file = zgItem?.fileList ? zgItem.fileList : zgItem.files
-        if (file) {   
-          const imgFile = file?.map(o => ({
-            name: o.fileName,
-            response: {
-                  data: {
-                    filePath: o.filePath,
-                    fileId:o.fileId
-                  }
-                },
-        }))
-        setImgFileList(imgFile)
-        } else {
-            setImgFileList([])
-        }
-        form1.setFieldsValue({...zgItem})
-      }, [zgItem])
-  
-  return (
-      <div>
-        <Radio.Group style={{marginBottom:10}} defaultValue={1} onChange={(e) => handleRadioChange(e)}>
-                  <Radio value={1}>显示全部</Radio>
-                  <Radio value={2}>仅显示扣分项目</Radio>
-          </Radio.Group>
-        <Table
-          components={components}
-          rowKey="id"
-          columns={Item?.tabs != 2 ?newcolumns :qdColumns }
-          dataSource={tableData}
-          scroll={{x:Item?.tabs != 2 ? 500: qdWidth, y: "calc( 100vh - 400px )"}}
-          pagination={false}
-          onRow={(record, rowIndex) => {
-            return {
-                onClick: () => handleRowClick(record),
-                onDoubleClick:(record, rowIndex) => setClickItem()
-            };
-              }}
-          />
-          {clickItem ? <div style={{backgroundColor:"#f2f2f2",marginTop:20,padding:10}}>
-              {clickItem?.indicatorRatings?.map(item => (
-                  <div key={item.id}>
-                      <div>【{clickItem?.indicatorName}】</div>
-                  <div>{item?.ratingDesc}（{item?.standardScore}）</div>
-                </div>
-            ))}
-          </div> : null}
-          {!Item?.view ? 
-          <div className='btns' style={{display:"flex",marginTop:40,justifyContent:"space-between"}}>
-              <Button type="primary" onClick={resetPf}>重置评分</Button>
-              <div style={{display:"flex",columnGap:10}}>
-                 <Button type="primary" onClick={onCancel}>取消</Button>
-                 <Button onClick={savepf}>保存</Button>
-                 <Button type="primary" onClick={confirm}>确认完成</Button>
-              </div>
-          </div> 
-              :
-              <div className='btns' style={{display:"flex",marginTop:40,justifyContent:"flex-end"}}>
-                  <Button onClick={onCancel} type='primary'>关闭</Button>
-                  </div>
-          }
-
-          {/* 整改 */}
-          <Modal
-              open={zgOpen}
-              width={800}
-              footer={null}
-              onCancel={() => { setZgOpen(false);form1.resetFields(); }}
-              title="整改详情"
-              destroyOnClose={true}
-          >
-              <Form
-                  form={form1}
-                  {...formItemLayout}
-                  onFinish={onfinish}
-                //   initialValues={zgItem}
-              >
-                  <Row>
-                <Col span={24}>
-                  <Form.Item
-                    label="问题描述"
-                    name="problemDesc"
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 19 }}
-                    rules={[
-                      {
-                        required: true,
-                      },
-                    ]}
-                  >
-                  <Input.TextArea  style={{width:'100%',minHeight:'100px'}} allowClear />
-                  </Form.Item>
-              </Col>  
-                  </Row>
-                  <Row>
-                <Col span={24}>
-                  <Form.Item
-                    label="整改要求"
-                    name="rectifyRequirement"
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 19 }}
-                  >
-                  <Input.TextArea  style={{width:'100%',minHeight:'100px'}} allowClear />
-                  </Form.Item>
-              </Col>  
-                  </Row>
-                  <Row>
-          <Col span={12}>
-              <Form.Item
-                label="整改期限"
-                name="rectifyLastDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker  format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-                  </Row>
-                  <Row>
-          <Col span={24}>
-              <Form.Item
-                label="现场图片"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-            
-                <Dragger
-                name='file'
-                action="/gunshiApp/tsg/assessTeamRating/file/upload/singleSimple"
-                onChange={imgfileChange}
-                beforeUpload={imgbeforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={imgfileList}
-                  disabled={imgloading}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.jpg .png 
-                </p>
-              </Dragger>
-              
-              <Row gutter={[16]}>
-                {
-                   loading ? <span>文件正在上传中，请等待</span> :
-                  imgfileList.length > 0 && imgfileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={'file-item'}  >
-                        <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                          </div>
-                        <div
-                          className={'delete-icon'}
-                          onClick={() => imgdeleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined
-                          />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-
-              </Row>
-              </Form.Item>
-          </Col>
-                  </Row>
-                  <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-               提交
-            </Button>
-          </Form.Item>
-              </Form>
-          </Modal>
-
-          {/* 评分详情中整改的详情查看 */}
-          <Modal
-            open={zgViewOpen}
-            width={800}
-            footer={null}
-            onCancel={() => { setzgViewOpen(false); ;setZgItem('');}}
-            title="查看"
-            destroyOnClose
-            wrapClassName='zgview-modal'
-          >
-              <PfViewModal zgItem={zgItem} record={Item} onCancel={() => {setzgViewOpen(false); ;setZgItem('');}} />
-          </Modal>
-    </div>
-  )
-}
diff --git a/src/views/rcgl/jdkh/khrwgl/form.js b/src/views/rcgl/jdkh/khrwgl/form.js
deleted file mode 100644
index 6cbe617..0000000
--- a/src/views/rcgl/jdkh/khrwgl/form.js
+++ /dev/null
@@ -1,787 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, TreeSelect,message,Image,Modal,Radio ,Transfer } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined,UserOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import MbForm from "./mbForm"
-import PersonForm from './transfer';
-import "./index.less"
-import moment from 'moment';
-import {getCurrentQuarter,convertQuarterToDate,getQuarterStartEndDates} from "../../../../utils/tools"
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const taskFreq = [
-    {label:"年度",value:1},
-    {label:"季度",value:2},
-    {label:"月度",value:3},
-  ]
-
-  const columns = [
-    {
-      title: '考核对象',
-      dataIndex: 'objectUserName',
-      key: 'objectUserName',
-      align: "center",
-      width: 200,
-    },
-    {
-      title: '标准得分',
-      dataIndex: 'standardScore',
-      align:"center",
-      key: 'standardScore',
-      width:200
-    },
-    {
-      title: '考核模版',
-      dataIndex: 'templateName',
-      align:"center",
-      key: 'templateName',
-      width: 200,
-      render: (v, r) => <a onClick={() => {templateModal(r)}}>{v}</a>
-    },
- 
-    {
-      title: '操作',
-      dataIndex: 'operator',
-      align:"center",
-      key: 'operator',
-      width: 200,
-      render:(value,record) => <a onClick={() =>deleteObject(record)}>删除</a>
-    },
-  ];
-
-  const newColumns = useMemo(() => {
-    if (mode == "view") {
-      const news = columns;
-      news.pop();
-      news.unshift({
-          title: '序号',
-          dataIndex: 'inxs',
-          key: 'inxs',
-          align: "center",
-          width: 60,
-        render: (v, record, i) => <span>{i + 1}</span>
-      })
-     
-      
-      return news;
-    } else {
-      return columns;
-    }
-  },[mode])
-  const [treeValue, setTreeValue] = useState([])
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const [form] = Form.useForm();
-  const [freq, setFreq] = useState()
-  const [transferOpen, setTransferOpen] = useState(false)
-
-
-  const [deptList, setDeptList] = useState([])
-  const [deptUserList, setDeptUserList] = useState([])
-
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-
-
-  const onfinish = (values) => {
-    const userId = localStorage.getItem('userId')
-    const userName = localStorage.getItem('userName')
-    values.createTime = values.createTime?moment(values.createTime).format("YYYY-MM-DD 00:00:00"):''
-    values.createUserId = userId;
-    values.createUserName = userName;
-    const filterTemplate = templateList.find(item => item.id == values.templateId);
-    values.assessObjects = values.assessObjects.map(o => {
-      const filterData = deptUserList.find(item => item.userId == o);
-      return {
-        objectUserId: filterData.userId,
-        objectUserName: filterData.nickName,
-        standardScore: filterTemplate.standardScore
-      }
-    })
-    values.assessTeams = values.assessTeams.map(o => {
-      const filterData = deptUserList.find(item => item.userId == o);
-      return {
-        teamUserId: filterData.userId,
-        teamUserName: filterData.nickName,
-        standardScore: filterTemplate.standardScore
-      }
-    })
-    let files = fileList?.map(item => ({ fileId: item.response?.data?.fileId }));
-    values.files = files;
-    if (mode === 'edit') {
-      onEdit(apiurl.rcgl.jdkh.khrwgl.edit, { ...record, ...values });
-    }
-    if (mode === 'save') {
-      values.startDate = values.dateRangeSo[0];
-      values.endDate = values.dateRangeSo[1];
-      onSave(apiurl.rcgl.jdkh.khrwgl.save,values)
-    }
-  }
-
- 
-  // 获取部门数据
-  const getDeptList = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist);
-      if (result.code == 200) {
-        setDeptList(result.data);
-        getDeptUser()
-      }
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-   // 获取部门人员数据
-   const getDeptUser = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:9999});
-      if (result.code == 200) {
-        setDeptUserList(result.rows)
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  const buildTree = (data, parentId) => {
-    let tree = [];
-    data.forEach((node) => {
-        node.title = node.deptName;
-        node.key = node.deptId;
-        
-        if (node.parentId === parentId) {
-        let children = buildTree(data, node.deptId);
-        if (children.length) {
-            node.children = children;
-        }
-        tree.push(node);
-        }
-    });
-    return tree;
-}
-  const handleTreeList = (dept, user) => {
-    const deptArr = dept.map(item => {
-      return {
-        ...item,
-        value: item.deptId,
-        title: item.deptName,
-        // disabled: item.userId ? false : true,
-        children: user.filter(u => u.deptId == item.deptId).map(u => ({
-          ...u,
-          value: u.userId,
-          title: u.nickName,
-        }))
-      }
-    }) 
-    const treelist = buildTree(deptArr, 0)
-    return treelist
-  }
-  const treeList = useMemo(() => {
-    if (deptUserList?.length > 0 && deptList?.length > 0) {
-        return handleTreeList(deptList,deptUserList)
-    } else {
-      return []
-    }
-  }, [deptUserList, deptList])
-
-   /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-   const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/assessTask/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-
-     /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-     const deleteFile = (fileId) => {
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-  }
-  const [templateList, setTemplateList] = useState([])
-  // 根据考核频次获取考核模版
-  const getTemplateList = async(freq=3) => {
-    try {
-      const result = await httppost2(apiurl.rcgl.jdkh.khrwgl.templateList + `/${freq}`);
-      if (result.code == 200) {
-        setTemplateList(result.data.map(item => ({...item,label:item.templateName, value:item.id,templateId:item.id})))
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const [khTableData, setkhTableData] = useState([])
-  const [taskType, setTaskType] = useState(2)
-  const khTableDataRef = useRef(null);
-  khTableDataRef.current = khTableData;
-  const onvaluesChange = (changedValues, allValues) => { 
-    if (allValues.templateId && allValues?.assessObjects?.length > 0) {
-      const filterData = templateList.find(item => item.id == allValues.templateId);
-      const khObject = allValues.assessObjects.map(item => {
-        let objectUserName = deptUserList.find(o => o.userId == item)?.nickName
-        return { objectUserName, ...filterData,id: item }
-      })
-      setkhTableData(khObject)
-    } else {
-      setkhTableData([])
-    }
-    if ("taskFreq" in changedValues) {
-      setTaskType(changedValues["taskFreq"]);
-    }
-    if ("assessBatch" in changedValues) {
-      console.log(moment(changedValues["assessBatch"]).endOf('days').format("YYYY-MM-DD"));
-      
-      const assessBatchData = convertQuarterToDate(changedValues["assessBatch"]);
-      const assessBatchValues = taskType == 2 ? assessBatchData.startDate : changedValues["assessBatch"]
-      
-      const taskName = taskType == 2 ? getCurrentQuarter(assessBatchData.startDate).name : 
-        taskType == 1 ? `${changedValues["assessBatch"]}年考核` :`${moment(changedValues["assessBatch"]).year()}年${moment(changedValues["assessBatch"]).month() + 1}月考核`
-      const date = taskType == 2 ?
-        [moment(assessBatchData.startDate), moment(assessBatchData.endDate)] : 
-        taskType == 1 ? [moment(changedValues["assessBatch"]).startOf('year'), moment(changedValues["assessBatch"]).endOf('year')] :
-          [moment(changedValues["assessBatch"]).startOf('month'), moment(changedValues["assessBatch"]).endOf('month')]
-      form.setFieldValue("assessBatch", assessBatchValues)
-      form.setFieldValue("taskName", taskName)
-      form.setFieldValue("dateRangeSo",date)
-    }
-  };
-
-   // 删除考核对象
-  const deleteObject = (record) => {
-    const filterData = khTableDataRef.current.filter(item => item.id != record.id)
-    const value = filterData.map(item =>item.id)
-    form.setFieldValue("assessObjects", value)
-    setTreeValue(value)
-     setkhTableData(filterData)
-  }
-  // 获取考核成员
-  const getKhMember = async(id) => {
-    try {
-      const result = await httpget2(apiurl.rcgl.jdkh.khrwgl.detail + `/${id}`);
-      if (result.code == 200) {
-        const ids = result.data.assessTeams.map(item => item.teamUserId - 0)
-        form.setFieldValue("assessTeams", ids)
-        setkhTableData(result.data.assessObjects?.map(item => ({...item,templateName:result.data?.templateName,templateId:result?.data.templateId})))
-        const file = result.data.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-        }))
-        setFileList(file)
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-const [selectPerson, setSelectPerson] = useState([])
-  const handlePerson = (e) => {
-    
-    setTransferOpen(false)
-    setSelectPerson(e)
-    const name = e.map(o => {
-      const arr = deptList.find(item => item.deptId == o)?.deptName
-      return arr;
-    })
-
-    form.setFieldValue("assessTeams", name)
-  }
-
-
-  // 考核模版显示
-  const [mbOpen, setMbOpen] = useState(false)
-  const [mbItem, setMbItem] = useState({})
-  const templateModal = (v) => {
-    setMbOpen(true)
-    setMbItem(v)
-  }
-  useEffect(() => {
-    if (freq) {
-      setkhTableData([])
-      form.setFieldValue("templateId", '')
-      getTemplateList(freq)
-  }
-}, [freq])
-
-
-  useEffect(() => {
-    if (mode == "save") {
-      const name = localStorage.getItem('userName')
-      form.setFieldValue("createUserName", name)
-      form.setFieldValue("createTime", moment())
-      form.setFieldValue("taskFreq", 2)
-    } else {
-      form.setFieldValue("assessObjects", record.assessObjects.map(item => item.objectUserId - 0))
-      form.setFieldValue("dateRangeSo", [moment(record.startDate), moment(record.endDate)])
-      console.log("record",record);
-      getKhMember(record.id)
-      getTemplateList(record.taskFreq)
-      setTaskType(record.taskFreq)
-   }
-   
- }, [mode,record])
-  
-  
- useEffect(() => {
-   getDeptList()
- }, [])
-  
-  useEffect(() => {
-    if (mode == "save") {
-      if (taskType == 2) {
-        getTemplateList(taskType)
-        const { startDate, endDate } = getQuarterStartEndDates(getCurrentQuarter('').value, moment().year());
-        form.setFieldValue("assessBatch", moment())
-        form.setFieldValue("taskName", getCurrentQuarter('').name)
-        form.setFieldValue("dateRangeSo",[moment(startDate), moment(endDate)])
-      } else if (taskType == 1) { 
-        form.setFieldValue("assessBatch", moment())
-        form.setFieldValue("taskName", `${moment().year()}年考核`)
-        form.setFieldValue("dateRangeSo",[moment().startOf('year'), moment().endOf('year')])
-      } else {
-        form.setFieldValue("assessBatch", moment().format('YYYY-MM-DD'))
-        form.setFieldValue("taskName", `${moment().year()}年${moment().month() + 1}月考核`)
-        form.setFieldValue("dateRangeSo",[moment().startOf('month'), moment().endOf('month')])
-      }
-    }
-  }, [taskType,mode])
-  
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-        onValuesChange={onvaluesChange}
-      >
-      <Row> 
-          <Col span={12}>
-              <Form.Item
-                label="考核频次"
-                name="taskFreq"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect
-                disabled={mode == "view"}
-                style={{ width: '100%' }}
-                allowClear
-                options={taskFreq}
-                onChange={(e) => setFreq(e)}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="综合得分计算方式"
-                name="scoreWay"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-                labelCol={{style: {marginLeft:-20}}}
-              >
-                <Radio.Group disabled={mode === 'view'} >
-                  <Radio value={1}>取最低</Radio>
-                  <Radio value={2}>平均</Radio>
-              </Radio.Group>
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="考核批次"
-                name="assessBatch"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <DatePicker
-                disabled={mode === 'view'}
-                // format={'YYYY-MM-DD'}
-                style={{ width: '100%' }}
-                allowClear
-                picker={taskType == 2 ? "quarter" : taskType == 1 ? "year" : "month"}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="考核任务名称"
-                name="taskName"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={12}>
-      <Form.Item
-            label="考核周期"
-            name="dateRangeSo"
-            rules={[
-              {
-                required: true,
-              },
-            ]}
-            getValueFromEvent={(e,dateString) => dateString}
-            getValueProps={(value) => {
-              return {
-                value: value ? [value[0]&&moment(value[0]),value[1]&&moment(value[1])] : undefined
-              };
-              }}
-          >
-            <RangePicker
-              allowClear
-              style={{ width: '100%' }}
-              format={'YYYY-MM-DD'}
-              disabled={mode === 'view'}
-            />
-          </Form.Item>
-          </Col>
-          {mode != "view" ? 
-            <Col span={12}>
-            <Form.Item
-              label="考核模板"
-              name="templateId"
-              rules={[
-                {
-                  required: true,
-                },
-              ]}
-            >
-            <NormalSelect
-              disabled={mode === 'view'}
-              style={{ width: '100%' }}
-              allowClear
-              options={templateList}
-              // fieldNames={{ label: "templateName",value:"id" }}
-            />
-            </Form.Item>
-        </Col> : null
-          }
-      </Row>          
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                   label="考核对象"
-                   name="assessObjects"
-                   labelCol={{ span: 3 }}
-                   wrapperCol={{ span: 19 }}
-                   rules={[
-                    {
-                      required: true,
-                    },
-                  ]}
-              >
-                <TreeSelect
-                   treeCheckable={true}
-                   showSearch
-                   disabled={mode==='view'}
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-                   treeData={treeList}
-                   treeNodeFilterProp='title'
-                  //  value={["1","33"]}
-                   onChange={(e) => { setTreeValue(e)}}
-               />
-              </Form.Item>
-          </Col>  
-        </Row>
-           <Row>
-           <Col span={24}>
-               <Form.Item
-                    label="考核组成员"
-                    name="assessTeams"
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 19 }}
-                    rules={[
-                      {
-                        required: true,
-                      },
-                    ]}
-               >
-                 <TreeSelect
-                    treeCheckable={true}
-                    showSearch
-                    disabled={mode==='view'}
-                    style={{
-                      width: '100%',
-                    }}
-                    dropdownStyle={{
-                      maxHeight: 400,
-                      overflow: 'auto',
-                    }}
-                    allowClear
-                    treeDefaultExpandAll
-                    treeData={treeList}
-                    treeNodeFilterProp='title'
-                />
-              {/* <Input 
-                  suffix={
-                  <UserOutlined
-                    style={{ cursor: 'pointer' }}
-                    onClick={person}
-                  />}
-                  allowClear
-                  disabled={mode==='view'}
-                  // onFocus={() => setTransferOpen(true)}
-                /> */}
-               </Form.Item>
-           </Col>  
-         </Row> 
-        <Row>
-          <Col span={12}>
-          <Form.Item
-                label="创建人"
-                name="createUserName"
-              >
-              <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="创建时间"
-                name="createTime"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-              <DatePicker disabled={true} style={{width:'100%'}} allowClear format={"YYYY-MM-DD HH:mm:ss"} />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Table
-          columns={newColumns}
-          pagination={false}
-          dataSource={khTableData}
-          rowKey="id"
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-        />
-        <Row style={{marginTop:20}}>
-          <Col span={24}>
-              <Form.Item
-                label="考核方案"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/assessTask/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传 （最大50M）</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-                {
-                  loading ? <span>文件正在上传中，请等待</span> :
-                  fileList?.length > 0 && fileList?.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      {/* 选择考核组成员 */}
-      <Modal
-        open={transferOpen}
-        width={800}
-        title="选择人员"
-        footer={null}
-        onCancel={() => setTransferOpen(false)}
-        // onOk={() => setTransferOpen(true)}
-        destroyOnClose
-      >
-        <PersonForm
-          treeList={treeList}
-          deptList={deptList}
-          callback={handlePerson}
-          onCancel={() => { setTransferOpen(false) }}
-          selectPerson={selectPerson}
-        />
-      </Modal>
-      {/* pdf预览 */}
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/assessTask/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-      {/* 模版 */}
-      <Modal
-        open={mbOpen}
-        width={1000}
-        title="查看"
-        onCancel={() => setMbOpen(false)}
-        footer={null}
-        destroyOnClose
-      >
-        <MbForm record={mbItem} mode="view" />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/jdkh/khrwgl/index.js b/src/views/rcgl/jdkh/khrwgl/index.js
deleted file mode 100644
index ae394ce..0000000
--- a/src/views/rcgl/jdkh/khrwgl/index.js
+++ /dev/null
@@ -1,405 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Popconfirm, message, Tabs,Dropdown,Space } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,DownOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import KhResultModal from './khResultModal';
-import PfDetail from "./PfDetail"
-import { httpget2 } from '../../../../utils/request';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const qd = role?.rule?.find(item => item.menuName == "清单") || true;
-  const khLevel = {
-    1: "优秀",
-    2: "良好",
-    3: "合格",
-    4:"不合格"
-  }
-  const khStatus = {
-    0: "未启动",
-    1: "评分中",
-    2: "已完成",
-    9:"评分中"
-  }
-  const expandedRowRender = (record) => {
-    const columns = [
-      {
-        title: '考核对象',
-        dataIndex: 'objectUserName',
-        key: 'objectUserName',
-        align: "center",
-        width: 200,
-      },
-      {
-        title: '标准得分',
-        dataIndex: 'standardScore',
-        align:"center",
-        key: 'standardScore',
-        width:200
-      },
-      {
-        title: '考核得分',
-        dataIndex: 'assessScore',
-        align:"center",
-        key: 'assessScore',
-        width:200
-      },
-      {
-        title: '考核等级',
-        dataIndex: 'assessLevel',
-        align:"center",
-        key: 'assessLevel',
-        width: 200,
-        render: (value) => <span>{khLevel[value]}</span>
-      },{
-        title: '考核记录状态',
-        dataIndex: 'status',
-        align:"center",
-        key: 'status',
-        width: 200,
-        render: (value) => <span>{khStatus[value]}</span>
-      },
-      {
-        title: '操作',
-        dataIndex: 'operator',
-        align:"center",
-        key: 'operator',
-        width: 200,
-        render: (value, row) => (
-          <>
-            {(row.status == 1 || row.status == 9 ) && tabs !=2 ? <a onClick={() => handlePf(row,record)}>评分</a> : null}
-            {(row.status == 2 || tabs ==2) ? <a onClick={() => viewPf(row,record)}>查看评分详情</a> : null}
-          </>
-        )
-      },
-    ];
-    return <Table columns={columns} dataSource={record?.assessObjects} pagination={false} rowKey="id"/>;
-  };
-  const taskStatus = {
-    0: '未启动',
-    1: '评分中',
-    2: '审核中',
-    3: '已审核',
-    4: '已作废',
-  }
-
-  const [dropItem, setDropItem] = useState({})
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({})
-  const columns = [
-    { title: '', key: '', dataIndex: '', width: 0, align: "center" },
-    { title: '考核任务名称', key: 'taskName', dataIndex: 'taskName', width: 200, },
-    {
-      title: '考核频次', key: 'taskFreq', dataIndex: 'taskFreq', width: 200,
-      render: (value) => <span>{value == 1? '年度' : value == 2 ? "季度": value == 3 ? "月度" : ''}</span>
-    },
-    {
-      title: '考核时间', key: 'time', dataIndex: 'time', width: 200,
-      render: (value, record) => <span>{(record?.startDate || record?.startDate?.endDate)
-        ? record?.startDate + '-' + record?.endDate : '' }</span>
-     },
-    {
-      title: '考核任务状态', key: 'status', dataIndex: 'status', width: 200,align: 'center',
-      render: (value) => <div>{taskStatus[value] || ''}</div>
-    },
-    {title: '创建人', key: 'createUserName', dataIndex: 'createUserName', width: 100},
-    {title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 150},
-    {
-      title: '操作', key: 'operation', width: 300,align: 'center',
-      render: (v,r) => (
-        <Space Space size="middle" >
-          {
-            tabs == 2 ? 
-              <>
-                {r.status == 0 ? <a onClick={() =>command("edit")(r)}>编辑</a> : null}
-              <a onClick={() => command("view")(r)}>查看</a>
-                {/* {r.status == 0 ? <a  onClick={() => command("del")(r)}>删除</a> : null} */}
-                {r.status == 0 ?  <Popconfirm title="确认删除评分?" onConfirm={()=> command("del")(r)}>
-                <Button type="link" size="small" style={{ color: "red" }}>删除</Button>
-              </Popconfirm> : null}
-              {r.status == 0 ?  <Popconfirm title="确认启动评分?" onConfirm={()=>startPf(r)}>
-                <Button type="link" size="small" title="启动">启动</Button>
-              </Popconfirm> : null}
-              {r.status == 1 ?  <Popconfirm title="确认作废评分?" onConfirm={()=>pause(r)}>
-                <Button type="link" size="small" title="作废">作废</Button>
-              </Popconfirm> : null}
-              {r.status == 2 ? 
-                <>
-                  <a onClick={() => khResult(r)}>考核结果</a>
-                    <Popconfirm title="确认审核通过?" onConfirm={()=>pass(r)}>
-                <Button type="link" size="small" title="审核通过">审核通过</Button>
-              </Popconfirm>
-              <Dropdown
-                menu={{
-                  items:[ {
-                    key: '1',
-                    label: <Popconfirm title="确定要驳回评分吗?" onConfirm={() =>{refuse(r)}}>
-                    <Button  type="link" size="small" title="驳回评分" style={{color:"#000"}}>驳回评分</Button>
-                  </Popconfirm>
-                  },
-                  {
-                    key: '2',
-                    label:  <Popconfirm title="确定要作废吗?" onConfirm={() =>{pause(r)}}>
-                    <Button  type="link" size="small" title="作废" style={{color:"#000"}}>作废</Button>
-                  </Popconfirm>,
-                  },]
-                }}
-                trigger={['click']}
-              >
-                  <a onClick={(e) => { e.preventDefault(); setDropItem(r)}}>
-                  更多 <DownOutlined />
-                </a>
-              </Dropdown>
-            </> : r.status == 3 ? <a onClick={() => khResult(r)}>考核结果</a> : null
-          }
-        
-              </> : <a onClick={() => command("view")({...r,tabs})}>查看</a>
-          }
-        </Space>
-      )
-    },
-  ];
-  const [tabs, setTabsChange] = useState(0)
- 
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  // 开始评分
-  const [pfOpen, setPfOpen] = useState(false)
-  const [pfItem, setPfItem] = useState({})
-  const [pfItem1, setPfItem1] = useState({})
-  const handlePf = (column,record) => {
-    setPfOpen(true);
-    setPfItem(record);
-    setPfItem1({...column,type:"start"});
-  }
-  // 启动评分
-  const startPf = async (params) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.jdkh.khrwgl.start + `/${params.id}`)
-      if (res.code == 200) {
-        message.success('启动成功')
-        refresh()
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-// 评分详情
-  const viewPf = (row, record) => {
-    setPfOpen(true);
-    setPfItem({ ...record,view:1 });
-    setPfItem1({ ...row,view:1,tabs });
-  }
-
-  // 作废
-  const pause = async (params) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.jdkh.khrwgl.pause + `/${params.id}`)
-      if (res.code == 200) {
-        message.success('作废成功')
-        refresh()
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  // 驳回评分
-  const refuse = async (params) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.jdkh.khrwgl.refuse + `/${params.id}`)
-      if (res.code == 200) {
-        message.success('驳回评分成功')
-        refresh()
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  // 审核通过
-  const pass = async (params) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.jdkh.khrwgl.pass + `/${params.id}`)
-      if (res.code == 200) {
-        message.success('审核通过成功')
-        refresh()
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  // 考核结果
-  const [khResultOpen, setKhResultOpen] = useState(false)
-  const [khResultItem, setKhResultItem] = useState({})
-  const khResult = (row) => {
-    setKhResultOpen(true)
-    setKhResultItem(row)
-  }
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.jdkh.khrwgl.delete + `/${params.id}`);
-    }
-  }
-  
- 
-  // 任务清单
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.jdkh.khrwgl.taskPage).find_noCode);
-   // 待办
-  const { tableProps: tableProps1, search: search1,refresh:refresh1 } = usePageTable(createCrudService(apiurl.rcgl.jdkh.khrwgl.todoPage).find_noCode);
-  // 已办
-   const { tableProps:tableProps2, search:search2,refresh:refresh2 } = usePageTable(createCrudService(apiurl.rcgl.jdkh.khrwgl.myDonePage).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-   refresh()
-   setTabsChange(2)
-  }
- //移入某一行禁用 
-  const rowClassName = (record) => {
-  return record.status == 4 ? 'disabled-row' : '';
-};
-
-  useEffect(() => {
-    const userId = localStorage.getItem("userId");
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          userId: tabs != 2 ? userId :undefined
-        }
-      }; 
-      if (tabs == 0) {
-        search1(params)
-      } else if (tabs == 1) {
-        search2(params)
-      } else {
-        search(params)
-      }
-      
-    }
-  }, [searchVal,tabs])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-          <Tabs
-              // defaultActiveKey={0}
-              onChange={(e) => setTabsChange(e)}
-              activeKey={tabs}
-              items={[
-                {
-                  label: `我的待办评分任务`,
-                  key: 0,
-                  children: <Table
-                    columns={columns}
-                    rowKey="inx"
-                    {...tableProps1}
-                    scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-                    expandable={{
-                      expandedRowRender,
-                    }}
-                  />
-                },
-                {
-                  label: `我的已办评分任务`,
-                  key: 1,
-                  children: <Table
-                    columns={columns}
-                    rowKey="inx"
-                    {...tableProps2}
-                    scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-                    expandable={{
-                      expandedRowRender,
-                    }}
-                  />
-                },
-                qd &&   {
-                  label: `考核任务清单`,
-                  key: 2,
-                  children: <Table
-                    columns={columns}
-                    rowKey="inx"
-                    rowClassName={rowClassName}
-                    {...tableProps}
-                    scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-                    expandable={{
-                      expandedRowRender,
-                    }}
-                  />
-               }
-              ]}
-            >
-          </Tabs>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-
-        {/* 评分弹框 */}
-        <Modal
-          open={pfOpen}
-          width={1000}
-          footer={null}
-          title={pfItem1.objectUserName}
-          destroyOnClose
-          onCancel={() =>setPfOpen(false)}
-        >
-          <PfDetail
-            record={pfItem}
-            Item={pfItem1}
-            refresh={refresh1}
-            onCancel={() => setPfOpen(false)}
-            tabs={tabs}
-          />
-        </Modal>
-
-        {/* 考核结果 */}
-        <Modal
-            open={khResultOpen}
-            width={800}
-            footer={null}
-            title="考核结果"
-            destroyOnClose
-            onCancel={() =>setKhResultOpen(false)}
-        >
-          <KhResultModal khItem={khResultItem} />
-        </Modal>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/jdkh/khrwgl/index.less b/src/views/rcgl/jdkh/khrwgl/index.less
deleted file mode 100644
index 579138b..0000000
--- a/src/views/rcgl/jdkh/khrwgl/index.less
+++ /dev/null
@@ -1,51 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
-
-.editable-cell-value-wrap {
-    padding: 5px 12px;
-    cursor: pointer;
-  }
-  
-  .editable-row:hover .editable-cell-value-wrap {
-    padding: 4px 11px;
-    border: 1px solid #d9d9d9;
-    border-radius: 2px;
-  }
-  .zgview-modal{
-    .ant-modal-body{
-        padding: 0;
-        padding-left: 30px;
-        padding-bottom: 30px;
-    }
-  }
-  .disabled-row {
-    background-color: #f5f5f5 !important;
-}
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khrwgl/khResultModal.js b/src/views/rcgl/jdkh/khrwgl/khResultModal.js
deleted file mode 100644
index d19363e..0000000
--- a/src/views/rcgl/jdkh/khrwgl/khResultModal.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React,{useState,useEffect,useRef,useContext,useMemo}from 'react'
-import { Table, Button } from 'antd'
-import apiurl from '../../../../service/apiurl'
-import { httpget2,httpgetExport } from '../../../../utils/request'
-import { handleData,exportFile } from "../../../../utils/tools"
-
-export default function KhResultModal({ khItem }) {
-    const [tableData, setTableData] = useState([])
-    const columns = [
-          {
-            title: '考核对象',
-            dataIndex: 'objectUserName',
-            key: 'objectUserName',
-            align: "center",
-            width: 200,
-            onCell: (row) => ({ rowSpan: row.rowSpan || 0 })
-          },
-        {
-          title: "考核类目",
-          dataIndex: "categoryName",
-          key:"categoryName",
-          width: 150,
-          align: "center",
-        
-        },
-        {
-          title: '指标名称',
-          key: 'indicatorName',
-          dataIndex: 'indicatorName',
-          width: 200,
-          align: "center",
-        },
-        {
-          title: '扣分',
-          key: 'deductScore',
-          dataIndex: 'deductScore',
-          width: 60,
-          align: "center",
-        },
-        {
-            title: '考核得分',
-            key: 'resScore',
-            dataIndex: 'resScore',
-            width: 80,
-            align: "center",
-            onCell: (row) => ({ rowSpan: row.rowSpan || 0 })
-        },
-
-    ]
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-    const getZbTableData = async (id) => {
-        const url = apiurl.rcgl.jdkh.khrwgl.result 
-        try {
-          const res = await httpget2(url + `/${id}`)
-          if (res.code == 200) {
-            res.data.forEach(item => {
-              if (item.rowSpan) delete item.rowSpan;
-            })
-            const result = handleData(res.data, "objectUserName")
-              setTableData(result)
-          }
-        } catch (error) {
-          console.log(error);
-        }
-    }
-
-    // 导出
-    const exportExcel = () => {
-        let params = {
-          id: khItem.id
-        }
-        httpgetExport(apiurl.rcgl.jdkh.khrwgl.export, params).then(res => {
-          exportFile(`考核结果.xlsx`,res.data)
-      })
-      }
-    
-    useEffect(() => {
-        getZbTableData(khItem.id)
-    }, [khItem])
-  return (
-      <div style={{display:"flex",flexDirection:"column"}}>
-          <Button style={{marginLeft:"auto",marginBottom:20}} onClick={exportExcel}>导出</Button>
-          <Table
-            columns={columns}
-            rowKey="objectId"
-              dataSource={tableData}
-              pagination={false}
-            scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-            />
-    </div>
-  )
-}
diff --git a/src/views/rcgl/jdkh/khrwgl/mbForm.js b/src/views/rcgl/jdkh/khrwgl/mbForm.js
deleted file mode 100644
index 355f46d..0000000
--- a/src/views/rcgl/jdkh/khrwgl/mbForm.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Table, Col, Tooltip, InputNumber,Image,Modal,Typography, message} from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import {handleData} from "../../../../utils/tools"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
- console.log("record", record);
- 
-  const columns = [
-    {
-      title: "考核类目",
-      dataIndex: "name",
-      key:"name",
-      width: 150,
-      align: "center",
-      onCell: (row) => ({ rowSpan: row.rowSpan || 0 })
-    },
-    {
-      title: '指标名称',
-      key: 'indicatorName',
-      dataIndex: 'indicatorName',
-      width: 250,
-      align: "center",
-      render: (v, r) => {
-        const titleDom = r.indicatorRatings ? 
-          r.indicatorRatings.map((item,i) => <div key={i}>{item?.ratingDesc}&nbsp;({item?.standardScore})</div>)
-         : ''
-        return (
-          <Tooltip title={titleDom}>
-            <span>{v}</span>
-        </Tooltip>
-        )
-      }
-    },
-    {
-      title: '标准分数',
-      key: 'standardScore',
-      dataIndex: 'standardScore',
-      width: 100,
-      align: "center",
-    },
-   
-  ]
-
-  const templateFreqOptions = [
-    {
-      label: "年度",
-      value:1
-    },
-    {
-      label: "季度",
-      value:2
-    },
-    {
-      label: "月度",
-      value:3
-    },
-  ]
-  const [form] = Form.useForm();
-  const [standardScore1, setStandardScore] = useState('')
-  const [zbOpen, setZbOpen] = useState(false)
-  const [tableData, setTableData] = useState([])
-  const [selectKeys, setSelectKeys] = useState([])
-  const tableDataRef = useRef(null)
-  tableDataRef.current = tableData;
-  const newColumns = useMemo(() => {
-    let data = columns;
-    if (mode == "view") {
-      data.pop();
-      return data
-    } else {
-      return data;
-    }
-  }, [mode])
- 
-
-
-  const onfinish = (values) => {
-    // 校验等级划分
-    if (values.excellentScore == undefined) {
-      message.error("优秀分数不能为空")
-      return
-    }
-    if (values.goodScore == undefined) {
-      message.error("良好分数不能为空")
-      return
-    }
-    if (values.passScore == undefined) {
-      message.error("合格分数不能为空")
-      return
-    }
-    const userId =  localStorage.getItem('userId')
-    const userName =  localStorage.getItem('userName')
-    values.indicatorIds = selectKeys;
-    values.standardScore = standardScore1;
-    values.createUserId = userId
-    values.createUserName = userName
-    if (mode === 'edit') {
-      onEdit(apiurl.rcgl.jdkh.khmbgl.edit,{...record,...values})
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.jdkh.khmbgl.save,values)
-    }
-  }
-
-
- 
-  const getZbTableData = async(id) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.jdkh.khmbgl.info + `/${id}`)
-      if (res.code == 200) {
-        let total = res.data.reduce((total,cur) => total + Number(cur.standardScore),0)
-        setStandardScore(total)
-        setSelectKeys(res.data.map(item => item.id))
-        res.data.forEach(item => {
-          if (item.rowSpan) delete item.rowSpan;
-        })
-        const result = handleData(res.data, "name")
-        setTableData(result)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-
-  const getMbDetails = async (id) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.jdkh.khmbgl.detail + `/${id}`)
-      if (res.code == 200) {
-        form.setFieldsValue(res.data)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-  useEffect(() => {
-    if (mode !== "save") { 
-      getZbTableData(record.templateId)
-      // form.setFieldsValue(record.template)
-      getMbDetails(record.templateId)
-    }
-
- }, [record,mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="模板名称"
-                name="templateName"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="考核频次"
-                name="templateFreq"
-              >
-              <NormalSelect disabled={mode != 'save'} style={{ width: '100%' }} allowClear options={templateFreqOptions} />
-              </Form.Item>
-          </Col>
-      </Row>
-      <div style={{display:"flex",justifyContent:"space-between"}}>
-        <span style={{ marginLeft: "auto" }}>标准分数：{ standardScore1}</span>
-      </div>
-      <Table
-          rowKey="id"
-          columns={newColumns}
-          dataSource={tableData}
-          scroll={{ y: "calc( 100vh - 400px )"}}
-          pagination={false}
-        />
-        <Row style={{marginTop:20}}>
-          <Col span={8}>
-            <Form.Item label="等级划分" >
-              <Form.Item label={<span style={{fontWeight:"bold"}}>优秀</span>}  required colon={false}>
-              <Form.Item name="excellentScore" noStyle>
-                  <InputNumber
-                    min={0}
-                    style={{ width: "45%" }}
-                    disabled={mode == "view"}
-                  />
-              </Form.Item>
-              <span className="ant-form-text"> 分及以上</span>
-              </Form.Item>
-            </Form.Item>
-          </Col>
-          <Col span={8}>
-            <Form.Item >
-            <Form.Item label={<span style={{fontWeight:"bold"}}>良好</span>} required colon={false}>
-              <Form.Item name="goodScore" noStyle >
-                  <InputNumber
-                    min={0}
-                    style={{ width: "45%" }}
-                    disabled={mode == "view"}
-                  />
-              </Form.Item>
-              <span className="ant-form-text"> 分及以上</span>
-              </Form.Item>
-            </Form.Item>
-          </Col>
-          <Col span={8}>
-            <Form.Item >
-            <Form.Item label={<span style={{fontWeight:"bold"}}>合格</span>} required colon={false}>
-              <Form.Item name="passScore" noStyle >
-                  <InputNumber
-                    min={0}
-                    style={{ width: "45%" }}
-                    disabled={mode == "view"}
-                  />
-              </Form.Item>
-              <span className="ant-form-text"> 分及以上</span>
-              </Form.Item>
-            </Form.Item>
-          </Col>
-        </Row>
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/jdkh/khrwgl/pfViewModal.js b/src/views/rcgl/jdkh/khrwgl/pfViewModal.js
deleted file mode 100644
index e5e7d03..0000000
--- a/src/views/rcgl/jdkh/khrwgl/pfViewModal.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import React from 'react'
-import {Tabs,Descriptions,Image} from "antd"
-export default function pfViewModal({ zgItem,record }) {
-    console.log("pfViewModal", zgItem,record);
-    const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-    const newArray = []
-    for (let i = 0; zgItem[`teamUserName${i}`] || record.tabs != 2; i++) {
-        if (record.tabs !=2) {
-            newArray.push({
-                [`teamUserName`]: zgItem[`teamUserName`],
-                [`assessScore`]: zgItem[`assessScore`],
-                [`problemDesc`]: zgItem[`problemDesc`],
-                [`rectifyRequirement`]: zgItem[`rectifyRequirement`],
-                [`rectifyLastDate`]: zgItem[`rectifyLastDate`],
-                [`files`]: zgItem[`files`],
-            });
-            break;
-        } else {
-            newArray.push({
-                [`teamUserName${i}`]: zgItem[`teamUserName${i}`],
-                [`assessScore${i}`]: zgItem[`assessScore${i}`],
-                [`problemDesc${i}`]: zgItem[`problemDesc${i}`],
-                [`rectifyRequirement${i}`]: zgItem[`rectifyRequirement${i}`],
-                [`rectifyLastDate${i}`]: zgItem[`rectifyLastDate${i}`],
-                [`files${i}`]: zgItem[`files${i}`],
-            });     
-        }
-    }
-    console.log(newArray);
-  return ( 
-      <div>
-          <Tabs
-              defaultActiveKey={0}
-              items={
-                  newArray.map((item,index) => {
-                      return   {
-                        label: record.tabs ==2 ? item["teamUserName" + index] : record.objectUserName,
-                        key: index,
-                          children: <>
-                              <Descriptions contentStyle={{marginBottom:20}}>
-                                  <Descriptions.Item
-                                      label={<div><span style={{ color: "red", marginLeft: -5 }}>*</span><span>问题描述</span></div>} span={3}>
-                                      {record.tabs ==2 ?item["problemDesc" + index] : item.problemDesc}
-                                  </Descriptions.Item>
-                                  <Descriptions.Item label="整改要求" span={3}>
-                                      { record.tabs ==2 ? item["rectifyRequirement" + index] : item.rectifyRequirement }
-                                  </Descriptions.Item>
-                                  <Descriptions.Item label="整改期限" span={3}>
-                                      {record.tabs ==2 ?item["rectifyLastDate" + index] : item.rectifyLastDate}
-                                  </Descriptions.Item>
-                                  <Descriptions.Item label="现场图片" span={3}>
-                                      {record.tabs ==2 ? item["files" + index]?.map(item => (
-                                          <div key={item.fileId} style={{display:"flex"}}>
-                                              <Image
-                                                  src={url + item?.filePath}
-                                                  style={{width:70,height:60,marginRight:10}}
-                                              />
-                                          </div>
-                                      )) : item["files"]?.map(item => (
-                                        <div key={item.fileId} style={{display:"flex"}}>
-                                            <Image
-                                                src={url + item?.filePath}
-                                                style={{width:70,height:60,marginRight:10}}
-                                            />
-                                        </div>
-                                    ))
-                                      }
-                                  </Descriptions.Item>
-                              </Descriptions>
-                          </>
-                      }
-                  })
-              }
-          />
-    </div>
-  )
-}
diff --git a/src/views/rcgl/jdkh/khrwgl/toolbar.js b/src/views/rcgl/jdkh/khrwgl/toolbar.js
deleted file mode 100644
index 8b3aa35..0000000
--- a/src/views/rcgl/jdkh/khrwgl/toolbar.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增") || true;
-  const types = [
-    {label:"未启动",value:0},
-    {label:"评分中",value:1},
-    {label:"审核中",value:2},
-    {label:"已审核",value:3},
-    {label:"已作废",value:4},
-  ]
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateRangeSo;
-    if (values.tm) {
-      dateRangeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateRangeSo});
-  }
-
-//   useEffect(() => {
-//     let dateRangeSo = {
-//       start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'),
-//       end: moment().format('YYYY-MM-DD 00:00:00')
-//     }
-//     form.setFieldValue("tm", [moment(dateRangeSo.start), moment(dateRangeSo.end)])
-//     setSearchVal({ dateRangeSo })
-//  }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="考核任务名称" name="taskName">
-            <Input allowClear style={{ width: '150px' }} />
-          </Form.Item>
-          <Form.Item label="考核状态" name="status">
-            <NormalSelect allowClear style={{ width: '150px' }} options={types} />
-          </Form.Item> <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> 
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khrwgl/transfer.js b/src/views/rcgl/jdkh/khrwgl/transfer.js
deleted file mode 100644
index cf649c9..0000000
--- a/src/views/rcgl/jdkh/khrwgl/transfer.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import React, { useState,useMemo,useEffect } from 'react';
-import { Input, Transfer, Button,Tree  } from "antd"
-import {RedoOutlined } from '@ant-design/icons';
-const { Search } = Input;
-export default function PersonForm({treeList,deptList,callback,onCancel,selectPerson}) {
-    const [searchValue, setSearchValue] = useState('');
-    const [expandedKeys, setExpandedKeys] = useState([treeList[0].key]);
-    const [autoExpandParent, setAutoExpandParent] = useState(true);
-    const [treeData, setTreeData] = useState(treeList)
-
- // 处理搜索时树形数据高亮
- const loop = (data) =>
-    data.map((item) => {
-      const index = item.title.indexOf(searchValue);
-      const beforeStr = item.title.substr(0, index);
-      const afterStr = item.title.substr(index + searchValue.length);
-      const title =
-        index > -1 ? (
-          <span>
-            {beforeStr}
-            <span style={{color:"#ff8c64"}}>{searchValue}</span>
-            {afterStr}
-          </span>
-        ) : (
-          <span>{item.title}</span>
-        );
-      if (item.children) {
-        return { title, key: item.key || item.value, children: loop(item.children) };
-      }
-
-      return {
-        title,
-        key: item.key || item.value,
-      };
-    })
- const getParentKey =(key, tree) => {
-        let parentKey
-        for (let i = 0; i < tree.length; i++) {
-          const node = tree[i];
-          if (node.children) {
-            if (node.children.some((item) => item.value === key)) {
-              parentKey = node.value;
-            } else if (getParentKey(key, node.children)) {
-              parentKey = getParentKey(key, node.children);
-            }
-          }
-        }
-        return parentKey;
-    }  
-    
-
-     // 将树形节点改为一维数组
-  const generateList = (data, dataList) => {
-    for (let i = 0; i < data.length; i++) {
-      const node = data[i];
-        const { key, title,value } = node;
-      dataList.push({ key:key||value, title, });
-      if (node.children) {
-        generateList(node.children, dataList);
-      }
-    }
-    return dataList
-    }
-    
-  // 树节点展开/收缩
-  const onExpand = (expandedKeys) => {
-    setExpandedKeys(expandedKeys)
-    setAutoExpandParent(false)
-  }
-
-    
-
-    // 搜索框回调
-    const onInputChange = (e) => {
-    let { value } = e.target
-    value = String(value).trim()
-    const dataList = generateList(treeData, [])
-    let expandedKeys = dataList
-      .map((item) => {
-        if (item.title.indexOf(value) > -1) {
-          return getParentKey(item.key, treeData)
-        }
-        return null;
-      })
-      .filter((item, i, self) => item && self.indexOf(item) === i)
-    setExpandedKeys(expandedKeys)
-    setAutoExpandParent(true)
-    setSearchValue(value)
-    }
-  
-    const customRender = (record) => {
-        let name;
-        if (record?.dept?.deptName) {
-            name = record.dept.deptName
-        } else {
-            name = deptList.find(item => item.deptId == record.parentId)?.deptName
-        }
-        return <span>{record.title}<span>{ name ? `【${name}】` :''}</span></span>;
-    }
-
-    // 穿梭框处理
-   const isChecked = (selectedKeys, eventKey) => selectedKeys.includes(eventKey);
-   const generateTree = (treeNodes = [], checkedKeys = []) =>
-      treeNodes.map(({ children, ...props }) => ({
-        ...props,
-        disabled: checkedKeys.includes(props.key),
-        children: generateTree(children, checkedKeys),
-      }));
-  const TreeTransfer = ({ dataSource, targetKeys, ...restProps }) => {
-    
-  const transferDataSource = [];
-  function flatten(list = []) {
-      list.forEach((item) => {
-        item.key = item.key ||item.value
-      transferDataSource.push(item);
-      flatten(item.children);
-    });
-  }
-  flatten(dataSource);
-  return (
-    <Transfer
-      {...restProps}
-      targetKeys={targetKeys}
-      dataSource={transferDataSource}
-      className="tree-transfer"
-      render={customRender}
-      showSelectAll={false}
-    >
-      {({ direction, onItemSelect, selectedKeys }) => {
-        if (direction === 'left') {
-          const checkedKeys = [...selectedKeys, ...targetKeys];
-          return (
-            <Tree
-              blockNode
-              checkable
-              checkStrictly
-              onExpand={onExpand}
-              expandedKeys={expandedKeys}
-              autoExpandParent={autoExpandParent}
-              height={300}
-              checkedKeys={checkedKeys}
-              treeData={loop(treeData)}
-              onCheck={(val, { node: { key },checkedNodes }) => {
-                  onItemSelect(key, !isChecked(checkedKeys, key));
-              }}
-              onSelect={(_, { node: { key } }) => {
-                onItemSelect(key, !isChecked(checkedKeys, key));
-              }}
-            />
-          );
-        }
-      }}
-    </Transfer>
-  );
-    };
-
-    
-    const [targetKeys, setTargetKeys] = useState([]);
-    const onChange = (keys,direction) => {
-        setTargetKeys(keys);
-    };
-    useEffect(() => {
-      setTargetKeys(selectPerson)
-    }, [selectPerson])
-    
-
-  return (
-      <>
-           <Input.Group compact>
-        <Search
-          addonBefore="用户名称"
-          placeholder="请输入用户名称"
-          allowClear
-          onChange={onInputChange}
-          style={{
-            width: "95.3%",
-          }}
-        />
-           <Button  icon={<RedoOutlined style={{color:"#8d8d8d"}} />}></Button>
-        </Input.Group>
-
-        <div className='transfer-content' style={{marginTop:20}}>
-           <TreeTransfer dataSource={treeData} targetKeys={targetKeys} onChange={onChange}  />
-        </div>
-          <div style={{ display: 'flex', justifyContent: 'flex-end',columnGap:10,marginTop:10 }}>
-              <Button onClick={onCancel}>取消</Button>
-              <Button type="primary" onClick={() => callback(targetKeys)}>确认</Button>
-        </div>
-      </>
-  )
-}
diff --git a/src/views/rcgl/jdkh/khtj/index.js b/src/views/rcgl/jdkh/khtj/index.js
deleted file mode 100644
index 3d44fc2..0000000
--- a/src/views/rcgl/jdkh/khtj/index.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import React,{useState,useMemo,useEffect} from 'react'
-import {Card } from 'antd';
-import ToolBar from './toolbar';
-import zgOptions from "./tjOption"
-import khOptions from "./khOption"
-import jgOptions from "./jgOptions"
-import ReactEcharts from 'echarts-for-react';
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import './index.less'
-export default function Khtj() {
-    const [searchVal, setSearchVal] = useState()
-    const [zgList, setZgList] = useState([1])
-    const [zgData, setZgData] = useState({})
-    const [levelData, setLevelData] = useState({})
-    const [personData, setPersonData] = useState([])
-    const zgOption = useMemo(() => {
-        return zgOptions(zgData)
-    }, [zgData])
-    const khOption = useMemo(() => {
-        return khOptions(levelData)
-    }, [levelData])
-    const jgOption = useMemo(() => {
-        return jgOptions(personData)
-    }, [personData])
-  // 考核等级数据
-  const getLevelData = async (params) => {
-    try {
-      const res = await httppost2(apiurl.rcgl.jdkh.khtj.level, params)
-      if (res.code == 200) {
-        setLevelData(res.data)
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-    
-    // 整改
-    const getZgData = async (params) => {
-      try {
-        const res = await httppost2(apiurl.rcgl.jdkh.khtj.zg, params)
-        if (res.code == 200) {
-          setZgData(res.data)
-        }
-      } catch (error) {
-        console.log(error);
-      }
-  }
-    // 考核人员
-    const getPersonData = async (params) => {
-      try {
-        const res = await httppost2(apiurl.rcgl.jdkh.khtj.person, params)
-        if (res.code == 200) {
-          setPersonData(res.data)
-        }
-      } catch (error) {
-        console.log(error);
-      }
-  }
-  useEffect(() => {
-    if (searchVal) {
-      getLevelData(searchVal)
-      getZgData(searchVal)
-      getPersonData(searchVal)
-      }
-   
-  }, [searchVal])
-  
-  return (
-      <div className='content-root clearFloat' style={{padding:0 }}>
-          <div className='lf' style={{ width: "100%", overflowY: "auto" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-            />
-          </Card>
-          <div className='kh-content'>
-            <div className='kh-left'>
-            <div className='comomn-title'>
-            <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-              <span>人员考核结果</span>
-            </div>
-            <div className='zg-charts'>
-                          {
-                              zgList.length > 0 ?
-                                <ReactEcharts
-                                  option={jgOption}
-                                  style={{width: "100%", height: "calc(100vh - 230px)"}}
-                                  notMerge={true}
-                                /> : <div style={{textAlign: "center", margin: "10%"}}>
-                                  <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                                </div>
-                          }
-                        </div>
-            </div>
-            <div className='kh-right'>
-                <div className='kh-top'>
-                <div className='comomn-title'>
-                    <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-                      <span>考核等级</span>
-               </div>
-               <div className='zg-charts'>
-                          {
-                              zgList.length > 0 ?
-                                <ReactEcharts
-                                  option={khOption}
-                                  style={{width: "100%", minHeight: "330px"}}
-                                  notMerge={true}
-                                /> : <div style={{textAlign: "center", margin: "10%"}}>
-                                  <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                                </div>
-                          }
-                        </div>
-                </div>
-                      <div className='kh-bottom'>
-                        <div className='comomn-title'>
-                        <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-                          <span>整改情况</span>
-                        </div>
-                          <div className='zg-charts'>
-                          {
-                              zgList.length > 0 ?
-                                <ReactEcharts
-                                  option={zgOption}
-                                  style={{width: "100%", minHeight: "330px"}}
-                                  notMerge={true}
-                                /> : <div style={{textAlign: "center", margin: "10%"}}>
-                                  <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                                </div>
-                          }
-                        </div>
-                </div>
-            </div>
-          </div>
-           </div>
-    </div>
-  )
-}
diff --git a/src/views/rcgl/jdkh/khtj/index.less b/src/views/rcgl/jdkh/khtj/index.less
deleted file mode 100644
index 8d4f47c..0000000
--- a/src/views/rcgl/jdkh/khtj/index.less
+++ /dev/null
@@ -1,31 +0,0 @@
-.kh-content{
-    display: flex;
-    column-gap: 10px;
-    margin-top: 10px;
-    height: calc(100vh - 160px);
-    .comomn-title{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        padding: 20px 10px;
-    }
-    .kh-left{
-        flex: 1;
-        height: 100%;
-        background-color: #fff;
-       
-    }
-    .kh-right{
-        width: 600px;
-        height: 100%;
-        .kh-top{
-            background-color: #fff;
-            height: 49%;
-        }
-        .kh-bottom{
-            margin-top: 13px;
-            background-color: #fff;
-            height: 49%;
-            }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khtj/jgOptions.js b/src/views/rcgl/jdkh/khtj/jgOptions.js
deleted file mode 100644
index aca9453..0000000
--- a/src/views/rcgl/jdkh/khtj/jgOptions.js
+++ /dev/null
@@ -1,225 +0,0 @@
-export default function jgOptions(personData) {
-    let personObj = {};
-    const Xdata = personData.map(item => item.taskName )
-    // 查找所有人员并去重
-    const allPerson= personData.map(item => {
-    return  item.assessObjects.map(o => o.objectUserName )
-    }).flat();
-   const Ydata = Array.from(new Set(allPerson));
-   
-  // 所有人员数据
-  const allData = personData.map(item => {
-    return item.assessObjects.map(o => {
-      return [item.taskName ,o.objectUserName,o.assessScore||0,o.assessLevel]
-    })
-  }).flat()
-
-  personObj.best = allData.filter(item => item[3] == 1);
-  personObj.better = allData.filter(item => item[3] == 2);
-  personObj.pass = allData.filter(item => item[3] == 3);
-  personObj.nopass = allData.filter(item => item[3] == 4);
-    return {
-        legend: {
-            show: true,
-            itemGap:40,
-          },
-          tooltip: {},
-          xAxis: {
-            type: 'category',
-            axisLabel: {
-              interval: Xdata.length > 5 ? 0 : 0, // 强制显示所有标签
-              rotate: Xdata.length > 5 ? 20 : 0 // 旋转角度
-          },
-            data: Xdata
-          },
-          yAxis: {
-        
-            type: 'category',
-            data: Ydata,
-            splitLine: {
-              show: false,
-              lineStyle: {
-                color: '#000'
-              }
-            }
-          },
-          series: [
-            {
-              name: '优秀',
-              type: 'scatter',
-              symbol: 'rect',
-              symbolSize: [(800/Xdata.length), (625/Ydata.length)],
-              itemStyle:{
-                color:"#91cc75"
-              },
-              label:{
-                show:true,
-                formatter: function (params) {
-                            return params.value[2]; // 显示数据点的值
-                        },
-                        offset: [0, 0], // 调整标签位置
-                        color: '#000' // 标签颜色
-              },
-              tooltip:{
-                  backgroundColor: "#fff",
-                  textStyle: {
-                      color:"#000",
-                  },
-                  formatter: (data) => {
-                      return `<div style="padding:5px">
-                       <div style="display:flex;column-gap:10px; align-items: center;">
-                         <span style="width:10px;height:10px;border-radius:50%;background-color:#91cc75;"></span>
-                         <span>${data.value[1]}</span>
-                       </div>
-                       <div>
-                         <span>考核任务：</span>
-                         <span>${data.value[0]}</span>
-                       </div>
-                        <div>
-                         <span>考核得分：</span>
-                         <span>${data.value[2]}</span>
-                       </div>
-                        <div>
-                         <span>考核等级：</span>
-                         <span>${data.seriesName}</span>
-                       </div>
-                     </div>`
-                }
-              },
-              data: personObj.best
-            },
-            {
-              name: '良好',
-              type: 'scatter',
-              symbol: 'rect',
-              symbolSize: [(800/Xdata.length), (625/Ydata.length)],
-              itemStyle:{
-                color:"#5470c6"
-              },
-              label:{
-                show:true,
-                formatter: function (params) {
-                            return params.value[2]; // 显示数据点的值
-                        },
-                        offset: [0, 0], // 调整标签位置
-                        color: '#fff' // 标签颜色
-              },
-              tooltip:{
-                backgroundColor: "#fff",
-                textStyle: {
-                    color:"#000",
-                },
-                formatter: (data) => {
-                    return `<div style="padding:5px">
-                     <div style="display:flex;column-gap:10px; align-items: center;">
-                       <span style="width:10px;height:10px;border-radius:50%;background-color:#5470c6;"></span>
-                       <span>${data.value[1]}</span>
-                     </div>
-                     <div>
-                       <span>考核任务：</span>
-                       <span>${data.value[0]}</span>
-                     </div>
-                      <div>
-                       <span>考核得分：</span>
-                       <span>${data.value[2]}</span>
-                     </div>
-                      <div>
-                       <span>考核等级：</span>
-                       <span>${data.seriesName}</span>
-                     </div>
-                   </div>`
-              }
-            },
-              data:personObj.better
-            },
-            {
-                name: '合格',
-                type: 'scatter',
-                symbol: 'rect',
-                symbolSize: [(800/Xdata.length), (625/Ydata.length)],
-                itemStyle:{
-                  color:"#fac858"
-                },
-                label:{
-                  show:true,
-                  formatter: function (params) {
-                              return params.value[2]; // 显示数据点的值
-                          },
-                          offset: [0, 0], // 调整标签位置
-                          color: '#000' // 标签颜色
-                },
-                tooltip:{
-                    backgroundColor: "#fff",
-                    textStyle: {
-                        color:"#000",
-                    },
-                    formatter: (data) => {
-                        return `<div style="padding:5px">
-                         <div style="display:flex;column-gap:10px; align-items: center;">
-                           <span style="width:10px;height:10px;border-radius:50%;background-color:#fac858;"></span>
-                           <span>${data.value[1]}</span>
-                         </div>
-                         <div>
-                           <span>考核任务：</span>
-                           <span>${data.value[0]}</span>
-                         </div>
-                          <div>
-                           <span>考核得分：</span>
-                           <span>${data.value[2]}</span>
-                         </div>
-                          <div>
-                           <span>考核等级：</span>
-                           <span>${data.seriesName}</span>
-                         </div>
-                       </div>`
-                  }
-                },
-                data: personObj.pass
-              },
-              {
-                name: '不合格',
-                type: 'scatter',
-                symbol: 'rect',
-                symbolSize: [(800/Xdata.length), (625/Ydata.length)],
-                itemStyle:{
-                  color:"#f07979"
-                },
-                label:{
-                  show:true,
-                  formatter: function (params) {
-                              return params.value[2]; // 显示数据点的值
-                          },
-                          offset: [0, 0], // 调整标签位置
-                          color: '#000' // 标签颜色
-                },
-                tooltip:{
-                    backgroundColor: "#fff",
-                    textStyle: {
-                        color:"#000",
-                    },
-                    formatter: (data) => {
-                        return `<div style="padding:5px">
-                         <div style="display:flex;column-gap:10px; align-items: center;">
-                           <span style="width:10px;height:10px;border-radius:50%;background-color:#f07979;"></span>
-                           <span>${data.value[1]}</span>
-                         </div>
-                         <div>
-                           <span>考核任务：</span>
-                           <span>${data.value[0]}</span>
-                         </div>
-                          <div>
-                           <span>考核得分：</span>
-                           <span>${data.value[2]}</span>
-                         </div>
-                          <div>
-                           <span>考核等级：</span>
-                           <span>${data.seriesName}</span>
-                         </div>
-                       </div>`
-                  }
-                },
-                data: personObj.nopass
-              }
-          ]
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khtj/khOption.js b/src/views/rcgl/jdkh/khtj/khOption.js
deleted file mode 100644
index 31ff6ce..0000000
--- a/src/views/rcgl/jdkh/khtj/khOption.js
+++ /dev/null
@@ -1,120 +0,0 @@
-export default function tjOption(obj) {
-let title = "优秀";
-let color = ["#91cc75", "#5470c6","#ffc542","#ff7474"];
-let echartData = [
-  {
-    name: "优秀",
-    value: obj[1] || 0
-  },
-  {
-    name: "良好",
-    value: obj[2] || 0,
-  },
-  {
-    name: "合格",
-    value: obj[3] || 0,
-  },
-  {
-    name: "不合格",
-    value: obj[4] || 0,
-  },
-];
-
-let formatNumber = function (num) {
-  let reg = /(?=(\B)(\d{3})+$)/g;
-  return num.toString().replace(reg, ",");
-};
-let total = echartData.reduce((a, b) => {
-  return a + b.value * 1;
-}, 0);
-let percentFormat = function (num){
-    return ((num / total) * 100)?.toFixed(0).toString() + "%";
-  }
-let wzgPrecent = percentFormat(echartData[0]?.value)
-  return {
-    color: color,
-
-    legend: {
-      show: true,
-      orient: 'vertical',
-      right: '80',
-      top: 'center',
-      itemWidth: 17,
-      itemHeight: 15,
-      itemGap:20,
-      textStyle: {
-        fontSize: 14,
-        rich: {
-          a: {
-            color: '#000',
-            width: 30
-          },
-          b:{
-            color: '#000',
-            fontSize: 14,
-            padding: [0, 30, 0, 40]
-        },
-        }
-      },
-      formatter: function(name) {
-        let title = ''
-        var target;
-        var index;
-        for (var i = 0, l = echartData.length; i < l; i++) {
-            if (echartData[i].name == name) {
-                target = echartData[i].value;
-                title = echartData[i].label
-                index = i < 6 ? i : 5
-            }
-        }
-        return `{a| ${name}}{b| ${target}}`
-    }
-    },
-    title: [
-      {
-        // text: "{name|" + title + "}\n{val|" + formatNumber(total) + "}{unit|"  + "万m³" + "}",
-        text: "{val|" + wzgPrecent + "}\n{name|" + title + "}",
-        top: "center",
-        left: "35%",
-        textStyle: {
-          rich: {
-            name: {
-              fontSize: 14,
-              color: "#a2a2a2",
-              padding: [10, 10],
-            },
-            val: {
-              fontSize: 28,
-              fontWeight: "bold",
-              padding: [0, -5],
-              color: "#333333",
-            },
-          },
-        },
-      },
-    ],
- 
-  series: [
-    {
-      type: "pie",
-      radius: ["40%", "60%"],
-      center: ["40%", "50%"],
-      data: echartData,
-      hoverAnimation: false,
-      itemStyle: {
-        normal: {
-        //   borderColor: bgColor,
-          borderWidth: 2,
-        },
-      },
-      labelLine: {
-        show:false
-      },
-      label: {
-        show:false
-      }
-    },
-  ],
-};
-
-}
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khtj/tjOption.js b/src/views/rcgl/jdkh/khtj/tjOption.js
deleted file mode 100644
index ee09ce8..0000000
--- a/src/views/rcgl/jdkh/khtj/tjOption.js
+++ /dev/null
@@ -1,114 +0,0 @@
-export default function tjOption(obj) {
-let title = "未整改";
-let color = ["#ff7a8c", "#52c1f5"];
-let echartData = [
-  {
-    name: "未整改",
-    value: obj[0]
-  },
-  {
-    name: "已整改",
-    value: obj[1],
-  },
-];
-
-let formatNumber = function (num) {
-  let reg = /(?=(\B)(\d{3})+$)/g;
-  return num.toString().replace(reg, ",");
-};
-let total = echartData.reduce((a, b) => {
-  return a + b.value * 1;
-}, 0);
-let percentFormat = function (num){
-    return ((num / total) * 100)?.toFixed(0).toString() + "%";
-  }
-let wzgPrecent = percentFormat(echartData[0]?.value)
-  return {
-    color: color,
-
-    legend: {
-      show: true,
-      orient: 'vertical',
-      right: '80',
-      top: 'center',
-      itemWidth: 10,
-      itemHeight: 10,
-      icon: 'circle',
-      itemGap:20,
-      textStyle: {
-        fontSize: 14,
-        rich: {
-          a: {
-            color: '#000',
-            width: 30
-          },
-          b:{
-            color: '#000',
-            fontSize: 14,
-            padding: [0, 30, 0, 40]
-        },
-        }
-      },
-      formatter: function(name) {
-        let title = ''
-        var total = 0;
-        var target;
-        var index;
-        for (var i = 0, l = echartData.length; i < l; i++) {
-            if (echartData[i].name == name) {
-                target = echartData[i].value;
-                title = echartData[i].label
-                index = i < 6 ? i : 5
-            }
-        }
-        return `{a| ${name}}{b| ${target}}`
-    }
-    },
-    title: [
-      {
-        // text: "{name|" + title + "}\n{val|" + formatNumber(total) + "}{unit|"  + "万m³" + "}",
-        text: "{val|" + wzgPrecent + "}\n{name|" + title + "}",
-        top: "center",
-        left: "35%",
-        textStyle: {
-          rich: {
-            name: {
-              fontSize: 14,
-              color: "#a2a2a2",
-              padding: [10, 10],
-            },
-            val: {
-              fontSize: 28,
-              fontWeight: "bold",
-              padding: [0, 0],
-              color: "#333333",
-            },
-          },
-        },
-      },
-    ],
- 
-  series: [
-    {
-      type: "pie",
-      radius: ["40%", "60%"],
-      center: ["40%", "50%"],
-      data: echartData,
-      hoverAnimation: false,
-      itemStyle: {
-        normal: {
-        //   borderColor: bgColor,
-          borderWidth: 2,
-        },
-      },
-      labelLine: {
-        show:false
-      },
-      label: {
-        show:false
-      }
-    },
-  ],
-};
-
-}
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khtj/toolbar.js b/src/views/rcgl/jdkh/khtj/toolbar.js
deleted file mode 100644
index 34d313b..0000000
--- a/src/views/rcgl/jdkh/khtj/toolbar.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateTimeRangeSo;
-    if (values.tm) {
-      dateTimeRangeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM'),
-        end: moment(values.tm[1]).format('YYYY-MM')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, ...dateTimeRangeSo});
-  }
-
-  useEffect(() => {
-    let dateTimeRangeSo = {
-      start: moment().subtract(1,"years").format('YYYY-MM'),
-      end: moment().format('YYYY-MM')
-    }
-    form.setFieldValue("tm", [moment(dateTimeRangeSo.start), moment(dateTimeRangeSo.end)])
-    setSearchVal({ ...dateTimeRangeSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="考核时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM"
-              picker="month"
-            />
-          </Form.Item>
- 
-         <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> 
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khwtzg/form.js b/src/views/rcgl/jdkh/khwtzg/form.js
deleted file mode 100644
index 0b10023..0000000
--- a/src/views/rcgl/jdkh/khwtzg/form.js
+++ /dev/null
@@ -1,347 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onUpdate, onSave, onSimilarSave }) => {
-console.log("record",record);
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/assessTeamRating/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.finishDate = values.finishDate?moment(values.finishDate).format("YYYY-MM-DD 00:00:00"):''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'zg') {
-      values.rectifyFiles = oldFiles;
-      // debugger
-      onUpdate(apiurl.rcgl.jdkh.khwtzg.finish,{...record,...values})
-    }
-  
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.rectifyFiles?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <div style={{maxHeight:"70vh",overflowY:"auto"}}>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-        <div style={{ marginBottom: 20, borderBottom: "1px solid #dfdfdf", width: "100%", paddingBottom: 5 }}><span style={{ padding: "0px 3px", backgroundColor: "#0079fe", marginRight: 20 }}></span>问题信息</div> 
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="考核任务名称"
-            >
-              <span>{record?.taskName}</span>
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="整改对象"
-            >
-              <span>{record?.objectUserName}</span>
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="整改项目"
-            >
-              <span>{record?.name}</span>
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="整改指标"
-            >
-              <span>{record?.indicatorName}</span>
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="问题描述"
-            >
-              <span>{record?.problemDesc}</span>
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="整改期限"
-            >
-              <span>{record?.rectifyLastDate}</span>
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="整改要求"
-            >
-              <span>{record?.rectifyRequirement}</span>
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="附件"
-            >
-              {record?.files.map(item => (
-                 <div key={item.fileId} style={{display:"flex"}}>
-                 <Image
-                     src={url + item?.filePath}
-                     style={{width:70,height:60,marginRight:10}}
-                 />
-             </div>
-              ))}
-            </Form.Item>
-          </Col>
-        </Row>
-        <div style={{marginBottom:20,borderBottom:"1px solid #dfdfdf",width:"100%",paddingBottom:5}}><span style={{padding:"0px 3px",backgroundColor:"#0079fe",marginRight:20}}></span>整改情况</div> 
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="完成日期"
-                name="finishDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="整改说明"
-                name="rectifyDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/assessTeamRating/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              完成整改
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/assessTeamRating/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/jdkh/khwtzg/index.js b/src/views/rcgl/jdkh/khwtzg/index.js
deleted file mode 100644
index c76fbc1..0000000
--- a/src/views/rcgl/jdkh/khwtzg/index.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Space, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const assessLevel = {
-    1: '优秀',
-    2: '良好',
-    3: '合格',
-  }
-  const task = {
-    0: "未整改",
-    1: "已整改",
-  }
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '考核任务名称', key: 'taskName', dataIndex: 'taskName', width: 200,},
-    { title: '整改对象', key: 'objectUserName', dataIndex: 'objectUserName', width: 200, ellipsis: true },
-    {
-      title: '考核等级', key: 'assessLevel', dataIndex: 'assessLevel', width: 200,
-      render: (v) => <span>{assessLevel[v]}</span>
-    },
-    {title: '整改项目', key: 'name', dataIndex: 'name', width: 200},
-    {title: '整改指标', key: 'indicatorName', dataIndex: 'indicatorName', width: 200},
-    {title: '问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 200},
-    {title: '整改期限', key: 'rectifyLastDate', dataIndex: 'rectifyLastDate', width: 200},
-    {
-      title: '状态', key: 'rectifyStatus', dataIndex: 'rectifyStatus', width: 200,
-      render: (value) => <span
-        style={{
-          display: "flex",
-          width:"50%",
-          alignItems: "center",
-          columnGap:5,
-          padding: "5px 10px",
-          color: "#689fff",
-          border: "1px solid #bbdcff",
-          background: "#ecf5ff",
-          borderRadius: "4px"
-        }}>
-        <span>{task[value]}</span>
-        <span style={{
-          display: "inline-block",
-          padding: 5,
-          background:value == 1 ? "#29c093" : "#d7d7d7"
-        }}></span>
-      </span>
-    },
-    {title: '整改完成日期', key: 'finishDate', dataIndex: 'finishDate', width: 200},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <Space>
-          <a onClick={() => command("view")(row)}>查看</a>
-          {!row.rectifyStatus ? <a  onClick={() => command("zg")(row)}>整改</a> : null}
-        </Space>
-      )
-    },
-  ];
-
-  const [zgItem, setZgItem] = useState()
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'zg') {
-      refModal.current.showUpdate({ ...params });
-      setZgItem(params)
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.aqgl.aqyhpc.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.jdkh.khwtzg.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/jdkh/khwtzg/index.less b/src/views/rcgl/jdkh/khwtzg/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/jdkh/khwtzg/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khwtzg/toolbar.js b/src/views/rcgl/jdkh/khwtzg/toolbar.js
deleted file mode 100644
index a1a4bcf..0000000
--- a/src/views/rcgl/jdkh/khwtzg/toolbar.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const [form] = Form.useForm();
-  const onFinish = (values) => {
-    let dateRangeSo;
-    if (values.tm) {
-      dateRangeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateRangeSo});
-  }
-
-  useEffect(() => {
-    const currentYear = moment().format('YYYY');
-    let dateRangeSo = {
-      start: moment(currentYear+ '-01-01').format('YYYY-MM-DD'),
-      end: moment(currentYear+ '-12-31').format('YYYY-MM-DD')
-    }
-    form.setFieldValue("tm", [moment(dateRangeSo.start), moment(dateRangeSo.end)])
-    setSearchVal({ dateRangeSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="整改期限" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="考核任务名称" name="taskName">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="状态" name="status">
-            <NormalSelect
-              allowClear
-              style={{ width: '150px' }}
-              options={[{ label: "未整改", value: 0 },{ label: "已整改", value: 1 }]} />
-          </Form.Item><Form.Item label="整改对象" name="objectUserName">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-           <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khzbgl/AdcdTreeSelector/index.less b/src/views/rcgl/jdkh/khzbgl/AdcdTreeSelector/index.less
deleted file mode 100644
index ac6ad25..0000000
--- a/src/views/rcgl/jdkh/khzbgl/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,47 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-.treeBox1{
-  .ant-tree-node-content-wrapper{
-    position: static !important;
-  }
-  .hover-ele{
-    &:hover{
-      color:#259dff
-    }
-  }
-}
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-
-  .treeTitle {
-    display: flex;
-    justify-content: space-between;
-    .treeBtn {
-        display: none;
-    }
-}
-.treeTitle:hover {
-    .treeBtn {
-        display: flex;
-    }
-}
-}
-.no-matter{
-  opacity: 0.5;
-}
\ No newline at end of file
diff --git a/src/views/rcgl/jdkh/khzbgl/AdcdTreeSelector/index.tsx b/src/views/rcgl/jdkh/khzbgl/AdcdTreeSelector/index.tsx
deleted file mode 100644
index fab5b67..0000000
--- a/src/views/rcgl/jdkh/khzbgl/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,311 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal,Form,Col,Row,message,Space } from 'antd';
-import { EditOutlined,PlusCircleOutlined, DeleteOutlined,ExclamationCircleOutlined} from '@ant-design/icons';
-import './index.less';
-import { formItemLayout, btnItemLayout } from '../../../../../components/crud/FormLayoutProps';
-import { getjdTreeData } from '../../../../../service/warn';
-import apiurl from '../../../../../service/apiurl';
-import { httppost3,httpget6 } from '../../../../../utils/request';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  onChangeOpen?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  isFetch?: boolean;
-}
-const { confirm } = Modal;
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({});
-  const [jdOpen, setJdOpen] = useState(false)
-  const [form] = Form.useForm();
-  const [mode, setMode] = useState('')
-  const [itemDetail, setItemDetail] = useState<any>({})
-  const [orderMax, setOrderMax] = useState<any>(0)
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    const adcdTreedata: any = await getjdTreeData();
-    const item:any = adcdTreedata
-    if (item) {
-      setSelectedKeys([item[0]?.id])
-      setAdcd(item[0]?.id)
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-      setOrderMax(Math.max(...adcdTreedata.map((item:any) => item?.orderIndex)))
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.name;
-        item.key = item.id;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.key;
-
-      let params = { id: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { id: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-
-
-
-
-  // 删除
-  const deleteJd = (v: any) => {
-    confirm({
-      title: '删除',
-      icon: <ExclamationCircleOutlined />,
-      content: '确认删除此数据',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk: async() => {
-        try {
-          const res = await httpget6(apiurl.rcgl.jdkh.khzbgl.deleteTree + `/${v.id}`)
-          if (res.code === 200) { 
-            message.success('删除成功');
-            getCustomerTreeData();
-          } 
-          if (res.code === 400) { 
-            message.error(res.description);
-          }
-        } catch (error) {
-          console.log(error);
-        }
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  }
- 
-  // 新增节点
-  const saveJd = (v: any) => {
-    if (v) {
-      //  form.setFieldValue('name', v.title);
-       setItemDetail(v);
-    }
-    setJdOpen(true);
-    setMode("save");
-  }
-
-  // 编辑节点
-  const editJd = (v: any) => { 
-    setJdOpen(true);
-    form.setFieldsValue(v);
-    setMode("edit");
-    setItemDetail(v);
-  }
-
-  const onOk = async () => { 
-    const name = form.getFieldValue('name').replace(/\s/g,"");
-    if(!name) return
-    const url = mode == "save" ? apiurl.rcgl.jdkh.khzbgl.saveTree : apiurl.rcgl.jdkh.khzbgl.editTree;
-    let saveParams = {
-      name,
-      parentId: itemDetail?.id || undefined,
-      orderIndex:itemDetail?.orderIndex || orderMax
-    }
-    let editParams = {
-      ...itemDetail,
-      name
-   } 
-    try {
-      const res = await httppost3(url, mode == "save" ? saveParams:editParams)
-      if (res.code == 200) {
-        message.success(mode == "save" ? '新增成功' : '编辑成功');
-        setJdOpen(false);
-        getCustomerTreeData();
-        form.resetFields();
-      } else if (res.code == 400) {
-        message.error(res.description);
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-      <div
-        style={{
-        padding: '10px',
-        color: "#409eff",
-        borderBottom: "1px solid #dfdfdf",
-        marginBottom: 20,
-        cursor: "pointer"
-        }}
-        onClick={saveJd}
-      >新增考核类目</div>
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"35%",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null 
-      }
-
-      <div className="treeBox1" style={{...treeBoxHeight,marginTop:"10px"}}>
-        <div style={{ width: "300px"}}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              showLine={true}
-              titleRender={(v: any) => {
-                return (
-                    <div
-                      style={{width:200}}
-                      className='treeTitle'
-                        >
-                        <span>{v.title}</span>
-                       <Space 
-                        size={4}
-                        className='treeBtn'
-                        >
-                          {/* <PlusCircleOutlined
-                               style={{ fontSize: 15 }}
-                               title='新增'
-                               onClick={(e) => {
-                                 e.stopPropagation();
-                                 saveJd(v);
-                               }}
-                               className='hover-ele'
-                             /> */}
-                          <EditOutlined
-                            title='编辑'
-                            style={{ fontSize: 15 }}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              editJd(v);
-                            }}
-                            className='hover-ele'
-                          />
-                          <DeleteOutlined
-                            title='删除'
-                            style={{ fontSize: 15 }}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              deleteJd(v);
-                            }}
-                            className='hover-ele'
-                          />
-                       
-                      </Space>
-                      </div>
-                )
-              }}
-            />
-          }
-        </div>
-      
-      </div>
-      <Modal
-        open={jdOpen}
-        title={mode == "save" ? "新增" : '编辑'}
-        destroyOnClose
-        onCancel={() => { setJdOpen(false); form.resetFields()}}
-        onOk={onOk}
-      >
-        <Form form={form} {...formItemLayout}>
-          <Row>
-            <Col span={24}>
-              <Form.Item
-                label="考核类目"
-                name="name"
-                rules={[{required: true}]}
-              >
-            <Input  allowClear/>
-           </Form.Item>
-            </Col>
-          </Row>
-        </Form>
-      </Modal>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/rcgl/jdkh/khzbgl/form.js b/src/views/rcgl/jdkh/khzbgl/form.js
deleted file mode 100644
index 3ca05d1..0000000
--- a/src/views/rcgl/jdkh/khzbgl/form.js
+++ /dev/null
@@ -1,317 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Table, Col, Popconfirm, InputNumber,Image,Modal,Typography} from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import moment from 'moment';
-const EditableCell = ({
-  editing,
-  dataIndex,
-  title,
-  inputType,
-  record,
-  index,
-  children,
-  ...restProps
-}) => {
-  const inputNode = inputType === 'number' ?
-    <InputNumber style={{ textAlign: "center", flex: 1 }} min={0} /> :
-    <Input style={{ textAlign: "center" }} />;
-  return (
-    <td {...restProps}>
-      {editing ? (
-        <Form.Item
-          name={dataIndex}
-          wrapperCol={[24]}
-          style={{
-            margin: 0,
-          }}
-        >
-          {inputNode}
-        </Form.Item>
-      ) : (
-        children
-      )}
-    </td>
-  );
-};
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
- const isEditing = (record) => {
-     return record.id === editingKey;
-  }
-  const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      width: 60,
-      render: (text, record, index) => <span>{ index + 1}</span>,
-      align: "center"
-    },
-    {
-      title: '描述',
-      key: 'ratingDesc',
-      dataIndex: 'ratingDesc',
-      width: 250
-      , align: "center",
-      editable: true,
-    },
-    {
-      title: '标准评分',
-      key: 'standardScore',
-      dataIndex: 'standardScore',
-      width: 100,
-      align: "center",
-      editable: true,
-    },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (_, record) => {
-        const editable = isEditing(record);  
-        return editable ? (
-          <span>
-            <Typography.Link
-              onClick={() => save(record.id)}
-              style={{
-                marginRight: 8,
-              }}
-            >
-              完成
-            </Typography.Link>
-           
-          </span>
-        ) : (
-            <div style={{display:"flex",justifyContent:"center",columnGap:10}}>
-              <Typography.Link
-                disabled={editingKey !== ''}
-                onClick={() => edit1(record)}
-              >
-            编辑
-            </Typography.Link>
-              <Popconfirm
-                title="确定要删除?"
-                onConfirm={() => handleDelete(record.id)}
-              >
-              <a>删除</a>
-            </Popconfirm>
-            </div>
-          
-            
-        );
-      },
-    },
-  ]
-  const [form] = Form.useForm();
-  const [form1] = Form.useForm();
-  const [editingKey, setEditingKey] = useState('');
-  const [disabled, setDisabled] = useState(false)
-  const [details, setDetails] = useState([])
-  const [standardScore1, setStandardScore] = useState('')
-  const detailsRef = useRef(null)
-  detailsRef.current = details
-
-
-  const newColumns = useMemo(() => {
-    let data = columns;
-    if (mode == "view") {
-      data.pop();
-      return data
-    } else {
-      return data;
-    }
-  }, [mode,editingKey])
-  const edit1 = (record) => {
-    setDisabled(true)
-    form1.setFieldsValue({
-      month: '',
-      drp:'',
-      ...record,
-    });
-    setEditingKey(record.id);
-  };
-
-  const handleAddRow = () => {
-    setDisabled(true)
-    const newData = {
-      id: (details.length + 1).toString(),
-      ratingDesc: '',
-      standardScore:''
-    };
-    form1.setFieldsValue(newData)
-    setDetails([...details, newData]);
-    detailsRef.current = [...details, newData]
-    setEditingKey(newData.id);
-  };
-  
-
-  const handleDelete = (key) => {
-    const newData = detailsRef.current.filter((item) => item.id !== key);
-    setDetails(newData);
-    detailsRef.current = newData
-    let total = newData.reduce((total,cur) => total + Number(cur.standardScore),0)
-    setStandardScore(total)
-  }; 
-
-
-  const save = async (key) => {
-    setDisabled(false)
-    try {
-      const row = await form1.validateFields();
-      const newData = [...details];
-      const index = newData.findIndex((item) => key === item.id);
-      if (index > -1) {
-        const item = newData[index];
-        newData.splice(index, 1, {
-          ...item,
-          ...row,
-        });
-        setDetails(newData);
-        detailsRef.current = newData
-        setEditingKey('');
-        let total = newData.reduce((total,cur) => total + Number(cur.standardScore),0)
-        setStandardScore(total)
-      } else {
-        newData.push(row);
-        setDetails(newData);
-        detailsRef.current = newData
-        setEditingKey('');
-      }
-    } catch (errInfo) {
-      console.log('Validate Failed:', errInfo);
-    }
-  };
-  const mergedColumns = newColumns.map((col) => {
-    if (!col.editable) {
-      return col;
-    }
-    return {
-      ...col,
-      onCell: (record) => ({
-        record,
-        inputType: col.dataIndex === 'standardScore' ? 'number' : "text",
-        dataIndex: col.dataIndex,
-        title: col.title,
-        editing: isEditing(record),
-      }),
-    };
-  });
- 
-  const onfinish = () => {
-    let values = form.getFieldsValue();
-    values.indicatorRatings = details;
-    values.categoryId = record.code;
-    values.standardScore = standardScore1;
-    if (mode === 'edit') {
-      values.id = record.id;
-      values.status = record.status;
-      onEdit(apiurl.rcgl.jdkh.khzbgl.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.jdkh.khzbgl.save,values)
-    }
-  }
-
-  useEffect(() => {
-    if (mode !== "save") { 
-      let total = record?.indicatorRatings?.reduce((total, cur) => total + cur.standardScore, 0)
-      setStandardScore(total)
-      setDetails(record.indicatorRatings)
-      detailsRef.current = record.indicatorRatings
-    }
-
- }, [record,mode])
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="指标名称"
-                name="indicatorName"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="指标编号"
-                name="indicatorCode"
-              >
-              <Input disabled={mode =='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="排序号"
-                name="orderIndex"
-              >
-                 <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="评分细则"
-              >
-              <Button
-                type="primary"
-                disabled={disabled || mode == "view"}
-                onClick={handleAddRow}
-                style={{ width: '23%' }}>新增</Button>
-              </Form.Item>
-          </Col> 
-      </Row>                   
-      </Form>
-      <div style={{display:"flex",justifyContent:"space-between"}}>
-        <span style={{ marginLeft: "auto" }}>标准分数：{ standardScore1}</span>
-      </div>
-      <Form form={form1} component={false}>
-        <Table
-          rowKey="id"
-          components={{
-            body: {
-              // row: EditableRow,
-              cell: EditableCell,
-            },
-          }}
-          columns={mergedColumns}
-          dataSource={details}
-          // scroll={{ x: width}}
-          pagination={false}
-        />
-
-{
-        mode==='view'?null:(
-          <div style={{marginTop:20}}>
-          <Form.Item wrapperCol={{span:2,offset:22}}>
-            <Button type="primary" onClick={onfinish} disabled={disabled}>
-                  {mode === 'save' ? '保存' :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </div>
-        )
-      }
-        </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/jdkh/khzbgl/index.js b/src/views/rcgl/jdkh/khzbgl/index.js
deleted file mode 100644
index 806f755..0000000
--- a/src/views/rcgl/jdkh/khzbgl/index.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image,Switch } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import AdcdTreeSelector from "./AdcdTreeSelector";
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
-  const refModal = useRef();
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '指标编号', key: 'indicatorCode', dataIndex: 'indicatorCode', width: 200},
-    {
-      title: '指标名称', key: 'indicatorName', dataIndex: 'indicatorName', width: 320,ellipsis:true},
-    {
-      title: '标准分数', key: 'standardScore', dataIndex: 'standardScore', width: 200 },
-    {
-      title: '排序号', key: 'orderIndex', dataIndex: 'orderIndex', width: 100,
-    },
-    {
-      title: '是否启用', key: 'status', dataIndex: 'status', width: 200,
-      render: (v, r) => <Switch
-      checkedChildren="启用"
-      unCheckedChildren="禁用"
-      checked={v == 0 ? true : false} 
-      onChange={(e) => { 
-        if (r?.isUsed) {
-          message.error("已使用指标无法修改启用状态");
-          return;
-        } else {
-          onEdit(apiurl.rcgl.jdkh.khzbgl.edit,{...r, status:e ? 0 : 1})
-        }
-      }} />
-    },
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={(editBtn && !row?.isUsed) ? true : false}
-        del={(delBtn && !row?.isUsed) ? true : false}
-        view={true}
-        command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  const [code, setCode] = useState()
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-
- 
-  const command = (type) => (params) => {
-    if (type === 'save') {   
-      refModal.current.showSave({code});
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params,code });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.jdkh.khzbgl.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.jdkh.khzbgl.page).find_noCode);
-
-  const onEdit = (path,values) => {
-    createCrudService(path).edit(values).then((result) => {
-      if (result?.code === 200) {
-        refresh()
-      }
-    })
-  }
-  useEffect(() => {
-    if (code) {
-      let params = {
-        search: {
-           menuId:code,
-          }
-        };
-      search(params)
-    }
-  }, [code]);
-  
-  
-  return (
-    <>
-       <div className='content-box' style={{ backgroundColor: '#fff', height: '100%',display:'flex',padding:'10px' }}>
-      <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)',width:'340px'}}>
-         <AdcdTreeSelector hasAlertBox={false} setAdcd={setCode}/>
-        </div>
-      <div className='AdcdTreeTableBox' style={{flex:1,overflowX:"auto"}}>
-         <Card className='nonebox'>
-          <ToolBar
-              onSave={command('save')}
-              role={role}
-          />
-        </Card>
-       
-        <Table
-          columns={columns}
-          rowKey="id"
-          {...tableProps}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-        />
-              
-   
-      </div>
-      
-      <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-      />
-    </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/jdkh/khzbgl/toolbar.js b/src/views/rcgl/jdkh/khzbgl/toolbar.js
deleted file mode 100644
index 47e06bd..0000000
--- a/src/views/rcgl/jdkh/khzbgl/toolbar.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  console.log("role",role);
-  
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
- 
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        {
-            (onSave) ?
-              <Form.Item>
-                <Button onClick={onSave} type='primary'>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/stlljc/drpOption.js b/src/views/rcgl/stlljc/drpOption.js
deleted file mode 100644
index a1ae680..0000000
--- a/src/views/rcgl/stlljc/drpOption.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import "echarts/extension/bmap/bmap"
-
-
-export default function drpOption (data,monthsData) {
-  console.log('data', data)
-  const maxQ = Math.ceil(Math.max(...data.map(obj => {
-    return  obj?.q ? obj?.q:0
-  })))
-  const minQ = Math.floor(Math.min(...data.map(obj => {
-    return  obj?.q? obj?.q :300
-  })))
-  const monthsX = Object.keys(monthsData);
-  const res = monthsX.map(item => {
-   const result =  data?.map(s => {
-    const momth = s.tm.substr("2024-0".length, "2024-0".length - 5);
-    if (momth == String(item)) {
-      return [s.tm,monthsData[item]]
-    } else {
-      return []
-    }
-   })
-    return result
-  })
-  const data1 = res.map(s => s.filter(o => o.length > 0)).filter(o => o.length > 0)
-  const lines = data1.map((item, index, c) => ({
-    type: 'line',
-    markLine: {
-      symbol:"none",
-      lineStyle: {
-        type: "dotted",
-        color: "#47daff",
-        width: 3
-      },
-      label: {
-        show: true,
-        position:"middle",
-        color: "#47daff",
-        distance: 5,
-        formatter: (value) => {
-          let months = value.data.coord[0].substr("2024-0".length, "2024-0".length - 5);
-          let val = value.data.coord[1]
-          return `${months}月核定生态流量${val}m³/s`
-        }
-      },
-      data: [
-        [{ coord: [item[0][0], item[0][1]] },{coord:[item[item.length - 1][0],item[item.length - 1][1]]}]
-      ]
-    }
-  }))
-  console.log("lines",lines,res);
-  return {
-    tooltip: {
-      trigger: 'axis'
-    },
-    grid: [
-      {
-        top: '18%',
-        left: '10%',
-        right: '12%',
-        bottom:"12%"
-        // width: '80%',
-        // height: '35%'
-      },
-    ],
-    legend: {
-      // 显示图例
-      show: true,
-    },
-   
-    xAxis: [
-      {
-        type: 'category',
-        data: data.map(o => o.tm),
-        // inverse: true,
-        splitLine: {
-          show: false
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-          formatter:function(val)  
-          {  
-            let value = val.substr('2020-'.length, 11)
-              var ret = "";//拼接加\n返回的类目项  
-              var maxLength = 6;//每项显示文字个数  
-              var valLength = value.length;//X轴类目项的文字个数  
-              var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数  
-              if (rowN > 1)//如果类目项的文字大于5,  
-              {  
-                  for (var i = 0; i < rowN; i++) {  
-                      var temp = "";//每次截取的字符串  
-                      var start = i * maxLength;//开始截取的位置  
-                      var end = start + maxLength;//结束截取的位置  
-                 //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧  
-                      temp = value.substring(start, end) + "\n";  
-                      ret += temp; //凭借最终的字符串  
-                  }  
-                  return ret;  
-              }  
-              else {  
-                   return value;  
-              }  
-          }  
-       
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#000',
-            width: 0.5
-          }
-        },
-        axisTick: {
-          show: false
-        }
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        // gridIndex:0,
-        position: 'left',
-        name: '生态流量(m³/s)',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#000',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        min: minQ,
-        max: maxQ 
-      },
-    ],
-    series: [
-      {
-        name: '生态流量(m³/s)',
-        type: 'line',
-        symbol: 'none',
-        color: '#4fa2ea',
-        smooth:true,
-        label: {
-          show: false
-        },
-        data: data.map(o => o.q)
-      },
-      ...lines
-    ]
-  }
-}
-
-
-
diff --git a/src/views/rcgl/stlljc/index.js b/src/views/rcgl/stlljc/index.js
deleted file mode 100644
index 3ee403b..0000000
--- a/src/views/rcgl/stlljc/index.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { httppost2,httpget2 } from '../../../utils/request';
-import llOptions from "./drpOption"
-import ReactEcharts from 'echarts-for-react';
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-
-  const [searchVal, setSearchVal] = useState()
-  const [chartData, setChartData] = useState([])
-  const [chartMonthData, setChartMonthData] = useState()
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '数据时间', key: 'tm', dataIndex: 'tm', ellipsis: true, align:"center" },
- 
-    { title: '生态流量(m³/s)', key: 'q', dataIndex: 'q',  ellipsis: true,align:"center", },
-  ];
-
-  const options = useMemo(() => {
-    if (chartData && chartData.length > 0 && chartMonthData) {
-      return llOptions(chartData, chartMonthData)
-    } else {
-      return llOptions([],{})
-    }
-  },[chartData,chartMonthData])
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.stlljk.page).find_noCode);
- 
-  const getChartData = async (params) => {
-    try {
-      const res = await httppost2(apiurl.rcgl.stlljk.list, params)
-      setChartData(res.data)
-    } catch (error) {
-      
-    }
-  }
-
-  const getMonthData = async (params) => {
-    try {
-      const res = await httpget2(apiurl.rcgl.stlljk.months, params)
-      setChartMonthData(res.data)
-    } catch (error) {
-      
-    }
-  }
- 
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          isAsc: false,
-        orderField:"tm",
-        },
-        orderField:"tm",
-      };
-      search(params)
-      getChartData(params?.search)
-      getMonthData(searchVal)
-    }
-
-  }, [searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-            <ToolBar
-            setSearchVal={setSearchVal}
-            role={role}
-            />
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <div style={{ display: "flex", columnGap: 30 }}>
-            <div style={{width:500}}>
-                  <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ y: "calc( 100vh - 400px )"}}/> 
-              </div>
-              <div style={{ flex: 1 }}>
-              {
-                  chartData.length > 0 ?
-                    <ReactEcharts
-                      option={options}
-                      style={{width: "100%", height: 360}}
-                      notMerge={true}
-                    /> : <div style={{textAlign: "center", margin: "10%"}}>
-                      <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                    </div>
-                }
-              </div>
-          </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/stlljc/index.less b/src/views/rcgl/stlljc/index.less
deleted file mode 100644
index d22a6aa..0000000
--- a/src/views/rcgl/stlljc/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
\ No newline at end of file
diff --git a/src/views/rcgl/stlljc/toolbar.js b/src/views/rcgl/stlljc/toolbar.js
deleted file mode 100644
index 650372c..0000000
--- a/src/views/rcgl/stlljc/toolbar.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-  const [form] = Form.useForm();
-
-
-  const onValuesChange = (e) => {
-    switch (e.ranger) {
-      case 1:
-        form.setFieldValue("tm",[moment().startOf("day"),moment()])
-        break;
-      case 2:
-          form.setFieldValue("tm",[moment().subtract(7, 'days'),moment()])
-        break;
-      case 3:
-          form.setFieldValue("tm",[moment().subtract(1, 'months'),moment()])
-        break;
-      case 4:
-          form.setFieldValue("tm",[moment().subtract(3, 'months'),moment()])
-        break;
-      case 5:
-          form.setFieldValue("tm",[moment().subtract(1, 'years'),moment()])
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        startTime: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        endTime: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...dateSo});
-  }
-
-
-   useEffect(() => {
-    let time = [moment().subtract(1,"months"),moment()]
-     let dateSo = {
-       startTime:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-       endTime:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-    }
-    form.setFieldValue("tm",time)
-    setSearchVal({...dateSo})
-  }, [])
-
- 
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item label="常用时段" name="ranger">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/szzb/index.js b/src/views/rcgl/szzb/index.js
deleted file mode 100644
index a4d0a68..0000000
--- a/src/views/rcgl/szzb/index.js
+++ /dev/null
@@ -1,187 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message,Menu } from 'antd';
-import ReactEcharts from 'echarts-for-react';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { httppost5, httppost2 } from '../../../utils/request';
-import { exportFile } from '../../../utils/tools.js';
-import moment from 'moment';
-import szOption from './szOptions';
-
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [newColumns, setNewColumns] = useState([])
-  const [selected, setSelected] = useState("数据表")
-  const [chartData, setChartData] = useState()
-  const option = useMemo(() => {
-    if (chartData) {
-      return szOption(chartData);
-    } 
-  }, [chartData])
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center"},
-  ];
-
-  const iColumns = useMemo(() => {
-    if (newColumns.length) {
-      return [...columns,...newColumns]
-    } else {
-      return columns
-    }
-     
-  },[newColumns])
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [iColumns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.gcaqjc.gcaqyj.yhyj.delete + `/${params.goodsId}`);
-    }
-  }
- 
-  const getTableHead = async() => {
-   try {
-     const res = await httppost2(apiurl.rcgl.szzb.list)
-     const newData = res.data.filter(s => s.isShow == 0 && s.enName != "id")
-     const newColmns1 = newData.map(item => ({
-       title: item.cnName + (item.unit || ''),
-       key: item.enName,
-       name: item.cnName,
-       unit:item.unit,
-       dataIndex: item.enName,
-       width: 200,
-       ellipsis: true,
-       align: "center",
-       render: item.isCompare == 1 ? (rec, record) => <span>{rec}</span> :
-         (rec, record) => <span style={(record[`${item.enName}Level`]?.includes("Ⅳ") || record[`${item.enName}Level`]?.includes("V")) ? { color: "red" } : {}}>{rec} </span>
-     }))
-     setNewColumns(newColmns1)
-   } catch (error) {
-    console.log(error);
-   }
- }
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.szzb.page).find_noCode);
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-      id: 1,  //后端需要 无任何意义
-      "orderField": "tm",
-      "isAsc": false,
-      pageSo: {
-        pageNumber: tableProps.pagination.current,
-        pageSize:tableProps.pagination.pageSize
-      }
-    }
-    let startTime = moment(searchVal.startTime).format("YYYY-MM-DD")
-    let endTime = moment(searchVal.endTime).format("YYYY-MM-DD");
-    httppost5(apiurl.rcgl.szzb.export, params).then(res => {
-      exportFile(`${startTime}至${endTime}水质数据.xlsx`,res.data)
-  })
-  }
-
-  const onChecked = (e) => {
-    setSelected(e)
-  }
-
-  const selectItem = (e) => {
-    let findItem = newColumns.find(s => s.key == e.key);
-    let data = tableProps.dataSource.map(s => ({
-      tm:s?.tm ? moment(s?.tm).format("YYYY-MM-DD"): '', res: s[findItem.key]
-    }))
-    setChartData({name:findItem.name,unit:findItem.unit,data})
-  }
-
-  const getItem = (label, key, icon, children, type) => {
-    return {
-      key,
-      icon,
-      children,
-      label,
-      type,
-    };
-  }
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          id: 1,  //后端需要 无任何意义
-          "orderField": "tm",
-          "isAsc": false,
-        }
-      };
-      search(params)
-    }
-  }, [searchVal])
-  useEffect(() => {
-    getTableHead()
-  }, [])
-  
-  useEffect(() => {
-    if (newColumns.length > 0 && tableProps.dataSource.length > 0) { 
-      let findItem = newColumns.filter(s => s.name != "采集时间")[0]
-      let data = tableProps.dataSource.map(s => ({
-        tm:s?.tm ? moment(s?.tm).format("YYYY-MM-DD"): '', res: s[findItem.key]
-      }))
-      setChartData({name:findItem.name,unit:findItem.unit,data})
-    }
-  }, [newColumns,tableProps.dataSource])
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              exportFile={exportExcel}
-              onChecked={onChecked}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            {
-              selected == "数据表" ? 
-                <Table columns={iColumns} rowKey="inx" {...tableProps} scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-                :
-                <div className='charts-box' style={{display:"flex",columnGap:10,maxHeight:'calc(100vh - 110px)'}} >
-                  <div className='left-content' style={{width:323,maxHeight:'calc(100vh - 180px)',overflowY:"auto"}}>
-                  <Menu
-                    onClick={(e) =>{selectItem(e)}}
-                    defaultSelectedKeys={[newColumns.filter(s => s.name != "采集时间")[0].key]}
-                    mode="inline"
-                    items={newColumns.filter(s => s.name != "采集时间").map(item => getItem(item.name,item.key,null))}
-                  />
-                  </div>
-                  <div className='right-content' style={{ flex: 1, background: "#f3fafd" }}>
-                  <ReactEcharts
-                option={option}
-                      style={{ width: "100%", height: '100%' }}
-                      notMerge={true}
-              /> 
-                  </div>
-                </div>
-              }
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/szzb/index.less b/src/views/rcgl/szzb/index.less
deleted file mode 100644
index 43fe303..0000000
--- a/src/views/rcgl/szzb/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
diff --git a/src/views/rcgl/szzb/szOptions.js b/src/views/rcgl/szzb/szOptions.js
deleted file mode 100644
index d7ba420..0000000
--- a/src/views/rcgl/szzb/szOptions.js
+++ /dev/null
@@ -1,126 +0,0 @@
-export default function szOption( chartData ) {
-   // 字体颜色
-   console.log("chartData",chartData);
-   const textColor = '#666'
-   const maxY = Math.ceil(Math.max(...chartData?.data?.map(s => s.res)))
-   const minY = Math.floor(Math.min(...chartData?.data?.map(s => s.res)))
-    return {
-        legend: {
-            top: "4%",
-            y: "center",
-            itemWidth: 30,
-            itemHeight: 15,
-            itemGap: 15,
-            textStyle: {
-               fontSize: 20,
-               color: "#000",
-               padding: [0, 0, 0, 6],
-            },
-         },
-            tooltip: {
-               trigger: 'axis'
-            },
-            grid: {
-               top: '20%',
-               left: '5%',
-               right: '10%',
-               bottom: '20%',
-               containLabel: true
-            },
-            xAxis: {
-               type: 'category',
-               data: chartData?.data?.map(s => s.tm),
-               axisLabel: {
-                  // 坐标轴字体颜色
-                  color: textColor,
-                  fontSize: 18
-               },
-               axisLine: {
-                  lineStyle: {
-                     color: textColor
-                  }
-               },
-               axisTick: {
-                  // y轴刻度线
-                  show: true
-               },
-               splitLine: {
-                  // 网格
-                  show: false
-               },
-               boundaryGap: false
-            },
-            yAxis: {
-               type: 'value',
-               min: minY,
-               max:maxY,
-               name: chartData?.unit,
-               nameTextStyle: {
-                  color: '#333',
-                  fontSize: 18,
-                //   padding: [0, 0, 0, 80]
-               },
-               axisLabel: {
-                  // 坐标轴字体颜色
-                  color: textColor,
-                  fontSize: 18
-               },
-               axisLine: {
-                  show: true
-               },
-               axisTick: {
-                  // y轴刻度线
-                  show: false
-               },
-               splitLine: {
-                  // 网格
-                  show: true,
-                  lineStyle: {
-                     color: '#CCCCCC',
-                     type: 'dashed'
-                  }
-               }
-            },
-         
-            series: [
-               {
-                  name: chartData?.name,
-                  type: 'line',
-                  symbol: 'circle',
-                  smooth: true,
-                  symbolSize: 7,
-                  z: 1,
-                  itemStyle: {
-                     color: '#44ceff'
-                  },
-                  lineStyle: {
-                     color: '#44ceff'
-                  },
-                //   areaStyle: {
-                //      color: {
-                //         x: 0,
-                //         y: 0,
-                //         x2: 0,
-                //         y2: 1,
-                //         type: 'linear',
-                //         global: false,
-                //         colorStops: [
-                //            {
-                //               offset: 0,
-                //               color: 'rgba(84,135,255,0.5)'
-                //            },
-                //            {
-                //               offset: 1,
-                //               color: 'rgba(84,135,255,0.1)'
-                //            }
-                //         ]
-                //      }
-                //   },
-                  data: chartData?.data?.map(s => s.res)
-               }
-            ]
-        
-    }
-}
-
-
diff --git a/src/views/rcgl/szzb/toolbar.js b/src/views/rcgl/szzb/toolbar.js
deleted file mode 100644
index e55c252..0000000
--- a/src/views/rcgl/szzb/toolbar.js
+++ /dev/null
@@ -1,143 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker,Segmented } from 'antd';
-import { AppstoreOutlined, BarsOutlined } from '@ant-design/icons'
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onChecked, exportFile, role }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  const [checked, setChecked] = useState("数据表")
-  
-  const optionsType = [
-    {
-      label: "今日",
-      value:1
-    },
-    {
-      label: "近一周",
-      value:2
-    },
-    {
-      label:"近一月",
-      value:3
-    },
-    {
-      label:"近三月",
-      value:4
-    },
-    {
-      label:"近一年",
-      value:5
-    },
-  ]
-
-  const options = [
-    {
-      label: "数据表",
-      value: "数据表",
-      icon:<BarsOutlined />,
-    },
-    {
-      label: "数据图",
-      value: "数据图",
-      icon:<BarsOutlined />,
-    },
-  ]
-  const [form] = Form.useForm();
-
-
-  const onValuesChange = (e) => {
-    switch (e.ranger) {
-      case 1:
-        form.setFieldValue("tm",[moment().startOf("day"),moment()])
-        break;
-      case 2:
-          form.setFieldValue("tm",[moment().subtract(7, 'days'),moment()])
-        break;
-      case 3:
-          form.setFieldValue("tm",[moment().subtract(1, 'months'),moment()])
-        break;
-      case 4:
-          form.setFieldValue("tm",[moment().subtract(3, 'months'),moment()])
-        break;
-      case 5:
-          form.setFieldValue("tm",[moment().subtract(1, 'years'),moment()])
-          break;
-      default:
-        break;
-    }
-    
-  }
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, startTime:dateSo?.start,endTime:dateSo?.end});
-  }
-
- 
-  useEffect(() => {
-    let time = [moment().subtract(1,"years"),moment()]
-     let dateSo = {
-       start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-       end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-    }
-    form.setFieldValue("tm",time)
-    setSearchVal({startTime:dateSo.start, endTime:dateSo.end})
-  }, [])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="采集时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item label="常用时段" name="ranger">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={optionsType}
-            />
-          </Form.Item>
-            {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null}
-          <Form.Item>
-          <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            exportBtn ?
-              <Form.Item>
-                <Button onClick={()=>exportFile()}>导出</Button>
-              </Form.Item>
-            :null
-          }
-          <Form.Item
-            wrapperCol={{span:14,offset:10}}
-          >
-            <Segmented
-              options={options}
-              onChange={(e) => {
-                setChecked(e);
-                onChecked(e)
-              }}
-              value={checked}
-            />
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/wxyh/form.js b/src/views/rcgl/wxyh/form.js
deleted file mode 100644
index b5f615e..0000000
--- a/src/views/rcgl/wxyh/form.js
+++ /dev/null
@@ -1,361 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,VideoCameraOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../service/apiurl';
-
-import NormalSelect from '../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  
-  const types = [
-    {label:"溢洪道淸障",value:1},
-    {label:"除草除杂",value:2},
-    {label:"设备养护",value:3},
-    {label:"环境清洁",value:4},
-    {label:"危险提示",value:5},
-    {label:"其他",value:6},
-  ]
-  const [form] = Form.useForm();
-  const [imgloading, setImgLoading] = useState(false)
-  const [imgfileList, setImgFileList] = useState([]) //上传文件列表
-  const [videoFileList, setVideoFileList] = useState([]) //上传文件列表
-  const [videoLoading, setVideoLoading] = useState(false)
-  const [videoOpen, setVideoOpen] = useState(false)
-  const [videoParams, setVideoParams] = useState({})
-
-  const videoDeleteFile = (fileId) => {
-    let filterFile = videoFileList.filter(item => item.response?.data?.fileId !== fileId);
-    setVideoFileList(filterFile)
-  }
-  const videoBeforeUpload = (file) => {
-    if (videoFileList.length == 1) {
-      message.warning('只能上传一个视频！');
-      return false;
-    }
-    const isJpgOrPng =
-      file.type === 'video/mp4' ||
-      file.type === 'video/avi';
-    if (!isJpgOrPng) {
-      message.error('请上传视频格式的文件！');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 50;
-    if (!isLt2M) {
-      message.error('视频大小需小于50M!');
-    }
-    return isJpgOrPng && isLt2M  ? true : Upload.LIST_IGNORE;
-  };
-  const videoFileChange = (info) => {
-    if (info.file.status === "done") {
-      setVideoLoading(false);
-    setVideoFileList(info.fileList)
-    }
-    if (info.file.status === "uploading") { 
-      setVideoLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setVideoLoading(false);
-    }
-    setVideoFileList(info.fileList)
-  }
-
-  
- 
-  const onfinish = (values) => {
-    const userId =  localStorage.getItem('userId')
-    values.reportTime = values.reportTime?moment(values.reportTime).format("YYYY-MM-DD 00:00:00"):''
-    let imgFiles = imgfileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    let videoFiles = videoFileList.map(item => ({ fileId: item.response?.data?.fileId }))
-    values.pics = imgFiles;
-    values.videos = videoFiles;
-    values.userId = userId
-    if (mode === 'edit') {
-   
-      values.id = record.id;
-      onEdit(apiurl.rcgl.wxyh.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.wxyh.save,values)
-    }
-  }
-  
-  const imgbeforeUpload = (file) => {
-    const isJpgOrPng =
-      file.type === 'image/jpeg' ||
-      file.type === 'image/jpg' ||
-      file.type === 'image/png';
-    
-    if (!isJpgOrPng) {
-      message.error('请上传图片格式的文件！');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 5;
-    if (!isLt2M) {
-      message.error('图片大小需小于5M!');
-    }
-    return isJpgOrPng && isLt2M ? true : Upload.LIST_IGNORE;
-  };
-
-  const imgdeleteFile = (fileId) => {
-    let filterFile = imgfileList.filter(item => item.response?.data?.fileId !== fileId);
-    setImgFileList(filterFile)
-  }
-  const imgfileChange = (info) => {
-    console.log("info",info);
-    if (info.file.status === "done") {
-      setImgLoading(false);
-    }
-    if (info.file.status === "uploading") {
-      setImgLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setImgLoading(false);
-    }
-    setImgFileList(info.fileList)
-  }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.pics?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-        }))
-        const videoFile = record?.videos?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-        }))
-        setImgFileList(imgFile)
-        setVideoFileList(videoFile)
-      }
-    }, [record, mode])
-
- useEffect(() => {
-   const name = localStorage.getItem('userName')
-   form.setFieldValue("reportUserName", name)
- }, [])
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报时间"
-                name="reportTime"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="上报人"
-                name="reportUserName"
-              >
-                <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="管护类型"
-                name="maintainType"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect allowClear style={{ width: '100%' }} options={types} />
-              </Form.Item>
-          </Col>  
-      </Row>          
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="内容"
-                name="maintainContent"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="现场图片"
-                name="picId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/maintain/service/file/upload/singleSimple"
-                onChange={imgfileChange}
-                beforeUpload={imgbeforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={imgfileList}
-                  disabled={imgloading}
-              >
-                   <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.jpg .png 
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-              {
-                   imgloading ? <span>文件正在上传中，请等待</span> :
-                  imgfileList.length > 0 && imgfileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                          </div>
-                        <div
-                          className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'}
-                          onClick={() => imgdeleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined
-                          />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-       </Row>
-       <Row>
-          <Col span={24}>
-              <Form.Item
-                label="视频资料"
-                name="videofieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              {mode !== "view" && 
-                <Dragger
-                name='file'
-                action="/gunshiApp/tsg/maintain/service/file/upload/singleSimple"
-                onChange={videoFileChange}
-                beforeUpload={videoBeforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                fileList={videoFileList}
-                maxCount={1}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传(最大50M)</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.mp4 .avi
-                </p>
-              </Dragger>
-              }
-              <Row gutter={[16]}>
-                {
-                   videoLoading ? <span>文件正在上传中，请等待</span> :
-                  videoFileList.length > 0 && videoFileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                        <div
-                            onClick={() => { setVideoOpen(true); setVideoParams(file)}}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <VideoCameraOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                            <span>{file.name}</span>
-                          </div>
-                        <div
-                          className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'}
-                          onClick={() => videoDeleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined
-                          />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-
-      <Modal
-        open={videoOpen}
-        width={800}
-        title="视频预览"
-        footer={null}
-        onCancel={() => setVideoOpen(false)}
-      >
-        <video
-          controls
-          src={url + videoParams?.response?.data?.filePath}
-          style={{width:"100%",height:"100%"}}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/wxyh/index.js b/src/views/rcgl/wxyh/index.js
deleted file mode 100644
index ffd2a5c..0000000
--- a/src/views/rcgl/wxyh/index.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")|| true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")|| true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")|| true;
-
-  const types = {
-    1: '溢洪道淸障',
-    2: '除草除杂',
-    3: '设备养护',
-    4: '环境清洁',
-    5: '危险提示',
-    6: '其他',
-  }
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [imgVisible, setImgVisible] = useState(false)
-  const [imgList, setImgList] = useState([])
-  const [videoOpen, setVideoOpen] = useState(false)
-  const [videoParams, setVideoParams] = useState({})
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '上报日期', key: 'reportTime', dataIndex: 'reportTime', width: 140, },
-    {
-      title: '管护类型', key: 'maintainType', dataIndex: 'maintainType', width: 200,
-      render: (value) => <span>{value ? types[value] : ''}</span>
-    },
-    { title: '内容', key: 'maintainContent', dataIndex: 'maintainContent', width: 300 },
-    {
-      title: '图片', key: 'pics', dataIndex: 'pics', width: 100,align: 'center',
-      render: (value) => <div>{value ? <a onClick={()=>reviewPic(value)}> { value.length} </a>: ''}</div>
-    },
-    {
-      title: '视频', key: 'videos', dataIndex: 'videos', width: 100,align: 'center',
-      render: (value) => <div>{value ? <a onClick={()=>reviewVideo(value)}> { value.length} </a>: ''}</div>
-    },
-    {title: '上报人', key: 'reportUserName', dataIndex: 'reportUserName', width: 100},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.wxyh.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.wxyh.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-  }
- 
-  const reviewPic = (arrPic) => {
-    if (arrPic.length > 0) {
-      setImgVisible(true)
-      setImgList(arrPic)
-    }
-  }
- 
-  const reviewVideo = (arrVideo) => {
-    if (arrVideo.length > 0) {
-      setVideoOpen(true)
-      setVideoParams(arrVideo[0])
-    }
-  }
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-      <div style={{ display: "none" }}>
-        <Image.PreviewGroup
-            preview={{
-              visible:imgVisible,
-              onVisibleChange: (vis) => setImgVisible(vis),
-            }}
-        >
-          {
-              imgList.length > 0 ? imgList.map(item => (
-                <Image src={ url + item.filePath} key={item?.id}/>
-            ))
-            : null
-          }
-
-        </Image.PreviewGroup>
-
-      </div>
-      <Modal
-        open={videoOpen}
-        width={800}
-        title="视频预览"
-        footer={null}
-        onCancel={() => setVideoOpen(false)}
-      >
-        <video
-          controls
-          src={url + videoParams?.filePath}
-          style={{width:"100%",height:"100%"}}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/wxyh/index.less b/src/views/rcgl/wxyh/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/wxyh/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/wxyh/toolbar.js b/src/views/rcgl/wxyh/toolbar.js
deleted file mode 100644
index b479927..0000000
--- a/src/views/rcgl/wxyh/toolbar.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-import NormalSelect from '../../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-
-  const types = [
-    {label:"溢洪道淸障",value:1},
-    {label:"除草除杂",value:2},
-    {label:"设备养护",value:3},
-    {label:"环境清洁",value:4},
-    {label:"危险提示",value:5},
-    {label:"其他",value:6},
-  ]
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateTimeSo;
-    if (values.tm) {
-      dateTimeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeSo});
-  }
-
-  useEffect(() => {
-    let dateTimeSo = {
-      start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 00:00:00')
-    }
-    form.setFieldValue("tm", [moment(dateTimeSo.start), moment(dateTimeSo.end)])
-    setSearchVal({ dateTimeSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="管护类型" name="maintainType">
-            <NormalSelect allowClear style={{ width: '150px' }} options={types} />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/xcxj/xjrw/detailForm.js b/src/views/rcgl/xcxj/xjrw/detailForm.js
deleted file mode 100644
index b35dddc..0000000
--- a/src/views/rcgl/xcxj/xjrw/detailForm.js
+++ /dev/null
@@ -1,443 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker,Tabs, Tooltip,message,Image,Modal,Typography ,Popconfirm, Descriptions } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined,VideoCameraOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-import { httpget2 } from '../../../../utils/request';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave,submit }) => {
-console.log(record);
- const taskTypes = [
-    {label:"日常巡查",value:0},
-    {label:"特别检查",value:1},
-    {label:"汛前巡检",value:2},
-  ]
-  const statusTypes = [
-    {label:"未完成",value:0},
-    {label:"进行中",value:1},
-    {label:"已完成",value:2},
-  ]
-  const xjStatus = {
-      0: "cha",
-      1:"gou"
-    }
-    const renderTooltip = (value) => {   
-        return (
-            <>
-                <Descriptions>
-                    <Descriptions.Item label="问题描述" span={3}>
-                        {value?.itemProblemDesc}
-                    </Descriptions.Item> 
-                    <Descriptions.Item label="处理建议">
-                        {value?.handleSuggestion}
-                    </Descriptions.Item> 
-                </Descriptions>
-            </>
-      )
-  }  
-  const columns = [
-      {
-          title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-          render: (value, row, index) => <span>{index + 1}</span>
-       },
-      {
-          title: '巡查项', key: 'itemDesc', dataIndex: 'itemDesc', width: 200, 
-          render: (value, row, index) =>
-              <div style={{ position: "relative" }}>
-                  <div style={{width:"80%",whiteSpace:"nowrap",textOverflow:"ellipsis",overflow:"hidden"}} title={value}>{value}</div>
-                  <span style={{ position: "absolute", top: 0, right: 0 }}>
-                  <Tooltip 
-                          title={renderTooltip(row)}
-                          color='#ffffff'
-                    >
-                  <img style={{width:20,height:20}} src={`${process.env.PUBLIC_URL}/assets/xyt/rcgl/wenhao.png`}/>
-                  </Tooltip>
-                  </span>
-          </div>
-       },  
-      { title: '巡查状态', key: 'isNormal', dataIndex: 'isNormal', width: 100, align: "center",
-        render: (value) => <div>
-            <img style={{width:value ? 20: 17,height:value ? 20: 17}} src={`${process.env.PUBLIC_URL}/assets/xyt/rcgl/${xjStatus[value]}.png`}
-          alt='' /></div>
-       },  
-      { title: '巡查问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 300,ellipsis:true },
-      { title: '巡查图片', key: 'inspectPics', dataIndex: 'inspectPics', width: 100,align: "center",
-         render: (value) => <div>{value ? <a onClick={()=>reviewPic(value)}> { value.length} </a>: ''}</div>
-        
-       },
-      { title: '巡查视频', key: 'inspectVideos', dataIndex: 'inspectVideos', width: 100,align: "center",
-        render: (value) => <div>{value ? <a onClick={()=>reviewVideo(value)}> { value.length} </a>: ''}</div>
-        
-       },
-      {
-          title: '是否处理', key: 'isHandle', dataIndex: 'isHandle', width: 100,align: "center",
-          render: (value) => <span>{value? "是" : "否"}</span>
-       },
-      { title: '处理人', key: 'handleUserName', dataIndex: 'handleUserName', width: 150 },
-      {
-          title: '操作', key: 'operator', dataIndex: 'operator', width: 150,
-          render:(value,row) => <a onClick={() =>handleDetail(row)}>处理详情</a>
-       },
-      
-    ]  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-    
-    const [form] = Form.useForm();
-    const [imgVisible, setImgVisible] = useState(false)
-    const [imgList, setImgList] = useState([])
-    const [videoOpen, setVideoOpen] = useState(false)
-    const [videoParams, setVideoParams] = useState({})
-    const [tabsRender, setTabsRender] = useState([])
-    const [totals, setTotals] = useState({})
-    const [handleDetailsOpen, setHandleDetailsOpen] = useState(false)
-    const [handleDetails, setHandleDetails] = useState({})
-    const [handleImgfileList, setHandleImgFileList] = useState([]) //上传文件列表
-    const [handleVideoFileList, setHandleVideoFileList] = useState([]) //上传文件列表
-    const handleDetail = (row) => {
-        setHandleDetailsOpen(true)
-        setHandleDetails(row)
-    }
-
-    const reviewPic = (arrPic) => {
-    if (arrPic.length > 0) {
-      setImgVisible(true)
-      setImgList(arrPic)
-    }
-  }
- 
-  const reviewVideo = (arrVideo) => {
-    if (arrVideo.length > 0) {
-      setVideoOpen(true)
-      setVideoParams(arrVideo[0])
-    }
-    }
-    const renderItems = (items) => { 
-        const result = items.map(o => ({
-            key: o.pointId,
-            label: o.name + `(${o.children.filter(r=>r.isNormal == 0).length})`,
-            children: 
-                <Table
-                columns={columns}
-                rowKey={o.id}
-                pagination={false}
-                dataSource={o.children}
-                scroll={{ x: width, y: "calc( 100vh - 400px )" }} />      
-        }))
-        setTabsRender(result)
-    }
-    const getTabsDetail = async (id) => { 
-        let items = {};
-        try {
-            const res = await httpget2(apiurl.rcgl.xcxj.xjrw.info,{taskId:id});
-            renderItems(res.data)
-             res.data.forEach(o => {
-                 items.isNormalTotal = o.children.filter(item => item.isNormal == 0).length;
-                 items.normalTotal = o.children.filter(item => item.isNormal == 1).length;
-            })
-            setTotals(items);           
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    const handleFile = (arr=[]) => {
-        const newArr = arr?.map(item => ({
-          name: item.fileName,
-          response: {
-                data: {
-                  filePath: item.filePath,
-                  fileId:item.fileId
-                }
-              },
-        }))
-        return newArr
-    }
-  useEffect(() => {
-    const handleImgFile = handleFile(handleDetails?.handlePics || []);
-    const hanldeVideoFile = handleFile(handleDetails?.handleVideos || []);
-    setHandleImgFileList(handleImgFile)
-    setHandleVideoFileList(hanldeVideoFile)
-  }, [handleDetails])
-    
- useEffect(() => {
-     getTabsDetail(record.id)
- }, [record])
- 
-  return (
-    <div style={{maxHeight:"70vh",overflowY:"auto"}}>
-      <div
-        style={{ marginBottom: 20, borderBottom: "1px solid #dfdfdf", width: "100%", paddingBottom: 5 }}>
-        <span style={{ padding: "0px 3px", backgroundColor: "#0079fe", marginRight: 20 }}></span>基本信息</div>
-      <Form
-        form={form}
-        {...formItemLayout}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="任务标题"
-                name="taskTitle"
-            >
-               <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="任务类型"
-                name="taskType"
-            >
-                <NormalSelect
-                style={{ width: '100%' }}
-                allowClear
-                options={taskTypes}
-                disabled={mode === 'view'}
-              />
-              </Form.Item>
-          </Col> 
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="任务内容"
-                name="taskContent"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-         
-            <Col span={12}>
-            <Form.Item
-              label="开始日期"
-              name="startDate"
-              getValueFromEvent={(e,dateString) => dateString}
-              getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              placeholder="" 
-            >
-              <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-            </Form.Item>
-           </Col>
-          <Col span={12}>
-              <Form.Item
-                label="结束日期"
-                name="endDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                placeholder=""
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="接收时间"
-                name="receiveTime"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                placeholder=""
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-           <Col span={12}>
-           <Form.Item
-             label="完成时间"
-             name="finishTime"
-             getValueFromEvent={(e,dateString) => dateString}
-             getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-             placeholder=""
-
-           >
-             <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm'} style={{width:'100%'}} allowClear />
-           </Form.Item>
-       </Col> 
-      </Row>   
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="巡查人"
-                name="inspectUserName"
-            >
-               <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="任务状态"
-                name="status"
-            >
-                <NormalSelect 
-                    disabled={mode==='view'}  
-                    style={{width:'100%'}} 
-                    allowClear 
-                    options={statusTypes}
-                    />
-              </Form.Item>
-          </Col> 
-      </Row>
-   
-      <div
-        style={{borderBottom: "1px solid #dfdfdf", width: "100%", paddingBottom: 5,display:"flex" }}>
-                  <span style={{ padding: "0px 3px", backgroundColor: "#0079fe", marginRight: 20 }}></span>
-                  <span>巡查信息</span>
-                  {record?.status == 2 ? 
-                      <span style={{ marginLeft: "auto", marginRight: 30 }}>(异常项：<span style={{ color: "red" }}>{totals?.isNormalTotal}</span>，正常项：{totals?.normalTotal})</span>
-                      : null
-                  }
-        </div>
-        {
-          record?.status == 2  ?
-          <Tabs
-            defaultActiveKey="1"
-            items={tabsRender}
-            tabBarStyle={{marginLeft:20}}
-          />
-          :
-          <img
-          src={`${process.env.PUBLIC_URL}/assets/noData.png`}
-          alt=''
-          style={{marginLeft: '36%',marginTop:"3%"}}
-        />
-        }
-      </Form>
-      <div style={{ display: "none" }}>
-        <Image.PreviewGroup
-            preview={{
-              visible:imgVisible,
-              onVisibleChange: (vis) => setImgVisible(vis),
-            }}
-        >
-          {
-              imgList.length > 0 ? imgList.map(item => (
-                <Image src={ url + item.filePath} key={item?.id}/>
-            ))
-            : null
-          }
-
-        </Image.PreviewGroup>
-
-      </div>
-      <Modal
-        open={videoOpen}
-        width={800}
-        title="视频预览"
-        footer={null}
-        onCancel={() => setVideoOpen(false)}
-      >
-        <video
-          controls
-          src={url + videoParams?.filePath}
-          style={{width:"100%",height:"100%"}}
-        />
-      </Modal>
-      
-      <Modal
-         open={handleDetailsOpen}
-         width={800}
-         title="处理详情"
-         footer={null}
-         onCancel={() => setHandleDetailsOpen(false)}
-      >
-        <>
-          <Form
-            form={form}
-            {...formItemLayout}
-            initialValues={handleDetails}
-          >
-            <Row>
-              <Col span={24}>
-                <Form.Item
-                  label="处理图片"
-                  name="picId"
-                  labelCol={{ span: 3 }}
-                  wrapperCol={{ span: 19 }}
-                >
-                     <Row gutter={[16]}>
-                {
-                  handleImgfileList.length > 0 && handleImgfileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-                </Form.Item>
-              </Col>
-            </Row>
-            <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理视频"
-                name="picId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-              <Row gutter={[16]}>
-              {
-                  handleVideoFileList.length > 0 && handleVideoFileList.map(file => {
-                  return (
-                      <Col span={12}>
-                      <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                      <div className='file-description'>
-                        <div
-                            onClick={() => { setVideoOpen(true); setVideoParams(file)}}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <VideoCameraOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                          </div>
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-            </Row>
-            <Row>
-                <Col span={24}>
-                <Form.Item
-                label="处理描述"
-                name="itemProblemDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                >
-                    <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-               </Form.Item>
-                </Col>
-            </Row>
-          </Form>
-        </>
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/xcxj/xjrw/form.js b/src/views/rcgl/xcxj/xjrw/form.js
deleted file mode 100644
index 16ef5b3..0000000
--- a/src/views/rcgl/xcxj/xjrw/form.js
+++ /dev/null
@@ -1,351 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, TreeSelect,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import PersonTree from '../../../../components/PersonTree';
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import { xyt_httpget2 } from '../../../../utils/request';
-import "./index.less"
-import moment from 'moment';
-import { httpget2 } from '../../../../utils/request';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const [itemList, setItemList] = useState([])
-  const [itemParams, setItemParams] = useState([])
-  const [list, setList] = useState([])
-  const taskTypes = [
-    {label:"日常巡查",value:0},
-    {label:"特别检查",value:1},
-    {label:"汛前巡检",value:2},
-  ]
-  const [form] = Form.useForm();
-
-  const handleTree = (arr) => {
-    
-    const res = arr.map(item => {
-      item.value = item.id;
-      item.title = item.itemDesc;
-      if (item.children) {
-        item.children = handleTree(item.children)
-      }
-      return item;
-    })
-    return res
-  }
- 
-  const getItemList = async() => {
-    try {
-      const res = await httpget2(apiurl.rcgl.xcxj.xjrw.list);
-      if (res.code === 200) {
-        const arr1 = res.data.map(item => ({
-          id: item.id,
-          itemDesc: item.name,
-          children: item.children,
-          disabled:item.children.length > 0 ? false : true
-        }));
-        const result = handleTree(arr1)
-        setList(res.data)
-        console.log(result);
-        setItemList(result)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  } 
- 
-  const onfinish = (values) => {
-    const userId = localStorage.getItem('userId')
-    const userName = localStorage.getItem('userName')
-    values.startDate = values.startDate?moment(values.startDate).format("YYYY-MM-DD 00:00:00"):''
-    values.endDate = values.endDate ? moment(values.endDate).format("YYYY-MM-DD 00:00:00") : ''
-    values.createUserId = userId
-    values.createUserName = userName;
-    values.inspectUserName = deptUserList?.find(item => item.userId == values.inspectUserId)?.nickName
-    values.items = itemParams;
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.xcxj.xjrw.save,values)
-    }
-    if (mode == "edit") {
-      onEdit(apiurl.rcgl.xcxj.xjrw.edit,{...record,...values})
-    }
-  }
- 
-  const itemChange = (a, b, c) => {
-    const itemArr = a.map(item => {
-      let pointId;
-      list.forEach(o => {
-        if (o.id != item && !pointId) {
-          pointId = o.children?.find(t => t.id == item)?.pointId;
-        }
-      })
-      return {
-        itemId: item,
-        pointId
-      }
-    })
-    setItemParams(itemArr)
-  }
-
-  const getXjInfo = async () => {
-    try {
-      const res = await httpget2(apiurl.rcgl.xcxj.xjrw.detail, { taskId: record?.id })
-      if (res.code === 200) { 
-        const xjd = res.data.map(item => item.itemId)
-        form.setFieldValue("items", xjd)
-        setItemParams(res.data)
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-  useEffect(() => {
-    getItemList()
-  }, [])
-
-  useEffect(() => {
-    if (mode == "edit") {
-      getXjInfo()
-    }
-  }, [record,mode])
-  
-
-  const [deptList, setDeptList] = useState([])
-  const [deptUserList, setDeptUserList] = useState([])
-  const buildTree = (data, parentId) => {
-    let tree = [];
-    data.forEach((node) => {
-        node.title = node.deptName;
-        node.key = node.deptId;
-        
-        if (node.parentId === parentId) {
-        let children = buildTree(data, node.deptId);
-        if (children.length) {
-            node.children = children;
-        }
-        tree.push(node);
-        }
-    });
-    return tree;
-}
-
-const handleTreeList = (dept, user) => {
-    const deptArr = dept.map(item => {
-      return {
-        ...item,
-        value: item.deptId,
-        title: item.deptName,
-        disabled: item.userId ? false : true,
-        children: user.filter(u => u.deptId == item.deptId).map(u => ({
-          ...u,
-          value: u.userId,
-          title: u.nickName
-        }))
-      }
-    }) 
-    console.log("deptArr",deptArr);
-    const treelist = buildTree(deptArr,0)
-    return treelist
-  }
-  const treeList = useMemo(() => {
-    if (deptUserList?.length > 0 && deptList?.length > 0) {
-        return handleTreeList(deptList,deptUserList)
-    } else {
-      return []
-    }
-  }, [deptUserList, deptList])
-
-
-  // 获取部门数据
-const getDeptList = async() => {
-try {
-  const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist);
-  if (result.code == 200) {
-    setDeptList(result.data);
-    getDeptUser(result.data[0])
-  }
-  
-} catch (error) {
-  console.log(error);
-}
-}
-
-// 获取部门人员数据
-const getDeptUser = async() => {
-try {
-  const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:9999});
-  if (result.code == 200) {
-    setDeptUserList(result.rows)
-  }
-} catch (error) {
-  console.log(error);
-}
-}
-  useEffect(() => {
-    getDeptList()
-  }, [])
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="任务类型"
-                name="taskType"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <NormalSelect
-                style={{ width: '100%' }}
-                allowClear
-                options={taskTypes}
-              />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="任务标题"
-                name="taskTitle"
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="选择巡查人"
-                name="inspectUserId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                    <TreeSelect
-                      showSearch
-                      style={{
-                          width: '100%',
-                      }}
-                      dropdownStyle={{
-                          maxHeight: 400,
-                          overflow: 'auto',
-                      }}
-                      allowClear
-                      treeDefaultExpandAll
-                      treeData={treeList}
-                      treeNodeFilterProp='title'
-                      
-                  />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="巡查项"
-                name="items"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-               <TreeSelect
-                  showSearch
-                  style={{
-                      width: '100%',
-                  }}
-                  dropdownStyle={{
-                      maxHeight: 400,
-                      overflow: 'auto',
-                  }}
-                  onChange={itemChange}
-                  allowClear
-                  treeDefaultExpandAll
-                  treeData={itemList}
-                  treeNodeFilterProp='title'
-                  treeCheckable={true}
-                  maxTagCount={1}
-              />
-              </Form.Item>
-          </Col>
-      </Row>          
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="任务内容"
-                name="taskContent"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="开始日期"
-                name="startDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-   
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="结束日期"
-                name="endDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-   
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>          
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/xcxj/xjrw/index.js b/src/views/rcgl/xcxj/xjrw/index.js
deleted file mode 100644
index d85deb5..0000000
--- a/src/views/rcgl/xcxj/xjrw/index.js
+++ /dev/null
@@ -1,222 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import DetailModalForm from "./detailForm"
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const task = {
-    0: "未完成",
-    1: "进行中",
-    2: "已完成"
-  }
-  const taskType = {
-    1: "日常巡查",
-    2: "特别检查",
-    3: "汛前巡检"
-  }
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [tabs, setTabsChange] = useState(0)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {
-      title: '任务类型', key: 'taskType', dataIndex: 'taskType', width: 200,
-      render: (value) => <span>{taskType[value]}</span>
-      
-    },
-    { title: '任务标题', key: 'taskTitle', dataIndex: 'taskTitle', width: 250, ellipsis: true },
-    {title: '任务内容', key: 'taskContent', dataIndex: 'taskContent', width: 200},
-    {
-      title: '任务状态', key: 'status', dataIndex: 'status', width: 200,
-      render: (value) => <span
-        style={{
-          display: "flex",
-          width:"50%",
-          alignItems: "center",
-          columnGap:5,
-          padding: "5px 10px",
-          color: "#689fff",
-          border: "1px solid #bbdcff",
-          background: "#ecf5ff",
-          borderRadius: "4px"
-        }}>
-        <span>{task[value]}</span>
-        <span style={{
-          display: "inline-block",
-          padding: 5,
-          background:tabs == 1 ? "#ffec00" : tabs == 2 ? "#29c093" : "#d7d7d7"
-        }}></span>
-      </span>
-    },
-    {title: '巡查人', key: 'inspectUserName', dataIndex: 'inspectUserName', width: 100},
-    {title: '开始日期', key: 'startDate', dataIndex: 'startDate', width: 200},
-    {title: '结束日期', key: 'endDate', dataIndex: 'endDate', width: 200},
-    {title: '问题数量', key: 'problemNum', dataIndex: 'problemNum', width: 100,align: 'center'},
-    { title: '待处理', key: 'handleNum', dataIndex: 'handleNum', width: 100,align: 'center'},
-    { title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200 },
-    { title: '创建人', key: 'createUserName', dataIndex: 'createUserName', width: 150 },
-    
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-          edit={(editBtn && tabs == 0) ? true : false}
-          del={(delBtn && tabs == 0) ? true : false}
-          detail={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  const [modeBtn, setModeBtn] = useState('')
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => { 
-    setModeBtn(type)
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.xcxj.xjrw.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjrw.page).find_noCode);
-  const { tableProps:tableProps0, search:search0 } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjrw.page).find_noCode);
-  const { tableProps:tableProps1, search:search1 } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjrw.page).find_noCode);
-  const { tableProps:tableProps2, search:search2 } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjrw.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-   refresh()
-   setTabsChange(0)
-}
-  useEffect(() => {
-    const userId = localStorage.getItem('userId')
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          status: Number(tabs),
-          createUserId:userId
-          
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal, tabs])
-  
-  useEffect(() => {
-    const userId = localStorage.getItem('userId')
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          status: 0,
-          createUserId:userId
-        }
-      }; 
-      search0(params)
-    }
-  }, [searchVal])
-  useEffect(() => {
-    const userId = localStorage.getItem('userId')
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          status: 1,
-          createUserId:userId
-        }
-      }; 
-      search1(params)
-    }
-  }, [searchVal])
-
-  useEffect(() => {
-    const userId = localStorage.getItem('userId')
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          status: 2,
-          createUserId:userId
-        }
-      }; 
-      search2(params)
-    }
-  }, [searchVal])
-
- 
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Tabs
-              // defaultActiveKey={0}
-              onChange={(e) => setTabsChange(e)}
-              activeKey={tabs}
-              items={[
-                {
-                  label: `未完成（${tableProps0?.pagination?.total}）`,
-                  key: 0,
-                  children:<Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-                },
-                {
-                  label: `进行中（${tableProps1?.pagination?.total}）`,
-                  key: 1,
-                  children:<Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-                },
-                {
-                  label: `已完成（${tableProps2?.pagination?.total}）`,
-                  key: 2,
-                  children:<Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-               }
-              ]}
-            >
-          </Tabs>    
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          title1="巡查任务详情"
-          component={modeBtn == "view"? DetailModalForm : ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/xcxj/xjrw/index.less b/src/views/rcgl/xcxj/xjrw/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/xcxj/xjrw/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/xcxj/xjrw/toolbar.js b/src/views/rcgl/xcxj/xjrw/toolbar.js
deleted file mode 100644
index 521eb6f..0000000
--- a/src/views/rcgl/xcxj/xjrw/toolbar.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "创建任务")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-
-  const types = [
-    {label:"日常巡查",value:1},
-    {label:"特别检查",value:2},
-    {label:"汛前巡检",value:3},
-  ]
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateTimeRangeSo;
-    if (values.tm) {
-      dateTimeRangeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo});
-  }
-
-  useEffect(() => {
-    let dateTimeRangeSo = {
-      start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 23:59:59')
-    }
-    form.setFieldValue("tm", [moment(dateTimeRangeSo.start), moment(dateTimeRangeSo.end)])
-    setSearchVal({ dateTimeRangeSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="创建时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="任务类型" name="taskType">
-            <NormalSelect allowClear style={{ width: '150px' }} options={types} />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>创建任务</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/xcxj/xjwtcl/form.js b/src/views/rcgl/xcxj/xjwtcl/form.js
deleted file mode 100644
index 62c9cae..0000000
--- a/src/views/rcgl/xcxj/xjwtcl/form.js
+++ /dev/null
@@ -1,347 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined,VideoCameraOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave,submit }) => {
-console.log(record);
-
-  const [form] = Form.useForm();
-  const [imgfileList, setImgFileList] = useState([]) //上传文件列表
-  const [videoFileList, setVideoFileList] = useState([]) //上传文件列表
-  const [handleImgfileList, setHandleImgFileList] = useState([]) //上传文件列表
-  const [handleVideoFileList, setHandleVideoFileList] = useState([]) //上传文件列表
-  const [videoOpen, setVideoOpen] = useState(false)
-  const [videoParams, setVideoParams] = useState({})
- 
-  const onfinish = (values) => {
-    if (mode === 'edit') {
-      values.id = record.id;
-      onEdit(apiurl.rcgl.xcxj.xjrw.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.xcxj.xjrw.save,values)
-    }
-  }
-  const handleFile = (arr=[]) => {
-    const newArr = arr?.map(item => ({
-      name: item.fileName,
-      response: {
-            data: {
-              filePath: item.filePath,
-              fileId:item.fileId
-            }
-          },
-    }))
-    return newArr
-  }
-    useEffect(() => {
-      if (mode != 'save') {
-        // const imgFile = record?.inspectPics?.map(o => ({
-        //   name: o.fileName,
-        //   response: {
-        //         data: {
-        //           filePath: o.filePath,
-        //           fileId:o.fileId
-        //         }
-        //       },
-        // }))
-        const imgFile = handleFile(record?.inspectPics);
-        const videoFile = handleFile(record?.inspectVideos);
-        const handleImgFile = handleFile(record?.handlePics);
-        const hanldeVideoFile = handleFile(record?.handleVideos);
-        setImgFileList(imgFile)
-        setVideoFileList(videoFile)
-        setHandleImgFileList(handleImgFile)
-        setHandleVideoFileList(hanldeVideoFile)
-        form.setFieldsValue({
-          ...record,
-          handleTime: record.handleTime ? moment(record.handleTime) : '',
-          finishTime: record.finishTime? moment(record.finishTime) : ''
-        })
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <div style={{maxHeight:"70vh",overflowY:"auto"}}>
-      <div
-        style={{ marginBottom: 20, borderBottom: "1px solid #dfdfdf", width: "100%", paddingBottom: 5 }}>
-        <span style={{ padding: "0px 3px", backgroundColor: "#0079fe", marginRight: 20 }}></span>巡检信息</div>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="任务标题"
-                name="taskTitle"
-            >
-               <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="巡检点"
-                name="name"
-            >
-               <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="巡查项"
-                name="itemDesc"
-            >
-               <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="巡检问题描述"
-                name="problemDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="巡查人"
-                name="inspectUserName"
-            >
-               <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="巡查时间"
-                name="finishTime"
-            >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="巡查图片"
-                name="picId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-              <Row gutter={[16]}>
-              {
-                  imgfileList.length > 0 && imgfileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-       </Row>
-       <Row>
-          <Col span={24}>
-              <Form.Item
-                label="巡查视频"
-                name="picId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-              <Row gutter={[16]}>
-              {
-                  videoFileList.length > 0 && videoFileList.map(file => {
-                  return (
-                      <Col span={12}>
-                      <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                      <div className='file-description'>
-                        <div
-                            onClick={() => { setVideoOpen(true); setVideoParams(file)}}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <VideoCameraOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                          </div>
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-       </Row>
-      <div
-        style={{ marginBottom: 20, borderBottom: "1px solid #dfdfdf", width: "100%", paddingBottom: 5 }}>
-          <span style={{ padding: "0px 3px", backgroundColor: "#0079fe", marginRight: 20 }}></span>处理信息</div>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="处理状态"
-                name="isHandle"
-            >
-              <NormalSelect
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                options={[{label:"待处理",value:0},{label:"已处理",value:1}]} />
-              </Form.Item>
-          </Col>
-         {
-          (record?.isHandle || record?.isHandle == 0) ?  
-          <Col span={12}>
-          <Form.Item
-            label="处理人"
-            name="handleUserName"
-        >
-            <Input disabled={mode==='view'}  style={{width:'100%'}} />
-          </Form.Item>
-        </Col> : null
-         }
-      </Row>
-      {
-          record?.isHandle ? 
-            <>
-              <Row>
-          <Col span={12}>
-              <Form.Item
-                label="处理时间"
-                name="handleTime"
-            >
-               <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row> 
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理内容"
-                name="handleDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-               <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理图片"
-                name="picId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-              <Row gutter={[16]}>
-              {
-                  handleImgfileList.length > 0 && handleImgfileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                        <div className='file-description'>
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-       </Row>
-       <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理视频"
-                name="picId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-              <Row gutter={[16]}>
-              {
-                  handleVideoFileList.length > 0 && handleVideoFileList.map(file => {
-                  return (
-                      <Col span={12}>
-                      <div className={mode == "view" ? 'file-item view-file' : 'file-item'}  >
-                      <div className='file-description'>
-                        <div
-                            onClick={() => { setVideoOpen(true); setVideoParams(file)}}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <VideoCameraOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                          </div>
-                            <span>{file.name}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-       </Row>
-            </> : null
-      } 
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" onClick={() => submit()}>
-              关闭
-            </Button>
-          </Form.Item>
-      </Form>
-      <Modal
-        open={videoOpen}
-        width={800}
-        title="视频预览"
-        footer={null}
-        onCancel={() => setVideoOpen(false)}
-      >
-        <video
-          controls
-          src={url + videoParams?.response?.data?.filePath}
-          style={{width:"100%",height:"100%"}}
-        />
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/xcxj/xjwtcl/index.js b/src/views/rcgl/xcxj/xjwtcl/index.js
deleted file mode 100644
index 226a929..0000000
--- a/src/views/rcgl/xcxj/xjwtcl/index.js
+++ /dev/null
@@ -1,197 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const viewBtn = role?.rule?.find(item => item.menuName == "详情") || true;
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [tabs, setTabsChange] = useState(0)
-  const [imgVisible, setImgVisible] = useState(false)
-  const [imgList, setImgList] = useState([])
-  const [videoOpen, setVideoOpen] = useState(false)
-  const [videoParams, setVideoParams] = useState({})
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '任务标题', key: 'taskTitle', dataIndex: 'taskTitle', width: 250, ellipsis: true },
-    {title: '巡检点', key: 'name', dataIndex: 'name', width: 200},
-    {
-      title: '巡查项', key: 'itemDesc', dataIndex: 'itemDesc', width: 200,
-    },
-    {title: '巡查问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 200},
-    {
-      title: '巡查图片', key: 'inspectPics', dataIndex: 'inspectPics', width: 100,
-      render: (value) => <div>{value ? <a onClick={()=>reviewPic(value)}> { value.length} </a>: ''}</div>
-    },
-    {
-      title: '巡查视频', key: 'inspectVideos', dataIndex: 'inspectVideos', width: 100,
-      render: (value) => <div>{value ? <a onClick={()=>reviewVideo(value)}> { value.length} </a>: ''}</div>
-    },
-    {
-      title: '处理状态', key: 'isHandle', dataIndex: 'isHandle', width: 200, align: 'center',
-      render: (value) => <span style={value == 1 ?{color:"green"}: {color:"red"}}>{ value == 1 ? "已处理" : value == 0 ? "待处理" : ''}</span>
-    },
-    { title: '巡查人', key: 'inspectUserName', dataIndex: 'inspectUserName', width: 150 },
-    { title: '巡查完成时间', key: 'finishTime', dataIndex: 'finishTime', width: 200 },
-    
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        detail={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.xcxj.xjrw.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjwtcl.page).find_noCode);
-  const { tableProps:tableProps0, search:search0 } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjwtcl.page).find_noCode);
-  const { tableProps:tableProps1, search:search1 } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjwtcl.page).find_noCode);
-
-  const reviewPic = (arrPic) => {
-    if (arrPic.length > 0) {
-      setImgVisible(true)
-      setImgList(arrPic)
-    }
-  }
- 
-  const reviewVideo = (arrVideo) => {
-    if (arrVideo.length > 0) {
-      setVideoOpen(true)
-      setVideoParams(arrVideo[0])
-    }
-  }
- 
-  useEffect(() => {
-    const userId = localStorage.getItem('userId')
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          isHandle: Number(tabs),
-          inspectUserId:userId
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal,tabs])
-
-  useEffect(() => {
-    const userId = localStorage.getItem('userId')
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          isHandle: 0,
-          inspectUserId:userId
-        }
-      }; 
-      search0(params)
-    }
-  }, [searchVal])
-  useEffect(() => {
-    const userId = localStorage.getItem('userId')
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-          isHandle: 1,
-          inspectUserId:userId
-        }
-      }; 
-      search1(params)
-    }
-  }, [searchVal])
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-          <Tabs defaultActiveKey={0} onChange={(e) => setTabsChange(e)} >
-              <Tabs.TabPane tab={`待处理（${tableProps0?.pagination?.total}）`} key={0}>
-                 <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-              </Tabs.TabPane>
-              <Tabs.TabPane tab={`已处理（${tableProps1?.pagination?.total}）`} key={1}>
-                 <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-              </Tabs.TabPane>
-          </Tabs>    
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          title1="详情"
-        />
-      </div>
-      <div style={{ display: "none" }}>
-        <Image.PreviewGroup
-            preview={{
-              visible:imgVisible,
-              onVisibleChange: (vis) => setImgVisible(vis),
-            }}
-        >
-          {
-              imgList.length > 0 ? imgList.map(item => (
-                <Image src={ url + item.filePath} key={item?.id}/>
-            ))
-            : null
-          }
-
-        </Image.PreviewGroup>
-
-      </div>
-      <Modal
-        open={videoOpen}
-        width={800}
-        title="视频预览"
-        footer={null}
-        onCancel={() => setVideoOpen(false)}
-      >
-        <video
-          controls
-          src={url + videoParams?.filePath}
-          style={{width:"100%",height:"100%"}}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/xcxj/xjwtcl/index.less b/src/views/rcgl/xcxj/xjwtcl/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/xcxj/xjwtcl/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/xcxj/xjwtcl/toolbar.js b/src/views/rcgl/xcxj/xjwtcl/toolbar.js
deleted file mode 100644
index 2892675..0000000
--- a/src/views/rcgl/xcxj/xjwtcl/toolbar.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateTimeRangeSo;
-    if (values.tm) {
-      dateTimeRangeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo});
-  }
-
-  useEffect(() => {
-    let dateTimeRangeSo = {
-      start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'),
-      end: moment().format('YYYY-MM-DD 23:59:59')
-    }
-    form.setFieldValue("tm", [moment(dateTimeRangeSo.start), moment(dateTimeRangeSo.end)])
-    setSearchVal({ dateTimeRangeSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="巡查时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
- 
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/xcxj/xjxpz/AdcdTreeSelector/index.less b/src/views/rcgl/xcxj/xjxpz/AdcdTreeSelector/index.less
deleted file mode 100644
index ac6ad25..0000000
--- a/src/views/rcgl/xcxj/xjxpz/AdcdTreeSelector/index.less
+++ /dev/null
@@ -1,47 +0,0 @@
-li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
-li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
-  color: #000 !important;
-  font-weight: bold;
-}
-
-.treeBox1{
-  .ant-tree-node-content-wrapper{
-    position: static !important;
-  }
-  .hover-ele{
-    &:hover{
-      color:#259dff
-    }
-  }
-}
-.AdcdTreeSelectorStyle{
-  .ant-input-wrapper{
-
-    .ant-input-affix-wrapper{
-      width: 98%;
-    }
-    .ant-input-group-addon{
-      .ant-btn{
-        width: 34px;
-        height: 34px;
-      }
-    }
-  }
-
-  .treeTitle {
-    display: flex;
-    justify-content: space-between;
-    .treeBtn {
-        display: none;
-    }
-}
-.treeTitle:hover {
-    .treeBtn {
-        display: flex;
-    }
-}
-}
-.no-matter{
-  opacity: 0.5;
-}
\ No newline at end of file
diff --git a/src/views/rcgl/xcxj/xjxpz/AdcdTreeSelector/index.tsx b/src/views/rcgl/xcxj/xjxpz/AdcdTreeSelector/index.tsx
deleted file mode 100644
index a15a10f..0000000
--- a/src/views/rcgl/xcxj/xjxpz/AdcdTreeSelector/index.tsx
+++ /dev/null
@@ -1,310 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Tree, Input, Checkbox, Spin,Modal,Form,Col,Row,message,Space } from 'antd';
-import { EditOutlined,PlusCircleOutlined, DeleteOutlined,ExclamationCircleOutlined} from '@ant-design/icons';
-import './index.less';
-import { formItemLayout, btnItemLayout } from '../../../../../components/crud/FormLayoutProps';
-import { getXjTreeData } from '../../../../../service/warn';
-import apiurl from '../../../../../service/apiurl';
-import { httppost3,httpget6 } from '../../../../../utils/request';
-
-const { Search } = Input;
-
-type IProps = {
-  onSelectFun?: any;
-  setAdcd?: any;
-  showCheckbox: any;
-  tableName?: any;
-  onChangeOpen?: any;
-  hasAlertBox?: boolean;//顶部是否有预警条
-  isFetch?: boolean;
-}
-const { confirm } = Modal;
-const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd, showCheckbox, tableName, hasAlertBox }) => {
-  const [loading, setLoading] = useState(true);
-  const [treeData, setTreeData] = useState([]);
-  const [newTreeData, setNewTreeData] = useState([]);
-  const [isFiter, setIsFiter] = useState(false);
-  const [expandedKeys, setExpandedKeys] = useState([]);
-  const [checkedKeys, setCheckedKeys] = useState([]);
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedItem, setSelectedItem] = useState({});
-  const [autoExpandParent, setAutoExpandParent] = useState(true);
-  const [treeBoxHeight, setTreeBoxHeight] = useState({});
-  const [jdOpen, setJdOpen] = useState(false)
-  const [form] = Form.useForm();
-  const [mode, setMode] = useState('')
-  const [itemDetail, setItemDetail] = useState<any>({})
-  const [orderMax, setOrderMax] = useState<any>(0)
-  useEffect(() => {
-    getCustomerTreeData();
-  }, []);
-
-  useEffect(() => {
-    if(tableName){
-      setSelectedKeys([]);
-    }
-  }, [tableName]);
-
-  useEffect(()=>{
-    //根据预警条计/多选框计算高度
-    if(hasAlertBox){
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 240px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 210px )"})
-      }
-    }else{
-      if(showCheckbox){
-        setTreeBoxHeight({height:"calc( 100vh - 224px )"})
-      }else{
-        setTreeBoxHeight({height:"calc( 100vh - 194px )"})
-      }
-    }
-  },[hasAlertBox])
-
-  const getCustomerTreeData = async () => {
-    const adcdTreedata: any = await getXjTreeData();
-    const item:any = adcdTreedata
-    if (item) {
-      setSelectedKeys([item[0]?.id])
-      setAdcd(item[0]?.id)
-    }
-    if (adcdTreedata.length > 0) {
-      handelTreeData(adcdTreedata);
-      setTreeData(adcdTreedata);
-      setLoading(false);
-      setOrderMax(Math.max(...adcdTreedata.map((item:any) => item?.orderIndex)))
-    }
-  };
-  // @ts-ignore
-  const handelTreeData = (data) => {
-    if (data.length > 0) {
-      // @ts-ignore
-      data.forEach(item => {
-        item.title = item.name;
-        item.key = item.id;
-        if (item.children && item.children.length > 0) {
-          handelTreeData(item.children);
-        }
-      });
-    }
-  }
-
-  const onExpand = (expandedKeysValue:any) => {
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-
-  const onSelect = (selectedKeysValue:any, info:any) => {
-    setSelectedKeys(selectedKeysValue);
-    setSelectedItem(info);
-
-    if (info.selectedNodes.length > 0) {
-      let selectData = info.selectedNodes[0];
-
-      let adcdVal = "";
-      adcdVal = selectData.key;
-
-      let params = { id: adcdVal };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd(adcdVal)
-      }
-    } else {
-      let params = { id: "" };
-      if(onSelectFun){
-        onSelectFun(params);
-      }
-      if(setAdcd){
-        setAdcd("")
-      }
-    }
-  };
-
-
-
-
-
-  // 删除
-  const deleteJd = (v: any) => {
-    confirm({
-      title: '删除',
-      icon: <ExclamationCircleOutlined />,
-      content: '确认删除此数据',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk: async() => {
-        try {
-          const res = await httpget6(apiurl.rcgl.xcxj.xjxpz.deleteTree + `/${v.id}`)
-          if (res.code === 200) { 
-            message.success('删除成功');
-            getCustomerTreeData();
-          } 
-          if (res.code === 400) { 
-            message.error(res.description);
-          }
-        } catch (error) {
-          console.log(error);
-        }
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  }
- 
-  // 新增节点
-  const saveJd = (v: any) => {
-    if (v) {
-      //  form.setFieldValue('name', v.title);
-       setItemDetail(v);
-    }
-    setJdOpen(true);
-    setMode("save");
-  }
-
-  // 编辑节点
-  const editJd = (v: any) => { 
-    setJdOpen(true);
-    form.setFieldsValue(v);
-    setMode("edit");
-    setItemDetail(v);
-  }
-
-  const onOk = async () => { 
-    const name = form.getFieldValue('name');
-    const url = mode == "save" ? apiurl.rcgl.xcxj.xjxpz.saveTree : apiurl.rcgl.xcxj.xjxpz.editTree;
-    let saveParams = {
-      name,
-      parentId: itemDetail?.id || undefined,
-      orderIndex:itemDetail?.orderIndex || orderMax
-    }
-    let editParams = {
-      ...itemDetail,
-      name
-   } 
-    try {
-      const res = await httppost3(url, mode == "save" ? saveParams:editParams)
-      if (res.code == 200) {
-        message.success(mode == "save" ? '新增成功' : '编辑成功');
-        setJdOpen(false);
-        getCustomerTreeData();
-        form.resetFields();
-      } else if (res.code == 400) {
-        message.error(res.description);
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-  return (
-    <div  className='AdcdTreeSelectorStyle'>
-      <div
-        style={{
-        padding: '10px',
-        color: "#409eff",
-        borderBottom: "1px solid #dfdfdf",
-        marginBottom: 20,
-        cursor: "pointer"
-        }}
-        onClick={saveJd}
-      >新增巡检点</div>
-      {
-        loading?
-          <div style={{position:"absolute",top:"200px",left:"35%",background:"#fff",padding:"20px 30px",borderRadius:"10px"}}>
-            <Spin tip="正在加载..." size="large" spinning={loading} />
-          </div>:null 
-      }
-
-      <div className="treeBox1" style={{...treeBoxHeight,marginTop:"10px"}}>
-        <div style={{ width: "300px"}}>
-          {
-            treeData.length > 0 &&
-            <Tree
-              defaultExpandAll={true}
-              blockNode={false}
-              onExpand={onExpand}
-              checkedKeys={checkedKeys}
-              onSelect={onSelect}
-              selectedKeys={selectedKeys}
-              treeData={isFiter ? newTreeData : treeData}
-              showLine={true}
-              titleRender={(v: any) => {
-                return (
-                    <div
-                      style={{width:200}}
-                      className='treeTitle'
-                        >
-                        <span>{v.title}</span>
-                       <Space 
-                        size={4}
-                        className='treeBtn'
-                        >
-                          {/* <PlusCircleOutlined
-                               style={{ fontSize: 15 }}
-                               title='新增'
-                               onClick={(e) => {
-                                 e.stopPropagation();
-                                 saveJd(v);
-                               }}
-                               className='hover-ele'
-                             /> */}
-                          <EditOutlined
-                            title='编辑'
-                            style={{ fontSize: 15 }}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              editJd(v);
-                            }}
-                            className='hover-ele'
-                          />
-                          <DeleteOutlined
-                            title='删除'
-                            style={{ fontSize: 15 }}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              deleteJd(v);
-                            }}
-                            className='hover-ele'
-                          />
-                       
-                      </Space>
-                      </div>
-                )
-              }}
-            />
-          }
-        </div>
-      
-      </div>
-      <Modal
-        open={jdOpen}
-        title={mode == "save" ? "新增" : '编辑'}
-        destroyOnClose
-        onCancel={() => { setJdOpen(false); form.resetFields()}}
-        onOk={onOk}
-      >
-        <Form form={form} {...formItemLayout}>
-          <Row>
-            <Col span={24}>
-              <Form.Item
-                label="巡检点"
-                name="name"
-                rules={[{required: true}]}
-              >
-            <Input  allowClear/>
-           </Form.Item>
-            </Col>
-          </Row>
-        </Form>
-      </Modal>
-    </div>
-  );
-};
-
-export default AdcdTreeSelector;
diff --git a/src/views/rcgl/xcxj/xjxpz/form.js b/src/views/rcgl/xcxj/xjxpz/form.js
deleted file mode 100644
index 48ca5bb..0000000
--- a/src/views/rcgl/xcxj/xjxpz/form.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, TreeSelect, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-  const [form] = Form.useForm();
-  const onfinish = (values) => {
-    values.pointId = record.code;
-    if (mode === 'edit') {
-      values.id = record.id;
-      values.status = record.status;
-      onEdit(apiurl.rcgl.xcxj.xjxpz.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.xcxj.xjxpz.save,values)
-    }
-  }
-
-  
-
- 
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="巡检项描述"
-                name="itemDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="问题描述"
-                name="problemDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col> 
-      </Row>                  
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="处理建议"
-                name="handleSuggestion"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-          <Col span={12}>
-          <Form.Item
-                label="排序号"
-                name="orderIndex"
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>            
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/rcgl/xcxj/xjxpz/index.js b/src/views/rcgl/xcxj/xjxpz/index.js
deleted file mode 100644
index c31ff4d..0000000
--- a/src/views/rcgl/xcxj/xjxpz/index.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image,Switch } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import AdcdTreeSelector from "./AdcdTreeSelector";
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  console.log(role);
-  
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")  || true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")  || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")  || true;
-  const checkType = {
-    1: "低风险",
-    2: "一般风险",
-    3: "较大风险",
-    4:"重大风险"
-  }
-  const risk = {
-    1: "low",
-    2: "yiban",
-    3: "jiaoda",
-    4:"zhongda"
-  }
-  const refModal = useRef();
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '巡检项描述', key: 'itemDesc', dataIndex: 'itemDesc', width: 240},
-    {
-      title: '问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 320,ellipsis:true},
-    {
-      title: '处理建议', key: 'handleSuggestion', dataIndex: 'handleSuggestion', width: 200 },
-    {
-      title: '排序号', key: 'orderIndex', dataIndex: 'orderIndex', width: 100,
-    },
-    {
-      title: '是否启用', key: 'status', dataIndex: 'status', width: 200,
-      render: (v, r) => <Switch
-      checkedChildren="启用"
-      unCheckedChildren="禁用"
-      checked={v == 0 ? true : false} onChange={(e) => { 
-        onEdit(apiurl.rcgl.xcxj.xjxpz.edit,{...r, status:e ? 0 : 1})
-      }} />
-    },
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  const [code, setCode] = useState()
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-
- 
-  const command = (type) => (params) => {
-    if (type === 'save') {   
-      refModal.current.showSave({code});
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params,code });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.xcxj.xjxpz.delete + `/${params.id}`);
-    }
-  }
-  
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.xcxj.xjxpz.page).find_noCode);
-
-  const onEdit = (path,values) => {
-    createCrudService(path).edit(values).then((result) => {
-      if (result?.code === 200) {
-        refresh()
-      }
-    })
-  }
-  useEffect(() => {
-    if (code) {
-      let params = {
-        search: {
-           menuId:code,
-          }
-        };
-      search(params)
-    }
-  }, [code]);
-  
-  
-  return (
-    <>
-       <div className='content-box' style={{ backgroundColor: '#fff', height: '100%',display:'flex',padding:'10px' }}>
-      <div className='lf adcdTreeSelectorBox' style={{height:'calc(100vh - 168px)',width:'340px'}}>
-         <AdcdTreeSelector hasAlertBox={false} setAdcd={setCode}/>
-        </div>
-      <div className='AdcdTreeTableBox' style={{flex:1,overflowX:"auto"}}>
-         <Card className='nonebox'>
-          <ToolBar
-              onSave={command('save')}
-              role={role}
-          />
-        </Card>
-       
-        <Table
-          columns={columns}
-          rowKey="id"
-          {...tableProps}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }}
-        />
-              
-   
-      </div>
-      
-      <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-      />
-    </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/xcxj/xjxpz/index.less b/src/views/rcgl/xcxj/xjxpz/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/rcgl/xcxj/xjxpz/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/xcxj/xjxpz/toolbar.js b/src/views/rcgl/xcxj/xjxpz/toolbar.js
deleted file mode 100644
index 47e06bd..0000000
--- a/src/views/rcgl/xcxj/xjxpz/toolbar.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  console.log("role",role);
-  
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
- 
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        {
-            (onSave) ?
-              <Form.Item>
-                <Button onClick={onSave} type='primary'>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/ColorPolygon.tsx b/src/views/rcgl/zmjk/ColorPolygon.tsx
deleted file mode 100644
index 815144c..0000000
--- a/src/views/rcgl/zmjk/ColorPolygon.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react'
-import { Shape } from 'react-konva';
-
-const ColorPolygon: React.FC<{
-  pts: ({ x?: number, y?: number } | [number, number])[]
-  fill: string;
-  desc?: string;
-  opacity?: number;
-}> = ({ pts, fill, opacity }) => {
-  return (
-    <Shape
-      fill={fill}
-      opacity={opacity}
-      sceneFunc={(context:any, shape:any) => {
-        context.beginPath();
-        pts.forEach((p, i) => {
-          let x:any, y:any;
-          if (Array.isArray(p)) {
-            x = p[0];
-            y = p[1];
-          } else {
-            x = p.x;
-            y = p.y;
-          }
-          if (i === 0) {
-            context.moveTo(x, y);
-          } else {
-            context.lineTo(x, y);
-          }
-        })
-        context.closePath();
-        context.fillStrokeShape(shape)
-      }}
-    />
-  )
-}
-
-export default ColorPolygon
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/Sider.tsx b/src/views/rcgl/zmjk/Sider.tsx
deleted file mode 100644
index c443cbd..0000000
--- a/src/views/rcgl/zmjk/Sider.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import { Layer, Rect } from 'react-konva';
-import ColorPolygon from './ColorPolygon';
-import { CanvasH, CanvasW, FarBuildingTop, Horizontal, RoofTop, SideRoomSize } from './consts';
-import { ControlPts } from './coordinates';
-import { RoomWindows } from './Window';
-
-const Sider: React.FC<{
-  pts: ControlPts;
-  side: 'left' | 'right';
-}> = ({ side, pts }) => {
-
-  return (
-    <Layer
-      x={side === 'left' ? 0 : CanvasW}
-      scaleX={side === 'left' ? 1 : -1}
-      width={CanvasW * 0.5}
-    >
-      <ColorPolygon desc='水' fill="#458eab" pts={[[0, Horizontal], [0, CanvasH], [CanvasW * 0.5, CanvasH], [CanvasW * 0.5, Horizontal]]} />
-
-      <ColorPolygon desc='远处的墙' fill="#8fa7a7" pts={[[0, FarBuildingTop], pts.C2, pts.C1, [pts.C1.x, FarBuildingTop]]} />
-
-      <Rect x={pts.RoomLT.x} y={pts.RoomLT.y} width={SideRoomSize} height={SideRoomSize} fill="#738785" />
-      <RoomWindows rect={[pts.RoomLT.x, pts.RoomLT.y + 8, pts.RoomRB.x - 16, pts.RoomRB.y]} />
-      <ColorPolygon desc='房屋侧面' fill="#4a5c5e" pts={[pts.RoomRT, pts.RoomRB, pts.RoomRBFar, pts.RoomRTFar]} />
-      <Rect x={pts.RoomLT.x - 2} y={pts.RoomLT.y} width={SideRoomSize + 4} height={8} fill="#f2ebcd" />
-      <ColorPolygon desc='房屋侧面-白条' fill="#f2ebcd" pts={[
-        [pts.RoomRT.x + 2, pts.RoomRT.y],
-        [pts.RoomRB.x + 2, pts.RoomRT.y + 8],
-        [pts.RoomRTFar.x! + 2, pts.RoomRTFar.y! + 8],
-        [pts.RoomRTFar.x! + 2, pts.RoomRTFar.y!]
-      ]} />
-      <ColorPolygon desc='房屋底面' fill="#4a5c5e" pts={[pts.RoomLB, pts.RoomLBFar, pts.RoomRBFar, pts.RoomRB]} />
-      <Rect x={pts.RoomRB.x - 16} y={pts.RoomRB.y - 8 - SideRoomSize} width={16} height={SideRoomSize} fill="#6e3a34" />
-
-
-      <ColorPolygon desc='侧面' fill="#4a5c5e" pts={[pts.L2, pts.B2, pts.B1, pts.L1]} />
-      <ColorPolygon desc='上盖' fill="#728381" pts={[pts.C2, pts.L2, pts.L1, pts.C1]} />
-      <ColorPolygon desc='墙' fill="#738b8b" pts={[[pts.C1.x, RoofTop], pts.C1, pts.L1, pts.A1]} />
-
-      <ColorPolygon desc='内壁' fill="#334648" pts={[pts.A1, pts.B1, pts.B3, pts.A2]} />
-    </Layer>
-  )
-}
-
-export default React.memo(Sider)
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/Topper1.tsx b/src/views/rcgl/zmjk/Topper1.tsx
deleted file mode 100644
index dd7a9ee..0000000
--- a/src/views/rcgl/zmjk/Topper1.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { useMemo } from 'react';
-import { Layer, Rect } from 'react-konva';
-import ColorPolygon from './ColorPolygon';
-import { Window1, WindowSep } from './Window';
-import { TopRoomHeight } from './consts';
-import { ControlPts, mirror } from './coordinates';
-
-
-const Topper1: React.FC<{
-  pts: ControlPts;
-  type: number;
-}> = ({ pts, type }) => {
-  const windows = useMemo<{
-    w: number[][];
-    h: number[][];
-  }>(() => {
-    const x1 = pts.TopRectLB.x;
-    const y0 = pts.TopRectLB.y - TopRoomHeight
-    const y1 = pts.TopRectLB.y - TopRoomHeight * 0.75;
-    const x2 = pts.TopRectRB.x;
-    const y2 = pts.TopRectLB.y - TopRoomHeight * 0.25;
-    if (type === 1) {
-      const u = (x2 - x1) / 10;
-      return {
-        w: [
-          [x1 + u, y1, x1 + 3 * u, y2],
-          [x1 + 4 * u, y1, x1 + 6 * u, y2],
-          [x1 + 7 * u, y1, x1 + 9 * u, y2],
-        ],
-        h: []
-      }
-    } else if (type === 2) {
-      const u = (x2 - x1 - 8) / 14;
-      return {
-        w: [
-          [x1 + u, y1, x1 + 3 * u, y2],
-          [x1 + 4 * u, y1, x1 + 6 * u, y2],
-          [x1 + 8 * u + 8, y1, x1 + 10 * u + 8, y2],
-          [x1 + 11 * u + 8, y1, x1 + 13 * u + 8, y2],
-        ],
-        h: [
-          [x1 + 7 * u, y0, x1 + 7 * u + 8, pts.TopRectLB.y],
-        ],
-      }
-    } else if (type === 3) {
-      const xc = (x2 - x1) * 0.5;
-      const u = (xc - 8) / 8;
-      return {
-        w: [
-          [x1 + u, y1, x1 + 3 * u, y2],
-          [x1 + 5 * u + 8, y1, x1 + 7 * u + 8, y2],
-          [x1 + u + xc, y1, x1 + 3 * u + xc, y2],
-          [x1 + 5 * u + 8 + xc, y1, x1 + 7 * u + 8 + xc, y2],
-        ],
-        h: [
-          [x1 + 4 * u, y0, x1 + 4 * u + 8, pts.TopRectLB.y],
-          [x1 + 4 * u + xc, y0, x1 + 4 * u + 8 + xc, pts.TopRectLB.y],
-        ]
-      }
-    } else if (type > 3) {
-      const xc1 = (x2 - x1) / 3;
-      const xc2 = xc1 * 2;
-      const u = (xc1 - 8) / 8;
-      return {
-        w: [
-          [x1 + u, y1, x1 + 3 * u, y2],
-          [x1 + 5 * u + 8, y1, x1 + 7 * u , y2],
-          [x1 + u + xc1, y1, x1 + 3 * u + xc1, y2],
-          [x1 + 5 * u + 8 + xc1, y1, x1 + 7 * u + 8 + xc1, y2],
-          [x1 + u + xc2, y1, x1 + 3 * u + xc2, y2],
-          [x1 + 5 * u + 8 + xc2, y1, x1 + 7 * u + 8 + xc2, y2],
-        ],
-        h: [
-          [x1 + 4 * u, y0, x1 + 4 * u + 8, pts.TopRectLB.y],
-          [x1 + 4 * u + xc1, y0, x1 + 4 * u + 8 + xc1, pts.TopRectLB.y],
-          [x1 + 4 * u + xc2, y0, x1 + 4 * u + 8 + xc2, pts.TopRectLB.y],
-        ]
-      }
-    }
-    return {
-      w: [], h: []
-    }
-  }, [])
-
-  return (
-    <Layer>
-      <Rect fill='#738b8b' x={pts.TopRectLB.x} y={pts.TopRectLB.y - TopRoomHeight} width={pts.TopRectRB.x - pts.TopRectLB.x} height={TopRoomHeight} />
-      <ColorPolygon fill='#4a5c5e' pts={[pts.TopRectLB, pts.RoomRBFar, mirror(pts.RoomRBFar), pts.TopRectRB]} />
-      {
-        pts.SepsLTLBRBRT.map((s, index) => (
-          <ColorPolygon key={'a' + index} fill='#334648' pts={s} />
-        ))
-      }
-      {
-        windows.w.map((o, index) => <Window1 rect={o} key={'w' + index} />)
-      }
-      {
-        windows.h.map((o, index) => <WindowSep rect={o} key={'h' + index} />)
-      }
-    </Layer>
-  )
-}
-
-export default React.memo(Topper1);
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/Topper2.tsx b/src/views/rcgl/zmjk/Topper2.tsx
deleted file mode 100644
index cb393f1..0000000
--- a/src/views/rcgl/zmjk/Topper2.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import { Layer, Rect } from 'react-konva';
-import ColorPolygon from './ColorPolygon';
-import { CanvasH, CanvasW, ViewCenter, WaterTop } from './consts';
-import { ControlPts, interpolate, intersection, mirror } from './coordinates';
-
-
-const Topper2: React.FC<{
-  pts: ControlPts;
-  waterRatio: number;
-}> = ({ pts, waterRatio }) => {
-
-  const waterP1 = interpolate(pts.B1, { x: pts.L1.x, y: WaterTop }, waterRatio);
-  const waterP2 = intersection(waterP1, ViewCenter, { x: 0, y: undefined });
-
-  return (
-    <Layer>
-      {
-        pts.SepsFront.map((s, index) => (
-          <Rect key={index} fill='#738b8b' x={s.x} y={s.y} width={s.w} height={s.h} />
-        ))
-      }
-      <ColorPolygon fill='#539cb9' pts={[waterP1, waterP2, mirror(waterP2), mirror(waterP1)]} opacity={0.8} />
-      <ColorPolygon fill='#2d99ba' pts={[waterP2, mirror(waterP2), [CanvasW, CanvasH], [0, CanvasH]]} opacity={0.8} />
-    </Layer>
-  )
-}
-
-export default React.memo(Topper2);
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/Window.tsx b/src/views/rcgl/zmjk/Window.tsx
deleted file mode 100644
index 550ed8c..0000000
--- a/src/views/rcgl/zmjk/Window.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import React from 'react'
-import { Line, Rect } from 'react-konva';
-import ColorPolygon from './ColorPolygon';
-
-const S1 = 4;
-
-export const Window1: React.FC<{
-  rect: number[];
-}> = ({ rect }) => {
-  const [x1, y1, x2, y2] = rect;
-
-  const w1 = (x2 - x1 - S1) / 2;
-  const w2 = (x2 - x1 - S1 * 2) / 3;
-
-  return (
-    <>
-      <Rect fill='#b1c3cf' x={x1} y={y1} width={w1} height={16} />
-      <Rect fill='#b1c3cf' x={x1 + w1 + S1} y={y1} width={w1} height={16} />
-
-      <Rect fill='#b1c3cf' x={x1} y={y1 + 16 + S1} width={w2} height={y2 - y1 - 16 - S1} />
-      <Rect fill='#b1c3cf' x={x1 + w2 + S1} y={y1 + 16 + S1} width={w2} height={y2 - y1 - 16 - S1} />
-      <Rect fill='#b1c3cf' x={x1 + (w2 + S1) * 2} y={y1 + 16 + S1} width={w2} height={y2 - y1 - 16 - S1} />
-    </>
-  )
-}
-
-export const WindowSep: React.FC<{
-  rect: number[];
-}> = ({ rect }) => {
-  const [x1, y1, x2, y2] = rect;
-
-  return (
-    <Rect fill='#b1c3cf' x={x1} y={y1 - 8} width={x2 - x1} height={y2 - y1 + 8} />
-  )
-}
-
-export const RoomWindows: React.FC<{
-  rect: number[];
-}> = ({ rect }) => {
-  const [x1, y1, x2, y2] = rect;
-
-  const u = (x2 - x1) / 10;
-  const v = (y2 - y1) / 6;
-
-  const c1 = x1 - 10 + 1;
-  const c2 = x1 - 10 + 7 * u;
-  const dc = (c2 - c1) / 10;
-
-  return (
-    <>
-      <Rect fill='#c1d3d5' x={x1 + u} y={y1 + v} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u, y1 + v, x1 + 2 * u, y1 + v]} />
-      <Rect fill='#c1d3d5' x={x1 + u * 2 + 2} y={y1 + v} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u * 2 + 2, y1 + v, x1 + 3 * u + 2, y1 + v]} />
-
-
-      <Rect fill='#c1d3d5' x={x1 + u * 5} y={y1 + v} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u * 5, y1 + v, x1 + 6 * u, y1 + v]} />
-      <Rect fill='#c1d3d5' x={x1 + u * 6 + 2} y={y1 + v} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u * 6 + 2, y1 + v, x1 + 7 * u + 2, y1 + v]} />
-
-
-
-      <Rect fill='#c1d3d5' x={x1 + u} y={y1 + v * 4} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u, y1 + v * 4, x1 + 2 * u, y1 + v * 4]} />
-      <Rect fill='#c1d3d5' x={x1 + u * 2 + 2} y={y1 + v * 4} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u * 2 + 2, y1 + v * 4, x1 + 3 * u + 2, y1 + v * 4]} />
-
-
-      <Rect fill='#c1d3d5' x={x1 + u * 5} y={y1 + v * 4} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u * 5, y1 + v * 4, x1 + 6 * u, y1 + v * 4]} />
-      <Rect fill='#c1d3d5' x={x1 + u * 6 + 2} y={y1 + v * 4} width={u} height={v} />
-      <Line stroke='#fff' points={[x1 + u * 6 + 2, y1 + v * 4, x1 + 7 * u + 2, y1 + v * 4]} />
-
-      <Rect fill='#8fa7a7' x={x1 - 10} y={y1 + 3 * v} width={7 * u} height={v * 0.6} />
-      <ColorPolygon
-        fill='#4a5c5e'
-        pts={[
-          [x1 - 10, y1 + 3.6 * v],
-          [x1 - 10 + 4, y1 + 3.6 * v + 2],
-          [x1 - 10 + 7 * u + 3, y1 + 3.6 * v + 2],
-          [x1 - 10 + 7 * u + 3, y1 + 3 * v + 2],
-          [x1 - 10 + 7 * u, y1 + 3 * v],
-          [x1 - 10 + 7 * u, y1 + 3.6 * v + 2],
-          [x1 - 10 + 7 * u, y1 + 3.6 * v],
-        ]}
-      />
-      <Line stroke='#8fa7a7' lineJoin='round' points={[
-        x1, y1 + 2.5 * v + 2,
-        x1 - 10 + 4, y1 + 2.5 * v + 2,
-        x1 - 10, y1 + 2.5 * v, x1 - 10 + 7 * u, y1 + 2.5 * v,
-        x1 - 10 + 7 * u + 3, y1 + 2.5 * v + 2,
-      ]} />
-      <Line stroke='#8fa7a7' points={[x1 - 10 + 4, y1 + 2.5 * v + 2, x1 - 10 + 4, y1 + 3 * v]} />
-      {
-        [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(i => (
-          <Line key={i} stroke='#8fa7a7' points={[c1 + dc * i, y1 + 2.5 * v, c1 + dc * i, y1 + 3 * v]} />
-        ))
-      }
-
-    </>
-
-  )
-}
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/ZmColumn.tsx b/src/views/rcgl/zmjk/ZmColumn.tsx
deleted file mode 100644
index 81aa780..0000000
--- a/src/views/rcgl/zmjk/ZmColumn.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import React from 'react'
-import { Circle, Layer, Line, Rect } from 'react-konva';
-import ColorPolygon from './ColorPolygon';
-import { ViewCenter, WaterTop } from './consts';
-import { ControlPts, interpolate, intersection } from './coordinates';
-import ZmDec from './ZmDec';
-import { useLinearAnim } from './useLinearAnim';
-
-const ZmColumn: React.FC<{
-  kdMax: number;
-  gtophgt?: number;
-  idx: number;
-  pts: ControlPts;
-  waterRatio: number;
-  selected: boolean;
-}> = ({ kdMax, gtophgt, idx, pts, waterRatio, selected }) => {
-
-  const renKd = gtophgt; //useLinearAnim(gtophgt);
-
-  const a = pts.ZmArea[idx];
-  if (!a || typeof renKd !== 'number') {
-    return null;
-  }
-
-  const hh1 = (a.lb1.y - a.lt1.y) * 0.5;
-  const hh2 = (a.lb2.y - a.lt2.y) * 0.5;
-
-  const ratio = renKd / kdMax;
-  const e1 = hh1 * ratio * 0.8;
-  const e2 = hh2 * ratio * 0.8;
-
-  const lineLineLeft = { x: (a.lt1.x + a.lt2.x) * 0.5, y: (a.lt1.y + a.lt2.y) * 0.5 };
-  const lineLineRight = { x: (a.rt1.x + a.rt2.x) * 0.5, y: (a.rt1.y + a.rt2.y) * 0.5 };
-  const line1 = interpolate(lineLineLeft, lineLineRight, 0.25);
-  const line2 = interpolate(lineLineLeft, lineLineRight, 0.75);
-
-  const ty1 = a.lt1.y + hh1 - e1;
-  const ty2 = a.lt2.y + hh2 - e2;
-  const joiny = (ty1 + ty2) * 0.5;
-
-  const waterP1 = interpolate(a.lb0, { x: a.lb0.x, y: WaterTop }, waterRatio);
-  const waterP1R = { x: a.rb0.x, y: waterP1.y };
-  const waterP2 = intersection(ViewCenter, waterP1, { x: a.lb1.x, y: undefined });
-  const waterP2R = { x: a.rb1.x, y: waterP2.y };
-  const waterP3 = intersection(ViewCenter, waterP1, { x: a.lb3.x, y: undefined });
-  waterP3.y -= 26;
-  const waterP3R = { x: a.rb3.x, y: waterP3.y };
-  if (waterP3.x < waterP2.x) {
-    waterP3.x = waterP2.x;
-  }
-  if (waterP3R.x > waterP2R.x) {
-    waterP3R.x = waterP2R.x
-  }
-
-  // 
-  const b1 = { x: a.lb0.x, y: a.lb0.y - 32 };
-  const b6 = { x: a.rb0.x, y: a.rb0.y - 32 };
-  const b2 = interpolate(b1, b6, 0.4);
-  const b5 = interpolate(b1, b6, 0.6);
-  const b3 = { x: b2.x, y: b2.y + 12 };
-  const b4 = { x: b5.x, y: b5.y + 12 };
-
-  const b1_1 = intersection(b1, ViewCenter, { x: a.lb1.x, y: undefined });
-  const b1_6 = intersection(b6, ViewCenter, { x: a.rb1.x, y: undefined });
-  const b1_2 = intersection(b2, ViewCenter, { x: undefined, y: b1_1.y });
-  const b1_5 = intersection(b5, ViewCenter, { x: undefined, y: b1_6.y });
-  const b1_3 = intersection(b3, ViewCenter, { x: b1_2.x, y: undefined });
-  const b1_4 = intersection(b4, ViewCenter, { x: b1_5.x, y: undefined });
-
-  return (
-    <>
-      {
-        waterP3 && waterP3R ? (
-          <ColorPolygon fill='#539cb9' pts={[waterP2, waterP2R, waterP3R, waterP3]} opacity={0.8} />
-        ) : null
-      }
-      <ColorPolygon
-        desc="闸门上测"
-        fill='#afb5b5'
-        pts={[
-          [a.lt1.x, ty1],
-          [a.rt1.x, ty1],
-          [a.rt2.x, ty2],
-          [a.lt2.x, ty2],
-        ]}
-      />
-      <Line stroke='#222' strokeWidth={8} lineCap="round" points={[line1.x, line1.y, line1.x, joiny]} />
-      <Line stroke='#222' strokeWidth={8} lineCap="round" points={[line2.x, line2.y, line2.x, joiny]} />
-      <Circle fill='#afb5b5' x={line1.x} y={joiny} radius={10} />
-      <Circle fill='#afb5b5' x={line2.x} y={joiny} radius={10} />
-      <Line stroke='#222' strokeWidth={12} points={[line1.x, joiny - 8, line1.x, joiny - 10]} />
-      <Line stroke='#222' strokeWidth={12} points={[line2.x, joiny - 8, line2.x, joiny - 10]} />
-
-      <Rect
-        desc='闸门正面'
-        fill={selected ? '#95927a' : '#5f6969'}
-        stroke={selected ? 'orange' : "#222"}
-        strokeWidth={1} x={a.lt1.x} y={ty1} width={a.rt1.x - a.lt1.x} height={hh1} />
-
-      <ZmDec tl={{ x: a.lt1.x, y: ty1 }} rb={{ x: a.rt1.x, y: ty1 + hh1 }} />
-
-      <ColorPolygon desc="出水口" fill='#8d9d9b' pts={[b1_1, b1_2, b2, b1]} />
-      <ColorPolygon desc="出水口" fill='#8d9d9b' pts={[b1_5, b1_6, b6, b5]} />
-      <ColorPolygon desc="出水口" fill='#8d9d9b' pts={[b1_2, b1_3, b3, b2]} />
-      <ColorPolygon desc="出水口" fill='#8d9d9b' pts={[b1_3, b1_4, b4, b3]} />
-      <ColorPolygon desc="出水口" fill='#8d9d9b' pts={[b1_4, b1_5, b5, b4]} />
-      <ColorPolygon desc="出水口" fill='#728381' pts={[b1, b2, b3, b4, b5, b6, a.rb0, a.lb0]} />
-
-      {
-        waterP1.y < b1.y ? (
-          <ColorPolygon fill='#539cb9' pts={[waterP1, waterP1R, waterP2R, waterP2]} opacity={0.8} />
-        ) : null
-      }
-
-    </>
-  )
-}
-
-export default React.memo(ZmColumn)
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/ZmColumns.tsx b/src/views/rcgl/zmjk/ZmColumns.tsx
deleted file mode 100644
index b3b4f8e..0000000
--- a/src/views/rcgl/zmjk/ZmColumns.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { useMemo } from 'react'
-import { Layer } from 'react-konva';
-import { ControlPts } from './coordinates';
-import ZmColumn from './ZmColumn';
-// import { StationItem, GateRuntime } from '../../../models/_/defs';
-import { apertureMeter } from '../../../utils/utils';
-
-const ZmColumns: React.FC<{
-  zmobj: any;
-  runtime: any;
-  pts: ControlPts;
-  selectedId?: string;
-  waterRatio: number;
-}> = ({ zmobj, runtime, pts, waterRatio }) => {
-  const eqpnoList = useMemo(() => new Array(runtime.length).fill(0).map((o, index) => index), [runtime]);
-  return (
-    <Layer>
-      {
-        eqpnoList.map((o, index) => (
-          <ZmColumn
-            key={o}
-            gtophgt={apertureMeter(runtime[o]?.realAperture)}
-            kdMax={2}
-            pts={pts}
-            idx={index}
-            waterRatio={waterRatio}
-            selected={false}
-          />)
-        )
-      }
-    </Layer>
-  )
-}
-
-export default ZmColumns
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/ZmDec.tsx b/src/views/rcgl/zmjk/ZmDec.tsx
deleted file mode 100644
index 30f9f26..0000000
--- a/src/views/rcgl/zmjk/ZmDec.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react'
-import { Line, Rect } from 'react-konva';
-import { Horizontal, ViewCenter } from './consts';
-import { XY } from './coordinates'
-
-const INTERVALS = [0, 1, 2];
-
-const ZmDec: React.FC<{
-  tl: XY;
-  rb: XY;
-}> = ({ tl, rb }) => {
-
-  const ux = (rb.x - tl.x) / 12;
-  const uy = (rb.y - tl.y) / 12;
-
-  const ox = tl.x + 3 * ux;
-  const oy = tl.y + 3 * uy;
-
-  return (
-    <>
-      {
-        INTERVALS.map(y => (
-          <React.Fragment key={y}>
-            {
-              INTERVALS.map(x => {
-                const cx = ox + x * 3 * ux;
-                const cy = oy + y * 3 * uy;
-                const l = cx - ux;
-                const r = cx + ux;
-                const t = cy - uy;
-                const b = cy + uy;
-                return (
-                  <React.Fragment key={x}>
-                    <Rect fill="323737" x={l} y={t} width={2 * ux} height={2 * uy} />
-                    {
-                      cx < ViewCenter.x ? (
-                        <Line points={[l, t, l, b]} stroke="#afb5b5" strokeWidth={1} />
-                      ) : (
-                        <Line points={[r, t, r, b]} stroke="#afb5b5" strokeWidth={1} />
-                      )
-                    }
-                    {
-                      cy < Horizontal ? (
-                        <Line points={[l, t, r, t]} stroke="#afb5b5" strokeWidth={1} />
-                      ) : (
-                        <Line points={[l, b, r, b]} stroke="#afb5b5" strokeWidth={1} />
-                      )
-                    }
-                  </React.Fragment>
-                )
-              })
-            }
-          </React.Fragment>
-        ))
-      }
-    </>
-  )
-}
-
-export default ZmDec
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/consts.ts b/src/views/rcgl/zmjk/consts.ts
deleted file mode 100644
index 1a9147e..0000000
--- a/src/views/rcgl/zmjk/consts.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export const CanvasW = 1080;
-export const CanvasH = 640;
-
-export const Horizontal = CanvasH * 1.4 / 3;
-export const ViewCenter = { x: CanvasW * 0.5, y: Horizontal };
-
-export const GroundBase = CanvasH * 1.8 / 3;
-export const BottomBase = CanvasH * 2.5 / 3;
-export const RoofTop = CanvasH * 0.8 / 3;
-export const RoofTopFar = RoofTop + 32;
-export const FarBuildingTop = RoofTop - 16;
-
-export const SideRoomSize = CanvasH * 0.7 / 3;
-export const TopRoomHeight = SideRoomSize - 24;
-export const PillarRatio = 0.2;
-export const WaterTop = GroundBase;
diff --git a/src/views/rcgl/zmjk/coordinates.ts b/src/views/rcgl/zmjk/coordinates.ts
deleted file mode 100644
index 93bff7e..0000000
--- a/src/views/rcgl/zmjk/coordinates.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { BottomBase, CanvasW, GroundBase, PillarRatio, RoofTop, RoofTopFar, SideRoomSize, ViewCenter } from "./consts";
-
-export type XY = {
-  x: number;
-  y: number;
-}
-
-export type XYWH = {
-  x: number;
-  y: number;
-  w: number;
-  h: number;
-}
-
-export function intersection(pt1: XY, pt2: XY, result: { x?: number, y?: number }): XY {
-  const invalid: XY = { x: result.x || 0, y: result.y || 0 };
-  if (typeof result.x === typeof result.y) {
-    return invalid;
-  }
-
-  const x1 = pt1.x, y1 = pt1.y, x2 = pt2.x, y2 = pt2.y;
-
-  if (typeof result.x === 'number') {
-    const x3 = result.x;
-
-    if (x2 === x1) {
-      return invalid;
-    }
-
-    result.y = (y2 - y1) * (x3 - x1) / (x2 - x1) + y1;
-  } else {
-    const y3 = result.y!;
-
-    if (y2 === y1) {
-      return invalid;
-    }
-
-    result.x = (x2 - x1) * (y3 - y1) / (y2 - y1) + x1;
-  }
-
-  return result as any;
-}
-
-export function interpolate(pt1: XY, pt2: XY, ratio: number): XY {
-  return {
-    x: pt1.x + (pt2.x - pt1.x) * ratio,
-    y: pt1.y + (pt2.y - pt1.y) * ratio,
-  }
-}
-
-export function mirror(pt: XY): XY {
-  return {
-    x: CanvasW - pt.x,
-    y: pt.y,
-  }
-}
-
-export type ControlPts = {
-  C1: XY;
-  L1: XY;
-  B1: XY;
-  C2: XY;
-  L2: XY;
-  B2: XY;
-  A1: XY;
-  A2: XY;
-  B3: XY;
-  RoomLT: XY;
-  RoomRT: XY;
-  RoomRB: XY;
-  RoomLB: XY;
-  RoomRTFar: XY;
-  RoomRBFar: XY;
-  RoomLBFar: XY;
-  TopRectLB: XY;
-  TopRectRB: XY;
-  SepsLTLBRBRT: XY[][];
-  SepsFront: XYWH[];
-  ZmArea: {
-    lt0: XY; lt1: XY; lt2: XY; lt3: XY;
-    lb0: XY; lb1: XY; lb2: XY; lb3: XY;
-    rt0: XY; rt1: XY; rt2: XY; rt3: XY;
-    rb0: XY; rb1: XY; rb2: XY; rb3: XY;
-
-  }[];
-}
-
-
-
-
-export function contextCoordinates(unitWidth: number, hole: number): ControlPts {
-  const C1 = { x: unitWidth * 0.6, y: GroundBase };
-  const L1 = { x: unitWidth, y: GroundBase };
-  const B1 = { x: unitWidth, y: BottomBase }
-
-  const C2 = intersection(ViewCenter, C1, { x: 0, y: undefined });
-  const L2 = intersection(ViewCenter, L1, { x: 0, y: undefined });
-  const B2 = intersection(ViewCenter, B1, { x: 0, y: undefined });
-
-  const A1 = { x: L1.x, y: RoofTop };
-  const A2 = intersection(ViewCenter, A1, { x: undefined, y: RoofTopFar });
-
-  const B3 = intersection(ViewCenter, B2, { x: A2.x, y: undefined })
-
-  const RoomLT = { x: (C1.x + L1.x) * 0.5 - SideRoomSize * 0.5, y: RoofTop - SideRoomSize }
-  const RoomRT = { x: (C1.x + L1.x) * 0.5 + SideRoomSize * 0.5, y: RoofTop - SideRoomSize }
-  const RoomRB = { x: (C1.x + L1.x) * 0.5 + SideRoomSize * 0.5, y: RoofTop }
-  const RoomLB = { x: (C1.x + L1.x) * 0.5 - SideRoomSize * 0.5, y: RoofTop }
-  const RoomRBFar = intersection(ViewCenter, RoomRB, { x: undefined, y: RoofTopFar });
-  const RoomRTFar = intersection(ViewCenter, RoomRT, { x: RoomRBFar.x, y: undefined });
-  const RoomLBFar = { x: RoomRBFar.x! - SideRoomSize, y: RoomRBFar.y };
-
-
-  const TopRectLB = interpolate(RoomRB, RoomRBFar, 0.05);
-  const TopRectRB = mirror(TopRectLB);
-
-  const TopHoleLT = intersection(A1, ViewCenter, { x: undefined, y: TopRectLB.y });
-  const TopHoleRT = mirror(TopHoleLT);
-  const HolesWidth = TopHoleRT.x - TopHoleLT.x;
-  const PillarWidth = (HolesWidth / hole) * PillarRatio;
-  const HoleWidth = (HolesWidth - PillarWidth * (hole - 1)) / hole;
-
-  const SepsLTLBRBRT: XY[][] = [];
-  const SepsFront: XYWH[] = [];
-  const ZmArea = [];
-  for (let i = 0; i < hole; i++) {
-    const TopBase = TopHoleLT.y;
-    // 隔断
-    if (i > 0) {
-      const frontRight = TopHoleLT.x + (PillarWidth + HoleWidth) * i;
-      const frontLeft = frontRight - PillarWidth;
-      SepsFront.push({ x: frontLeft, y: TopBase, w: PillarWidth, h: BottomBase - TopBase });
-      if (i < hole / 2) {
-        // 右侧面
-        const p1 = { x: frontRight, y: TopBase };
-        const p2 = { x: frontRight, y: BottomBase };
-        const p4 = intersection(p1, ViewCenter, { x: undefined, y: RoofTopFar });
-        const p3 = intersection(p2, ViewCenter, { x: p4.x, y: undefined });
-        SepsLTLBRBRT.push([p1, p2, p3, p4]);
-      } else if (i > hole / 2) {
-        // 左侧面
-        const p1 = { x: frontLeft, y: TopBase };
-        const p2 = { x: frontLeft, y: BottomBase };
-        const p4 = intersection(p1, ViewCenter, { x: undefined, y: RoofTopFar });
-        const p3 = intersection(p2, ViewCenter, { x: p4.x, y: undefined });
-        SepsLTLBRBRT.push([p1, p2, p3, p4]);
-      }
-    }
-
-    // 闸门面
-    {
-      const ZmTopBaseFront = TopBase + 6;
-      const ZmTopBaseBack = ZmTopBaseFront + 10;
-      const lt0 = { x: TopHoleLT.x + (PillarWidth + HoleWidth) * i, y: TopBase };
-      const lb0 = { x: lt0.x, y: BottomBase };
-      const rb0 = { x: lt0.x + HoleWidth, y: BottomBase };
-      const lt1 = intersection(ViewCenter, lt0, { x: undefined, y: ZmTopBaseFront });
-      const lt2 = intersection(ViewCenter, lt0, { x: undefined, y: ZmTopBaseBack });
-      const lt3 = intersection(ViewCenter, lt0, { x: undefined, y: RoofTopFar });
-      const lb1 = intersection(ViewCenter, lb0, { x: lt1.x, y: undefined });
-      const lb2 = intersection(ViewCenter, lb0, { x: lt2.x, y: undefined });
-      const lb3 = intersection(ViewCenter, lb0, { x: lt3.x, y: undefined });
-      const rb1 = intersection(ViewCenter, rb0, { x: undefined, y: lb1.y });
-      const rb2 = intersection(ViewCenter, rb0, { x: undefined, y: lb2.y });
-      const rb3 = intersection(ViewCenter, rb0, { x: undefined, y: lb3.y });
-      const rt0 = { x: rb0.x, y: lt0.y };
-      const rt1 = { x: rb1.x, y: lt1.y };
-      const rt2 = { x: rb2.x, y: lt2.y };
-      const rt3 = { x: rb3.x, y: lt3.y };
-      ZmArea.push({ lt0, lb0, rb0, rt0, lt1, rt1, lb1, rb1, lt2, lb2, rt2, rb2, lt3, lb3, rt3, rb3 });
-    }
-  }
-
-  return {
-    C1, L1, B1, C2, L2, B2, A1, A2, B3,
-    RoomLT, RoomRT, RoomRB, RoomLB, RoomRTFar, RoomRBFar, RoomLBFar,
-    TopRectLB, TopRectRB,
-    SepsLTLBRBRT, SepsFront, ZmArea,
-  }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/index.js b/src/views/rcgl/zmjk/index.js
deleted file mode 100644
index 999994b..0000000
--- a/src/views/rcgl/zmjk/index.js
+++ /dev/null
@@ -1,416 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react'
-import { Modal, Tabs, Descriptions, Image } from 'antd';
-import { Stage } from 'react-konva';
-import Sider from './Sider';
-import Topper1 from './Topper1';
-import Topper2 from './Topper2';
-import ZmColumns from './ZmColumns';
-import { contextCoordinates } from './coordinates';
-import { renAperture } from '../../../utils/utils';
-import HFivePlayer from '../../../components/video1Plary'
-import './index.less';
-import { httpget, httpget2, httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const CanvasW = 1080
-const CanvasH = 640
-// const waterRatio = 0
-const zmobj ={
-  "hpCode": "HP0074208040002120",
-  "stcd": "4265630075",
-  "ctrlType": "PLC",
-  "ctrlProtocol": "PLC",
-  "uprzStcd": null,
-  "dwrzStcd": null,
-  "flowStcd": null,
-  "gaType": "waga",
-  "ctrlPass": null,
-  "maxHgt": 1.9,
-  "minHgt": 0,
-  "name": "五岭包节制闸",
-  "ghtX": null,
-  "ghtY": null,
-  "irrCode": "D00000020",
-  "irrName": "三干渠",
-  "engCode": "ENG100076",
-  "engName": "三干渠管理处",
-  "orgCode": "A07",
-  "gaorNum": 3,
-  "wagaType": "节制闸",
-  "plcType": null,
-  "bim": 0,
-  "vip": 0,
-  "miu": null,
-  "lgtd": 112.242945,
-  "lttd": 30.848166,
-  "runtime": [
-      null,
-      {
-          "stcd": "4265630075",
-          "gateNumber": 1,
-          "realAperture": 376,
-          "setAperture": 0,
-          "sensorLever": null,
-          "altitudeLever": null,
-          "remoteSignal": 0,
-          "powerSignal": 0,
-          "openingSignal": 0,
-          "closeingSignal": 0,
-          "errorSignal": 0,
-          "openedSignal": 0,
-          "closedSignal": 0,
-          "tm": "2024-09-25 20:03:26",
-          "_online": true
-      },
-      {
-          "stcd": "4265630075",
-          "gateNumber": 2,
-          "realAperture": 388,
-          "setAperture": 0,
-          "sensorLever": null,
-          "altitudeLever": null,
-          "remoteSignal": 0,
-          "powerSignal": 0,
-          "openingSignal": 0,
-          "closeingSignal": 0,
-          "errorSignal": 0,
-          "openedSignal": 0,
-          "closedSignal": 0,
-          "tm": "2024-09-25 20:03:26",
-          "_online": true
-      },
-      {
-          "stcd": "4265630075",
-          "gateNumber": 3,
-          "realAperture": 394,
-          "setAperture": 0,
-          "sensorLever": null,
-          "altitudeLever": null,
-          "remoteSignal": 0,
-          "powerSignal": null,
-          "openingSignal": 0,
-          "closeingSignal": 0,
-          "errorSignal": 0,
-          "openedSignal": 0,
-          "closedSignal": 0,
-          "tm": "2024-09-25 20:03:26",
-          "_online": true
-      }
-  ],
-  "real": {
-      "stcd": "4265630075",
-      "stationName": "五岭包节制闸",
-      "z1": null,
-      "zz1": null,
-      "z1tm": null,
-      "z2": null,
-      "zz2": null,
-      "z2tm": null,
-      "hq": null,
-      "hqtm": null,
-      "demtl": null
-  },
-  "cctvs": [],
-  "_idx": 88,
-  "_fav": false,
-  "_sort": 10086
-}
-
-const runtime = [
-  null,
-  {
-      "stcd": "4265630075",
-      "gateNumber": 1,
-      "realAperture": 976,
-      "setAperture": 0,
-      "sensorLever": null,
-      "altitudeLever": null,
-      "remoteSignal": 0,
-      "powerSignal": 0,
-      "openingSignal": 0,
-      "closeingSignal": 0,
-      "errorSignal": 0,
-      "openedSignal": 0,
-      "closedSignal": 0,
-      "tm": "2024-09-25 20:03:31"
-  },
-  {
-      "stcd": "4265630075",
-      "gateNumber": 2,
-      "realAperture": 388,
-      "setAperture": 0,
-      "sensorLever": null,
-      "altitudeLever": null,
-      "remoteSignal": 0,
-      "powerSignal": 0,
-      "openingSignal": 0,
-      "closeingSignal": 0,
-      "errorSignal": 0,
-      "openedSignal": 0,
-      "closedSignal": 0,
-      "tm": "2024-09-25 20:03:31"
-  },
-  {
-      "stcd": "4265630075",
-      "gateNumber": 3,
-      "realAperture": 394,
-      "setAperture": 0,
-      "sensorLever": null,
-      "altitudeLever": null,
-      "remoteSignal": 0,
-      "powerSignal": null,
-      "openingSignal": 0,
-      "closeingSignal": 0,
-      "errorSignal": 0,
-      "openedSignal": 0,
-      "closedSignal": 0,
-      "tm": "2024-09-25 20:03:31"
-  }
-]
-
-const myType = {
-  // 闸前水位站 2闸后水位站 3流量站
-  '1':'闸前水位/水深(m)',
-  '2':'闸后水位/水深(m)',
-  '3':'流量 (m³/s)',
-}
-
-const Page = () => {
-  const [itemIndex,setItemIndex] = useState(null)
-  const [waterRatio,setWaterRatio] = useState(0)
-  const [data,setData] = useState({})
-  const [list, setList ] = useState([])
-  const [damList, setDamList ] = useState([])
-  const [videoList, setVideoList ] = useState([])
-  const [videoArr, setvideoArr] = useState({})
-  const [open, setOpen] = useState(false)
-
-
-  const hole = 10;//zmobj.gaorNum;
-  const xunit = CanvasW / (2 + hole);
-  const pts = contextCoordinates(xunit, hole);
-  const eqpnoList = useMemo(() => damList ? new Array(damList.length).fill(0).map((o, index) => index) : [], [damList]);
-
-  useEffect(()=>{
-    getList()
-  },[])
-
-  const getList = async()=>{
-    const {code, data} = await httppost2(apiurl.zmjk.getList)
-    if(code!==200){
-      return
-    }
-    const obj = data[0]||{}
-    getInformation(obj.gateCode)
-    getDamData(obj.stcd)
-    getVideo(obj.gateCode)
-    setData(obj)
-  }
-
-  const getInformation = async(gateCode)=>{
-    const {code, data} = await httpget2(apiurl.zmjk.getInformation,{gateCode})
-    if(code!==200){
-      return
-    }
-    data.map((item)=>{
-      if(item.type===2){
-        setWaterRatio(item.value/5||0)
-      }
-    })
-    setList(data)
-  }
-
-  const getDamData = async(stcd)=>{
-    const {code, data} = await httpget2(apiurl.zmjk.getDamData,{stcd})
-    if(code!==200){
-      return
-    }
-    const list = [] 
-    data.map((item)=>{
-      list.push({
-        ...item
-      })
-    })
-    
-    setDamList([...list,...list,...list,list[0]])
-  }
-
-  const getVideo = async(valveCode)=>{
-    const {code, data} = await httppost2(apiurl.zmjk.getVideo,{valveCode})
-    if(code!==200){
-      return
-    }
-    setVideoList(data)
-  }
-
-  const getVideoSrc = async (current) => {
-    const res = await httpget2(`${apiurl.gsxl.zfzl.videosrc}${current}`)//32023a7f27d8448fa10511f24e96acff
-    if (res.code == 200 && res.data?.length !== 0) {
-      setvideoArr({src:res.data})
-    }else{
-      setvideoArr({})
-    }
-  }
-
-  const getNum = (a,b)=>{
-    const aa = Number(a||0)
-    const bb = Number(b||0)
-    const num = Number(aa-bb).toFixed(3)
-    return num
-  }
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm sg_zmjk' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          {/* <Card className='nonebox'>
-          </Card> */}
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <dvi className="sg_zmjk_left">
-              <Stage width={1080} height={640}>
-                <Sider pts={pts} side="left" />
-                <Sider pts={pts} side="right" />
-                <Topper1 pts={pts} type={hole} />
-                <ZmColumns runtime={damList} zmobj={zmobj} pts={pts} waterRatio={waterRatio} />
-                <Topper2 pts={pts} waterRatio={waterRatio} />
-              </Stage>
-              <div style={{ position: 'absolute', left: 0, top: 20, width: '100%', height: 100, display: 'flex', alignContent: 'center' }}>
-                <div key="sider1" style={{ flexGrow: 1, width: 100 }}></div>
-                {
-                  eqpnoList.map(o => (
-                    <div key={o}
-                      onClick={() => {}}
-                      className='o' style={{ flexGrow: 1, width: 100, display: 'flex', justifyContent: 'center', cursor: 'pointer' }}>
-                      <div style={{ width: 80, height: 40, backgroundColor: '#43c4e7', borderRadius: 12, color: '#fff', display: 'flex', justifyContent: 'center', alignItems: 'center', fontSize: 28 }}>#{o+1}</div>
-                    </div>
-                  ))
-                }
-                <div key="sider2" style={{ flexGrow: 1, width: 100 }}></div>
-              </div>
-              <div style={{ position: 'absolute', left: 0, bottom: 20, width: '100%', height: 100, display: 'flex', alignContent: 'center' }}>
-                <div key="sider1" style={{ flexGrow: 1, width: 100 }}></div>
-                {
-                  eqpnoList.map(o => (
-                    <div key={o} className='o' style={{ flexGrow: 1, width: 100, display: 'flex', justifyContent: 'center' }}>
-                      <div
-                        onClick={() => {}}
-                        style={{ width: 80, height: 32, border: '1px solid #444', backgroundColor: '#fff', borderRadius: 4, color: '#888', display: 'flex', justifyContent: 'center', alignItems: 'center', fontSize: 18, cursor: 'pointer' }}
-                      >
-                        {renAperture(damList[o]?.realAperture)}
-                      </div>
-                    </div>
-                  ))
-                }
-                <div key="sider2" style={{ flexGrow: 1, width: 100 }}></div>
-              </div>
-            </dvi>
-            {/* <dvi className="sg_zmjk_right">
-              <div className='sg_zmjk_right_video'>
-                <div className='sg_zmjk_right_video_title'>视频监控</div>
-                <div className='sg_zmjk_right_video_content'>
-                  <div className='sg_zmjk_right_video_content_left'>
-                    {
-                      videoList.map((item,index)=>(
-                        <div className={index===itemIndex?'sg_zmjk_right_video_content_left_item itemChecked':'sg_zmjk_right_video_content_left_item'} onClick={()=>{setItemIndex(index);getVideoSrc(item.indexCode)}}>
-                          {item.name}
-                        </div>
-                      ))
-                    }
-                  </div>
-                  <div className='sg_zmjk_right_video_content_right'>
-                    {
-                      videoArr?.src && 
-                      <div
-                          className="content-video"
-                          style={{ width: '100%', height: '100%',cursor: "pointer" }}
-                          onClick={() => {
-                            if (controlerParams.type == 1) {
-                              setVideoOpen(true)
-                              setIsShow(!isShow)
-                            }
-                          }}
-                        >
-                        <HFivePlayer size={1} wsUrl={videoArr} playerID={'111'} />
-                        <div style={{textAlign:"right"}}>注：单击视频显示/隐藏云台</div>
-                      </div>
-                    }
-                  </div>
-                </div>
-              </div>
-              <div className='sg_zmjk_right_information'>
-                <div className='sg_zmjk_right_information_title'>监测数据</div>
-                <div style={{height:'144px',overflowY:'auto',padding:'20px'}}>
-                {
-                  list?.map((item)=>{
-                    if(item.type===1){
-                      return (
-                        <div className='sg_zmjk_right_information_content'>
-                          <div>{myType[item.type]}</div>
-                          <div>{item.value||'-'} / {getNum(item.value,data.inEle)}</div>
-                          <div>{item.tm?.slice(5,19)}</div>
-                        </div>
-                      )
-                    }else if(item.type===2){
-                      return (
-                        <div className='sg_zmjk_right_information_content'>
-                          <div>{myType[item.type]}</div>
-                          <div>{item.value||'-'} / {getNum(item.value,data.inEle)}</div>
-                          <div>{item.tm?.slice(5,19)}</div>
-                        </div>
-                      )
-                    }else{
-                      return (
-                          <div className='sg_zmjk_right_information_content'>
-                            <div>{myType[item.type]}</div>
-                            <div>{item.value}</div>
-                            <div>{item.tm?.slice(5,19)}</div>
-                          </div>
-                        )
-                    }
-                  })
-                }
-                </div>
-              </div>
-              <div className='sg_zmjk_right_more' onClick={()=>setOpen(true)}>查看更多信息</div>
-            </dvi> */}
-          </div>
-        </div>
-      </div>
-      <Modal
-        open={open}
-        width={1000}
-        title=""
-        footer={null}
-        onCancel={() => {
-          setOpen(false)
-        }}
-      >
-        <div style={{height:'600px'}}>
-          <Tabs>
-            <Tabs.TabPane tab="基本信息" key="item-1">
-              <Descriptions bordered size="small" column={3} >
-                <Descriptions.Item label="启闭设备类型" style={{ width: '16.5%' }}>{{1:'卷扬式',2:'螺杆式',3:'凹轮式',4:'涡轮式',5:'丝杆式'}?.[data?.hdgrTp]||'-'}</Descriptions.Item>
-                <Descriptions.Item label="动力类型" style={{ width: '16.5%' }}>{{1:'手动',2:'电动',3:'手电两用'}?.[data?.pwrTp]||'-'}</Descriptions.Item>
-                <Descriptions.Item label="水闸类型" style={{ width: '16.5%' }}>{{1:'分（泄）洪闸',2:'节制闸',3:'排（退）水闸',4:'引（进）水闸',5:'挡潮闸',6:'船闸',9:'其他'}?.[data?.wagaType]||'-'}</Descriptions.Item>
-                <Descriptions.Item label="进口高程">{data?.inEle||'-'} m</Descriptions.Item>
-                <Descriptions.Item label="出口高程">{data?.outEle||'-'} m</Descriptions.Item>
-                <Descriptions.Item label="闸门孔数">{data?.gaorNum||'-'} 孔</Descriptions.Item>
-                <Descriptions.Item label="设计流量">{data?.dsfl||'-'} m³/s</Descriptions.Item>
-                <Descriptions.Item label="实达流量">{data?.stfl||'-'} m³/s</Descriptions.Item>
-                <Descriptions.Item label="闸门尺寸">{data?.gateSize||'-'} m*m</Descriptions.Item>
-                <Descriptions.Item label="工程等级">{{1:'Ⅰ',2:'Ⅱ',3:'Ⅲ',4:'Ⅳ',5:'Ⅴ'}?.[data?.engGrad]||'-'}</Descriptions.Item>
-                <Descriptions.Item label="运行状况">{{1:'在用良好',2:'在用故障',3:'停用'}?.[data?.runStat]||'-'}</Descriptions.Item>
-                <Descriptions.Item label="建成时间">{data?.compDate||'-'}</Descriptions.Item>
-              </Descriptions>
-            </Tabs.TabPane>
-            <Tabs.TabPane tab="工程图片" key="item-2">
-              <Image width={800} src={url + data?.files?.filePath} alt='' />
-            </Tabs.TabPane>
-          </Tabs>
-        </div>
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/rcgl/zmjk/index.less b/src/views/rcgl/zmjk/index.less
deleted file mode 100644
index b97ba31..0000000
--- a/src/views/rcgl/zmjk/index.less
+++ /dev/null
@@ -1,92 +0,0 @@
-.sg_zmjk{
-    .ant-card-body{
-        display: flex;
-        height: 100%;
-        .sg_zmjk_left{
-            top: 30px;
-            position: relative;
-            width: 1080px;
-            height: 640px;
-            transform: scale(0.9,1);
-
-        }
-        .sg_zmjk_right{
-            flex: 1;
-            // width: 40%;
-            height: 100%;
-            display: flex;
-            flex-direction: column;
-
-            .sg_zmjk_right_video{
-                height: 400px;
-                margin: 30px 20px 30px -30px;
-                border-radius: 5px;
-                border: 1px solid #bbb;
-                display: flex;
-                flex-direction: column;
-                .sg_zmjk_right_video_title{
-                    height: 35px;
-                    line-height: 35px;
-                    padding-left: 10px;
-                    border-bottom: 1px solid #bbb;
-                }
-                .sg_zmjk_right_video_content{
-                    flex: 1;
-                    display: flex;
-                    width: 100%;
-                    // height: 100%;
-                    .sg_zmjk_right_video_content_left{
-                        overflow-y: auto;
-                        overflow-x: hidden;
-                        padding: 10px;
-                        width: 130px;
-                        height: 363px;
-                        border-right: 1px solid #bbb;
-                        cursor: pointer;
-                        .sg_zmjk_right_video_content_left_item{
-                            width: 110px;
-                            // height: 30px;
-                            margin-bottom: 5px;
-                            // line-height: 30px;
-                            text-align: center;
-                            border: 1px solid #bbb;
-                        }
-                        .itemChecked{
-                            background-color: #1890FF;
-                            color: #ffffff;
-                        }
-                    }
-                    .sg_zmjk_right_video_content_right{
-                        flex: 1;
-                        height: 100%;
-                        padding: 10px;
-                    }
-                }
-            }
-            .sg_zmjk_right_information{
-                height: 180px;
-                margin: -10px 20px 30px -30px;
-                border-radius: 5px;
-                border: 1px solid #bbb;
-                .sg_zmjk_right_information_title{
-                    height: 35px;
-                    line-height: 35px;
-                    padding-left: 10px;
-                    border-bottom: 1px solid #bbb;
-                }
-                .sg_zmjk_right_information_content{
-                    display: flex;
-                    padding: 2px 10px;
-                    div{
-                        width: 33%;
-                        margin-bottom: 10px;
-                    }
-                }
-            }
-            .sg_zmjk_right_more{
-                margin: -10px 20px 30px -30px;
-                cursor: pointer;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/rcgl/zmjk/useLinearAnim.ts b/src/views/rcgl/zmjk/useLinearAnim.ts
deleted file mode 100644
index 7fb7040..0000000
--- a/src/views/rcgl/zmjk/useLinearAnim.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useEffect, useReducer, useRef, useState } from "react";
-
-
-const DURATION = 900;
-const CNT = 5;
-
-const INTERVAL = DURATION / CNT;
-
-export function useLinearAnim(val: number | undefined) {
-
-  const ren = useRef(val);
-
-  const [_, refresh] = useReducer(s => s + 1, 0);
-
-  const alive = useRef<boolean>(true);
-
-  useEffect(() => {
-    return () => {
-      alive.current = false;
-    }
-  }, [])
-
-  useEffect(() => {
-    if (typeof val !== 'number') {
-      return;
-    }
-
-    if (ren.current == undefined) {
-      ren.current = val;
-    }
-    const len = val - ren.current;
-
-    let handle: any = null;
-    if (len) {
-      const dv = len / CNT;
-      let cnt = CNT;
-      handle = setInterval(() => {
-        if (cnt > 0 && alive.current) {
-          cnt--;
-          ren.current! -= dv;
-          refresh();
-        }
-      }, INTERVAL)
-    }
-
-    return () => {
-      if (handle) {
-        clearInterval(handle);
-      }
-    }
-  }, [val]);
-
-  return ren.current ?? val;
-}
\ No newline at end of file
diff --git a/src/views/spjk/aiWarn/Card.js b/src/views/spjk/aiWarn/Card.js
deleted file mode 100644
index 499ba6a..0000000
--- a/src/views/spjk/aiWarn/Card.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react'
-import { Image } from 'antd'
-export default function Card({record}) {
-  return (
-      <div className='card-box' style={{border:"1px solid #fff",boxShadow:"0 0 10px #c0c0c0",padding:10,marginBottom:10,marginLeft:10}}>
-          <Image
-              src={record?.imgPath}
-              style={{width:360,height:220}}
-          ></Image>
-          <div style={{display:"flex",alignItems:"center",columnGap:5}}>
-              <span style={{
-                  padding: "4px 2px",
-                  backgroundColor: "#fff7e6",
-                  color: "#fbaa50",
-                  border: "1px solid #ffe3b6",
-                  margin: "5px 0",
-                  borderRadius:4
-              }}>{record.type == 1 ? "人员闯入" :
-                      record.type == 2 ? "工程车辆识别" :
-                          record.type == 3 ? "漂浮物识别" :
-                          record.type == 4 ? "游泳识别" : ''
-              }</span>
-              <span>{record?.tm}</span>
-          </div>
-          <div>
-              {record?.name}
-          </div>
-    </div>
-  )
-}
diff --git a/src/views/spjk/aiWarn/index.js b/src/views/spjk/aiWarn/index.js
deleted file mode 100644
index 2facc94..0000000
--- a/src/views/spjk/aiWarn/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Pagination,message } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable3';
-import { createCrudService } from '../../../components/crud/_';
-import CardShow from "./Card"
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-
-  const [searchVal, setSearchVal] = useState(false)
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.spjk1.aiWarn.page).find_noCode);
-  const onchange = (page, pageSize) => {
-    const obj = {
-      pageNumber: page,
-      pageSize: pageSize,
-    }
-    const searchParams = {
-      ...obj,
-      // search: {
-      //   ...searchVal,
-      // }
-    }
-    search(searchParams)
-  }
-  useEffect(() => {
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0",display:"flex",flexWrap:"wrap",maxHeight:650,overflowY:"auto"}}>
-            {
-              tableProps.dataSource.length > 0 ? 
-                tableProps.dataSource.map((item,i) => {
-                  return (
-                    <div key={i} >
-                      <CardShow
-                        record={item}
-                      />
-                  </div>
-                )
-              }) : null
-            }
-          </div>
-          <div style={{textAlign: "right", marginTop: "25px",marginRight:40}}>
-        <Pagination
-          current={tableProps.pagination.current}
-          total={tableProps.pagination.total}
-          showTotal={tableProps.pagination.showTotal}
-          pageSize={tableProps.pagination.pageSize}
-          showSizeChanger
-          showQuickJumper
-          pageSizeOptions={[4, 8, 12, 16]}
-          onChange={onchange}
-        />
-      </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/spjk/aiWarn/index.less b/src/views/spjk/aiWarn/index.less
deleted file mode 100644
index d22a6aa..0000000
--- a/src/views/spjk/aiWarn/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
\ No newline at end of file
diff --git a/src/views/spjk/aiWarn/toolbar.js b/src/views/spjk/aiWarn/toolbar.js
deleted file mode 100644
index 0708ae2..0000000
--- a/src/views/spjk/aiWarn/toolbar.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-import { httppost2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;  
-  
-  const warnTypes = [
-    {
-      label: "人员闯入",
-      value:1
-    },
-    {
-      label: "工程车辆识别",
-      value:2
-    },
-    {
-      label: "漂浮物识别",
-      value:3
-    },
-    {
-      label: "游泳识别",
-      value:4
-    },
-  ]
-  const [form] = Form.useForm();
-  const [codeList, setCodeList] = useState([])
-
-  const getStationCode = async () => {
-    try {
-      const res = await httppost2(apiurl.spjk1.aiWarn.list)
-      setCodeList(res.data.map(s=>({label:s.name,value:s.indexCode})));
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateTimeRangeSo:dateSo});
-  }
-
- useEffect(() => {
-   getStationCode()
-   let time = [moment().subtract(1,"weeks"),moment()]
-   let dateSo = {
-     start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-     end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-  }
-  form.setFieldValue("tm",time)
-  setSearchVal({dateTimeRangeSo:dateSo})
- }, [])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} >
-          <Form.Item label="告警日期" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="告警点位" name="indexCode">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={codeList}
-            />
-          </Form.Item>
-          <Form.Item label="告警类型" name="type">
-            <NormalSelect
-              allowClear
-              style={{ width: "150px" }}
-              options={warnTypes}
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          <Form.Item>
-          <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sq/qfg/zcdjxx.js b/src/views/sq/qfg/zcdjxx.js
deleted file mode 100644
index d32e277..0000000
--- a/src/views/sq/qfg/zcdjxx.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Image } from "antd"
-import zd from '../../../assets/img/u0.png'
-const Page = () => {
-    return (
-        <div style={{display:'flex',justifyContent:'center',alignItems:'center',backgroundColor:'#fff',height:'100%',padding:'20px'}}>
-            <Image src={zd} style={{margin:'auto',margin:'20px',height:'750px'}} preview={false}/>
-        </div>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sq/qth/hdsq/index.js b/src/views/sq/qth/hdsq/index.js
deleted file mode 100644
index 1bbf71f..0000000
--- a/src/views/sq/qth/hdsq/index.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { zqrl, list} from "../../../../service/sssq";
-import Sssw from './sssw';
-import Sjcx from '../../../Home/MapCtrl/components/Sqjcsj/index'
-import "./index.less"
-import { Table } from 'antd';
-export default function Sksq() {
-
-  const columns = [
-    {title: '水位(m)', key: 'z', dataIndex: 'z', align: 'center'},
-    {title: '流量(m³/s)', key: 'q', dataIndex: 'q', align: 'center'},
-  ]
-    const [tableData, setTableData] = useState([])
-    const [swtableData, setSwTableData] = useState([])
-  const getData = async (params) => {
-      let res = await list(params)
-      setTableData(res);
-      getSwTableData(res[0]?.stcd)
-  }
-  
-  const getSwTableData = async (stcd) => {
-    setSwTableData(await zqrl(stcd));
-  };
-    useEffect(() => {
-      getData({args: "",sources: ["SH", "SW"]})
-      }, [])
-  return (
-      <div className='lf' style={{ height: 'calc(100vh - 168px)', width: "100%" }}>
-          <div className='content-sk'>
-          <div className='content-left'>
-          <div className='comomn-title'>
-            <div style={{display:"flex",alignItems:"center"}}>
-                <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-                <span style={{marginLeft:10}}>实时水位</span>
-            </div>
-            <span>站点：{tableData[0]?.stnm}</span>
-            </div>
-            <div className='sssw-content'>
-                <Sssw data={tableData[0] || {}}/>
-          </div>
-          <div className='comomn-title'>
-            <div style={{display:"flex",alignItems:"center"}}>
-                <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-                <span style={{marginLeft:10}}>水位流量关系表</span>
-            </div>
-          </div>
-          <div className='sssw-content' style={{padding:10}}>
-            <Table
-              dataSource={swtableData}
-              rowKey="adcd"
-              columns={columns}
-              pagination={false}
-            />
-          </div>
-          </div>
-          <div className='content-right'>
-          <div className='comomn-title'>
-            <div style={{display:"flex",alignItems:"center",columnGap:10}}>
-            <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-            <span>数据查询</span>
-            </div>
-            </div>
-            <div className='sjcx-content'>
-                <Sjcx record={{...tableData[0],height:true} || {}}/>
-            </div>
-          </div>
-          </div>
-          
-      </div>
-  )
-}
diff --git a/src/views/sq/qth/hdsq/index.less b/src/views/sq/qth/hdsq/index.less
deleted file mode 100644
index e1f623d..0000000
--- a/src/views/sq/qth/hdsq/index.less
+++ /dev/null
@@ -1,108 +0,0 @@
-.content-sk{
-    display: flex;
-    column-gap: 10px;
-    height: calc(100vh - 90px);
-    .comomn-title{
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20px 10px;
-    }
-    .content-left{
-        width: 550px;
-        height: 100%;
-        background-color: #fff;
-        .ssjc{
-            .root {
-              display: flex;
-              color: #333;
-              padding: 1rem 1rem 1rem 1rem;
-            }
-          
-            .realinfo {
-              width: 100%;
-              margin-right: 1rem
-            }
-          
-            .dataTm {
-              padding: 0.4rem 1rem;
-              border-radius: 0.4rem;
-              margin-bottom: 0.5rem;
-              font-size: 0.8rem;
-            }
-          
-            .online, .offline{
-              color:#fff;
-              line-height:22px;
-              font-size:14px;
-              letter-spacing: 1px;
-            }
-          
-            .online {
-              border: 1px solid #9ccc65;
-              background-color: #33691e;
-            }
-            .report-time,.rain-report{
-              display: flex;
-              width: 70%;
-              align-items: center;
-              color: #689fff;
-              font-size: 15px;
-              font-weight: 500;
-              line-height: 1.5;
-              column-gap: 5px;
-              margin-bottom: 10px;
-              justify-content: center;
-              padding: 7px 0;
-              background-color: #ecf5ff;  
-              border: 1px solid #cde5ff;
-              border-radius: 5px;
-              margin-left: 10%;
-            }
-          
-            .offline {
-              border: 1px solid #ef5350;
-              background-color: #b71c1c;
-            }
-          
-            .infoItem {
-              border-bottom: 1px dashed #aaa;
-              display: flex;
-              font-size: 14px;
-              line-height: 1.8;
-              margin-bottom: 0.5rem;
-          
-              & > .row-key{
-                width: 9rem;
-                line-height:30px;
-              }
-          
-              & > .row-value{
-                width: 50%;
-                text-align: right;
-                font-weight: bold;
-                margin-right: 0.5rem;
-                flex-grow: 1;
-              }
-          
-              & > .row-unit{
-                width: 3rem;
-                flex-shrink: 0;
-              }
-            }
-          
-    
-          }
-    }
-    .content-right{
-        flex: 1;
-        height: 100%;
-        background-color: #fff;
-        .sjcx-content{
-            padding: 10px;
-        }
-    }
-    .pic-container{
-        padding: 10px;
-    }
-}
\ No newline at end of file
diff --git a/src/views/sq/qth/hdsq/sssw.js b/src/views/sq/qth/hdsq/sssw.js
deleted file mode 100644
index bd6c189..0000000
--- a/src/views/sq/qth/hdsq/sssw.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react'
-import {Divider} from "antd"
-export default function Sssw({data}) {
-  return (
-    <div className="ssjc">
-    <div className="root">
-      <div className="realinfo">
-        <div
-          className='report-time'
-        >水位上报时间: {data?.tm}</div>
-
-        <div className="infoItem">
-          <div className="row-key">监测水位:</div>
-          <div className="row-value">{data?.z ? data?.z.toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">警戒水位:</div>
-            <div className="row-value">{data?.wrz ? data?.wrz.toFixed(2) : '-'}</div>
-            <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-            <div className="row-value" style={{width:"20%"}}>{(data.wrz && data?.z) ? (data?.z - data.wrz).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">保证水位:</div>
-            <div className="row-value">{data.grz ? data.grz.toFixed(2) : '-'}</div>
-            <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-            <div className="row-value" style={{width:"20%"}}>{(data.grz && data?.z) ? (data?.z - data.grz ).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-      </div>
-    </div>
-  </div>
-  )
-}
diff --git a/src/views/sq/qth/sksq/index.js b/src/views/sq/qth/sksq/index.js
deleted file mode 100644
index 68d6969..0000000
--- a/src/views/sq/qth/sksq/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { reservoirlist, } from "../../../../service/sssq";
-import Sssw from './sssw';
-import Sjcx from '../../../Home/MapCtrl/components/Sksjcx/index'
-import "./index.less"
-import { helpers } from '@turf/turf';
-export default function Sksq() {
-    const [tableData, setTableData] = useState([])
-    const getData = async (params) => {
-        setTableData(await reservoirlist(params));
-    }
-    useEffect(() => {
-        let option = {
-          sources: ["SW", "SK"],
-          args: "",
-        };
-        getData(option)
-      }, [])
-  return (
-      <div className='lf' style={{ height: 'calc(100vh - 168px)', width: "100%" }}>
-          <div className='content-sk'>
-          <div className='content-left'>
-          <div className='comomn-title'>
-            <div style={{display:"flex",alignItems:"center"}}>
-                <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-                <span style={{marginLeft:10}}>实时水位</span>
-            </div>
-            <span>站点：{tableData[0]?.stnm}</span>
-            </div>
-            <div className='sssw-content'>
-                <Sssw data={tableData[0] || {}}/>
-            </div>
-          </div>
-          <div className='content-right'>
-          <div className='comomn-title'>
-            <div style={{display:"flex",alignItems:"center",columnGap:10}}>
-            <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-            <span>数据查询</span>
-            </div>
-            </div>
-            <div className='sjcx-content'>
-                <Sjcx record={{...tableData[0],height:true} || {}}/>
-            </div>
-          </div>
-          </div>
-          
-      </div>
-  )
-}
diff --git a/src/views/sq/qth/sksq/index.less b/src/views/sq/qth/sksq/index.less
deleted file mode 100644
index e1f623d..0000000
--- a/src/views/sq/qth/sksq/index.less
+++ /dev/null
@@ -1,108 +0,0 @@
-.content-sk{
-    display: flex;
-    column-gap: 10px;
-    height: calc(100vh - 90px);
-    .comomn-title{
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20px 10px;
-    }
-    .content-left{
-        width: 550px;
-        height: 100%;
-        background-color: #fff;
-        .ssjc{
-            .root {
-              display: flex;
-              color: #333;
-              padding: 1rem 1rem 1rem 1rem;
-            }
-          
-            .realinfo {
-              width: 100%;
-              margin-right: 1rem
-            }
-          
-            .dataTm {
-              padding: 0.4rem 1rem;
-              border-radius: 0.4rem;
-              margin-bottom: 0.5rem;
-              font-size: 0.8rem;
-            }
-          
-            .online, .offline{
-              color:#fff;
-              line-height:22px;
-              font-size:14px;
-              letter-spacing: 1px;
-            }
-          
-            .online {
-              border: 1px solid #9ccc65;
-              background-color: #33691e;
-            }
-            .report-time,.rain-report{
-              display: flex;
-              width: 70%;
-              align-items: center;
-              color: #689fff;
-              font-size: 15px;
-              font-weight: 500;
-              line-height: 1.5;
-              column-gap: 5px;
-              margin-bottom: 10px;
-              justify-content: center;
-              padding: 7px 0;
-              background-color: #ecf5ff;  
-              border: 1px solid #cde5ff;
-              border-radius: 5px;
-              margin-left: 10%;
-            }
-          
-            .offline {
-              border: 1px solid #ef5350;
-              background-color: #b71c1c;
-            }
-          
-            .infoItem {
-              border-bottom: 1px dashed #aaa;
-              display: flex;
-              font-size: 14px;
-              line-height: 1.8;
-              margin-bottom: 0.5rem;
-          
-              & > .row-key{
-                width: 9rem;
-                line-height:30px;
-              }
-          
-              & > .row-value{
-                width: 50%;
-                text-align: right;
-                font-weight: bold;
-                margin-right: 0.5rem;
-                flex-grow: 1;
-              }
-          
-              & > .row-unit{
-                width: 3rem;
-                flex-shrink: 0;
-              }
-            }
-          
-    
-          }
-    }
-    .content-right{
-        flex: 1;
-        height: 100%;
-        background-color: #fff;
-        .sjcx-content{
-            padding: 10px;
-        }
-    }
-    .pic-container{
-        padding: 10px;
-    }
-}
\ No newline at end of file
diff --git a/src/views/sq/qth/sksq/sssw.js b/src/views/sq/qth/sksq/sssw.js
deleted file mode 100644
index d6b3b3d..0000000
--- a/src/views/sq/qth/sksq/sssw.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import React from 'react'
-import moment from 'moment'
-import MyImg from '../../../Home/MapCtrl/components/Skssjc/myImg'
-import {Divider} from "antd"
-
-export default function Sssw({data}) {
-  return (
-    <div className="ssjc">
-    <div className="root">
-      <div className="realinfo">
-        <div
-          className='report-time'
-        >水位上报时间: {data?.tm}</div>
-
-        <div className="infoItem">
-          <div className="row-key">监测水位:</div>
-          <div className="row-value">{data?.rz ? data?.rz.toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">校验洪水位:</div>
-            <div className="row-value">{data?.calFloodLev ? data?.calFloodLev.toFixed(2) : '-'}</div>
-            <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-            <div className="row-value" style={{width:"20%"}}>{(data.calFloodLev && data?.rz) ? (data?.rz - data.calFloodLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-        <div className="infoItem">
-          <div className="row-key">设计洪水位:</div>
-          <div className="row-value">{data?.desFloodLev ? data?.desFloodLev.toFixed(2):'-'}</div>
-          <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-          <div className="row-value" style={{width:"20%"}}>{(data.desFloodLev && data?.rz) ? (data?.rz - data.desFloodLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">汛限水位:</div>
-          <div className="row-value">{data.flLowLimLev ? data.flLowLimLev.toFixed(2):'-'}</div>
-          <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-          <div className="row-value" style={{width:"20%"}}>{(data.flLowLimLev && data?.rz) ? (data?.rz - data.flLowLimLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">死水位:</div>
-          <div className="row-value">{data.deadLev ? data.deadLev.toFixed(2):'-'}</div>
-          <Divider type="vertical" style={{height:25,background:"#000",width:2,margin:"0 30px"}}/>
-          <div className="row-value" style={{width:"20%"}}>{(data.deadLev && data?.rz) ? (data?.rz - data.deadLev).toFixed(2):'-'}</div>
-          <div className="row-unit">m</div>
-        </div>
-        <div className="infoItem">
-          <div className="row-key">坝顶高程:</div>
-          <div className="row-value">{data.crestElev}</div>
-          <div className="row-unit">{ data.crestElev ? "m" : "-"}</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">水库当前库容:</div>
-          <div className="row-value">{data.nowCap}</div>
-          <div className="row-unit">万m³</div>
-        </div>
-
-        <div className="infoItem">
-          <div className="row-key">兴利库容:</div>
-          <div className="row-value">{data.benResCap}</div>
-          <div className="row-unit">万m³</div>
-        </div>
-      </div>
-    </div>
-    <div className='pic-container'>
-      <MyImg record={data} />
-    </div>
-  </div>
-  )
-}
diff --git a/src/views/sq/qth/ssyq/index.js b/src/views/sq/qth/ssyq/index.js
deleted file mode 100644
index c4e5a87..0000000
--- a/src/views/sq/qth/ssyq/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { reservoirlist, } from "../../../../service/sssq";
-import { message } from 'antd';
-import Sssw from './sssw';
-import Sjcx from '../../../Home/MapCtrl/components/Jcsj/index'
-import "./index.less"
-import { httppost2 } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import { helpers } from '@turf/turf';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-export default function Sksq() {
-    const [tableData1, setTableData1] = useState([])
-  const getData1 = async () => {
-      const { data, code, msg } = await httppost2(apiurl.home.yq)
-      if (code !== 200) {
-          message.error(msg || '请求失败');
-      }
-      const list = data.map((i)=>{
-        return {
-          id : i.stcd,
-          ...i,
-          drp : i.drp ,//i.v,
-        }
-      })
-      setTableData1(list||[])
-
-  }
-  const [selectList, setSelectList] = useState([])
-  const [selected, setSelected] = useState('')
-  const [stcdItem, setStcdItem] = useState({})
-  const getList = async() => {
-    try {
-      const res = await httppost2(apiurl.sssq.selectList)
-      setSelectList(res.data.map(item => ({ label: item.stnm, value: item.stcd,...item})))
-      setSelected(res.data[0].stcd)
-      setStcdItem(res.data[0])
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  const handleChange = (e) =>{
-    setSelected(e);
-    setStcdItem(selectList.find(item => item.stcd === e))
-  }
-  
-  useEffect(() => {
-    getList()
-  }, [])
-  
-    useEffect(() => {
-      getData1()
-    }, [])
-  return (
-      <div className='lf' style={{ height: 'calc(100vh - 168px)', width: "100%" }}>
-          <div className='content-sk'>
-          <div className='content-left'>
-          <div className='comomn-title'>
-            <div  style={{display:"flex",alignItems:"center",columnGap:0}}>
-                <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-                <span style={{marginLeft:10}}>实时雨情</span>
-            </div>
-            <div style={{display:"flex",columnGap:10,width:"45%",alignItems:"center"}}>
-              <span style={{width:"18%"}}>站点：</span>
-              <NormalSelect
-                style={{ width: '77%' }}
-                allowClear
-                options={selectList}
-                value={selected}
-                onChange={(e) => { handleChange(e)}}
-              />
-            </div>
-            </div>
-            <div className='sssw-content'>
-                <Sssw data={stcdItem || {}}/>
-            </div>
-          </div>
-          <div className='content-right'>
-          <div className='comomn-title'>
-            <div style={{display:"flex",alignItems:"center",columnGap:10}}>
-            <img alt='' src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} />
-            <span>数据查询</span>
-            </div>
-            </div>
-            <div className='sjcx-content'>
-                <Sjcx record={{stcd:selected,height:true} || {}}/>
-            </div>
-          </div>
-          </div>
-          
-      </div>
-  )
-}
diff --git a/src/views/sq/qth/ssyq/index.less b/src/views/sq/qth/ssyq/index.less
deleted file mode 100644
index 9159b4b..0000000
--- a/src/views/sq/qth/ssyq/index.less
+++ /dev/null
@@ -1,82 +0,0 @@
-.content-sk{
-    display: flex;
-    column-gap: 10px;
-    height: calc(100vh - 90px);
-    .comomn-title{
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20px 10px;
-    }
-    .content-left{
-        width: 550px;
-        height: 100%;
-        background-color: #fff;
-        .ssjc{
-            .root {
-              display: flex;
-              color: #333;
-              padding: 1rem 1rem 1rem 1rem;
-              .drp-content{
-                display: flex;
-                justify-content: center;
-                flex-wrap: wrap;
-                column-gap: 40px;
-                margin-top: 40px;
-              }
-              .drp-item{
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                justify-content: space-around;
-                width: 220px;
-                height: 160px;
-                background-color: #eaf4fe;
-                margin-bottom: 40px;
-                .value{
-                  font-size: 20px;
-                  font-weight: bold;
-                }
-                .name{
-                  font-size: 16px;
-                  color: #40a9ff;
-                }
-              }
-            }
-          
-          
-            .report-time,.rain-report{
-              display: flex;
-              width: 70%;
-              align-items: center;
-              color: #689fff;
-              font-size: 15px;
-              font-weight: 500;
-              line-height: 1.5;
-              column-gap: 5px;
-              margin-bottom: 10px;
-              justify-content: center;
-              padding: 7px 0;
-              background-color: #ecf5ff;  
-              border: 1px solid #cde5ff;
-              border-radius: 5px;
-              margin-left: 10%;
-            }
-          
-      
-          
-    
-          }
-    }
-    .content-right{
-        flex: 1;
-        height: 100%;
-        background-color: #fff;
-        .sjcx-content{
-            padding: 10px;
-        }
-    }
-    .pic-container{
-        padding: 10px;
-    }
-}
\ No newline at end of file
diff --git a/src/views/sq/qth/ssyq/sssw.js b/src/views/sq/qth/ssyq/sssw.js
deleted file mode 100644
index 152e7d5..0000000
--- a/src/views/sq/qth/ssyq/sssw.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React,{useState,useEffect} from 'react'
-import {queryStPptnDetails} from '../../../../service/ssyq'
-export default function Sssw({ data }) {
-  const [detail, setDetail] = useState({})
-  const getDetail = async (data) => {
-    setDetail(await queryStPptnDetails(data))
-  }
-  useEffect(() => {
-    if (data.stcd) {
-      getDetail(data.stcd)
-   }
-  }, [data])
-  
-  return (
-    <div className="ssjc">
-    <div className="root">
-      <div className="realinfo">
-        <div
-          className='report-time'
-        >雨情最新上报时间: {detail?.tm}</div>
-          <div className='drp-content'>
-          <div className='drp-item'>
-              <div className='value'>{detail?.h1 ?? '-' }&nbsp;<span>mm</span></div>
-            <div className='name'>近1小时</div>
-          </div>
-          <div className='drp-item'>
-            <div className='value'>{detail?.h3 ?? '-' }&nbsp;<span>mm</span></div>
-            <div className='name'>近3小时</div>
-          </div>
-          <div className='drp-item'>
-            <div className='value'>{detail?.h6 ?? '-' }&nbsp;<span>mm</span></div>
-            <div className='name'>近6小时</div>
-          </div>
-          <div className='drp-item'>
-            <div className='value'>{detail?.h12 ?? '-' }&nbsp;<span>mm</span></div>
-            <div className='name'>近12小时</div>
-          </div>
-          <div className='drp-item'>
-            <div className='value'>{detail?.h24 ?? '-' }&nbsp;<span>mm</span></div>
-            <div className='name'>近24小时</div>
-         </div> <div className='drp-item'>
-            <div className='value'>{detail?.h48 ?? '-' }&nbsp;<span>mm</span></div>
-            <div className='name'>近48小时</div>
-         </div>
-            
-       </div>
-      </div>
-    </div>
-   
-  </div>
-  )
-}
diff --git a/src/views/sq/qys/gcys/KrLine/drpOption.js b/src/views/sq/qys/gcys/KrLine/drpOption.js
deleted file mode 100644
index f466540..0000000
--- a/src/views/sq/qys/gcys/KrLine/drpOption.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  const maxVal = Math.ceil(Math.max(...data.map(obj => obj.rz)))
-  const minVal = Math.floor(Math.min(...data.map(obj => obj.rz)))
-  const maxValX = Math.max(...data.map(obj => obj.w))
-  const minValX = Math.min(...data.map(obj => obj.w))
-  
-
-
-  let arr =[]
-  data.forEach(item=>{
-    console.log(data);
-    arr.push([item.w,item.rz])
-  })
-  // console.log(GetInterval(minValX,maxValX),'jhsdjkashdjkahjk');
-  return {
-    toolbox: {
-      show: true,
-      feature: {
-        saveAsImage: {
-          show: true,
-          excludeComponents: ['toolbox'],
-          pixelRatio: 2,
-          name:"库容曲线图"
-        }
-      },
-      right: "14%",
-      top:"5%"
-    },
-    title: {
-      text: "库容曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "15%",
-        right: "15%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "库容(万m³)",
-        nameGap: 5,
-        type: 'value',
-        min:Math.floor(minValX / 5)  *5,
-        max:Math.ceil(maxValX / 5)  *5,
-        interval:GetInterval(minValX,maxValX),
-        data: data.map(o => o.w),
-        splitLine: {
-          show: false
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        minInterval:1,
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data: arr,
-        smooth: true
-      },
-    ]
-  };
-}
diff --git a/src/views/sq/qys/gcys/KrLine/form.js b/src/views/sq/qys/gcys/KrLine/form.js
deleted file mode 100644
index 4514722..0000000
--- a/src/views/sq/qys/gcys/KrLine/form.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col} from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../../service/apiurl';
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const onFinish = async (values) => {
-    values.id = record?.id
-    if (mode === 'edit') {
-      const params = {
-        ...record,
-        rz: Number(values?.rz),
-        w: Number(values?.w),
-      }
-      onEdit(apiurl.dataResourcesCenter.projectAndWater.kr.update,params)
-    }
-    if (mode === 'save') {
-      const params = {
-        ...values,
-        resCode:record.resCode
-      }
-      onSave(apiurl.dataResourcesCenter.projectAndWater.kr.save,params)
-    }
-  }
-  
-  return (
-    <>
-      <Form
-        form={form}
-        // {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="水位(m)"
-                name="rz"
-                labelCol={{ span: 5, offset: 0 }}
-                wrapperCol={{span:19,offset:0}}
-                rules={[{ required: true }]}
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="库容(万m³)"
-                name="w"
-                labelCol={{ span: 5, offset: 0 }}
-                wrapperCol={{span:19,offset:0}}
-                rules={[{ required: true }]}
-              >
-               <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col> 
-      </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sq/qys/gcys/KrLine/index.js b/src/views/sq/qys/gcys/KrLine/index.js
deleted file mode 100644
index fe68fbc..0000000
--- a/src/views/sq/qys/gcys/KrLine/index.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import React,{useEffect,useState,useRef,useMemo} from 'react'
-import { Table, Button } from 'antd'
-import ModalForm from './form';
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption'
-import apiurl from '../../../../../service/apiurl';
-import { httppost2 } from '../../../../../utils/request';
-import { CrudOpRender_text } from '../../../../../components/crud/CrudOpRender';
-import BasicCrudModal from '../../../../../components/crud/BasicCrudModal2';
-export default function Zrtx({dataInfo}) {
-    const refModal = useRef();
-    const columns = [
-        {
-            title: '序号', dataIndex: 'index', key: 'index', align: "center",
-            render: (r, c,i) => <span>{i + 1}</span>
-         },
-        { title: '水位(m)', dataIndex: 'rz', key: 'rz',align:"center" },
-        { title: '库容(万m³)', dataIndex: 'w', key: 'w',align:"center" },
-        {
-            title: '操作', dataIndex: 'op', key: 'op', align: "center",width:200,
-            render: (value, row, index) => (<CrudOpRender_text  del={true} edit={true} command={(cmd) => () => command(cmd)(row)} />)
-         },
-    ];
-    const [data, setData] = useState([])
-    const option = useMemo(() => {
-      return drpOption({data});
-    }, [data])
-    const getData = async () => {
-        try {
-            const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.kr.list)
-            setData(res.data.map((item,i) => ({...item,inx:i + 1})))
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-
-    const command = (type) => (params) => {
-      // debugger;
-        if (type === 'save') {
-          refModal.current.showSave(dataInfo);
-        } else if (type === 'edit') {
-          refModal.current.showEdit(params)
-        } else if (type === 'view') {
-          refModal.current.showView(params);
-        } else if (type === 'del') {
-          refModal.current.onDeletePost(apiurl.dataResourcesCenter.projectAndWater.kr.delete,params);
-        } 
-      }
-  
-    useEffect(() => {
-      getData();
-      
-    }, [])
-    
-  return (
-      <div>
-         <h1><Button type='primary' onClick={() => {refModal.current.showSave(dataInfo)}}>新增</Button></h1>
-         <div style={{display:"flex",columnGap:10,width:"100%"}}>
-          <div style={{width:500}}>
-          <Table
-              rowKey="inx"
-              columns={columns}
-              dataSource={data}
-              pagination={false}
-              scroll={{ y:"calc( 100vh - 300px )"}}
-          />
-          </div>
-          <div className='right-echarts' style={{ flex: 1 }}>
-              {
-                  data.length > 0 ?
-                  <ReactEcharts
-                    option={option}
-                    style={{width: "100%", height: '100%'}}
-                  /> : <div style={{textAlign: "center", margin: "10%"}}>
-                    <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                  </div>
-              }
-          </div>
-         </div>
-
-        <BasicCrudModal
-          width={550}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={getData}
-        />
-    </div>
-  )
-}
diff --git a/src/views/sq/qys/gcys/index.js b/src/views/sq/qys/gcys/index.js
deleted file mode 100644
index 90059ee..0000000
--- a/src/views/sq/qys/gcys/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import ProjectBasciInfo from './projectBasicInfo'
-import TzParams from './tzParams'
-import KrLine from './KrLine'
-import MonthLl from './monthLl'
-import apiurl from '../../../../service/apiurl';
-import { httpget2, httppost2 } from '../../../../utils/request';
-import XlLine from './xlLine'
-import "./index.less"
-export default function ShuikuBasicInfo() {
-  const [tabVal, setTabVal] = useState('1')
-  const [data,setData] =useState('')
-  const getDataIfo = async () => {
-    try {
-        
-        const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.shuikuBasicinfo.detail)
-        // debugger;
-        if (res.code == 200) {
-            setData(res.data[0])
-        }
-    } catch (error) {
-        console.log(error);
-    }
-}
-  useEffect(()=>{
-    getDataIfo()
-  },[])
-  return (
-    <div className='shuiku-content-root'>
-      <div className='fxdd_hsybjs_toolbar'>
-        <div
-          className={tabVal === '1' ? 'fxdd_hsybjs_toolbar_item hsybjs_checked' : 'fxdd_hsybjs_toolbar_item'}
-          onClick={() => setTabVal('1')}>工程基础信息
-        </div>
-        <div
-          className={tabVal === '2' ? 'fxdd_hsybjs_toolbar_item hsybjs_checked' : 'fxdd_hsybjs_toolbar_item'}
-          onClick={() => setTabVal('2')}>主要特征参数
-        </div>
-        <div
-          className={tabVal === '3' ? 'fxdd_hsybjs_toolbar_item hsybjs_checked' : 'fxdd_hsybjs_toolbar_item'}
-          onClick={() => setTabVal('3')}>水库库容曲线
-        </div>
-        <div
-          className={tabVal === '4' ? 'fxdd_hsybjs_toolbar_item hsybjs_checked' : 'fxdd_hsybjs_toolbar_item'}
-          onClick={() => setTabVal('4')}>水库泄流曲线
-        </div>
-        <div
-          className={tabVal === '5' ? 'fxdd_hsybjs_toolbar_item hsybjs_checked' : 'fxdd_hsybjs_toolbar_item'}
-          onClick={() => setTabVal('5')}>月生态流量
-        </div>
-      </div>
-      <div
-        className='shuiku-content'
-        style={{marginLeft:(tabVal == 1 || tabVal == 2) ? 60 : 20}}
-      >
-        {tabVal === "1" ? <ProjectBasciInfo /> : null}
-        {tabVal === "2" ? <TzParams /> : null}
-        {tabVal === "3" ? <KrLine dataInfo={data}/> : null}
-        {tabVal === "4" ? <XlLine /> : null}
-        {tabVal === "5" ? <MonthLl dataInfo={data}/> : null}
-    
-      </div>
-    </div>
-  )
-}
diff --git a/src/views/sq/qys/gcys/index.less b/src/views/sq/qys/gcys/index.less
deleted file mode 100644
index 4d3cbab..0000000
--- a/src/views/sq/qys/gcys/index.less
+++ /dev/null
@@ -1,56 +0,0 @@
-.shuiku-content-root{
-    height: calc(100vh - 93px);
-    padding: 12px;
-    overflow-y: auto;
-    overflow-x: hidden;
-    background-color: #fff;
-    margin: 4px 0 0 5px;
-    .fxdd_hsybjs_toolbar{
-        width: 100%;
-        height: 40px;
-        display: flex;
-
-        .fxdd_hsybjs_toolbar_item{
-            width: 120px;
-            height: 40px;
-            line-height: 40px;
-            margin-right: 5px;
-            border-radius: 10px 10px 0 0;
-            background: #D7DFEB;
-            border: 1px solid rgba(228, 231, 237, 1);
-            text-align: center;
-            font-size: 14px;
-            font-weight: 500;
-            color: #333;
-            cursor: pointer;
-        }
-        .hsybjs_checked{
-            color: #409EFF;
-            background: #ffffff;
-        }
-        .fxdd_hsybjs_toolbar_item:hover{
-            color: #409EFF;
-        }
-        
-    }
-    .shuiku-content{
-        margin: 0 20px 0 60px;
-        padding: 20px 0;
-    }
-}
-
-.ant-input[disabled]{
-    color: rgba(0, 0, 0, 0.5) !important;
-}
-
-.ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector{
-    color: rgba(0, 0, 0, 0.5) !important;
-}
-
-.ant-picker-input > input[disabled]{
-    color: rgba(0, 0, 0, 0.5) !important;
-}
-.ant-select-disabled.ant-select-multiple .ant-select-selection-item{
-    color: rgba(0, 0, 0, 0.5) !important;
-
-}
\ No newline at end of file
diff --git a/src/views/sq/qys/gcys/monthLl/index.js b/src/views/sq/qys/gcys/monthLl/index.js
deleted file mode 100644
index c5f793f..0000000
--- a/src/views/sq/qys/gcys/monthLl/index.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import React, { useState,useEffect } from 'react'
-import { Table, Input, Form, Row, Col, Button, message } from "antd"
-import { httppost2 } from '../../../../../utils/request';
-import apiurl from '../../../../../service/apiurl';
-import moment from "moment"
-const EditableCell = ({
-    editing,
-    dataIndex,
-    title,
-    inputType,
-    record,
-    index,
-    children,
-    ...restProps
-  }) => {
-    const inputNode = <Input style={{ textAlign: "center" }} />;
-    return (
-      <td {...restProps}>
-        {editing ? (
-          <Form.Item
-            name={dataIndex}
-            wrapperCol={[24]}
-            style={{
-              margin: 0,
-            }}
-          >
-            {inputNode}
-          </Form.Item>
-        ) : (
-          children
-        )}
-      </td>
-    );
-  };
-export default function MonthLl() {
-    const [form] = Form.useForm()
-    const columns = Array(12).fill(0).map((item, i) => ({
-        title: (i + 1) + '月',
-        key: String(i + 1),
-        dataIndex: String(i + 1),
-        align:"center",
-        ellipsis: true,
-        editable: true,
-    }))
-    const [details, setDetails] = useState([])
-    const [editingKey, setEditingKey] = useState('');
-    const [skdisabled, setSkDisabled] = useState(true)
-    const [data, setData] = useState([])
-    const isEditing = (record) => {
-        console.log("editingKey",editingKey,record.id);
-        return record.id === editingKey;
-    }
-    const mergedColumns = columns.map((col) => {
-        if (!col.editable) {
-          return col;
-        }
-        return {
-          ...col,
-          onCell: (record) => ({
-            record,
-            inputType: "text",
-            dataIndex: col.dataIndex,
-            title: col.title,
-            editing: isEditing(record),
-          }),
-        };
-    });
- 
-
-    const edit = () => {
-        form.setFieldsValue(details[0])
-        setSkDisabled(false);
-        setEditingKey(details[0]?.id)
-    }
-
-    const cancel = () => { 
-        setSkDisabled(true);
-        setEditingKey("")
-    }
-  const editItem = async(arr) => {
-      try {
-        const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.monthLl.update,arr)
-        if (res.code == 200) {
-          message.success('修改成功');
-          getData()
-        }
-      } catch (error) {
-        console.log(error);
-        
-      }
-    }
-    const save = async () => {
-        try {
-          const row = await form.validateFields();
-          const newData = [];
-            const index = newData.findIndex((item) => details[0]?.id === item.id);
-          if (index > -1) {
-            const item = newData[index];
-            newData.splice(index, 1, {
-              ...item,
-              ...row,
-            });
-            setDetails(newData);
-            setEditingKey('');
-            
-          } else {
-            newData.push(row);
-            setDetails(newData);
-            setEditingKey('');
-            }
-            setSkDisabled(true)
-         const arr = data.map(item => ({
-            ...item,
-            value:newData[0][item.month] ? Number(newData[0][item.month]) : ''
-          }))
-           
-            editItem(arr)
-        } catch (errInfo) {
-          console.log('Validate Failed:', errInfo);
-        }
-    };
-    
-    const getData = async () => {
-      try {
-        const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.monthLl.page, { year: moment().year() })
-        setData(res.data)
-        let obj = {}
-        for (let i = 0; i < res.data.length; i++) {
-          obj[res.data[i].month] = res.data[i].value
-        }
-        setDetails([{...obj,id:"42120250085"}])
-      } catch (error) {
-          console.log(error);
-      }
-  }
-    useEffect(() => {
-      console.log(details);
-    }, [details])
-  
-  useEffect(() => {
-    getData()
-  }, [])
-  
-  return (
-      <div>
-          <h1 style={{ textAlign: "center" }}>月核定生态流量</h1>
-          <div style={{ textAlign: "center", marginLeft: "30vw" }}>单位:m³/s</div>
-          <Form form={form} component={false}>
-          <Table
-              rowKey="id"
-              columns={mergedColumns}
-              components={{
-                body: {
-                  cell: EditableCell,
-                },
-              }}
-              dataSource={details}
-              pagination={false}
-          />
-          </Form>
-         
-             <Row style={{marginTop:"60vh"}}>
-                  <Col span={24}>
-                      <Form.Item
-                        wrapperCol={{span:14,offset:10}}
-                      >
-                          {
-                              skdisabled ? <Button type="primary" onClick={edit}>编辑</Button> :
-                                  <div style={{ display: 'flex', columnGap: 20 }}>
-                                      <Button onClick={cancel}>取消</Button>
-                                      <Button type="primary" onClick={save}>保存</Button>
-                               </div>   
-                          }
-                          
-                      </Form.Item>
-                  </Col>
-            </Row>
-    </div>
-  )
-}
diff --git a/src/views/sq/qys/gcys/projectBasicInfo/index.js b/src/views/sq/qys/gcys/projectBasicInfo/index.js
deleted file mode 100644
index e41a5d5..0000000
--- a/src/views/sq/qys/gcys/projectBasicInfo/index.js
+++ /dev/null
@@ -1,460 +0,0 @@
-import React,{useState,useEffect} from 'react'
-import { Row, Col, Form, Input, DatePicker, Button,Upload,message,Modal } from "antd"
-import {PaperClipOutlined,DeleteOutlined} from '@ant-design/icons';
-import NormalSelect from '../../../../../components/Form/NormalSelect';
-import { formItemLayout } from '../../../../../components/crud/FormLayoutProps'
-import apiurl from '../../../../../service/apiurl';
-import { httpget2, httppost2 } from '../../../../../utils/request';
-import moment from 'moment'
-import "./index.less"
-export default function ProjectBasciInfo() {
-    const [form] = Form.useForm();
-    const [data, setData] = useState()
-    const [fileList, setFileList] = useState([]) //上传文件列表
-    const [fileIds, setFileIds] = useState([])
-    const [loading, setLoading] = useState(false)
-    const [iframeId, setIframeId] = useState('')
-    const [perviewOpen, setPerviewOpen] = useState(false)
-    const [skdisabled, setSkDisabled] = useState(true)
-    const optionsLevel = [
-        {
-            label: "大 (1)型",
-            value:"1"
-        },
-        {
-            label: "大 (2)型",
-            value:"2"
-        },
-        {
-            label: "中型",
-            value:"3"
-        },
-        {
-            label: "小 (1)型",
-            value:"4"
-        },
-        {
-            label: "小 (2)型",
-            value:"5"
-        },
-        {
-            label: "其他",
-            value:"9"
-        }
-    ]
-
-    const getData = async () => {
-        try {
-            
-            const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.shuikuBasicinfo.detail)
-            // debugger;
-            if (res.code == 200) {
-                form.setFieldsValue(res.data[0])
-                setData(res.data[0])
-                if (res.data[0].files.length > 0) {
-                    getFileInfo(res.data[0]?.files[0]?.fileId)
-                 }
-            }
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    const beforeUpload = (file) => { 
-        const isPdf = file.type === 'application/pdf'
-        if (!isPdf) {
-            message.error("请上传pdf文件")
-        } 
-        return isPdf  
-    }
-
-    const fileChange = (info) => {
-   
-        if (info.file.status === "done") {
-            setLoading(false);
-  
-        }
-        if (info.file.status === "uploading") { 
-            setLoading(true);
-   
-        }
-        if (info.file.status === "error") {
-          message.error("文件上传失败")
-            setLoading(false);
-  
-        }
-        if (info?.file.type === "application/pdf") {
-            let fileIds = info.fileList.map(file => {
-              return file.response?.data?.fileId
-            })
-            setFileIds(fileIds)
-            setFileList(info.fileList)
-            
-        }
-      }
-
-      const deleteFile = (fileId) => {
-        let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-        setFileList(filterFile)
-    }
-
-    const onFinish = async () => {
-        try {
-            let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId }))
-            const values = form.getFieldsValue();
-            const params = {
-                ...data,
-                ...values,
-                files:oldFiles
-            }
-            const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.shuikuBasicinfo.update,params)
-            if (res.code == 200) {
-                message.success("修改成功")
-                setSkDisabled(true)
-                getData()
-            }
-        } catch (error) {
-            console.log(error);
-            
-        }
-        
-    }
-
-    const getFileInfo = async(id) => {
-        try {
-            const res = await httpget2(`${apiurl.dataResourcesCenter.projectAndWater.shuikuBasicinfo.getFile}/${id}`)
-            let obj ={
-                name: res.data.fileName,
-                response: {
-                  data: {
-                    filePath: res.data.filePath,
-                    fileId:res.data.fileId
-                  }
-                },
-              }
-            setFileList([obj])
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-    useEffect(() => {
-        getData()
-    }, [])
-    
-  return (
-    <div className='basic-info-content'>
-          <Form
-              form={form}
-              {...formItemLayout}
-              onFinish={onFinish}
-          >
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="水库名称"
-                          name="resName"
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{ width: '300px' }} disabled={skdisabled} />
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="水库代码"
-                          name="resCode"
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="注册登记号"
-                          name="regSn"
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="注册登记时间"
-                          name="regTime"
-                          getValueFromEvent={(e, dateString) => moment(dateString).format('YYYY-MM-DD HH:mm:ss')}
-                          getValueProps={value => ({
-                            value: value ? moment(value) : undefined
-                          })}
-                      >
-                          <DatePicker allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="工程位置"
-                          name="resLoc"
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="所在河流(水系)名称"
-                          name="basName"
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="水库规模"
-                          name="engScal"
-                          rules={[{ required: true }]}
-                      >
-                           <NormalSelect
-                              style={{ width: '300px' }}
-                              allowClear
-                              options={optionsLevel}
-                              disabled={skdisabled}
-                            />
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="主要功能"
-                          name="rsvFunction"
-                          
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="经度"
-                          name="lgtd"
-                          rules={[{ required: true }]}
-                          
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="纬度"
-                          name="lttd"
-                          rules={[{ required: true }]}
-                      >
-                        <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>    
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="设计灌溉面积(亩)"
-                          name="designIrrArea"
-                          
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="实际灌溉面积(亩)"
-                          name="actualIrrArea"
-                          
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="受益人口(人)"
-                          name="feedPop"
-                      >
-                        <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>    
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                  <Form.Item
-                    label="开工日期"
-                    name="startDate"
-                    getValueFromEvent={(e, dateString) => moment(dateString).format('YYYY-MM-DD HH:mm:ss')}
-                    getValueProps={value => ({
-                    value: value ? moment(value) : undefined
-                    })}
-                   >
-                          <DatePicker allowClear style={{ width: '300px' }} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                  <Form.Item
-                    label="竣工日期"
-                    name="compDate"
-                    getValueFromEvent={(e, dateString) => moment(dateString).format('YYYY-MM-DD HH:mm:ss')}
-                    getValueProps={value => ({
-                    value: value ? moment(value) : undefined
-                    })}
-                   >
-                         <DatePicker allowClear style={{ width: '300px' }} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="是否病险"
-                          name="isDanger"
-                      >
-                           <NormalSelect
-                              style={{ width: '300px' }}
-                              allowClear
-                              options={[
-                                  {
-                                      label: '否',
-                                      value:0,
-                                  },
-                                  {
-                                    label: '是',
-                                    value:1,
-                                },
-                              ]}
-                              disabled={skdisabled}
-                            />
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="是否有闸控制"
-                          name="spillwayGate"
-                      >
-                            <NormalSelect
-                              style={{ width: '300px' }}
-                              allowClear
-                              options={[
-                                  {
-                                      label: '否',
-                                      value:"0",
-                                  },
-                                  {
-                                    label: '是',
-                                    value:"1",
-                                },
-                              ]}
-                              disabled={skdisabled}
-                            />
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="工程特性表"
-                          name=""
-                          rules={[{ required: true }]}
-                      >
-                               <Upload 
-                                   name='file'
-                                   action="/gunshiApp/tsg/attResBase/file/upload/singleSimple"
-                                   onChange={fileChange}
-                                   fileList={fileList}
-                                   maxCount={1}
-                                    disabled={loading}
-                                    beforeUpload={beforeUpload}
-                                    itemRender={(origin,file) => {
-                                        return (
-                                            <div style={{display:"flex",alignItems:"center",columnGap:10}}>
-                                                 <PaperClipOutlined />
-                                                <span
-                                                    style={{ cursor: "pointer" }}
-                                                    onClick={() => { setPerviewOpen(true); setIframeId(file.response?.data?.fileId)}}
-                                                >
-                                                    {file?.name}</span>
-                                                {skdisabled ? null :
-                                                <DeleteOutlined
-                                                    style={{ marginLeft: 20, cursor: "pointer" }}
-                                                    onClick={() => deleteFile(file.response?.data?.fileId)}
-                                                /> 
-                                                }
-                                            </div>
-                                        )
-                                    }}
-                                 >
-                                     {skdisabled ? null :
-                                    <div style={{display:"flex",alignItems:"center",columnGap:10,color:"#4f85ec",cursor:skdisabled?"not-allowed":"pointer"}}>
-                                    <PaperClipOutlined />
-                                     <a style={{cursor:"pointer"}}>上传PDF文件</a>
-                                    </div>
-                                     }
-                                </Upload>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={24}>
-                      <Form.Item
-                          label="供水效益"
-                          name="benefit"
-                          labelCol={{ span: 2, offset: 0 }}
-                          wrapperCol={{span:21,offset:0}}
-                      >
-                            <Input allowClear disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={24}>
-                      <Form.Item
-                          label="工程概况"
-                          name="projOverview"
-                          labelCol={{ span: 2, offset: 0 }}
-                          wrapperCol={{span:21,offset:0}}
-                      >
-                          <Input.TextArea allowClear style={{width:'100%',minHeight:'100px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row style={{marginTop:80}}>
-                  <Col span={24}>
-                      <Form.Item
-                        wrapperCol={{span:14,offset:10}}
-                      >
-                          {
-                              skdisabled ? <Button type="primary" onClick={() => setSkDisabled(false)}>编辑</Button> :
-                                  <div style={{ display: 'flex', columnGap: 20 }}>
-                                      <Button onClick={() => setSkDisabled(true)}>取消</Button>
-                                      <Button type="primary" onClick={() => { onFinish() }}>保存</Button>
-                               </div>   
-                          }
-                          
-                      </Form.Item>
-                  </Col>
-            </Row>
-          </Form>
-          
-          <Modal
-        open={perviewOpen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPerviewOpen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/attResBase/file/download/${iframeId}`)}`}
-        />
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/views/sq/qys/gcys/projectBasicInfo/index.less b/src/views/sq/qys/gcys/projectBasicInfo/index.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/sq/qys/gcys/tzParams/index.js b/src/views/sq/qys/gcys/tzParams/index.js
deleted file mode 100644
index a0d3c40..0000000
--- a/src/views/sq/qys/gcys/tzParams/index.js
+++ /dev/null
@@ -1,271 +0,0 @@
-import React,{useState,useEffect} from 'react'
-import { Row, Col, Form, Input, DatePicker, Button,Upload,message,Modal } from "antd"
-import {PaperClipOutlined,DeleteOutlined} from '@ant-design/icons';
-import NormalSelect from '../../../../../components/Form/NormalSelect';
-import { formItemLayout } from '../../../../../components/crud/FormLayoutProps'
-import apiurl from '../../../../../service/apiurl';
-import { httppost2 } from '../../../../../utils/request';
-import moment from 'moment'
-import "./index.less"
-export default function ProjectBasciInfo() {
-    const [form] = Form.useForm();
-    const [data, setData] = useState()
-    const [skdisabled, setSkDisabled] = useState(true)
-    const getData = async () => {
-        try {
-            const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.shuikuBasicinfo.detail)
-            form.setFieldsValue(res.data[0])
-            setData(res.data[0])
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-   
-
-    const onFinish = async () => {
-        try {
-            const values = form.getFieldsValue();
-            const params = {
-                ...data,
-                ...values,
-            }
-            const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.shuikuBasicinfo.update,params)
-            if (res.code == 200) {
-                message.success("修改成功")
-                setSkDisabled(true)
-                getData()
-            }
-        } catch (error) {
-            console.log(error);
-            
-        }
-        
-    }
-    useEffect(() => {
-        getData()
-    }, [])
-    
-  return (
-    <div className='basic-info-content'>
-          <Form
-              form={form}
-            //   {...formItemLayout}
-              onFinish={onFinish}
-              labelCol={{ span: 8 }}
-              wrapperCol={{span:14}}
-          >
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="坝址以上流域面积(km²)"
-                          name="watShedArea"
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{ width: '300px' }} disabled={skdisabled} />
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="坝顶高程(m)"
-                          name="crestElev"
-                          labelCol={{ span: 5 }}
-                          wrapperCol={{span:14}}
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{width:'280px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="最大坝高(m)"
-                          name="maxDamHeig"
-                          labelCol={{ span: 6 }}
-                          wrapperCol={{span:14}}
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="校核洪水位(m)"
-                          name="calFloodLev"
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8} >
-                      <Form.Item
-                          label="总库容(万m³)"
-                          name="totCap"
-                          labelCol={{ span: 5 }}
-                          wrapperCol={{span:14}}
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{width:'280px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8} style={{marginLeft:"-105px"}}>
-                      <Form.Item
-                          label="校核洪水位时最大下泄流量(m³/s)"
-                          name="maxCalFloodFlow"
-                          labelCol={{ span: 11 }}
-                          wrapperCol={{span:13}}
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="设计洪水位(m)"
-                          name="desFloodLev"
-                          rules={[{ required: true }]}
-                      >
-                        <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="调洪库容(万m³)"
-                          name="storFlCap"
-                          labelCol={{ span: 5 }}
-                          wrapperCol={{span:14}}
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{width:'280px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8} style={{marginLeft:"-125px"}}>
-                      <Form.Item
-                          label="设计洪水位时最大下泄流量(m³/s)"
-                          name="maxDesFloodFlow"
-                          labelCol={{ span: 12 }}
-                          wrapperCol={{span:12}}
-                          rules={[{ required: true }]}
-                          
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="防洪高水位(m)"
-                          name="uppLevFlco"
-                          rules={[{ required: true }]}
-                      >
-                        <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>    
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="防洪库容(万m³)"
-                          name="flcoCap	"
-                          labelCol={{ span: 5 }}
-                          wrapperCol={{span:14}}
-                      >
-                          <Input allowClear style={{width:'280px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-                  <Col span={8} style={{marginLeft:"-43px"}}>
-                      <Form.Item
-                          label="下游河道安全泄量(m³/s)"
-                          name="dsSaftFlow"
-                          labelCol={{ span: 8 }}
-                          wrapperCol={{span:14}}
-                      >
-                          <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="正常蓄水位(m)"
-                          name="normWatLev"
-                          rules={[{ required: true }]}
-                      >
-                        <Input allowClear style={{width:'300px'}} disabled={skdisabled}/>    
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                  <Form.Item
-                    label="兴利库容(万m³)"
-                    name="benResCap"
-                    labelCol={{ span: 5 }}
-                    wrapperCol={{span:14}}
-                   >
-                       <Input allowClear style={{width:'280px'}} disabled={skdisabled}/> 
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                  <Form.Item
-                    label="汛限水位(m)"
-                    name="flLowLimLev"
-                    rules={[{ required: true }]}
-                    labelCol={{ span: 6 }}
-                    wrapperCol={{span:14}}
-                   >
-                         <Input allowClear style={{width:'300px'}} disabled={skdisabled}/> 
-                      </Form.Item>
-                  </Col>
-            </Row>
-            <Row>
-                  <Col span={8}>
-                      <Form.Item
-                          label="死水位(m)"
-                          name="deadLev"
-                          rules={[{ required: true }]}
-                      >
-                           <Input allowClear style={{width:'300px'}} disabled={skdisabled}/> 
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="死库容(万m³)"
-                          name="deadCap"
-                          labelCol={{ span: 5 }}
-                          wrapperCol={{span:14}}
-                          rules={[{ required: true }]}
-                      >
-                          <Input allowClear style={{width:'280px'}} disabled={skdisabled}/> 
-                      </Form.Item>
-                  </Col>
-                  <Col span={8}>
-                      <Form.Item
-                          label="堰顶高程(m)"
-                          name="wcrstel"
-                          rules={[{ required: true }]}
-                          labelCol={{ span: 6 }}
-                          wrapperCol={{span:14}}
-                      >
-                             <Input allowClear style={{width:'300px'}} disabled={skdisabled}/> 
-                      </Form.Item>
-                  </Col>
-              </Row>
-              <Row style={{marginTop:80}}>
-                  <Col span={24}>
-                      <Form.Item
-                        wrapperCol={{span:14,offset:10}}
-                      >
-                          {
-                              skdisabled ? <Button type="primary" onClick={() => setSkDisabled(false)}>编辑</Button> :
-                                  <div style={{ display: 'flex', columnGap: 20 }}>
-                                      <Button onClick={() => setSkDisabled(true)}>取消</Button>
-                                      <Button type="primary" onClick={() => { onFinish() }}>保存</Button>
-                               </div>   
-                          }
-                          
-                      </Form.Item>
-                  </Col>
-            </Row>
-          </Form>
-    </div>
-  )
-}
diff --git a/src/views/sq/qys/gcys/tzParams/index.less b/src/views/sq/qys/gcys/tzParams/index.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/sq/qys/gcys/xlLine/drpOption.js b/src/views/sq/qys/gcys/xlLine/drpOption.js
deleted file mode 100644
index a70c48f..0000000
--- a/src/views/sq/qys/gcys/xlLine/drpOption.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import echarts from 'echarts/lib/echarts';
-import { GetInterval } from '../../../../../utils/tools' 
-
-export default function drpOption({data}) {
-  const maxVal = Math.ceil(Math.max(...data.map(obj => obj.q)))
-  const minVal = Math.floor(Math.min(...data.map(obj => obj.q)))
-  const maxValX = Math.max(...data.map(obj => obj.z))
-  const minValX = Math.min(...data.map(obj => obj.z))
-  
-  let arr =[]
-  data.forEach(item=>{
-    arr.push([item.z,item.q])
-  })
-  console.log(arr,data.map(o => o.z),'jhsdjkashdjkahjk');
-  // debugger;
-  return {
-    toolbox: {
-      show: true,
-      feature: {
-        saveAsImage: {
-          show: true,
-          excludeComponents: ['toolbox'],
-          pixelRatio: 2,
-          name:"泄流曲线图"
-        }
-      },
-      right: "14%",
-      top:"5%"
-    },
-    title: {
-      text: "泄流曲线图",
-      left: "40%",
-    },
-    tooltip: {
-      trigger: 'axis',
-    },
-    grid: [
-      {
-        top: "10%",
-        left: "15%",
-        right: "15%",
-        bottom: "8%"
-      },
-    ],
-    xAxis: [
-      {
-        name: "流量(m³/s)",
-        nameGap: 5,
-        type: 'value',
-        min:Math.floor(minValX / 5)  *5,
-        max:Math.ceil(maxValX / 5)  *5,
-        interval:GetInterval(minValX,maxValX),
-        data: data.map(o => o.z),
-        splitLine: {
-          show: false
-        },
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        name: "库水位(m)",
-        minInterval:1,
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#07a6ff',
-            width: 0.25,
-            type: 'dotted'
-          }
-        },
-        axisLabel: {
-          color: '#333',
-          fontSize: 12,
-        },
-        axisLine: {
-          show: false
-        },
-        axisTick: {
-          show: false,
-        },
-        min: minVal,
-        max: maxVal
-      }
-    ],
-    series: [
-      {
-        type: 'line',
-        color: "#007AFD",
-        data:  arr,
-        smooth: true
-      },
-    ]
-  };
-}
diff --git a/src/views/sq/qys/gcys/xlLine/form.js b/src/views/sq/qys/gcys/xlLine/form.js
deleted file mode 100644
index 6f8bfd5..0000000
--- a/src/views/sq/qys/gcys/xlLine/form.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React,{useEffect,useState,useRef} from 'react';
-import { Form, Button, Input, Row, Col} from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../../../components/crud/FormLayoutProps';
-import apiurl from '../../../../../service/apiurl';
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const onFinish = async (values) => {
-    values.resCode = "42120250085"
-    values.id = record?.id
-    if (mode === 'edit') {
-      const params = {
-        ...record,
-        q: Number(values?.q),
-        z: Number(values?.z),
-      }
-      onEdit(apiurl.dataResourcesCenter.projectAndWater.xl.update,params)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.dataResourcesCenter.projectAndWater.xl.save,values)
-    }
-  }
-  
-  return (
-    <>
-      <Form
-        form={form}
-        // {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}
-        // labelCol={{ span: 1 }}
-        //  wrapperCol={{ span: 15 }}
-      >
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="水位(m)"
-                name="q"
-                labelCol={{ span: 4, offset: 0 }}
-                wrapperCol={{span:20,offset:0}}
-                rules={[{ required: true }]}
-              >
-              <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="流量(m³/s)"
-                name="z"
-                labelCol={{ span: 4, offset: 0 }}
-                wrapperCol={{ span: 20, offset: 0 }}
-                rules={[{ required: true }]}
-              >
-               <Input
-                style={{ width: '100%' }}
-                allowClear
-              />
-              </Form.Item>
-          </Col> 
-      </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sq/qys/gcys/xlLine/index.js b/src/views/sq/qys/gcys/xlLine/index.js
deleted file mode 100644
index 44db446..0000000
--- a/src/views/sq/qys/gcys/xlLine/index.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React,{useEffect,useState,useRef,useMemo} from 'react'
-import { Table, Button } from 'antd'
-import ModalForm from './form';
-import ReactEcharts from 'echarts-for-react';
-import drpOption from './drpOption'
-import apiurl from '../../../../../service/apiurl';
-import { httppost2 } from '../../../../../utils/request';
-import { CrudOpRender_text } from '../../../../../components/crud/CrudOpRender';
-import BasicCrudModal from '../../../../../components/crud/BasicCrudModal2';
-export default function Zrtx() {
-    const refModal = useRef();
-    const columns = [
-        {
-            title: '序号', dataIndex: 'index', key: 'index', align: "center",
-            render: (r, c,i) => <span>{i + 1}</span>
-         },
-        { title: '水位(m)', dataIndex: 'q', key: 'rz',align:"center" },
-        { title: '流量(m³/s)', dataIndex: 'z', key: 'z',align:"center" },
-        {
-            title: '操作', dataIndex: 'op', key: 'op', align: "center",width:200,
-            render: (value, row, index) => (<CrudOpRender_text  del={true} edit={true} command={(cmd) => () => command(cmd)(row)} />)
-         },
-    ];
-    const [data, setData] = useState([])
-    const option = useMemo(() => {
-      return drpOption({data});
-    }, [data])
-    const getData = async () => {
-        try {
-            const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.xl.list)
-            setData(res.data.map((item,i) => ({...item,inx:i + 1})))
-        } catch (error) {
-            console.log(error);
-            
-        }
-    }
-
-    const command = (type) => (params) => {
-        if (type === 'save') {
-          refModal.current.showSave({});
-        } else if (type === 'edit') {
-          refModal.current.showEdit(params)
-        } else if (type === 'view') {
-          refModal.current.showView(params);
-        } else if (type === 'del') {
-          refModal.current.onDeletePost(apiurl.dataResourcesCenter.projectAndWater.xl.delete,params);
-        } 
-      }
-    useEffect(() => {
-      getData();
-    }, [])
-    
-  return (
-      <div>
-         <h1><Button type='primary' onClick={() => {refModal.current.showSave({})}}>新增</Button></h1>
-         <div style={{display:"flex",columnGap:10,width:"100%"}}>
-          <div style={{width:500}}>
-          <Table
-              rowKey="inx"
-              columns={columns}
-              dataSource={data}
-              pagination={false}
-              scroll={{ y:"calc( 100vh - 300px )"}}
-          />
-          </div>
-          <div className='right-echarts' style={{ flex: 1 }}>
-              {
-                  data.length > 0 ?
-                  <ReactEcharts
-                    option={option}
-                    style={{width: "100%", height: '100%'}}
-                  /> : <div style={{textAlign: "center", margin: "10%"}}>
-                    <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt=""/>
-                  </div>
-              }
-          </div>
-         </div>
-
-        <BasicCrudModal
-          width={550}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={getData}
-        />
-    </div>
-  )
-}
diff --git a/src/views/sq/qys/kqys/index.js b/src/views/sq/qys/kqys/index.js
deleted file mode 100644
index 41342f3..0000000
--- a/src/views/sq/qys/kqys/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Image } from "antd"
-import zd from '../../../../assets/img/u0.png'
-import qys1 from '../../../../assets/img/qys1.png'
-import qys2 from '../../../../assets/img/qys2.jpg'
-import qys3 from '../../../../assets/img/qys3.jpg'
-import qys4 from '../../../../assets/img/qys4.png'
-import stylesCss from './index.module.less'
-
-import { Rnd } from "react-rnd"
-import { useState, useEffect } from "react"
-const list = [
-    { name: '水库地理位置图', key: 1, img: qys1 },
-    { name: '水库平面布置图', key: 2, img: qys2 },
-    { name: '主坝平面布置图', key: 3, img: qys3 },
-    { name: '副坝平面布置图', key: 4, img: qys4 },
-]
-const Page = () => {
-    const [url, setUrl] = useState(qys1)
-    const tabClick = (item) => {
-        setUrl(item.img)
-    }
-    useEffect(() => {
-        // let scale = 1
-        // const img = document.getElementById("img");
-        // const fun = (e) => {
-        //     console.log(1111)
-        //     // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
-        //     if (e.wheelDelta > 0) {
-        //         scale += 0.05;
-        //         img.style.transform = `scale(${scale})`;
-        //     } else {
-        //         if (scale == 1) {
-        //             img.style.left = 0 + "px";
-        //             img.style.top = 0 + "px";
-        //         }
-        //         // 缩放值大于1时,可以缩小,反之亦然
-        //         if (scale > 1) {
-        //             scale -= 0.05;
-        //             img.style.transform = `scale(${scale})`;
-        //         }
-        //     }
-        // }
-        // img.addEventListener("wheel", fun)
-
-        // // getSyData()
-        // // getSlData()
-        // // getWyData()
-        // // getDmData()
-        // return () => {
-        //     img.removeEventListener("wheel", fun)
-        // }
-
-    }, [])
-    return (
-        <div style={{ backgroundColor: '#fff', height: '100%' }}>
-            <div style={{ display: 'flex', justifyContent: 'start', alignItems: 'center', padding: 10 }}>
-                {list.map(item => <div className={url == item.img ? stylesCss.active : stylesCss.tabCheck} onClick={() => tabClick(item)}>{item.name}</div>)}
-            </div>
-            <div style={{height: 'calc(100% - 60px)',textAlign:'center',padding:20,overflow:'auto'}}>
-                <Image src={url} width='80%' preview={false} />
-                </div>
-        </div>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sq/qys/kqys/index.module.less b/src/views/sq/qys/kqys/index.module.less
deleted file mode 100644
index c3d7533..0000000
--- a/src/views/sq/qys/kqys/index.module.less
+++ /dev/null
@@ -1,54 +0,0 @@
-.tabCheck{
-    width: 120px;
-    height: 40px;
-    line-height: 40px;
-    margin-right: 5px;
-    border-radius: 10px 10px 0 0;
-    background: #D7DFEB;
-    border: 1px solid rgba(228, 231, 237, 1);
-    text-align: center;
-    font-size: 14px;
-    font-weight: 500;
-    color: #333;
-    cursor: pointer;
-
-
-}
-.active{
-    width: 120px;
-    height: 40px;
-    line-height: 40px;
-    margin-right: 5px;
-    border-radius: 10px 10px 0 0;
-    background: #D7DFEB;
-    border: 1px solid rgba(228, 231, 237, 1);
-    text-align: center;
-    font-size: 14px;
-    font-weight: 500;
-    color: #333;
-    cursor: pointer;
-
-    color: #409EFF;
-    background: #ffffff;
-
-
-}
-
-// .fxdd_hsybjs_toolbar_item{
-//     width: 120px;
-//     height: 40px;
-//     line-height: 40px;
-//     margin-right: 5px;
-//     border-radius: 10px 10px 0 0;
-//     background: #D7DFEB;
-//     border: 1px solid rgba(228, 231, 237, 1);
-//     text-align: center;
-//     font-size: 14px;
-//     font-weight: 500;
-//     color: #333;
-//     cursor: pointer;
-// }
-// .hsybjs_checked{
-//     color: #409EFF;
-//     background: #ffffff;
-// }
\ No newline at end of file
diff --git a/src/views/sq/qys/xyys/index copy.js b/src/views/sq/qys/xyys/index copy.js
deleted file mode 100644
index 43c04f9..0000000
--- a/src/views/sq/qys/xyys/index copy.js	
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Image } from "antd"
-import zd from '../../../../assets/img/u7.png'
-import title from '../../../../assets/img/titleRight.png'
-import './index.less'
-
-const Page = () => {
-    return (
-        <div style={{ display: 'flex',height:'100%' }}>
-            <div style={{ backgroundColor: '#ffffff',width:390,height:'100%',marginRight:10 }}>
-                <div className="title">
-                    <Image src={title} />保护对象
-                </div>
-                <div className="content">
-                    水库防洪标准按50年一遇设计，1000年一遇校核，设计洪水位111.51米，校核洪水位 112.75 米,水库担负着红安县城、七里坪、杏花、城关等城镇，以及京九铁路汉麻连络线、省道S234、国道G230,京九铁路汉麻联络线等交通设施安全的防洪重任、防洪保护人口32万
-                    人，保护耕地 15 万亩。
-                </div>
-
-            </div>
-            <div style={{ backgroundColor: '#ffffff',flex:1}}>
-                <div className="title">
-                    <Image src={title} />转移路线示意图
-                </div>
-                <Image src={zd} width='80%' preview={false} />
-            </div>
-        </div>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sq/qys/xyys/index.js b/src/views/sq/qys/xyys/index.js
deleted file mode 100644
index 0d996af..0000000
--- a/src/views/sq/qys/xyys/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Image } from "antd"
-import zd from '../../../../assets/img/u7.png'
-import title from '../../../../assets/img/titleRight.png'
-import styles from './index.module.less'
-
-const Page = () => {
-    return (
-        <div style={{ display: 'flex',height:'100%' }}>
-            <div style={{ backgroundColor: '#ffffff',width:390,height:'100%',marginRight:10,padding:10 }}>
-                <div className={styles.title}>
-                    <Image src={title} />保护对象
-                </div>
-                <div className={styles.content}>
-                    水库防洪标准按
-                    <span className={styles.color}>50</span>
-                    年一遇设计，<span className={styles.color}>1000</span>年一遇校核，设计洪水位<span className={styles.color}>111.51</span>米，
-                    校核洪水位 <span className={styles.color}>112.75</span> 米,
-                    水库担负着红安县城、七里坪、杏花、城关等城镇，
-                    以及京九铁路汉麻连络线、省道S234、国道G230,京九铁路汉麻联络线等交通设施安全的防洪重任、防洪保护人口<span className={styles.color}>32</span>万
-                    人，保护耕地 <span className={styles.color}>15</span> 万亩。
-                </div>
-
-            </div>
-            <div style={{ backgroundColor: '#ffffff',flex:1,padding:10}}>
-                <div className={styles.title}>
-                    <Image src={title} />转移路线示意图
-                </div>
-                <div style={{height: 'calc(100% - 40px)',textAlign:'center'}}>
-                <Image src={zd} width='80%' preview={false} />
-                </div>
-                
-            </div>
-        </div>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sq/qys/xyys/index.module.less b/src/views/sq/qys/xyys/index.module.less
deleted file mode 100644
index 806855d..0000000
--- a/src/views/sq/qys/xyys/index.module.less
+++ /dev/null
@@ -1,14 +0,0 @@
-.title{
-    font-size: 16px;
-    color: #000000;
-    // width: 112px;
-    height: 32px;
-    margin-bottom:20px;
-}
-.content{
-    font-size: 17px;
-    padding: 0 20px;
-}
-.color{
-    color: #409eff;
-}
\ No newline at end of file
diff --git a/src/views/sq/qzq/gcdsj/form.js b/src/views/sq/qzq/gcdsj/form.js
deleted file mode 100644
index 77c62e4..0000000
--- a/src/views/sq/qzq/gcdsj/form.js
+++ /dev/null
@@ -1,296 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-import NormalSelect from '../../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.eventsDate = values.eventsDate?moment(values.eventsDate).format("YYYY-MM-DD 00:00:00"):''
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.rcgl.gcdsj.edit,values)
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.rcgl.gcdsj.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="名称"
-                name="name"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="发生日期"
-                name="eventsDate"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="事件类型"
-                name="eventsType"
-              >
-               <NormalSelect
-                allowClear
-                disabled={mode==='view'}
-                style={{ width: "100%" }}
-                options={[{label:"综合大事记",value:1},{label:"专题大事记",value:2}]}
-               />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="事件内容描述"
-                name="eventsDesc"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-     
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/projectEvents/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sq/qzq/gcdsj/index.js b/src/views/sq/qzq/gcdsj/index.js
deleted file mode 100644
index 5eb10cb..0000000
--- a/src/views/sq/qzq/gcdsj/index.js
+++ /dev/null
@@ -1,224 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑");
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-  const delBtn = role?.rule?.find(item => item.menuName == "删除");
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [isFetch, setIsFetch] = useState(false)
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '名称', key: 'name', dataIndex: 'name', width: 250, ellipsis: true },
-    {
-      title: '发生日期', key: 'eventsDate', dataIndex: 'eventsDate', width: 140,
-    },
-    {
-      title: '事件类型', key: 'eventsType', dataIndex: 'eventsType', width: 140,
-      render: (value) => <span>{value == 1 ? "综合大事记" : value == 2 ? "专题大事记" : ''}</span>,
-    },
-    {
-      title: '事件内容描述', key: 'eventsDesc', dataIndex: 'eventsDesc', width: 300},
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={ true }
-        del={ true }
-        view={ true }
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.gcdsj.delete + `/${params.id}`);
-    }
-  }
-  
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.gcdsj.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-  setIsFetch(!isFetch)
-}
-
-  
-const viewPdf = (params) => {
-  setIframeSrc(params)
-  setPdfViewOPen(true)
-}
-  useEffect(()=>{
-    
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Tabs defaultActiveKey="1">
-              <Tabs.TabPane tab="列表" key="1">
-                 <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-              </Tabs.TabPane>
-              <Tabs.TabPane tab="时间轴" key="2">
-                <div className='time-line'>
-                  <Timeline>
-                    {tableProps.dataSource.map((item, index) => (
-                      <Timeline.Item key={index}>
-                        <div className='time-line-item'>
-                        <span style={{width:100}}>{item.eventsDate}</span>
-                          <div className='dsj-item-right'>
-                            <span>{item.eventsDesc}</span>
-                            <div style={{ display: "flex"}}>
-                              <span>附件：</span>
-                            <Row gutter={[16]} style={{flex:1}}>
-               {
-                  item.files.length > 0 && item.files.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"100%"}}>
-                          <div className='file-description'>
-                          {file.fileName.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.fileName.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.fileName.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.fileName.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file?.filePath} alt='' />
-                            }
-                            <span>{file.fileName}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-                            </Row>
-                            </div>
-                        </div>
-                        </div>
-                      </Timeline.Item>
-                    ))}
-                  </Timeline>
-                 </div>
-              </Tabs.TabPane>
-            </Tabs>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/sq/qzq/gcdsj/index.less b/src/views/sq/qzq/gcdsj/index.less
deleted file mode 100644
index 4f76f22..0000000
--- a/src/views/sq/qzq/gcdsj/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .dsj-item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/sq/qzq/gcdsj/toolbar.js b/src/views/sq/qzq/gcdsj/toolbar.js
deleted file mode 100644
index e102498..0000000
--- a/src/views/sq/qzq/gcdsj/toolbar.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="名称" name="name">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="发生日期" name="tm">
-            <RangePicker
-              allowClear
-              showTime 
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-           <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sq/qzq/qzqda/index.js b/src/views/sq/qzq/qzqda/index.js
deleted file mode 100644
index 0299744..0000000
--- a/src/views/sq/qzq/qzqda/index.js
+++ /dev/null
@@ -1,197 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
-import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
-import './index.less'
-import { httppost5 } from '../../../../utils/request';
-import { exportFile } from '../../../../utils/tools';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑");
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-  const delBtn = role?.rule?.find(item => item.menuName == "删除");
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [isFetch, setIsFetch] = useState(false)
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.gcdsj.delete + `/${params.id}`);
-    }
-  }
-  
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gcdsj.qzqda.list).find_noCode);
-  console.log(tableProps);
-  
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
-const onExport = () => {
-    let params = {
-      ...searchVal,
-      pageSo:{
-        pageNum:1,pageSize:9999
-      }
-    }
-    httppost5(apiurl.gcdsj.qzqda.export, params).then(res => {
-      exportFile(`全周期档案.xlsx`,res.data)
-  })
-}
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-        
-      },
-      pageSize:9999
-    };
-    search(params)
-  }, [searchVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflow:'hidden'}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onExport={onExport}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0",overflowY:"auto",height: 'calc(100vh - 68px)'}}>
-                <div className='time-line' style={{width:'calc(100% - 140px)'}}>
-                  <Timeline >
-                    {tableProps.dataSource?.map((item, index) => (
-                      <Timeline.Item key={index}>
-                        <div className='time-line-item'>
-                        <div style={{width:100}}>
-                          <span>{item.eventsDate}</span>
-                          <div className='dsj'>{item.typeName}</div>
-                          </div>
-                        
-                          <div className='item-right'>
-                            <span>{item.eventsDesc}</span>
-                            <div style={{ display: "flex"}}>
-                              <span>附件：</span>
-                            <Row gutter={[16]} style={{flex:1}}>
-               {
-                  item.files?.length > 0 && item.files?.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"100%"}}>
-                          <div className='file-description'>
-                          {file.fileName?.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.fileName?.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.fileName?.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.fileName?.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file?.filePath} alt='' />
-                            }
-                            <span>{file.fileName}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-                            </Row>
-                            </div>
-                        </div>
-                        </div>
-                      </Timeline.Item>
-                    ))}
-                  </Timeline>
-                 </div>
-          </div>
-        </div>
-      </div>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/sq/qzq/qzqda/index.less b/src/views/sq/qzq/qzqda/index.less
deleted file mode 100644
index dacb1a8..0000000
--- a/src/views/sq/qzq/qzqda/index.less
+++ /dev/null
@@ -1,54 +0,0 @@
-.basic-info {
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding: 5px 25px;
-    border-bottom: 1px solid #eee;
-
-    &::before {
-        position: absolute;
-        top: 8px;
-        left: 0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.time-line {
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-
-    .time-line-item {
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-
-        .dsj {
-            border-width: 0px;
-            width: 82px;
-            height: 30px;
-            background: inherit;
-            background-color: rgba(128, 255, 255, 1);
-            border: none;
-            border-radius: 4px;
-            -moz-box-shadow: none;
-            -webkit-box-shadow: none;
-            box-shadow: none;
-            line-height: 30px;
-            text-align: center;
-            margin-top: 10px;
-        }
-
-        .item-right {
-            flex: 1;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            min-height: 70px;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/sq/qzq/qzqda/toolbar.js b/src/views/sq/qzq/qzqda/toolbar.js
deleted file mode 100644
index d4b3dfa..0000000
--- a/src/views/sq/qzq/qzqda/toolbar.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Select, Button, DatePicker } from 'antd';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onExport, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({ ...values, dateSo });
-  }
-
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="类型" name="types">
-            <Select options={[
-              {value:1,label:'大事记'}, {value:2,label:'调度指令'}, {value:3,label:'维修养护'},{value:4,label:'安全鉴定'}, {value:5,label:"除险加固"}, {value:6,label:'白蚁普查'}
-            ]} allowClear mode='multiple' maxTagCount='responsive' style={{ width: "200px" }}/>
-          </Form.Item>
-          <Form.Item label="发生日期" name="tm">
-            <RangePicker
-              allowClear
-              showTime
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-           <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> 
-
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" onClick={onExport}>导出</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/flfg/form.js b/src/views/sz/flfg/form.js
deleted file mode 100644
index b0198db..0000000
--- a/src/views/sz/flfg/form.js
+++ /dev/null
@@ -1,328 +0,0 @@
-import React, { useEffect, useState, useMemo, useRef } from 'react';
-import { Form, Button, Input, Row, Upload, Col, Table, DatePicker, InputNumber, message, Image, Modal, Typography, Select } from 'antd';
-import { DeleteOutlined, FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../service/apiurl';
-
-import NormalSelect from '../../../components/Form/NormalSelect';
-
-// import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const opntios = [
-  { label: '宪法', value: '宪法' },
-  { label: '法律', value: '法律' },
-  { label: '行政法规', value: '行政法规' },
-  { label: '督察法规', value: '督察法规' },
-  { label: '司法解释', value: '司法解释' },
-  { label: '地方性法规', value: '地方性法规' },
-]
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-    downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/SzRuleByLaw/file/download/${params}`;
-    downloadLink.download = `${params.fileName}`;
-    downloadLink.style.display = "none";
-    // 将链接添加到页面中
-    document.body.appendChild(downloadLink);
-
-    // 模拟点击事件，开始下载
-    downloadLink.click();
-  }
-  /**
-    * @description 上传图片
-    * @param {string}  file 上传的文件
-    */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") {
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-  }
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-
-
-  const onfinish = (values) => {
-    values.files =  fileList.map(item => item.response?.data??item);
-    
-   // values.eventsDate = values.eventsDate ? moment(values.eventsDate).format("YYYY-MM-DD 00:00:00") : ''
-    if (mode === 'edit') {
-      
-      onEdit(apiurl.flfg.edit, {...record,...values})
-    }
-    if (mode === 'save') {
-      onSave(apiurl.flfg.add, values)
-    }
-  }
-
-  /**
- * @description 删除上传的图片
- * @param {string}  id 删除的id
- */
-  const deleteFile = (fileId) => {
-    console.log(fileId,fileList);
-    let filterFile = fileList.filter(item => item.fileId !== fileId);
-    setFileList(filterFile)
-  }
-  useEffect(() => {
-    if (mode != 'save') {
-      const imgFile = record?.files?.map(o => ({
-        name: o.fileName,
-        response: {
-          data: {
-            filePath: o.filePath,
-            fileId: o.fileId
-          }
-        },
-      }))
-      setFileList(imgFile)
-    }
-  }, [record, mode])
-
-
-
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="标题"
-              name="name"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="制定机关"
-              name="fillUnit"
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item label="法律性质" name="type" rules={[{ required: true }]}>
-              <Select allowClear style={{ width: '100%' }} options={[
-                { label: '宪法', value: 0 },
-                { label: '法律', value: 1 },
-                { label: '行政法规', value: 2 },
-                { label: '督察法规', value: 3 },
-                { label: '司法解释', value: 4 },
-                { label: '地方性法规', value: 5 },
-              ]} disabled={mode === 'view'} />
-            </Form.Item>
-          </Col>
-          {/* <Col span={12}>
-            <Form.Item label="法律性质" name="timeliness">
-              <Select allowClear style={{ width: '150px' }} options={opntios} />
-            </Form.Item>
-          </Col> */}
-
-          <Col span={12}>
-            <Form.Item
-              label="时效性"
-              name="timeliness"
-              rules={[
-                {
-                  required: true,
-                },
-              ]}
-
-            >
-              <Select allowClear style={{ width: '100%' }} options={[
-                { label: '尚未生效', value: 0 },
-                { label: '有效', value: 1 },
-                { label: '已修改', value: 2 },
-                { label: '已废止', value: 3 },
-              ]} />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="施行日期"
-              name="announcementDate"
-              getValueFromEvent={(e, dateString) => dateString}
-              getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-            >
-              <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="公布日期"
-              name="implementationDate"
-              getValueFromEvent={(e, dateString) => dateString}
-              getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-            >
-              <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="附件"
-              name="files"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-              // rules={[
-              //   {
-              //     required: true,
-              //   },
-              // ]}
-            >
-              {mode !== "view" &&
-                <Dragger
-                  name='file'
-                  // multiple
-                  action="/gunshiApp/tsg/SzRuleByLaw/file/upload/singleSimple"
-                  onChange={fileChange}
-                  onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                  maxCount={1}
-                // onSuccess={handleSuccess}
-                >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .ppt
-                  </p>
-                </Dragger>
-              }
-              <Row gutter={[16]}>
-                {
-                  fileList.length > 0 && fileList.map(file => {
-                    return (
-                      <Col span={12}>
-                        <div className="file-item" style={{ width: "75%",marginTop:5 }}>
-                          <div className='file-description'>
-                            {file.name?.indexOf('.docx') > -1 ?
-                              <div
-                                onClick={() => { download(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                                <FileWordOutlined
-                                  style={{ fontSize: 40 }}
-                                />
-                              </div>
-                              :
-                              file.name?.indexOf('.pdf') > -1 ?
-                                <div
-                                  onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePdfOutlined style={{ fontSize: 40 }} />
-                                </div>
-                                :
-                                file.name?.indexOf('.zip') > -1 ?
-                                  <div
-                                    onClick={() => { download(file.response?.data?.fileId) }}
-                                    style={{ cursor: 'pointer' }}
-                                  >
-                                    <FileZipOutlined style={{ fontSize: 40 }} />
-                                  </div>
-                                  :
-                                  file.name?.indexOf('.xlsx') > -1 ?
-                                    <div
-                                      onClick={() => { download(file.response?.data?.fileId) }}
-                                      style={{ cursor: 'pointer' }}
-                                    >
-                                      <FileExcelOutlined style={{ fontSize: 40 }} />
-                                    </div>
-                                    :
-                                    <Image width={60} src={url + file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() => deleteFile(file.response?.data?.fileId)}>
-                            <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                    )
-                  })
-                }
-              </Row>
-            </Form.Item>
-          </Col>
-        </Row>
-        {
-          mode === 'view' ? null : (
-            <>
-              <Form.Item {...btnItemLayout}>
-                <Button type="primary" htmlType="submit" loading={loading}>
-                  {mode === 'save' ? '提交' : '修改'}
-                </Button>
-              </Form.Item>
-            </>
-          )
-        }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{ marginTop: "-5%" }}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-        <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-          src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sz/flfg/index.js b/src/views/sz/flfg/index.js
deleted file mode 100644
index 54e3250..0000000
--- a/src/views/sz/flfg/index.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image } from 'antd';
-import { FileWordOutlined, FilePdfOutlined, FileZipOutlined, PaperClipOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import { render } from 'react-dom';
-import { httpgetExport } from '../../../utils/request';
-import { exportFile } from '../../../utils/tools';
-import dayjs from 'dayjs';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const typeOb={0:'宪法',1:'法律',2:'行政法规',3:'督察法规',4:'司法解释',5:'地方性法规'}
-const timelinessOb = {0:'尚未生效',1:'有效',2:'已修改',3:'已废止'}
-const Page = () => {
-    const role = useSelector(state => state.auth.role);
-    const editBtn = role?.rule?.find(item => item.menuName == "编辑");
-    const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-    const delBtn = role?.rule?.find(item => item.menuName == "删除");
-    const refModal = useRef();
-    const [searchVal, setSearchVal] = useState(false)
-    const [iframeSrc, setIframeSrc] = useState('')
-    const [pdfViewOPen, setPdfViewOPen] = useState(false)
-    const [isFetch, setIsFetch] = useState(false)
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-        { title: '标题', key: 'name', dataIndex: 'name', ellipsis: true },
-        {
-            title: '制定机关', key: 'fillUnit', dataIndex: 'fillUnit',
-        },
-        {
-            title: '法律性质', key: 'type', dataIndex: 'type', 
-            render: (value) => <span>{typeOb[value]}</span>,
-        },
-        {
-            title: '时效性', key: 'timeliness', dataIndex: 'timeliness', render:(v)=><>
-            {timelinessOb[v]}
-            </>
-        },
-        {
-            title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate',
-            render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
-        },
-        {
-            title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate'
-        },
-        {
-            title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate'
-        },
-        {
-            title: '附件', key: 'files', dataIndex: 'files',render:(v,r)=><a onClick={()=>download(v[0].fileId,v[0]?.fileName)}><PaperClipOutlined />{v[0]?.fileName}</a>
-        },
-        {
-            title: '操作', key: 'operation',
-            render: (value, row, index) => (
-                <CrudOpRender_text
-                    edit={true}
-                    del={true}
-                    // view={true}
-                    command={(cmd) => () => command(cmd)(row)} />)
-        },
-    ];
-
-
-    const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-    const command = (type) => (params) => {
-        if (type === 'save') {
-            refModal.current.showSave();
-        } else if (type === 'edit') {
-            refModal.current.showEdit({ ...params });
-        } else if (type === 'view') {
-            refModal.current.showView(params);
-        } else if (type === 'del') {
-            refModal.current.onDeleteGet(apiurl.flfg.del + `/${params.id}`);
-        }
-    }
-
-
-    const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.flfg.list).find_noCode);
-
-    /**
-      * @description 处理成功的回调
-      */
-    const successCallback = () => {
-        refresh()
-        setIsFetch(!isFetch)
-    }
-    /**
- * @description 文件下载
- * @param {String} params 文件fileId
- */
-    const download = async(id, name) => {
-        var extension = name?.split('.').pop().toLowerCase();
-        httpgetExport(apiurl.zdgl.download+id).then(res => {
-            exportFile(name,res.data)
-        })
-    }
-    const viewPdf = (params) => {
-        setIframeSrc(params)
-        setPdfViewOPen(true)
-      }
-    useEffect(() => {
-        const params = {
-            search: {
-                ...searchVal,
-            }
-        };
-        search(params)
-    }, [searchVal])
-
-
-    return (
-        <>
-            <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-                <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%", overflowY: "auto" }}>
-                    <Card className='nonebox'>
-                        <ToolBar
-                            setSearchVal={setSearchVal}
-                            onSave={command('save')}
-                            role={role}
-                        />
-                    </Card>
-                    <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-                        <Table columns={columns} rowKey="inx" {...tableProps} />
-                    </div>
-                </div>
-
-                <BasicCrudModal
-                    width={1000}
-                    ref={refModal}
-                    title=""
-                    component={ModalForm}
-                    onCrudSuccess={successCallback}
-                // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-                />
-            </div>
-
-            <Modal
-                open={pdfViewOPen}
-                width={1000}
-                title=""
-                footer={null}
-                style={{ marginTop: "-5%" }}
-                onCancel={() => {
-                    setPdfViewOPen(false)
-                }}
-            >
-                <iframe
-                    style={{
-                        height: '80vh',
-                        width: '100%',
-                        border: 0,
-                        marginTop: 20,
-                    }}
-                    src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-                />
-            </Modal>
-        </>
-    );
-}
-
-export default Page;
diff --git a/src/views/sz/flfg/toolbar.js b/src/views/sz/flfg/toolbar.js
deleted file mode 100644
index e9dbbbe..0000000
--- a/src/views/sz/flfg/toolbar.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker, Select } from 'antd';
-import { DownOutlined, UpOutlined } from '@ant-design/icons'
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  const [form] = Form.useForm();
-  const [showGj, setShowGj] = useState(false)
-  const onFinish = (values) => {
-    if (values.announcementDate) {
-      // 公布时间
-      values.stmAd= values.announcementDate[0].format('YYYY-MM-DD HH:mm:ss')
-      values.etmAd= values.announcementDate[1].format('YYYY-MM-DD HH:mm:ss')
-    }
-    if (values.implementationDate) {
-      // 施行日期
-      values.stmIm= values.implementationDate[0].format('YYYY-MM-DD HH:mm:ss')
-      values.etmIm= values.implementationDate[0].format('YYYY-MM-DD HH:mm:ss')
-    }
-    if (values.uploadTime) {
-      // 上传日期
-      values.stmUd= values.uploadTime[0].format('YYYY-MM-DD HH:mm:ss')
-      values.etmUd= values.uploadTime[0].format('YYYY-MM-DD HH:mm:ss')
-    }
-
-    delete values.announcementDate
-    delete values.implementationDate  
-    delete values.uploadTime  
-
-    setSearchVal({ ...values });
-  }
-
-  const opntios = [
-    { label: '宪法', value: 0 },
-    { label: '法律', value: 1 },
-    { label: '行政法规', value: 2 },
-    { label: '督察法规', value: 3 },
-    { label: '司法解释', value: 4 },
-    { label: '地方性法规', value: 5 },
-  ]
-  const opntios1 = [
-    { label: '尚未生效', value: 0 },
-    { label: '有效', value: 1 },
-    { label: '已修改', value: 2 },
-    { label: '已废止', value: 3 },
-  ]
-  const styles = {
-    fontFamily: '微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑, sans-serif',
-    fontWeight: '700',
-    fontStyle: 'normal',
-    fontSize: '16px'
-  }
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <div style={{ display: 'flex' }}>
-            <Form.Item label="标题" name="name">
-              <Input allowClear style={{ width: '150px' }} />
-            </Form.Item>
-            <Form.Item label="制定机关" name="fillUnit">
-              <Input allowClear style={{ width: '150px' }} />
-            </Form.Item>
-            <Form.Item label="法律性质" name="type">
-              <Select allowClear style={{ width: '150px' }} options={opntios} />
-            </Form.Item>
-            <Form.Item>
-              <Button type="primary" htmlType="submit">查询</Button>
-            </Form.Item>
-
-            <Form.Item>
-              <Button onClick={() => form.resetFields()}>重置</Button>
-            </Form.Item>
-
-            {
-              (onSave) ?
-                <Form.Item>
-                  <Button onClick={onSave}>新增</Button>
-                </Form.Item>
-                : null
-            }
-            <Form.Item>
-              <div style={styles} onClick={() => setShowGj(!showGj)}>高级搜索 {!showGj && <DownOutlined />} {showGj && <UpOutlined />}</div>
-            </Form.Item>
-          </div>
-          {showGj && <div style={{ display: 'flex' }}>
-            <Form.Item label="时效性" name="timeliness">
-              <Select allowClear style={{ width: '150px' }} options={opntios1} />
-            </Form.Item>
-            <Form.Item label="公布日期" name="announcementDate">
-              <RangePicker allowClear />
-            </Form.Item>
-            <Form.Item label="施行日期" name="implementationDate">
-              <RangePicker allowClear />
-            </Form.Item>
-            <Form.Item label="上传时间" name="uploadTime">
-              <RangePicker allowClear />
-            </Form.Item>
-          </div>}
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/pxjhgl/RecordForm.js b/src/views/sz/pxjhgl/RecordForm.js
deleted file mode 100644
index 3d114c8..0000000
--- a/src/views/sz/pxjhgl/RecordForm.js
+++ /dev/null
@@ -1,417 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import "./index.less"
-import moment from 'moment';
-import { createCrudService } from '../../../components/crud/_';
-import { httpget2, httppost2 } from '../../../utils/request';
-
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const types = [
-    {
-      label: "水利",
-      value:1
-    },
-    {
-      label: "岗前培训",
-      value:2
-    },{
-      label: "在岗培训",
-      value:3
-    },{
-      label: "政治学习教育",
-      value:4
-    },{
-      label: "其他",
-      value:5
-    },
-  ]
-  const [details, setDetails] = useState([])
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-   /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = (params) => {
-    createCrudService(apiurl.fxzb.qsdw.zq.getFile).delGet({ teamId: params.teamId  }).then(res => {
-      if (res.code === 200) {
-        let fileArr = res.data?.files.map(item => {
-                return {
-                  name: item.fileName,
-                  response: {
-                    data: {
-                      filePath: item.filePath,
-                      fileId:item.fileId
-                    }
-                  },
-                }
-              })
-        setFileList(fileArr)
-        const result = res.data?.details.map(item => ({ ...item, key: item.detailId }))
-        console.log("resss",result);
-        
-        setDetails(result)
-      }
-    })
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/rescue/team/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- 
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
-  const [jh, setJh] = useState([])
-  const getJhList = async () => {
-    try {
-      const res = await httppost2(apiurl.pxjl.list)
-      if (res.code == 200) {
-        setJh(res.data.map(item => ({label:item.name,value:item.id})))
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
- 
- 
-  
-  useEffect(()=>{
-    if (record.teamId ) {
-        getFileInfo(record)
-      }
-  }, [record])
-
-  useEffect(() => {
-    getJhList()
-  }, [])
-  
-
-//   useEffect(() => {
-//     if (mode !== "save") { 
-//       let dateSo = [
-//         record.validStartDate? moment(record.validStartDate):'',
-//         record.validEndDate? moment(record.validEndDate): ''
-//       ]
-    
-//       form.setFieldsValue({...record,dateRangeSo:dateSo})
-
-//     }
-
-//  }, [record,mode])
- 
-  return (
-    <div style={{height:"65vh",overflowY:"auto"}}>
-      <div className='basic-info'>基本信息</div>
-      {/* <Divider /> */}
-      <Form
-        form={form}
-        {...formItemLayout}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训计划"
-                name="planId"
-              >
-                 <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={jh}/>
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="培训分类"
-                name="type"
-              >
-              <NormalSelect disabled={true} style={{ width: '100%' }} allowClear options={types} />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="培训日期"
-                name="planDate"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-   
-              >
-                <DatePicker disabled={true} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="标题名称"
-                name="name"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-          <Form.Item
-                label="培训时段"
-                name="tm"
-              >
-              <TimePicker.RangePicker
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                format={"HH:mm:ss"}
-                // value={timeValue}
-                // onChange={(e) => setTimeValue(e)}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="培训时长(小时)"
-                name="hour"
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>   
-      </Row>
-      <Row>
-      <Col span={12}>
-      <Form.Item
-                label="培训地点"
-                name="addr"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="主办单位"
-                rules={[{ required: true }]}
-                name="unit"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={24}>
-      <Form.Item
-                label="培训内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="培训范围"
-                name="scope"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-               
-              >
-                <Input disabled={true} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={12}>
-      <Form.Item
-                label="参训人员"
-                name="trainees"
-              >
-              <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="参训人数"
-                name="numPeople"
-                rules={[{ required: true }]}
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-         
-          <Col span={12}>
-          <Form.Item
-                label="填报人"
-                rules={[{ required: true }]}
-                name="applicant"
-              >
-                <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="登记日期"
-                name="regDate"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker disabled={true} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>    
-      </Row>
-      <Row>
-        <Col span={24}>
-            <Form.Item 
-            label="培训签到表"
-            labelCol={{ span: 3 }}
-            wrapperCol={{ span: 19 }}
-            >
-                
-            </Form.Item>
-        </Col>
-      </Row>
-        <div className='basic-info' style={{display:"flex",justifyContent:"space-between"}}>
-          <span>其他信息</span>
-      </div>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} >
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '保存' :
-                    mode === "similarSave" ? "保存" :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/rescue/goods/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sz/pxjhgl/form.js b/src/views/sz/pxjhgl/form.js
deleted file mode 100644
index fadc880..0000000
--- a/src/views/sz/pxjhgl/form.js
+++ /dev/null
@@ -1,471 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import "./index.less"
-import moment from 'moment';
-import { createCrudService } from '../../../components/crud/_';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const types = [
-    {
-      label: "水利",
-      value:1
-    },
-    {
-      label: "岗前培训",
-      value:2
-    },{
-      label: "在岗培训",
-      value:3
-    },{
-      label: "政治学习教育",
-      value:4
-    },{
-      label: "其他",
-      value:5
-    },
-  ]
-  const [details, setDetails] = useState([])
- 
-
-
-
-
-  
- 
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/personnelPlan/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    values.regDate = moment(values.regDate).format('YYYY-MM-DD')
-    let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId }))
-    values.files = oldFiles;
-    if (mode === 'edit') {
-      onEdit(apiurl.pxjh.edit,{...record,...values})
-    }
-    if (mode === 'save') {
-      onSave(apiurl.pxjh.save,values)
-    }
-    if (mode === "similarSave") {
-      onSave(apiurl.pxjh.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-
-
-  useEffect(() => {
-    if (mode!== "save") {
-      let fileArr = record?.files.map(item => {
-        return {
-          name: item.fileName,
-          response: {
-            data: {
-              filePath: item.filePath,
-              fileId:item.fileId
-            }
-          },
-        }
-      })
-      setFileList(fileArr)
-    }
-  }, [mode, record])
-  
-  useEffect(() => {
-    const userName =  localStorage.getItem('userName')
-    form.setFieldValue("regDate", moment())
-    form.setFieldValue("applicant",userName)
-  }, [])
-  
- 
-  return (
-    <div style={{height:"65vh",overflowY:"auto"}}>
-      <div className='basic-info'>基本信息</div>
-      {/* <Divider /> */}
-      <Form
-        form={form}
-        {...formItemLayout}
-        initialValues={record}
-        onFinish={onfinish}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训班名称"
-                name="name"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="培训班分类"
-                name="type"
-                rules={[{ required: true }]}
-              >
-              <NormalSelect disabled={mode === 'view'} style={{ width: '100%' }} allowClear options={types} />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="主办单位"
-                name="unit"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="开始培训日期"
-                name="stm"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-   
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="结束培训日期"
-                name="etm"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-   
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训天数(天)"
-                name="day"
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="培训期数(期)"
-                name="num"
-                rules={[{ required: true }]}
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>   
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="培训地点"
-                name="addr"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="培训内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="培训范围"
-                name="scope"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="参训人员"
-                name="trainees"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-              <Form.Item
-                label="参训人数(人)"
-                name="numPeople"
-                rules={[{ required: true }]}
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="联系人"
-                name="contacts"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>   
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="联系电话"
-                name="contactNumber"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="填报人"
-                name="applicant"
-              >
-                <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>   
-        </Row>
-        <Row>
-          <Col span={12}>
-              <Form.Item
-                label="状态"
-                name="status"
-                rules={[{ required: true }]}
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={[{label:"有效",value:1},{label:"无效",value:2}]} />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="登记日期"
-                name="regDate"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-   
-              >
-                <DatePicker disabled={true} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>   
-        </Row>
-        <div className='basic-info' style={{display:"flex",justifyContent:"space-between"}}>
-          <span>其他信息</span>
-      </div>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/personnelPlan/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '保存' :
-                    mode === "similarSave" ? "保存" :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/personnelPlan/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sz/pxjhgl/index.js b/src/views/sz/pxjhgl/index.js
deleted file mode 100644
index 807baab..0000000
--- a/src/views/sz/pxjhgl/index.js
+++ /dev/null
@@ -1,284 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Image,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import RecordDetails from "../pxjlgl/form"
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import { exportFile } from '../../../utils/tools.js';
-import { httppost5,httpget2 } from '../../../utils/request';
-import {fileDownload} from "../../../utils/tools"
-const Page = () => {
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [pxRecordOpen, setPxRecordOpen] = useState(false)
-
-  const [qdItem, setQdItem] = useState()
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '培训班名称', key: 'name', dataIndex: 'name', width: 200, ellipsis: true },
-    {
-      title: '计划培训周期', key: 'num1', dataIndex: 'num1', width: 200,
-      render: (value, record) =>  <span>{(record?.stm && record?.etm) ? `${record?.stm}至${record?.etm}` : ''}</span>,
-    },
-    { title: '主办单位', key: 'unit', dataIndex: 'unit', width: 200 },
-    {
-      title: '培训内容', key: 'content', dataIndex: 'content', width: 200,ellipsis: true
-    },
-    { title: '培训地点', key: 'addr', dataIndex: 'addr', width: 150, ellipsis: true },
-    { title: '填报人', key: 'applicant', dataIndex: 'applicant', width: 150, ellipsis: true },
-  
-    {
-      title: '操作', key: 'operation', width: 300, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-          edit={editBtn ? true : false}
-          del={delBtn ? true : false}
-          view={viewBtn ? true : false}
-          similarAdd={true}
-          record={true}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  const columns1 = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '培训日期', key: 'planDate', dataIndex: 'planDate', width: 150, ellipsis: true },
-    {
-      title: '培训时段', key: 'personCount', dataIndex: 'personCount', width: 150,
-      render: (value, record) => <span>{(record?.stm && record?.etm) ? `${record?.stm}至${record?.etm}` : ''}</span>,
-    },
-    { title: '参加人数', key: 'trainees', dataIndex: 'trainees', width: 100 },
-    {
-      title: '参训人员', key: 'numPeople', dataIndex: 'numPeople', width: 200,ellipsis: true
-    },
-    {
-      title: '培训签到表', key: 'teamLeader', dataIndex: 'teamLeader', width: 150,
-      render: (value,record) => <div><a onClick={()=>reviewPic(record.files1)}> {record?.files1[0]?.fileName} </a></div>
-    },
-  
-    {
-      title: '操作', key: 'operation', width: 100, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <a onClick={() => { setPxRecordOpen(true); setQdItem(row)}}>查看</a>
-      )
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-  const width1 = useMemo(() => columns1.reduce((total, cur) => total + (cur.width), 0), [columns1]);
-  const [pxOpen, setPxOpen] = useState(false)
-  const [imgVisible, setImgVisible] = useState(false)
-  const [imgList, setImgList] = useState([])
-  const [fileList1, setFileList1] = useState([]) //上传文件列表
-  const [fileList2, setFileList2] = useState([]) //上传文件列表
-
-
-  const reviewPic = (arrPic) => {
-    const url = "tsg/personnelPlan/file/download";
-    if (arrPic.length > 0) {
-      const filename = arrPic[0]?.fileName
-      if (filename.indexOf('.jpg') > -1 || filename.indexOf('.png')> -1 || filename.indexOf('.jpeg') > -1) {
-        setImgVisible(true)
-        setImgList(arrPic)
-      } else {
-        fileDownload(url,arrPic[0])
-      }
-    }
-  }
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.pxjh.delete + `/${params.id}`);
-    }else if (type === 'similarAdd') {
-      refModal.current.showSimilarSave(params);
-    } else {
-      // 培训记录
-      const params1 = {
-        search: {
-          ...searchVal,
-          planId:params.id
-        }
-      };
-      setPxOpen(true);
-      search1(params1)
-      // getFileInfo(params)
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.pxjh.page).find_noCode);
-  const { tableProps:tableProps1, search:search1 } = usePageTable(createCrudService(apiurl.pxjl.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-
-  
-// const getFileInfo = async (params) => {
-//   try {
-//     const res = await httpget2(apiurl.pxjl.getFile + `/${params.id}`)
-//     if (res.code === 200) {
-//       if (res.data?.files1) {
-//         let fileArr1 = res.data?.files1.map(item => {
-//           return {
-//             name: item.fileName,
-//             response: {
-//               data: {
-//                 filePath: item.filePath,
-//                 fileId: item.fileId
-//               }
-//             },
-//           }
-//         })
-//         setFileList1(fileArr1)
-//       }
-//       if (res.data?.files2) {
-//         let fileArr2 = res.data?.files2.map(item => {
-//           return {
-//             name: item.fileName,
-//             response: {
-//               data: {
-//                 filePath: item.filePath,
-//                 fileId: item.fileId
-//               }
-//             },
-//           }
-//         })
-//         setFileList2(fileArr2)
-//       }
-//     }
-//   } catch (error) {
-//     console.log(error);
-//   }
-  
-// }
-  
-  // 导出
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-    }
-    httppost5(apiurl.pxjh.export, params).then(res => {
-      exportFile(`培训计划管理.xlsx`,res.data)
-  })
-  }
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-
-  // const dataSource = useMemo(() => {
-  //   if (tableProps1.dataSource.length > 0) { 
-  //     return tableProps1.dataSource.map(item => ({
-  //       ...item,
-  //       files1: fileList1,
-  //       files2: fileList2,
-  //     }))
-  //   } else {
-  //     return []
-  //   }
-  // },[tableProps1.dataSource,fileList1,fileList2])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-              callback={refresh}
-              exportFile1={exportExcel}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-        />
-      </div>
-      {/* 培训记录 */}
-      <Modal
-        title="培训记录"
-        width={1000}
-        open={pxOpen}
-        destroyOnClose
-        footer={null}
-        onCancel={() => {
-          setPxOpen(false);
-        }}
-      >
-        <Table
-          columns={columns1}
-          rowKey="inx"
-          {...tableProps1}
-          // dataSource={dataSource}
-          scroll={{ x: width1, y: "calc( 100vh - 400px )" }} />
-      </Modal>
-
-      
-      {/* 培训记录查看 */}
-      <Modal
-           title="查看"
-           width={800}
-           open={pxRecordOpen}
-           destroyOnClose
-           footer={null}
-           onCancel={() => {
-             setPxRecordOpen(false);
-           }}
-      >
-        <RecordDetails mode={"view"} record={qdItem} />
-      </Modal>
-      <div style={{ display: "none" }}>
-        <Image.PreviewGroup
-            preview={{
-              visible:imgVisible,
-              onVisibleChange: (vis) => setImgVisible(vis),
-            }}
-        >
-          {
-              imgList.length > 0 ? imgList.map(item => (
-                <Image src={ url + item.filePath} key={item?.id}/>
-            ))
-            : null
-          }
-
-        </Image.PreviewGroup>
-
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/sz/pxjhgl/index.less b/src/views/sz/pxjhgl/index.less
deleted file mode 100644
index 2740803..0000000
--- a/src/views/sz/pxjhgl/index.less
+++ /dev/null
@@ -1,17 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
\ No newline at end of file
diff --git a/src/views/sz/pxjhgl/toolbar.js b/src/views/sz/pxjhgl/toolbar.js
deleted file mode 100644
index 714bdd5..0000000
--- a/src/views/sz/pxjhgl/toolbar.js
+++ /dev/null
@@ -1,147 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Upload, Button,Row, Col, Input, DatePicker, message,Modal } from 'antd';
-import {RightOutlined,LeftOutlined,FileExcelOutlined,DeleteOutlined} from '@ant-design/icons';
-import { createCrudService } from '../../../components/crud/_';
-import apiurl from '../../../service/apiurl';
-import { httpgetExport, httppost5 } from '../../../utils/request';
-import { exportFile } from '../../../utils/tools';
-import moment from 'moment';
-const { Dragger } = Upload;
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role = [],callback,exportFile1 }) => {
-  const [form] = Form.useForm();
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询") || true;
-  
-  const [exportOPen, setExportOPen] = useState(false)
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [loading, setLoading] = useState(false)
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        stm: moment(values.tm[0]).format('YYYY-01-01'),
-        etm: moment(values.tm[1]).format('YYYY-12-31')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, ...dateSo});
-  }
-
-  const beforeUpload = (file) => {
-    const accept = [".xlsx",".xls"]
-    const fileType = file?.name.split(".");
-    const fileDate = fileType.slice(-1);
-    const isEecel = accept.includes(`.${fileDate[0]}`)
-    if (!isEecel) {
-      message.error('请上传.xls .xlsx格式的文件！');
-    }
-    return isEecel  ? true : Upload.LIST_IGNORE;
-  };
-
-
-  const fileChange = (info) => {
-    console.log(info);
-    if (info.file.status === "done") {
-      setLoading(false);
-      setExportOPen(false)
-      callback()
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    setFileList(info.fileList)
-  }
-
-  const downTemplate = ()=>{
-    httpgetExport(apiurl.pxjh.import, {}).then(res => {
-      exportFile(`培训计划管理.xlsx`,res.data)
-  })
-  }
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-         
-          <Form.Item label="计划年度" name="tm">
-            <RangePicker
-              allowClear
-              showTime 
-              style={{ width: "300px" }}
-              picker='year'
-            />
-          </Form.Item>
-          <Form.Item label="填报人" name="applicant">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="培训班名称" name="name">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-          <Form.Item>
-            <Button onClick={() => {setExportOPen(true)}}>导入</Button>
-          </Form.Item><Form.Item>
-            <Button onClick={()=>exportFile1()}>导出</Button>
-          </Form.Item>
-        </Form>
-      </div>
-   {/* 导入 */}
-      <Modal
-        open={exportOPen}
-        width={700}
-        title="仅支持表格文件上传，请按照模板示例数据填写"
-        destroyOnClose
-        onCancel={() => setExportOPen(false)}
-        footer={null}
-      >
-        <Row>
-          <Col span={24}>
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/personnelPlan/upload"
-                onChange={fileChange}
-                beforeUpload={beforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={fileList}
-                  disabled={loading}
-                  accept=".xls, .xlsx"
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.xls .xlsx
-                </p>
-              </Dragger>
-          </Col>
-        </Row>
-       
-        <Row>
-          <Col span={24} style={{ textAlign: 'right',marginTop:15 }}>
-            <Button onClick={downTemplate} type="primary" style={{marginRight:10}}>下载模板</Button>
-            {/* <Button type="primary" onClick={() => {}}>提交</Button> */}
-          </Col>
-        </Row>
-      </Modal>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/pxjlgl/chartToolbar.js b/src/views/sz/pxjlgl/chartToolbar.js
deleted file mode 100644
index 991bc75..0000000
--- a/src/views/sz/pxjlgl/chartToolbar.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Upload, Button,Row, Col, Input, DatePicker, message,Modal } from 'antd';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-
-const ToolBar = ({ setSearchVal }) => {
-  const [form] = Form.useForm();
-  const types = [
-    {
-      label: '培训人次',
-      value: 1
-    },
-    {
-      label: '培训期数',
-      value: 2
-    },
-  ]
-  const valuesChange = (e,allvalue) => {
-    setSearchVal({ ...allvalue,year:moment(allvalue.year).format("YYYY") })
-  }
-
-  useEffect(() => {
-    const value = {year:moment()}
-    form.setFieldsValue(value)
-    setSearchVal({year:moment().format("YYYY")})
-  }, [])
-  
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onValuesChange={valuesChange}>
-        {/* <Form.Item label="统计维度" name="teamName">
-            <NormalSelect allowClear style={{ width: '150px' }} options={types} />
-          </Form.Item> */}
-          <Form.Item label="选择年份" name="year">
-            <DatePicker
-              allowClear
-              showTime 
-              style={{ width: "150px" }}
-               picker='year'
-            />
-          </Form.Item>
-          
-        </Form>
-      </div>
-  
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/pxjlgl/form.js b/src/views/sz/pxjlgl/form.js
deleted file mode 100644
index 294d6d5..0000000
--- a/src/views/sz/pxjlgl/form.js
+++ /dev/null
@@ -1,653 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, TimePicker, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import "./index.less"
-import moment from 'moment';
-import dayjs from "dayjs"
-import { createCrudService } from '../../../components/crud/_';
-import { httpget2, httppost2 } from '../../../utils/request';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const types = [
-    {
-      label: "水利",
-      value:1
-    },
-    {
-      label: "岗前培训",
-      value:2
-    },{
-      label: "在岗培训",
-      value:3
-    },{
-      label: "政治学习教育",
-      value:4
-    },{
-      label: "其他",
-      value:5
-    },
-  ]
-
-  const [details, setDetails] = useState([])
- 
- 
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-
-
-
-  const [fileList1, setFileList1] = useState([]) //上传文件列表
-  const [fileIds1, setFileIds1] = useState([])
-  const [iframeSrc1, setIframeSrc1] = useState('')
-  const [pdfViewOPen1, setPdfViewOPen1] = useState(false)
-
-  const [loading1, setLoading1] = useState(false)
-   /**
-   * @description 获取查看时文件
-   * @param {*} type 
-   * @returns 
-   */
-  const getFileInfo = async (params) => {
-    try {
-      const res = await httpget2(apiurl.pxjl.getFile + `/${params.id}`)
-      if (res.code === 200) {
-        if (res.data?.files1) {
-          let fileArr1 = res.data?.files1.map(item => {
-            return {
-              name: item.fileName,
-              response: {
-                data: {
-                  filePath: item.filePath,
-                  fileId: item.fileId
-                }
-              },
-            }
-          })
-          setFileList1(fileArr1)
-        }
-        if (res.data?.files2) {
-          let fileArr = res.data?.files2.map(item => {
-            return {
-              name: item.fileName,
-              response: {
-                data: {
-                  filePath: item.filePath,
-                  fileId: item.fileId
-                }
-              },
-            }
-          })
-          setFileList(fileArr)
-        }
-      }
-    } catch (error) {
-      console.log(error);
-    }
-    
-  }
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/personnelPlanLog/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  const download1 = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/personnelPlanLog/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-  }
-  
-  const fileChange1 = (info) => {
-    if (info.file.status === "done") {
-      setLoading1(false);
-    }
-    if (info.file.status === "uploading") { 
-      setLoading1(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading1(false);
-     }
-    let fileIds = info.fileList.map(file => {
-      return file.response?.data?.fileId
-    })
-    setFileIds1(fileIds)
-    setFileList1(info.fileList)
-    console.log(info.fileList);
-    
-  }
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
-  const viewPdf1 = (params) => {
-    setIframeSrc1(params)
-    setPdfViewOPen1(true)
-  }
-  const onfinish = (values) => {
-    values.stm = values.tm ? values.tm[0].format("HH:mm:ss") : ''
-    values.etm = values.tm ? values.tm[1].format("HH:mm:ss") : ''
-    values.regDate = moment(values.regDate).format('YYYY-MM-DD')
-    const files1 = fileList1.map(item =>  ({fileId:item.response?.data?.fileId }));
-    const files = fileList.map(item => ({ fileId: item.response?.data?.fileId }));
-    values.files1 = files1;
-    values.files2 = files;
-    if (mode === 'edit') {
-      onEdit(apiurl.pxjl.edit,{...record,...values});
-    }
-    if (mode === 'save') {
-      onSave(apiurl.pxjl.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-  }
-  
-  const deleteFile1 = (fileId) => {
-    console.log(fileId);
-    let filterFile = fileList1.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList1(filterFile)
-  }
- const [jh, setJh] = useState([])
- const [jhData, setJhData] = useState([])
-  const getJhList = async () => {
-    try {
-      const res = await httppost2(apiurl.pxjl.list)
-      if (res.code == 200) {
-        setJhData(res.data)
-        setJh(res.data.map(item => ({ label: item.name, value: item.id })))
-        if (mode != 'save') {
-          const formName = res.data.find(item => item.id == record.planId)
-          form.setFieldsValue(formName)
-        }
-      }
-    } catch (error) {
-      console.log(error);
-      
-    }
-  }
-
-  const handleFieldChange = (changedValues, allValues) => {
-    // 检查变化的字段是否是您感兴趣的字段
-    if ('planId' in changedValues) {
-      const formName = jhData.find(item => item.id == changedValues['planId'])
-      form.setFieldsValue(formName)
-    }
-  };
-  useEffect(()=>{
-    if (mode !== "save") {
-      getFileInfo(record)
-      const momentArr = (record?.stm && record.etm) ? [dayjs("2024-05-06" + record.stm), dayjs("2024-05-06" +record.etm)] : ''
-      form.setFieldValue("tm", momentArr)
-    }
-  }, [record,mode])
-
-  useEffect(() => {
-    const userName =  localStorage.getItem('userName')
-    form.setFieldValue("regDate", moment())
-    form.setFieldValue("applicant",userName)
-    getJhList()
-  }, [])
- 
- 
- 
-
-
- 
-  return (
-    <div style={{height:"65vh",overflowY:"auto"}}>
-      <div className='basic-info'>基本信息</div>
-      {/* <Divider /> */}
-      <Form
-        form={form}
-        {...formItemLayout}
-        initialValues={record}
-        onFinish={onfinish}
-        onValuesChange={handleFieldChange}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="培训计划"
-                name="planId"
-              >
-                <NormalSelect disabled={mode==='view'} style={{width:'100%'}} allowClear options={jh}/>
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="培训分类"
-                name="type"
-              >
-              <NormalSelect disabled={true} style={{ width: '100%' }} allowClear options={types} />
-              </Form.Item>
-          </Col>  
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="培训日期"
-                name="planDate"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="标题名称"
-                name="name"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode === 'view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="培训时段"
-                name="tm"
-              >
-              <TimePicker.RangePicker
-                disabled={mode === 'view'}
-                style={{ width: '100%' }}
-                allowClear
-                format={"HH:mm:ss"}
-                // value={timeValue}
-                // onChange={(e) => setTimeValue(e)}
-              />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="培训时长(小时)"
-                name="hour"
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>   
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="培训地点"
-                name="addr"
-                rules={[{ required: true }]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="主办单位"
-                rules={[{ required: true }]}
-                name="unit"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="培训内容"
-                name="content"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'50px'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      <Col span={24}>
-              <Form.Item
-                label="培训范围"
-                name="scope"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-      </Row>
-      <Row>
-      <Col span={12}>
-              <Form.Item
-                label="参训人员"
-                name="trainees"
-              >
-              <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="参训人数"
-                name="numPeople"
-                rules={[{ required: true }]}
-              >
-                <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-       
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="填报人"
-                rules={[{ required: true }]}
-                name="applicant"
-              >
-                <Input disabled={true} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-          <Form.Item
-                label="登记日期"
-                name="regDate"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-              >
-                <DatePicker disabled={true} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-        </Row>
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label="培训签到表"
-                name="fieldId1"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // beforeUpload={imgbeforeUpload}
-                action="/gunshiApp/tsg/personnelPlanLog/file/upload/singleSimple"
-                onChange={fileChange1}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList1}
-                  disabled={loading1}
-                  maxCount={1}
-                // onSuccess={handleSuccess}
-              >
-                      <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                  支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList1.length > 0 && fileList1.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download1(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf1(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download1(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download1(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile1(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        <div className='basic-info' style={{display:"flex",justifyContent:"space-between"}}>
-          <span>其他信息</span>
-      </div>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/personnelPlanLog/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
-               {
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '保存' :
-                    mode === "similarSave" ? "保存" :
-                    '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/personnelPlanLog/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-
-      <Modal
-        open={pdfViewOPen1}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen1(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/personnelPlanLog/file/download/${iframeSrc1}`)}`}
-        />
-      </Modal>
-    </div>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sz/pxjlgl/index.js b/src/views/sz/pxjlgl/index.js
deleted file mode 100644
index 38d9ace..0000000
--- a/src/views/sz/pxjlgl/index.js
+++ /dev/null
@@ -1,212 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { useSelector } from 'react-redux';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card,Modal,Image,Input,Button,Row,Col,message } from 'antd';
-import ToolBar from './toolbar';
-import ChartToolBar from './chartToolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import options from "./options";
-import ReactEcharts from 'echarts-for-react';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import "./index.less"
-import { httpget2 } from '../../../utils/request';
-import moment from 'moment';
-
-const Page = () => {
-  const types = [
-    {
-      label: "水利",
-      value:1
-    },
-    {
-      label: "岗前培训",
-      value:2
-    },{
-      label: "在岗培训",
-      value:3
-    },{
-      label: "政治学习教育",
-      value:4
-    },{
-      label: "其他",
-      value:5
-    },
-  ]
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [searchChartVal, setSearchChartVal] = useState()
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
-    { title: '培训日期', key: 'planDate', dataIndex: 'planDate', width: 200, ellipsis: true },
-    {
-      title: '标题', key: 'name', dataIndex: 'name', width: 200,ellipsis: true
-    },
-    { title: '主办单位', key: 'unit', dataIndex: 'unit', width: 150 },
-    {
-      title: '培训分类', key: 'type', dataIndex: 'type', width: 150,
-      render: (v) => <span>{types[v]?.label}</span>
-     },
-    {
-      title: '培训内容', key: 'content', dataIndex: 'content', width: 200,ellipsis: true
-    },
-    { title: '参训人员', key: 'trainees', dataIndex: 'trainees', width: 200, ellipsis: true },
-    { title: '培训地点', key: 'addr', dataIndex: 'addr', width: 150, ellipsis: true },
-    { title: '填报人', key: 'applicant', dataIndex: 'applicant', width: 150, ellipsis: true },
-    { title: '登记日期', key: 'regDate', dataIndex: 'regDate', width: 150, ellipsis: true },
-  
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-          edit={editBtn ? true : false}
-          del={delBtn ? true : false}
-          view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.pxjl.delete + `/${params.id}`);
-    }
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.pxjl.page).find_noCode);
-
- /**
-   * @description 处理成功的回调
-   */
- const successCallback = () => {
-  refresh()
-}
-
-// 获取统计数据
-  const [staData, setStaData] = useState({})
-  const pxOptions = useMemo(() => {
-    if (staData) {
-      return options(staData)
-    } else {
-      return options({})
-    }
-  }, [staData])
-  const getStaData = async (params) => {
-    try {
-      const res = await httpget2(apiurl.pxjl.sta + `/${params.year}`)
-      if (res.code == 200) {
-        setStaData({...res.data})
-        // if (params.teamName == 1) {
-        //   setStaData({...res.data,list:res.data.list1})
-        // } else {
-        //   setStaData({...res.data,list:res.data.list2})
-        // }
-      }else{
-        message.error(res.description)
-        setStaData([])
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
- 
-  useEffect(()=>{
-    const params = {
-      search: {
-        ...searchVal,
-      }
-    };
-    search(params)
-  }, [searchVal])
-  
-  useEffect(() => {
-    if (searchChartVal) {
-      getStaData(searchChartVal)
-    }
-    
-  }, [searchChartVal])
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <div style={{ width: "100%", height: "35vh", marginBottom: 20, padding: 10,display:"flex",columnGap:10 }}>
-            <div className='pxrecord-title-left'>
-                <div className='first-item'>
-                <img src={`${process.env.PUBLIC_URL}/assets/images/qishu.jpg`} alt='' />
-                <div className='children-itm'>
-                    <span>本年培训期数</span>
-                    <span>计划/实际</span>
-                  <span><span style={{ fontSize: 22, fontWeight: "bold" }}>{ staData?.numberOfPeriods2 ?? "--"}</span>&nbsp;期/
-                    <span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.numberOfPeriods1 ?? "--"}</span>&nbsp;期</span>
-                </div>
-               
-                </div>
-                <div className='second-item'>
-                <img src={`${process.env.PUBLIC_URL}/assets/images/renchi.jpg`} alt='' />
-                <div className='children-itm'>
-                    <span>本年培训人次</span>
-                    <span>计划/实际</span>
-                    <span><span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.personNum2 ?? "--"}</span>&nbsp;人次/
-                    <span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.personNum1 ?? "--"}</span>&nbsp;人次</span>
-                </div>
-                </div>
-            </div>
-            <div className='pxrecord-title-right'>
-              <div className='chart-tool'>
-                  <ChartToolBar
-                  setSearchVal={setSearchChartVal}
-                />
-              </div>
-              <div className='chart-box'>
-                  <ReactEcharts
-                      option={pxOptions || {}}
-                      style={{ width: "100%", height: '100%' }}
-                      notMerge={true}
-                    />
-              </div>
-            </div>
-          </div>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-              callback={refresh}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 20px 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 680px )"}}/>
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={successCallback}
-          // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-        />
-      </div>
-    
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/sz/pxjlgl/index.less b/src/views/sz/pxjlgl/index.less
deleted file mode 100644
index 1131755..0000000
--- a/src/views/sz/pxjlgl/index.less
+++ /dev/null
@@ -1,59 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.pxrecord-title-left{
-  width: 300px;
-  .first-item,.second-item{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    column-gap: 10px;
-    width: 300px;
-    height: 16vh;
-    padding: 20px;
-    img{
-        width: 80px;
-        height: 60px;
-    }
-    .children-itm{
-        display: flex;
-        flex-direction: column;
-
-    }
-  }
-  .first-item{
-    background: #e4f4f8;
-    margin-bottom: 10px;
-  }
-  .second-item{
-    background: #e9f4ff;
-  }
-}
-
-.pxrecord-title-right{
-    display: flex;
-    flex:1;
-    background-color: #f4f8ff;
-    flex-direction: column;
-    .chart-tool{
-        margin-left: auto;
-    }
-    .chart-box{
-      height: calc(320px - 46px);
-    }
-}
\ No newline at end of file
diff --git a/src/views/sz/pxjlgl/options.js b/src/views/sz/pxjlgl/options.js
deleted file mode 100644
index 72f9e70..0000000
--- a/src/views/sz/pxjlgl/options.js
+++ /dev/null
@@ -1,108 +0,0 @@
-export default function options(data = {}) {
-   const xAxisData = data ?.list1 ?.map(item => item.month + "月")
-   const maxCount = data ?.list1 ? Math.ceil(Math.max(...data ?.list1 ?.map(obj => [obj.num1, obj.num2]).flat())) : 0
-   const minCount = data ?.list1 ? Math.floor(Math.min(...data ?.list1 ?.map(obj => [obj.num1, obj.num2]).flat())) : 100
-   return {
-      animation: true,
-      tooltip: {
-         trigger: 'axis',
-      },
-      grid: {
-         top: '15%',
-         bottom: '15%',
-         right: '8%',
-         left: '7%',
-      },
-      legend: {
-         show: true,
-         left: "10%",
-         top: "-1%",
-         itemWidth: 11,
-         itemHeight: 10,
-      },
-      xAxis: {
-         data: xAxisData,
-      },
-      yAxis: [{
-            type: 'value',
-            position: "left",
-            offset: 10,
-            min: minCount,
-            max: maxCount,
-            //   splitLine:false,
-            axisTick: {
-               show: false
-            },
-            axisLine: {
-               show: false,
-
-            },
-            axisLabel: {
-               show: true,
-               margin: 0,
-               fontSize: 18,
-            }
-         },
-         {
-            type: 'value',
-            position: "right",
-            offset: 10,
-            min: minCount,
-            max: maxCount,
-            //   splitLine:false,
-            axisTick: {
-               show: false
-            },
-            axisLine: {
-               show: false,
-
-            },
-            axisLabel: {
-               show: true,
-               margin: 0,
-               fontSize: 18,
-            }
-         },
-        
-      ],
-      series: [{
-            name: "实际人次",
-            type: 'bar',
-            barWidth: 25,
-            data: data?.list1?.map(item => item.num1),
-            itemStyle: {
-               color: "#6295fa"
-            }
-         },
-         {
-            name: '实际期数',
-            yAxisIndex: 1,
-            type: 'bar',
-            barWidth: 25,
-            data: data ?.list1 ?.map(item => item.num2),
-            itemStyle: {
-               color: "#62daab"
-            }
-         },
-         //   {
-         //   name: '完成率',
-         //   type: 'line',
-         //   yAxisIndex: 1,
-         //   showSymbol:false,
-         //   smooth: false, // 平滑曲线显示
-         //   lineStyle: {
-         //      width: 2,
-         //      color: '#5d7092'
-         //   },
-         //   itemStyle: {
-         //      color: '#5d7092',
-         //      shadowColor: '#5d7092',
-         //      shadowBlur: 10,
-         //      borderColor: '#5d7092',
-         //      borderWidth: 2
-         //   },
-         //   data: data?.list?.map(item => item.rate * 100),
-         //   }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/src/views/sz/pxjlgl/toolbar.js b/src/views/sz/pxjlgl/toolbar.js
deleted file mode 100644
index 5dd553e..0000000
--- a/src/views/sz/pxjlgl/toolbar.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Upload, Button,Row, Col, Input, DatePicker, message,Modal } from 'antd';
-import {RightOutlined,LeftOutlined,FileExcelOutlined,DeleteOutlined} from '@ant-design/icons';
-import { createCrudService } from '../../../components/crud/_';
-import apiurl from '../../../service/apiurl';
-import { httppost5 } from '../../../utils/request';
-import { exportFile } from '../../../utils/tools';
-import moment from 'moment';
-import NormalSelect from '../../../components/Form/NormalSelect';
-const { Dragger } = Upload;
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role = [],callback,exportFile }) => {
-  const [form] = Form.useForm();
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询") || true;
-  const types = [
-    {
-      label: "水利",
-      value:1
-    },
-    {
-      label: "岗前培训",
-      value:2
-    },{
-      label: "在岗培训",
-      value:3
-    },{
-      label: "政治学习教育",
-      value:4
-    },{
-      label: "其他",
-      value:5
-    },
-  ]
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        stm: moment(values.tm[0]),
-        etm: moment(values.tm[1])
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, ...dateSo});
-  }
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-         
-          <Form.Item label="日期范围" name="tm">
-            <RangePicker
-              allowClear
-              showTime 
-              style={{ width: "300px" }}
-              format={"YYYY-MM-DD"}
-            />
-          </Form.Item>
-          <Form.Item label="参训人员" name="trainees">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="主办单位" name="unit">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="培训分类" name="type">
-            <NormalSelect allowClear style={{ width: '150px' }} options={types} />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        
-        </Form>
-      </div>
-  
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajdj/bajz.js b/src/views/sz/szzf/ajdj/bajz.js
deleted file mode 100644
index dbee098..0000000
--- a/src/views/sz/szzf/ajdj/bajz.js
+++ /dev/null
@@ -1,219 +0,0 @@
-import { Space, Table, Radio, DatePicker, Form, Select, Button, message, Upload, Input, Row, Col, Switch, Image } from 'antd';
-import { InboxOutlined, LinkOutlined, DeleteOutlined, LoadingOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons'
-import { useForm } from 'antd/lib/form/Form';
-import { useEffect, useState } from 'react';
-import {  httpgetExport, httppostAddfile } from '../../../../utils/request';
-import { exportFile } from '../../../../utils/tools';
-import PdfView from './pdfView'
-
-const { Dragger } = Upload;
-
-const list = [
-    {
-        type: '立案',
-        key: 'files3'
-    },
-    {
-        type: '调查取证',
-        key: 'files4'
-    },
-    {
-        type: '审查处理',
-        key: 'files5'
-    },
-    {
-        type: '送达执行',
-        key: 'files6'
-    },
-    {
-        type: '结案',
-        key: 'files7'
-    }
-]
-const baseUrl = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
-    const [form] = Form.useForm();
-    const [fileList, setFileList] = useState([])
-    const [fileListHj, setFileHj] = useState({'files3': [],'files4': [],'files5': [],'files6': [],'files7': []})
-    const [url, setUrl] = useState('')
-    const [isModal, setIsModal] = useState(false)
-  const [loading, setLoading] = useState(false)
-
-    const getInfo = () => {
-        form.validateFields().then((values) => {
-            getFormInfo({ ...fileListHj,...values,  })
-            setFileList([])
-        }).catch((errorInfo) => {
-            console.log(errorInfo, 'error');
-        })
-        // 
-    }
-    const cancel = () => {
-        getFormInfo(false)
-        form.resetFields()
-        setFileList([])
-
-    }
-    const deleteFile = (e,key) => {
-        fileListHj[key] = fileListHj[key].filter(item => item.fileId !== e)
-        setFileHj({ ...fileListHj })
-    }
-    const props = (keys) => {
-        return {
-            name: 'file',
-            multiple: true,
-            fileList: fileList,
-            showUploadList: false,
-            beforeUpload: (file, fileList) => {
-                // if (fileType == "pic" &&
-                //     (file.type != "image/jpeg" || file.type != "image/png" || file.type != "image/jpg")) {
-                //     message.error('仅支持上传jpg/png/jpeg格式的图片');
-                //     return false;
-                // } else {
-                //     return true;
-                // }
-            },
-            customRequest(e) {
-                setLoading(true);
-                httppostAddfile(uploadUrl, e).then(res => {
-                    
-                    if(fileListHj[keys]){
-                        fileListHj[keys].push(res.data)
-                    }else{
-                        fileListHj[keys]=[]
-                        fileListHj[keys].push(res.data)
-                    }
-                    
-                    setFileHj({ ...fileListHj })
-                    setLoading(false);
-
-                })
-            }
-        }
-    };
-    function checkMediaType(url) {
-        // 创建URL对象
-        var link = url;
-        // 获取路径的最后一个点之后的内容作为文件扩展名
-        var extension = link?.split('.').pop().toLowerCase();
-
-        // 声明支持的图片和视频文件扩展名
-        var imageExtensions = ['jpg', 'jpeg', 'gif', 'png'];
-        var file = ['pdf', 'word', 'xslx', 'xsl', 'txt', "pptx"];
-        // 
-        // 判断文件扩展名是否在图片扩展名数组中
-        if (imageExtensions.includes(extension)) {
-            return 'image';
-        }
-
-        // 判断文件扩展名是否在视频扩展名数组中
-        if (file.includes(extension)) {
-            return extension;
-        }
-
-        // 扩展名不在图片或视频数组中，返回null表示无法确定媒体类型
-        return null;
-    }
-    const preView = (item) => {
-        if (checkMediaType(item.fileName) == 'pdf') {
-            // window.open(baseUrl + item.previewUrl)
-            setUrl(item.fileId)
-            setIsModal(true)
-        }
-
-    }
-    /**
-* @description 文件下载
-* @param {String} params 文件fileId
-*/
-    const download = (id, name) => {
-        httpgetExport(downloadUrl+id).then(res => {
-            exportFile(name,res.data)
-        })
-    }
-    const onFinish = () => {
-
-    }
-    useEffect(() => {
-        
-        setFileHj(formJsonData)
-        form.setFieldsValue(formJsonData)
-    }, [])
-    return (
-        <Form form={form} onFinish={onFinish} >
-            <Row>
-                <Col span={2}>
-                    <div style={{ display: 'flex', alignItems: 'center' }}>
-                        <div style={{ width: 3, height: 12, background: '#259def', marginRight: 5 }}></div>
-                        案卷存档</div>
-                </Col>
-                <Col span={10}>
-                    <Form.Item
-                        label='保管人员'
-                        name='custodian'
-                    >
-                        <Input disabled={type == 'view'}/>
-                    </Form.Item>
-                </Col>
-                <Col span={10}>
-                    <Form.Item
-                        label='保管地点'
-                        name='storageLocation'
-                    >
-                        <Input disabled={type == 'view'}/>
-                    </Form.Item>
-                </Col>
-            </Row>
-            {list.map(item1 => (
-                <Row>
-                    <Col span={2}>
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                            <div style={{ width: 3, height: 12, background: '#259def', marginRight: 5 }}></div>
-                            {item1.type}</div>
-                    </Col>
-                    <Col span={22}>
-                        <Form.Item
-                            label='附件'
-                            name='files'
-                        >
-                            {type !== 'view' &&<Dragger {...props(item1.key)} disabled={type == 'view'}>
-                                <p className="ant-upload-drag-icon">
-                                    <InboxOutlined />
-                                </p>
-                                <p className="ant-upload-text">点击或将文件拖拽到这里上传 支持扩展名：jpeg、png</p>
-                            </Dragger>}
-                            <div className='flex'>
-                                {fileListHj?.[item1.key]?.map((item) => {
-                                    return <div className='flex align-center file-item' style={{marginTop:5,marginRight:'3%',width:'30%', minHeight: "50px", fontSize: 14, columnGap: 10, cursor: checkMediaType(item.fileName) == 'image' || checkMediaType(item.fileName) == 'pdf' ? 'pointer' : "not-allowed" }}>
-                                        <div style={{ width: 40, height: 40, display: "flex", alignItems: 'center' }}>
-                                            {checkMediaType(item.fileName) == 'image' && <Image
-                                                height={40}
-                                                src={baseUrl + item.filePath}
-                                            />}
-                                            {
-                                                checkMediaType(item.fileName) !== 'image' &&
-                                                <span  >{checkMediaType(item.fileName)?.toUpperCase()}</span>
-                                            }
-                                        </div>
-
-                                        <span onClick={() => preView(item)}>{item.fileName}</span>
-                                        {type !== 'view' && <DeleteOutlined onClick={() => deleteFile(item.fileId,item1.key)} />}
-                                        <VerticalAlignBottomOutlined onClick={() => download(item.fileId, item.fileName)} />
-                                    </div>
-                                })}
-                            </div>
-                        </Form.Item>
-                    </Col>
-                </Row>))}
-            <div className="flex flex-end" style={{ marginTop: 10, justifyContent: "flex-end" }}>
-                <Button type="" style={{ marginRight: 10 }} onClick={cancel}>取消</Button>
-                <Button type="primary" onClick={getInfo} loading={loading}>确定</Button>
-            </div>
-            <PdfView url={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/rescue/goods/file/download/${url}`)}`} isModal={isModal} setModalN={(e)=>setIsModal(e)}/>
-        </Form >
-
-    )
-}
-
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajdj/config.js b/src/views/sz/szzf/ajdj/config.js
deleted file mode 100644
index a0c6a58..0000000
--- a/src/views/sz/szzf/ajdj/config.js
+++ /dev/null
@@ -1,366 +0,0 @@
-
-const treeData = [
-    {
-      value: '行政处理',
-      title: '行政处理',
-      children: [
-        {
-          value: '责令停止违法行为',
-          title: '责令停止违法行为',
-        },
-        {
-          value: '责令补办许可手续',
-          title: '责令补办许可手续',
-        },
-        {
-            value: '责令限期拆除',
-            title: '责令限期拆除',
-          },
-          {
-            value: '责令采取补救措施',
-            title: '责令采取补救措施',
-          },
-          {
-            value: '责令停止施工',
-            title: '责令停止施工',
-          },
-          {
-            value: '责令赔偿损失',
-            title: '责令赔偿损失',
-          },
-      ],
-    },
-    {
-        value: '行政处罚',
-        title: '行政处罚',
-        children: [
-          {
-            value: '警告',
-            title: '警告',
-          },
-          {
-            value: '罚款',
-            title: '罚款',
-          },
-          {
-            value: '没收违法所得、非法财产',
-            title: '没收违法所得、非法财产',
-          },
-          {
-            value: '责令停产停业',
-            title: '责令停产停业',
-          },
-          {
-            value: '暂扣许可证、执照',
-            title: '暂扣许可证、执照',
-          },
-          {
-            value: '吊销许可证、执照',
-            title: '吊销许可证、执照',
-          },
-
-        ],
-      },
-      {
-        value: '行政强制措施',
-        title: '行政强制措施',
-        children: [
-          {
-            value: '查封或扣押设施',
-            title: '查封或扣押设施',
-          },
-          {
-            value: '查封或扣罚财务',
-            title: '查封或扣罚财务',
-          },
-          {
-            value: '其他',
-            title: '其他',
-          },
-        ],
-      },
-  ];
-const basicData = [
-    {
-        label: '填报人',
-        key: 'createName',
-        type: 'input',
-        span: 12,
-        disabled: true
-
-    },
-    {
-        label: '填报时间',
-        key: 'createTime',
-        type: 'input',
-        span: 12,
-        // required: true
-        disabled: true
-    },
-    {
-        label: '案件编号',
-        key: 'caseId',
-        type: 'input',
-        span: 12
-    },
-    {
-        label: '案件名称',
-        key: 'caseName',
-        type: 'input',
-        span: 12,
-        required: true
-    },
-    {
-        label: '案件类型',
-        key: 'caseType',
-        type: 'Select',
-        options: [
-            { value: 0, label: '违建' },
-            { value: 1, label: '毁林垦荒' },
-            { value: 2, label: '筑坝拦汊' },
-            { value: 3, label: '填占库容' },
-            { value: 4, label: '违法取水' },
-            { value: 5, label: '其他' }
-        ],
-        span: 12,
-        required: true
-    },
-    {
-        label: '发现时间',
-        key: 'caseDate',
-        type: 'DatePicker',
-        span: 12,
-        required: true
-    },
-    {
-        label: '案发地点',
-        key: 'caseAddress',
-        type: 'input',
-        span: 12,
-        required: true,
-        addonAfter:'选择地点'
-    },
-    {
-        label: '案件来源',
-        key: 'caseSource',
-        type: 'Select',
-        span: 12,
-        required: true,
-        options: [
-            { label: '巡查上报', value: 0 },
-            { label: '自主发现', value: 1 },
-            { label: '公共举报', value: 2 },
-            { label: '电话举报', value: 3 },
-            { label: '其他', value: 4 },
-
-        ]
-    },
-    {
-        label: '违法时间',
-        key: 'illegalDate',
-        type: 'DatePicker',
-        span: 12
-    },
-    {
-        label: '当事人类型',
-        key: 'partyType',
-        type: 'Radio',
-        required: true,
-        options: [
-            { label: '自然人', value: 0 },
-            { label: '法人或其他组织', value: 1 },
-            { label: '待定', value: 2 },
-        ],
-        span: 24
-    },
-    {
-        label: '姓名',
-        key: 'partyName',
-        type: 'input',
-        span: 12
-    },
-    {
-        label: '身份证号',
-        key: 'idNumber',
-        type: 'input',
-        span: 12
-    },
-    {
-        label: '住址',
-        key: 'partyAddr',
-        type: 'input',
-        span: 12
-    },
-    {
-        label: '联系方式',
-        key: 'name',
-        type: 'input',
-        span: 12
-    },
-    {
-        label: '简要案情',
-        key: 'intro',
-        type: 'TextArea',
-        span: 24
-    },
-    {
-        label: '附件',
-        key: 'files1',
-        type: 'upload',
-        span: 24
-    },
-]
-
-const clqkData = [
-    {
-        label: '处理程序',
-        key: 'processor',
-        type: 'Select',
-        options: [
-            { label: '简易程序', value: 0 },
-            { label: '一般程序', value: 1 },
-        ],
-        span: 12,
-    },
-    {
-        label: '处理依据',
-        key: 'treatmentBasis',
-        type: 'TreeSelect',
-        span: 12,
-        treeData:[],
-        fieldNames:{label: 'legalName', value: 'legalName', children: 'children'}
-    },
-    {
-        label: '处理措施',
-        key: 'treatmentMeasure',
-        type: 'TreeSelect',
-        span: 12,
-        treeData:treeData
-    },
-    {
-        label: '移送处理情况',
-        key: 'transfer',
-        type: 'Radio',
-        span: 24,
-        options: [
-            { label: '移送单位', value: '1' },
-            { label: '不移送', value: '0' },
-        ],
-    },
-    {
-        label: '案件执行情况',
-        key: 'caseImplementation',
-        type: 'Radio',
-        options: [
-            { label: '当事人自动履行', value: 0 },
-            { label: '行政强制执行', value: 1 },
-        ],
-        span: 24
-    },
-    {
-        label: '自动履行情况',
-        key: 'performance',
-        type: 'TextArea',
-        span: 24
-    },
-    {
-        label: '伤亡人数(人)',
-        key: 'casualties',
-        type: 'input',
-        span: 12
-    },
-    {
-        label: '直接损失金额(万元)',
-        key: 'directLossAmount',
-        labelCol:{span:7},
-        type: 'input',
-        span: 12
-    },
-    {
-        label: '结案情况',
-        key: 'closeStatus',
-        type: 'Select',
-        options: [
-            { label: '正常结案', value: 0 },
-            { label: '其他方式结案', value: 1 },
-            { label: '未结案', value: 2 },
-        ],
-        span: 12
-    },
-    {
-        label: '结案时间',
-        key: 'closeDate',
-        type: 'DatePicker',
-        span: 12
-    },
-    {
-        label: '文件编号及名称',
-        key: 'docNumName',
-        type: 'input',
-        span: 24
-    },
-    {
-        label: '督办单位类型',
-        key: 'unitType',
-        type: 'Select',
-        options: [
-            { label: '上级督办', value: 0 },
-            { label: '本级河长督办', value: 1 },
-        ],
-        span: 12
-    },
-    {
-        label: '督办单位名称',
-        key: 'unitName',
-        type: 'input',
-        span: 24
-    },
-    {
-        label: '附件',
-        key: 'files2',
-        type: 'upload',
-        span: 24
-    },
-]
-
-const xzfy = [
-    {
-        label: '行政复议情况',
-        key: 'administrativeReconsideration',
-        type: 'Select',
-        span: 12,
-        options: [
-            {
-                label: '维护', value: 0
-            },
-            { label: '变更', value: 1 },
-            { label: '撤销', value: 2 },
-            { label: '和解', value: 3 },
-            { label: '调解', value: 4 },
-
-        ],
-        disabled: true
-    },
-    {
-        label: '行政应诉情况',
-        key: 'administrativeResponse',
-        type: 'Select',
-        span: 12,
-        disabled: true,
-        options: [
-            {
-                label: '驳回原告诉讼', value: 0
-            },
-            { label: '变更', value: 2 },
-            { label: '撤销', value: 1 },
-            { label: '确认违法', value: 3 },
-            { label: '确认无效', value: 4 },
-            { label: '其他', value: 5 },
-        ],
-    },
-]
-export {
-    basicData,
-    clqkData,
-    xzfy
-}
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js
deleted file mode 100644
index f046b57..0000000
--- a/src/views/sz/szzf/ajdj/editTabs.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { message, Tabs } from 'antd';
-import BascForm from '../form/index'
-import { basicData, clqkData, xzfy } from './config'
-import Bajz from './bajz'
-import Lsyx from './lsyx'
-import { httpget, httppost } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import dayjs from 'dayjs'
-const items = [
-    {
-        key: '1',
-        label: '基本情况',
-    },
-    {
-        key: '2',
-        label: '处理情况',
-    },
-    {
-        key: '3',
-        label: '行政复议、行政应诉情况',
-    },
-    {
-        key: '4',
-        label: '办案宗卷',
-    },
-    {
-        key: '5',
-        label: '历史影像及图片',
-    },
-];
-
-
-const Page = ({ mode, onCrudSuccess,record,submit }) => {
-    const [formData,setFormData] =useState({})
-    const [clqkDataConfig,setConfig] =useState([])
-    const [recordData,setRecord] =useState({})
-
-
-    // debugger;
-    const [key, setKeys] = useState('1')
-    const onChange = async(key) => {
-        console.log(key);
-        setKeys(key)
-        if(key == 2){
-            const res = await httpget(apiurl.szzf.clyj.tree)
-            const arr = clqkData.map(item=>{
-                if(item.key == 'treatmentBasis'){
-                    item.treeData = res.data
-                }
-                return item
-            })
-            setConfig(arr)
-        }
-    };
-    const getFormInfo = (e) => {
-        if(!e){
-            submit()
-            return;
-        }
-        let params = {
-            ...formData,
-            ...e,
-            caseDate: dayjs(e.caseDate).format("YYYY-MM-DD HH:mm:ss"),
-            illegalDate: e.illegalDate ? dayjs(e.illegalDate).format("YYYY-MM-DD HH:mm:ss") : null,
-            closeDate:e.closeDate ? dayjs(e.closeDate).format("YYYY-MM-DD HH:mm:ss") :null,
-        }
-        if (mode == 'save') {
-            addBasic(params)
-        } else if (mode == 'edit') {
-            editBasic(params)
-        }
-    }
-    const addBasic = (params) => {
-        httppost(apiurl.szzf.ajdj.add, params).then(res => {
-            if (res.code == 200) {
-                message.success('新增成功')
-                submit()
-            } else {
-                message.error(res.description)
-            }
-
-        })
-    }
-    const editBasic = (params) => {
-        httppost(apiurl.szzf.ajdj.edit, params).then(res => {
-            if (res.code == 200) {
-                message.success('编辑成功')
-                submit()
-            } else {
-                message.error(res.description)
-            }
-        })
-    }
-    useEffect(()=>{
-        let obj = {
-            createName: localStorage.getItem('userName'),
-            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-            createBy:localStorage.getItem('userId')
-        }
-        if(mode == 'edit' || mode =='view'){
-            httpget(apiurl.szzf.ajdj.detail + record.id).then(async res=>{
-                if(res.data?.caseDate){
-                    obj.caseDate=dayjs(res.data.caseDate)
-                }
-                if(res.data?.illegalDate){
-                    obj.illegalDate=dayjs(res.data.illegalDate)
-                }     
-                if(res.data?.closeDate){
-                    obj.closeDate=dayjs(res.data.closeDate)
-                }          
-                setFormData({...res.data,...obj})
-            })
-        }else if(mode == 'save'){
-            setFormData({...obj})
-        }
-       
-    },[])
-    return (
-        <>
-            <Tabs defaultActiveKey="1" items={items} onChange={onChange} />
-            <>
-                {key == 1 && <BascForm formJson={basicData} formJsonData={formData} fileKey='files1'type={mode} getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></BascForm>}
-                {key == 2 && <BascForm formJson={clqkDataConfig} fileKey='files2' formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></BascForm>}
-                {key == 3 && <BascForm formJson={xzfy} formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></BascForm>}
-                {key == 4 && <Bajz formJson={xzfy} formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></Bajz>}
-                {key == 5 && <Lsyx formJson={xzfy} formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></Lsyx>}
-            </>
-        </>
-    )
-}
-
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajdj/index.js b/src/views/sz/szzf/ajdj/index.js
deleted file mode 100644
index 27da4a5..0000000
--- a/src/views/sz/szzf/ajdj/index.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image } from 'antd';
-import { FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './editTabs';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-import dayjs from 'dayjs'
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const caseTypeOb = {
-    0: '违建', 1: '毁林垦荒', 2: '筑坝拦汊', 3: '填占库容', 4: '违法取水', 5: '其他'
-}
-const caseSourceOb = {
-    0: '巡查上报', 1: '自主发现', 2: '公共举报', 3: '电话举报', 4: '其他'
-}
-const Page = () => {
-    const role = useSelector(state => state.auth.role);
-    const editBtn = role?.rule?.find(item => item.menuName == "编辑");
-    const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-    const delBtn = role?.rule?.find(item => item.menuName == "删除");
-    const refModal = useRef();
-    const [searchVal, setSearchVal] = useState(false)
-    const [iframeSrc, setIframeSrc] = useState('')
-    const [pdfViewOPen, setPdfViewOPen] = useState(false)
-    const [isFetch, setIsFetch] = useState(false)
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-        { title: '填报时间', key: 'createTime', dataIndex: 'createTime', ellipsis: true,render: (value) => <span>{dayjs(value).format('YYYY-MM-DD HH:mm')}</span>, },
-        {
-            title: '案件名称', key: 'caseName', dataIndex: 'caseName', 
-        },
-        {
-            title: '案件编号', key: 'caseId', dataIndex: 'caseId', 
-
-        },
-        {
-            title: '发现时间', key: 'caseDate', dataIndex: 'caseDate', 
-            render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
-
-        },
-        {
-            title: '案件类型', key: 'caseType', dataIndex: 'caseType', 
-            render: (value) => <span>{caseTypeOb[value]}</span>,
-        },
-        {
-            title: '案件来源', key: 'caseSource', dataIndex: 'caseSource',
-            render: (value) => <span>{caseSourceOb[value]}</span>,
-        },
-        {
-            title: '操作', key: 'operation', width: 240, 
-            render: (value, row, index) => (
-                <CrudOpRender_text
-                    edit={true}
-                    del={true}
-                    view={true}
-                    command={(cmd) => () => command(cmd)(row)} />)
-        },
-    ];
-
-
-    const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-    const command = (type) => (params) => {
-        if (type === 'save') {
-            
-            refModal.current.showSave();
-        } else if (type === 'edit') {
-            let obj={}
-            if(params.caseDate){
-                obj.caseDate= dayjs(params.caseDate)
-            }
-            if(params.IllegalDate){
-                obj.IllegalDate= dayjs(params.IllegalDate)
-            }
-            refModal.current.showEdit({ ...params,...obj });
-        } else if (type === 'view') {
-            refModal.current.showView(params);
-        } else if (type === 'del') {
-            refModal.current.onDeleteGet(apiurl.szzf.ajdj.del + `/${params.id}`);
-        }
-    }
-
-
-    const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.szzf.ajdj.list).find_noCode);
-
-    /**
-      * @description 处理成功的回调
-      */
-    const successCallback = () => {
-        refresh()
-        setIsFetch(!isFetch)
-    }
-
-    const viewPdf = (params) => {
-        setIframeSrc(params)
-        setPdfViewOPen(true)
-    }
-    useEffect(() => {
-        const params = {
-            search: {
-                ...searchVal,
-            }
-        };
-        search(params)
-    }, [searchVal])
-
-
-    return (
-        <>
-            <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-                <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%", overflowY: "auto" }}>
-                    <Card className='nonebox'>
-                        <ToolBar
-                            setSearchVal={setSearchVal}
-                            onSave={command('save')}
-                            role={role}
-                        />
-                    </Card>
-                    <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-                        <Table columns={columns} rowKey="inx" {...tableProps} />
-                    </div>
-                </div>
-
-                <BasicCrudModal
-                    width={1000}
-                    ref={refModal}
-                    title=""
-                    component={ModalForm}
-                    onCrudSuccess={successCallback}
-                // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-                />
-            </div>
-
-            <Modal
-                open={pdfViewOPen}
-                width={1000}
-                title=""
-                footer={null}
-                style={{ marginTop: "-5%" }}
-                onCancel={() => {
-                    setPdfViewOPen(false)
-                }}
-            >
-                <iframe
-                    style={{
-                        height: '80vh',
-                        width: '100%',
-                        border: 0,
-                        marginTop: 20,
-                    }}
-                    src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-                />
-            </Modal>
-        </>
-    );
-}
-
-export default Page;
diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js
deleted file mode 100644
index 36577e0..0000000
--- a/src/views/sz/szzf/ajdj/lsyx.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import { Space, Table, Radio, DatePicker, Form, Select, Button, message, Upload, Input, Row, Col, Switch, Image } from 'antd';
-import { InboxOutlined, LinkOutlined, DeleteOutlined, LoadingOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons'
-import { useForm } from 'antd/lib/form/Form';
-import { useEffect, useState } from 'react';
-import {  httpgetExport, httppostAddfile } from '../../../../utils/request';
-import { exportFile } from '../../../../utils/tools';
-import PdfView from './pdfView'
-
-const { Dragger } = Upload;
-
-const list = [
-    {
-        type:'整改前',
-        key:'files8'
-    },
-    {
-        type:'整改后',
-        key:'files9'
-    },
-
-]
-const baseUrl = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
-    const [form] = Form.useForm();
-    const [fileList, setFileList] = useState([])
-    const [fileListHj, setFileHj] = useState({'files3': [],'files4': [],'files5': [],'files6': [],'files7': []})
-    const [url, setUrl] = useState('')
-    const [isModal, setIsModal] = useState(false)
-  const [loading, setLoading] = useState(false)
-
-    const getInfo = () => {
-        form.validateFields().then((values) => {
-            getFormInfo({ ...values, ...fileListHj })
-            form.resetFields()
-            setFileList([])
-        }).catch((errorInfo) => {
-            console.log(errorInfo, 'error');
-        })
-        // 
-    }
-    const cancel = () => {
-        getFormInfo(false)
-        form.resetFields()
-        setFileList([])
-
-    }
-    const deleteFile = (e,key) => {
-        fileListHj[key] = fileListHj[key].filter(item => item.fileId !== e)
-        setFileHj({ ...fileListHj })
-    }
-    const props = (keys) => {
-        return {
-            name: 'file',
-            multiple: true,
-            fileList: fileList,
-            showUploadList: false,
-            beforeUpload: (file, fileList) => {
-                // if (fileType == "pic" &&
-                //     (file.type != "image/jpeg" || file.type != "image/png" || file.type != "image/jpg")) {
-                //     message.error('仅支持上传jpg/png/jpeg格式的图片');
-                //     return false;
-                // } else {
-                //     return true;
-                // }
-            },
-            customRequest(e) {
-                setLoading(true);
-
-                httppostAddfile(uploadUrl, e).then(res => {
-                    if(fileListHj[keys]){
-                        fileListHj[keys].push(res.data)
-                    }else{
-                        fileListHj[keys]=[]
-                        fileListHj[keys].push(res.data)
-                    }
-                    
-                    setFileHj({ ...fileListHj })
-                    setLoading(false);
-                })
-            }
-        }
-    };
-    function checkMediaType(url) {
-        // 创建URL对象
-        var link = url;
-        // 获取路径的最后一个点之后的内容作为文件扩展名
-        var extension = link?.split('.').pop().toLowerCase();
-
-        // 声明支持的图片和视频文件扩展名
-        var imageExtensions = ['jpg', 'jpeg', 'gif', 'png'];
-        var file = ['pdf', 'word', 'xslx', 'xsl', 'txt', "pptx"];
-        // 
-        // 判断文件扩展名是否在图片扩展名数组中
-        if (imageExtensions.includes(extension)) {
-            return 'image';
-        }
-
-        // 判断文件扩展名是否在视频扩展名数组中
-        if (file.includes(extension)) {
-            return extension;
-        }
-
-        // 扩展名不在图片或视频数组中，返回null表示无法确定媒体类型
-        return null;
-    }
-    const preView = (item) => {
-        if (checkMediaType(item.fileName) == 'pdf') {
-            // window.open(baseUrl + item.previewUrl)
-            setUrl(item.fileId)
-            setIsModal(true)
-        }
-
-    }
-    /**
-* @description 文件下载
-* @param {String} params 文件fileId
-*/
-    const download = (id, name) => {
-        httpgetExport(downloadUrl+id).then(res => {
-            exportFile(name,res.data)
-        })
-    }
-    const onFinish = () => {
-
-    }
-    useEffect(() => {
-        setFileHj(formJsonData)
-    }, [])
-    return (
-        <Form form={form} onFinish={onFinish} >
-            {list.map(item1 => (
-                <Row>
-                    <Col span={2}>
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                            <div style={{ width: 3, height: 12, background: '#259def', marginRight: 5 }}></div>
-                            {item1.type}</div>
-                    </Col>
-                    <Col span={22}>
-                        <Form.Item
-                            label='附件'
-                            name='files'
-                        >
-                            {type !== 'view'&&<Dragger {...props(item1.key)}>
-                                <p className="ant-upload-drag-icon">
-                                    <InboxOutlined />
-                                </p>
-                                <p className="ant-upload-text">点击或将文件拖拽到这里上传 支持扩展名：jpeg、png</p>
-                            </Dragger>}
-                            <div className='flex'>
-                                {fileListHj?.[item1.key]?.map((item) => {
-                                    return <div className='flex align-center file-item' style={{marginTop:5,marginRight:'3%',width:'30%', minHeight: "50px", fontSize: 14, columnGap: 10, cursor: checkMediaType(item.fileName) == 'image' || checkMediaType(item.fileName) == 'pdf' ? 'pointer' : "not-allowed" }}>
-                                        <div style={{ width: 40, height: 40, display: "flex", alignItems: 'center' }}>
-                                            {checkMediaType(item.fileName) == 'image' && <Image
-                                                height={40}
-                                                src={baseUrl + item.filePath}
-                                            />}
-                                            {
-                                                checkMediaType(item.fileName) !== 'image' &&
-                                                <span  >{checkMediaType(item.fileName)?.toUpperCase()}</span>
-                                            }
-                                        </div>
-
-                                        <span onClick={() => preView(item)}>{item.fileName}</span>
-                                        {type !== 'view' && <DeleteOutlined onClick={() => deleteFile(item.fileId,item1.key)} />}
-                                        <VerticalAlignBottomOutlined onClick={() => download(item.fileId, item.fileName)} />
-                                    </div>
-                                })}
-                            </div>
-                        </Form.Item>
-                    </Col>
-                </Row>))}
-            <div className="flex flex-end" style={{ marginTop: 10, justifyContent: "flex-end" }}>
-                <Button type="" style={{ marginRight: 10 }} onClick={cancel}>取消</Button>
-                <Button type="primary" onClick={getInfo} loading={loading}>确定</Button>
-            </div>
-            <PdfView url={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/rescue/goods/file/download/${url}`)}`} isModal={isModal} setModalN={(e)=>setIsModal(e)}/>
-        </Form >
-
-    )
-}
-
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajdj/pdfView.js b/src/views/sz/szzf/ajdj/pdfView.js
deleted file mode 100644
index fa913aa..0000000
--- a/src/views/sz/szzf/ajdj/pdfView.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { Component, useEffect, useState } from 'react';
-import { Document, Page, pdfjs } from 'react-pdf';
-import { Modal } from 'antd';
-
-const Pdf = ({ url,isModal,setModalN }) => {
-  const [isModalOpen, setIsModalOpen] = useState(false);
-
-  const handleOk = () => {
-    setIsModalOpen(false);
-    setModalN(false)
-  };
-
-  const handleCancel = () => {
-    setIsModalOpen(false);
-    setModalN(false)
-  };
-  useEffect(()=>{
-    setIsModalOpen(isModal)
-  },[isModal])
-  return (
-    <div>
-      <Modal
-        title={<div style={{ backgroundColor: '#259dff', padding: 10, color: "#fff" }}>pdf</div>}
-        open={isModalOpen}
-        width={1000}
-        onOk={handleOk}
-        footer={false}
-        onCancel={handleCancel}
-        style={{ marginTop: "-5%" }}
-        destroyOnClose>
-        <div style={{ padding: "0 10px" }}>
-          <iframe
-            style={{
-              height: '80vh',
-              width: '100%',
-              border: 0,
-              marginTop: 20,
-            }}
-            src={url}
-          />
-        </div>
-
-      </Modal>
-    </div>
-  );
-}
-export default Pdf
diff --git a/src/views/sz/szzf/ajdj/toolbar.js b/src/views/sz/szzf/ajdj/toolbar.js
deleted file mode 100644
index 429e865..0000000
--- a/src/views/sz/szzf/ajdj/toolbar.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker, Select } from 'antd';
-import { DownOutlined, UpOutlined } from '@ant-design/icons'
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  const [form] = Form.useForm();
-  const [showGj, setShowGj] = useState(false)
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({ ...values, dateSo });
-  }
-
-  const opntios = [
-    { label: '宪法', value: '宪法' },
-    { label: '法律', value: '法律' },
-    { label: '行政法规', value: '行政法规' },
-    { label: '督察法规', value: '督察法规' },
-    { label: '司法解释', value: '司法解释' },
-    { label: '地方性法规', value: '地方性法规' },
-  ]
-
-  const caseTypeOption = [
-    { label: '违建', value: 0 },
-    { label: '毁林垦荒', value: 1 },
-    { label: '筑坝拦汊', value: 2 },
-    { label: '填占库容', value: 3 },
-    { label: '违法取水', value: 4 },
-    { label: '其他', value: 5 },
-  ]
-  const styles = {
-    fontFamily: '微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑, sans-serif',
-    fontWeight: '700',
-    fontStyle: 'normal',
-    fontSize: '16px'
-  }
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <div style={{ display: 'flex' }}>
-            <Form.Item label="案件类型" name="caseType">
-              <Select allowClear style={{ width: '150px' }} options={caseTypeOption} />
-            </Form.Item>
-            <Form.Item label="时间" name="createTime">
-              <RangePicker allowClear />
-            </Form.Item>
-            <Form.Item label="案件名称" name="caseName">
-              <Input allowClear style={{ width: '150px' }} />
-            </Form.Item>
-            <Form.Item label="案件编号" name="caseId">
-              <Input allowClear style={{ width: '150px' }} />
-            </Form.Item>
-            <Form.Item>
-              <Button type="primary" htmlType="submit">查询</Button>
-            </Form.Item>
-            <Form.Item>
-              <Button onClick={() => form.resetFields()}>重置</Button>
-            </Form.Item>
-            {
-              (onSave) ?
-                <Form.Item>
-                  <Button onClick={onSave}>新增</Button>
-                </Form.Item>
-                : null
-            }
-            {/* <Form.Item>
-            <div style={styles} onClick={()=>setShowGj(!showGj)}>高级搜索 {!showGj&&<DownOutlined />} {showGj&&<UpOutlined />}</div>
-          </Form.Item>
-          </div>
-          {showGj&&<div style={{display:'flex'}}>
-          <Form.Item label="时效性" name="name">
-            <Select allowClear  style={{width:'150px'}} options={opntios}/>
-          </Form.Item>
-          <Form.Item label="公布日期" name="name">
-            <RangePicker allowClear />
-          </Form.Item>
-          <Form.Item label="施行日期" name="name">
-            <RangePicker allowClear />
-          </Form.Item>
-          <Form.Item label="上传时间" name="name">
-            <RangePicker allowClear />
-          </Form.Item>*/}
-          </div>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajtj/barCharts.js b/src/views/sz/szzf/ajtj/barCharts.js
deleted file mode 100644
index d61cf91..0000000
--- a/src/views/sz/szzf/ajtj/barCharts.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import dayjs from 'dayjs';
-import { Space, Table, Tag, DatePicker, Form, Select, Button, Card } from 'antd';
-import ReactECharts from 'echarts-for-react';
-import { useEffect, useState, useMemo } from 'react';
-import { httppost } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-
-let obj= {  0:'当事人自动履行',1: '行政强制执行'}
-const Page = ({ title = '标题' }) => {
-    const [echart2, setEchart2] = useState(Object())
-    const [inspectordata, setInspectorData] = useState([{}])
-    const [plandata, setPlanData] = useState(Object())
-    const [problemdata, setProblemData] = useState(Object())
-    const [sumTotal, setSum] = useState(0)
-
-    const getPlanOption = useMemo((name, data) => {
-        // let total = 0
-        // for (let i = 0; i < data.length; i++) {
-        //     total = total + Number(data[i].value)
-        // }
-        return {
-            title: {},
-            tooltip: {},
-            legend: {
-                data: Object.values(obj)
-            },
-            graphic: {
-                type: 'text',
-                top: 'center',
-                left: 'center',
-                style: {
-                    text: `总计\n${sumTotal}`,
-                    fontSize: 20,
-                    fontWeight: 'bold',
-                    textAlign: 'center'
-                }
-            },
-            series: {
-                name: '执行情况',
-                type: 'pie',
-                // center: ['50%', '50%'],
-                // radius: ['35%', '50%'],
-                // hoverAnimation: true,
-                data: plandata,
-                label: {
-                    show:false,
-                },
-                labelLine: {
-                    show: false
-                },
-                itemStyle:{
-                    color: function (colors) {
-                        var colorList = [
-                                   '#5b8ff9',
-                                   '#5ad8a6',
-                                   '#5d7092',
-                                   '#f6bd16',
-                                   '#6f5ef9',
-                                 ];
-                        return colorList[colors.dataIndex];
-                      }
-                }
-            }
-
-
-        }
-    }, [plandata])
-    console.log(getPlanOption);
-
-    const onOk = (event, index) => {
-        if (event !== null) {
-            let params = {
-                stm: dayjs(new Date(event[0])).format('YYYY-MM-DD HH:mm:ss'),
-                etm: dayjs(new Date(event[1])).format('YYYY-MM-DD HH:mm:ss'),
-            }
-            // getStm(params, index)
-            getInfo(params)
-        }
-    }
-    const getInfo=(params)=>{
-        let obj1=[]
-        let sum=0
-        httppost(apiurl.szzf.ajtj.info+2,params).then(res=>{
-            res.data.map(item=>{
-                obj1.push({value:item.count,name:obj[item.type]})
-                sum=sum+item.count
-            })
-            // debugger;
-            setPlanData(obj1)
-            setSum(sum)
-
-        })
-    }
-    useEffect(() => {
-        let params = {
-            stm: dayjs().startOf("year").format('YYYY-MM-DD HH:mm:ss'),
-            etm: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        }
-        getInfo(params)
-        
-    },[])
-    return (
-        <>
-            <div className='top' style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
-                <div style={{ fontSize: 20, fontWeight: 'bold', display: 'flex', alignItems: 'center' }}>
-                    <div style={{ width: 5, height: 25, backgroundColor: '#259def', marginRight: 10 }}></div>
-                    执行情况
-                </div>
-                <DatePicker.RangePicker
-                    style={{ width: 220, }}
-                    onChange={(e, index) => onOk(e, 2)}
-                    defaultValue={[dayjs().startOf("year"), dayjs()]}
-                ></DatePicker.RangePicker>
-            </div>
-            <ReactECharts
-                ref={(e) => setEchart2(e)}
-                option={getPlanOption}
-                style={{ height: 350 }}
-            />
-        </>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajtj/bincharts.js b/src/views/sz/szzf/ajtj/bincharts.js
deleted file mode 100644
index 96a30dc..0000000
--- a/src/views/sz/szzf/ajtj/bincharts.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import { Space, Table, Tag, DatePicker, Form, Select, Button, Card } from 'antd';
-import ReactECharts from 'echarts-for-react';
-import { useEffect, useState, useMemo } from 'react';
-import { httpget, httppost } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-import dayjs from 'dayjs';
-import advancedFormat from 'dayjs/plugin/advancedFormat'
-import customParseFormat from 'dayjs/plugin/customParseFormat'
-import localeData from 'dayjs/plugin/localeData'
-import weekday from 'dayjs/plugin/weekday'
-import weekOfYear from 'dayjs/plugin/weekOfYear'
-import weekYear from 'dayjs/plugin/weekYear'
-
-dayjs.extend(customParseFormat)
-dayjs.extend(advancedFormat)
-dayjs.extend(weekday)
-dayjs.extend(localeData)
-dayjs.extend(weekOfYear)
-dayjs.extend(weekYear)
-
-let obj={0:'巡查上报',1:'自主发现',2:'公共举报',3:'电话举报',4:'其他'}
-const Page = ({ title = '标题' }) => {
-    const [echart2, setEchart2] = useState(Object())
-    const [inspectordata, setInspectorData] = useState([{}])
-    const [plandata, setPlanData] = useState(Object())
-    const [problemdata, setProblemData] = useState(Object())
-    const [sumTotal, setSum] = useState(0)
-
-    const getPlanOption = useMemo((name, data) => {
-        // let total = 0
-        // for (let i = 0; i < data.length; i++) {
-        //     total = total + Number(data[i].value)
-        // }
-        return {
-            title: {},
-            tooltip: {},
-            legend: {
-                data:Object.values(obj)
-            },
-            graphic: {
-                type: 'text',
-                top: 'center',
-                left: 'center',
-                style: {
-                    text: `总计\n${sumTotal}`,
-                    fontSize: 20,
-                    fontWeight: 'bold',
-                    textAlign: 'center'
-                }
-            },
-            series: {
-                name: '案件来源',
-                type: 'pie',
-                center: ['50%', '50%'],
-                radius: ['60%', '80%'],
-                // hoverAnimation: true,
-                data: plandata,
-                label: {
-                    show:false,
-                },
-                labelLine: {
-                    show: false
-                },
-                itemStyle:{
-                    color: function (colors) {
-                        var colorList = [
-                                   '#5b8ff9',
-                                   '#5ad8a6',
-                                   '#5d7092',
-                                   '#f6bd16',
-                                   '#6f5ef9',
-                                 ];
-                        return colorList[colors.dataIndex];
-                      }
-                }
-            }
-
-
-        }
-    }, [plandata])
-    console.log(getPlanOption);
-
-    const onOk = (event, index) => {
-        if (event !== null) {
-            let params = {
-                stm: dayjs(new Date(event[0])).format('YYYY-MM-DD HH:mm:ss'),
-                etm: dayjs(new Date(event[1])).format('YYYY-MM-DD HH:mm:ss'),
-            }
-            // getStm(params, index)
-            getInfo(params)
-        }
-    }
-    const getInfo=(params)=>{
-        let obj1=[]
-        let sum=0
-        httppost(apiurl.szzf.ajtj.info+0,params).then(res=>{
-            res.data.map(item=>{
-                obj1.push({value:item.count,name:obj[item.type]})
-                sum=sum+item.count
-            })
-            // debugger;
-            setPlanData(obj1)
-            setSum(sum)
-
-        })
-    }
-    useEffect(() => {
-        let params = {
-            stm: dayjs().startOf("year").format('YYYY-MM-DD HH:mm:ss'),
-            etm: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        }
-        getInfo(params)
-        
-    },[])
-    return (
-        <>
-            <div className='top' style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
-                <div style={{ fontSize: 20, fontWeight: 'bold', display: 'flex', alignItems: 'center' }}>
-                    <div style={{ width: 5, height: 25, backgroundColor: '#259def', marginRight: 10 }}></div>
-                    案件来源
-                </div>
-                <DatePicker.RangePicker
-                    style={{ width: 220, }}
-                    onChange={(e, index) => onOk(e, 2)}
-                    defaultValue={[dayjs().startOf("year"), dayjs()]}
-                ></DatePicker.RangePicker>
-            </div>
-            <ReactECharts
-                ref={(e) => setEchart2(e)}
-                option={getPlanOption}
-                style={{ height: 350 }}
-            />
-        </>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajtj/index.js b/src/views/sz/szzf/ajtj/index.js
deleted file mode 100644
index 21ff6a8..0000000
--- a/src/views/sz/szzf/ajtj/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Charts from './bincharts'
-import BarCharts from './barCharts'
-import LineCharts from './lincharts'
-import LdCharts from './ldCharts'
-
-
-const Page = () => {
-
-    return (
-        <>
-            <div style={{ display: 'flex',height:'50%'}}>
-                <div style={{width:'33%',backgroundColor:'#ffffff',margin:5,padding:10}}>
-                    <Charts />
-                </div>
-                <div style={{width:'33%',backgroundColor:'#ffffff',margin:5,padding:10}}>
-                    <LdCharts />
-                </div>
-                <div style={{width:'33%',backgroundColor:'#ffffff',margin:5,padding:10}}>
-                    <BarCharts />
-                </div>
-
-            </div>
-            <div style={{backgroundColor:'#ffffff',padding:10,height:'50%'}}>
-                <LineCharts />
-            </div>
-
-        </>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajtj/ldCharts.js b/src/views/sz/szzf/ajtj/ldCharts.js
deleted file mode 100644
index ba5e8ad..0000000
--- a/src/views/sz/szzf/ajtj/ldCharts.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import dayjs from 'dayjs';
-import { Space, Table, Tag, DatePicker, Form, Select, Button, Card } from 'antd';
-import ReactECharts from 'echarts-for-react';
-import { useEffect, useState, useMemo } from 'react';
-import { httppost } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-
-let obj =
-{
-    0: '违建',
-    1: '毁林垦荒',
-    2: '筑坝拦汊',
-    3: '填占库容',
-    4: '违法取水',
-    5: '其他'
-}
-
-const Page = ({ title = '标题' }) => {
-    const [echart2, setEchart2] = useState(Object())
-    const [inspectordata, setInspectorData] = useState([{}])
-    const [plandata, setPlanData] = useState([])
-    const [problemdata, setProblemData] = useState(Object())
-    const [MaxMin, setMaxMin] = useState({max:0,min:0})
-
-    const getPlanOption = useMemo((name, data) => {
-        return {
-            legend: {
-                show: true,
-                data: plandata?.map(item=>item.name),
-                type: 'scroll'
-            },
-            tooltip: {},
-            polar: {
-                // radius: [0, '80%']
-            },
-            angleAxis: {
-                type: 'category',
-                data: plandata?.map(item=>item.name),
-
-            },
-            radiusAxis: {
-                min:MaxMin.min-1,
-                max:MaxMin.max,
-                interval: 1,
-                // // 刻度
-                axisTick:{
-                  show:false
-                },
-                // //刻度数值
-                axisLabel:{
-                  show:false
-                },
-                // // 线
-                // axisLine:{
-                //   show:false
-                // },
-            },
-            series: [
-                {
-                    name: '案件类型',
-                    stack: 'a',
-                    type: 'pie',
-                    radius: [0, 140],
-                    center: ['50%', '50%'],
-                    roseType: 'area',
-                    stillShowZeroSum:false,
-                    label: {
-                        show:false,
-                    },
-                    labelLine: {
-                        show: true
-                    },
-                    itemStyle: {
-                        normal: {
-                            color: function (colors) {
-                                var colorList = [
-                                    '#5b8ff9',
-                                    '#5ad8a6',
-                                    '#5d7092',
-                                    '#f6bd16',
-                                    '#6f5ef9',
-                                ];
-                                return colorList[colors.dataIndex];
-                            }
-                        },
-                    },
-                    data: plandata
-                }
-            ]
-        }
-    }, [plandata])
-    const onOk = (event, index) => {
-        if (event !== null) {
-            let params = {
-                stm: dayjs(new Date(event[0])).format('YYYY-MM-DD HH:mm:ss'),
-                etm: dayjs(new Date(event[1])).format('YYYY-MM-DD HH:mm:ss'),
-            }
-            // getStm(params, index)
-            getInfo(params)
-        }
-    }
-    const getInfo = (params) => {
-        let sum = 0
-        httppost(apiurl.szzf.ajtj.info + 1, params).then(res => {
-                const arr = Object.values(obj).map(item1=>{
-                    let obj1=res.data.find(item => obj[item.type] == item1)
-                    if(obj1?.count){
-                        sum =sum+1
-                        return { value: obj1?.count, name: item1 }
-                    }else{
-                        return { value: 0, name: item1 }
-                    }
-            })
-            if(sum == 0){
-                setPlanData([])
-            }else{
-                setPlanData(arr)
-                setMaxMin({max:Math.max.apply(Math,res.data.map(item => { return item.count })),min:Math.min.apply(Math,res.data.map(item => { return item.count }))})  
-                console.log({max:Math.max.apply(Math,res.data.map(item => { return item.count })),min:Math.min.apply(Math,res.data.map(item => { return item.count }))});
-                              
-            }
-        })
-    }
-    useEffect(() => {
-        let params = {
-            stm: dayjs().startOf("year").format('YYYY-MM-DD HH:mm:ss'),
-            etm: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        }
-        getInfo(params)
-
-    }, [])
-    return (
-        <>
-            <div className='top' style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
-                <div style={{ fontSize: 20, fontWeight: 'bold', display: 'flex', alignItems: 'center' }}>
-                    <div style={{ width: 5, height: 25, backgroundColor: '#259def', marginRight: 10 }}></div>
-                    案件类型
-                </div>
-                <DatePicker.RangePicker
-                    style={{ width: 220, }}
-                    onChange={(e, index) => onOk(e, 2)}
-                    defaultValue={[dayjs().startOf("year"), dayjs()]}
-                ></DatePicker.RangePicker>
-            </div>
-            <ReactECharts
-                ref={(e) => setEchart2(e)}
-                option={getPlanOption}
-                style={{ height: 350 }}
-            />
-        </>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/ajtj/lincharts.js b/src/views/sz/szzf/ajtj/lincharts.js
deleted file mode 100644
index 5e4e109..0000000
--- a/src/views/sz/szzf/ajtj/lincharts.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import dayjs from 'dayjs';
-import { Space, Table, Tag, DatePicker, Form, Select, Button, Card } from 'antd';
-import ReactECharts from 'echarts-for-react';
-import { useEffect, useState, useMemo } from 'react';
-import { encode } from 'punycode';
-import { httpget } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-
-const Page = ({ title = '标题' }) => {
-    const [echart2, setEchart2] = useState(Object())
-    const [inspectordata, setInspectorData] = useState([{}])
-    const [plandata, setPlanData] = useState([])
-    const [problemdata, setProblemData] = useState(Object())
-    const getPlanOption = useMemo((name, data) => {
-        return {
-            tooltip: {
-                trigger: 'axis',
-                position: ['20%', '50%'],
-                formatter:function(value){
-                    console.log(value);
-                    
-                    return `<div>${value[0].value.month+"月份"}</div><div>数量：${value[0].value.count}</div>`;
-                 }
-                },
-            dataset: [
-                { source: plandata },
-            ]
-            ,
-            xAxis:
-            {
-                type: 'category',
-                axisLabel: {
-                    show: true,                               
-                    textStyle: {
-                       color: '#595C61'
-                    },
-                    formatter:function(value){
-                       return value+'月';
-                    }
-               }
-            }
-            ,
-            yAxis: [
-                {
-                    type: 'value'
-                }
-            ],
-            series: [
-                {
-                    name:'数量',
-                    type: 'line',
-                    datasetIndex: 0,
-                    encode: {
-                        x: 'month',
-                        y: 'count'
-                    },
-                    itemStyle: {
-                        color: 'skyblue'
-                    }
-                },
-
-            ]
-        }
-    }, [plandata])
-
-    const onOk = (event, index) => {
-        if (event !== null) {
-            let params = dayjs(event).format('YYYY')
-            getInfo(params)
-        }
-    }
-    const getInfo = (params) => {
-        httpget(apiurl.szzf.ajtj.qs+ params).then(res => {
-            setPlanData(res.data)
-        })
-    }
-    useEffect(() => {
-        let params = dayjs().format('YYYY')
-                  
-        getInfo(params)
-    }, [])
-    return (
-        <>
-            <div className='top' style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
-                <div style={{ fontSize: 20, fontWeight: 'bold', display: 'flex', alignItems: 'center' }}>
-                    <div style={{ width: 5, height: 25, backgroundColor: '#259def', marginRight: 10 }}></div>
-                    案件趋势
-                </div>
-                <DatePicker
-                    style={{ width: 220, }}
-                    onChange={(e, index) => onOk(e, 2)}
-                    defaultValue={dayjs()}
-                    picker='year'
-                ></DatePicker>
-            </div>
-            <ReactECharts
-                ref={(e) => setEchart2(e)}
-                option={getPlanOption}
-                style={{ height: 350 }}
-            />
-        </>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/clyj/content.js b/src/views/sz/szzf/clyj/content.js
deleted file mode 100644
index b55dd49..0000000
--- a/src/views/sz/szzf/clyj/content.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import styles from './content.module.less'
-import { Button } from 'antd'
-import ModalForm from './form';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
-import { httpget } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-const Page = ({ treeSelect }) => {
-    const refModal = useRef();
-    const [data,setData] = useState({})
-
-    /**
-  * @description 处理成功的回调
-  */
-    const successCallback = () => {
-        getInfo()
-        // setIsFetch(!isFetch)
-    }
-    const dataPahe = {
-        title: '侵占、毁坏水工程及堤防、护岸等有关设施',
-        zhunag: '1'
-    }
-    const edit = () => {
-        refModal.current.showEdit({...data});
-    }
-    const getInfo=()=>{
-        httpget(apiurl.szzf.clyj.detail+treeSelect?.key).then(res=>{
-            setData({...res.data,name:treeSelect.name})
-        })
-    }
-    useEffect(()=>{
-        if(treeSelect){
-            getInfo()
-        }
-    },[treeSelect])
-    return (
-        <>
-            <div className={styles.list} style={{ padding: '0 10px', marginBottom: 5 }}>{treeSelect?.name}<Button type="primary" onClick={edit}>编辑</Button></div>
-
-            <div className={styles.listborder} style={{ padding: '0 10px', }}>状态</div>
-            <div className={styles.listborder} style={{ padding: '0 10px', marginBottom: 5 }}>{data?.status?'启用':'禁用'}</div>
-            <div className={styles.contentBor} style={{ padding: '0 10px', marginBottom: 5, height: '35%' }}>
-                <div className={styles.listborder} style={{ padding: '0 10px', height: '30%' }}>法律依据</div>
-                {data?.legalName ?? '无内容请添加'}
-            </div>
-
-            <div style={{ display: 'flex', height: '33%' }}>
-                <div className={styles.contentBor} style={{ flex: 1, marginRight: 5 }}>
-                    <div className={styles.listborder} style={{ height: '30%', padding: '0 10px', }}>违法行为描述</div>
-                    <div style={{ padding: '0 10px' }}>{data?.violationDesc ?? '无内容请添加'}</div>
-                </div>
-                <div className={styles.contentBor} style={{ flex: 1 }}>
-                    <div className={styles.listborder} style={{ height: '30%', padding: '0 10px', }}>处罚措施</div>
-                    <div style={{ padding: '0 10px' }}>{data?.penalties ?? '无内容请添加'}</div>
-                </div>
-
-            </div>
-            <BasicCrudModal
-                width={800}
-                ref={refModal}
-                title=""
-                component={ModalForm}
-                onCrudSuccess={successCallback}
-            />
-        </>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/clyj/content.module.less b/src/views/sz/szzf/clyj/content.module.less
deleted file mode 100644
index b1f79c5..0000000
--- a/src/views/sz/szzf/clyj/content.module.less
+++ /dev/null
@@ -1,28 +0,0 @@
-.list{
-    height: 10%;
-    // margin: 5px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    background-color: #fff;
-    font-size: 16px;
-
-}
-.listborder{
-    height: 10%;
-    // margin: 5px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    background-color: #fff;
-    border-bottom: 1px solid #f0f0f0;
-    font-size: 16px;
-
-}
-.contentBor{
-
-    background-color: #fff;
-    border-bottom: 1px solid #f0f0f0;
-    font-size: 16px;
-
-}
\ No newline at end of file
diff --git a/src/views/sz/szzf/clyj/form.js b/src/views/sz/szzf/clyj/form.js
deleted file mode 100644
index 1745698..0000000
--- a/src/views/sz/szzf/clyj/form.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, { useEffect, useState, useMemo, useRef } from 'react';
-import { Space, Table, Radio, DatePicker, Form, Select, Button, message, Upload, Input, Row, Col, Switch, Image } from 'antd';
-import { DeleteOutlined, FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../../service/apiurl';
-
-// import "./index.less"
-import moment from 'moment';
-const { TextArea } = Input;
-
-const options=[
-  {label:'禁用',value:0},
-  {label:'启用',value:1}
-]
-const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => {
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-
-  const [loading, setLoading] = useState(false)
-
-
-
-
-  const onfinish = (values) => {
-    onEdit(apiurl.szzf.clyj.edit, {...record,...values})
-  }
-  useEffect(() => {
-    if(record){
-      form.setFieldsValue(record)
-    }
-  }, [record, mode])
-
-
-
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="节点"
-              name="name"
-              rules={[{ required: true }]}
-            >
-              <Input disabled style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={24}>
-            <Form.Item
-              label="状态"
-              name="status"
-              rules={[{ required: true }]}
-            >
-              <Radio.Group options={options}/>
-            </Form.Item>
-          </Col>
-          <Col span={24}>
-            <Form.Item
-              label="法律名称"
-              name="legalName"
-              rules={[{ required: true }]}
-            >
-              <Input  style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={24}>
-            <Form.Item
-              label="法条内容"
-              name="legalContent"
-            >
-              <Input  style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-
-          <Col span={24}>
-            <Form.Item
-              label="违法行为描述"
-              name="violationDesc"
-            >
-              <TextArea rows={4}  />
-            </Form.Item>
-          </Col>
-          <Col span={24}>
-            <Form.Item
-              label="处罚措施"
-              name="penalties"
-            >
-              <TextArea rows={4} />
-            </Form.Item>
-          </Col>
-
-        </Row>
-
-        {
-          mode === 'view' ? null : (
-            <>
-              <Form.Item {...btnItemLayout}>
-                <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '提交' : '修改'}
-                </Button>
-              </Form.Item>
-            </>
-          )
-        }
-      </Form>
-
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sz/szzf/clyj/index.js b/src/views/sz/szzf/clyj/index.js
deleted file mode 100644
index 8e7aabb..0000000
--- a/src/views/sz/szzf/clyj/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Card } from 'antd'
-import TreeSelectZdy from './treeSelectZdy'
-
-import ContentPage from './content'
-import { useEffect, useState } from 'react'
-
-
-const Page = () => {
-    const [treeSelect ,setTreeSelect] =useState({})
-    useEffect(()=>{
-        console.log(treeSelect,'1111');
-        
-    },[treeSelect])
-    return (
-        <div style={{display:'flex',height: '100%'}}>
-            <div style={{ width: 320, backgroundColor: '#fff', padding: 10  }}>
-                <TreeSelectZdy setTreeSelect={setTreeSelect}/>
-            </div>
-            <div style={{ flex:1 ,marginLeft:10}}>
-                <ContentPage treeSelect={treeSelect[0]}/>
-            </div>
-            
-        </div>
-    )
-}
-export default Page
\ No newline at end of file
diff --git a/src/views/sz/szzf/clyj/treeSelectZdy.js b/src/views/sz/szzf/clyj/treeSelectZdy.js
deleted file mode 100644
index 47d02c6..0000000
--- a/src/views/sz/szzf/clyj/treeSelectZdy.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import React, { useState, useMemo, useEffect, useRef } from 'react';
-import { Tree, Input, Tooltip } from 'antd';
-import { httpget } from '../../../../utils/request';
-import apiurl from '../../../../service/apiurl';
-const { Search } = Input;
-
-// const data = [
-//     {
-//         key: 'parent 1',
-//         title: '违反水利工程建设与管理类行为',
-//         children: [
-//             {
-//                 value: 'parent 1-0',
-//                 title: '侵占、毁坏水法规定相关设施',
-//                 children: [
-//                     {
-//                         key: 'leaf1',
-//                         title: '侵占、毁坏水工程及堤防、护岸...',
-//                     },
-//                     {
-//                         key: 'leaf2',
-//                         title: '毁坏防汛、水文监测、水文地质...',
-//                     },
-//                     {
-//                         key: 'leaf3',
-//                         title: '在水工程保护范围内，从事影响..',
-//                     }
-//                 ],
-//             },
-//             {
-//                 key: 'parent 1-1',
-//                 title: '破坏大坝管理设施、妨碍大坝',
-//                 children: [
-//                     {
-//                         key: 'leaf4',
-//                         title: '毁坏大坝及其管理设施',
-//                     },
-//                     {
-//                         key: 'leaf5',
-//                         title: '危害大坝安全或破坏大坝正常运行',
-//                     },
-//                     {
-//                         key: 'leaf6',
-//                         title: '在岸区或坝体从事生产活动',
-//                     },
-//                 ],
-//             },
-//         ],
-//     },
-// ];
-let dataList = [];
-
-const Page = ({ setTreeSelect }) => {
-    const [expandedKeys, setExpandedKeys] = useState([]);
-    const [searchValue, setSearchValue] = useState();
-    const [autoExpandParent, setAutoExpandParent] = useState(true);
-    const [selectNode, setSelect] = useState(true);
-
-    const [data, setData] = useState([]);
-    const treeRef = useRef();
-
-
-
-    const onExpand = (newExpandedKeys) => {
-        setExpandedKeys(newExpandedKeys);
-        setAutoExpandParent(false);
-
-    };
-    const onSearch = (value) => {
-        // debugger;
-        setSearchValue(value);
-        setAutoExpandParent(true);
-
-    };
-    const treeData = useMemo(() => {
-        const loop = (data) =>
-            data.map((item) => {
-                const strTitle = item.legalName;
-                const index = strTitle?.indexOf(searchValue);
-                const beforeStr = strTitle.substring(0, index);
-                const afterStr = strTitle.slice(index + searchValue?.length);
-                const title =
-                    index > -1 ? (
-                        <span key={item.id}>
-                            {beforeStr}
-                            <span className="site-tree-search-value" style={{ color: 'red' }}>{searchValue}</span>
-                            {afterStr}
-                        </span>
-                    ) : (
-                        <span key={item.id}>{strTitle}</span>
-                    );
-                if (item.children) {
-                    return { title: title, key: item.id, children: loop(item.children), name: strTitle };
-                }
-                if (index > -1) {
-
-                    console.log(index, strTitle, searchValue);
-
-                    dataList.push(item.id)
-                    setExpandedKeys(dataList);
-                    if (dataList.length < 2) {
-                        treeRef.current.scrollTo({ key: dataList[0].id });
-                    }
-
-                }
-                return {
-                    title: title,
-                    key: item.id,
-                    name: strTitle
-                };
-            });
-
-        return loop(data);
-    }, [searchValue, data]);
-    
-    const  getFirstChild=(val)=> {
-        let res = {};
-        if (JSON.stringify(res) != "{}") {
-            return;//如果res不再是空对象，退出递归
-        } else {
-            //遍历数组
-            for (let i = 0; i < val.length; i++) {
-                //如果当前的isleaf是true,说明是叶子节点，把当前对象赋值给res,并return，终止循环
-                if (!val[i].children) {
-                    res = val[i];
-                    break;
-                }else {//否则的话，递归当前节点的children
-                    getFirstChild(val[i].children);
-                }
-            }
-            return res
-        }
-    }
-    useEffect(() => {
-        httpget(apiurl.szzf.clyj.tree).then(res => {
-            setData(res.data)
-            // setTreeSelect(
-            //     [{
-            //         key: res.data[0].id,
-            //         name: res.data[0].legalName,
-
-            //     }]
-                
-            // )
-            // setSelect([res.data[0].id])
-            // getFirstChild(res.data)
-       
-            setSelect([getFirstChild(res.data).id]);
-            setTreeSelect(
-                [{
-                    key: getFirstChild(res.data).id,
-                    name: getFirstChild(res.data).legalName,
-
-                }]
-                
-            )
-            
-        })
-    }, [])
-
-    return (
-        <>
-            <div style={{ margin: '10px 0' }}><Search onSearch={onSearch} /></div>
-            <Tree
-                onExpand={onExpand}
-                ref={treeRef}
-                expandedKeys={expandedKeys}
-                treeData={treeData}
-                autoExpandParent={autoExpandParent}
-                selectedKeys={selectNode}
-                titleRender={(data) => {
-                    return (
-                        <div style={{ color: data.children ? '#c8c8c8' : '', cursor: data.children ? 'not-allowed' : '' }} >
-                            <Tooltip title={data.name}>
-                                <div className='ellipsis1' style={{ width: 200 }}>
-                                    {data.title}
-                                </div>
-                            </Tooltip>
-
-                        </div>)
-                }}
-                onSelect={(e, node) => {
-                    if (node.selectedNodes[0].children) {
-                        return;
-                    }
-                    setSelect(e)
-                    setTreeSelect(
-                        node.selectedNodes
-                    )
-                }}
-                height={800}
-
-            />
-        </>
-    );
-};
-
-export default Page;
-
diff --git a/src/views/sz/szzf/form/ddForm.css b/src/views/sz/szzf/form/ddForm.css
deleted file mode 100644
index b643db7..0000000
--- a/src/views/sz/szzf/form/ddForm.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.ddForm .ant-form-item-label {
-  width: 110px;
-}
-.zxform .ant-form-item-control {
-  border: 1px solid;
-  height: 50px;
-}
-.zxform .ant-form-item-label {
-  border: 1px solid;
-  width: 110px;
-  height: 50px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-.zxform .ant-input-outlined {
-  border: none;
-}
-.zxform .ant-form-item {
-  margin-bottom: 0;
-}
-.zxform .ant-input {
-  height: 48px;
-}
-.zxform .ant-input-disabled {
-  background-color: #fff;
-}
diff --git a/src/views/sz/szzf/form/ddForm.less b/src/views/sz/szzf/form/ddForm.less
deleted file mode 100644
index 39266af..0000000
--- a/src/views/sz/szzf/form/ddForm.less
+++ /dev/null
@@ -1,50 +0,0 @@
-
-    .ddForm{
-      .ant-form-item-label{
-        width: 110px;
-      }
-    }
-
-    .zxform{
-        .ant-form-item{
-            margin-bottom: 0;
-        }
-            .ant-form-item-control{
-                border: 1px solid;
-                height: 50px;
-                display: flex;
-            justify-content: center;
-            }
-            
-            .ant-form-item-label{
-                border: 1px solid;
-                // border-right:none;
-                width: 110px;
-                height: 50px;
-                display: flex;
-                align-items: center;
-                justify-content: flex-end;
-            }
-            // .ant-input-outlined {
-            //     border:none
-            // }
-            
-            .ant-input{
-                height: 40px;
-                width: 90%;
-
-            }
-            .empty{
-                .ant-input-disabled{
-                    background-color: #fff;
-                }
-            }
-            
-            .ant-select-single{
-                height: 40px;
-                width: 90%;
-            }
-        
-  }
-  
-
diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js
deleted file mode 100644
index bf4dc8b..0000000
--- a/src/views/sz/szzf/form/index.js
+++ /dev/null
@@ -1,322 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { TreeSelect, Table, Tag, DatePicker, Form, Select, Button, message, Upload, Input, Row, Col, Switch, Image,Radio } from 'antd';
-import './ddForm.less'
-import dayjs from 'dayjs'
-import { InboxOutlined, LinkOutlined, DeleteOutlined, LoadingOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons'
-import apiurl from '../../../../service/apiurl';
-import {  httpgetExport, httppostAddfile } from '../../../../utils/request';
-import { exportFile } from '../../../../utils/tools';
-
-// import apiUrl from '../../service/apiurl'
-import PdfView from './pdfView'
-const { RangePicker } = DatePicker;
-const { TextArea } = Input;
-
-const baseUrl = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, formJsonData, typeUpload = 'dispatch', isModalOpen, fileType, footer = true, uploadUrl,TableZdyProps,downloadUrl,
-    onSave }) => {
-    const [fileList, setFileList] = useState([])
-    const [fileListUp, setFileLisUp] = useState([])
-    const [url, setUrl] = useState('')
-    const [isModal, setIsModal] = useState(false)
-  const [loading, setLoading] = useState(false)
-
-
-
-    // 
-    const [form] = Form.useForm();
-
-    // function onDocumentLoadSuccess({ numPages }) {
-    //     setRenderNumPages(numPages);
-    // }
-    const onFinish = (e) => {
-    }
-    const getInfo = () => {
-        form.validateFields().then((values) => {
-            // debugger;
-            getFormInfo({ ...values, [fileKey]: fileList, fileIds: fileList.map(item => item.fileId) })
-            
-            setFileList([])
-        }).catch((errorInfo) => {
-            console.log(errorInfo, 'error');
-        })
-        // 
-    }
-    const cancel = () => {
-        getFormInfo(false)
-        form.resetFields()
-        setFileList([])
-
-    }
-    const { Dragger } = Upload;
-    // const preView = (e) => {
-    //      window.open('http://local.gunshiiot.com:18083/xintankou/api/file/preview/104')
-    // }
-    const deleteFile = (e) => {
-        // debugger;
-        let arr = fileList.filter(item => item.fileId !== e)
-        setFileList(arr)
-    }
-    const props = {
-        name: 'file',
-        multiple: true,
-        fileList: fileList,
-        showUploadList: false,
-        beforeUpload: (file, fileList) => {
-            if (fileType == "pic" &&
-                (file.type != "image/jpeg" || file.type != "image/png" || file.type != "image/jpg")) {
-                message.error('仅支持上传jpg/png/jpeg格式的图片');
-                return false;
-            } else {
-                return true;
-            }
-        },
-        customRequest(e) {
-            setLoading(true);
-            httppostAddfile(uploadUrl, e).then(res => {
-                setLoading(false);
-                setFileList([...fileList, res.data])
-            })
-        }
-    };
-    const onChange = () => { }
-    function checkMediaType(url) {
-        // 创建URL对象
-        var link = url;
-        // 获取路径的最后一个点之后的内容作为文件扩展名
-        var extension = link?.split('.').pop().toLowerCase();
-
-        // 声明支持的图片和视频文件扩展名
-        var imageExtensions = ['jpg', 'jpeg', 'gif', 'png'];
-        var file = ['pdf', 'word', 'xslx', 'xsl', 'txt', "pptx"];
-        // 
-        // 判断文件扩展名是否在图片扩展名数组中
-        if (imageExtensions.includes(extension)) {
-            return 'image';
-        }
-
-        // 判断文件扩展名是否在视频扩展名数组中
-        if (file.includes(extension)) {
-            return extension;
-        }
-
-        // 扩展名不在图片或视频数组中，返回null表示无法确定媒体类型
-        return null;
-    }
-    const preView = (item) => {
-        if (checkMediaType(item.fileName) == 'pdf') {
-            // window.open(baseUrl + item.previewUrl)
-            setUrl(item.fileId)
-            setIsModal(true)
-        }
-
-    }
-
-    /**
- * @description 文件下载
- * @param {String} params 文件fileId
- */
-    const download = async(id, name) => {
-        var extension = name?.split('.').pop().toLowerCase();
-        httpgetExport(downloadUrl+id).then(res => {
-            exportFile(name,res.data)
-        })
-    }
-    useEffect(()=>{
-        form.resetFields()
-    },[])
-    useEffect(() => {
-        
-        let formType = type
-        if (type = 'edit') {
-            formType = 2
-        }
-        if (type == 'view') {
-            formType = 1
-        }
-        if (type == 'save') {
-            form.setFieldsValue(formJsonData)
-            formType = 0
-        }
-        if (formType == 1 || formType == 2 || formType == 3) {
-            form.setFieldsValue(formJsonData)
-            if (formJsonData?.[fileKey]) {
-                setFileList(formJsonData[fileKey])
-            }
-
-            console.log(formJsonData, formJson);
-            // 
-
-        }
-
-        return () => {
-            setFileList([])
-        }
-
-    }, [type, formJsonData, isModalOpen])
-
-
-
-    return (
-        <div style={{ backgroundColor: '#fff', marginTop: 10 }}>
-            <Form form={form} name="searchTabel" onFinish={onFinish} className={typeName}>
-                <Row>
-                    {formJson?.map(item => {
-                        return (
-                            <Col span={item.span} >
-                                {item.type == "input" &&
-                                    <Form.Item
-                                        label={item.label}
-                                        name={item.key}
-                                        labelCol={item.labelCol}
-                                        rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                    >
-                                        <Input disabled={type == 'view' || item.disabled} placeholder={item.placeholder} addonAfter={item.addonAfter}/>
-                                    </Form.Item>}
-                                {item.type == "title" &&
-                                    <Form.Item
-                                        label={item.label}
-                                        name={item.key}
-                                        rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                    >
-
-                                        <div className='title'>
-                                            <div className='titleRight'></div>
-                                            {item.content}
-                                        </div>
-                                    </Form.Item>}
-
-                                {item.type == "Select" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-                                    <Select disabled={type == 'view'} options={item.options} fieldNames={item.fieldNames} />
-                                </Form.Item>}
-                                {item.type == "Radio" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-                                    <Radio.Group disabled={type == 'view'} options={item.options}/>
-                                </Form.Item>}
-
-                                {/* {item.type == "Select" && <Select disabled={type == 1} options={item.options} />} */}
-
-                                {item.type == "Switch" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-                                    <Switch defaultChecked onChange={onChange} disabled={type == 'view'} />
-                                </Form.Item>}
-
-                                {/* {item.type == "Switch" && <Switch defaultChecked onChange={onChange} disabled={type == 1} />} */}
-
-                                {item.type == "DatePicker" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-                                    {/* {formJsonData[item.key]} */}
-                                    <DatePicker disabled={type == 'view'} style={{ width: "100%" }} picker={item.picker}/>
-                                </Form.Item>}
-
-                                {/* {item.type == "DatePicker" && <DatePicker disabled={type == 1} style={{ width: "100%" }} />} */}
-
-                                {item.type == "TextArea" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-                                    <TextArea rows={4} disabled={type == 'view'} />
-                                </Form.Item>}
-                                {/* {item.type == "TextArea" && <TextArea rows={4} disabled={type == 1} />} */}
-
-                                {item.type == "RangePicker" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-                                    <RangePicker disabled={type == 'view'} />
-                                </Form.Item>}
-
-                                {item.type == "TreeSelect" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-                                    <TreeSelect
-                                        showSearch
-                                        style={{ width: '100%' }}
-                                        dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-                                        allowClear
-                                        fieldNames={item.fieldNames}
-                                        treeData={item.treeData}
-                                        treeCheckable={item.multiple}
-                                        disabled={type == 'view'}
-                                    />
-                                    
-                                </Form.Item>}
-
-                                {/* {item.type == "RangePicker" &&
-                                    <RangePicker disabled={type == 'view'} />} */}
-                                {item.type == "upload" && <Form.Item
-                                    label={item.label}
-                                    name={item.key}
-                                    rules={[{ required: item.required, message: '请输入' + item.label }]}
-                                >
-
-                                    <>
-                                        {type !== 'view' && <Dragger {...props}>
-                                            <p className="ant-upload-drag-icon">
-                                                <InboxOutlined />
-                                            </p>
-
-                                            {fileType == "pic" ? <p className="ant-upload-text">点击或将文件拖拽到这里上传 支持扩展名：jpeg、png</p> : <p className="ant-upload-text">点击或将文件拖拽到这里上传</p>}
-
-                                        </Dragger>}
-                                        <div className='flex' >
-                                            {fileList?.map((item) => {
-                                                return <div className='flex align-center file-item' style={{marginTop:5, marginRight:'3%',width:'30%',minHeight: "50px", fontSize: 14, columnGap: 10, cursor: checkMediaType(item.fileName) == 'image' || checkMediaType(item.fileName) == 'pdf' ? 'pointer' : "not-allowed" }}>
-                                                    <div style={{ width: 40, height: 40, display: "flex", alignItems: 'center' }}>
-                                                        {checkMediaType(item.fileName) == 'image' && <Image
-                                                            height={40}
-                                                            src={baseUrl + item.filePath}
-                                                        />}
-                                                        {
-                                                            checkMediaType(item.fileName) !== 'image' &&
-                                                            <span  >{checkMediaType(item.fileName)?.toUpperCase()}</span>
-                                                        }
-                                                    </div>
-
-                                                    <span onClick={() => preView(item)}>{item.fileName}</span>
-                                                    {type !== 'view' && <DeleteOutlined onClick={() => deleteFile(item.fileId)} />}
-                                                    <VerticalAlignBottomOutlined onClick={() => download(item.fileId, item.fileName)} />
-                                                </div>
-                                            })}
-                                        </div>
-                                    </>
-                                </Form.Item>}
-                            </Col>
-                        )
-                    })}
-                </Row>
-            </Form >
-            {TableZdyProps}
-            {
-                type !== 'view' && <div className="flex flex-end" style={{ marginTop: 10, justifyContent: "flex-end" }}>
-                    <Button type="" style={{ marginRight: 10 }} onClick={cancel}>取消</Button>
-                    <Button type="primary" onClick={getInfo} loading={loading}>确定</Button>
-                </div>
-            }
-            <PdfView url={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/rescue/goods/file/download/${url}`)}`} isModal={isModal} setModalN={(e)=>setIsModal(e)}/>
-
-
-        </div >
-    );
-}
-
-
-export default FormZdy;
\ No newline at end of file
diff --git a/src/views/sz/szzf/form/pdfView.js b/src/views/sz/szzf/form/pdfView.js
deleted file mode 100644
index fa913aa..0000000
--- a/src/views/sz/szzf/form/pdfView.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { Component, useEffect, useState } from 'react';
-import { Document, Page, pdfjs } from 'react-pdf';
-import { Modal } from 'antd';
-
-const Pdf = ({ url,isModal,setModalN }) => {
-  const [isModalOpen, setIsModalOpen] = useState(false);
-
-  const handleOk = () => {
-    setIsModalOpen(false);
-    setModalN(false)
-  };
-
-  const handleCancel = () => {
-    setIsModalOpen(false);
-    setModalN(false)
-  };
-  useEffect(()=>{
-    setIsModalOpen(isModal)
-  },[isModal])
-  return (
-    <div>
-      <Modal
-        title={<div style={{ backgroundColor: '#259dff', padding: 10, color: "#fff" }}>pdf</div>}
-        open={isModalOpen}
-        width={1000}
-        onOk={handleOk}
-        footer={false}
-        onCancel={handleCancel}
-        style={{ marginTop: "-5%" }}
-        destroyOnClose>
-        <div style={{ padding: "0 10px" }}>
-          <iframe
-            style={{
-              height: '80vh',
-              width: '100%',
-              border: 0,
-              marginTop: 20,
-            }}
-            src={url}
-          />
-        </div>
-
-      </Modal>
-    </div>
-  );
-}
-export default Pdf
diff --git a/src/views/sz/zdgl/form.js b/src/views/sz/zdgl/form.js
deleted file mode 100644
index 8b8bc0e..0000000
--- a/src/views/sz/zdgl/form.js
+++ /dev/null
@@ -1,283 +0,0 @@
-import React, { useEffect, useState, useMemo, useRef } from 'react';
-import { Form, Button, Input, Row, Upload, Col, Table, DatePicker, InputNumber, message, Image, Modal, Typography, Select } from 'antd';
-import { DeleteOutlined, FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../service/apiurl';
-
-import NormalSelect from '../../../components/Form/NormalSelect';
-
-// import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-const opntios=[
-  {value:0,label:'党支部工作制度'},
-  {value:1,label:'行政工作制度'},
-  {value:2,label:'部门工作制度'},
-  {value:3,label:'安全管理制度'},
-  {value:4,label:'工程管理制度'},
-  {value:5,label:'技术规程'},
-  {value:6,label:'岗位责任制'}
-]
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-    downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`;
-    downloadLink.download = `${params.fileName}`;
-    downloadLink.style.display = "none";
-    // 将链接添加到页面中
-    document.body.appendChild(downloadLink);
-
-    // 模拟点击事件，开始下载
-    downloadLink.click();
-  }
-  /**
-    * @description 上传图片
-    * @param {string}  file 上传的文件
-    */
-  const fileChange = (info) => {
-    if (info.file.status === "done") {
-      setLoading(false);
-    }
-    if (info.file.status === "uploading") {
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    let fileIds = info.fileList.map(file => {
-      return file.response?.data?.fileId
-    })
-    setFileIds(fileIds)
-    setFileList(info.fileList)
-  }
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-
-
-  const onfinish = (values) => {
-    let oldFiles = fileList.map(item => (item.response?.data??item))
-    // debugger
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      onEdit(apiurl.zdgl.edit, {...record,...values})
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.zdgl.add, values)
-    }
-  }
-
-  /**
- * @description 删除上传的图片
- * @param {string}  id 删除的id
- */
-  const deleteFile = (fileId) => {
-    console.log(fileId);
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-  }
-  useEffect(() => {
-    if (mode != 'save') {
-       const imgFile = record?.files?.map(o => ({
-        name: o.fileName,
-        response: {
-          data: {
-            filePath: o.filePath,
-            fileId: o.fileId
-          }
-        },
-      }))
-      setFileList(imgFile)
-    }
-  }, [record, mode])
-
-
-
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-      >
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="标题"
-              name="name"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item label="制度类型" name="type" rules={[{ required: true }]}>
-              <Select allowClear style={{ width: '100%' }} options={opntios} />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="公布日期"
-              name="releaseDate"
-              getValueFromEvent={(e, dateString) => dateString}
-              getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-            >
-              <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="发布单位"
-              name="fillUnit"
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="附件"
-              name="files"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-            >
-              {mode !== "view" &&
-                <Dragger
-                  name='file'
-                  // multiple
-                  action="/gunshiApp/tsg/SzRegulatoryFramework/file/upload/singleSimple"
-                  onChange={fileChange}
-                  onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                  maxCount={1}
-                // onSuccess={handleSuccess}
-                >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .ppt
-                  </p>
-                </Dragger>
-              }
-              <Row gutter={[16]}>
-                {
-                  fileList.length > 0 && fileList.map(file => {
-                    return (
-                      <Col span={12}>
-                        <div className="file-item" style={{ width: "75%",marginTop:5 }}>
-                          <div className='file-description'>
-                            {file.name.indexOf('.docx') > -1 ?
-                              <div
-                                onClick={() => { download(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                                <FileWordOutlined
-                                  style={{ fontSize: 40 }}
-                                />
-                              </div>
-                              :
-                              file.name.indexOf('.pdf') > -1 ?
-                                <div
-                                  onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FilePdfOutlined style={{ fontSize: 40 }} />
-                                </div>
-                                :
-                                file.name.indexOf('.zip') > -1 ?
-                                  <div
-                                    onClick={() => { download(file.response?.data?.fileId) }}
-                                    style={{ cursor: 'pointer' }}
-                                  >
-                                    <FileZipOutlined style={{ fontSize: 40 }} />
-                                  </div>
-                                  :
-                                  file.name.indexOf('.xlsx') > -1 ?
-                                    <div
-                                      onClick={() => { download(file.response?.data?.fileId) }}
-                                      style={{ cursor: 'pointer' }}
-                                    >
-                                      <FileExcelOutlined style={{ fontSize: 40 }} />
-                                    </div>
-                                    :
-                                    <Image width={60} src={url + file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() => deleteFile(file.response?.data?.fileId)}>
-                            <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                    )
-                  })
-                }
-              </Row>
-            </Form.Item>
-          </Col>
-        </Row>
-        {
-          mode === 'view' ? null : (
-            <>
-              <Form.Item {...btnItemLayout}>
-                <Button type="primary" htmlType="submit" loading={loading}>
-                  {mode === 'save' ? '提交' : '修改'}
-                </Button>
-              </Form.Item>
-            </>
-          )
-        }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{ marginTop: "-5%" }}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-        <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-          src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sz/zdgl/index.js b/src/views/sz/zdgl/index.js
deleted file mode 100644
index d8df704..0000000
--- a/src/views/sz/zdgl/index.js
+++ /dev/null
@@ -1,157 +0,0 @@
-import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image } from 'antd';
-import { FileWordOutlined, FilePdfOutlined, FileZipOutlined, PaperClipOutlined } from '@ant-design/icons';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import { httpgetExport } from '../../../utils/request';
-import { exportFile } from '../../../utils/tools';
-import dayjs from 'dayjs';
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const obj={0:"党支部工作制度",1:"行政工作制度",2:"部门工作制度",3:"安全管理制度",4:"工程管理制度",5:"技术规程",6:"岗位责任制"}
-const Page = () => {
-    const role = useSelector(state => state.auth.role);
-    const editBtn = role?.rule?.find(item => item.menuName == "编辑");
-    const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-    const delBtn = role?.rule?.find(item => item.menuName == "删除");
-    const refModal = useRef();
-    const [searchVal, setSearchVal] = useState(false)
-    const [iframeSrc, setIframeSrc] = useState('')
-    const [pdfViewOPen, setPdfViewOPen] = useState(false)
-    const [isFetch, setIsFetch] = useState(false)
-    const columns = [
-        { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-        { title: '标题', key: 'name', dataIndex: 'name',  ellipsis: true },
-        {
-            title: '制度类型', key: 'type', dataIndex: 'type',render:(v)=><>{obj[v]}</>
-        },
-        {
-            title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate',
-            render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
-        },
-        {
-            title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit'
-        },
-        {
-            title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate'
-        },
-        {
-            title: '附件', key: 'files', dataIndex: 'files', render:(v,r)=><a onClick={()=>download(v[0].fileId,v[0]?.fileName)}><PaperClipOutlined />{v[0]?.fileName}</a>
-        },
-        {
-            title: '操作', key: 'operation', fixed: 'right', align: 'center',
-            render: (value, row, index) => (
-                <CrudOpRender_text
-                    edit={true}
-                    del={true}
-                    // view={true}
-                    command={(cmd) => () => command(cmd)(row)} />)
-        },
-    ];
-
-
-    const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-    const command = (type) => (params) => {
-        if (type === 'save') {
-            refModal.current.showSave();
-        } else if (type === 'edit') {
-            refModal.current.showEdit({ ...params });
-        } else if (type === 'view') {
-            refModal.current.showView(params);
-        } else if (type === 'del') {
-            refModal.current.onDeleteGet(apiurl.zdgl.del + `/${params.id}`);
-        }
-    }
-
-
-    const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.zdgl.list).find_noCode);
-
-    /**
-      * @description 处理成功的回调
-      */
-    const successCallback = () => {
-        refresh()
-        setIsFetch(!isFetch)
-    }
-    /**
- * @description 文件下载
- * @param {String} params 文件fileId
- */
-    const download = async(id, name) => {
-        var extension = name?.split('.').pop().toLowerCase();
-        httpgetExport(apiurl.zdgl.download+id).then(res => {
-            exportFile(name,res.data)
-        })
-    }
-    const viewPdf = (params) => {
-        setIframeSrc(params)
-        setPdfViewOPen(true)
-      }
-    useEffect(() => {
-        const params = {
-            search: {
-                ...searchVal,
-            }
-        };
-        search(params)
-    }, [searchVal])
-
-
-    return (
-        <>
-            <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-                <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%", overflowY: "auto" }}>
-                    <Card className='nonebox'>
-                        <ToolBar
-                            setSearchVal={setSearchVal}
-                            onSave={command('save')}
-                            role={role}
-                        />
-                    </Card>
-                    <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-                        <Table columns={columns} rowKey="inx" {...tableProps} />
-                    </div>
-                </div>
-
-                <BasicCrudModal
-                    width={1000}
-                    ref={refModal}
-                    title=""
-                    component={ModalForm}
-                    onCrudSuccess={successCallback}
-                // onCrudSuccess={()=>{refresh({addvcd:localStorage.getItem('ADCD6')})}}
-                />
-            </div>
-
-            <Modal
-                open={pdfViewOPen}
-                width={1000}
-                title=""
-                footer={null}
-                style={{ marginTop: "-5%" }}
-                onCancel={() => {
-                    setPdfViewOPen(false)
-                }}
-            >
-                <iframe
-                    style={{
-                        height: '80vh',
-                        width: '100%',
-                        border: 0,
-                        marginTop: 20,
-                    }}
-                    src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
-                />
-            </Modal>
-        </>
-    );
-}
-
-export default Page;
diff --git a/src/views/sz/zdgl/toolbar.js b/src/views/sz/zdgl/toolbar.js
deleted file mode 100644
index dccdad9..0000000
--- a/src/views/sz/zdgl/toolbar.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker, Select } from 'antd';
-import { DownOutlined, UpOutlined } from '@ant-design/icons'
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
-  const [form] = Form.useForm();
-  const [showGj, setShowGj] = useState(false)
-  const onFinish = (values) => {
-    let dataSo;
-    if (values.releaseDate) {
-      dataSo = {
-        stm: moment(values.releaseDate[0]).format('YYYY-MM-DD HH:mm:ss'),
-        etm: moment(values.releaseDate[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.releaseDate
-    setSearchVal({ ...values, ...dataSo });
-  }
-
-  const opntios = [
-    {value:0,label:'党支部工作制度'},
-    {value:1,label:'行政工作制度'},
-    {value:2,label:'部门工作制度'},
-    {value:3,label:'安全管理制度'},
-    {value:4,label:'工程管理制度'},
-    {value:5,label:'技术规程'},
-    {value:6,label:'岗位责任制'}
-  ]
-  const styles = {
-    fontFamily: '微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑, sans-serif',
-    fontWeight: '700',
-    fontStyle: 'normal',
-    fontSize: '16px'
-  }
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="标题" name="name">
-            <Input allowClear style={{ width: '150px' }} />
-          </Form.Item>
-          <Form.Item label="制度类型" name="type">
-            <Select allowClear style={{ width: '150px' }} options={opntios} />
-          </Form.Item>
-          <Form.Item label="发布日期" name="releaseDate">
-            <RangePicker allowClear />
-          </Form.Item>
-          <Form.Item label="发布单位" name="fillUnit">
-            <Input allowClear style={{ width: '150px' }} />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-
-          {
-            (onSave) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-              : null
-          }
-
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/zrrgl/form.js b/src/views/sz/zrrgl/form.js
deleted file mode 100644
index abb996f..0000000
--- a/src/views/sz/zrrgl/form.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Modal,Image } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-const ModalForm = ({ mode, record, onEdit, onSave }) => {
- 
-  const [form] = Form.useForm();
-  const types = [
-    {
-      label: "行政责任人",
-      value: 1
-    },
-    {
-      label: "主管部门责任人",
-      value: 2
-    }, {
-      label: "管理单位责任人",
-      value: 3
-    }, {
-      label: "巡查责任人",
-      value: 4
-    }, {
-      label: "技术责任人",
-      value: 5
-    },
-  ]
-  const onFinish = (values) => {
-    if (mode === 'edit') {
-      values.id = record.id
-      onEdit(apiurl.zrrgl.edit, values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.zrrgl.save, values)
-    }
-  }
-
-
-  return (
-    <>
-      <Form form={form} {...formItemLayout} onFinish={onFinish} initialValues={record}>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="责任类型"
-              name="type"
-              rules={[{ required: true }]}
-            >
-             <NormalSelect allowClear style={{ width: '100%' }} options={types} />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="姓名"
-              name="name"
-              rules={[{ required: true }]}
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="单位"
-              name="unit"
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item
-              label="职务"
-              name="duty"
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <Form.Item
-              label="联系方式"
-              name="contactInfo"
-            >
-              <Input disabled={mode === 'view'} style={{ width: '100%' }} allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <Form.Item
-              label="主要职责"
-              name="dutyBound"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 19 }}
-
-            >
-              <Input.TextArea disabled={mode === 'view'} style={{width:'100%',minHeight:'50px'}}allowClear />
-            </Form.Item>
-          </Col>
-        </Row>
-  
-        {
-          mode === 'view' ? null : (
-            <>
-              <Form.Item {...btnItemLayout}>
-                <Button type="primary" htmlType="submit">
-                  {mode === 'save' ? '保存' : '修改'}
-                </Button>
-              </Form.Item>
-            </>
-          )
-        }
-      </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/sz/zrrgl/index.js b/src/views/sz/zrrgl/index.js
deleted file mode 100644
index 9ba593e..0000000
--- a/src/views/sz/zrrgl/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card } from 'antd';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import moment from 'moment';
-
-const Page = () => {
-
-  const types = {
-    1:"行政责任人",
-    2:"主管部门责任人",
-    3:"管理单位责任人",
-    4:"巡查责任人",
-    5:"技术责任人",
-  }
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({})
-  
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {
-      title: '责任类型', key: 'type', dataIndex: 'type', width: 200,
-      render: (value) => <span>{types[value]}</span>
-     },
-    { title: '姓名', key: 'name', dataIndex: 'name', width: 140 },
-    { title: '单位', key: 'unit', dataIndex: 'unit', width: 200},
-    { title: '职务', key: 'duty', dataIndex: 'duty', width: 150, },
-    { title: '联系方式', key: 'contactInfo', dataIndex: 'contactInfo', width: 150, },
-    { title: '主要职责', key: 'dutyBound', dataIndex: 'dutyBound', width: 250,ellipsis: true},
-    {
-      title: '操作', key: 'operation', width: 150, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit(params);
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.zrrgl.delete + `/${params.id}`);
-    }
-  }
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.zrrgl.page).find_noCode);
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-         ...searchVal
-        }
-      };
-      console.log(searchVal);
-      search(params)
-    }
-  }, [searchVal])
-
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{ paddingRight: "0", paddingBottom: "0" }}>
-        <div className='adcdTableBox'>
-          <Card className='nonebox'>
-            <ToolBar setSearchVal={setSearchVal} onSave={command('save')} />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{width:width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/sz/zrrgl/toolbar.js b/src/views/sz/zrrgl/toolbar.js
deleted file mode 100644
index 70a1bd1..0000000
--- a/src/views/sz/zrrgl/toolbar.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import { SearchOutlined, UndoOutlined, PlusOutlined } from '@ant-design/icons';
-import moment from 'moment';
-import NormalSelect from '../../../components/Form/NormalSelect';
-
-
-const ToolBar = ({ setSearchVal, onSave }) => {
-  const [form] = Form.useForm();
-  const types = [
-    {
-      label: "行政责任人",
-      value: 1
-    },
-    {
-      label: "主管部门责任人",
-      value: 2
-    }, {
-      label: "管理单位责任人",
-      value: 3
-    }, {
-      label: "巡查责任人",
-      value: 4
-    }, {
-      label: "技术责任人",
-      value: 5
-    },
-  ]
-
-  const onFinish = (val) => {
-    if (val.dateTimeRangeSo) {
-      val.dateTimeRangeSo = {
-        start: moment(val.dateTimeRangeSo[0]).format("YYYY-MM-DD HH:mm:ss"),
-        end:moment(val.dateTimeRangeSo[1]).format("YYYY-MM-DD HH:mm:ss")
-      }
-    }
-    setSearchVal(val);
-  }
-
-
-  const onReset = () => {
-    form.resetFields();
-  };
-
-
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="责任类型" name="type">
-            <NormalSelect allowClear style={{ width: '150px' }} options={types} />
-          </Form.Item>
-          <Form.Item label="姓名" name="name">
-            <Input allowClear  style={{ width: '150px' }} />
-          </Form.Item>
-          <Form.Item label="联系方式" name="contactInfo">
-            <Input allowClear  style={{ width: '150px' }} />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" icon={<SearchOutlined />} htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button htmlType="button" onClick={onReset} icon={<UndoOutlined />}>
-              重置
-            </Button>
-          </Form.Item>
-          {
-            onSave && (
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            )
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/sz/zzjgck/index.js b/src/views/sz/zzjgck/index.js
deleted file mode 100644
index f92dd40..0000000
--- a/src/views/sz/zzjgck/index.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { useState, useMemo, useEffect } from 'react'
-import ReactEcharts from 'echarts-for-react';
-import jgOption from './jgoption'
-import { httpget2, httppost2,xyt_httpget2 } from '../../../utils/request';
-import apiurl from '../../../service/apiurl';
-import "./index.less"
-export default function Zzjgck() {
-
- 
-  
-    const [deptList, setDeptList] = useState([])
-    const [deptUserList, setDeptUserList] = useState([])
-  
-  // 获取部门数据
-  const getDeptList = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist);
-      if (result.code == 200) {
-        setDeptList(result.data);
-        getDeptUser()
-      }
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-   // 获取部门人员数据
-   const getDeptUser = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:9999});
-      if (result.code == 200) {
-        setDeptUserList(result.rows)
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  const buildTree = (data, parentId) => {
-    let tree = [];
-    data.forEach((node) => {
-        node.title = node.deptName;
-        node.key = node.deptId;
-        
-        if (node.parentId === parentId) {
-        let children = buildTree(data, node.deptId);
-        if (children.length) {
-            node.children = children;
-        }
-        tree.push(node);
-        }
-    });
-    return tree;
-  }
-  
-  // 演示用
-
-  const nameObj = {
-    "刘测": "高伟",
-    "若依": "刘立新",
-    "张雨齐": "彭双林",
-    "杜飞": "王忠明",
-    "李斯": "刘艳华",
-    "李峰": "吴吉琛",
-    "刘玉": "赵国栋",
-    "李星雨": "李星雨",
-    
-  }
-  const handleTreeList = (dept, user) => {
-    const deptArr = dept.map(item => {
-      return {
-        ...item,
-        value: item.deptId,
-        title: item.deptName,
-        // disabled: item.userId ? false : true,
-        children: user.filter(u => u.deptId == item.deptId).map(u => ({
-          ...u,
-          value: u.userId,
-          title: nameObj[u.nickName],
-        }))
-      }
-    }) 
-    const treelist = buildTree(deptArr, 0)
-    return treelist
-  }
-  const treeList = useMemo(() => {
-    if (deptUserList?.length > 0 && deptList?.length > 0) {
-        return handleTreeList(deptList,deptUserList)
-    } else {
-      return []
-    }
-  }, [deptUserList, deptList])
-
-  const jgOptions = useMemo(() => {
-    if (treeList.length > 0) {
-      return jgOption(treeList);
-    } else {
-      return {}
-     }
-  }, [treeList])
-
-  useEffect(() => {
-    getDeptList()
- }, [])
-
-  return (
-      <div className='content-box' style={{ backgroundColor: '#fff', height: '100%', display: 'flex', padding: '10px' }}>
-          <div className='lf' style={{ height: 'calc(100vh - 168px)',width:"100%" }}>
-          <div style={{width:"100%",height:"100%"}}>
-                     <ReactEcharts
-                      option={jgOptions || {}}
-                      style={{ width: "100%", height: '100%' }}
-                      notMerge={true}
-                    />
-                  </div> 
-          </div>
-    </div>
-  )
-}
diff --git a/src/views/sz/zzjgck/index.less b/src/views/sz/zzjgck/index.less
deleted file mode 100644
index 71a8ea8..0000000
--- a/src/views/sz/zzjgck/index.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.org-parent{
-    font-size: 20px;
-    color: '#000';
-    padding: 20px;
-    background: url(../../../../public/assets/images/one.png) 0 0 no-repeat;
-}
-.org-parent1{
-    font-size: 18px;
-    color: '#000';
-    padding: 10px;
-    background: url(../../../../public/assets/images/two.png) 0 0 no-repeat;
-}
-.org-parent2{
-    font-size: 18px;
-    color: '#000';
-    padding: 10px;
-    background: url(../../../../public/assets/images/three.png) 0 0 no-repeat;
-}
-.org-parent3{
-    font-size: 18px;
-    color: '#000';
-    padding: 10px;
-    background: url(../../../../public/assets/images/four.png) 0 0 no-repeat;
-}
diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
deleted file mode 100644
index 7ef1d8e..0000000
--- a/src/views/sz/zzjgck/jgoption.js
+++ /dev/null
@@ -1,155 +0,0 @@
-
-export default function jgOption(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`;
-  const four = `${process.env.PUBLIC_URL}/assets/images/four.png`;
-  return {
-		series: [{
-			type: 'tree',
-			name: 'tree1',
-			data: data1,
-			top: '10%',
-			left: '10%',
-			bottom: '20%',
-			right: '30%',
-			avoidLabelOverlap: true,//防止标签重叠
-			roam: true, //移动+缩放  'scale' 或 'zoom'：只能够缩放。 'move' 或 'pan'：只能够平移。
-			scaleLimit:{ //缩放比例
-				min:0.7,//最小的缩放值
-				max:4,//最大的缩放值  
-		    },
-			layout: 'orthogonal',//树图布局，orthogonal水平垂直方向，radial径向布局 是指以根节点为圆心，每一层节点为环，一层层向外
-			orient: 'LR', //树形方向  TB为上下结构  LR为左右结构
-			// nodePadding: 100,//结点间距 （发现没用）
-			//layerPadding: 30,//连接线长度 （发现没用）
-			symbol: 'circle', //图形形状  rect方形  roundRect圆角 emptyCircle圆形 circle实心圆
-			symbolSize: 14, //状态大小
-			edgeShape: 'polyline', //线条类型  curve曲线
-			initialTreeDepth: 3, //初始展开的层级
-			expandAndCollapse: true,//子树折叠和展开的交互，默认打开
-			lineStyle: {//结构线条样式
-				width: 1,
-				color: '#1E9FFF',
-				type: 'solid'
-			},
-      label: {
-        // 每个节点对应的文本标签样式
-        show: true, // 是否显示标签
-        // rotate:90,
-        distance: 1, // 文本距离图形元素的距离
-        position: ['50%', '50%'], // 标签位置
-        verticalAlign: 'middle', // 文字垂直对齐方式，默认自动，top，middle，bottom
-        align: 'center', // 文字水平对齐方式，默认自动，left，right，center
-        fontSize: 16, // 字体大小
-        color: '#000', // 字体颜色
-        overflow: 'breakAll',
-        formatter: (params) => {
-          // let newName = ''
-          // let len = params.data.title.length
-          // let strLen = (params.data.parentId === 0 || params.data.parentId === 100 ) ? 100 : 1 //一行显示几个字
-          // let rowNum = Math.ceil(len / strLen)
-          // if (len > strLen) {
-          
-          //   for (let p = 0; p < rowNum; p++) {
-          //     let tempStr = ''
-          //     let start = p * strLen
-          //     let end = start + strLen
-          //     if (p == rowNum - 1) {
-          //       tempStr = params.data.title.substring(start, len)
-          //     } else {
-          //       tempStr = params.data.title.substring(start, end) + '\n'
-          //     }
-          //     newName += tempStr
-          //   }
-          // } else {
-          //   newName = params.data.title
-          // }
-          // let n = newName
-          // if (n.length > 16) {
-          //   n = n.slice(0, 16) + '...'
-          // }
-          let n = params.data.title;
-          let parentId = params.data.parentId
-          let userId = params.data.userId;
-          let str = parentId === 0 ? `{parent|${n}}` : 
-            parentId === 100 ? `{parent1|${n}}` : userId != undefined ? `{parent3|${n}}` : `{parent2|${n}}`
-            // let str = parentId === 0 ? `<div class='org-parent'>${n}</div>` :
-          // parentId === 100 ? `<div class='org-parent1'>${n}</div>` : userId != undefined ? `<div class='org-parent3'>${n}</div>` : `<div class='org-parent2'>${n}</div>`
-          return  str;
-        },
-       
-        rich: {
-          parent: {
-            color: '#000',
-            padding: [15, 15],
-            backgroundColor: {
-              image: one
-            },
-            fontSize: 20
-          },
-          parent1: {
-            color: '#000',
-            padding: [10, 10],
-            backgroundColor: {
-              image: two
-            },
-            fontSize: 18
-          },
-          parent2: {
-            fontSize: 18,
-            color: '#000',
-            align: 'center',
-            padding: [10, 10],
-            backgroundColor: {
-              image: three,
-              repeat: "norepeat",
-            },
-          },
-          parent3: {
-            width:200,
-            color: '#000',
-            padding: [10, 10],
-            overflow:'break',
-            backgroundColor: {
-              image: four,
-            },
-            align: 'center',
-            fontSize: 18,
-          },
-        }
-      },
-
-     
-			leaves: { //叶子节点文本样式
-				label: {
-					// backgroundColor: '#81c5f7',
-					backgroundColor: '#fff',
-					color:'#333',
-					position: 'bottom',
-					rotate: 0,//标签旋转。
-					verticalAlign: 'middle',
-          align: 'center',
-          position: ['50%', '50%'], // 标签位置
-					//文本框内文字超过6个字折行
-					//  formatter: function(val) {
-					//  let strs = val.name.split(''); //字符串数组
-					//  let str = ''
-					//  for(let i = 0, s; s = strs[i++];) { //遍历字符串数组
-					//    str += s;
-					//    if(!(i % 6)) str += '\n'; //按需要求余，目前是一个字换一行
-					//  }
-					//  return str
-				  //  },
-				   //或者 
-				   overflow:'break',//break为文字折行，  truncate为文字超出部分省略号显示
-				   lineOverflow:'truncate',//文字超出高度后 直接截取
-				}
-			},
-			expandAndCollapse: true, //默认展开树形结构
-			animationDuration: 550,
-      animationDurationUpdate: 750,
-		}]
-	};
-}
-
diff --git a/src/views/szydd/ddjl/form.js b/src/views/szydd/ddjl/form.js
deleted file mode 100644
index a35bc36..0000000
--- a/src/views/szydd/ddjl/form.js
+++ /dev/null
@@ -1,315 +0,0 @@
-import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-
-import apiurl from '../../../service/apiurl';
-
-import NormalSelect from '../../../components/Form/NormalSelect';
-
-import "./index.less"
-import moment from 'moment';
-const { RangePicker } = DatePicker
-const { Dragger } = Upload;
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-
-
-const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
-
-  const [form] = Form.useForm();
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [fileIds, setFileIds] = useState([])
-  const [iframeSrc, setIframeSrc] = useState('')
-  const [pdfViewOPen, setPdfViewOPen] = useState(false)
-  const [flag,setFlag] = useState(false)
-
-  const [loading, setLoading] = useState(false)
-  
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/dispatchRecord/file/download/${params.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
- /**
-   * @description 上传图片
-   * @param {string}  file 上传的文件
-   */
- const fileChange = (info) => {
-  if (info.file.status === "done") {
-    setLoading(false);
-  }
-  if (info.file.status === "uploading") { 
-    setLoading(true);
-  }
-  if (info.file.status === "error") {
-    message.error("文件上传失败")
-    setLoading(false);
-   }
-  let fileIds = info.fileList?.map(file => {
-    return file.response?.data?.fileId
-  })
-  setFileIds(fileIds)
-  setFileList(info.fileList)
-}
-  /**
-   * @description pdf文件预览
-   * @param {String} params 文件预览url
-   */
-  const viewPdf = (params) => {
-    setIframeSrc(params)
-    setPdfViewOPen(true)
-  }
-  
- 
-  const onfinish = (values) => {
-    let oldFiles = fileList?.map(item => ({fileId:item.response?.data?.fileId}) )
-    if (mode === 'edit') {
-      values.files = oldFiles;
-      values.id = record.id;
-      values.createTime = record.createTime;
-      onEdit(apiurl.ddjl.edit,values)
-    }
-    if (mode === 'save') {
-      values.files = oldFiles
-      onSave(apiurl.ddjl.save,values)
-    }
-  }
- 
-    /**
-   * @description 删除上传的图片
-   * @param {string}  id 删除的id
-   */
-    const deleteFile = (fileId) => {
-      console.log(fileId);
-      let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-      setFileList(filterFile)
-    }
-    useEffect(() => {
-      if (mode != 'save') {
-        const imgFile = record?.files?.map(o => ({
-          name: o.fileName,
-          response: {
-                data: {
-                  filePath: o.filePath,
-                  fileId:o.fileId
-                }
-              },
-      }))
-      setFileList(imgFile)
-      }
-    }, [record, mode])
-
- 
- 
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onfinish}
-        initialValues={record}
-        onValuesChange={(v,b)=>{
-          setFlag(b.status===0?false:true)
-        }}
-      >
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="调度开始时间"
-                name="startTime"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[{required: true}]}
-              >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} showTime allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="调度结束时间"
-                name="endTime"
-                getValueFromEvent={(e,dateString) => dateString}
-                getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
-                rules={[{required: flag}]}
-              >
-                <DatePicker disabled={mode==='view'||!flag} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} showTime allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="操作人"
-                name="opUserName"
-                rules={[{required: true}]}
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>  
-          <Col span={12}>
-              <Form.Item
-                label="调度状态"
-                name="status"
-                rules={[{required: true}]}
-              >
-                <NormalSelect disabled={mode==='view'} options={[{label:"执行中",value:0},{label:"完成",value:1}]}/>
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="调度原因"
-                name="dispatchReason"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="调度详情"
-                name="dispatchDetail"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-              <Input.TextArea disabled={mode==='view'} style={{width:'100%',minHeight:'100px'}} allowClear />
-              </Form.Item>
-          </Col>  
-      </Row>
-
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="附件"
-                name="fieldId"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-            >
-                {mode !== "view" && 
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/dispatchRecord/file/upload/singleSimple"
-                onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.doc .docx .pdf .jpg .png .xlsx .xls
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]} style={{marginTop:"30px"}}>
-               {
-                  fileList?.length > 0 && fileList?.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className="file-item" style={{width:"75%"}}>
-                          <div className='file-description'>
-                          {file.name.indexOf('.docx') > -1 ?
-                            <div
-                              onClick={() => { download(file.response?.data?.fileId) }}
-                              style={{ cursor: 'pointer' }}
-                            >
-                              <FileWordOutlined
-                              style={{ fontSize: 40 }}
-                            />
-                            </div>
-                             :
-                            file.name.indexOf('.pdf') > -1 ?
-                              <div
-                                onClick={() => { viewPdf(file.response?.data?.fileId) }}
-                                style={{ cursor: 'pointer' }}
-                              >
-                              <FilePdfOutlined style={{ fontSize: 40 }} /> 
-                              </div>
-                              :
-                              file.name.indexOf('.zip') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileZipOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                                file.name.indexOf('.xlsx') > -1 ?
-                                <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                :
-                            <Image width={60} src={url +file.response?.data?.filePath} alt='' />
-                            }
-                            <span>{file.name}</span>
-                          </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() =>  deleteFile(file.response?.data?.fileId)}>
-                              <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-              </Row>
-              </Form.Item>
-          </Col>
-        </Row>
-        {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-      <Modal
-        open={pdfViewOPen}
-        width={1000}
-        title=""
-        footer={null}
-        style={{marginTop:"-5%"}}
-        onCancel={() => {
-          setPdfViewOPen(false)
-        }}
-      >
-      <iframe
-          style={{
-            height: '80vh',
-            width: '100%',
-            border: 0,
-            marginTop: 20,
-          }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/dispatchRecord/file/download/${iframeSrc}`)}`}
-        />
-      </Modal>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/szydd/ddjl/index.js b/src/views/szydd/ddjl/index.js
deleted file mode 100644
index d95a50d..0000000
--- a/src/views/szydd/ddjl/index.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card, Alert } from 'antd';
-import { useSelector } from 'react-redux';
-import ToolBar from './toolbar';
-import ModalForm from './form';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
-import { exportFile } from '../../../utils/tools.js';
-import { httppost2, httppost5 } from '../../../utils/request';
-import moment from 'moment';
-
-const statusVal = {'0':'执行中','1':'完成'}
-
-
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-  const [isChecked, setIsChecked] = useState(false)
-  const [delVal, setDelVal] = useState([])
-  const [num,setNum] = useState(0)
-
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    {title: '调度开始时间', key: 'startTime', dataIndex: 'startTime', width: 140,},
-    {title: '调度结束时间', key: 'endTime', dataIndex: 'endTime', width: 140,},
-    {title: '调度原因', key: 'dispatchReason', dataIndex: 'dispatchReason', width: 140,},
-    {title: '调度详情', key: 'dispatchDetail', dataIndex: 'dispatchDetail', width: 140,},
-    {title: '操作人', key: 'opUserName', dataIndex: 'opUserName', width: 140,},
-    {title: '调度状态', key: 'status', dataIndex: 'status', width: 140, render:(v)=>statusVal[v]},
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (
-        <CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        view={viewBtn ? true : false}
-          command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave({status:0});
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      let myParams
-      if(params.id){
-        myParams = [params.id]
-      }else{
-        myParams = params
-      }
-      refModal.current.onDelete(apiurl.ddjl.del,myParams);
-      setIsChecked(false)
-    }
-  }
-  
-
-  const exportExcel = () => {
-    let params = {
-      ...searchVal,
-      "pageSo": {
-        "pageSize": tableProps.pagination.current,
-        "pageNumber": tableProps.pagination.pageSize
-      },
-    }
-    httppost5(apiurl.ddjl.export, params).then(res => {
-        exportFile(`调度记录.xlsx`,res.data)
-    })
-  }
- 
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.ddjl.page).find_noCode);
-
-  console.log(tableProps);
-
- /**
-   * @description 处理成功的回调
-   */
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      }; 
-      search(params)
-    }
-  }, [searchVal])
-
-  useEffect(()=>{
-    (async()=>{
-      const { code, data } = await httppost2(apiurl.ddjl.page,{
-        "pageSo": {
-            "pageSize": 10,
-            "pageNumber": 1
-        },
-        "dateSo": {
-            "start": moment().format('YYYY-01-01 00:00:00'),
-            "end": moment().format('YYYY-MM-DD HH:mm:ss')
-        }
-      })
-      if(code===200){
-        setNum(data.total)
-      }
-    })()
-  })
-  
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%",overflowY:"auto"}}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              setIsChecked={(v)=>setIsChecked(v)}
-              setDelVal={(v)=>setDelVal(v)}
-              isChecked={isChecked}
-              exportFile={exportExcel}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-
-            <Alert 
-                message={moment().format('YYYY')+'年共执行调度任务'+num+'个。'} 
-                style={{marginBottom:'10px'}}
-                type="info" 
-            />
-
-            {
-                isChecked?
-                <Alert 
-                    message={'已选择'+delVal.length+'项'} 
-                    style={{marginBottom:'10px'}}
-                    type="error" 
-                    action={delVal.length>0?<CrudOpRender_text del={true} command={(type) => () => command(type)(delVal)} />:null}
-                />:null
-            }
-            <Table 
-              columns={columns} 
-              rowKey="inx" 
-              {...tableProps} 
-              scroll={{ x: width , y: "calc( 100vh - 400px )"}}
-              rowSelection={
-                isChecked?
-                {
-                    type: 'checkbox',
-                    onChange: (v,e)=>setDelVal(e.map((i)=>i.id))
-                }:null
-              }
-            />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/szydd/ddjl/index.less b/src/views/szydd/ddjl/index.less
deleted file mode 100644
index e0bd728..0000000
--- a/src/views/szydd/ddjl/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-.time-line{
-    width: 50%;
-    margin-left: 6%;
-    margin-top: 1%;
-    .time-line-item{
-        display: flex;
-        // align-items: center;
-        column-gap: 20px;
-        .item-right{
-            flex:1
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/szydd/ddjl/toolbar.js b/src/views/szydd/ddjl/toolbar.js
deleted file mode 100644
index 4a23998..0000000
--- a/src/views/szydd/ddjl/toolbar.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import NormalSelect from '../../../components/Form/NormalSelect';
-
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, storeData, role, setIsChecked, setDelVal, isChecked, exportFile }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
-  const [form] = Form.useForm();
-
-  const delChange = ()=>{
-    if(isChecked){
-      setIsChecked(false)
-      setIsChecked(false)
-    }else{
-      setIsChecked(true)
-      setIsChecked(true)
-      setDelVal([])
-    }
-  }
-
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
-  useEffect(() => {
-    let dateSo = {
-      start: moment().format('YYYY-01-01 00:00:00'),
-      end: moment().format('YYYY-MM-DD 00:00:00')
-    }
-    form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
-    setSearchVal({ dateSo })
- }, [])
- 
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-        <Form.Item label="时间段" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "300px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          <Form.Item label="操作人" name="opUserName">
-            <Input allowClear  style={{width:'150px'}}/>
-          </Form.Item>
-          <Form.Item label="调度状态" name="status">
-            <NormalSelect options={[{label:"执行中",value:"0"},{label:"完成",value:"1"}]} style={{width:'150px'}}/>
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button size='Default' onClick={delChange} type={isChecked?"primary":""}>删除</Button>
-          </Form.Item>
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-          <Form.Item>
-            <Button size='Default' onClick={exportFile}>导出</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/video/http.js b/src/views/video/http.js
deleted file mode 100644
index c7dc668..0000000
--- a/src/views/video/http.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { httpget2,httppost2 } from "../../utils/request"
-import apiUrl from '../../service/apiurl'
-
-export const treeList = async (params) => {
-    const res = await httppost2(apiUrl.spjk.treeList, params)
-    return res
-}
-
-export const treeListById = async (params) => {
-    const res = await httpget2(`${apiUrl.spjk.treeListById}${params}`, params)
-    return res
-}
-
-export const srcData = async (params) => {
-    const res = await httpget2(`${apiUrl.spjk.srcData}${params}`)
-    return res
-}
-
-export const ysyToken = async (params) => {
-    const res = await httpget2(apiUrl.spjk.ysyToken)
-    return res
-}
-
-export const videoList = async (params) => {
-    const res = await httppost2(apiUrl.spjk.videoList)
-    return res
-}
-// export const videoBystcd = async (params) => {
-//     const res = await httpget2(`${apiUrl.spjk.videoBystcd}${params}`)
-//     return res
-// }
\ No newline at end of file
diff --git a/src/views/video/index.css b/src/views/video/index.css
deleted file mode 100644
index 03526b6..0000000
--- a/src/views/video/index.css
+++ /dev/null
@@ -1,80 +0,0 @@
-.videoList {
-  height: 100%;
-}
-.videoList .treeRight {
-  width: 350px;
-  height: 100%;
-  padding: 16px 8px;
-  background-color: #fff;
-  box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
-}
-.videoList .treeRight .ant-tree-node-selected .iconSelect {
-  color: blue;
-}
-.videoList .treeLeft {
-  flex: 1;
-  margin-left: 12px;
-  background-color: #fff;
-  height: 100%;
-  padding: 16px 8px;
-  box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
-}
-.videoList .treeLeft .splitScreen {
-  height: 100%;
-}
-.videoList .treeLeft .splitScreen .borderF {
-  height: calc(100% - 40px);
-}
-.videoList .treeLeft .splitScreen .borderFa {
-  width: 100%;
-  height: 100%;
-  background: #f6f9fd;
-  border: 1px solid rgba(42, 117, 214, 0.2);
-  position: relative;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  padding-bottom: 10px;
-}
-.videoList .treeLeft .splitScreen .borderType {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-}
-.videoList .treeLeft .splitScreen .borderType .text {
-  width: 100%;
-  height: 22px;
-  font-size: 16px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #79a2d7;
-  text-align: center;
-}
-.videoList .treeLeft .splitScreen .videoBorder {
-  border: 3px solid red;
-}
-.videoList .treeLeft .splitScreen .videoBorder1 {
-  flex: 1;
-  height: 100%;
-}
-.videoList .treeLeft .splitScreen .videoBorder4 {
-  width: 50%;
-  height: 50%;
-}
-.videoList .treeLeft .splitScreen .videoBorder9 {
-  width: 33%;
-  height: 33%;
-}
diff --git a/src/views/video/index.js b/src/views/video/index.js
deleted file mode 100644
index 53bcd74..0000000
--- a/src/views/video/index.js
+++ /dev/null
@@ -1,222 +0,0 @@
-import TreeData from "./treeData"
-import './index.less'
-import SplitScreen from "./splitScreen"
-import { useEffect, useState } from "react"
-import { treeList, srcData, videoList, ysyToken } from './http'
-import { DownOutlined, VideoCameraFilled } from '@ant-design/icons';
-import VideoControler from "../../components/VideoControler"
-import { httppost2 } from "../../utils/request"
-import apiurl from "../../service/apiurl"
-
-
-const VideoList = () => {
-    const [videoArr, setVideo] = useState([])
-    const [count, setCount] = useState(999)
-    const [indexData, setIndex] = useState(999)
-    const [size, setSize] = useState(1)
-    const [treeListData, setTreeData] = useState([])
-    const [selectList, setSelectList] = useState()
-    const [clickVideo, setClickVideo] = useState('')
-    // const getSrc=async(indexCode)=>{
-    //     return await srcData(indexCode)
-    // }
-    const selectedKeys = async (list, node) => {
-        console.log(node,'node');
-        let src = null
-        let obj = {}
-        setSelectList(list[list.length - 1])
-        if (indexData === 999) {
-            if (node.selected) {
-                console.log(node.node.relType,'asdkjashkd');
-                src = node.node.relType == "ysy"?(await ysyToken(node.node.indexCode)).data:(await srcData(node.node.indexCode)).data
-                obj = { ...node.node, src: src }
-                if (videoArr.length < size) {
-                    setVideo([...videoArr, obj])
-                } else {
-                    videoArr[size - 1] = obj
-                    console.log(videoArr, '45678');
-                    setVideo((videoArr) => {
-                        const newA = [...videoArr]
-                        return newA
-                    })
-                }
-            } else {
-                let count = videoArr.findIndex(item => item.id === node.node.id)
-                setVideo(() => {
-                    const newA = [...videoArr]
-                    newA.splice(count, 1)
-                    return newA
-                })
-            }
-        } else {
-            if (node.selected) {
-                src = node.node.relType == 'ysy'?(await ysyToken(node.node.indexCode)).data:(await srcData(node.node.indexCode)).data
-                obj = { ...node.node, src: src }
-                videoArr[indexData] = obj
-                setVideo((videoArr) => {
-                    const newA = [...videoArr]
-                    return newA
-                })
-            }
-           
-        }
-
-        // if(videoArr.length < size){
-        //     setVideo([...videoArr, obj])
-        // }else{
-        //     let count = videoArr.findIndex(item => item.id === node.node.id)
-        //     setVideo(() => {
-        //         const newA = [...videoArr]
-        //         newA.splice(count,1)
-        //         return newA
-        //     })
-        // }
-
-        console.log(videoArr);
-        // let count = videoArr.findIndex(item => item.id === info.id)
-        // if (count === -1) {
-        //     if (videoArr.length < size) {
-        //         setVideo([...videoArr, obj])
-        //     } else {
-        //         videoArr[size - 1] = obj
-        //         setVideo((videoArr) => {
-        //             const newA = [...videoArr]
-        //             return newA
-        //         })
-        //     }
-
-        // } else {
-        //     videoArr[count] = { src: '' }
-        //     setVideo((videoArr) => {
-        //         const newA = [...videoArr]
-        //         return newA
-        //     })
-        // }
-        // console.log(videoArr);
-        // setVideo([...videoArr, obj])
-        // if (indexData === 999) {
-
-        //     let count = videoArr.findIndex(item => item.id === info.id)
-        //     console.log(obj,count);
-        //     if (obj.isLeaf && count === -1) {
-        //         console.log([1, 4, 9].includes(size) , videoArr.length < size);
-        //         if ([1, 4, 9].includes(size) && videoArr.length < size) {
-        //             setVideo([...videoArr, obj])
-        //         } else if ([1, 4, 9].includes(size) && videoArr.length === size) {
-        //             console.log(222);
-        //             videoArr[size - 1] = obj
-        //             setVideo((videoArr) => {
-        //                 const newA = [...videoArr]
-        //                 return newA
-        //             })
-        //         }
-        //     }
-        //     if (count !== -1) {
-        //         setCount(count)
-        //     }
-        // } else {
-        //     videoArr[indexData] = obj
-        //     setVideo((videoArr) => {
-        //         const newA = [...videoArr]
-        //         return newA
-        //     })
-        // }
-
-    }
-    const clickIndex = (index,item) => {
-        setIndex(index)
-        setSelectList(videoArr[index])
-    }
-    const getType = (size) => {
-        console.log(size, videoArr.slice(0, size), 'szie');
-        setSize(size)
-        setIndex(999)
-        setVideo(() => {
-            const newA = videoArr.slice(0, size)
-            console.log(newA);
-            return newA
-        })
-        
-    }
-    const getTreeData = async () => {
-        const res = await treeList()
-        const res1 = await videoList()
-        const arr = res1.data.filter(item => item.menuId).map((item, index) => {
-            item.parentId = item.menuId
-            item.id = 999 + index
-            item.isLeaf = true
-            // item.icon=<VideoCameraFilled />
-            return item
-        })
-        const arr1 = [...arr, ...res.data]
-        console.log("before",arr1);
-        setTreeData(buildTree(arr1))
-    }
-    function buildTree(data, parentId="0") {
-        const tree = [];
-        for (const item of data) {
-            if (item.parentId == parentId) {
-                const children = buildTree(data, item.id);
-                if (children.length > 0) item.children = children;
-                tree.push(item)
-            }
-
-        }
-        return tree;
-    }
-    let timer = null;
-    // 云台控制
-    const onOperation = async(params) => {
-        let data = {
-            ...params,
-            indexCode: selectList?.indexCode,
-            action:0
-        }
-        try {
-            const res = await httppost2(apiurl.spjk1.aiWarn.controler, data)
-            if (res.code == 200) {
-                if(timer) clearTimeout(timer)
-                timer = setTimeout(() => {
-                    onOperation1(params)
-                },500)
-            }
-        } catch (error) {
-            console.log(error);
-        }
-    }
-    const onOperation1 = async(params) => {
-        let data = {
-            ...params,
-            indexCode: selectList?.indexCode,
-            action:1
-        }
-        try {
-            const res = await httppost2(apiurl.spjk1.aiWarn.controler,data)
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    useEffect(() => {
-        getTreeData()
-    }, [])
-    return (
-        <div className='flex videoList'>
-            <div className='treeRight'>
-                <TreeData size={size} selectedKeys={selectedKeys} treeListData={treeListData} videoArr={videoArr} />
-                {
-                    selectList && selectList.type == 1 ? 
-                        <div style={{position:"absolute",bottom:0,left:0}}>
-                            <VideoControler
-                                selectItem={selectList}
-                                onOperation={onOperation}
-                            />
-                        </div>
-                        : null
-                }
-            </div>
-            <div className='treeLeft'><SplitScreen count={count} videoArr={videoArr} clickIndex={clickIndex} getType={getType} /></div>
-        </div>
-    )
-}
-export default VideoList
\ No newline at end of file
diff --git a/src/views/video/index.less b/src/views/video/index.less
deleted file mode 100644
index 1578084..0000000
--- a/src/views/video/index.less
+++ /dev/null
@@ -1,90 +0,0 @@
-.videoList{
-    height: 100%;
-    .treeRight{
-        position: relative;
-        width: 350px;
-        height: 100%;
-        padding: 16px 8px;
-        background-color: #fff;
-        box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
-        .ant-tree-iconEle{
-            .iconSelect{
-                // color: blue;
-                width: 25px;
-                height: 25px;
-                margin-bottom: 5px;
-            }
-            
-        }
-    }
-    .treeLeft{
-        flex: 1;
-        margin-left: 12px;
-        background-color: #fff;
-        height: 100%;
-        padding: 16px 8px;
-        box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
-        .splitScreen{
-            height: 100%;
-            .borderF{
-                height: calc(100% - 40px);
-                // padding: 20px;
-            }
-            .borderFa{
-                width: 100%;
-                height: 100%;
-                background: #f6f9fd;
-                border: 1px solid rgba(42, 117, 214, .2);
-                position: relative;
-                display: -webkit-box;
-                display: -ms-flexbox;
-                display: flex;
-                -webkit-box-orient: vertical;
-                -webkit-box-direction: normal;
-                -ms-flex-direction: column;
-                flex-direction: column;
-                -webkit-box-align: center;
-                -ms-flex-align: center;
-                align-items: center;
-                -webkit-box-pack: center;
-                -ms-flex-pack: center;
-                justify-content: center;
-                padding-bottom: 10px;
-            }
-            .borderType{
-                width: 100%;
-                height: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                flex-direction: column;
-                .text{
-                    width: 100%;
-                    height: 22px;
-                    font-size: 16px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #79a2d7;
-                    text-align: center;
-                }
-            }
-            .videoBorder{
-                border: 3px solid red;
-            }
-            .videoBorder1{
-                flex: 1;
-                height: 100%;
-            }
-            .videoBorder4{
-                width: 50%;
-                height: 50%;
-            }
-            .videoBorder9{
-                width: 33%;
-                height: 33%;
-            }
-        }
-
-    }
-}
-
diff --git a/src/views/video/splitScreen.tsx b/src/views/video/splitScreen.tsx
deleted file mode 100644
index f6d9316..0000000
--- a/src/views/video/splitScreen.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import TreeData from "./treeData"
-import './index.less'
-import { Radio, Tabs, Empty } from "antd"
-import { useEffect, useRef, useState } from "react";
-import HFivePlayer from "../../components/video1Plary";
-import { translate } from "ol/transform";
-// import HFivePlayer from "./video1";
-
-const SplitScreen: React.FC = (props: any) => {
-  const [size, setSize] = useState(1);
-  const [list, setList] = useState<any>([]);
-  const [videoList, setVideoList] = useState<any>([]);
-  const [num, setNum] = useState<any>(999);
-  const [styleType, setStyle] = useState(false);
-
-
-  const onChange = (e: any) => {
-    setSize(Number(e));
-    handDate(Number(e))
-    setNum(999)
-  };
-  const handDate = (size: any) => {
-    props.getType(size)
-    console.log(new Array(size).fill(1),'4678999');
-    
-    setList(new Array(size).fill(1))
-    setVideoList([])
-  }
-  const clickVideo = (index: any,item:any) => {
-    if(num == index){
-        props.clickIndex(999,item)
-        setStyle(true)
-        setNum(999)
-    }else{
-      props.clickIndex(index,item)
-      setStyle(false)
-      setNum(index)
-    }
-    
-  }
-  const getNum = () => {
-    if (num === 999) {
-      // return props.videoArr.length - 1
-    } else {
-      return num
-    }
-  }
-  useEffect(() => {
-    if (props.count !== 999) {
-      setNum(props.count)
-    }
-  }, [props.count])
-  useEffect(() => {
-    
-    setVideoList(props.videoArr)
-    console.log(props.videoArr,'props.videoArr');
-    
-  }, [props.videoArr])
-
-  useEffect(() => {
-    onChange('9')
-  }, [])
-  const items = [
-    { key: '1', label: '单屏' },
-    { key: '4', label: '四分屏' },
-    { key: '9', label: '九分屏' },
-  ]
-  return (
-    <div className='splitScreen'>
-      <Tabs
-        onChange={onChange}
-        defaultActiveKey='9'
-        type="card"
-        items={items}
-      />
-      {/* {props.videoArr} */}
-      <div className={['flex', 'flexwarp', 'borderF'].join(' ')} style={{ position: 'relative' }}>
-        {list.map((item: any, index: any) => {
-          return <div onClick={() => clickVideo(index,item)}
-            // onClick={()=>clickVideo(index)}
-            className={[getNum() == index ? 'videoBorder' : null,
-            size == 1 ? 'videoBorder1' : null, size == 4 ? 'videoBorder4' : null,
-            size == 9 ? 'videoBorder9' : null,'borderFa'].join(' ')}>
-            {props.videoArr[index]&&<div style={{height:'100%',width:'100%'}}>
-              <div style={{ height: 'calc(100% - 20px)',width:'100%' }}>
-              {videoList.length&&<HFivePlayer size={size} wsUrl={videoList[index]} playerID={index} />}
-              </div>
-              <div style={{ textAlign: 'center' }}>{videoList[index]?.name}</div>
-            </div>}
-            {!props.videoArr[index]&&<div className='borderType'>
-              <img src={require('../../assets/images/no-video.png')}/>
-              <div className='text'>暂无视频数据</div>
-              </div>}
-          </div>
-
-        })}
-      </div>
-    </div>
-  )
-}
-export default SplitScreen
\ No newline at end of file
diff --git a/src/views/video/treeData.tsx b/src/views/video/treeData.tsx
deleted file mode 100644
index 1fcf51e..0000000
--- a/src/views/video/treeData.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { DownOutlined, VideoCameraFilled } from '@ant-design/icons';
-import React, { useEffect, useState } from 'react';
-import { Tree } from 'antd';
-import { treeListById,srcData } from './http'
-
-interface DataNode {
-  title: string;
-  key: string;
-  isLeaf?: boolean;
-  children?: DataNode[];
-}
-
-let arr:any=[]
-// It's just a simple demo. You can use tree map to optimize update perf.
-const updateTreeData = (list: DataNode[], key: React.Key, children: DataNode[]): DataNode[] =>
-  list.map((node: any) => {
-    if (node.id === key) {
-      return {
-        ...node,
-        children,
-      };
-    }
-    if (node.children) {
-      return {
-        ...node,
-        children: updateTreeData(node.children, key, children),
-      };
-    }
-    return node;
-  });
-
-const TreeData = (props: any) => {
-  console.log(props.treeListData);
-  
-  const [checkNode, setCheckNode] = useState([]);
-  const onSelect = async (selectedKeys: (any | never[]), info: any) => {
-    if(!info.node.isLeaf && !info.node.selected)return
-    if(selectedKeys.length < props.size){
-      setCheckNode(selectedKeys)
-      props.selectedKeys(info.selectedNodes,info)
-    }else{
-      setCheckNode((selectedKeys) => {
-                const newA:any = [...selectedKeys]
-                newA[Number(props.size)-1]=info.node.id
-                
-                const arr =newA.map((item:any)=>{
-                  let count = info.selectedNodes.findIndex((itemq:any) => itemq.id === item)
-                  if(count !== -1){
-                    return info.selectedNodes[count] 
-                  }
-                })
-                 props.selectedKeys(arr,info)
-                return newA
-            })
-    }
- 
-  };
-  const iconSelect = (a: any) => {
-    const type = a.data.type;
-    // const online = a.data.online
-    if (type == 1) {
-      return <img src={`${process.env.PUBLIC_URL}/assets/qiujiG.png`} alt='' className='iconSelect'/>
-  
-    } else if(type ==2) {
-      return <img
-        src={`${process.env.PUBLIC_URL}/assets/images/jk.png`}
-        alt=''
-        className='iconSelect'
-        style={{width:17,height:18}}
-      />
-    }
-    
-    // if (a.data.isLeaf) {
-    //   if(a.data.type ==1)
-    //   return <VideoCameraFilled className='iconSelect'/>
-    // }
-  }
-  useEffect(()=>{
-    setCheckNode(() => {
-      const newA = props.videoArr.map((item:any)=>{
-        return item?.id
-      })
-      return newA
-  })
-    // setCheckNode(selectedKeys)
-  },[props.videoArr])
-  // useEffect(()=>{})
-  return <div style={{height:'100%',overflowY:'scroll'}}>
-    {props.treeListData.length !== 0 &&
-      <Tree
-        treeData={props.treeListData}
-        fieldNames={{ title: 'name', key: 'id' }}
-        defaultExpandAll={true}
-        multiple
-        showIcon
-        key='id'
-        // height={600}
-        onSelect={onSelect}
-        icon={iconSelect}
-        selectedKeys={checkNode}
-         /> } 
-  </div>;
-};
-
-export default TreeData;
\ No newline at end of file
diff --git a/src/views/ysgzq/ssgq/dbaq/bxjc/index.css b/src/views/ysgzq/ssgq/dbaq/bxjc/index.css
deleted file mode 100644
index 61a3476..0000000
--- a/src/views/ysgzq/ssgq/dbaq/bxjc/index.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.syjcPage_bxjc {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  height: 100%;
-}
-.syjcPage_bxjc .eacherBox {
-  width: 70% !important;
-  height: calc(100vh - 324px) !important;
-  flex: 2 !important;
-  padding: 10px;
-}
-.syjcPage_bxjc .tableBox {
-  flex: 1;
-  position: relative;
-}
-.syjcPage_bxjc .tableBox .tabs {
-  text-align: right;
-  margin-bottom: 10px;
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/bxjc/index.js b/src/views/ysgzq/ssgq/dbaq/bxjc/index.js
deleted file mode 100644
index 39fa681..0000000
--- a/src/views/ysgzq/ssgq/dbaq/bxjc/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Table, Typography } from 'antd'
-import './index.less'
-
-import ToolBal from './toolBar'
-import TablePage from './table'
-
-const { Text } = Typography
-
-const YjlbPage = ({ params, data, resCd, yjBool }) => {
-  console.log('变形监测分析', resCd)
-  const [option, SetOption] = useState([
-    {
-      value: '0',
-      label: '全部'
-    },
-    {
-      value: '1',
-      label: '渗压'
-    },
-    {
-      value: '2',
-      label: '位移'
-    }
-  ])
-  const [resCode, SetResCode] = useState(resCd)
-  const [paramsData, SetParamsData] = useState()
-  useEffect(() => {
-    if (yjBool == 1) {
-      SetOption([
-        {
-          value: '0',
-          label: '全部'
-        },
-        {
-          value: '1',
-          label: '渗压'
-        }
-      ])
-    } else {
-      SetOption([
-        {
-          value: '0',
-          label: '全部'
-        },
-        {
-          value: '2',
-          label: '位移'
-        }
-      ])
-    }
-  }, [yjBool])
-
-  useEffect(() => {
-    doSearch()
-  }, [])
-
-  const doSearch = obj => {
-    if (resCd && obj?.startDate) {
-      SetParamsData({ ...obj, resCd: resCode })
-    }
-  }
-
-  return (
-    <>
-      <div className='syjcPage'>
-        <div className='syjcPage_con'>
-          <ToolBal search={doSearch} yjBool={yjBool}></ToolBal>
-          <TablePage params={{ ...paramsData }} resCd={resCd}></TablePage>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default YjlbPage
diff --git a/src/views/ysgzq/ssgq/dbaq/bxjc/index.less b/src/views/ysgzq/ssgq/dbaq/bxjc/index.less
deleted file mode 100644
index da0cfb7..0000000
--- a/src/views/ysgzq/ssgq/dbaq/bxjc/index.less
+++ /dev/null
@@ -1,20 +0,0 @@
-.syjcPage_bxjc {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  height: 100%;
-  .eacherBox {
-    width: 70% !important;
-    height: calc(100vh - 324px) !important;
-    flex: 2 !important;
-    padding: 10px;
-  }
-  .tableBox {
-    flex: 1;
-    position: relative;
-    .tabs {
-      text-align: right;
-      margin-bottom: 10px;
-    }
-  }
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/bxjc/table.js b/src/views/ysgzq/ssgq/dbaq/bxjc/table.js
deleted file mode 100644
index 574d29d..0000000
--- a/src/views/ysgzq/ssgq/dbaq/bxjc/table.js
+++ /dev/null
@@ -1,539 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { Table, Typography, Radio } from 'antd'
-import '../index.less'
-import { unionList, dwsWyList } from '../../../../../service/dbaq'
-import LineBarEacher from '../eachers/lineBarEacher2'
-
-import { getColumns, getDatesInRange } from '../utils'
-
-const { Text } = Typography
-
-const SyjcPage = ({ params, date, resCd, tableData1, pressList, avgData }) => {
-  const [col, SetColumns] = useState([])
-  const [tableData, SetTable] = useState([])
-  const [echartsDt, SetechartsDt] = useState()
-  const [echartsRz, SetechartsRz] = useState()
-  const [echartsDrp, SetechartsDrp] = useState()
-  const [series, Setseries] = useState([])
-  const [defaultVal, SetDefaultVal] = useState('x')
-  const [defaultVal2, SetDefaultVal2] = useState('x')
-  const [changeLin, SetChangeLin] = useState('x')
-  const [tableDate, SetTableDate] = useState()
-  const [loading, setLoading] = useState(true)
-  const [maxY, SetMaxY] = useState()
-
-  const [footerData, SetFooterData] = useState([
-    {
-      avgValue: '',
-      cd: '',
-      dt: '',
-      stCd: '',
-      resCd: '',
-      rz: ''
-    }
-  ])
-
-  useEffect(() => {
-    if (resCd && params.startDate) {
-      console.log('变形监测分析', params, resCd)
-      let o = {
-        stm: params.startDate + ' 00:00:00',
-        etm: params.endDate + ' 23:59:59',
-        resCd: resCd
-      }
-
-      let o1 = {
-        startDate: params.startDate,
-        endDate: params.endDate
-      }
-      setLoading(true)
-      tableList(o, o1)
-    }
-  }, [params])
-
-  useEffect(() => {
-    if (tableDate?.wy.length > 0) {
-      getData(tableDate, {
-        startDate: params.startDate,
-        endDate: params.endDate
-      })
-      if (defaultVal == 'y') SetChangeLin('h')
-      if (defaultVal == 'x') SetChangeLin('x')
-    }
-  }, [defaultVal])
-
-  const tableList = async (obj, date) => {
-    await unionList(obj).then(res => {
-      let a = []
-      let ar = []
-      let obj2 = {}
-      if (res.wy.length > 0) {
-        getData(res, date)
-        setLoading(false)
-        SetTableDate(res)
-      }
-    })
-  }
-
-  const getData = (res, date) => {
-    let a = []
-    let ar = []
-    let obj2 = {}
-    if (res.wy.length > 0) {
-      // 获取所有时间
-      // getDatesInRange(obj.stm, obj.etm)
-      console.log('dateArray111', date)
-
-      // 使用示例
-      const startDate = new Date(date.startDate)
-      const endDate = new Date(date.endDate)
-      const dateArray = getDatesInRange(startDate, endDate)
-      // console.log('dateArray', dateArray)
-
-      // 打印日期数组
-      // dateArray.forEach(function (date) {
-      //   console.log(date.toISOString().split('T')[0])
-      // })
-
-      let newArr = dateArray.map(date => {
-        let item = date.toISOString().split('T')[0]
-        return { dt: item, list: [] }
-      })
-      let obj = {}
-      // console.log('newArr111', newArr)
-      newArr.forEach(item => {
-        res.wy.forEach(obj => {
-          if (item.dt == obj.dt) {
-            item['cd'] = obj.cd
-            item.list.push(obj)
-            item[obj.cd + 'x'] = obj.avgDeValue
-            item[obj.cd + 'x'] = obj.avgDeValue
-            item[obj.cd + 'y'] = obj.avgDnValue
-            item[obj.cd + 'h'] = obj.avgDuValue
-          }
-        })
-
-        res.water.forEach(item1 => {
-          if (item.dt == item1.dt) {
-            item.rz = item1.rz
-          }
-        })
-      })
-      console.log('newArr111', newArr)
-
-      res.wy.forEach(o2 => {
-        if (!obj[o2.dt]) {
-          obj[o2.dt] = []
-        }
-        obj[o2.dt].push({
-          dt: o2.dt,
-          cd: o2.cd,
-          avgDeValue: o2.avgDeValue,
-          avgDnValue: o2.avgDnValue,
-          avgDuValue: o2.avgDuValue
-        })
-      })
-
-      let b1 = res.wy.map(item => item.cd)
-      let t2 = Array.from(new Set(b1))
-
-      let c2 = []
-      if (defaultVal == 'x') {
-        c2 = t2.map((o4, index) => {
-          return {
-            title: o4,
-            dataIndex: o4,
-            key: o4,
-            align: 'center',
-            children: [
-              {
-                title: 'x',
-                dataIndex: o4 + 'x',
-                key: o4 + 'x',
-                y1: 'x',
-                align: 'center'
-              },
-              {
-                title: 'y',
-                dataIndex: o4 + 'y',
-                key: o4 + 'y',
-                y1: 'x',
-                align: 'center'
-              }
-            ]
-          }
-        })
-      } else {
-        c2 = t2.map((o4, index) => {
-          return {
-            title: o4,
-            dataIndex: o4,
-            key: o4,
-            align: 'center',
-            children: [
-              {
-                title: '',
-                dataIndex: o4 + 'h',
-                key: o4 + 'h',
-                y1: 'h',
-                align: 'center'
-              }
-            ]
-          }
-        })
-      }
-
-      let bd = []
-      let de = []
-      console.log('objobjobj', obj)
-      for (const [key, value] of Object.entries(obj)) {
-        obj2.dt = key
-        value.forEach(y => {
-          if (key === y.dt) {
-            c2.forEach(it => {
-              if (it.title == y.cd && key === y.dt) {
-                bd.push({
-                  title: y.cd,
-                  dt: key,
-                  [it.title + 'x']: y.avgDeValue,
-                  [it.title + 'x']: y.avgDeValue,
-                  [it.title + 'y']: y.avgDnValue,
-                  [it.title + 'h']: y.avgDuValue
-                })
-                y[it.title + 'x'] = y.avgDeValue
-                y[it.title + 'x'] = y.avgDeValue
-                y[it.title + 'y'] = y.avgDnValue
-                y[it.title + 'h'] = y.avgDuValue
-              }
-            })
-          }
-        })
-        de.push(value)
-      }
-
-      if (bd.length > 0) {
-        bd.forEach(item => {
-          de.forEach(uy => {
-            uy.forEach(it => {
-              if (item.dt == it.dt) {
-                item = Object.assign(item, it)
-              }
-            })
-          })
-        })
-      }
-
-      // 去重
-      bd = bd.reduce((acc, curr) => {
-        const isDuplicate = acc.some(item => item.dt === curr.dt)
-        if (!isDuplicate) {
-          acc.push(curr)
-        }
-        return acc
-      }, [])
-
-      if (res.water.length > 0) {
-        bd.forEach(item => {
-          res.water.forEach(item1 => {
-            if (item.dt == item1.dt) {
-              item.rz = item1.rz
-            }
-          })
-        })
-      }
-
-      const resWy = res.wy.reduce((acc, curr) => {
-        const isDuplicate = acc.some(
-          item => item.cd.toUpperCase() === curr.cd.toUpperCase()
-        )
-        if (!isDuplicate) {
-          acc.push(curr)
-        }
-        return acc
-      }, [])
-
-      Setseries(resWy)
-      console.log('c2', c2)
-      // 排序
-      c2.sort((a, b) => a.key - b.key)
-      SetColumns(c2)
-
-      console.log('bd', newArr)
-
-      SetTable(newArr)
-
-      let d1 = [
-        {
-          dt: '最大值'
-        },
-        {
-          dt: '日期'
-        },
-        {
-          dt: '最小值'
-        },
-        {
-          dt: '日期'
-        },
-        {
-          dt: '变幅'
-        }
-      ]
-      let d2 = {}
-      let wy = res.wy
-      wy.forEach(o => {
-        if (!d2[o.cd]) {
-          d2[o.cd] = []
-        }
-
-        d2[o.cd].push({
-          title: o.cd,
-          dt: o.dt,
-          [o.cd + 'x']: o.avgDeValue,
-          [o.cd + 'y']: o.avgDnValue,
-          [o.cd + 'h']: o.avgDuValue,
-          [o.cd + 'avgDeValue']: o.avgDeValue,
-          [o.cd + 'avgDnValue']: o.avgDnValue,
-          [o.cd + 'avgDuValue']: o.avgDuValue
-        })
-      })
-
-      let d3 = [],
-        keys = []
-
-      for (const [key, value] of Object.entries(d2)) {
-        keys.push(key)
-        value.forEach(item => {
-          if (item.title == key) {
-            d3.push(item)
-          }
-        })
-      }
-
-      if (d2) {
-        d1.forEach((o1, idx, sel) => {
-          c2.forEach((o, i) => {
-            // console.log(' d1.forEach', keys[i], o1, idx)
-            if (keys[i] == o1.title) {
-            }
-
-            o1['maxDe'] = bd.reduce(
-              (maxObj, currentObj) =>
-                currentObj.avgDeValue > maxObj.avgDeValue ? currentObj : maxObj,
-              { avgDeValue: -Infinity }
-            )
-
-            o1['maxDn'] = bd.reduce(
-              (maxObj, currentObj) =>
-                currentObj.avgDnValue > maxObj.avgDnValue ? currentObj : maxObj,
-              { avgDnValue: -Infinity }
-            )
-
-            o1['maxDu'] = bd.reduce(
-              (maxObj, currentObj) =>
-                currentObj.avgDuValue > maxObj.avgDuValue ? currentObj : maxObj,
-              { avgDuValue: -Infinity }
-            )
-            // x
-            o1['minDe'] = bd.reduce((minObj, currentObj) => {
-              return currentObj[keys[i] + 'x'] < minObj[keys[i] + 'x']
-                ? currentObj
-                : minObj
-            }, d2[keys[i]][0])
-            // y
-            o1['minDn'] = bd.reduce((minObj, currentObj) => {
-              return currentObj[keys[i] + 'y'] < minObj[keys[i] + 'y']
-                ? currentObj
-                : minObj
-            }, d2[keys[i]][0])
-            // h
-            o1['minDu'] = bd.reduce((minObj, currentObj) => {
-              return currentObj[keys[i] + 'h'] < minObj[keys[i] + 'h']
-                ? currentObj
-                : minObj
-            }, d2[keys[i]][0])
-
-            if (idx == 0) {
-              o1[keys[i] + 'x'] = o1['maxDe'][keys[i] + 'x']
-              o1[keys[i] + 'y'] = o1['maxDn'][keys[i] + 'y']
-              o1[keys[i] + 'h'] = o1['minDu'][keys[i] + 'h']
-            }
-            if (idx == 1) {
-              o1[keys[i] + 'x'] = o1['maxDe'].dt
-              o1[keys[i] + 'y'] = o1['maxDn'].dt
-              o1[keys[i] + 'h'] = o1['maxDu'].dt
-            }
-            if (idx == 2) {
-              o1[keys[i] + 'x'] = o1['minDe'][keys[i] + 'x']
-              o1[keys[i] + 'y'] = o1['minDn'][keys[i] + 'y']
-              o1[keys[i] + 'h'] = o1['minDu'][keys[i] + 'h']
-            }
-            if (idx == 3) {
-              o1[keys[i] + 'x'] = o1['minDe'].dt
-              o1[keys[i] + 'y'] = o1['minDn'].dt
-              o1[keys[i] + 'h'] = o1['minDu'].dt
-            }
-            if (idx == 4) {
-              o1[keys[i] + 'x'] = (
-                o1['maxDe'][keys[i] + 'x'] - o1['minDe'][keys[i] + 'x']
-              ).toFixed(2)
-
-              o1[keys[i] + 'y'] = (
-                o1['maxDn'][keys[i] + 'y'] - o1['minDn'][keys[i] + 'y']
-              ).toFixed(2)
-
-              o1[keys[i] + 'h'] = (
-                o1['maxDu'][keys[i] + 'h'] - o1['minDu'][keys[i] + 'h']
-              ).toFixed(2)
-            }
-          })
-        })
-      }
-
-      SetFooterData(d1)
-    }
-  }
-
-  const columns = [
-    {
-      title: '监测日期',
-      dataIndex: 'dt',
-      key: 'dt',
-      width: 90,
-      align: 'center'
-    },
-    {
-      title: '水平位移(mm)',
-      align: 'center',
-      width: 80,
-      children: col
-    }
-  ]
-
-  const onChange = e => {
-    // console.log('val', e.target.value)
-    SetChangeLin(e.target.value)
-  }
-
-  const onChange2 = e => {
-    // console.log('val', e.target.value)
-    SetDefaultVal(e.target.value)
-  }
-
-  return (
-    <>
-      <div className='syjcPage_bxjc'>
-        <div className='eacherBox'>
-          <LineBarEacher
-            echartsData={tableData}
-            echartsDt={echartsDt}
-            echartsRz={echartsRz}
-            echartsDrp={echartsDrp}
-            series={series}
-            col={col}
-            changeLin={changeLin}
-          ></LineBarEacher>
-        </div>
-        {/* <div className='tableBox'>tableBox</div> */}
-        <div className='tableBox'>
-          <div className='tabs'>
-            {defaultVal === 'x' ? (
-              <Radio.Group
-                defaultValue={defaultVal2}
-                size='small'
-                type='primary'
-                buttonStyle='solid'
-              >
-                <Radio.Button value='x' onChange={onChange}>
-                  上下游
-                </Radio.Button>
-                <Radio.Button value='y' onChange={onChange}>
-                  左右岸
-                </Radio.Button>
-              </Radio.Group>
-            ) : null}
-
-            <Radio.Group
-              defaultValue={defaultVal}
-              type='primary'
-              buttonStyle='solid'
-              size='small'
-              style={{ marginLeft: '8px' }}
-            >
-              <Radio.Button value='x' onChange={onChange2}>
-                水平位移
-              </Radio.Button>
-              <Radio.Button value='y' onChange={onChange2}>
-                垂直位移
-              </Radio.Button>
-            </Radio.Group>
-          </div>
-          <Table
-            columns={columns}
-            dataSource={tableData}
-            pagination={false}
-            loading={loading}
-            scroll={{
-              y: 266
-            }}
-            bordered
-            summary={pageData => {
-              return (
-                <Table.Summary fixed style={{ textAlign: 'center' }}>
-                  {footerData?.length > 0 ? (
-                    <>
-                      {footerData.map((item, index) => (
-                        <>
-                          <Table.Summary.Row>
-                            <Table.Summary.Cell className='ellipsis' index={0}>
-                              {item.dt}
-                            </Table.Summary.Cell>
-
-                            {series?.length > 0 ? (
-                              <>
-                                {series.map((obj, inx) => (
-                                  <>
-                                    {defaultVal == 'x' ? (
-                                      <>
-                                        <Table.Summary.Cell
-                                          className='ellipsis'
-                                          index={Math.random() * 2}
-                                        >
-                                          {item[obj.cd + 'x']}
-                                        </Table.Summary.Cell>
-                                        <Table.Summary.Cell
-                                          className='ellipsis'
-                                          index={Math.random() * 3}
-                                        >
-                                          {item[obj.cd + 'y']}
-                                        </Table.Summary.Cell>
-                                      </>
-                                    ) : (
-                                      <>
-                                        <Table.Summary.Cell
-                                          index={Math.random() * 3}
-                                        >
-                                          {item[obj.cd + 'h']}
-                                        </Table.Summary.Cell>
-                                      </>
-                                    )}
-                                  </>
-                                ))}
-                              </>
-                            ) : null}
-                          </Table.Summary.Row>
-                        </>
-                      ))}
-                    </>
-                  ) : null}
-                </Table.Summary>
-              )
-            }}
-          ></Table>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default SyjcPage
diff --git a/src/views/ysgzq/ssgq/dbaq/bxjc/toolBar.js b/src/views/ysgzq/ssgq/dbaq/bxjc/toolBar.js
deleted file mode 100644
index bf3beaf..0000000
--- a/src/views/ysgzq/ssgq/dbaq/bxjc/toolBar.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { Select, DatePicker, Radio, Button, Form } from 'antd'
-import moment from 'moment'
-import TimeRangePicker from '../../../../../components/Form/datePicker'
-const { RangePicker } = DatePicker
-const { Option } = Select
-
-const ToolBar1 = ({ search, activeKey }) => {
-  const [size, setSize] = useState('small')
-  const [form] = Form.useForm()
-  const [date, setDate] = useState()
-
-  const [params, setParams] = useState({
-    type: '0',
-    tplType: 0,
-    source: '0',
-    resCd: ''
-  }) //查询条件
-
-  useEffect(() => {
-    const { ...rec } = form.getFieldsValue()
-    search({ ...rec, ...date })
-  }, [date])
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    search({ ...rec, ...date })
-  }
-
-  const onDateClick = val => {
-    setDate(val)
-  }
-  const options = [
-    {
-      value: '0',
-      label: '过程线图'
-    }
-    // {
-    //   value: '1',
-    //   label: '浸润线图'
-    // }
-  ]
-
-  return (
-    <>
-      <div style={{ display: 'flex' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          style={{ display: 'flex' }}
-          initialValues={{
-            type: '0',
-            tm: moment(),
-            ts: '12:00'
-          }}
-        >
-          <Form.Item label='' name='type'>
-            <Select
-              style={{ width: 190, marginRight: 20 }}
-              defaultValue={options[0]?.value}
-              onChange={onSearchClick}
-              placeholder='请选择'
-            >
-              {options.map(option => (
-                <Option key={option.value} value={option.value}>
-                  {option.label}
-                </Option>
-              ))}
-            </Select>
-          </Form.Item>
-
-          <Form.Item>
-            <TimeRangePicker onDateClick={onDateClick} />
-          </Form.Item>
-          <Form.Item></Form.Item>
-        </Form>
-        <Form.Item style={{ marginTop: 5 }}>
-          <Button
-            type='primary'
-            onClick={onSearchClick}
-            style={{
-              marginLeft: '10px',
-              background: '#0893ff',
-              borderColor: '#0893ff',
-              height: '36px'
-            }}
-          >
-            查询
-          </Button>
-          {/* <Button style={{ marginLeft: '10px' }}>重置</Button> */}
-        </Form.Item>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar1
diff --git a/src/views/ysgzq/ssgq/dbaq/eachers/dbEacher.js b/src/views/ysgzq/ssgq/dbaq/eachers/dbEacher.js
deleted file mode 100644
index 2517164..0000000
--- a/src/views/ysgzq/ssgq/dbaq/eachers/dbEacher.js
+++ /dev/null
@@ -1,303 +0,0 @@
-import React, { useMemo } from 'react'
-import echarts from 'echarts/lib/echarts'
-import ReactEcharts from 'echarts-for-react'
-
-const LineBarEacher = ({ data, areaDrpTmType }) => {
-  let color = ['#02a6ef', '#ff1a00', '#74a5d6', '#99e12a', '#27ff7c']
-  let maxw = 1518.932,
-    maxh = 1521.66,
-    maxdh = 1522,
-    gdsw = [1516.48, 1514.74, 1512.09]
-  let maxY = 1535,
-    minY = 1505,
-    jgX = 16
-
-  let designFL = ((1520 - 13.3) * 33.9) / 13.3
-  let category = [0, 50, 100, 150, 200, 240]
-
-  function getData (data, type) {
-    let x = null
-
-    if (type == 1) {
-      x =
-        (((data.maxdh - data.minY) / Math.tan(40 * 0.017453293)) *
-          (data.maxX / (data.maxY - data.minY)) +
-          33) /
-        2
-      // x = ((data.maxdh-data.minY) / Math.tan(40 * 0.017453293) * (data.maxY / ( data.maxY - data.minY )) + 33) / 2
-    } else {
-      // x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 33) / 2 ) + 2
-      x =
-        (((data.maxdh - data.minY) / Math.tan(40 * 0.017453293)) *
-          (data.maxX / (data.maxY - data.minY)) +
-          33) /
-          2 +
-        2.32
-    }
-    return x
-  }
-  let db = getData({ maxdh: maxdh, maxY: maxY, minY: minY, maxX: 240 }, 1)
-  let sk = getData({ maxdh: maxw, maxY: maxY, minY: minY, maxX: 240 }, 2)
-
-  let option = {
-    xAxis: {
-      max: 240
-      // data: category,
-    },
-    yAxis: {
-      max: maxY,
-      min: minY,
-      name: '断面高(m)'
-    },
-    series: [
-      // 大坝
-      {
-        // data: [
-        //   [33, 1505],
-        //   [106.5, maxdh], // x = ((maxdh-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 33) / 2
-        //   [122, maxdh], //
-        //   [140, maxdh-3], // -3
-        //   [175, maxdh-3], // -3
-        //   [220, 1505], // y轴最小值
-        //   [33, 1505], // y轴最小值
-        // ],
-        data: [
-          [33, minY], // minY:y轴最小值 jgX: x轴间隔 maxdh：大坝高度
-          [db, maxdh], //  [106.5, maxdh]
-          [db + jgX, maxdh],
-          [db + jgX * 2, maxdh - 3],
-          [db + jgX * 4, maxdh - 3],
-          [db + jgX * 7, minY],
-          [33, minY] // y轴最小值
-        ],
-        z: 4,
-        type: 'line',
-        symbol: 'none',
-        areaStyle: {
-          color: '#b8a8a1',
-          opacity: 1
-        },
-        itemStyle: {
-          color: '#b8a8a1'
-        },
-        emphasis: {
-          focus: 'none', // 禁止单击图例聚焦（高亮）对应系列
-          disabled: true // 禁止hoveer
-        }
-      },
-      // 水库
-      {
-        // data: [
-        //   // x轴固定 y轴动态生成
-        //   [33, minY], // y轴取水库最低
-        //   [92.6, 1518.932], // y轴取水库最高  x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 33) / 2 ) + 2
-        //   [0, 1518.932], // y轴取 水库最高
-        //   [0, minY], // y轴取水库最低
-        //   [33, minY], // y轴取水库最低
-        // ],
-        data: [
-          // x轴固定 y轴动态生成
-          [33, minY], // y轴取水库最低
-          [sk, maxw], // y轴取水库最高  x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 33) / 2 ) + 2
-          [0, maxw], // y轴取 水库最高
-          [0, minY], // y轴取水库最低
-          [33, minY] // y轴取水库最低
-        ],
-        type: 'line',
-        symbol: 'none',
-        areaStyle: {
-          color: '#3f9786',
-          opacity: 1
-        },
-        itemStyle: {
-          color: '#3f9786',
-          borderColor: 'pink'
-        },
-        markPoint: {
-          data: [{ type: 'max', x: '24%', coord: [40, 1519.12] }],
-          symbol: 'pin',
-          symbolSize: [30, 10],
-          itemStyle: {
-            color: '#fff', // 标注点颜色
-            borderColor: '#ffa500', // 标注点边框颜色
-            borderWidth: 0 // 标注点边框宽度
-          },
-          label: {
-            show: true, // 是否显示标签
-            formatter: '实测水位' + `${maxw}` + '▼' + '2024-04-08', // 标签格式
-
-            color: '#368ae6', // 标签文字颜色
-            fontSize: 12 // 标签文字大小
-          }
-        }
-      },
-      // 校核洪水位 虚线
-      {
-        data: [
-          // x轴固定 y轴动态生成
-          [0, maxh], // y轴取水库最低
-          [sk + 8, maxh] // x = (((1520-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 33) / 2 ) + 2
-        ],
-        z: 7,
-        type: 'line',
-        symbol: 'none',
-        markPoint: {
-          data: [{ type: 'max', x: '20%', coord: [40, maxh + 0.25] }],
-          symbol: 'pin',
-          symbolSize: [30, 10],
-          itemStyle: {
-            color: '#fff', // 标注点颜色
-            borderColor: '#ffa500', // 标注点边框颜色
-            borderWidth: 0 // 标注点边框宽度
-          },
-          label: {
-            show: true, // 是否显示标签
-            formatter: '校核洪水位' + `${maxh}` + '▼', // 标签格式
-
-            color: '#ff0000', // 标签文字颜色
-            fontSize: 12 // 标签文字大小
-          }
-        },
-        lineStyle: {
-          type: 'dashed' // 设置线型为虚线
-        },
-        itemStyle: {
-          // 折线样式，包括折线点的颜色等
-          color: '#ff0000' // 改变折线颜色
-        }
-      },
-      // 红色的线
-      {
-        data: [
-          // x轴固定 y轴动态生成
-          [sk + 8, maxh], // y轴取水库最低  x = (((1520-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 33) / 2 ) + 2
-          [220, minY]
-        ],
-        z: 6,
-        type: 'line',
-        symbol: 'none',
-        lineStyle: {
-          // type: 'dashed' // 设置线型为虚线
-        },
-        itemStyle: {
-          // 折线样式，包括折线点的颜色等
-          color: '#ff0000' // 改变折线颜色
-        }
-      },
-      // 实测水位-蓝色的线
-      {
-        data: [
-          // x轴固定 y轴动态生成
-          [sk, maxw], // y轴取水库最低   x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 33) / 2 ) + 2
-          [db + jgX, gdsw[0]],
-          [db + jgX * 2, gdsw[1]],
-          [db + jgX * 4, gdsw[2]],
-          [db + jgX * 7, minY]
-        ],
-        z: 5,
-        type: 'line',
-        symbol: 'none',
-        // smooth: true, // 设置折线为圆滑曲线
-        lineStyle: {
-          // type: 'dashed' // 设置线型为虚线
-        },
-        itemStyle: {
-          // 折线样式，包括折线点的颜色等
-          color: '#368ae6' // 改变折线颜色
-        }
-      },
-      // 管道1
-      {
-        data: [
-          [db + jgX + 2, maxdh], //x轴：管道位置 y轴大坝高度+ 0.23
-          [db + jgX + 4, maxdh], //x轴：管道高度  y轴大坝高度+ 0.23
-          [db + jgX + 4, gdsw[0] - 0.23], //x轴：管道  y轴最小水位线+ 3
-          [db + jgX + 2, gdsw[0] - 0.23], //x轴：管道  y轴最小水位线+ 3
-          [db + jgX + 2, maxdh] //x轴：管道位置 y轴大坝高度+ 0.23
-        ],
-        type: 'line',
-        symbol: 'none',
-        z: 11,
-        itemStyle: {
-          color: '#e6ebf3',
-          borderWidth: '0.1'
-        },
-        emphasis: {
-          focus: 'none', // 禁止单击图例聚焦（高亮）对应系列
-          disabled: true // 禁止hoveer
-        }
-      },
-      // 管道1-1
-      {
-        data: [
-          [db + jgX + 2, gdsw[0] - 0.23], //x轴：管道位置 y轴大坝高度+ 0.23
-          [db + jgX + 4, gdsw[0] - 0.23], //x轴：管道高度  y轴大坝高度+ 0.23
-          [db + jgX + 4, minY + 1], //x轴：管道  y轴最小水位线+ 1
-          [db + jgX + 2, minY + 1], //x轴：管道  y轴最小水位线+ 1
-          [db + jgX + 2, gdsw[0] - 0.23] //x轴：管道位置 y轴大坝高度+ 0.23
-        ],
-        type: 'line',
-        symbol: 'none',
-
-        z: 14,
-        areaStyle: {
-          color: '#25b7ef',
-          opacity: 1
-        },
-        itemStyle: {
-          color: '#25b7ef',
-          borderWidth: '0.1'
-        }
-      },
-      // 管道2
-      {
-        data: [
-          [db + jgX + 2 + 14, maxdh - 3 + 0.23], //x轴：管道位置 y轴大坝高度+ 0.23
-          [db + jgX + 4 + 14, maxdh - 3 + 0.23], //x轴：管道高度  y轴大坝高度+ 0.23
-          [db + jgX + 4 + 14, gdsw[1]], //x轴：管道  y轴最小水位线+ 3
-          [db + jgX + 2 + 14, gdsw[1]], //x轴：管道  y轴最小水位线+ 3
-          [db + jgX + 2 + 14, maxdh - 3 + 0.23] //x轴：管道位置 y轴大坝高度+ 0.23
-        ],
-        type: 'line',
-        symbol: 'none',
-        z: 12,
-        itemStyle: {
-          color: '#e6ebf3',
-          borderWidth: '0.1'
-        },
-        emphasis: {
-          focus: 'none', // 禁止单击图例聚焦（高亮）对应系列
-          disabled: true // 禁止hoveer
-        }
-      },
-      // 管道2-1
-      {
-        data: [
-          [db + jgX + 2 + 14, gdsw[1]], //x轴：管道位置 y轴大坝高度+ 0.23
-          [db + jgX + 4 + 14, gdsw[1]], //x轴：管道高度  y轴大坝高度+ 0.23
-          [db + jgX + 4 + 14, minY + 1], //x轴：管道  y轴最小水位线+ 1
-          [db + jgX + 2 + 14, minY + 1], //x轴：管道  y轴最小水位线+ 1
-          [db + jgX + 2 + 14, gdsw[1]] //x轴：管道位置 y轴大坝高度+ 0.23
-        ],
-        type: 'line',
-        symbol: 'none',
-
-        z: 13,
-        areaStyle: {
-          color: '#25b7ef',
-          opacity: 1
-        },
-        itemStyle: {
-          color: '#25b7ef',
-          borderWidth: '0.1'
-        }
-      }
-    ]
-  }
-
-  return (
-    <ReactEcharts option={option} style={{ height: '100%', width: '100%' }} />
-  )
-}
-
-export default React.memo(LineBarEacher)
diff --git a/src/views/ysgzq/ssgq/dbaq/eachers/dbaqEcharts.js b/src/views/ysgzq/ssgq/dbaq/eachers/dbaqEcharts.js
deleted file mode 100644
index 8fcaa82..0000000
--- a/src/views/ysgzq/ssgq/dbaq/eachers/dbaqEcharts.js
+++ /dev/null
@@ -1,765 +0,0 @@
-import React, { useMemo } from 'react'
-import echarts from 'echarts/lib/echarts'
-import ReactEcharts from 'echarts-for-react'
-import { getxy, getxy1, getxy2 } from './mock'
-
-const DbaqEcharts = ({ data, rz, resdt }) => {
-  console.log('DbaqEcharts normWatLev ', data, rz, resdt)
-  let maxw = data?.rzmaxw || resdt.rz || data?.normWatLev,
-    maxh = data.desFloodLev,
-    maxdh = data.crestElev,
-    gdsw = data?.gdsw || [],
-    date = data?.maxDate || resdt?.dt
-  // gdsw = [1516.48, 1514.74, 1512.09]
-  // let maxY = 1535
-  // let minY = 1505
-  // let jgX = 16
-  let maxY = Math.ceil(data.normWatLev) + 15,
-    minY = Math.ceil(data.deadLev) - 15,
-    jgX = 16
-  let maxY1 = Math.ceil(data.normWatLev) + 15,
-    minY1 = Math.ceil(data.deadLev) - 10,
-    jgX1 = 16
-
-  // console.log('maxY1', maxY1, minY1)
-
-  let designFL = ((1520 - 13.3) * 33.9) / 13.3
-  let category = [0, 50, 100, 150, 200, 240]
-
-  function getData (data, type) {
-    let x = null
-    if (type == 1) {
-      x =
-        (((data.maxdh - data.minY) / Math.tan(40 * 0.017453293)) *
-          (data.maxX / (data.maxY - data.minY)) +
-          15) /
-        2
-      // x = ((data.maxdh-data.minY) / Math.tan(40 * 0.017453293) * (data.maxY / ( data.maxY - data.minY )) + 15) / 2
-    } else {
-      // x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 15) / 2 ) + 2
-      x =
-        (((data.maxdh - data.minY) / Math.tan(40 * 0.017453293)) *
-          (data.maxX / (data.maxY - data.minY)) +
-          15) /
-          2 +
-        2.32
-    }
-    return x
-  }
-  let db = getData({ maxdh: maxdh, maxY: maxY, minY: minY, maxX: 245 }, 1)
-  let sk = getData({ maxdh: maxw, maxY: maxY, minY: minY, maxX: 245 }, 2)
-  let redLine =
-    (((maxdh - minY) / Math.tan(40 * 0.017453293)) * (245 / (maxY - minY)) +
-      33) /
-      2 -
-    10
-
-  let d1 = [
-    [db + jgX + 2, maxdh], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + 4, maxdh], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + 4, gdsw[0] == minY ? gdsw[0] + 1 : gdsw[0] - 0.23], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2, gdsw[0] == minY ? gdsw[0] + 1 : gdsw[0] - 0.23], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2, maxdh] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-
-  let d2 = [
-    [db + jgX + 2, gdsw[0] - 0.23], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + 4, gdsw[0] - 0.23], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + 4, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX + 2, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX + 2, gdsw[0] - 0.23] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-
-  let d3 = [
-    [db + jgX + 2 + 14, maxdh - 3 + 0.23], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14, maxdh - 3 + 0.23], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14, gdsw[1] == minY ? gdsw[1] + 1 : gdsw[1]], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2 + 14, gdsw[1] == minY ? gdsw[1] + 1 : gdsw[1]], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2 + 14, maxdh - 3 + 0.23] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-  let d4 = [
-    [db + jgX + 2 + 14, gdsw[1]], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14, gdsw[1]], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX + 2 + 14, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX + 2 + 14, gdsw[1]] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-
-  let d5 = [
-    [db + jgX * 3 + 2, maxdh - 3 + 0.23], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX * 3 + 2 + 2, maxdh - 3 + 0.23], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX * 3 + 2 + 2, gdsw[2] == minY ? gdsw[2] + 1 : gdsw[2]], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX * 3 + 2, gdsw[2] == minY ? gdsw[2] + 1 : gdsw[2]], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX * 3 + 2, maxdh - 3 + 0.23] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-  let d6 = [
-    [db + jgX * 3 + 2, gdsw[2]], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX * 3 + 2 + 2, gdsw[2]], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX * 3 + 2 + 2, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX * 3 + 2, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX * 3 + 2, gdsw[2]] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-
-  let d7 = [
-    [db + jgX + 2 + 14 * 4, maxdh - 3 + 0.23], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14 * 4, maxdh - 3 + 0.23], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14 * 4, gdsw[3] == minY ? gdsw[3] + 1 : gdsw[3]], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2 + 14 * 4, gdsw[3] == minY ? gdsw[3] + 1 : gdsw[3]], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2 + 14 * 4, maxdh - 3 + 0.23] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-  let d8 = [
-    [db + jgX + 2 + 14 * 4, gdsw[3]], //x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14 * 4, gdsw[3]], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + 4 + 14 * 4, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX + 2 + 14 * 4, minY + 1], //x轴：管道  y轴最小水位线+ 1
-    [db + jgX + 2 + 14 * 4, gdsw[3]] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-
-  console.log('gdsw', minY)
-  let blueLie = [[sk, maxw]]
-  // if (gdsw.length > 2 && gdsw[2] != minY) {
-  //   blueLie = [
-  //     // x轴固定 y轴动态生成
-  //     [sk, maxw], // y轴取水库最低   x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 15) / 2 ) + 2
-  //     [db + jgX, gdsw[0]],
-  //     [db + jgX * 2, gdsw[1]],
-  //     [db + jgX * 3, gdsw[2]],
-  //     [225, minY]
-  //   ]
-  // } else {
-  //   blueLie = [
-  //     // x轴固定 y轴动态生成
-  //     [sk, maxw], // y轴取水库最低   x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 15) / 2 ) + 2
-  //     [db + jgX, gdsw[0]],
-  //     [db + jgX * 2, gdsw[1]],
-  //     // [db + jgX * 4, gdsw[2]],
-  //     [225, minY]
-  //   ]
-  // }
-
-  gdsw.forEach((item, index, sel) => {
-    if (item != minY) {
-      blueLie.push([db + jgX * (index + 1), Number(item)])
-    }
-  })
-
-  blueLie.push([225, minY])
-  console.log('blueLie', blueLie)
-  function getSeries () {
-    let arr = [
-      // 大坝
-      {
-        data: [
-          [15, minY], // minY:y轴最小值 jgX: x轴间隔 maxdh：大坝高度
-          [db, maxdh], //  [106.5, maxdh]
-          [db + jgX, maxdh],
-          [db + jgX * 2, maxdh - 3],
-          [db + jgX * 3 + 6, maxdh - 3],
-          [235, minY],
-          [15, minY] // y轴最小值
-        ],
-        z: -1,
-        type: 'line',
-        symbol: 'none',
-        areaStyle: {
-          color: '#b8a8a1',
-          opacity: 1
-        },
-        itemStyle: {
-          color: '#b8a8a1'
-        },
-        emphasis: {
-          focus: 'none', // 禁止单击图例聚焦（高亮）对应系列
-          disabled: true // 禁止hoveer
-        }
-      },
-      // 水库
-      {
-        data: [
-          // x轴固定 y轴动态生成
-          [15, minY], // y轴取水库最低
-          [sk, maxw], // y轴取水库最高  x = (((1519-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 15) / 2 ) + 2
-          [0, maxw], // y轴取 水库最高
-          [0, minY], // y轴取水库最低
-          [15, minY] // y轴取水库最低
-        ],
-        type: 'line',
-        symbol: 'none',
-        areaStyle: {
-          color: '#3f9786',
-          opacity: 1
-        },
-        itemStyle: {
-          color: '#3f9786',
-          borderColor: 'pink'
-        },
-        markPoint: {
-          data: [{ type: 'max', x: '24%', coord: [40, maxw + 0.2] }],
-          symbol: 'pin',
-          symbolSize: [30, 10],
-          itemStyle: {
-            color: '#fff', // 标注点颜色
-            borderColor: '#ffa500', // 标注点边框颜色
-            borderWidth: 0 // 标注点边框宽度
-          },
-          label: {
-            show: true, // 是否显示标签
-            formatter: '实测水位' + `${maxw}` + '▼' + date, // 标签格式
-
-            color: '#368ae6', // 标签文字颜色
-            fontSize: 10 // 标签文字大小
-          }
-        }
-      },
-      // 校核洪水位 虚线
-      {
-        data: [
-          // x轴固定 y轴动态生成
-          [0, maxh], // y轴取水库最低
-          [redLine, maxh] // x = (((1520-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 15) / 2 ) + 2
-        ],
-        z: 7,
-        type: 'line',
-        symbol: 'none',
-        markPoint: {
-          data: [{ type: 'max', x: '20%', coord: [40, maxh + 0.25] }],
-          symbol: 'pin',
-          symbolSize: [30, 10],
-          itemStyle: {
-            color: '#fff', // 标注点颜色
-            borderColor: '#ffa500', // 标注点边框颜色
-            borderWidth: 0 // 标注点边框宽度
-          },
-          label: {
-            show: true, // 是否显示标签
-            formatter: '设计洪水位' + `${maxh}` + '▼', // 标签格式
-
-            color: '#ff0000', // 标签文字颜色
-            fontSize: 10 // 标签文字大小
-          }
-        },
-        lineStyle: {
-          type: 'dashed' // 设置线型为虚线
-        },
-        itemStyle: {
-          // 折线样式，包括折线点的颜色等
-          color: '#ff0000' // 改变折线颜色
-        }
-      },
-      // 红色的线
-      {
-        data: [
-          // x轴固定 y轴动态生成
-          [redLine, maxh], // y轴取水库最低  x = (((1520-1505) / Math.tan(40 * 0.017453293) * (240 / ( 1532 - 1505 )) + 15) / 2 ) + 2
-          [228, minY]
-        ],
-        z: 4,
-        type: 'line',
-        symbol: 'none',
-        lineStyle: {
-          // type: 'dashed' // 设置线型为虚线
-        },
-        itemStyle: {
-          // 折线样式，包括折线点的颜色等
-          color: '#ff0000' // 改变折线颜色
-        }
-      },
-      // 实测水位-蓝色的线
-      {
-        data: blueLie,
-        z: 5,
-        type: 'line',
-        symbol: 'none',
-        smooth: true, // 设置折线为圆滑曲线
-        lineStyle: {
-          // type: 'dashed' // 设置线型为虚线
-        },
-        itemStyle: {
-          // 折线样式，包括折线点的颜色等
-          color: '#368ae6' // 改变折线颜色
-        }
-      }
-    ]
-    let arr2 = []
-    if (data?.svg) {
-      data.svg.forEach((item, index, sel) => {
-        console.log('index===', index)
-
-        let obj = {
-          type: 'line',
-          symbol: 'none',
-          z: 11,
-          itemStyle: {
-            color: '#99958c'
-          },
-          emphasis: {
-            focus: 'none', // 禁止单击图例聚焦（高亮）对应系列
-            disabled: true // 禁止hoveer
-          },
-          data: [],
-          svg: sel
-        }
-
-        let o2 = {
-          type: 'line',
-          symbol: 'none',
-
-          z: 14,
-          areaStyle: {
-            color: '#25b7ef',
-            opacity: 1
-          },
-          itemStyle: {
-            color: '#25b7ef',
-            borderWidth: '0.1'
-          },
-          data: [],
-          svg: sel
-        }
-        let val = item.avgValue == minY ? item.avgValue + 1 : item.avgValue
-
-        let x = null
-        let y = null
-        let xx = null
-        let yx = null
-
-        if (item.avgValue != minY) {
-          obj.data = getxy(db, jgX * (index + 1), 2, 4, maxdh - 3, val, minY)
-          o2.data = getxy1(db, jgX * (index + 1), 2, 4, maxdh, val, minY)
-        } else {
-          obj.data = getxy2(db, jgX * (index + 1), maxdh - 2.77, val, minY)
-        }
-
-        if (index == 0) {
-          if (item.avgValue !== minY) {
-            obj.data = getxy(db, jgX * (index + 1), 2, 4, maxdh, val, minY)
-            o2.data = getxy1(db, jgX * (index + 1), 2, 4, maxdh, val, minY)
-            xx = (o2.data[0][0] / 245) * 100 - 3
-            yx = ((maxdh - val + (maxY - maxdh)) / (maxY - minY)) * 100 - 4
-          } else {
-            obj.data = getxy2(db, jgX * index, 2, 4, maxdh, val, minY)
-          }
-
-          console.log('obj.data', obj.data[0][0])
-          x = (obj.data[0][0] / 245) * 100
-          y = ((maxY - maxdh) / (maxY - minY)) * 100 + 4
-        }
-
-        if (index == 1) {
-          if (item.avgValue !== minY) {
-            obj.data = getxy(db, jgX * (index + 1), 2, 4, maxdh - 3, val, minY)
-            o2.data = getxy1(db, jgX * (index + 1), 2, 4, maxdh, val, minY)
-            xx = (o2.data[0][0] / 240) * 100 + 1
-            yx = ((maxdh - val + (maxY - maxdh)) / (maxY - minY)) * 100
-          } else {
-            obj.data = getxy2(db, jgX * (index + 1), 2, 4, maxdh, val, minY)
-          }
-
-          x = (obj.data[0][0] / 245) * 100
-          y = ((maxY - maxdh) / (maxY - minY)) * 100 + 6
-        }
-
-        if (index == 2) {
-          if (item.avgValue != minY) {
-            obj.data = getxy(
-              db,
-              jgX * (index + 1),
-              2,
-              4,
-              maxdh - 2.77,
-              val,
-              minY
-            )
-            o2.data = getxy1(
-              db,
-              jgX * (index + 1),
-              2,
-              4,
-              maxdh - 2.77,
-              val,
-              minY
-            )
-            xx = (o2.data[0][0] / 240) * 100
-            yx = ((maxdh - val + (maxY - maxdh)) / (maxY - minY)) * 100
-          } else {
-            obj.data = getxy2(
-              db,
-              jgX * (index + 1),
-              2,
-              4,
-              maxdh - 2.77,
-              val,
-              minY
-            )
-          }
-          x = (obj.data[0][0] / 245) * 100 - 1
-          y = ((maxY - maxdh) / (maxY - minY)) * 100 + 8
-        }
-        if (index == 3) {
-          if (val !== maxY) {
-            obj.data = getxy(db, jgX * (index + 1), 2, 4, maxdh - 6, val, minY)
-            o2.data = getxy1(db, jgX * (index + 1), 2, 4, maxdh - 6, val, minY)
-            xx = (o2.data[0][0] / 240) * 100 - 3
-            yx = ((maxdh - val + (maxY - maxdh)) / (maxY - minY)) * 100
-          } else {
-            obj.data = getxy2(db, jgX * (index + 1), maxdh - 2.77, val, minY)
-          }
-
-          x = (obj.data[0][0] / 245) * 100 - 2
-          y = ((maxY - maxdh) / (maxY - minY)) * 100 + 10 + 6
-        }
-        if (index == 4) {
-          if (item.avgValue !== minY) {
-            obj.data = getxy(db, jgX * (index + 1), 2, 4, maxdh - 12, val, minY)
-            o2.data = getxy1(db, jgX * (index + 1), 2, 4, maxdh - 12, val, minY)
-            xx = (o2.data[0][0] / 240) * 100 - 4
-            yx = ((maxdh - val + (maxY - maxdh)) / (maxY - minY)) * 100
-          } else {
-            obj.data = getxy2(db, jgX, 80, 82, maxdh - 12, val, minY)
-          }
-          x = (obj.data[0][0] / 245) * 100 - 2
-          y = ((maxY - maxdh) / (maxY - minY)) * 100 + 10 + 16
-        }
-
-        if (index == 5) {
-          if (item.avgValue !== minY) {
-            obj.data = getxy(
-              db,
-              jgX * (index + 1),
-              2,
-              4,
-              maxdh - 18,
-              item.avgValue,
-              minY
-            )
-            o2.data = getxy1(
-              db,
-              jgX * (index + 1),
-              2,
-              4,
-              maxdh - 48,
-              item.avgValue,
-              minY
-            )
-            xx = (o2.data[0][0] / 240) * 100 - 4
-            yx = ((maxdh - val + (maxY - maxdh)) / (maxY - minY)) * 100
-          } else {
-            obj.data = getxy2(
-              db,
-              jgX * (index + 1),
-              2,
-              4,
-              maxdh - 18,
-              item.avgValue,
-              minY
-            )
-          }
-
-          x = (obj.data[0][0] / 245) * 100 - 2
-          y = ((maxY - maxdh) / (maxY - minY)) * 100 + 10 + 16
-        }
-
-        obj.markPoint = {
-          data: [
-            { type: 'max', x: `${x}%`, y: `${y}%`, coord: [40, maxh + 0.25] }
-          ],
-          symbol: 'pin',
-          symbolSize: [30, 10],
-          itemStyle: {
-            color: '#fff', // 标注点颜色
-            borderColor: '#ffa500', // 标注点边框颜色
-            borderWidth: 0 // 标注点边框宽度
-          },
-          label: {
-            show: true, // 是否显示标签
-            formatter: `${item.dvcd}`, // 标签格式
-
-            color: '#3B4859', // 标签文字颜色
-            fontSize: 10 // 标签文字大小
-          }
-        }
-        o2.markPoint = {
-          data: [
-            {
-              type: 'max',
-              x: `${xx}%`,
-              y: `${yx}%`,
-              coord: [40, maxh + 0.25]
-            }
-          ],
-          symbol: 'pin',
-          symbolSize: [1, 1],
-          itemStyle: {
-            color: '#fff', // 标注点颜色
-            borderColor: '#ffa500', // 标注点边框颜色
-            borderWidth: 0 // 标注点边框宽度
-          },
-          label: {
-            show: true, // 是否显示标签
-            formatter: `${val}m`, // 标签格式
-
-            color: '#3B4859', // 标签文字颜色
-            fontSize: 10 // 标签文字大小
-          }
-        }
-        arr2.push(obj, o2)
-      })
-    }
-
-    console.log('arr2', arr2)
-
-    // let a = arr2.map((item, index, sel) => {
-    //   if (index == 0) {
-    //     item.data = d1
-    //     let x = (d1[0][0] / 245) * 100
-    //     let y = ((maxY - maxdh) / (maxY - minY)) * 100
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${y}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [30, 10],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-    //         formatter: `${item.svg[0].dvcd}`, // 标签格式
-
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //   } else if (index == 1) {
-    //     item.data = d2
-    //     let x = (d2[0][0] / 245) * 100 - 3
-
-    //     let yxx = ((maxdh - gdsw[0] + (maxY - maxdh)) / (maxY - minY)) * 100 - 4
-    //     // let h = ((maxdh - gdsw[0] + (maxY - maxdh)) / (maxY - minY)) * 100
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${yxx}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [1, 1],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-    //         formatter: `${item.svg[0].avgValue}m`, // 标签格式
-
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //   } else if (index == 2) {
-    //     item.data = d3
-    //     let x = (d3[0][0] / 245) * 100
-    //     let y = ((maxY - maxdh) / (maxY - minY)) * 100 + 6
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${y}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [1, 1],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-    //         formatter: `${item.svg[1].dvcd}`, // 标签格式
-
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //   } else if (index == 3) {
-    //     let x = (d4[0][0] / 240) * 100 + 1
-    //     let y = ((maxdh - gdsw[1] + (maxY - maxdh)) / (maxY - minY)) * 100
-    //     item.z = 100
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${y}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [1, 1],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-    //         formatter: `${item.svg[1].avgValue}m`, // 标签格式
-
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //     item.data = d4
-    //   } else if (index == 4) {
-    //     let x = (d5[0][0] / 245) * 100 - 1
-    //     let y = ((maxY - maxdh) / (maxY - minY)) * 100 + 8
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${y}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [1, 1],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-    //         formatter: `${item.svg[2].dvcd}`, // 标签格式
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //     item.data = d5
-    //   } else if (index == 5 && gdsw[2] != minY) {
-    //     let x = (d6[0][0] / 245) * 100 + 2
-    //     let y = ((maxdh - gdsw[2] + (maxY - maxdh)) / (maxY - minY)) * 100
-    //     console.log('yyyyyyyyyyyyyyyy', y)
-    //     let yy = y > 91 ? y - 5 : y
-    //     item.z = 15
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${yy}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [1, 1],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-
-    //         formatter: `${item.svg[2].avgValue}m`, // 标签格式
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //     item.data = d6
-    //   } else if (index == 6) {
-    //     item.data = d7
-    //     // let x = (d7[0][0] / 245) * 100
-    //     // let y = ((maxY - maxdh) / (maxY - minY)) * 100 + 8
-    //     let x = (d7[0][0] / 245) * 100 - 2
-    //     let y = ((maxY - maxdh) / (maxY - minY)) * 100 + 8
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${y}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [30, 10],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-    //         formatter: `${item.svg[3].dvcd}`, // 标签格式
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //   } else if (index == 7) {
-    //     item.data = d8
-    //     let x = (d8[0][0] / 245) * 100 - 2
-    //     let yxx = ((maxdh - gdsw[3] + (maxY - maxdh)) / (maxY - minY)) * 100 - 4
-    //     // let h = ((maxdh - gdsw[0] + (maxY - maxdh)) / (maxY - minY)) * 100
-    //     item.markPoint = {
-    //       data: [
-    //         { type: 'max', x: `${x}%`, y: `${yxx}%`, coord: [40, maxh + 0.25] }
-    //       ],
-    //       symbol: 'pin',
-    //       symbolSize: [1, 1],
-    //       itemStyle: {
-    //         color: '#fff', // 标注点颜色
-    //         borderColor: '#ffa500', // 标注点边框颜色
-    //         borderWidth: 0 // 标注点边框宽度
-    //       },
-    //       label: {
-    //         show: true, // 是否显示标签
-    //         formatter: `${item.svg[3].avgValue}m`, // 标签格式
-
-    //         color: '#3B4859', // 标签文字颜色
-    //         fontSize: 10 // 标签文字大小
-    //       }
-    //     }
-    //   }
-
-    //   return item
-    // })
-    // console.log('data.svg', a)
-
-    let obj = [
-      {
-        data: [
-          [220, minY], //x轴：管道位置 y轴大坝高度+ 0.23
-          [225, minY + 2], //x轴：管道高度  y轴大坝高度+ 0.23
-          [235, minY + 2], //x轴：管道  y轴最小水位线+ 1
-          [240, minY], //x轴：管道  y轴最小水位线+ 1
-          [220, minY] //x轴：管道位置 y轴大坝高度+ 0.23
-        ],
-        type: 'line',
-        symbol: 'none',
-
-        z: 19,
-        areaStyle: {
-          color: '#888987',
-          opacity: 1
-        },
-        itemStyle: {
-          color: '#888987',
-          borderWidth: '0.1'
-        }
-      }
-    ]
-    let nes = arr.concat(arr2)
-
-    return nes.concat(obj)
-  }
-
-  let option = {
-    xAxis: {
-      max: 245,
-      min: 0,
-      splitLine: {
-        show: false
-      }
-    },
-    yAxis: {
-      max: maxY,
-      min: minY,
-      name: '断面高(m)',
-      splitLine: {
-        show: false
-      }
-    },
-    series: getSeries()
-  }
-
-  return (
-    <ReactEcharts
-      notMerge={true}
-      option={option}
-      style={{ height: '100%', width: '100%' }}
-    />
-  )
-}
-
-export default React.memo(DbaqEcharts)
diff --git a/src/views/ysgzq/ssgq/dbaq/eachers/lineBarEacher.js b/src/views/ysgzq/ssgq/dbaq/eachers/lineBarEacher.js
deleted file mode 100644
index 581e13f..0000000
--- a/src/views/ysgzq/ssgq/dbaq/eachers/lineBarEacher.js
+++ /dev/null
@@ -1,201 +0,0 @@
-import React, { useMemo } from 'react'
-import echarts from 'echarts/lib/echarts'
-import ReactEcharts from 'echarts-for-react'
-
-const LineBarEacher = ({
-  echartsData,
-  echartsDt,
-  echartsRz,
-  echartsDrp,
-  series,
-  col,
-  maxY
-}) => {
-  let data = echartsData.filter(item => item.list.length > 0)
-  let col1 = col
-  let arr = [],
-    minArr = [],
-    maxArr = []
-  let color = ['#ff1a00', '#74a5d6', '#99e12a', '#27ff7c']
-
-  const dataTiem = data.map(item => item.dt)
-  const drp = data.map(item => item.drp)
-  const rz = data.map(item => item.rz)
-
-  console.log('echartsData', col)
-
-  let obj = {}
-  col.forEach(o2 => {
-    if (!obj[o2.key]) {
-      obj[o2.key] = []
-    }
-    obj[o2.key].push(o2.key)
-  })
-  let arr2 = []
-  const math = [rz]
-  let idx = 0
-  for (const [key, value] of Object.entries(obj)) {
-    idx++
-    console.log('arr2', key)
-    if (key != 'undefined') {
-      if (data.length > 0) {
-        const dd = data.map(ele => {
-          return ele[key]
-        })
-        arr2.push({
-          name: key,
-          type: 'line',
-          yAxisIndex: 0, // 指定此系列使用左侧的y轴
-          symbol: 'none',
-          itemStyle: {
-            color: color[idx]
-          },
-          lineStyle: {
-            color: color[idx] // 设置折线颜色
-          },
-          data: dd
-        })
-
-        math.push(dd)
-      }
-    }
-  }
-
-  console.log('allData', arr2)
-
-  let s = [
-    {
-      name: '雨量',
-      type: 'bar',
-      yAxisIndex: 1, // 指定此系列使用右侧的y轴
-      itemStyle: {
-        color: '#02a6ef'
-      },
-      lineStyle: {
-        color: '#02a6ef' // 设置折线颜色
-      },
-      barMaxWidth: 3,
-      data: drp
-    },
-    {
-      name: '库水位',
-      type: 'line',
-      yAxisIndex: 0, // 指定此系列使用左侧的y轴
-      lineStyle: {
-        color: '#ff1a00' // 设置折线颜色
-      },
-      itemStyle: {
-        color: '#ff1a00'
-      },
-      symbol: 'none',
-      data: rz
-    }
-  ]
-
-  let allData = arr2
-
-  if (math.length > 0) {
-    minArr = math.map(tem => {
-      let atem = tem.filter(x => x != undefined)
-      return Math.min(...atem)
-    })
-    maxArr = math.map(tem => {
-      let atem = tem.filter(x => x != undefined)
-      return Math.max(...atem)
-    })
-  }
-
-  console.log('maxArr', maxArr)
-  console.log('minArr', minArr)
-
-  const getseries = (s, arr) => {
-    return s.concat(arr)
-  }
-
-  let option = {
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'cross',
-        crossStyle: {
-          color: '#999'
-        }
-      }
-    },
-
-    legend: {
-      //   // data: ['Evaporation', '雨量', '库水位', '系列1']
-    },
-    xAxis: [
-      {
-        type: 'category',
-        data: dataTiem,
-
-        axisPointer: {
-          type: 'shadow'
-        }
-      }
-    ],
-
-    yAxis: [
-      {
-        type: 'value',
-        name: '水位(m)',
-        max: Math.ceil(Math.max(...maxArr)) + 10,
-        min: Math.ceil(Math.min(...minArr)) - 11,
-        // 左侧y轴的配置（如果需要的话）
-        splitLine: {
-          show: true,
-          lineStyle: {
-            type: 'dashed'
-          }
-        }
-      },
-      {
-        type: 'value',
-        name: '雨量(mm)', // 设置y轴的名称
-        max: '500',
-        nameLocation: 'start', // 设置名称在y轴的结束位置
-        nameGap: 18, // 调整名称与轴线之间的距离，使其更靠近左下角
-        nameTextStyle: {
-          align: 'left' // 文本左对齐，这有助于在视觉上使名称更靠近左下角
-          // 其他文本样式设置...
-        },
-        axisLabel: {
-          position: 'insideLeft' // 将刻度标签设置在y轴内侧的左边，以进一步留出左下角空间给name
-          // 其他刻度标签设置...
-        },
-        inverse: true, // 翻转右侧的y轴
-        // 其他右侧y轴的配置（如果需要的话）
-        splitLine: {
-          show: true,
-          lineStyle: {
-            type: 'dashed'
-          }
-        }
-      }
-    ],
-    dataZoom: [
-      {
-        type: 'inside',
-        start: 0,
-        end: 100
-      },
-      {
-        start: 0,
-        end: 100
-      }
-    ],
-    series: getseries(s, arr2)
-  }
-
-  return (
-    <ReactEcharts
-      notMerge={true}
-      option={option}
-      style={{ height: '100%', width: '100%' }}
-    />
-  )
-}
-
-export default React.memo(LineBarEacher)
diff --git a/src/views/ysgzq/ssgq/dbaq/eachers/lineBarEacher2.js b/src/views/ysgzq/ssgq/dbaq/eachers/lineBarEacher2.js
deleted file mode 100644
index 9fba28d..0000000
--- a/src/views/ysgzq/ssgq/dbaq/eachers/lineBarEacher2.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import React, { useMemo } from 'react'
-import echarts from 'echarts/lib/echarts'
-import ReactEcharts from 'echarts-for-react'
-import { log } from '@antv/g2plot/lib/utils'
-
-const LineBarEacher = ({
-  echartsData,
-  echartsDt,
-  echartsRz,
-  echartsDrp,
-  series,
-  col,
-  changeLin
-}) => {
-  let data = echartsData
-  let col1 = col
-  let arr = []
-  let color = ['#ff1a00', '#74a5d6', '#99e12a', '#27ff7c']
-
-  let titl = {
-    x: ['上下游水平位移(mm)', '库水位(m)'],
-    y: ['左右岸水平位移(mm)', '库水位(m)'],
-    h: ['垂直位移(mm)', '库水位(m)']
-  }
-  // let titl1 = ['左右岸水平位移(mm)', '库水位(m)']
-  // let titl3 = ['左右岸水平位移(mm)', '库水位(m)']
-
-  console.log('echartsData0000000000', data)
-  console.log('series', series)
-
-  const dataTiem = data.map(item => item.dt)
-  const drp = data.map(item => item.drp)
-  const rz = data.map(item => item.rz)
-  console.log('echartsData0000000000', rz)
-  const math = [rz]
-  let obj = {}
-  data.forEach(o2 => {
-    if (!obj[o2.title]) {
-      obj[o2.title] = []
-    }
-    obj[o2.title].push(o2)
-  })
-
-  let arr2 = [],
-    minArr = [],
-    maxArr = []
-
-  let idx = 0
-
-  arr2 = series.map((obj, idx) => {
-    console.log('obj', obj)
-
-    return {
-      name: obj.cd,
-      type: 'line',
-      yAxisIndex: 0, // 指定此系列使用左侧的y轴
-      symbol: 'none',
-      itemStyle: {
-        color: color[idx + 1]
-      },
-      lineStyle: {
-        color: color[idx + 1] // 设置折线颜色
-      },
-      data: data.map(item => {
-        return item[obj.cd + changeLin]
-      })
-    }
-  })
-
-  console.log('arrarr', arr2)
-
-  let s = [
-    {
-      name: titl[changeLin][1],
-      type: 'line',
-      yAxisIndex: 1, // 指定此系列使用左侧的y轴
-      lineStyle: {
-        color: '#ff1a00' // 设置折线颜色
-      },
-      itemStyle: {
-        color: '#ff1a00'
-      },
-      symbol: 'none',
-      data: rz
-    }
-  ]
-  // const minArr = Math.min(...rz)
-  // const maxArr = Math.max(...rz)
-
-  if (math.length > 0) {
-    minArr = math.map(tem => {
-      let atem = tem.filter(x => x != undefined)
-      return Math.min(...atem)
-    })
-    maxArr = math.map(tem => {
-      let atem = tem.filter(x => x != undefined)
-      return Math.max(...atem)
-    })
-  }
-
-  console.log('minArr', minArr)
-  console.log('minArr', math)
-
-  const getseries = (s, arr) => {
-    return s.concat(arr)
-  }
-
-  console.log(getseries(s, arr))
-
-  let option = {
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'cross',
-        crossStyle: {
-          color: '#999'
-        }
-      }
-    },
-    legend: {
-      // data: ['Evaporation', '雨量', '库水位', '系列1']
-    },
-    xAxis: [
-      {
-        type: 'category',
-
-        data: dataTiem,
-
-        axisPointer: {
-          type: 'shadow'
-        }
-      }
-    ],
-
-    yAxis: [
-      {
-        type: 'value',
-        name: titl[changeLin][0],
-        splitLine: {
-          show: true,
-          lineStyle: {
-            type: 'dashed'
-          }
-        }
-      },
-      {
-        max: Math.ceil(maxArr[0] + 10),
-        min: Math.ceil(minArr[0] - 11),
-        type: 'value',
-        name: titl[changeLin][1], // 设置y轴的名称
-        nameLocation: 'end', // 设置名称在y轴的结束位置
-        nameGap: 18, // 调整名称与轴线之间的距离，使其更靠近左下角
-        nameTextStyle: {
-          align: 'left' // 文本左对齐，这有助于在视觉上使名称更靠近左下角
-          // 其他文本样式设置...
-        },
-        axisLabel: {
-          position: 'insideLeft' // 将刻度标签设置在y轴内侧的左边，以进一步留出左下角空间给name
-          // 其他刻度标签设置...
-        },
-        inverse: false, // 翻转右侧的y轴
-        // 其他右侧y轴的配置（如果需要的话）
-        splitLine: {
-          show: true,
-          lineStyle: {
-            type: 'dashed'
-          }
-        }
-      }
-    ],
-    dataZoom: [
-      {
-        type: 'inside',
-        start: 0,
-        end: 100
-      },
-      {
-        start: 0,
-        end: 100
-      }
-    ],
-
-    series: getseries(s, arr2)
-  }
-
-  return (
-    <ReactEcharts option={option} style={{ height: '100%', width: '100%' }} />
-  )
-}
-
-export default React.memo(LineBarEacher)
diff --git a/src/views/ysgzq/ssgq/dbaq/eachers/mock.js b/src/views/ysgzq/ssgq/dbaq/eachers/mock.js
deleted file mode 100644
index 2e0d9a8..0000000
--- a/src/views/ysgzq/ssgq/dbaq/eachers/mock.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * db: 大坝的高
- * jgX： 管道之间的距离
- * num: x轴位移动的距离
- * maxdh：坝顶高程
- * gdsw：管道数据
- * minY: y轴最小值
- * */
-
-export function getxy (db, jgX, num1, num2, maxdh, gdsw, minY) {
-  return [
-    [db + jgX + num1, maxdh], // x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + num2, maxdh], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + num2, gdsw], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + num1, gdsw], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + num1, maxdh] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-}
-
-export function getxy1 (db, jgX, num1, num2, maxdh, gdsw, minY) {
-  return [
-    [db + jgX + num1, gdsw - 0.23], // x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + num2, gdsw - 0.23], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + num2, minY + 1], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + num1, minY + 1], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + num1, gdsw - 0.23] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-}
-
-export function getxy2 (db, jgX, num1, num2, maxdh, gdsw, minY) {
-  return [
-    [db + jgX + 2, maxdh], // x轴：管道位置 y轴大坝高度+ 0.23
-    [db + jgX + 4, maxdh], //x轴：管道高度  y轴大坝高度+ 0.23
-    [db + jgX + 4, gdsw + 1], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2, gdsw + 1], //x轴：管道  y轴最小水位线+ 3
-    [db + jgX + 2, maxdh] //x轴：管道位置 y轴大坝高度+ 0.23
-  ]
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/index.css b/src/views/ysgzq/ssgq/dbaq/index.css
deleted file mode 100644
index 748b804..0000000
--- a/src/views/ysgzq/ssgq/dbaq/index.css
+++ /dev/null
@@ -1,120 +0,0 @@
-.content {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-}
-.content .ant-radio-group .ant-radio-button-wrapper:first-child,
-.content .ant-radio-group .ant-radio-button-wrapper:last-child {
-  border-radius: 0 !important;
-}
-.content .ant-radio-group .ant-radio-button-wrapper {
-  border: 1px solid #d9d9d9 !important;
-  color: #3b4859 !important;
-}
-.content .ant-radio-group .ant-radio-button .ant-radio-button-checked {
-  color: #3b7cff !important;
-}
-.content .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
-  color: #fff !important;
-  border-color: #0052d9 !important;
-}
-.leftBox {
-  background-color: #fff;
-  width: 12rem;
-  overflow-y: auto;
-  border-radius: 2px;
-  padding: 10px;
-}
-.leftBox .itemlist {
-  line-height: 2rem;
-  cursor: pointer;
-  position: relative;
-}
-.leftBox .itemlist div {
-  padding-left: 20px;
-}
-.leftBox .itemlist .dian1 {
-  position: absolute;
-  top: -2px;
-  left: 0;
-  font-size: 50px;
-  width: 10px;
-  height: 10px;
-}
-.leftBox .active {
-  background-color: #a3d3ff;
-}
-.rightlist {
-  background-color: #fff;
-  flex: 3;
-  margin-left: 10px;
-  overflow-y: auto;
-  border-radius: 2px;
-  line-height: 2rem;
-  padding: 10px;
-}
-.rightlist .nav-sort {
-  display: flex;
-  align-items: center;
-  font-size: 13px;
-}
-.rightlist .nav-item {
-  cursor: pointer;
-  margin: 0 12px;
-}
-.rightlist .active {
-  color: #a3d3ff;
-  border-bottom: 2px solid #a3d3ff;
-}
-.rightlist .right_conter {
-  width: 100%;
-  height: 100%;
-}
-.rightlist .right_conter .syjcPage {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  height: 100%;
-}
-.rightlist .right_conter .syjcPage .eacherBox {
-  width: 50%;
-  height: calc(100vh - 252px);
-  flex: 1;
-  padding: 10px;
-}
-.rightlist .right_conter .syjcPage .tableBox {
-  width: 50%;
-  flex: 1;
-  position: relative;
-}
-.rightlist .right_conter .syjcPage .tableBox .tabs {
-  text-align: right;
-  margin-bottom: 10px;
-}
-.rightlist .right_conter .dbaqEcharts {
-  height: calc(100vh - 350px);
-}
-.ant-table-thead > tr > th,
-.ant-table-tbody > tr > td,
-.ant-table tfoot > tr > th,
-.ant-table tfoot > tr > td {
-  padding: 6px !important;
-}
-.ant-table-summary {
-  background-color: #f2f9fd !important;
-}
-.ellipsis {
-  width: 100%;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  cursor: pointer;
-  text-align: center;
-}
-.ellipsis:hover {
-  overflow: visible;
-  white-space: nowrap;
-}
-.ant-table-thead th {
-  background-color: #fafafa;
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/index.js b/src/views/ysgzq/ssgq/dbaq/index.js
deleted file mode 100644
index 2cd1b78..0000000
--- a/src/views/ysgzq/ssgq/dbaq/index.js
+++ /dev/null
@@ -1,314 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { useSelector } from 'react-redux'
-import { Tabs } from 'antd'
-import apiurl from '../../../../service/apiurl'
-import {
-  unionList,
-  attResBasePage,
-  hEResPage,
-  hERespageRes,
-  dwsWyList,
-  pressListPage
-} from '../../../../service/dbaq'
-import classNames from 'classnames'
-import moment, { months } from 'moment'
-
-import { getGcTreeData } from '../../../../service/warn'
-import { getColumns } from './utils'
-
-import './index.less'
-import ToolBar from './toolBar'
-import SyjcPage from './syjc'
-import DbaqEcharts from './eachers/dbaqEcharts.js'
-import Yjlb from './yjlb/index.js'
-import Bxjc from './bxjc/index'
-
-const tabs = [
-  { key: '0', children: '渗压监测分析', label: '渗压监测分析' },
-  { key: '1', children: '变形监测分析', label: '变形监测分析' },
-  { key: '2', children: '相关性图', label: '相关性图' },
-  { key: '3', children: '预警列表', label: '预警列表' }
-]
-
-const Page1 = () => {
-  const hasAlertBox = useSelector(s => s.runtime.hasAlertBox)
-  const refModal = useRef()
-  const isRender = useRef(true)
-  const [skData, SetSkData] = useState()
-  const [tag, SetTag] = useState()
-  const [activeKey, SetActiveKey] = useState('0')
-  const [resCd, SetResCd] = useState()
-  const [params2, setParams] = useState()
-  const [date2, setDate2] = useState()
-  const [dataType, setDataType] = useState('1')
-  const [tableData1, SetTableData1] = useState({})
-  const [pressList, setPressList] = useState([])
-  const [avgData, SetavgData] = useState([])
-  const [bdObj, SetBdObj] = useState({})
-  const [bdObj1, SetBdObj1] = useState()
-  const [yjBool, SetYjBool] = useState(0)
-  const [resData, SetResData] = useState()
-  const [resdt, SetResdt] = useState()
-
-  let paramsData = {
-    stm: moment().format('YYYY-MM-DD HH:mm:ss'),
-    etm: moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss'),
-    resCd: ''
-  }
-
-  let maxw = null,
-    maxDate = null
-
-  useEffect(() => {
-    getCustomerTreeData()
-  }, [])
-
-  const getTable = obj => {
-    // 页面初始默认查询参数
-    SetBdObj1()
-    unionList(obj).then(res => {
-      if (res.press.length == 0) {
-        SetActiveKey('1')
-        SetYjBool('2')
-      }
-      if (res.press.length > 0) {
-        SetActiveKey('0')
-        SetYjBool('1')
-      }
-      if (res.press.length > 0 && res.wy.length > 0) {
-        SetYjBool('3')
-      }
-      if (res.water.length > 0) {
-        console.log('res.water.length0.', res.water[0].dt)
-        if (res.water[0].dt == moment().format('YYYY-MM-DD')) {
-          maxw = res.water[1].rz
-          maxDate = res.water[1].dt
-          SetResdt(res.water[1])
-          SetBdObj1(res.water[1].rz)
-        } else {
-          maxw = res.water[0].rz
-          maxDate = res.water[0].dt
-          SetResdt(res.water[0])
-          SetBdObj1(res.water[0].rz)
-        }
-      }
-      SetResData(res)
-    })
-  }
-
-  const getCustomerTreeData = async () => {
-    await attResBasePage({ pageSize: 999, pageNumber: 1 }).then(res => {
-      const newArr = res.records.filter(item => item.hasWypress == 1)
-      SetSkData(newArr)
-      SetResCd(newArr[0].resCode)
-      setParams({ ...date2, resCd: newArr[0].resCode })
-
-      paramsData.resCd = newArr[0].resCode
-      if (newArr[0].resCode) {
-        let time = moment().subtract(1, 'months')
-        getData({
-          resCd: newArr[0].resCode,
-          etm: params2?.etm ? params2.etm : moment().format('YYYY-MM-DD'),
-          stm: params2?.stm ? params2.stm : time.format('YYYY-MM-DD')
-        })
-      }
-    })
-  }
-
-  const getData = obj => {
-    if (obj.etm) {
-      getTable(obj)
-    }
-
-    setParams(obj)
-    gethERes(obj)
-  }
-
-  const onToggle = (item, index) => {
-    console.log('onToggle', item, index)
-    SetTag(index)
-
-    SetResCd(item.resCode)
-    setParams({ ...date2, resCd: item.resCode })
-    getData({ resCd: item.resCode, etm: params2.etm, stm: params2.stm })
-
-    console.log('页面初始默认查询参数', params2)
-  }
-  const onTabChange = key => {
-    SetActiveKey(key)
-  }
-  const skData1 = [
-    {
-      key: '1',
-      sname: '1'
-    },
-    {
-      key: '2',
-      sname: '2'
-    }
-  ]
-
-  const onChangeType = type => {
-    setDataType(type)
-  }
-
-  const gethERes = async params => {
-    let resName = '',
-      engScal = ''
-    let obj = {
-      resCode: '',
-      uppLevFlco: '', // 防洪高水位
-      normWatLev: '', // 正常蓄水位
-      deadLev: '', // 死水位
-      totCap: '', // 总库容
-      calFloodLev: '', // 校核洪水位
-      desFloodLev: '', //设计洪水位
-      crestElev: '', // 坝顶高程
-      maxDamHeig: '', // 最大坝高
-      maxDesFloodFlow: '', // 设计洪水位时最大下泄流量
-      normPoolStagArea: '', // 正常蓄水位相应
-      svg: [],
-      gdsw: []
-    }
-    await hEResPage({ resCode: params.resCd }).then(res => {
-      obj = {
-        resCode: res.resCode,
-        uppLevFlco: res.uppLevFlco, // 防洪高水位
-        normWatLev: res.normWatLev, // 正常蓄水位
-        deadLev: res.deadLev, // 死水位
-        totCap: res.totCap, // 总库容
-        calFloodLev: res.calFloodLev, // 校核洪水位
-        desFloodLev: res.desFloodLev, //设计洪水位
-        crestElev: res.crestElev, // 坝顶高程
-        maxDamHeig: res.maxDamHeig, // 最大坝高
-        maxDesFloodFlow: res.maxDesFloodFlow, // 设计洪水位时最大下泄流量
-        normPoolStagArea: res.normPoolStagArea // 正常蓄水位相应水面面积
-      }
-
-      resName = res.resName
-      engScal = res.engScal
-    })
-
-    if (resName && params.stm) {
-      await pressListPage(params).then(res => {
-        res.forEach(item => {
-          item.dvcd = item.dvcd.toUpperCase()
-        })
-        const asdd = res.reduce((acc, curr) => {
-          const isDuplicate = acc.some(item => item.cd === curr.cd)
-          if (!isDuplicate) {
-            acc.push(curr)
-          }
-          return acc
-        }, [])
-
-        console.log('asdd', asdd, '000', bdObj1)
-        asdd.forEach(item => {
-          item.avgValue = item.avgValue.toFixed(2)
-          if (item.dt != moment().subtract(1, 'days').format('YYYY-MM-DD')) {
-            item.dt = moment().subtract(1, 'days').format('YYYY-MM-DD')
-            item.avgValue = Math.ceil(obj.deadLev) - 15
-          }
-        })
-
-        let bss = res.filter((item, index, sel) => {
-          if (sel[2].dt == sel[1].dt) {
-            return index < 3
-          } else {
-            return index < 2
-          }
-        })
-        let f = res.slice(0, 3)
-
-        obj.svg = asdd.sort((a, b) => {
-          return a.cd - b.cd
-        })
-        obj.gdsw = asdd.map(item => item.avgValue)
-        obj.rzmaxw = maxw
-        obj.maxDate = maxDate
-      })
-    }
-
-    SetBdObj({ ...obj })
-  }
-  const doSearch = obj => {
-    let ob = {
-      stm: obj.startDate,
-      etm: obj.endDate,
-      resCd: resCd
-    }
-
-    setDate2({ stm: obj.startDate, etm: obj.endDate })
-    setParams(ob)
-    setDataType(obj.type)
-
-    if (resCd) {
-      getData(ob)
-    }
-  }
-  return (
-    <div className='content'>
-      <div
-        className=' leftBox'
-        style={{
-          height: hasAlertBox ? 'calc(100vh - 110px)' : 'calc(100vh - 90px)'
-        }}
-      >
-        {skData &&
-          skData.map((item, index) => {
-            return (
-              <div
-                className='itemlist'
-                key={item.key}
-                onClick={() => onToggle(item, index)}
-              >
-                <div></div>
-                <span className='dian1'>·</span>
-                <div className={resCd == item.resCode ? 'active' : ''}>
-                  {item.resName}
-                  <> {item.isDanger == 1 ? <span>(病)</span> : null}</>
-                </div>
-              </div>
-            )
-          })}
-      </div>
-      <div
-        className='rightlist'
-        style={{
-          height: hasAlertBox ? 'calc(100vh - 110px)' : 'calc(100vh - 90px)'
-        }}
-      >
-        <Tabs activeKey={activeKey} onChange={onTabChange}>
-          {resData?.press.length > 0 ? (
-            <Tabs.TabPane tab='渗压监测分析' key='0'>
-              <ToolBar
-                search={doSearch}
-                resCd={resCd}
-                bdObj={bdObj}
-                bdObj1={bdObj1}
-                resdt={resdt}
-              />
-            </Tabs.TabPane>
-          ) : null}
-
-          {/*  */}
-          {resData?.wy.length > 0 ? (
-            <Tabs.TabPane tab='变形监测分析' key='1'>
-              <div className='right_conter'>
-                {activeKey == 1 ? <Bxjc resCd={resCd}></Bxjc> : null}
-              </div>
-            </Tabs.TabPane>
-          ) : null}
-
-          <Tabs.TabPane tab='预警列表' key='2'>
-            {activeKey == 2 ? (
-              <Yjlb resCd={resCd} yjBool={yjBool}></Yjlb>
-            ) : null}
-          </Tabs.TabPane>
-        </Tabs>
-      </div>
-    </div>
-  )
-}
-
-export default Page1
diff --git a/src/views/ysgzq/ssgq/dbaq/index.less b/src/views/ysgzq/ssgq/dbaq/index.less
deleted file mode 100644
index 2c290aa..0000000
--- a/src/views/ysgzq/ssgq/dbaq/index.less
+++ /dev/null
@@ -1,136 +0,0 @@
-.content {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  .ant-radio-group .ant-radio-button-wrapper:first-child,
-  .ant-radio-group .ant-radio-button-wrapper:last-child {
-    border-radius: 0 !important;
-  }
-  .ant-radio-group .ant-radio-button-wrapper {
-    border: 1px solid #d9d9d9 !important;
-    color: #3b4859 !important;
-  }
-  .ant-radio-group .ant-radio-button .ant-radio-button-checked {
-    color: #3b7cff !important;
-  }
-  .ant-radio-group-solid
-    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
-    color: #fff !important;
-    border-color: #0052d9 !important;
-  }
-}
-.leftBox {
-  background-color: #fff;
-  width: 12rem;
-  overflow-y: auto;
-  border-radius: 2px;
-  // box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
-  padding: 10px;
-  .itemlist {
-    line-height: 2rem;
-    cursor: pointer;
-    position: relative;
-    div {
-      padding-left: 20px;
-    }
-    .dian1 {
-      position: absolute;
-      top: -2px;
-      left: 0;
-      font-size: 50px;
-      width: 10px;
-      height: 10px;
-    }
-  }
-  .active {
-    // color: #fff;
-    background-color: #a3d3ff;
-    // border-bottom: 2px solid #0e5cdb;
-  }
-}
-.rightlist {
-  background-color: #fff;
-  flex: 3;
-  margin-left: 10px;
-  overflow-y: auto;
-  border-radius: 2px;
-  // box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
-  line-height: 2rem;
-  padding: 10px;
-
-  .nav-sort {
-    display: flex;
-    align-items: center;
-    font-size: 13px;
-  }
-
-  .nav-item {
-    cursor: pointer;
-    margin: 0 12px;
-  }
-
-  .active {
-    color: #a3d3ff;
-    border-bottom: 2px solid #a3d3ff;
-  }
-
-  .right_conter {
-    width: 100%;
-    height: 100%;
-    // padding: 10px;
-
-    .syjcPage {
-      display: flex;
-      justify-content: space-between;
-      width: 100%;
-      height: 100%;
-      .eacherBox {
-        width: 50%;
-        height: calc(100vh - 252px);
-        flex: 1;
-        padding: 10px;
-      }
-      .tableBox {
-        // background-color: pink;
-        width: 50%;
-        flex: 1;
-        position: relative;
-        .tabs {
-          text-align: right;
-          margin-bottom: 10px;
-        }
-      }
-    }
-    .dbaqEcharts {
-      height: calc(100vh - 350px);
-    }
-  }
-}
-
-.ant-table-thead > tr > th,
-.ant-table-tbody > tr > td,
-.ant-table tfoot > tr > th,
-.ant-table tfoot > tr > td {
-  padding: 6px !important;
-}
-.ant-table-summary {
-  background-color: #f2f9fd !important;
- 
-}
-.ellipsis {
-  width: 100%;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  cursor: pointer;
-  text-align: center;
-}
-
-.ellipsis:hover {
-  overflow: visible;
-  white-space: nowrap;
-}
-
-.ant-table-thead th {
-  background-color: #fafafa;
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/syjc.js b/src/views/ysgzq/ssgq/dbaq/syjc.js
deleted file mode 100644
index d9589f9..0000000
--- a/src/views/ysgzq/ssgq/dbaq/syjc.js
+++ /dev/null
@@ -1,452 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { Table, Typography } from 'antd'
-import './index.less'
-import TableRow from './tableRow'
-
-import apiurl from '../../../../service/apiurl'
-import usePageTable from '../../../../components/crud/usePageTable'
-import { createCrudService } from '../../../../components/crud/_'
-
-import { unionList } from '../../../../service/dbaq'
-import LineBarEacher from './eachers/lineBarEacher'
-
-import { getColumns, getDatesInRange } from './utils'
-
-const { Text } = Typography
-
-const SyjcPage = ({ params, date, resCd, pressList, avgData }) => {
-  // const  { date, resCd, , pressList, avgData } = props
-  const [col, SetColumns] = useState([])
-  const [tableData, SetTable] = useState([])
-  const dispatch = useDispatch()
-
-  const [cell, SetCell] = useState([])
-  const [echartsData, SetechartsData] = useState()
-  const [echartsDt, SetechartsDt] = useState()
-  const [echartsRz, SetechartsRz] = useState()
-  const [echartsDrp, SetechartsDrp] = useState()
-  const [series, Setseries] = useState([])
-  const [maxY, SetMaxY] = useState()
-  const [loading, setLoading] = useState(true)
-  const [footerData, SetFooterData] = useState([
-    {
-      avgValue: '',
-      cd: '',
-      dt: '',
-      stCd: '',
-      resCd: '',
-      rz: ''
-    }
-  ])
-
-  useEffect(() => {
-    console.log('渗压', params, params.resCd)
-    if (params.resCd && params.stm) {
-      setLoading(true)
-      tableList(params)
-    }
-  }, [params])
-
-  const tableList = async obj => {
-    await unionList(obj).then(res => {
-      let a = []
-      let newArr = []
-      dispatch.runtime.setBadgejy(res)
-
-      if (res.press.length > 0) {
-        // 获取所有时间
-        // getDatesInRange(obj.stm, obj.etm)
-
-        // 使用示例
-        const startDate = new Date(obj.stm)
-        const endDate = new Date(obj.etm)
-        const dateArray = getDatesInRange(startDate, endDate)
-        // console.log('dateArray', dateArray)
-
-        // 打印日期数组
-        // dateArray.forEach(function (date) {
-        //   console.log(date.toISOString().split('T')[0])
-        // })
-
-        let dtArr = []
-        let dtpress = res.press.map(item => item.dt)
-        let dtrain = res.rain.map(item => item.dt)
-        let dtwater = res.water.map(item => item.dt)
-
-        dtpress.concat(dtpress).concat(dtrain).concat(dtwater)
-
-        // dtArr = dtpress.filter((item, index) => dtpress.indexOf(item) === index)
-        // newArr = dtArr.map(item => {
-        //   return { dt: item, list: [] }
-        // })
-
-        newArr = dateArray.map(date => {
-          let item = date.toISOString().split('T')[0]
-          return { dt: item, list: [] }
-        })
-
-        newArr.forEach(item => {
-          res.press.forEach(obj => {
-            if (item.dt == obj.dt) {
-              obj.dvcd = obj.dvcd.toUpperCase()
-              item.list.push(obj)
-              item['avgValue'] = obj.avgValue
-              item.dvcd = obj.dvcd
-            }
-          })
-          res.rain.forEach(obj2 => {
-            if (item.dt == obj2.dt) {
-              item.list.push(obj2)
-              item['drp'] = obj2.drp
-            }
-          })
-
-          res.water.forEach(obj3 => {
-            if (item.dt == obj3.dt) {
-              item.list.push(obj3)
-              item['rz'] = obj3.rz
-            }
-          })
-        })
-
-        newArr = newArr.map(item => {
-          item.list.forEach(val => {
-            if (val?.dvcd) {
-              item[val.dvcd] = Number(val.avgValue.toFixed(2))
-            }
-          })
-          return item
-        })
-        const len = newArr.filter(item => item.list.length > 0)
-        console.log('lenlen', len)
-        console.log('newArr', newArr)
-
-        res.press.forEach(o => {
-          res.rain.forEach(o1 => {
-            let obj = {}
-            obj.dt = o1.dt
-            if (o.dt == o1.dt) {
-              obj.drp = o1.drp
-              obj.dvcd = o.dvcd.toUpperCase()
-              obj.avgValue = o.avgValue
-              a.push(obj)
-            }
-          })
-
-          a.forEach(o2 => {
-            res.water.forEach(o3 => {
-              if (o2.dt == o3.dt) {
-                o2.rz = o3.rz
-              }
-            })
-          })
-        })
-
-        let b = res.press.map(item => {
-          return {
-            dvcd: item.dvcd.toUpperCase(),
-            cd: item.cd
-          }
-        })
-        // 去重
-        let t = b.reduce((acc, curr) => {
-          const isDuplicate = acc.some(item => item.cd === curr.cd)
-          if (!isDuplicate) {
-            acc.push(curr)
-          }
-          return acc
-        }, [])
-
-        // 排序
-        t.sort((a, b) => a.cd - b.cd)
-        let cc = t.map(item => item.dvcd)
-        console.log('tttt', t)
-        let c = cc.map((o4, index) => {
-          return {
-            title: o4,
-            dataIndex: o4,
-            key: o4,
-            align: 'center'
-          }
-        })
-
-        let de = []
-
-        a.forEach(o => {
-          c.forEach((o1, index) => {
-            if (o.dvcd == o1.title) {
-              o[o.dvcd] = o.avgValue
-              o['idx'] = index
-              de.push({
-                [o.dvcd]: o.avgValue,
-                ['idx']: index,
-                ['dt']: o.dt
-              })
-            }
-          })
-        })
-
-        if (a.length > 0) {
-          a.forEach(item => {
-            de.forEach(uy => {
-              // uy.forEach(it => {
-              if (item.dt == uy.dt) {
-                item = Object.assign(item, uy)
-              }
-              // })
-            })
-          })
-
-          // 去重
-          a = a.reduce((acc, curr) => {
-            const isDuplicate = acc.some(item => item.dt === curr.dt)
-            if (!isDuplicate) {
-              acc.push(curr)
-            }
-            return acc
-          }, [])
-        }
-        console.log('col--', c)
-
-        SetColumns(c)
-
-        Setseries(() => {
-          // return res.press.map(item => item.dvcd.toUpperCase())
-          return res.press.reduce((acc, curr) => {
-            const isDuplicate = acc.some(
-              item => item.dvcd.toUpperCase() === curr.dvcd.toUpperCase()
-            )
-            if (!isDuplicate) {
-              acc.push(curr)
-            }
-            return acc
-          }, [])
-        })
-        setLoading(false)
-        // SetTable(a.reverse())
-        SetTable(newArr)
-        // console.log('SetTableSetTable', a)
-
-        // 总计
-
-        const maxRz = newArr.reduce(
-          (maxObj, currentObj) =>
-            currentObj.rz > maxObj.rz ? currentObj : maxObj,
-          { rz: -Infinity }
-        )
-
-        const maxDrp = newArr.reduce(
-          (maxObj, currentObj) =>
-            currentObj.drp > maxObj.drp ? currentObj : maxObj,
-          { drp: -Infinity }
-        )
-
-        const mDrp = newArr.reduce((minObj, currentObj) => {
-          return currentObj.drp < minObj.drp ? currentObj : minObj
-        }, len[0])
-
-        const mRz = newArr.reduce((minObj, currentObj) => {
-          return currentObj.rz < minObj.rz ? currentObj : minObj
-        }, len[0])
-
-        let d1 = [
-          {
-            dt: '最大值',
-            dvcd: maxRz.dvcd ? maxRz.dvcd.toUpperCase() : '',
-            rz: maxRz.rz,
-            drp: maxDrp.drp
-          },
-          {
-            dt: '日期',
-            dvcd: maxRz.dvcd ? maxRz.dvcd.toUpperCase() : ' ',
-            rz: maxRz.dt,
-            drp: maxDrp.dt
-          },
-          {
-            dt: '最小值',
-            dvcd: maxRz.dvcd ? maxRz.dvcd.toUpperCase() : '',
-            rz: mRz.rz,
-            drp: mDrp.drp
-          },
-          {
-            dt: '日期',
-            dvcd: maxRz.dvcd ? maxRz.dvcd.toUpperCase() : '',
-            rz: mRz.dt,
-            drp: mDrp.dt
-          },
-          {
-            dt: '变幅',
-            dvcd: maxRz.dvcd ? maxRz.dvcd.toUpperCase() : '',
-            rz: (maxRz.rz - mRz.rz).toFixed(3),
-            drp: (maxDrp.drp - mDrp.drp).toFixed(2)
-          }
-        ]
-        let d2 = {}
-
-        res.press.forEach(o => {
-          o.dvcd = o.dvcd.toUpperCase()
-          if (!d2[o.dvcd]) {
-            d2[o.dvcd] = []
-          }
-          d2[o.dvcd].push({ avgValue: o.avgValue, dt: o.dt })
-        })
-
-        for (const [key, value] of Object.entries(d2)) {
-          d1.forEach((o, i, sel) => {
-            o.svg = []
-            o['max'] = value.reduce(
-              (maxObj, currentObj) =>
-                currentObj.avgValue > maxObj.avgValue ? currentObj : maxObj,
-              { avgValue: -Infinity }
-            )
-
-            o['min'] = value.reduce((minObj, currentObj) => {
-              return currentObj.avgValue < minObj.avgValue ? currentObj : minObj
-            }, value[0])
-
-            if (i == 0) {
-              o[key] = o['max'].avgValue.toFixed(2)
-            }
-            if (i == 1) {
-              o[key] = o['max'].dt
-            }
-            if (i == 2) {
-              o[key] = o['min'].avgValue.toFixed(2)
-            }
-            if (i == 3) {
-              o[key] = o['min'].dt
-            }
-            if (i == 4) {
-              o[key] = (o['max'].avgValue - o['min'].avgValue).toFixed(2)
-            }
-          })
-        }
-        SetMaxY({ max: d1[0], min: d1[2] })
-        SetFooterData(d1)
-        // console.log('d1111', d1)
-      }
-    })
-  }
-
-  const columns = [
-    {
-      title: '监测日期',
-      dataIndex: 'dt',
-      key: 'dt',
-      align: 'center',
-      width: 90
-    },
-    {
-      title: '库水位(m)',
-      key: 'rz',
-      dataIndex: 'rz',
-      align: 'center',
-      width: 90
-    },
-    {
-      title: '雨量(mm)',
-      dataIndex: 'drp',
-      key: 'drp',
-      align: 'center',
-      width: 90
-    },
-    {
-      title: '渗压水位(m)',
-      width: 80,
-      align: 'center',
-      children: col
-    }
-  ]
-
-  return (
-    <>
-      <div className='syjcPage' loading={loading}>
-        <div className='eacherBox'>
-          <LineBarEacher
-            echartsData={tableData}
-            echartsDt={echartsDt}
-            echartsRz={echartsRz}
-            echartsDrp={echartsDrp}
-            series={series}
-            col={col}
-            maxY={maxY}
-          ></LineBarEacher>
-        </div>
-        {/* <div className='tableBox'>tableBox</div> */}
-        <div className='tableBox'>
-          <Table
-            loading={loading}
-            columns={columns}
-            dataSource={tableData}
-            pagination={false}
-            // style={{ height: '450px' }}
-            scroll={{
-              y: 'calc( 100vh - 500px )'
-            }}
-            bordered
-            summary={pageData => {
-              let svg = series.map(obj => {
-                return obj
-              })
-              return (
-                <Table.Summary fixed>
-                  {footerData?.length > 0 ? (
-                    <>
-                      {footerData.map((item, index) => (
-                        <Table.Summary.Row>
-                          <Table.Summary.Cell className='ellipsis' index={0}>
-                            {item.dt}
-                          </Table.Summary.Cell>
-                          <Table.Summary.Cell
-                            index={1}
-                            className='ellipsis'
-                            style={{ padding: '6px' }}
-                          >
-                            <Text>{item.rz}</Text>
-                          </Table.Summary.Cell>
-                          <Table.Summary.Cell
-                            index={2}
-                            style={{ padding: '6px' }}
-                            className='ellipsis'
-                          >
-                            <Text>{item.drp}</Text>
-                          </Table.Summary.Cell>
-                          {svg?.length > 0 ? (
-                            <>
-                              {svg.map((val, idx) => (
-                                <Table.Summary.Cell
-                                  index={index + idx + val.dvcd}
-                                  style={{ padding: '6px' }}
-                                  className='ellipsis'
-                                >
-                                  <Text>{item[val.dvcd]}</Text>
-                                </Table.Summary.Cell>
-                              ))}
-                            </>
-                          ) : null}
-                        </Table.Summary.Row>
-                      ))}
-                    </>
-                  ) : null}
-                </Table.Summary>
-              )
-            }}
-          ></Table>
-          {/* <Table
-            columns={columns}
-            bordered
-            dataSource={footerData}
-            pagination={false}
-            showHeader={false}
-            scroll={{
-              x: 200
-            }}
-          ></Table> */}
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default SyjcPage
diff --git a/src/views/ysgzq/ssgq/dbaq/tableRow.js b/src/views/ysgzq/ssgq/dbaq/tableRow.js
deleted file mode 100644
index 0905d42..0000000
--- a/src/views/ysgzq/ssgq/dbaq/tableRow.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { Table, Typography } from 'antd'
-import './index.less'
-
-const TableRow = () => {
-  return (
-    <>
-      <Table.Summary.Row>
-        <Table.Summary.Cell index={0}>最大值</Table.Summary.Cell>
-        <Table.Summary.Cell index={1}>中控</Table.Summary.Cell>
-        <Table.Summary.Cell index={2}>中控</Table.Summary.Cell>
-        <Table.Summary.Cell index={3}>中控</Table.Summary.Cell>
-        <Table.Summary.Cell index={4}>中控</Table.Summary.Cell>
-        <Table.Summary.Cell index={5}>中控</Table.Summary.Cell>
-      </Table.Summary.Row>
-    </>
-  )
-}
-
-export default TableRow
diff --git a/src/views/ysgzq/ssgq/dbaq/toolBar.js b/src/views/ysgzq/ssgq/dbaq/toolBar.js
deleted file mode 100644
index ed9e49d..0000000
--- a/src/views/ysgzq/ssgq/dbaq/toolBar.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { Select, DatePicker, Radio, Button, Form } from 'antd'
-import moment from 'moment'
-import TimeRangePicker from '../../../../components/Form/datePicker'
-import SyjcPage from './syjc'
-import DbaqEcharts from './eachers/dbaqEcharts.js'
-const { RangePicker } = DatePicker
-const { Option } = Select
-
-const ToolBar1 = ({ search, activeKey, bdObj, resCd, bdObj1, resdt }) => {
-  const [size, setSize] = useState('small')
-  const [form] = Form.useForm()
-  const [date, setDate] = useState()
-  const [dataType, setDataType] = useState('0')
-
-  const [params, setParams] = useState({
-    type: '0',
-    tplType: 0,
-    source: '0',
-    resCd: resCd
-  }) //查询条件
-
-  useEffect(() => {
-    const { ...rec } = form.getFieldsValue()
-    console.log('查询条件', date)
-    if (date) {
-      setParams({ stm: date.startDate, etm: date.endDate, resCd: resCd })
-    }
-  }, [date])
-
-  useEffect(() => {
-    if (date) {
-      setParams({
-        stm: date.startDate,
-        etm: date.endDate,
-        resCd: resCd
-      })
-    }
-  }, [resCd])
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    setDataType(rec.type)
-    console.log('onSearchClick', resCd)
-    setParams({ stm: date.startDate, etm: date.endDate, resCd: resCd })
-  }
-
-  const onDateClick = val => {
-    console.log('onDateClick, ', val)
-    setDate(val)
-  }
-  const options = [
-    {
-      value: '0',
-      label: '过程线图'
-    },
-    {
-      value: '1',
-      label: '浸润线图'
-    }
-  ]
-
-  return (
-    <>
-      <div style={{ display: 'flex' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          style={{ display: 'flex' }}
-          initialValues={{
-            type: '0',
-            tm: moment(),
-            ts: '12:00'
-          }}
-        >
-          <Form.Item label='' name='type'>
-            <Select
-              style={{ width: 190, marginRight: 20 }}
-              defaultValue={options[0]?.value}
-              onChange={onSearchClick}
-              placeholder='请选择'
-            >
-              {options.map(option => (
-                <Option key={option.value} value={option.value}>
-                  {option.label}
-                </Option>
-              ))}
-            </Select>
-          </Form.Item>
-
-          <Form.Item>
-            <TimeRangePicker onDateClick={onDateClick} />
-          </Form.Item>
-          <Form.Item></Form.Item>
-        </Form>
-        <Form.Item style={{ marginTop: 5 }}>
-          <Button
-            type='primary'
-            onClick={onSearchClick}
-            style={{
-              marginLeft: '10px',
-              background: '#0893ff',
-              borderColor: '#0893ff',
-              height: '36px'
-            }}
-          >
-            查询
-          </Button>
-          {/* <Button style={{ marginLeft: '10px' }}>重置</Button> */}
-        </Form.Item>
-      </div>
-      <div className='right_conter'>
-        {dataType == 0 ? (
-          <SyjcPage resCd={resCd} params={resCd ? params : ''} />
-        ) : (
-          <div className='dbaqEcharts'>
-            <DbaqEcharts data={bdObj} rz={bdObj1} resdt={resdt}></DbaqEcharts>
-          </div>
-        )}
-      </div>
-    </>
-  )
-}
-
-export default ToolBar1
diff --git a/src/views/ysgzq/ssgq/dbaq/utils.js b/src/views/ysgzq/ssgq/dbaq/utils.js
deleted file mode 100644
index 824db7f..0000000
--- a/src/views/ysgzq/ssgq/dbaq/utils.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import moment from 'moment'
-// 二级表头
-export function getColumns (array) {
-  if (Array.isArray(array)) {
-    const uniqueObjectMap = array.reduce((accumulator, currentObject) => {
-      // 使用id作为键来存储对象
-      accumulator.set(currentObject.cd, currentObject)
-      return accumulator
-    }, new Map())
-
-    // 从Map中提取唯一的对象数组
-    return Array.from(uniqueObjectMap.values())
-  }
-}
-
-export function toolDate (val) {
-  const endDate = moment()
-  const startDate = moment().subtract(val, 'months')
-  console.log('tiemeeeeeeeeee', endDate, startDate)
-  return [startDate, endDate]
-}
-
-export function getNum (num) {
-  const valueSymbols = [
-    [1000, 'M'],
-    [900, 'CM'],
-    [500, 'D'],
-    [400, 'CD'],
-    [100, 'C'],
-    [90, 'XC'],
-    [50, 'L'],
-    [40, 'XL'],
-    [10, 'X'],
-    [9, 'IX'],
-    [5, 'V'],
-    [4, 'IV'],
-    [1, 'I']
-  ]
-  let result = []
-  for (const [value, key] of valueSymbols) {
-    while (num >= value) {
-      num -= value
-      result.push(key)
-    }
-    if (num == 0) {
-      break
-    }
-  }
-  return result.join('')
-}
-
-export function sortDateList (data) {
-  data.sort(function (a, b) {
-    return new Date(a).getTime() - new Date(b).getTime()
-  })
-  return data
-}
-export function handleDate (arr) {
-  // 转时间戳
-  function transTime (date) {
-    return new Date(date).getTime()
-  }
-  var result = []
-  var i = 0
-  const list = sortDateList(arr)
-  if (list.length === 0) return
-  list.forEach((item, index) => {
-    if (index === 0) {
-      result[0] = [item]
-    } else if (transTime(item) - transTime(list[index - 1]) === 86400000) {
-      // 判断当前值 和 前一个值是否相差 1
-      result[i].push(item)
-    } else {
-      result[++i] = [item]
-    }
-  })
-
-  return result
-}
-
-export function getDatesInRange (startDate, endDate) {
-  let dates = []
-  let currentDate = new Date(startDate)
-
-  while (currentDate <= endDate) {
-    dates.push(new Date(currentDate))
-    currentDate.setDate(currentDate.getDate() + 1)
-  }
-
-  return dates
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/yjlb/index.css b/src/views/ysgzq/ssgq/dbaq/yjlb/index.css
deleted file mode 100644
index e946e77..0000000
--- a/src/views/ysgzq/ssgq/dbaq/yjlb/index.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.syjcPageTable .syjcPage_con .tableBox {
-  height: calc(100vh - 600px);
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/yjlb/index.js b/src/views/ysgzq/ssgq/dbaq/yjlb/index.js
deleted file mode 100644
index e2da80d..0000000
--- a/src/views/ysgzq/ssgq/dbaq/yjlb/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Table, Typography } from 'antd'
-import './index.less'
-
-import ToolBal from './toolBal'
-import TablePage from './table'
-
-const { Text } = Typography
-
-const YjlbPage = ({ params, data, resCd, yjBool }) => {
-  console.log('预警列表', resCd)
-
-  const [resCode, SetResCode] = useState(resCd)
-  const [paramsData, SetParamsData] = useState()
-
-  const doSearch = obj => {
-    console.log('预警列表obj---', obj)
-    if (resCd) {
-      SetParamsData({ ...obj, resCd: resCode })
-    }
-  }
-
-  return (
-    <>
-      <div className='syjcPage'>
-        <div className='syjcPage_con'>
-          <ToolBal search={doSearch} resCd={resCd} yjBool={yjBool}></ToolBal>
-          <TablePage
-            params={{ ...paramsData }}
-            yjBool={yjBool}
-            resCd={resCd}
-          ></TablePage>
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default YjlbPage
diff --git a/src/views/ysgzq/ssgq/dbaq/yjlb/index.less b/src/views/ysgzq/ssgq/dbaq/yjlb/index.less
deleted file mode 100644
index 319b6fc..0000000
--- a/src/views/ysgzq/ssgq/dbaq/yjlb/index.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.syjcPageTable {
-  .syjcPage_con {
-    .tableBox {
-      height: calc(100vh - 600px);
-    }
-  }
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/yjlb/table.js b/src/views/ysgzq/ssgq/dbaq/yjlb/table.js
deleted file mode 100644
index 8d1aa44..0000000
--- a/src/views/ysgzq/ssgq/dbaq/yjlb/table.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { Table, Typography } from 'antd'
-import '../index.less'
-
-import usePageTable from '../../../../../components/crud/usePageTable'
-import { createCrudService } from '../../../../../components/crud/_'
-
-import { unionList, alarmPage } from '../../../../../service/dbaq'
-import { getNum } from '../utils'
-import apiurl from '../../../../../service/apiurl'
-
-const { Text } = Typography
-
-const YjlbPage = ({
-  params,
-  date,
-  resCd,
-  yjBool,
-  tableData1,
-  pressList,
-  avgData
-}) => {
-  const [col, SetColumns] = useState([])
-  const [tableData, SetTable] = useState([])
-
-  useEffect(() => {
-    console.log('YjlbPage2============ yjBool', yjBool, resCd, params)
-    if (resCd && params.startDate) {
-      const d3 = {
-        search: {
-          stm: params.startDate + ' 00:00:00',
-          etm: params.endDate + ' 23:59:59',
-          resCd: resCd
-        }
-      }
-      if (params.type != '2') {
-        d3.search.type = params.type
-      } else {
-        delete d3.search.type
-      }
-      search(d3)
-    }
-  }, [params])
-
-  const { tableProps, search } = usePageTable(
-    createCrudService(apiurl.ysgzq.dbaq.alarmPage).find_noCode
-  )
-
-  const columns = [
-    {
-      title: '序号',
-      dataIndex: 'inx',
-      key: 'inx',
-      fixed: 'left'
-    },
-    {
-      title: '测点名称',
-      key: 'dvcd',
-      dataIndex: 'dvcd'
-    },
-    {
-      title: '监测时间',
-      dataIndex: 'time',
-      key: 'time'
-    },
-    {
-      title: '监测类型',
-      dataIndex: 'type',
-      key: 'type',
-      render: (alue, row, index) => (
-        <span>
-          {' '}
-          {row.type == 1
-            ? '渗压'
-            : row.type == 3 || row.type == 4 || row.type == 5
-            ? '位移'
-            : ''}
-        </span>
-      )
-    },
-    {
-      title: '监测值',
-      dataIndex: 'value',
-      key: 'value'
-    },
-    {
-      title: '预警等级',
-      dataIndex: 'level',
-      key: 'level',
-      render: (alue, row, index) => (
-        <span>
-          {' '}
-          {row.level === 1
-            ? 'Ⅰ级'
-            : row.level === 2
-            ? 'Ⅱ级'
-            : row.level === 3
-            ? 'Ⅲ级'
-            : row.level === 4
-            ? 'Ⅳ级'
-            : ''}
-        </span>
-      )
-    }
-  ]
-
-  return (
-    <>
-      <div className='syjcPageTable'>
-        <div className='tableBox'>
-          <Table
-            columns={columns}
-            rowKey='id'
-            {...tableProps}
-            scroll={{ y: 'calc( 100vh - 400px )' }}
-          />
-        </div>
-      </div>
-    </>
-  )
-}
-
-export default YjlbPage
diff --git a/src/views/ysgzq/ssgq/dbaq/yjlb/toolBal.js b/src/views/ysgzq/ssgq/dbaq/yjlb/toolBal.js
deleted file mode 100644
index b2841b3..0000000
--- a/src/views/ysgzq/ssgq/dbaq/yjlb/toolBal.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import React, { useRef, useMemo, useEffect, useState } from 'react'
-import { Select, DatePicker, Radio, Button, Form } from 'antd'
-import moment from 'moment'
-import TimeRangePicker from '../../../../../components/Form/datePicker'
-const { RangePicker } = DatePicker
-const { Option } = Select
-
-const ToolBar1 = ({ search, yjBool, resCd }) => {
-  const [size, setSize] = useState('small')
-  const [form] = Form.useForm()
-  const [date, setDate] = useState()
-
-  const [optionData, SetOption] = useState([
-    {
-      value: '2',
-      label: '全部'
-    },
-    {
-      value: '1',
-      label: '渗压'
-    },
-    {
-      value: '3',
-      label: '位移'
-    }
-  ])
-  useEffect(() => {
-    console.log('yjBool---', yjBool)
-    if (yjBool == 1) {
-      SetOption([
-        {
-          value: '2',
-          label: '全部'
-        },
-        {
-          value: '1',
-          label: '渗压'
-        }
-      ])
-    } else if (yjBool == 2) {
-      SetOption([
-        {
-          value: '2',
-          label: '全部'
-        },
-        {
-          value: '3',
-          label: '位移'
-        }
-      ])
-    } else {
-      SetOption([
-        {
-          value: '2',
-          label: '全部'
-        },
-        {
-          value: '1',
-          label: '渗压'
-        },
-        {
-          value: '3',
-          label: '位移'
-        }
-      ])
-    }
-  }, [yjBool])
-
-  useEffect(() => {
-    const { ...rec } = form.getFieldsValue()
-    search({ ...rec, ...date })
-  }, [date])
-
-  const changeTplType = options => {}
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    search({ ...rec, ...date })
-  }
-
-  const onDateClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    setDate(val)
-    search({ ...rec })
-  }
-
-  return (
-    <>
-      <div style={{ display: 'flex' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          style={{ display: 'flex' }}
-          initialValues={{
-            type: '2',
-            tm: moment(),
-            ts: '12:00'
-          }}
-        >
-          <Form.Item label='' name='type'>
-            <Select
-              style={{ width: 190, marginRight: 20 }}
-              defaultValue={optionData[0]?.value}
-              value={optionData[0]?.value}
-              onChange={onSearchClick}
-              placeholder='请选择'
-            >
-              {optionData.map(option => (
-                <Option key={option.value} value={option.value}>
-                  {option.label}
-                </Option>
-              ))}
-            </Select>
-          </Form.Item>
-
-          <Form.Item>
-            <TimeRangePicker onDateClick={onDateClick} />
-          </Form.Item>
-          <Form.Item></Form.Item>
-        </Form>
-        <Form.Item style={{ marginTop: 5 }}>
-          <Button
-            type='primary'
-            onClick={onSearchClick}
-            style={{
-              marginLeft: '10px',
-              backgroundColor: '#0893ff',
-              borderColor: '#0893ff',
-              height: '36px'
-            }}
-          >
-            查询
-          </Button>
-          {/* <Button style={{ marginLeft: '10px' }}>重置</Button> */}
-        </Form.Item>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar1
diff --git a/src/views/ysgzq/ssgq/dbaq/yjlb/yjlb.css b/src/views/ysgzq/ssgq/dbaq/yjlb/yjlb.css
deleted file mode 100644
index e946e77..0000000
--- a/src/views/ysgzq/ssgq/dbaq/yjlb/yjlb.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.syjcPageTable .syjcPage_con .tableBox {
-  height: calc(100vh - 600px);
-}
diff --git a/src/views/ysgzq/ssgq/dbaq/yjlb/yjlb.less b/src/views/ysgzq/ssgq/dbaq/yjlb/yjlb.less
deleted file mode 100644
index 319b6fc..0000000
--- a/src/views/ysgzq/ssgq/dbaq/yjlb/yjlb.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.syjcPageTable {
-  .syjcPage_con {
-    .tableBox {
-      height: calc(100vh - 600px);
-    }
-  }
-}
diff --git a/src/views/ysgzq/ssgq/gcxq/form.js b/src/views/ysgzq/ssgq/gcxq/form.js
deleted file mode 100644
index 83e49eb..0000000
--- a/src/views/ysgzq/ssgq/gcxq/form.js
+++ /dev/null
@@ -1,204 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Select,Image } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined } from '@ant-design/icons';
-import "./index.less"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const options = [
-    {
-    label: '一般险情 ',
-    value: 1
-    },
-    {
-      label: '较大险情 ',
-      value: 2
-    }
-    ,
-    {
-      label: '重大险情 ',
-      value: 3
-    }
-    ,
-    {
-      label: '特别重大险情 ',
-      value: 4
-    }
-  ]
-  const [form] = Form.useForm();
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  useEffect(() => {
-    let initalParams = {
-      ...record,
-      projectType: record.projectType == 1 ? "水库" : "水电站",
-      severity: options.find(item => item.value == record.severity).label,
-      isControlled: record.isControlled == 1 ? "是" : "否",
-   }
-   form.setFieldsValue(initalParams)
-  }, [record])
-  
-  return (
-    <>
-    <Form form={form}>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="工程名称"
-                name="projectName"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="工程类型"
-                name="projectType"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="严重程度"
-                name="severity"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-                // rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="是否已管控"
-                name="isControlled"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-                // rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label="险情描述"
-                name="incidentDescription"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 21 }}
-              >
-                <Input.TextArea disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="管控责任人"
-                name="controlResponsiblePerson"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="联系电话"
-                name="responsiblePersonPhone"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报人"
-                name="reporter"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-            
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="上报单位"
-                name="reportUnit"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报时间"
-                name="reportTime"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      、 <Row>
-          <Col span={24}>
-              <Form.Item
-                label="其他情况说明"
-                name="remark"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 21 }}
-              >
-                <Input.TextArea disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row gutter={[16]}>
-          <div style={{marginLeft:81}}>附件：</div>
-              {
-                 record?.fileList.length > 0 && record?.fileList.map(file => {
-                  return (
-                      <Col span={10}>
-                        <div className='file-item'>
-                          <div className='file-description'>
-                          {file.fileName.indexOf('.docx') > -1 ? <FileWordOutlined  style={{fontSize:40}}/> :
-                            file.fileName.indexOf('.pdf') > -1 ? <FilePdfOutlined /> : 
-                              file.fileName.indexOf('.zip') > -1 ? <FileZipOutlined /> :
-                            <Image src={ url +file?.filePath} alt='' />
-                            }
-                            <span
-                            style={
-                              {
-                                display: "inline-block",
-                                width: "230px",
-                                textOverflow: "ellipsis",
-                                overflow: "hidden",
-                                whiteSpace: "nowrap"
-                              }}>{file.fileName}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-              }
-
-              </Row>
-    </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/ysgzq/ssgq/gcxq/index.js b/src/views/ysgzq/ssgq/gcxq/index.js
deleted file mode 100644
index 309a7f2..0000000
--- a/src/views/ysgzq/ssgq/gcxq/index.js
+++ /dev/null
@@ -1,177 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Button, message, Tabs } from 'antd';
-import {useDispatch,useSelector} from "react-redux";
-import ModalForm from './form';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({ projectName: '' })
-  const [tab, setTab] = useState(0)  // 0未读  1已读
-  const toolBarRef = useRef();
-  const dispatch = useDispatch();
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '上报时间', key: 'reportTime', dataIndex: 'reportTime', width: 200 },
-    { title: '工程名称', key: 'projectName', dataIndex: 'projectName', width: 200 },
-    {
-      title: '工程类型', key: 'projectType', dataIndex: 'projectType', width: 200,
-      render: (_, record) => {
-        return <span>{ record?.projectType == 1 ? "水库" :'水电站'}</span>
-      }
-    },
-    {
-      title: '严重程度', key: 'severity', dataIndex: 'severity', width: 200,
-      render: (_, record) => {
-        return <span>{
-          record?.severity == 1 ? "一般险情" : 
-            record?.severity == 2 ? "较大险情" : 
-              record?.severity == 3 ? "重大险情" : 
-                 record?.severity == 4? "特别重大灾情" : ""
-          }</span>
-      }
-    },
-    { title: '险情描述', key: 'incidentDescription', dataIndex: 'incidentDescription', width: 200 },
-    {
-      title: '是否已管控', key: 'isControlled', dataIndex: 'isControlled', width: 140,
-      render: (_, record) => { return <span>{ record?.isControlled ? "是" : "否"}</span>}
-    },
-    { title: '管控责任人', key: 'controlResponsiblePerson', dataIndex: 'controlResponsiblePerson', width: 200 },
-    { title: '责任人电话', key: 'responsiblePersonPhone', dataIndex: 'responsiblePersonPhone', width: 200 },
-    { title: '上报人', key: 'reporter', dataIndex: 'reporter', width: 200 },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text  view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.ysgzq.gcxq.page).find_noCode, {});
-  
-  
-  const command = (type) => (params) => {
-    createCrudService(apiurl.ysgzq.gcxq.getFile)
-    .delGet({id: params.id})
-    .then(res => {
-      if (res.code == 200) {
-        refModal.current.showView({ ...params, fileList: res.data });
-        if (tab == 0) {
-         refresh();
-       }
-      }
-  })
-  }
- 
-  /**
-   * @description 渲染每一个tab
-   */
-  const renderTab = () => {
-    return [
-      {
-        key: 0,
-        label: '未读',
-        children:
-          <Table
-            columns={columns}
-            rowKey="inx"
-            {...tableProps}
-            scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-      },
-      {
-        key: 1,
-        label: '已读',
-        children:
-        <Table
-          columns={columns}
-          rowKey="inx"
-          {...tableProps}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-      },
-    ];
-  };
-  const getReadStatus = () => {
-    createCrudService(apiurl.ssyq.status).delGet().then((res) => {
-      if (res.code === 200) {
-        dispatch.runtime.setIsReadObject(res.data)
-      }
-    })
-  }
-   /**
-   * @description 全部标记为已读
-   */
-   const allReadChange = () => {
-    createCrudService(apiurl.ysgzq.gcxq.allRead).save().then(res => {
-      if (res.code === 200) {
-        refresh();
-        getReadStatus()
-      }
-    })
-  }
-  /**
-   * @description 点击tab切换
-   */
-  useEffect(() => {
-    if (searchVal) {
-      let params = {
-        search: {
-          ...searchVal,
-          projectName:searchVal.projectName || undefined,
-          isRead:tab
-          }
-        };
-      search(params)
-    }
-  }, [searchVal, tab])
-
-  /**
-   * @description 获取已读状态
-   */
-  useEffect(() => {
-    let data = tableProps.dataSource;
-    if (data?.length) {
-      getReadStatus()
-   }  
-  }, [tableProps])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-            <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              ref={toolBarRef}
-              setTab={setTab}
-              allReadChange={allReadChange}
-            />
-            </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Tabs
-              onChange={(v) => setTab(v)}
-              items={renderTab()}
-              activeKey={tab} 
-            />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssgq/gcxq/index.less b/src/views/ysgzq/ssgq/gcxq/index.less
deleted file mode 100644
index 35237c4..0000000
--- a/src/views/ysgzq/ssgq/gcxq/index.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.view-file{
-    margin-left: 12% ;
-}
-.upload-file{
-    margin-left: 92%;
-}
-.disable-icon{
-    pointer-events: none;
-    cursor: not-allowed !important;
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/ssgq/gcxq/toolbar.js b/src/views/ysgzq/ssgq/gcxq/toolbar.js
deleted file mode 100644
index 2d02ea1..0000000
--- a/src/views/ysgzq/ssgq/gcxq/toolbar.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import React, { forwardRef, useImperativeHandle } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import moment from 'moment';
-import NormalSelect from '../../../../components/Form/NormalSelect';
-const ToolBar = forwardRef(({ setSearchVal, allReadChange,setTab },ref) => {
-  const [form] = Form.useForm();
-  const { RangePicker } = DatePicker;
-  const source = [
-    {
-    label: '一般险情 ',
-    value: 1
-    },
-    {
-      label: '较大险情 ',
-      value: 2
-    }
-    ,
-    {
-      label: '重大险情 ',
-      value: 3
-    }
-    ,
-    {
-      label: '特别重大险情 ',
-      value: 4
-    }
-  ]
-  useImperativeHandle(ref, () => ({
-    reset: () => {
-      form.resetFields();
-    }
-  }))
-
-  /**
-   * @description 表单提交
-   */
-  const onFinish = (values) => {
-    let timeSo;
-    if (values.tm) {
-      timeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, timeSo});
-  };
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form
-          className='toolbarBox'
-          layout="inline"
-          onFinish={onFinish}
-          form={form}
-        >
-          <Form.Item label="工程名称" name="projectName">
-            <Input allowClear placeholder='' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="严重程度" name="severity">
-            <NormalSelect options={source} style={{ width: '180px' }} />
-          </Form.Item>
-          <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "250px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button onClick={() => {allReadChange()}}>全部标记为已读</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-})
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/ysgzq/ssgq/index.js b/src/views/ysgzq/ssgq/index.js
deleted file mode 100644
index e39ea1f..0000000
--- a/src/views/ysgzq/ssgq/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-const Page = () => {
-
-
-  return (
-    <>
-        <div>工情</div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssgq/yxqk/form.js b/src/views/ysgzq/ssgq/yxqk/form.js
deleted file mode 100644
index 8a82032..0000000
--- a/src/views/ysgzq/ssgq/yxqk/form.js
+++ /dev/null
@@ -1,181 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined } from '@ant-design/icons';
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  useEffect(() => {
-    let initalParams = {
-      ...record,
-      isPowerGeneration: record.isPowerGeneration == 0 ? "否" : "是",
-      isFloodRelease: record.isFloodRelease == 0 ? "否" : "是",
-      projectType: record.projectType == 1 ? "水库" : "水电站"
-   }
-   form.setFieldsValue(initalParams)
-  }, [record])
-  
-  return (
-    <>
-    <Form form={form}>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="工程名称"
-                name="projectName"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="工程类型"
-                name="projectType"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="是否发电"
-                name="isPowerGeneration"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-                // rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="是否泄洪"
-                name="isFloodRelease"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-                // rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报水位(m)"
-                name="waterLevel"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="上报入库流量(m³/s)"
-                name="inflowVolume"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报出库流量(m³/s)"
-                name="outflowVolume"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-            
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="上报人"
-                name="reporter"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报单位"
-                name="reportUnit"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="上报时间"
-                name="reportTime"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      、 <Row>
-          <Col span={24}>
-              <Form.Item
-                label="其他运行情况"
-                name="remark"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 21 }}
-              >
-                <Input.TextArea disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row gutter={[16]}>
-          <div style={{marginLeft:81}}>附件：</div>
-              {
-                 record?.fileList.length > 0 && record?.fileList.map(file => {
-                  return (
-                      <Col span={8}>
-                        <div className='file-item'>
-                          <div className='file-description'>
-                          {file.fileName.indexOf('.docx') > -1 ? <FileWordOutlined  style={{fontSize:40}}/> :
-                            file.fileName.indexOf('.pdf') > -1 ? <FilePdfOutlined /> : 
-                              file.fileName.indexOf('.zip') > -1 ? <FileZipOutlined /> :
-                            <Image src={ url +file?.filePath} alt='' />
-                            }
-                          <span
-                            style={
-                              {
-                                display: "inline-block",
-                                width: "230px",
-                                textOverflow: "ellipsis",
-                                overflow: "hidden",
-                                whiteSpace: "nowrap"
-                              }}>{file.fileName}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-              }
-
-              </Row>
-    </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/ysgzq/ssgq/yxqk/index.js b/src/views/ysgzq/ssgq/yxqk/index.js
deleted file mode 100644
index 20cdefd..0000000
--- a/src/views/ysgzq/ssgq/yxqk/index.js
+++ /dev/null
@@ -1,175 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
-import { Table, Card, Button, message, Tabs } from 'antd';
-import {useDispatch,useSelector} from "react-redux";
-import ModalForm from './form';
-import ToolBar from './toolbar';
-import apiurl from '../../../../service/apiurl';
-import usePageTable from '../../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../../components/crud/_';
-import { CrudOpRender_text } from '../../../../components/crud/CrudOpRender';
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({ projectName: '' })
-  const [tab, setTab] = useState(0)  // 0未读  1已读
-  const toolBarRef = useRef();
-  const dispatch = useDispatch();
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '上报时间', key: 'reportTime', dataIndex: 'reportTime', width: 200 },
-    { title: '工程名称', key: 'projectName', dataIndex: 'projectName', width: 200, },
-    {
-      title: '工程类型', key: 'projectType', dataIndex: 'projectType', width: 200,
-      render: (_, record) => {
-        return <span>{ record?.projectType == 1 ? "水库" :'水电站'}</span>
-      }
-    },
-    {
-      title: '是否发电', key: 'isPowerGeneration', dataIndex: 'isPowerGeneration', width: 200,
-      render: (_, record) => {
-        return <span>{ record?.isPowerGeneration == 1 ? "是" :'否'}</span>
-      }
-    },
-    {
-      title: '是否泄洪', key: 'isFloodRelease', dataIndex: 'isFloodRelease', width: 140,
-      render: (_, record) => { return <span>{ record?.isFloodRelease ? "是" : "否"}</span>}
-    },
-    { title: '上报水位(m)', key: 'waterLevel', dataIndex: 'waterLevel', width: 200 },
-    { title: '上报入库流量(m³/s)', key: 'inflowVolume', dataIndex: 'inflowVolume', width: 200 },
-    { title: '上报出库流量(m³/s)', key: 'outflowVolume', dataIndex: 'outflowVolume', width: 200 },
-    { title: '上报人', key: 'reporter', dataIndex: 'reporter', width: 200 },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text  view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.ysgzq.ssgq.page).find_noCode, {});
-  console.log(tableProps.dataSource);
-  const command = (type) => (params) => {
-    createCrudService(apiurl.ysgzq.ssgq.getFile)
-      .delGet({id: params.id})
-      .then(res => {
-        if (res.code == 200) {
-          refModal.current.showView({ ...params, fileList: res.data });
-          if (tab == 0) {
-           refresh();
-         }
-        }
-        
-    })
-  }
- 
-  /**
-   * @description 渲染每一个tab
-   */
-  const renderTab = () => {
-
-    return [
-      {
-        key: 0,
-        label: '未读',
-        children:
-          <Table
-            columns={columns}
-            rowKey="inx"
-            {...tableProps}
-            scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-      },
-      {
-        key: 1,
-        label: '已读',
-        children:
-        <Table
-          columns={columns}
-          rowKey="inx"
-          {...tableProps}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-      },
-    ];
-  };
-
-  /**
-   * @description 全部标记为已读
-   */
-  const allReadChange = () => {
-    createCrudService(apiurl.ysgzq.ssgq.allRead).save().then(res => {
-      if (res.code === 200) {
-        refresh();
-        getReadStatus()
-      }
-    })
-  }
-  /**
-   * @description 点击tab切换
-   */
-  useEffect(() => {
-    if (searchVal) {
-      let params = {
-        search: {
-          ...searchVal,
-          projectName:searchVal.projectName || undefined,
-          isRead:tab
-          }
-        };
-      search(params)
-    }
-  }, [searchVal, tab])
-
-  const getReadStatus = () => {
-    createCrudService(apiurl.ssyq.status).delGet().then((res) => {
-      if (res.code === 200) {
-        dispatch.runtime.setIsReadObject(res.data)
-      }
-    })
-  }
-  useEffect(() => {
-    let data = tableProps.dataSource;
-    if (data?.length) {
-      getReadStatus()
-   }  
-  }, [tableProps])
-  
- 
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-            <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              ref={toolBarRef}
-              setTab={setTab}
-              allReadChange={allReadChange}
-            />
-            </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Tabs
-              // defaultActiveKey="1"
-              onChange={(v) => setTab(v)}
-              items={renderTab()}
-              activeKey={tab} 
-            />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssgq/yxqk/index.less b/src/views/ysgzq/ssgq/yxqk/index.less
deleted file mode 100644
index 7f15153..0000000
--- a/src/views/ysgzq/ssgq/yxqk/index.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-  
-}
-
diff --git a/src/views/ysgzq/ssgq/yxqk/toolbar.js b/src/views/ysgzq/ssgq/yxqk/toolbar.js
deleted file mode 100644
index 04e0a3b..0000000
--- a/src/views/ysgzq/ssgq/yxqk/toolbar.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { forwardRef, useImperativeHandle } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
-import moment from 'moment';
-const ToolBar = forwardRef(({ setSearchVal, allReadChange,setTab },ref) => {
-  const [form] = Form.useForm();
-  const { RangePicker } = DatePicker;
-  useImperativeHandle(ref, () => ({
-    reset: () => {
-      form.resetFields();
-    }
-  }))
-
-  /**
-   * @description 表单提交
-   */
-  const onFinish = (values) => {
-    let timeSo;
-    if (values.tm) {
-      timeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, timeSo});
-  };
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form
-          className='toolbarBox'
-          layout="inline"
-          onFinish={onFinish}
-          form={form}
-        >
-          <Form.Item label="工程名称" name="projectName">
-            <Input allowClear placeholder='' style={{width:'180px'}}/>
-          </Form.Item>
-          <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              showTime 
-              style={{ width: "330px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button onClick={() => { allReadChange() }}>全部标记为已读</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-})
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/ysgzq/sssq/hdsq/img/tuli.png b/src/views/ysgzq/sssq/hdsq/img/tuli.png
deleted file mode 100644
index 4df94d0..0000000
Binary files a/src/views/ysgzq/sssq/hdsq/img/tuli.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/hdsq/index.js b/src/views/ysgzq/sssq/hdsq/index.js
deleted file mode 100644
index 9da94f7..0000000
--- a/src/views/ysgzq/sssq/hdsq/index.js
+++ /dev/null
@@ -1,324 +0,0 @@
-import "./index.less"
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import Toolbar from './toolbar'
-import {Table, Switch} from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import Icon from "ol/style/Icon";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import FillStyle from 'ol/style/Fill'
-import Text from 'ol/style/Text'
-import Stroke from 'ol/style/Stroke'
-import { transform } from 'ol/proj';
-import moment from "moment";
-import {list,warn} from '../../../../service/sssq'
-import Tuli from './img/tuli.png'
-
-const Page = () => {
-  const hasAlertBox = useSelector((s) => s.runtime.hasAlertBox);
-  const layerVisible = useSelector((s) => s.map.layerVisible);
-  let mapObj = useSelector((s) => s.map.map);
-  const dispatch = useDispatch();
-  const [tableData, setTableData] = useState([])
-  const [params, setParams] = useState({})
-  const [tjData, setTjData] = useState({
-    wrzList:[],
-    grzList:[],
-  })
-
-  const doSearch = (params) => {
-    setParams(params)
-    getData(params)
-  };
-
-  const getData = async (params) => {
-    setTableData(await list(params));
-    setTjData(await warn(params));
-  }
-  const columns = [
-    {
-      title: '站名', key: '', dataIndex: '', align: 'center',
-      render: (rec) => <div className="ellipsisDiv" onClick={() => flyTo(rec)}
-                            style={{cursor: "pointer", paddingLeft: "10px"}} title={rec.stnm}>{rec.stnm}</div>
-    },
-    {
-      title: '河流及站址',
-      key: '',
-      dataIndex: '',
-      align: 'center',
-      render: (rec) => <div className="ellipsisDiv" onClick={() => flyTo(rec)}
-                            style={{cursor: "pointer", paddingLeft: "10px"}} title={rec.rvnm||""+rec.stlc||""}>{rec.rvnm||""+rec.stlc||""}</div>
-    },
-    {
-      title: '监测时间', key: '', dataIndex: '', align: 'center', render: (rec) =>
-        <span
-          style={
-            { color:moment().diff(moment(rec.tm),"hours") > 2 && "red"}
-          }
-        >
-          {rec.tm ? moment(rec.tm).format("MM-DD HH:mm") : ""}
-        </span>
-    },
-    {
-      title: '实时水位(m)', key: 'z', dataIndex: 'z', align: 'center',
-      
-      render: (_, rec) => {
-        return (
-          <div style={{ position: "relative" }}>
-            {
-                (rec.z && rec.grz) && (rec.z > rec.grz ) ? 
-                  <img
-                    src={`${process.env.PUBLIC_URL}/assets/fxdd/超危险.png`}
-                    style={{
-                      position: "absolute",
-                      top: "-16%",
-                      left: "5%",
-                      width: '30px',
-                      height: '30px',
-                      marginRight: '10px',
-                    }}
-                  /> :
-                (rec.z && rec.wrz) && (rec.z > rec.wrz) ?
-                  <img
-                    src={`${process.env.PUBLIC_URL}/assets/fxdd/超警戒.png`}
-                    style={{
-                      position: "absolute",
-                      top: "-16%",
-                      left: "5%",
-                      width: '30px',
-                      height: '30px',
-                      marginRight: '10px',
-                    }}
-                      /> :
-               null
-            }
-            <span
-              style={
-                {
-                  backgroundColor:
-                  (rec.z && rec.grz) && (rec.z > rec.grz) ? "rgba(255,29,29,.2)" :
-                  (rec.z && rec.wrz) && (rec.z > rec.wrz) ? "rgba(255,141,39,.2)" :
-                    "none"
-                }
-              }>{rec.z.toFixed(2)}</span>
-              {
-              rec.state == 1 ? <span style={
-                {
-                  position: 'absolute',
-                  top: "-6px",
-                  right: 0,
-                  color: "#FF7D7D",
-                  fontSize: "20px"
-              }}>↑</span> : rec.state == 2 ?
-                  <span style={
-                    {
-                      position: 'absolute',
-                      top: "-6px",
-                      right: 0,
-                      color: "#32E48E",
-                      fontSize: "20px",
-
-                    }}>↓</span> : ""
-              }
-          </div>
-        )
-      }
-    },
-  ];
-
-
-  const flyTo = (record) => {
-
-    // dispatch.map.setLayerVisible({'HdswLayer': true});
-
-    const {lgtd, lttd, elev} = record;
-    if (lgtd && lttd) {
-      // dispatch.map.setLayerSetting({
-      //   highlight: {
-      //     HdswLayer: [record.id],
-      //   }
-      // });
-
-      dispatch.runtime.setFeaturePop({type: "hdsw", data: record, lgtd: record.lgtd, lttd: record.lttd,});
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-    }
-  }
-
-  useEffect(() => {
-    // dispatch.map.setLayerVisible({'HdswLayer': true});
-    let option = {
-      sources: ["SH", "SW"],
-      args: "",
-    };
-    setParams(option)
-    getData(option)
-
-    return ()=>{
-      // dispatch.map.setLayerVisible({'HdswLayer': false});
-      dispatch.runtime.closeFeaturePopAll()
-      mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-        if( (layer.values_.name) && ((layer.values_.name).indexOf("YSGZQ_SSSQ_HD")>-1 ) ){
-            layer.getSource().clear();
-        }
-      })
-    }
-  }, [mapObj])
-
-  useEffect(()=>{
-    //根据查询出来的水库在地图上打点
-    if(tableData&&tableData.length>=0){
-      mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-          if( (layer.values_.name) && ((layer.values_.name).indexOf("YSGZQ_SSSQ_HD")>-1 ) ){
-              layer.getSource().clear();
-          }
-      })
-      addLayer(tableData)
-    }
-  },[tableData])
-
-  const addLayer = (arr)=>{
-
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name:"YSGZQ_SSSQ_HD",
-      source: new VectorSource(),
-      style: (feature,zIndex) =>{
-        const z = feature.values_.data.z
-        const stnm = feature.values_.data.stnm
-          return [new Style({
-            image: new Icon({
-              src: `${process.env.PUBLIC_URL}/assets/sanjiao2.png`,
-              // anchor: [0.5, 0.5],
-              opacity: 1,
-              // scale: 0.9,
-              // rotation:(90),
-              width:12,
-              hieght:12
-            }),
-            text: new Text({
-              text: zIndex<50?`${stnm}`:'',
-              offsetY: 24,
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true,
-            }),
-            zIndex:20
-          })]
-        },
-        zIndex:200,
-    })
-
-    var layerZ = new VectorLayer({
-      // @ts-ignore
-      name:"YSGZQ_SSSQ_HD_Z",
-      visible:layerVisible['jcsjLayer'],
-      source: new VectorSource(),
-      style: (feature,zIndex) =>{
-        const z = feature.values_.data.z
-        const stnm = feature.values_.data.stnm
-          return [new Style({
-            text: new Text({
-              text: z===null?'-':String(z),
-              offsetY: 12, 
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: 'rgba(0,0,0,0.5)' }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true
-            }),
-            zIndex:20
-          })]
-        },
-        zIndex:200,
-    })
-
-    const features = arr.map((item)=>{
-
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857');
-      const feature = new Feature({
-        geometry: new Point(point2),
-        data:item
-      });
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature));
-    features.forEach(feature => layerZ.getSource().addFeature(feature));
-    mapObj && mapObj.addLayer(layer);
-    mapObj && mapObj.addLayer(layerZ);
-    
-    mapObj && mapObj.on('click', function(evt) {
-
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj && mapObj.forEachFeatureAtPixel(evt.pixel, function(feature) {
-        return feature;
-      });
-      if (feature) {
-        const data = feature.values_.data
-        if(data){
-          dispatch.runtime.setFeaturePop({
-            id: data.stcd,
-            data:data,
-            type: 'hdsw',
-            lgtd: data.lgtd,
-            lttd: data.lttd,
-          })
-        }
-      }
-    });
-  }
-
-  return (
-    <div className="monitor-rainfall waterLevelBox">
-      <div style={{position:'absolute',top:0, left:'calc(100vw - 500px)', width:'300px'}}>
-        <Switch 
-          size='default' 
-          checkedChildren="监测数据" 
-          unCheckedChildren="监测数据" 
-          style={{marginRight:'20px'}}
-          onChange={(e)=>{
-            mapObj && mapObj.getLayers().getArray().forEach(layer => {
-              if (layer.values_.name && layer.values_.name === 'YSGZQ_SSSQ_HD_Z') {
-                layer.setVisible(e)
-              }
-            })
-            dispatch.map.setLayerVisible({'jcsjLayer':e});
-          }} 
-          value={layerVisible['jcsjLayer']} 
-          defaultChecked={layerVisible['jcsjLayer']}
-        />
-      </div>
-
-      <div style={{margin: "0 0 0 6px"}} className="topQuery">
-        <Toolbar params={params} doSearch={doSearch}/>
-      </div>
-      <div className="smallTable" style={{minHeight: "140px"}}>
-        <Table columns={columns} dataSource={tableData} rowKey="inx" pagination={false}
-               scroll={{y: hasAlertBox ? "calc((100vh - 370px)/2)" : "calc((100vh - 350px)/2)"}}/>
-      </div>
-      <div className="subTitles" style={{marginTop: "15px"}}>
-        <div> 站点统计(个)：<span style={{fontSize: '18px', color: '#0B81FF', marginRight: "10px"}}>{tableData.length || ""}</span></div>
-        <div>正常：<span style={{fontSize: '18px', color: '#0B81FF', marginRight: "10px"}}>{(tableData?.length-tjData.grzList?.length-tjData.wrzList?.length)||''}</span></div>
-        <div>超警戒：<span style={{fontSize: '18px', color: '#F59A23', marginRight: "10px"}}>{tjData.wrzList?.length}</span></div>
-        <div>超危险：<span style={{fontSize: '18px', color: '#D90030', marginRight: "10px"}}>{tjData.grzList?.length}</span></div>
-      </div>
-
-      <div style={{position:'absolute',top:'calc(100vh - 300px)', left:'calc(100vw - 700px)'}}>
-          <img src={Tuli} alt="" width={300}/>
-      </div>
-    </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/sssq/hdsq/index.less b/src/views/ysgzq/sssq/hdsq/index.less
deleted file mode 100644
index 720508f..0000000
--- a/src/views/ysgzq/sssq/hdsq/index.less
+++ /dev/null
@@ -1,38 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-
-  .smallTable {
-    //height: 23vh;
-    height: calc(100% - 190px);
-  }
-}
-
-.subTitles {
-  padding: 0 20px;
-  display: flex;
-  justify-content: space-between;
-  .sum-left{
-    flex: 1;
-    text-align: center;
-  }
-  .sum-right{
-    flex: 1;
-    display: flex;
-    flex-wrap: wrap;
-    div{
-      width: 50%;
-    }
-  }
-
-}
-
-.summary {
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-
-  .sum-count {
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/sssq/hdsq/toolbar.js b/src/views/ysgzq/sssq/hdsq/toolbar.js
deleted file mode 100644
index 96df00a..0000000
--- a/src/views/ysgzq/sssq/hdsq/toolbar.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Input,Form, Button, DatePicker,Checkbox,TreeSelect,Select } from 'antd';
-
-
-const CheckboxGroup = Checkbox.Group;
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({params,doSearch }) => {
-  const [form] = Form.useForm();
-  const onSearchClick = (val) => {
-    const {...rec} = form.getFieldsValue();
-    doSearch(rec);
-  }
-
-  useEffect(() => {
-    form.setFieldsValue(params);
-  }, [params])
-
-  const typeOptions = [
-    {label:"山洪", value: "SH"},
-    {label:"水文", value: "SW"},
-  ];
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' initialValues={{types:["SH","SW"]}}>
-          <Form.Item label="类型" name="sources" style={{margin: "0 0 8px 0"}}>
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick}/>
-          </Form.Item>
-          <Form.Item label="查询" name="args">
-            <Input  allowClear placeholder="输入站点名称或站点编码" onChange={onSearchClick}/>
-          </Form.Item>
-        </Form>
-
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/ysgzq/sssq/index.js b/src/views/ysgzq/sssq/index.js
deleted file mode 100644
index 27d0f33..0000000
--- a/src/views/ysgzq/sssq/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import {useSelector} from 'react-redux';
-import {Collapse, Slider, Button, Spin, Modal} from 'antd'
-import "./index.less"
-import React,{useState} from "react";
-import Hdsq from './hdsq'
-import Sksq from './sksq'
-import SummarizeRiverWaterRegime from "../../../components/summarizeRiverWaterRegime";
-import SummarizeReservoirWaterRegime from "../../../components/summarizeReservoirWaterRegime";
-
-
-
-const {Panel} = Collapse;
-
-
-
-const Page = () => {
-
-  const hasAlertBox = useSelector((s) => s.runtime.hasAlertBox);
-  const [myKey,setMyKey] = useState('1')
-  const [hzhdsqVisible, setHzhdsqVisible] = useState(false);
-  const [hzsksqVisible, setHzsksqVisible] = useState(false);
-
-  const handleCancel = () => {
-    setHzhdsqVisible(false);
-  }
-
-  const handleCancelSksq = () => {
-    setHzsksqVisible(false);
-  }
-
-  return (
-    <>
-      <div className="waterBox"
-        style={{ width: "28rem" }}
-        // style={{ height: hasAlertBox ? "calc(100vh - 110px)" : "calc(100vh - 90px)", width: "28rem" }}
-      >
-        <Collapse accordion defaultActiveKey={['1']} expandIconPosition="end" onChange={(e)=>setMyKey(e)}>
-          <Panel header={<div className="clearFloat panelTitle">
-            <div className="lf">
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">河道水情</span>
-            <span className="rf" onClick={(e)=>{e.stopPropagation();setHzhdsqVisible(true); }} style={{fontSize:"12px", margin:"2px 50px 0 0", color:"#0068F4"}}>汇总详情</span>
-          </div>} key="1">
-            {
-              myKey==='1'?<Hdsq />:null
-            }
-          </Panel>
-          <Panel header={<div className="clearFloat panelTitle">
-            <div className="lf">
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">水库水情</span>
-            <span className="rf" onClick={(e)=>{e.stopPropagation();setHzsksqVisible(true); }} style={{fontSize:"12px", margin:"2px 50px 0 0", color:"#0068F4"}}>汇总详情</span>
-          </div>} key="2">
-            { 
-              myKey==='2'?<Sksq key={myKey}/>:null
-            }
-          </Panel>
-        </Collapse>
-      </div>
-      {/*汇总河道水情弹窗*/}
-      <Modal
-        visible={hzhdsqVisible}
-        title="汇总河道水情"
-        footer={null}
-        onCancel={handleCancel}
-        width="99vw"
-        className="hzyqModal"
-        style={{ top: "15px", width: "99vw" }}
-        destroyOnClose
-      >
-        <SummarizeRiverWaterRegime />
-      </Modal>
-
-      {/*汇总水库水情弹窗*/}
-      <Modal
-        visible={hzsksqVisible}
-        title="汇总水库水情"
-        footer={null}
-        onCancel={handleCancelSksq}
-        width="99vw"
-        className="hzyqModal"
-        style={{ top: "15px" }}
-        destroyOnClose
-      >
-        <SummarizeReservoirWaterRegime />
-      </Modal>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/sssq/index.less b/src/views/ysgzq/sssq/index.less
deleted file mode 100644
index 6173585..0000000
--- a/src/views/ysgzq/sssq/index.less
+++ /dev/null
@@ -1,230 +0,0 @@
-.waterBox{
-  display: inline-block;
-  background: #fff;
-  padding: 10px;
-  position: relative;
-  z-index: 9999999;
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-
-  .drpBox{
-    .button-group span{
-      padding: 0 0.1rem;
-    }
-  }
-  .ellipsisDiv{
-    width:115px;
-    overflow: hidden;//溢出隐藏
-    white-space: nowrap;//禁止换行
-    text-overflow: ellipsis;//...
-  }
-}
-
-/*.legendBox{
-  background:#fff;
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width:132px;
-  left:82vw;
-  bottom:16px;
-  border-radius:6px;
-  padding:10px 10px 0 20px;
-  ul,li{
-    list-style: none;
-    padding:0;
-  }
-  span{
-    font-size:1rem;
-    height:20px;
-    line-height: 20px;
-  }
-  .colorSpan1,.colorSpan2,.colorSpan3,.colorSpan4,.colorSpan5,.colorSpan6,.colorSpan7{
-    width:16px;
-    height:9px;
-    border:1px solid #ddd;
-    margin:5px 10px 0 0;
-  }
-  .colorSpan1{
-    background:#781D4F;
-  }
-  .colorSpan2{
-    background:#EB20F7;
-  }
-  .colorSpan3{
-    background:#1E1ACA;
-  }
-  .colorSpan4{
-    background:#6EC2FA;
-  }
-  .colorSpan5{
-    background:#59B666;
-  }
-  .colorSpan6{
-    background:#BDEF9A;
-  }
-  .colorSpan7{
-    background:#fff;
-  }
-}*/
-
-.timeLineBox{
-  background: rgba(255,255,255,0.8);
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width:755px;
-  height:68px;
-  //left:480px;
-  left:calc( (100vw - 840px)/2 );
-  bottom:12px;
-  border-radius:6px;
-  padding:2px 0 0 5px;
-  cursor:pointer;
-  .ant-slider{
-    margin: 5px 0 0 30px;
-    //width:720px;
-    .ant-slider-rail{
-      background-color: #B4BCCC;
-      height: 3px;
-    }
-    .ant-slider-handle{
-      background-color: #B2D7FF;
-    }
-  }
-  .ant-slider-disabled .ant-slider-track{
-    background-color: #007BFF !important;
-  }
-  .ant-slider-disabled .ant-slider-rail{
-    background-color: #B4BCCC !important;
-  }
-  .topLabelBox{
-    position: relative;
-    height:15px;
-    span{
-      font-size: 12px;
-      color: #007BFF;
-      position: absolute;
-      font-weight:bold;
-      letter-spacing: 1px;
-      &:first-child{
-        left: 36px;
-        top:3px;
-      }
-      &:nth-child(2){
-        //left: 363px;
-        left: 417px;
-        top: 3px;
-        //font-size: 13px;
-      }
-      &:nth-child(3){
-        //left: 395px;
-        left: 455px;
-        top:3px;
-      }
-      &:nth-child(4){
-        right: 0;
-        top:5px;
-      }
-    }
-
-    .btnBg{
-      position: absolute;
-      background: rgba(0, 132, 231, 0.2);
-      width: 100px;
-      height: 23px;
-      //right: 170px;
-      border-radius: 6px;
-    }
-  }
-  .labelBox{
-    width:785px;
-    span{
-      margin-right:11px;
-      font-size:12px;
-      width: 61px;
-      text-align: center;
-      position: relative;
-      &:first-child, &:last-child, &:nth-child(6), &:nth-child(8){
-        &:after{
-          content: "";
-          display: block;
-          position: absolute;
-          width: 2px;
-          height: 8px;
-          background: #007BFF;
-          left: 29px;
-          top: -17px;
-        }
-      }
-      &:last-child{
-        margin-right:0;
-      }
-      &:before{
-        content:"";
-        display:block;
-        position: absolute;
-        left: 27px;
-        top: -9px;
-        width: 6px;
-        height: 6px;
-        border-radius: 50%;
-        background: #007BFF;
-        pointer-events: none;
-      }
-    }
-  }
-}
-
-.hzyqModal{
-  padding-bottom:10px;
-  .ant-modal-body{
-    padding: 12px 14px;
-  }
-  .ant-modal-content{
-    height:100%;
-  }
-}
-
-@media screen and (max-width:1549px){
-  .timeLineBox{
-    //zoom: 0.86;
-    left: 36.5rem;
-  }
-  .legendBox{
-    bottom: 70px;
-  }
-}
-@media screen and (max-width:1399px){
-  .indexBox .tipsBox{
-    //zoom: 0.76;
-  }
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli.png b/src/views/ysgzq/sssq/sksq/img/tuli.png
deleted file mode 100644
index 62d2e8d..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli2.png b/src/views/ysgzq/sssq/sksq/img/tuli2.png
deleted file mode 100644
index fcfea80..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli2.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli3.png b/src/views/ysgzq/sssq/sksq/img/tuli3.png
deleted file mode 100644
index c9dfae5..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli3.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli4.png b/src/views/ysgzq/sssq/sksq/img/tuli4.png
deleted file mode 100644
index dccd31d..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli4.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli5.png b/src/views/ysgzq/sssq/sksq/img/tuli5.png
deleted file mode 100644
index c4142dd..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli5.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli6.png b/src/views/ysgzq/sssq/sksq/img/tuli6.png
deleted file mode 100644
index 3ae4e33..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli6.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli7.png b/src/views/ysgzq/sssq/sksq/img/tuli7.png
deleted file mode 100644
index 2c66325..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli7.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli8.png b/src/views/ysgzq/sssq/sksq/img/tuli8.png
deleted file mode 100644
index 6dda296..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli8.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/img/tuli9.png b/src/views/ysgzq/sssq/sksq/img/tuli9.png
deleted file mode 100644
index 4507761..0000000
Binary files a/src/views/ysgzq/sssq/sksq/img/tuli9.png and /dev/null differ
diff --git a/src/views/ysgzq/sssq/sksq/index.js b/src/views/ysgzq/sssq/sksq/index.js
deleted file mode 100644
index 1c980ca..0000000
--- a/src/views/ysgzq/sssq/sksq/index.js
+++ /dev/null
@@ -1,346 +0,0 @@
-import "./index.less"
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import Toolbar from './toolbar'
-import {Table, Switch} from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import Icon from "ol/style/Icon";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import Stroke from "ol/style/Stroke";
-import FillStyle from "ol/style/Fill";
-import Text from "ol/style/Text";
-import { transform } from 'ol/proj';
-import moment from "moment";
-import {reservoirlist, reswarn} from "../../../../service/sssq";
-import Tuli from "./img/tuli.png"
-
-const Page = ({Sksq}) => {
-  const hasAlertBox = useSelector((s) => s.runtime.hasAlertBox);
-  const layerVisible = useSelector((s) => s.map.layerVisible);
-  let mapObj = useSelector((s) => s.map.map);
-  const dispatch = useDispatch();
-  const [tableData, setTableData] = useState([])
-  const [params, setParams] = useState({})
-  const [tjData, setTjData] = useState({
-    afsltdzList: [],
-    calFloodLevList: [],
-    desFloodLevList: [],
-  })
-
-  const doSearch = (params) => {
-    setParams(params)
-    getData(params)
-  };
-
-  const getData = async (params) => {
-    setTableData(await reservoirlist(params));
-    setTjData(await reswarn(params));
-  }
-  const columns = [
-    {
-      title: '站名', key: '', dataIndex: '', align: 'center',
-      render: (rec) => <div className="ellipsisDiv" onClick={() => flyTo(rec)}
-                            style={{cursor: "pointer"}} title={rec.stnm}>{rec.stnm}</div>
-    },
-    {
-      title: '监测时间',
-      key: '',
-      dataIndex: '',
-      align: 'center',
-      render: (rec) =>
-        <span
-          style={
-            { color:moment().diff(moment(rec.tm),"hours") > 2 && "red"}
-          }
-        >
-          {rec.tm ? moment(rec.tm).format("MM-DD HH:mm") : ""}
-        </span>
-    },
-    {
-      title: '实时水位(m)', key: 'rz', dataIndex: 'rz', align: 'center',
-      render: (rec) => <span>{rec.toFixed(2)}</span>
-    },
-    {
-      title: '', key: 'afsltdz', dataIndex: '', align: '', width: "10px",
-      render: (rec) => <div>
-        {
-          rec.state == 1 ? <span style={{color: "#FF7D7D",fontSize:"20px"}}>↑</span> : rec.state == 2 ?
-            <span style={{color: "#32E48E",fontSize:"20px"}}>↓</span> : ""
-        }
-      </div>
-    },
-    {
-      title: '超汛限(m)', key: 'afsltdz', dataIndex: 'afsltdz', align: 'center',
-      render: (_, rec) => {
-        return (
-          <div style={{ position: "relative" }}>
-            {
-                  (rec.rz && rec.calFloodLev)&&(rec.rz > rec.calFloodLev ) ? 
-                  <img
-                    src={`${process.env.PUBLIC_URL}/assets/fxdd/超核验.png`}
-                    style={{
-                      position: "absolute",
-                      top: "-16%",
-                      left: "5%",
-                      width: '30px',
-                      height: '30px',
-                      marginRight: '10px',
-                    }}
-                  /> :
-                  (rec.rz && rec.desFloodLev)&&(rec.rz > rec.desFloodLev) ?
-                  <img
-                    src={`${process.env.PUBLIC_URL}/assets/fxdd/超设计.png`}
-                    style={{
-                      position: "absolute",
-                      top: "-16%",
-                      left: "5%",
-                      width: '30px',
-                      height: '30px',
-                      marginRight: '10px',
-                    }}
-                      /> :
-                  rec.afsltdz && rec.afsltdz > 0 ?
-                  <img
-                    src={`${process.env.PUBLIC_URL}/assets/fxdd/超讯限.png`}
-                    style={{
-                      position: "absolute",
-                      top: "-16%",
-                      left: "5%",
-                      width: '30px',
-                      height: '30px',
-                      marginRight: '10px',
-                    }}
-                  />
-                  :
-               null
-            }
-            <span
-              style={
-                {
-                  backgroundColor:
-                  (rec.rz && rec.calFloodLev)&&(rec.rz > rec.calFloodLev ) ? "rgba(255,29,29,.2)" :
-                  (rec.rz && rec.desFloodLev)&&(rec.rz > rec.desFloodLev) ? "rgba(255,141,39,.2)" :
-                  rec.afsltdz && rec.afsltdz > 0 > 0  ? "rgba(247,221,6,.2)" :
-                        "none"
-                }
-              }>{rec.afsltdz ? rec.afsltdz.toFixed(2): "-"}</span>
-          </div>
-        )
-      }
-       
-    },
-
-  ];
-
-  const flyTo = (record) => {
-
-    // dispatch.map.setLayerVisible({'ShuiKuLayer': true});
-
-    const { lgtd, lttd, elev } = record;
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          ShuiKuLayer: [record.id],
-        }
-      });
-
-      dispatch.runtime.setFeaturePop({ type: "shuiku2", data: record, lgtd: record.lgtd, lttd: record.lttd, });
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-    }
-  }
-
-  useEffect(() => {
-    let option = {
-      sources: ["SW", "SK"],
-      args: "",
-    };
-    setParams(option)
-    getData(option)
- 
-    return ()=>{
-        dispatch.runtime.closeFeaturePopAll()
-        mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-          if( (layer.values_.name) && ((layer.values_.name).indexOf("YSGZQ_SSSQ_SK")>-1 ) ){
-              layer.getSource().clear();
-          }
-      })
-    }
-  }, [mapObj])
-
-  useEffect(()=>{
-    //根据查询出来的水库在地图上打点
-    if(tableData&&tableData.length>=0){
-      mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-          if( (layer.values_.name) && ((layer.values_.name).indexOf("YSGZQ_SSSQ_SK")>-1 ) ){
-              layer.getSource().clear();
-          }
-      })
-      addLayer(tableData)
-    }
-  },[tableData])
-
-  const addLayer = (arr)=>{
-
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name:"YSGZQ_SSSQ_SK",
-      source: new VectorSource(),
-      style: (feature,zIndex) =>{
-        const stnm = feature.values_.data.stnm
-          return [new Style({
-            image: new Icon({
-              src: `${process.env.PUBLIC_URL}/assets/sk3.png`,
-              // anchor: [0.5, 0.5],
-              opacity: 1,
-              // scale: 0.9,
-              width:12,
-              hieght:12
-            }),
-            text: new Text({
-              text: zIndex<50?`${stnm}`:'',
-              offsetY: 24,
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true,
-            }),
-            zIndex:20
-          })]
-        },
-        zIndex:200,
-    })
-
-    var layerRz = new VectorLayer({
-      // @ts-ignore
-      name:"YSGZQ_SSSQ_SK_RZ",
-      visible:layerVisible['jcsjLayer'],
-      source: new VectorSource(),
-      style: (feature,zIndex) =>{
-        const rz = feature.values_.data.rz
-          return [new Style({
-            text: new Text({
-              text: `${rz}`,
-              offsetY: 12,
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true,
-            }),
-            zIndex:20
-          })]
-        },
-        zIndex:200,
-    })
-
-    const features = arr.map((item)=>{
-      
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857');
-      const feature = new Feature({
-        geometry: new Point(point2),
-        data:item
-      });
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature));
-    features.forEach(feature => layerRz.getSource().addFeature(feature));
-
-    mapObj && mapObj.addLayer(layer);
-    mapObj && mapObj.addLayer(layerRz);
-
-    
-    mapObj && mapObj.on('click', function(evt) {
-
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj && mapObj.forEachFeatureAtPixel(evt.pixel, function(feature) {
-        return feature;
-      });
-      if (feature) {
-        const data = feature.values_.data
-        if(data){
-          dispatch.runtime.setFeaturePop({
-            id: data.stcd,
-            data:data,
-            type: 'shuiku2',
-            lgtd: data.lgtd,
-            lttd: data.lttd,
-          })
-        }
-      }
-    });
-  }
-
-  
-
-  return (
-    <div className="monitor-rainfall waterLevelBox">
-      <div style={{position:'absolute',top:0, left:'calc(100vw - 500px)', width:'300px'}}>
-        <Switch 
-          size='default' 
-          checkedChildren="监测数据" 
-          unCheckedChildren="监测数据" 
-          style={{marginRight:'20px'}}
-          onChange={(e)=>{
-            mapObj && mapObj.getLayers().getArray().forEach(layer => {
-              if (layer.values_.name && layer.values_.name === 'YSGZQ_SSSQ_SK_RZ') {
-                layer.setVisible(e)
-              }
-            })
-            dispatch.map.setLayerVisible({'jcsjLayer':e});
-          }} 
-          value={layerVisible['jcsjLayer']} 
-          defaultChecked={layerVisible['jcsjLayer']}
-        />
-      </div>
-      <div style={{margin: "0 0 0 6px"}} className="topQuery">
-        <Toolbar params={params} doSearch={doSearch}/>
-      </div>
-      <div className="smallTable" style={{minHeight: "140px"}}>
-        <Table columns={columns} dataSource={tableData} rowKey="inx" pagination={false}
-               scroll={{y: hasAlertBox ? "calc((100vh - 370px)/2)" : "calc((100vh - 350px)/2)"}}/>
-      </div>
-      <div className="subTitles" style={{marginTop: "15px"}}>
-        <div className="sum-left">站点统计(个)：<span
-          style={{fontSize: '18px', color: '#0B81FF', marginRight: "10px"}}>{tableData.length}</span></div>
-        <div className="sum-right">
-          <div>
-            正常：<span style={{ fontSize: '18px', color: '#0B81FF', marginRight: "10px" }}>{
-              (tableData?.length - tjData.afsltdzList?.length - tjData.desFloodLevList?.length - tjData.calFloodLevList?.length) > 0 ?
-              (tableData?.length - tjData.afsltdzList?.length - tjData.desFloodLevList?.length - tjData.calFloodLevList?.length) : ""
-            }</span>
-
-          </div>
-          <div>
-            超汛限：<span style={{fontSize: '18px', color: '#FFFF00', marginRight: "10px"}}>{tjData.afsltdzList?.length}</span>
-          </div>
-          <div>
-            超设计：<span style={{fontSize: '18px', color: '#D90030', marginRight: "10px"}}>{tjData.desFloodLevList?.length}</span>
-
-          </div>
-          <div>
-            超校核：<span style={{fontSize: '18px', color: '#D90030', marginRight: "10px"}}>{tjData.calFloodLevList?.length}</span>
-          </div>
-
-        </div>
-
-
-      </div>
-      <div style={{position:'absolute',top:'calc(100vh - 300px)', left:'calc(100vw - 700px)'}}>
-          <img src={Tuli} alt="" width={300}/>
-      </div>
-    </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/sssq/sksq/index.less b/src/views/ysgzq/sssq/sksq/index.less
deleted file mode 100644
index e86279a..0000000
--- a/src/views/ysgzq/sssq/sksq/index.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.waterLevelBox{
-  height:100%;
-  .smallTable{
-    //height: 23vh;
-    height:calc( 100% - 190px );
-  }
-}
-
-
-
-.summary{
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-  .sum-count{
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/sssq/sksq/toolbar.js b/src/views/ysgzq/sssq/sksq/toolbar.js
deleted file mode 100644
index 0686c11..0000000
--- a/src/views/ysgzq/sssq/sksq/toolbar.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Input,Form, Button, DatePicker,Checkbox,TreeSelect,Select } from 'antd';
-
-const CheckboxGroup = Checkbox.Group;
-const { RangePicker } = DatePicker;
-
-const ToolBar = ({params,doSearch }) => {
-  const [form] = Form.useForm();
-  const onSearchClick = (val) => {
-    const {...rec} = form.getFieldsValue();
-    doSearch(rec);
-  }
-
-  useEffect(() => {
-    form.setFieldsValue(params);
-  }, [params])
-
-  const typeOptions = [
-    {label:"水文", value: "SW"},
-    {label:"水库", value: "SK"},
-  ];
-
-
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' initialValues={{types:["SH","SW"]}}>
-          <Form.Item label="类型" name="sources" style={{margin: "0 0 8px 0"}}>
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick}/>
-          </Form.Item>
-          <Form.Item label="查询" name="args">
-            <Input  allowClear placeholder="输入站点名称或站点编码" onChange={onSearchClick}/>
-          </Form.Item>
-        </Form>
-
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/ysgzq/ssyq/dataConfig.js b/src/views/ysgzq/ssyq/dataConfig.js
deleted file mode 100644
index 7482d40..0000000
--- a/src/views/ysgzq/ssyq/dataConfig.js
+++ /dev/null
@@ -1,278 +0,0 @@
-export default {
-  tableData:[
-    {
-      "type": 7,
-      "typeName": "超历史最大",
-      "flowSign": null,
-      "flowDetails": []
-    },
-    {
-      "type": 6,
-      "typeName": "超100年一遇",
-      "flowSign": null,
-      "flowDetails": []
-    },
-    {
-      "type": 5,
-      "typeName": "超50年一遇",
-      "flowSign": null,
-      "flowDetails": []
-    },
-    {
-      "type": 4,
-      "typeName": "超20年一遇",
-      "flowSign": null,
-      "flowDetails": []
-    },
-    {
-      "type": 3,
-      "typeName": "超10年一遇",
-      "flowSign": null,
-      "flowDetails": []
-    },
-    {
-      "type": 2,
-      "typeName": "超5年一遇",
-      "flowSign": null,
-      "flowDetails": [
-        {
-          "rvcd": "AFF1320101W00000",
-          "village": [
-            "三组(幺牌）"
-          ],
-          "villagePoint": [
-            [
-              110.407947,
-              30.013943
-            ]
-          ],
-          "villagePeople": 318,
-          "flow": 466.972,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF1320101T00000",
-          "village": [
-            "五组（田家坪）"
-          ],
-          "villagePoint": [
-            [
-              110.425186,
-              30.030705
-            ]
-          ],
-          "villagePeople": 424,
-          "flow": 422.697,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF1320101R00000",
-          "village": [
-            "下街",
-            "四组（覃家坪）"
-          ],
-          "villagePoint": [
-            [
-              110.427007,
-              30.041187
-            ],
-            [
-              110.430404,
-              30.036725
-            ]
-          ],
-          "villagePeople": 631,
-          "flow": 417.836,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 2,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF1320101P00000",
-          "village": [
-            "四组",
-            "二组（胡家坪）"
-          ],
-          "villagePoint": [
-            [
-              110.435104,
-              30.057728
-            ],
-            [
-              110.439722,
-              30.055551
-            ]
-          ],
-          "villagePeople": 686,
-          "flow": 294.871,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 2,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF1320101X00000",
-          "village": [
-            "二组（红旗2）"
-          ],
-          "villagePoint": [
-            [
-              110.403766,
-              30.016641
-            ]
-          ],
-          "villagePeople": 100,
-          "flow": 481.41,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        }
-      ]
-    },
-    {
-      "type": 1,
-      "typeName": "超2年一遇",
-      "flowSign": null,
-      "flowDetails": [
-        {
-          "rvcd": "AFF1320101K00000",
-          "village": [
-            "一组（八里铺）"
-          ],
-          "villagePoint": [
-            [
-              110.458963,
-              30.074837
-            ]
-          ],
-          "villagePeople": 295,
-          "flow": 247.457,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF1320101I00000",
-          "village": [
-            "三组（关岔口）"
-          ],
-          "villagePoint": [
-            [
-              110.47866,
-              30.080996
-            ]
-          ],
-          "villagePeople": 197,
-          "flow": 218.73,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 6,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF1320101G00000",
-          "village": [
-            "二组（横河）"
-          ],
-          "villagePoint": [
-            [
-              110.47501,
-              30.097844
-            ]
-          ],
-          "villagePeople": 214,
-          "flow": 159.271,
-          "time": "2017-07-15 01:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 5,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF13201018N0000",
-          "village": [
-            "二组（白果湾）"
-          ],
-          "villagePoint": [
-            [
-              110.436559,
-              30.051893
-            ]
-          ],
-          "villagePeople": 193,
-          "flow": 72.42,
-          "time": "2017-07-15 00:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 4,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        },
-        {
-          "rvcd": "AFF13201015N0000",
-          "village": [
-            "三组"
-          ],
-          "villagePoint": [
-            [
-              110.457203,
-              30.049073
-            ]
-          ],
-          "villagePeople": 361,
-          "flow": 50.667,
-          "time": "2017-07-15 00:00:00",
-          "villageCount": 1,
-          "eventId": null,
-          "type": 4,
-          "riverMapCenter": null,
-          "town": null,
-          "riverArea": null,
-          "totalDrp": null
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/ssyq/index.js b/src/views/ysgzq/ssyq/index.js
deleted file mode 100644
index 793c475..0000000
--- a/src/views/ysgzq/ssyq/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-
-import { useState,useEffect } from 'react';
-import { useSelector } from 'react-redux';
-import {Collapse, Slider, Button, Spin, Modal, Radio} from 'antd'
-import "./index.less"
-import Jyxx from './jyxx'
-import Tjfx from './tjfx'
-
-const {Panel} = Collapse;
-
-const Page = () => {  
-  const [myKey, setMyKey] = useState('1')
-  return (
-    <>
-      <div className="waterBox"
-           style={{width: "28rem",marginBottom:'10px'}}>
-        <Collapse defaultActiveKey={['1']} accordion destrInactivePanel  expandIconPosition="end" onChange={(e)=>setMyKey(e)}>
-          <Panel header={<div className="clearFloat panelTitle">
-            <div className="lf">
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">降雨信息</span>
-          </div>} key="1">
-            {
-              myKey==='1'?<Jyxx/>:null
-            }
-            {/* <Jyxx/>  */}
-          </Panel>
-          <Panel header={<div className="clearFloat panelTitle">
-            <div className="lf">
-              <img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>
-            </div>
-            <span className="lf txt">统计分析</span>
-          </div>} key="2">
-            {
-              myKey==='2'?<Tjfx/>:null
-            }
-            {/* <Tjfx/> */}
-          </Panel>
-        </Collapse>
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssyq/index.less b/src/views/ysgzq/ssyq/index.less
deleted file mode 100644
index 6173585..0000000
--- a/src/views/ysgzq/ssyq/index.less
+++ /dev/null
@@ -1,230 +0,0 @@
-.waterBox{
-  display: inline-block;
-  background: #fff;
-  padding: 10px;
-  position: relative;
-  z-index: 9999999;
-  .rightDetails{
-    .closeBtn{
-      font-size: 20px;
-      cursor:pointer;
-      margin: -3px 14px 0 0;
-    }
-    position: absolute;
-    width:330px;
-    height:calc( 100vh - 90px );
-    background:#fff;
-    z-index:101;
-    right: calc( (100vw - 46rem)*(-1) );
-    top: -8px;
-    box-shadow: 1px 2px 10px #bdbaba;
-    padding:10px 0;
-    box-sizing: border-box;
-    .listDiv{
-      padding: 20px 0 20px 20px;
-      box-sizing: border-box;
-      height: calc(100vh - 135px);
-      overflow:hidden;
-    }
-    .imgDiv{
-      height: calc(100vh - 175px);
-      overflow: hidden auto;
-      .imgBox{
-        padding-right:20px;
-      }
-    }
-  }
-
-  .drpBox{
-    .button-group span{
-      padding: 0 0.1rem;
-    }
-  }
-  .ellipsisDiv{
-    width:115px;
-    overflow: hidden;//溢出隐藏
-    white-space: nowrap;//禁止换行
-    text-overflow: ellipsis;//...
-  }
-}
-
-/*.legendBox{
-  background:#fff;
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width:132px;
-  left:82vw;
-  bottom:16px;
-  border-radius:6px;
-  padding:10px 10px 0 20px;
-  ul,li{
-    list-style: none;
-    padding:0;
-  }
-  span{
-    font-size:1rem;
-    height:20px;
-    line-height: 20px;
-  }
-  .colorSpan1,.colorSpan2,.colorSpan3,.colorSpan4,.colorSpan5,.colorSpan6,.colorSpan7{
-    width:16px;
-    height:9px;
-    border:1px solid #ddd;
-    margin:5px 10px 0 0;
-  }
-  .colorSpan1{
-    background:#781D4F;
-  }
-  .colorSpan2{
-    background:#EB20F7;
-  }
-  .colorSpan3{
-    background:#1E1ACA;
-  }
-  .colorSpan4{
-    background:#6EC2FA;
-  }
-  .colorSpan5{
-    background:#59B666;
-  }
-  .colorSpan6{
-    background:#BDEF9A;
-  }
-  .colorSpan7{
-    background:#fff;
-  }
-}*/
-
-.timeLineBox{
-  background: rgba(255,255,255,0.8);
-  //border:1px solid #ddd;
-  box-shadow: 1px 2px 10px #bdbaba;
-  position: absolute;
-  width:755px;
-  height:68px;
-  //left:480px;
-  left:calc( (100vw - 840px)/2 );
-  bottom:12px;
-  border-radius:6px;
-  padding:2px 0 0 5px;
-  cursor:pointer;
-  .ant-slider{
-    margin: 5px 0 0 30px;
-    //width:720px;
-    .ant-slider-rail{
-      background-color: #B4BCCC;
-      height: 3px;
-    }
-    .ant-slider-handle{
-      background-color: #B2D7FF;
-    }
-  }
-  .ant-slider-disabled .ant-slider-track{
-    background-color: #007BFF !important;
-  }
-  .ant-slider-disabled .ant-slider-rail{
-    background-color: #B4BCCC !important;
-  }
-  .topLabelBox{
-    position: relative;
-    height:15px;
-    span{
-      font-size: 12px;
-      color: #007BFF;
-      position: absolute;
-      font-weight:bold;
-      letter-spacing: 1px;
-      &:first-child{
-        left: 36px;
-        top:3px;
-      }
-      &:nth-child(2){
-        //left: 363px;
-        left: 417px;
-        top: 3px;
-        //font-size: 13px;
-      }
-      &:nth-child(3){
-        //left: 395px;
-        left: 455px;
-        top:3px;
-      }
-      &:nth-child(4){
-        right: 0;
-        top:5px;
-      }
-    }
-
-    .btnBg{
-      position: absolute;
-      background: rgba(0, 132, 231, 0.2);
-      width: 100px;
-      height: 23px;
-      //right: 170px;
-      border-radius: 6px;
-    }
-  }
-  .labelBox{
-    width:785px;
-    span{
-      margin-right:11px;
-      font-size:12px;
-      width: 61px;
-      text-align: center;
-      position: relative;
-      &:first-child, &:last-child, &:nth-child(6), &:nth-child(8){
-        &:after{
-          content: "";
-          display: block;
-          position: absolute;
-          width: 2px;
-          height: 8px;
-          background: #007BFF;
-          left: 29px;
-          top: -17px;
-        }
-      }
-      &:last-child{
-        margin-right:0;
-      }
-      &:before{
-        content:"";
-        display:block;
-        position: absolute;
-        left: 27px;
-        top: -9px;
-        width: 6px;
-        height: 6px;
-        border-radius: 50%;
-        background: #007BFF;
-        pointer-events: none;
-      }
-    }
-  }
-}
-
-.hzyqModal{
-  padding-bottom:10px;
-  .ant-modal-body{
-    padding: 12px 14px;
-  }
-  .ant-modal-content{
-    height:100%;
-  }
-}
-
-@media screen and (max-width:1549px){
-  .timeLineBox{
-    //zoom: 0.86;
-    left: 36.5rem;
-  }
-  .legendBox{
-    bottom: 70px;
-  }
-}
-@media screen and (max-width:1399px){
-  .indexBox .tipsBox{
-    //zoom: 0.76;
-  }
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/ssyq/jyxx/index.css b/src/views/ysgzq/ssyq/jyxx/index.css
deleted file mode 100644
index 8742f1a..0000000
--- a/src/views/ysgzq/ssyq/jyxx/index.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.waterLevelBox {
-  height: 100%;
-}
-.waterLevelBox .smallTable {
-  height: calc(100% - 190px);
-}
-.subTitle {
-  position: relative;
-  padding-left: 8px;
-  margin: 0 0 10px 10px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-}
-.subTitle:after {
-  content: "";
-  display: block;
-  position: absolute;
-  width: 3px;
-  height: 16px;
-  background: #0068F4;
-  left: -2px;
-  top: 5px;
-  border-radius: 4px;
-}
-.summary {
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-}
-.summary .sum-count {
-  font-size: 18px;
-  font-weight: bold;
-}
diff --git a/src/views/ysgzq/ssyq/jyxx/index.js b/src/views/ysgzq/ssyq/jyxx/index.js
deleted file mode 100644
index 68480af..0000000
--- a/src/views/ysgzq/ssyq/jyxx/index.js
+++ /dev/null
@@ -1,475 +0,0 @@
-import './index.less'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import Toolbar from './toolbar'
-import {Table, Switch, Radio} from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import { Vector as VectorSource } from "ol/source";
-import VectorLayer from "ol/layer/Vector";
-import Style from "ol/style/Style";
-import Icon from "ol/style/Icon";
-import Text from "ol/style/Text";
-import Feature from "ol/Feature";
-import Point from 'ol/geom/Point.js';
-import Circle from 'ol/style/Circle';
-import Stroke from "ol/style/Stroke";
-import FillStyle from "ol/style/Fill";
-
-import { transform } from 'ol/proj';
-import moment from 'moment'
-import { list, count, level } from '../../../../service/ssyq'
-
-const Page = ({tableData1}) => {
-  const hasAlertBox = useSelector((s) => s.runtime.hasAlertBox);
-  const layerVisible = useSelector((s) => s.map.layerVisible);
-
-  const dispatch = useDispatch();
-  const [tableData, setTableData] = useState([])
-  const [myKey, setMyKey] = useState('点雨量')
-  const [tjData, setTjData] = useState({})
-  const [levelData, setLevelData] = useState({})
-  const [params, setParams] = useState({})
-  let mapObj = useSelector(s => s.map.map)
-
-  // 获取当前时间
-  const currentTime = moment()
-
-  // 设置早上八点的时间
-  const eightAM = moment().set({
-    hour: 8,
-    minute: 0,
-    second: 0,
-    millisecond: 0
-  })
-
-  const doSearch = params => {
-    setParams(params)
-    getData(params)
-  }
-
-  const getData = async (params) => {
-    console.log("params",params);
-    setTableData(await list(params));
-    setTjData(await count(params));
-    setLevelData(await level(params));
-  }
-
-  useEffect(() => {
-    // dispatch.map.setLayerVisible({ RealDrpLayer: true });
-
-    let option = ''
-    // 比较当前时间和早上八点
-    if (currentTime.isBefore(eightAM)) {
-      option = {
-        source: ['SH', 'SW', 'QX', 'SK'],
-        stm: moment()
-          .subtract(2, 'days')
-          .startOf('day')
-          .set({ hour: 8, minute: 0 })
-          .format('YYYY-MM-DD HH:mm'),
-        etm: moment()
-          .subtract(1, 'days')
-          .startOf('day')
-          .set({ hour: 8, minute: 0 })
-          .format('YYYY-MM-DD HH:mm'),
-        tm: [
-          moment()
-            .subtract(2, 'days')
-            .startOf('day')
-            .set({ hour: 8, minute: 0 }),
-          moment()
-            .subtract(1, 'days')
-            .startOf('day')
-            .set({ hour: 8, minute: 0 })
-        ]
-      }
-    } else {
-      option = {
-        source: ['SH', 'SW', 'QX', 'SK'],
-        stm: moment()
-          .subtract(1, 'days')
-          .startOf('day')
-          .set({ hour: 8, minute: 0 })
-          .format('YYYY-MM-DD HH:mm'),
-        etm: moment()
-          .startOf('day')
-          .set({ hour: 8, minute: 0 })
-          .format('YYYY-MM-DD HH:mm'),
-        tm: [
-          moment()
-            .subtract(1, 'days')
-            .startOf('day')
-            .set({ hour: 8, minute: 0 }),
-          moment().startOf('day').set({ hour: 8, minute: 0 })
-        ]
-      }
-    }
-    setParams(option)
-    getData(option)
-
-    return () => {
-      dispatch.map.setLayerVisible({ RealDrpLayer: false })
-
-
-    return ()=>{
-      // dispatch.map.setLayerVisible({ RealDrpLayer: false });
-
-      dispatch.runtime.setLayerSetting({ contour: null, dem: undefined });
-      dispatch.map.setLayerVisible({ ContourLayer: false });
-
-      //不这样清除会有残留
-      mapObj && mapObj
-        .getLayers()
-        .getArray()
-        .forEach(layer => {
-          if (layer.values_.name && layer.values_.name === 'ContourLayer') {
-            layer.getSource().clear()
-          }
-        })
-    }
-  }
-  }, [mapObj])
-
-  useEffect(() => {
-    if (tableData1 && tableData1.lenght > 0) {
-      setTableData(tableData1)
-    }
-  }, [tableData1])
-  
-  const columns = [
-    {
-      title: '站名',
-      key: '',
-      dataIndex: '',
-      align: 'center',
-      width: '115px',
-      render: rec => (
-        <div
-          className='ellipsisDiv'
-          onClick={() => {
-            flyTo(rec)
-          }}
-          style={{ cursor: 'pointer' }}
-          title={rec.stnm}
-        >
-          {rec.stnm}
-        </div>
-      )
-    },
-    {
-      title: '累计雨量(mm)',
-      key: 'drp',
-      dataIndex: 'drp',
-      align: 'center',
-      render: rec => {
-        const num = rec===0?0:rec?rec:'-'
-        return <span>{num}</span>
-      }
-    },
-    { title: '所属政区', key: 'adnm', dataIndex: 'adnm', align: 'center' },
-    { title: '所属流域', key: 'basName', dataIndex: 'basName', align: 'center' }
-  ];
-
-  useEffect(()=>{
-    //根据查询出来的水库在地图上打点
-    if (tableData && tableData.length >= 0) {
-      if(myKey === '点雨量'){
-        dispatch.runtime.closeFeaturePopAll()
-        dispatch.runtime.setLayerSetting({
-          contour: null,
-          dem: undefined
-        })
-        dispatch.map.setLayerVisible({ ContourLayer: false })
-
-        //不这样清除会有残留
-        mapObj && mapObj
-          .getLayers()
-          .getArray()
-          .forEach(layer => {
-            if (
-              layer.values_.name &&
-              (layer.values_.name === 'ContourLayer'||layer.values_.name.indexOf('YSGZQ_SSYQ_JYXX') > -1)
-            ) {
-              layer.getSource().clear()
-            }
-          })
-        addLayer(tableData)
-
-      }
-      if(myKey === '面雨量'){
-          dispatch.runtime.closeFeaturePopAll()
-          dispatch.map.setLayerVisible({ RealDrpLayer: false })
-          dispatch.rcview.showRealContour(tableData)
-
-          mapObj && mapObj.getLayers().getArray().forEach((layer)=> {
-            if( (layer.values_.name) && ((layer.values_.name).indexOf("YSGZQ_SSYQ_JYXX")>-1 ) ){
-                layer.getSource().clear();
-            }
-          })
-      }
-    }
-
-    return ()=>{
-      dispatch.runtime.closeFeaturePopAll()
-      dispatch.runtime.setLayerSetting({
-        contour: null,
-        dem: undefined
-      })
-      dispatch.map.setLayerVisible({ ContourLayer: false })
-      dispatch.map.setLayerVisible({ RealDrpLayer: false })
-
-      //不这样清除会有残留
-      mapObj && mapObj
-        .getLayers()
-        .getArray()
-        .forEach(layer => {
-          if (
-            layer.values_.name &&
-            (layer.values_.name === 'ContourLayer'||layer.values_.name.indexOf('YSGZQ_SSYQ_JYXX') > -1)
-          ) {
-            layer.getSource().clear()
-          }
-        })
-    }
-  }, [tableData, myKey])
-
-
-
-  const getColor = (val)=>{
-    if(val===null){
-      return '#8c8c8c'
-    }else if(val<0.1){
-        return '#ffffff'
-    }else if(val>=0.1 && val<10){
-        return 'rgb(167, 240, 143)';
-    }else if(val>=10 && val<25){
-        return 'rgb(64, 215, 255)';
-    }else if(val>=25 && val<50){
-        return 'rgb(32, 143, 238)';
-    }else if(val>=50 && val<100){
-        return 'rgb(85, 86, 255)';
-    }else if(val>=100 && val<250){
-        return 'rgb(191, 90, 252)';
-    }else{
-        return 'rgb(246, 66, 66)';
-    }
-}
-
-  const addLayer = (arr)=>{
-
-    var layer = new VectorLayer({
-      // @ts-ignore
-      name:"YSGZQ_SSYQ_JYXX",
-      source: new VectorSource(),
-      style: (feature,zIndex) =>{
-        const drp = feature.values_.data.drp
-        const stnm = feature.values_.data.stnm
-          return [new Style({
-            image: new Circle({
-              radius: 5,
-              fill: new FillStyle({ color: getColor(drp) }),
-              stroke: new Stroke({ color: getColor(drp), width: 2 })
-            }),
-            text: new Text({
-              text: zIndex<50?`${stnm}`:'',
-              offsetY: 24,
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true,
-            }),
-            zIndex: drp===0?0.01:drp*10
-          })]
-        },
-        zIndex:200,
-    })
-
-    var layerDrp = new VectorLayer({
-      // @ts-ignore
-      name:"YSGZQ_SSYQ_JYXX_DRP",
-      visible:layerVisible['jcsjLayer'],
-      source: new VectorSource(),
-      style: (feature,zIndex) =>{
-        const drp = feature.values_.data.drp
-          return [new Style({
-            text: new Text({
-              text: drp===null?'-':String(drp),
-              offsetY: 12,
-              font: '12px 微软雅黑',
-              //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-              fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-              stroke: new Stroke({ color: '#fff', width: 1 }),
-              overflow: true,
-            })
-          })]
-        },
-        zIndex:200,
-    })
-
-  
-
-    const features = arr.map((item)=>{
-      const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857');
-      const feature = new Feature({
-        geometry: new Point(point2),
-        data:{...item,myParams:params}
-      });
-
-      return feature
-    })
-    features.forEach(feature => layer.getSource().addFeature(feature));
-    features.forEach(feature => layerDrp.getSource().addFeature(feature));
-    mapObj && mapObj.addLayer(layer);
-    mapObj && mapObj.addLayer(layerDrp);
-    
-    mapObj && mapObj.on('click', function(evt) {
-
-      //console.log("271++++",postmessageData);
-
-      var feature = mapObj && mapObj.forEachFeatureAtPixel(evt.pixel, function(feature) {
-        return feature;
-      });
-      if (feature) {
-        const data = feature.values_.data
-        if(data){
-          dispatch.runtime.setFeaturePop({
-            id: data.stcd,
-            data:{...data,myParams:params},
-            type: 'drp',
-            lgtd: data.lgtd,
-            lttd: data.lttd,
-          })
-        }
-      }
-    });
-  }
-
-
-  const flyTo = (record) => {
-    const {lgtd, lttd, elev} = record;
-    record.stm = params.stm
-    record.etm = params.etm
-    if (lgtd && lttd) {
-      dispatch.map.setLayerSetting({
-        highlight: {
-          ShuiKuLayer: [record.id]
-        }
-      });
-      dispatch.runtime.setFeaturePop({type: "drp", data: {...record,myParams:params}, lgtd: record.lgtd, lttd: record.lttd,});
-
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60
-      })
-    }
-  }
-
-  return (
-     <>
-    <div className="monitor-rainfall waterLevelBox">
-      <div style={{margin: "0 0 0 6px"}} className="topQuery">
-        <Toolbar params={params} doSearch={doSearch}/>
-      </div>
-      <div className="smallTable" style={{minHeight: "140px"}}>
-        <Table columns={columns} dataSource={tableData} rowKey="inx" pagination={false}
-               scroll={{y: hasAlertBox ? "calc((100vh - 370px)/2)" : "calc((100vh - 350px)/2)"}}/>
-      </div>
-      <div className="subTitle" style={{marginTop: "15px"}}>
-	        站点统计(个)：<span
-	        style={{fontSize: '18px', color: '#0B81FF', marginRight: "10px"}}>{tjData.totalCount}</span> 其中有雨站点：<span
-        style={{fontSize: '18px', color: '#0B81FF'}}>{tjData.rainCount}</span>
-      </div>
-      <div className="summary">
-        <div className="sum-item">
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt=""/>
-          <div className="sum-num">≥250</div>
-          <div className="sum-count">{levelData["6"] ? levelData["6"].length : "0"}</div>
-        </div>
-        <div className="sum-item">
-          <img src={`${process.env.PUBLIC_URL}/assets/xiayu.png`} alt=""/>
-          <div className="sum-num">100~250</div>
-          <div className="sum-count">{levelData["5"] ? levelData["5"].length : "0"}</div>
-        </div>
-        <div className="sum-item">
-          <img src={`${process.env.PUBLIC_URL}/assets/很多点.png`} alt=""/>
-          <div className="sum-num">50~100</div>
-          <div className="sum-count">{levelData["4"] ? levelData["4"].length : "0"}</div>
-        </div>
-        <div className="sum-item">
-          <img src={`${process.env.PUBLIC_URL}/assets/五点.png`} alt=""/>
-          <div className="sum-num">25~50</div>
-          <div className="sum-count">{levelData["3"] ? levelData["3"].length : "0"}</div>
-        </div>
-        <div className="sum-item">
-          <img src={`${process.env.PUBLIC_URL}/assets/三点.png`} alt=""/>
-          <div className="sum-num">10~25</div>
-          <div className="sum-count">{levelData["2"] ? levelData["2"].length : "0"}</div>
-        </div>
-        <div className="sum-item">
-          <img src={`${process.env.PUBLIC_URL}/assets/fxdd/两点.png`} alt=""/>
-          <div className="sum-num">0.1~10</div>
-          <div className="sum-count">{levelData["1"] ? levelData["1"].length : "0"}</div>
-        </div>
-        <div className="sum-item">
-          <img src={`${process.env.PUBLIC_URL}/assets/meiyu.png`} alt=""/>
-          <div className="sum-num">无雨</div>
-          <div className="sum-count">{levelData["0"] ? levelData["0"].length : "0"}</div>
-        </div>
-      </div>
-
-
-
-      <div style={{position:'absolute',top:0, left:'calc(100vw - 620px)', width:'300px'}}>
-      <Switch 
-        size='default' 
-        checkedChildren="监测数据" 
-        unCheckedChildren="监测数据" 
-        style={{marginRight:'20px'}}
-        onChange={(e)=>{
-          mapObj && mapObj.getLayers().getArray().forEach(layer => {
-            if (layer.values_.name && layer.values_.name === 'YSGZQ_SSYQ_JYXX_DRP') {
-              layer.setVisible(e)
-            }
-          })
-          dispatch.map.setLayerVisible({'jcsjLayer':e});
-        }} 
-        value={layerVisible['jcsjLayer']} 
-        defaultChecked={layerVisible['jcsjLayer']}
-      />
-
-      <Radio.Group defaultValue='点雨量' onChange={(e)=>setMyKey(e.target.value)}>
-        <Radio.Button
-          value='点雨量'
-        >
-          点雨量
-        </Radio.Button>
-        <Radio.Button
-          value='面雨量'
-        >
-          面雨量
-        </Radio.Button>
-      </Radio.Group>
-      </div>      
-
-
-      <div
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 'calc(50vw - 90px)',
-          width: '200px'
-        }}
-      >
-        <div style={{display:'flex',alignItems:'center',justifyContent:'center',flexDirection:'column'}}>
-          <div style={{fontSize:'20px',fontWeight:800}}>咸丰县降雨形势图</div>
-          <div style={{fontSize:'15px',fontWeight:600,width:'300px',textAlign:'center'}}>{moment(params.stm).format('MM月DD日HH时')+'至'+moment(params.etm).format('MM月DD日HH时')}</div>
-        </div>
-      </div>
-      </div>
-    </>
-  )
-}
-
-export default Page
diff --git a/src/views/ysgzq/ssyq/jyxx/index.less b/src/views/ysgzq/ssyq/jyxx/index.less
deleted file mode 100644
index 2e7094a..0000000
--- a/src/views/ysgzq/ssyq/jyxx/index.less
+++ /dev/null
@@ -1,45 +0,0 @@
-.waterLevelBox{
-  height:100%;
-  .smallTable{
-    //height: 23vh;
-    height:calc( 100% - 190px );
-  }
-}
-
-.subTitle{
-  position: relative;
-  padding-left:8px;
-  margin: 0 0 10px 10px;
-  font-weight:bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-  &:after{
-    content: "";
-    display: block;
-    position: absolute;
-    width: 3px;
-    height: 16px;
-    background: #0068F4;
-    left: -2px;
-    top: 5px;
-    border-radius: 4px;
-  }
-}
-
-.summary{
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-  .sum-count{
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
-
-.toolbarBox{
-  // .selecItem:hover{
-  //   color:#fff;
-  //   background-color: skyblue;
-  // }
-}
diff --git a/src/views/ysgzq/ssyq/jyxx/toolbar.js b/src/views/ysgzq/ssyq/jyxx/toolbar.js
deleted file mode 100644
index ecf184e..0000000
--- a/src/views/ysgzq/ssyq/jyxx/toolbar.js
+++ /dev/null
@@ -1,207 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Form, Input, DatePicker, Checkbox, TreeSelect, Select} from 'antd';
-import {basNameList, adnmList} from '../../../../service/ssyq'
-import moment from 'moment';
-import { FileTextOutlined } from '@ant-design/icons';
-
-const CheckboxGroup = Checkbox.Group
-const { RangePicker } = DatePicker
-
-const ToolBar = ({ doSearch, params }) => {
-  const [form] = Form.useForm()
-  const [lyList, setLylist] = useState([])
-  const [zqList, setZqList] = useState([])
-  const [showIcon, setShowIcon] = useState(false)
-
-  
-  const [disabledObject, setDisabledObject] = useState({basCode:"11",adcd:"11"})
-
-  const onSearchClick = val => {
-    const { ...rec } = form.getFieldsValue()
-    rec.stm = rec.tm[0].format('YYYY-MM-DD HH:mm')
-    rec.etm = rec.tm[1].format('YYYY-MM-DD HH:mm')
-    doSearch(rec)
-  }
-
-  const getData = async () => {
-    setLylist(await basNameList())
-    setZqList(await adnmList())
-  }
-
-  /**
-   *
-   * @param {Object} changedValues 改变的某个字表单的值
-   * @description 某个表单值发生改变引起的表单的变化
-   */
-  const handleFormChange = (changedValues, allValues) => {
-    if (!changedValues.adcd && !changedValues.basCode) {
-      setDisabledObject({ basCode: '11', adcd: '11' })
-    } else {
-      setDisabledObject(changedValues)
-    }
-  }
-  const selectTime = (params)=>{
-    let tmValue=[]
-    if(params === 1){
-      tmValue=[moment()
-            .subtract(1, 'days')
-            .startOf('day')
-            .set({ hour: 8, minute: 0 }),
-            moment()
-            ]
-    }else if(params ===2){
-      tmValue=[moment()
-        .startOf('day')
-        .set({ hour: 8, minute: 0 }),
-        moment()
-        ]
-    }else if(params ===3){
-      tmValue=[moment()
-        .subtract(1, 'days')
-        .startOf('day')
-        .set({ hour: 8, minute: 0 }),
-        moment()
-        .startOf('day')
-        .set({ hour: 8, minute: 0 })
-        ]
-    }else if(params ===4){
-      tmValue=[moment().subtract(1, 'hours'),
-        moment()
-        ]
-    }else if(params ===5){
-      tmValue=[moment().subtract(3, 'hours'),
-        moment()
-        ]
-    }else if(params ===6){
-      tmValue=[moment().subtract(6, 'hours'),
-        moment()
-        ]
-    }else if(params ===7){
-      tmValue=[moment().subtract(12, 'hours'),
-        moment()
-        ]
-    }else if(params ===8){
-      tmValue=[moment().subtract(24, 'hours'),
-        moment()
-        ]
-    }
-    form.setFieldsValue({...params,tm:tmValue})
-    onSearchClick()
-  }
-  useEffect(() => {
-    getData()
-    form.setFieldsValue(params)
-  }, [params])
-
-  const typeOptions = [
-    {label: "山洪", value: "SH"},
-    {label: "水文", value: "SW"},
-    {label: "气象", value: "QX"},
-    {label: "水库", value: "SK"},
-  ];
-  const selectList=[
-    {key:'昨天08:00~当前时间',value:1},
-    {key:'今天08:00~当前时间',value:2},
-    {key:'昨天08:00~今天08:00',value:3},
-    {key:'最近1小时',value:4},
-    {key:'最近3小时',value:5},
-    {key:'最近6小时',value:6},
-    {key:'最近12小时',value:7},
-    {key:'最近24小时',value:8},
-  ]
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between',position:'relative' }}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          onValuesChange={handleFormChange}
-        >
-          <Form.Item
-            label='类型'
-            name='source'
-            style={{ margin: '0 0 8px 28px' }}
-          >
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick} />
-          </Form.Item>
-          <Form.Item
-            label='站点'
-            name='stArg'
-            style={{ margin: '0 0 8px 28px' }}
-          >
-            <Input
-              onChange={onSearchClick}
-              allowClear
-              style={{ width: '330px' }}
-            />
-          </Form.Item>
-          <Form.Item label='时段选择' name='tm' style={{ margin: '0 0 8px 0' }}>
-            <RangePicker
-              showTime
-              style={{ width: '330px' }}
-              onChange={onSearchClick}
-              format='YYYY-MM-DD HH:mm'
-            />
-            
-          </Form.Item>
-          
-          
-          <Form.Item
-            label='流域选择'
-            name='basCode'
-            style={{ margin: '0 0 8px 0' }}
-            dependencies={['adcd']}
-          >
-            <Select
-              allowClear
-              placeholder='请选择'
-              onChange={onSearchClick}
-              disabled={disabledObject.basCode ? false : true}
-            >
-              {lyList.map(o => (
-                <Select.Option key={o.basCode} value={o.basCode}>
-                  {o.basName}
-                </Select.Option>
-              ))}
-            </Select>
-          </Form.Item>
-          <Form.Item
-            label='政区选择'
-            name='adcd'
-            style={{ margin: '0 0 8px 0' }}
-            dependencies={['basCode']}
-          >
-            <Select
-              allowClear
-              placeholder='请选择'
-              onChange={onSearchClick}
-              disabled={disabledObject.adcd ? false : true}
-            >
-              {zqList.map(o => (
-                <Select.Option key={o.adcd} value={o.adcd}>
-                  {o.adnm}
-                </Select.Option>
-              ))}
-            </Select>
-          </Form.Item>
-          
-        </Form>
-        <div style={{display:'flex',justifyContent:'end',position:'absolute',right: 0,
-    top: 103}}
-          onClick={()=>{
-            setShowIcon(!showIcon)
-          }}
-          >
-            <FileTextOutlined style={{fontSize:24,color:'skyblue'}}/>
-             {showIcon &&<div className='selecItem' style={{position:'absolute',zIndex:2,width:200,top:30,right:-10,backgroundColor:'#fff',border:'1px solid #f0f0f0',padding:'5px 10px'}}>
-              {selectList.map((item)=>{
-                return <div style={{cursor:'pointer'}} onClick={()=>selectTime(item.value)}>{item.key}</div>
-              })}
-              </div>}
-          </div>
-      </div>
-    </>
-  )
-}
-
-export default ToolBar
diff --git a/src/views/ysgzq/ssyq/kqjy/index.js b/src/views/ysgzq/ssyq/kqjy/index.js
deleted file mode 100644
index 7627c7f..0000000
--- a/src/views/ysgzq/ssyq/kqjy/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import {Collapse, Table, Tabs, Segmented, Spin,} from 'antd';
-import React, {useEffect, useState} from 'react';
-import {useDispatch} from "react-redux";
-
-const Page = ({data,params}) => {
-  const [loading, setLoading] = useState(true);
-  const dispatch = useDispatch();
-  const columns = [
-    {
-      title: '水库/站点',
-      key: '',
-      dataIndex: '',
-      align: 'center',
-      render: (rec) => <span className="ellipsisDiv" onClick={() => flyTo(rec)}
-                            style={{cursor: "pointer"}} title={rec.stnm}>{rec.stnm}</span>
-    },
-    {title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center'},
-    {title: '最大站点', key: 'maxName', dataIndex: 'maxName', align: 'center'},
-  ];
-
-  const flyTo = (record) => {
-
-    // dispatch.map.setLayerVisible({'RealDrpLayer': true});
-    const {lgtd, lttd, elev} = record;
-    record.stm = params.stm
-    record.etm = params.etm
-    if (lgtd && lttd) {
-      // dispatch.map.setLayerSetting({
-      //   highlight: {
-      //     RealDrpLayer: [record.id],
-      //   }
-      // });
-      dispatch.runtime.setFeaturePop({type: "drp", data: {...record,myParams:params}, lgtd: record.lgtd, lttd: record.lttd,});
-
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-
-    }
-  };
-  const [tableData, setTableData] = useState()
-
-  const dataMap = (list) => {
-    return list.map((item, index) => {
-      return {
-        stnm: item.resName,
-        children: item.children,
-        maxName: item.maxRainList[0]?item.maxRainList[0].stnm:"",
-        drp: item.drp,
-        stcd: index,
-      }
-    })
-  }
-  useEffect(() => {
-
-    setTableData(dataMap(data))
-  }, [data])
-  return (
-    <>
-      <div className="header">全县平均降雨(mm)</div>
-      <div className="tabless">
-        <Table bordered
-               rowKey="stcd"
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               scroll={{y: "calc(100vh - 520px)"}}
-        />
-      </div>
-
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssyq/ljtj/index.js b/src/views/ysgzq/ssyq/ljtj/index.js
deleted file mode 100644
index 8632eed..0000000
--- a/src/views/ysgzq/ssyq/ljtj/index.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import {Collapse, Table, Tabs, Segmented, Spin,} from 'antd';
-import React, {useEffect, useState} from 'react';
-import data from "../dataConfig"
-import './index.less'
-import {ylLevelNum} from "../../../../utils/dictType";
-import {useDispatch} from "react-redux";
-
-const {Panel} = Collapse;
-const Page = ({data,params}) => {
-  const dispatch = useDispatch();
-  const [loading, setLoading] = useState(true);
-  const columns = [
-    {title: '站名', key: 'rvcd', dataIndex: 'rvcd', align: 'center',},
-    {title: '累计雨量(mm)', key: 'villagePeople', dataIndex: 'villagePeople', align: 'center'},
-    {title: '所属政区', key: 'flow', dataIndex: 'flow', align: 'center',},
-    {title: '所属流域', key: 'time', dataIndex: 'time', align: 'center',}
-  ];
-  const [tableData, setTableData] = useState({})
-  const flyTo = (record) => {
-
-    // dispatch.map.setLayerVisible({'RealDrpLayer': true});
-    const {lgtd, lttd, elev} = record;
-    record.stm = params.stm
-    record.etm = params.etm
-    if (lgtd && lttd) {
-      // dispatch.map.setLayerSetting({
-      //   highlight: {
-      //     RealDrpLayer: [record.id],
-      //   }
-      // });
-      dispatch.runtime.setFeaturePop({type: "drp", data: {...record,myParams:params}, lgtd: record.lgtd, lttd: record.lttd,});
-
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-
-    }
-  };
-  useEffect(() => {
-    delete data[0];
-    setTableData(data)
-  }, [data])
-  return (
-    <>
-      <div className="table">
-        <Table rowKey="adcd" bordered
-               columns={columns}
-               pagination={false}
-               dataSource={[]}
-               scroll={{y: 0}}
-               defaultExpandAllRows={true}
-               expandable={
-                 {
-                   indentSize: 10,
-                 }
-               }
-        />
-      </div>
-      <div className="listBox" style={{height: "calc(100vh - 480px)", overflow: "auto"}}>
-        {
-          Object.keys(tableData).length > 0 ? Object.keys(tableData).reverse().map(key => (
-            <div key={key} className="box-item-lj">
-              <Collapse size="small">
-                <Panel header={ylLevelNum(key) + `(${tableData[key].length})`} key={key}>
-                  {
-                    tableData[key].map((item, index) => (
-                      <div>
-                        <div className="clearFloat txtBox">
-                          <div className="lf txt" onClick={() => flyTo(item)}
-                               style={{cursor: "pointer"}}>{item.stnm}</div>
-                          <div className="lf txt">{item.drp}</div>
-                          <div className="lf txt">{item.adnm}</div>
-                          <div className="lf txt">{item.basName}</div>
-                        </div>
-                      </div>
-                    ))
-
-                  }
-                </Panel>
-              </Collapse>
-            </div>
-          )) : <div style={{textAlign: "center", margin: "10%"}}>
-            <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt="" width={170}/>
-          </div>
-        }
-      </div>
-
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssyq/ljtj/index.less b/src/views/ysgzq/ssyq/ljtj/index.less
deleted file mode 100644
index ce53f82..0000000
--- a/src/views/ysgzq/ssyq/ljtj/index.less
+++ /dev/null
@@ -1,95 +0,0 @@
-.listBox {
-  height: calc(100vh - 500px);
-  overflow: auto;
-
-  .box-item-lj {
-    .ant-collapse-header {
-      padding: 4px 6px;
-      background: #F2F3F5;
-      font-weight: bold;
-      font-size: 12px;
-    }
-
-    &:nth-child(6) {
-      .ant-collapse-header {
-        background: rgba(237, 252, 233, 1);
-
-      }
-    }
-
-    &:nth-child(5) {
-      .ant-collapse-header {
-        background: rgba(217, 247, 255, 1);
-
-      }
-    }
-
-    &:nth-child(4){
-      .ant-collapse-header {
-        background:rgba(210, 233, 252, 1);
-
-      }
-    }
-
-    &:nth-child(3){
-      .ant-collapse-header {
-        background:rgba(221, 221, 255, 1);
-
-      }
-    }
-
-    &:nth-child(2){
-      .ant-collapse-header {
-        background:rgba(242, 222, 254, 1);
-
-      }
-    }
-
-    &:nth-child(1){
-      .ant-collapse-header {
-        background:rgba(255, 213, 213, 1);
-
-      }
-    }
-
-    .txtBox {
-      margin: 2px 0;
-      border-bottom: 1px solid #eee;
-      cursor: pointer;
-    }
-
-    .txt {
-      font-size: 12px;
-
-      &:nth-child(1) {
-        width: 25%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        line-height: 14px;
-      }
-
-      &:nth-child(2) {
-        width: 25%;
-        text-align: center;
-      }
-
-      &:nth-child(3) {
-        width: 25%;
-        text-align: center;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-
-      &:nth-child(4) {
-        width: 25%;
-        line-height: 20px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/ssyq/lyjy/index.js b/src/views/ysgzq/ssyq/lyjy/index.js
deleted file mode 100644
index 6f21acf..0000000
--- a/src/views/ysgzq/ssyq/lyjy/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import {Collapse, Table, Tabs, Segmented, Spin,} from 'antd';
-import React, {useEffect, useState} from 'react';
-import data from "../dataConfig"
-import './index.less'
-import {useDispatch} from "react-redux";
-
-const Page = ({data, params}) => {
-  const [loading, setLoading] = useState(true);
-  const dispatch = useDispatch();
-  const columns = [
-    {
-      title: '流域/站点',
-      key: '',
-      dataIndex: '',
-      align: 'center',
-      render: (rec) => <span className="ellipsisDiv" onClick={() => flyTo(rec)}
-                             style={{cursor: "pointer"}} title={rec.stnm}>{rec.stnm}</span>
-    },
-    {title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center'},
-    {title: '最大站点', key: 'maxName', dataIndex: 'maxName', align: 'center'},
-  ];
-  const flyTo = (record) => {
-
-    // dispatch.map.setLayerVisible({'RealDrpLayer': true});
-    const {lgtd, lttd, elev} = record;
-    record.stm = params.stm
-    record.etm = params.etm
-    if (lgtd && lttd) {
-      // dispatch.map.setLayerSetting({
-      //   highlight: {
-      //     RealDrpLayer: [record.id],
-      //   }
-      // });
-      dispatch.runtime.setFeaturePop({type: "drp", data: {...record,myParams:params}, lgtd: record.lgtd, lttd: record.lttd,});
-
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-
-    }
-  };
-
-  const dataMap = (list) => {
-    return list.map((item, index) => {
-      return {
-        stnm: item.basName,
-        children: item.children,
-        maxName: item.maxRainList[0] ? item.maxRainList[0].stnm : "",
-        drp: item.drp || 0,
-        stcd: index,
-      }
-    })
-  }
-  useEffect(() => {
-    setTableData(dataMap(data))
-  }, [data])
-  const [tableData, setTableData] = useState()
-  return (
-    <>
-      <div className="header">全县平均降雨(mm)</div>
-      <div className="tabless">
-        <Table bordered
-               rowKey="stcd"
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               scroll={{y: "calc(100vh - 520px)"}}
-        />
-      </div>
-
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssyq/lyjy/index.less b/src/views/ysgzq/ssyq/lyjy/index.less
deleted file mode 100644
index 49035c7..0000000
--- a/src/views/ysgzq/ssyq/lyjy/index.less
+++ /dev/null
@@ -1,6 +0,0 @@
-.header{
-  background: #5FB7FF;
-  color:#fff;
-  font-size: 14px;
-  padding: 4px 10px;
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/ssyq/pltj/index.js b/src/views/ysgzq/ssyq/pltj/index.js
deleted file mode 100644
index 64ad175..0000000
--- a/src/views/ysgzq/ssyq/pltj/index.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import {Collapse, Table, Tabs, Segmented, Spin,} from 'antd';
-import React, {useEffect, useState} from 'react';
-import {useDispatch, useSelector} from 'react-redux';
-import clsx from 'clsx';
-import './index.less'
-import {ylFreq} from "../../../../utils/dictType";
-
-
-const {Panel} = Collapse;
-
-const Page = ({data,params}) => {
-  const dispatch = useDispatch();
-  const [timeType, setTimeType] = useState(0);
-  const columns = [
-    {title: '站名', key: 'rvcd', dataIndex: 'rvcd', align: 'center',},
-    {title: '累计雨量(mm)', key: 'villagePeople', dataIndex: 'villagePeople', align: 'center'},
-    {title: '所属政区', key: 'flow', dataIndex: 'flow', align: 'center',},
-    {title: '所属流域', key: 'time', dataIndex: 'time', align: 'center',}
-  ];
-  const [tableData, setTableData] = useState({})
-
-  const flyTo = (record) => {
-
-    // dispatch.map.setLayerVisible({'RealDrpLayer': true});
-    const {lgtd, lttd, elev} = record;
-    record.stm = params.stm
-    record.etm = params.etm
-    if (lgtd && lttd) {
-      // dispatch.map.setLayerSetting({
-      //   highlight: {
-      //     RealDrpLayer: [record.id],
-      //   }
-      // });
-      const name = ['h1','h3','h6','h12','h24'][timeType]
-      const drp = record[name]
-
-      dispatch.runtime.setFeaturePop({type: "drp", data: {...record,myParams:params,drp:drp}, lgtd: record.lgtd, lttd: record.lttd,});
-
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-
-    }
-  };
-  useEffect(() => {
-    setTableData(data)
-    console.log("data",data);
-  }, [data])
-  return (
-    <>
-      <div className="button-group rf" style={{margin: "5px 0 10px 0"}}>
-        {
-          ['1小时', '3小时', '6小时', '12小时', '24小时'].map((key, index) => (
-            <div key={key} className={clsx({active: timeType == (index)})}
-                 onClick={() => setTimeType(index)}>{key}</div>
-          ))
-        }
-      </div>
-      <div className="table">
-        <Table rowKey="adcd" bordered
-               columns={columns}
-               pagination={false}
-               dataSource={[]}
-               scroll={{y: 0}}
-               defaultExpandAllRows={true}
-               expandable={
-                 {
-                   indentSize: 10,
-                 }
-               }
-        />
-      </div>
-      <div className="listBox">
-        {
-          Object.keys(tableData).length > 0 ? Object.keys(tableData).reverse().map(key => (
-            <div key={key} className="box-item-pl">
-              <Collapse size="small">
-                <Panel header={ylFreq(key) + `(${tableData[key].length})`} key={key}>
-                  {
-                    tableData[key].map((item, index) => (
-                      <div>
-                        <div className="clearFloat txtBox">
-                          <div className="lf txt" onClick={() => flyTo(item)}
-                               style={{cursor: "pointer"}}>{item.stnm}</div>
-                          {
-                            timeType == 0 ? <div className="lf txt">{item.h1}</div> : timeType == 1 ?
-                              <div className="lf txt">{item.h3}</div> : timeType == 2 ?
-                                <div className="lf txt">{item.h6}</div> : timeType == 3 ?
-                                  <div className="lf txt">{item.h12}</div> : timeType == 4 ?
-                                    <div className="lf txt">{item.h24}</div> : ""
-                          }
-                          <div className="lf txt">{item.adnm}</div>
-                          <div className="lf txt">{item.basName}</div>
-                        </div>
-                      </div>
-                    ))
-
-                  }
-                </Panel>
-              </Collapse>
-            </div>
-          )) : <div style={{textAlign: "center", margin: "10%"}}>
-            <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt="" width={170}/>
-          </div>
-        }
-        {/*{*/}
-        {/*  tableData.length > 0 ? tableData.map((item, index) => (*/}
-        {/*    <>*/}
-        {/*      <div key={item.type}>*/}
-        {/*        <Collapse size="small" defaultActiveKey={index}>*/}
-        {/*          <Panel header={item.typeName} key={index}>*/}
-        {/*            {*/}
-        {/*              item.flowDetails.length > 0 && item.flowDetails.map((item1) => <div>*/}
-        {/*                <div className="clearFloat txtBox" >*/}
-        {/*                  <div className="lf txt">{item1.rvcd}</div>*/}
-        {/*                  <div className="lf txt">{item1.villagePeople}</div>*/}
-        {/*                  <div className="lf txt">{item1.flow ? (item1.flow).toFixed(1) : "-"}</div>*/}
-        {/*                  <div className="lf txt">{item1.time}</div>*/}
-        {/*                </div>*/}
-        {/*              </div>)*/}
-        {/*            }*/}
-        {/*          </Panel>*/}
-        {/*        </Collapse>*/}
-        {/*      </div>*/}
-        {/*    </>*/}
-        {/*  )) : <div style={{textAlign: "center", margin: "10%"}}>*/}
-        {/*    <img src={`${process.env.PUBLIC_URL}/assets/noData.png`} alt="" width={170}/>*/}
-        {/*  </div>*/}
-        {/*}*/}
-      </div>
-
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssyq/pltj/index.less b/src/views/ysgzq/ssyq/pltj/index.less
deleted file mode 100644
index e13f5b9..0000000
--- a/src/views/ysgzq/ssyq/pltj/index.less
+++ /dev/null
@@ -1,116 +0,0 @@
-.listBox{
-  height: calc( 100vh - 520px);
-  overflow: auto;
-  .box-item-pl{
-    .ant-collapse-header{
-      padding:4px 6px;
-      background: #F2F3F5;
-      font-weight: bold;
-      font-size: 12px;
-    }
-
-    &:nth-child(6) {
-      .ant-collapse-header {
-        background: rgba(237, 252, 233, 1);
-
-      }
-    }
-
-    &:nth-child(5) {
-      .ant-collapse-header {
-        background: rgba(217, 247, 255, 1);
-
-      }
-    }
-
-    &:nth-child(4){
-      .ant-collapse-header {
-        background:rgba(210, 233, 252, 1);
-
-      }
-    }
-
-    &:nth-child(3){
-      .ant-collapse-header {
-        background:rgba(221, 221, 255, 1);
-
-      }
-    }
-
-    &:nth-child(2){
-      .ant-collapse-header {
-        background:rgba(242, 222, 254, 1);
-
-      }
-    }
-
-    &:nth-child(1){
-      .ant-collapse-header {
-        background:rgba(255, 213, 213, 1);
-
-      }
-    }
-    .txtBox{
-      margin: 2px 0;
-      border-bottom: 1px solid #eee;
-      cursor:pointer;
-    }
-    .txt{
-      font-size: 12px;
-      &:nth-child(1){
-        width: 25%;
-        text-align: center;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        line-height: 14px;
-      }
-      &:nth-child(2){
-        width: 25%;
-        text-align: center;
-      }
-      &:nth-child(3){
-        width: 25%;
-        text-align: center;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-      &:nth-child(4){
-        text-align: center;
-        width: 25%;
-        line-height: 14px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-}
-
-.indexBox{
-  .button-group{
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 1px solid #eee;
-    border-top: 1px solid #eee;
-    border-radius: 5px;
-    overflow: hidden;
-    div{
-      font-size: 14px;
-      text-align: center;
-      flex: 1;
-      border-left: 1px solid #eee;
-      border-right: 1px solid #eee;
-      color:#333;
-    }
-
-    .active{
-      background: #0B81FF;
-      color:#fff;
-    }
-
-  }
-}
diff --git a/src/views/ysgzq/ssyq/qyjy/index.js b/src/views/ysgzq/ssyq/qyjy/index.js
deleted file mode 100644
index eb72505..0000000
--- a/src/views/ysgzq/ssyq/qyjy/index.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import {Collapse, Table, Tabs, Segmented, Spin,} from 'antd';
-import React, {useEffect, useState} from 'react';
-import './index.less'
-import {useDispatch} from "react-redux";
-
-const Page = ({data,params}) => {
-  const [loading, setLoading] = useState(true);
-  const dispatch = useDispatch();
-  const columns = [
-    {
-      title: '政区/站点',
-      key: '',
-      dataIndex: '',
-      align: 'center',
-      render: (rec) => <span className="ellipsisDiv" onClick={() => flyTo(rec)}
-                            style={{cursor: "pointer"}} title={rec.stnm}>{rec.stnm}</span>
-    },
-    {title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center'},
-    {title: '最大站点', key: 'maxName', dataIndex: 'maxName', align: 'center'},
-  ];
-
-  const flyTo = (record) => {
-
-    // dispatch.map.setLayerVisible({'RealDrpLayer': true});
-    const {lgtd, lttd, elev} = record;
-    record.stm = params.stm
-    record.etm = params.etm
-    if (lgtd && lttd) {
-      // dispatch.map.setLayerSetting({
-      //   highlight: {
-      //     RealDrpLayer: [record.id],
-      //   }
-      // });
-      dispatch.runtime.setFeaturePop({type: "drp", data: {...record,myParams:params}, lgtd: record.lgtd, lttd: record.lttd,});
-
-
-      dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd, elev],
-        zoom: 13,
-        pitch: 60,
-      });
-
-    }
-  };
-  const [tableData, setTableData] = useState()
-
-  const dataMap = (list) => {
-    return list.map((item, index) => {
-      return {
-        stnm: item.adnm,
-        children: item.children,
-        maxName: item.maxRainList[0]?item.maxRainList[0].stnm:"",
-        drp: item.drp,
-        stcd: index,
-      }
-    })
-  }
-  useEffect(() => {
-
-    setTableData(dataMap(data))
-  }, [data])
-  return (
-    <>
-      <div className="header">全县平均降雨(mm)</div>
-      <div className="tabless">
-        <Table bordered
-               rowKey="stcd"
-               columns={columns}
-               pagination={false}
-               dataSource={tableData}
-               scroll={{y: "calc(100vh - 520px)"}}
-        />
-      </div>
-
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssyq/qyjy/index.less b/src/views/ysgzq/ssyq/qyjy/index.less
deleted file mode 100644
index 8694b72..0000000
--- a/src/views/ysgzq/ssyq/qyjy/index.less
+++ /dev/null
@@ -1,20 +0,0 @@
-.header{
-  background: #5FB7FF;
-  color:#fff;
-  font-size: 14px;
-  padding: 4px 10px;
-}
-
-.tabless{
-  .ant-table-cell{
-    .ellipsisDiv{
-      width: 94px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      display: inline-block;
-      text-align: left;
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/ssyq/tjfx/dataConfig.js b/src/views/ysgzq/ssyq/tjfx/dataConfig.js
deleted file mode 100644
index 2f6b5cb..0000000
--- a/src/views/ysgzq/ssyq/tjfx/dataConfig.js
+++ /dev/null
@@ -1,4639 +0,0 @@
-export default {
-  xzqh: [
-    {
-      "adcd": "420529000000000",
-      "adnm": "五峰土家族自治县",
-      "pcount": 200000,
-      "htcount": 63880,
-      "ldarea": 2372,
-      "plarea": 28.8,
-      "prevtp": "0",
-      "lgtd": 110.670293,
-      "lttd": 30.201663,
-      "children": [
-        {
-          "adcd": "420529101000000",
-          "adnm": "五峰镇",
-          "pcount": 39881,
-          "htcount": 13699,
-          "ldarea": 456,
-          "prevtp": "0",
-          "lgtd": 110.64161,
-          "lttd": 30.184073,
-          "children": [
-            {
-              "adcd": "420529101001000",
-              "adnm": "北门社区",
-              "pcount": 3164,
-              "htcount": 1536,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.661896,
-              "lttd": 30.204225,
-              "children": [
-                {
-                  "adcd": "420529101001100",
-                  "adnm": "北门社区上",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.667857,
-                  "lttd": 30.204172
-                },
-                {
-                  "adcd": "420529101001101",
-                  "adnm": "北门社区中",
-                  "pcount": 1054,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.663659,
-                  "lttd": 30.205619
-                },
-                {
-                  "adcd": "420529101001102",
-                  "adnm": "北门社区下",
-                  "pcount": 1055,
-                  "htcount": 512,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 110.662192,
-                  "lttd": 30.207136
-                }
-              ]
-            },
-            {
-              "adcd": "420529101002000",
-              "adnm": "正街社区",
-              "pcount": 4725,
-              "htcount": 2340,
-              "ldarea": 3.5,
-              "prevtp": "2",
-              "lgtd": 110.670643,
-              "lttd": 30.200895,
-              "children": []
-            },
-            {
-              "adcd": "420529101003000",
-              "adnm": "长坪社区",
-              "pcount": 5725,
-              "htcount": 2226,
-              "ldarea": 1.5,
-              "prevtp": "0",
-              "lgtd": 110.665503,
-              "lttd": 30.190297,
-              "children": [
-                {
-                  "adcd": "420529101003100",
-                  "adnm": "长坪上",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.66546,
-                  "lttd": 30.187869
-                },
-                {
-                  "adcd": "420529101003101",
-                  "adnm": "长坪下",
-                  "pcount": 2862,
-                  "htcount": 1113,
-                  "ldarea": 2.75,
-                  "prevtp": "2",
-                  "lgtd": 110.670436,
-                  "lttd": 30.196018
-                }
-              ]
-            },
-            {
-              "adcd": "420529101201000",
-              "adnm": "石梁司村",
-              "pcount": 3012,
-              "htcount": 890,
-              "ldarea": 44,
-              "prevtp": "0",
-              "lgtd": 110.656911,
-              "lttd": 30.175933,
-              "children": [
-                {
-                  "adcd": "420529101201100",
-                  "adnm": "十三组(铁厂湾）",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18.05,
-                  "prevtp": "2",
-                  "lgtd": 110.606521,
-                  "lttd": 30.14701
-                },
-                {
-                  "adcd": "420529101201101",
-                  "adnm": "三组上（小汊湾）",
-                  "pcount": 536,
-                  "htcount": 145,
-                  "ldarea": 9.4,
-                  "prevtp": "2",
-                  "lgtd": 110.653196,
-                  "lttd": 30.171942
-                },
-                {
-                  "adcd": "420529101201102",
-                  "adnm": "二组（杨腊岭）",
-                  "pcount": 691,
-                  "htcount": 187,
-                  "ldarea": 10.5,
-                  "prevtp": "2",
-                  "lgtd": 110.660371,
-                  "lttd": 30.180565
-                },
-                {
-                  "adcd": "420529101201103",
-                  "adnm": "十二组",
-                  "pcount": 148,
-                  "htcount": 40,
-                  "ldarea": 6,
-                  "prevtp": "0",
-                  "lgtd": 110.623533,
-                  "lttd": 30.147948
-                },
-                {
-                  "adcd": "420529101201104",
-                  "adnm": "十五组",
-                  "pcount": 270,
-                  "htcount": 73,
-                  "ldarea": 8.05,
-                  "prevtp": "2",
-                  "lgtd": 110.647408,
-                  "lttd": 30.1812815
-                },
-                {
-                  "adcd": "420529101201105",
-                  "adnm": "三组下",
-                  "pcount": 520,
-                  "htcount": 140,
-                  "ldarea": 7.2,
-                  "prevtp": "2",
-                  "lgtd": 110.655473,
-                  "lttd": 30.176246
-                }
-              ]
-            },
-            {
-              "adcd": "420529101202000",
-              "adnm": "香东村",
-              "pcount": 2100,
-              "htcount": 625,
-              "ldarea": 14.6,
-              "prevtp": "0",
-              "lgtd": 110.684722,
-              "lttd": 30.195305,
-              "children": [
-                {
-                  "adcd": "420529101202100",
-                  "adnm": "七组（口子泉）",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 110.664549,
-                  "lttd": 30.208265
-                },
-                {
-                  "adcd": "420529101202101",
-                  "adnm": "八组（砂坪）",
-                  "pcount": 114,
-                  "htcount": 31,
-                  "ldarea": 10.3,
-                  "prevtp": "2",
-                  "lgtd": 110.677247,
-                  "lttd": 30.207814
-                },
-                {
-                  "adcd": "420529101202102",
-                  "adnm": "七组（天池河）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.658039,
-                  "lttd": 30.213228
-                }
-              ]
-            },
-            {
-              "adcd": "420529101203000",
-              "adnm": "小河村",
-              "pcount": 3446,
-              "htcount": 961,
-              "ldarea": 36,
-              "prevtp": "0",
-              "lgtd": 110.648435,
-              "lttd": 30.221484,
-              "children": [
-                {
-                  "adcd": "420529101203100",
-                  "adnm": "一组",
-                  "pcount": 620,
-                  "htcount": 167,
-                  "ldarea": 10,
-                  "prevtp": "1",
-                  "lgtd": 110.628695,
-                  "lttd": 30.218468
-                },
-                {
-                  "adcd": "420529101203101",
-                  "adnm": "十一组（前坪）",
-                  "pcount": 407,
-                  "htcount": 110,
-                  "ldarea": 14,
-                  "prevtp": "2",
-                  "lgtd": 110.593009,
-                  "lttd": 30.2113403
-                },
-                {
-                  "adcd": "420529101203102",
-                  "adnm": "七组",
-                  "pcount": 155,
-                  "htcount": 42,
-                  "ldarea": 18,
-                  "prevtp": "1",
-                  "lgtd": 110.606354,
-                  "lttd": 30.207401
-                }
-              ]
-            },
-            {
-              "adcd": "420529101204000",
-              "adnm": "楠木河村",
-              "pcount": 1526,
-              "htcount": 442,
-              "ldarea": 19.8,
-              "prevtp": "0",
-              "lgtd": 110.464955,
-              "lttd": 30.174449,
-              "children": [
-                {
-                  "adcd": "420529101204100",
-                  "adnm": "一组",
-                  "pcount": 220,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.661256,
-                  "lttd": 30.2369128
-                },
-                {
-                  "adcd": "420529101204101",
-                  "adnm": "三组",
-                  "pcount": 195,
-                  "htcount": 53,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.679309,
-                  "lttd": 30.2514761
-                }
-              ]
-            },
-            {
-              "adcd": "420529101205000",
-              "adnm": "水浕司村",
-              "pcount": 3320,
-              "htcount": 1045,
-              "ldarea": 36.6,
-              "prevtp": "0",
-              "lgtd": 110.627483,
-              "lttd": 30.248739,
-              "children": [
-                {
-                  "adcd": "420529101205100",
-                  "adnm": "二组（渡糟）",
-                  "pcount": 240,
-                  "htcount": 65,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.61626,
-                  "lttd": 30.2579
-                },
-                {
-                  "adcd": "420529101205101",
-                  "adnm": "四组",
-                  "pcount": 296,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.625852,
-                  "lttd": 30.238361
-                },
-                {
-                  "adcd": "420529101205102",
-                  "adnm": "六组",
-                  "pcount": 258,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.626089,
-                  "lttd": 30.249254
-                },
-                {
-                  "adcd": "420529101205103",
-                  "adnm": "三组",
-                  "pcount": 249,
-                  "htcount": 70,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.62251,
-                  "lttd": 30.249145
-                },
-                {
-                  "adcd": "420529101205104",
-                  "adnm": "一组（水浕司）",
-                  "pcount": 270,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.607703,
-                  "lttd": 30.266896
-                }
-              ]
-            },
-            {
-              "adcd": "420529101206000",
-              "adnm": "油菜坪",
-              "pcount": 650,
-              "htcount": 163,
-              "ldarea": 2.8,
-              "prevtp": "0",
-              "lgtd": 110.622123,
-              "lttd": 30.276306,
-              "children": [
-                {
-                  "adcd": "420529101206100",
-                  "adnm": "一组",
-                  "pcount": 340,
-                  "htcount": 87,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.611682,
-                  "lttd": 30.269515
-                }
-              ]
-            },
-            {
-              "adcd": "420529101207000",
-              "adnm": "黄粮坪村",
-              "pcount": 1217,
-              "htcount": 352,
-              "ldarea": 24.3,
-              "prevtp": "0",
-              "lgtd": 110.652169,
-              "lttd": 30.2798,
-              "children": [
-                {
-                  "adcd": "420529101207100",
-                  "adnm": "一组",
-                  "pcount": 302,
-                  "htcount": 95,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.642672,
-                  "lttd": 30.280247
-                }
-              ]
-            },
-            {
-              "adcd": "420529101208000",
-              "adnm": "谢家坪村",
-              "pcount": 2302,
-              "htcount": 644,
-              "ldarea": 23.2,
-              "prevtp": "0",
-              "lgtd": 110.58412,
-              "lttd": 30.299189,
-              "children": [
-                {
-                  "adcd": "420529101208100",
-                  "adnm": "三组",
-                  "pcount": 215,
-                  "htcount": 67,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592951,
-                  "lttd": 30.3194646
-                },
-                {
-                  "adcd": "420529101208101",
-                  "adnm": "五组",
-                  "pcount": 112,
-                  "htcount": 38,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.580078,
-                  "lttd": 30.279418
-                },
-                {
-                  "adcd": "420529101208102",
-                  "adnm": "八组",
-                  "pcount": 132,
-                  "htcount": 46,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.581833,
-                  "lttd": 30.298807
-                }
-              ]
-            },
-            {
-              "adcd": "420529101209000",
-              "adnm": "麦庄村",
-              "pcount": 2564,
-              "htcount": 729,
-              "ldarea": 30.5,
-              "prevtp": "0",
-              "lgtd": 110.552111,
-              "lttd": 30.292016,
-              "children": []
-            },
-            {
-              "adcd": "420529101210000",
-              "adnm": "怀抱窝村",
-              "pcount": 1764,
-              "htcount": 529,
-              "ldarea": 26.1,
-              "prevtp": "0",
-              "lgtd": 110.606024,
-              "lttd": 30.32805,
-              "children": [
-                {
-                  "adcd": "420529101210100",
-                  "adnm": "一组(竹桥）",
-                  "pcount": 83,
-                  "htcount": 25,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.595765,
-                  "lttd": 30.33814
-                },
-                {
-                  "adcd": "420529101210101",
-                  "adnm": "三组",
-                  "pcount": 129,
-                  "htcount": 35,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.592862,
-                  "lttd": 30.3195735
-                }
-              ]
-            },
-            {
-              "adcd": "420529101211000",
-              "adnm": "茅坪村",
-              "pcount": 2711,
-              "htcount": 833,
-              "ldarea": 0,
-              "prevtp": "0",
-              "lgtd": 110.674183,
-              "lttd": 30.138689,
-              "children": [
-                {
-                  "adcd": "420529101211100",
-                  "adnm": "二组（万家田）",
-                  "pcount": 44,
-                  "htcount": 18,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.597656,
-                  "lttd": 30.089048
-                },
-                {
-                  "adcd": "420529101211101",
-                  "adnm": "三组",
-                  "pcount": 68,
-                  "htcount": 21,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.56665,
-                  "lttd": 30.0911
-                },
-                {
-                  "adcd": "420529101211102",
-                  "adnm": "六组（晏家坪）",
-                  "pcount": 118,
-                  "htcount": 32,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.719605,
-                  "lttd": 30.138661
-                },
-                {
-                  "adcd": "420529101211104",
-                  "adnm": "十组（茅坪）",
-                  "pcount": 159,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.669315,
-                  "lttd": 30.153423
-                },
-                {
-                  "adcd": "420529101211105",
-                  "adnm": "九组（茅坪）",
-                  "pcount": 318,
-                  "htcount": 86,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.674523,
-                  "lttd": 30.139839
-                },
-                {
-                  "adcd": "420529101211106",
-                  "adnm": "二组（老屋场）",
-                  "pcount": 40,
-                  "htcount": 12,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.621323,
-                  "lttd": 30.080742
-                }
-              ]
-            },
-            {
-              "adcd": "420529101212000",
-              "adnm": "长坡村",
-              "pcount": 1221,
-              "htcount": 384,
-              "ldarea": 51.5,
-              "prevtp": "0",
-              "lgtd": 110.727382,
-              "lttd": 30.072334,
-              "children": [
-                {
-                  "adcd": "420529101212100",
-                  "adnm": "四组",
-                  "pcount": 221,
-                  "htcount": 112,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.685538,
-                  "lttd": 30.078245
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529102000000",
-          "adnm": "长乐坪镇",
-          "pcount": 24902,
-          "htcount": 6908,
-          "ldarea": 374,
-          "prevtp": "0",
-          "lgtd": 110.817333,
-          "lttd": 30.187285,
-          "children": [
-            {
-              "adcd": "420529102001000",
-              "adnm": "长乐坪社区",
-              "pcount": 1450,
-              "htcount": 412,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.950819,
-              "lttd": 30.266553,
-              "children": []
-            },
-            {
-              "adcd": "420529102201000",
-              "adnm": "洞口村",
-              "pcount": 1686,
-              "htcount": 525,
-              "ldarea": 18.57,
-              "prevtp": "0",
-              "lgtd": 110.862146,
-              "lttd": 30.17035,
-              "children": [
-                {
-                  "adcd": "420529102201100",
-                  "adnm": "三组（洞口）",
-                  "pcount": 423,
-                  "htcount": 146,
-                  "ldarea": 6.22,
-                  "prevtp": "2",
-                  "lgtd": 110.84918,
-                  "lttd": 30.172821
-                },
-                {
-                  "adcd": "420529102201101",
-                  "adnm": "四组（滴淋冲）",
-                  "pcount": 354,
-                  "htcount": 101,
-                  "ldarea": 7.15,
-                  "prevtp": "1",
-                  "lgtd": 110.852646,
-                  "lttd": 30.166916
-                },
-                {
-                  "adcd": "420529102201102",
-                  "adnm": "一组（龟坪）",
-                  "pcount": 427,
-                  "htcount": 122,
-                  "ldarea": 7.07,
-                  "prevtp": "2",
-                  "lgtd": 110.863379,
-                  "lttd": 30.172428
-                },
-                {
-                  "adcd": "420529102201103",
-                  "adnm": "二组（洞口）",
-                  "pcount": 482,
-                  "htcount": 156,
-                  "ldarea": 6.13,
-                  "prevtp": "2",
-                  "lgtd": 110.859648,
-                  "lttd": 30.170953
-                }
-              ]
-            },
-            {
-              "adcd": "420529102202000",
-              "adnm": "腰牌村",
-              "pcount": 1607,
-              "htcount": 484,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 110.898742,
-              "lttd": 30.183227,
-              "children": [
-                {
-                  "adcd": "420529102202100",
-                  "adnm": "二组（腰牌）",
-                  "pcount": 377,
-                  "htcount": 112,
-                  "ldarea": 5.74,
-                  "prevtp": "2",
-                  "lgtd": 110.900312,
-                  "lttd": 30.181927
-                },
-                {
-                  "adcd": "420529102202101",
-                  "adnm": "三组（腰牌）",
-                  "pcount": 429,
-                  "htcount": 129,
-                  "ldarea": 5.95,
-                  "prevtp": "2",
-                  "lgtd": 110.891906,
-                  "lttd": 30.182658
-                },
-                {
-                  "adcd": "420529102202102",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 355,
-                  "htcount": 92,
-                  "ldarea": 5.67,
-                  "prevtp": "2",
-                  "lgtd": 110.884063,
-                  "lttd": 30.178409
-                },
-                {
-                  "adcd": "420529102202103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 446,
-                  "htcount": 151,
-                  "ldarea": 5.81,
-                  "prevtp": "2",
-                  "lgtd": 110.878992,
-                  "lttd": 30.174009
-                }
-              ]
-            },
-            {
-              "adcd": "420529102203000",
-              "adnm": "白岩坪村",
-              "pcount": 2576,
-              "htcount": 767,
-              "ldarea": 31.35,
-              "prevtp": "0",
-              "lgtd": 110.894666,
-              "lttd": 30.159786,
-              "children": [
-                {
-                  "adcd": "420529102203100",
-                  "adnm": "一组",
-                  "pcount": 1242,
-                  "htcount": 379,
-                  "ldarea": 16.98,
-                  "prevtp": "1",
-                  "lgtd": 110.926374,
-                  "lttd": 30.172706
-                },
-                {
-                  "adcd": "420529102203101",
-                  "adnm": "二组（白岩坪）",
-                  "pcount": 1334,
-                  "htcount": 388,
-                  "ldarea": 18.37,
-                  "prevtp": "1",
-                  "lgtd": 110.91441,
-                  "lttd": 30.173227
-                }
-              ]
-            },
-            {
-              "adcd": "420529102204000",
-              "adnm": "月山村",
-              "pcount": 1515,
-              "htcount": 422,
-              "ldarea": 25.29,
-              "prevtp": "0",
-              "lgtd": 110.899558,
-              "lttd": 30.127007,
-              "children": [
-                {
-                  "adcd": "420529102204100",
-                  "adnm": "三组（小河）",
-                  "pcount": 258,
-                  "htcount": 73,
-                  "ldarea": 6.98,
-                  "prevtp": "2",
-                  "lgtd": 110.891944,
-                  "lttd": 30.128185
-                },
-                {
-                  "adcd": "420529102204101",
-                  "adnm": "二组（高桥）",
-                  "pcount": 289,
-                  "htcount": 81,
-                  "ldarea": 7.13,
-                  "prevtp": "2",
-                  "lgtd": 110.912641,
-                  "lttd": 30.136977
-                },
-                {
-                  "adcd": "420529102204102",
-                  "adnm": "一组（曹家河）",
-                  "pcount": 325,
-                  "htcount": 89,
-                  "ldarea": 7.05,
-                  "prevtp": "2",
-                  "lgtd": 110.944037,
-                  "lttd": 30.139595
-                },
-                {
-                  "adcd": "420529102204103",
-                  "adnm": "六组",
-                  "pcount": 323,
-                  "htcount": 90,
-                  "ldarea": 7.13,
-                  "prevtp": "1",
-                  "lgtd": 110.921658,
-                  "lttd": 30.140975
-                },
-                {
-                  "adcd": "420529102204104",
-                  "adnm": "一组（邵家河）",
-                  "pcount": 320,
-                  "htcount": 89,
-                  "ldarea": 7,
-                  "prevtp": "2",
-                  "lgtd": 110.935464,
-                  "lttd": 30.135935
-                }
-              ]
-            },
-            {
-              "adcd": "420529102205000",
-              "adnm": "苏家河村",
-              "pcount": 1483,
-              "htcount": 419,
-              "ldarea": 22.89,
-              "prevtp": "0",
-              "lgtd": 110.7719,
-              "lttd": 30.160052,
-              "children": [
-                {
-                  "adcd": "420529102205100",
-                  "adnm": "二组（苏家河）",
-                  "pcount": 348,
-                  "htcount": 96,
-                  "ldarea": 7.38,
-                  "prevtp": "2",
-                  "lgtd": 110.758849,
-                  "lttd": 30.151386
-                },
-                {
-                  "adcd": "420529102205101",
-                  "adnm": "三组（金家湾）",
-                  "pcount": 375,
-                  "htcount": 107,
-                  "ldarea": 7.82,
-                  "prevtp": "2",
-                  "lgtd": 110.769432,
-                  "lttd": 30.146094
-                },
-                {
-                  "adcd": "420529102205102",
-                  "adnm": "四组",
-                  "pcount": 362,
-                  "htcount": 103,
-                  "ldarea": 7.78,
-                  "prevtp": "1",
-                  "lgtd": 110.749224,
-                  "lttd": 30.143833
-                },
-                {
-                  "adcd": "420529102205103",
-                  "adnm": "一组",
-                  "pcount": 398,
-                  "htcount": 113,
-                  "ldarea": 7.91,
-                  "prevtp": "1",
-                  "lgtd": 110.781997,
-                  "lttd": 30.15012
-                }
-              ]
-            },
-            {
-              "adcd": "420529102206000",
-              "adnm": "甘沟村",
-              "pcount": 1728,
-              "htcount": 530,
-              "ldarea": 26.69,
-              "prevtp": "0",
-              "lgtd": 110.792784,
-              "lttd": 30.164572,
-              "children": [
-                {
-                  "adcd": "420529102206100",
-                  "adnm": "二组（高家坪）",
-                  "pcount": 402,
-                  "htcount": 123,
-                  "ldarea": 8.52,
-                  "prevtp": "2",
-                  "lgtd": 110.792131,
-                  "lttd": 30.14632
-                },
-                {
-                  "adcd": "420529102206101",
-                  "adnm": "一组（甘沟）",
-                  "pcount": 418,
-                  "htcount": 129,
-                  "ldarea": 8.38,
-                  "prevtp": "2",
-                  "lgtd": 110.802311,
-                  "lttd": 30.164633
-                },
-                {
-                  "adcd": "420529102206102",
-                  "adnm": "三组",
-                  "pcount": 453,
-                  "htcount": 135,
-                  "ldarea": 8.92,
-                  "prevtp": "1",
-                  "lgtd": 110.802988,
-                  "lttd": 30.151881
-                },
-                {
-                  "adcd": "420529102206103",
-                  "adnm": "五组（剪槽沟）",
-                  "pcount": 455,
-                  "htcount": 143,
-                  "ldarea": 8.87,
-                  "prevtp": "1",
-                  "lgtd": 110.829652,
-                  "lttd": 30.1611865
-                }
-              ]
-            },
-            {
-              "adcd": "420529102207000",
-              "adnm": "百年关村",
-              "pcount": 1805,
-              "htcount": 540,
-              "ldarea": 21.95,
-              "prevtp": "0",
-              "lgtd": 110.953275,
-              "lttd": 30.179524,
-              "children": []
-            },
-            {
-              "adcd": "420529102208000",
-              "adnm": "三教庙村",
-              "pcount": 2267,
-              "htcount": 690,
-              "ldarea": 31.79,
-              "prevtp": "0",
-              "lgtd": 110.893176,
-              "lttd": 30.200651,
-              "children": []
-            },
-            {
-              "adcd": "420529102209000",
-              "adnm": "柴埠溪村",
-              "pcount": 376,
-              "htcount": 123,
-              "ldarea": 9.52,
-              "prevtp": "0",
-              "lgtd": 110.933963,
-              "lttd": 30.228582,
-              "children": [
-                {
-                  "adcd": "420529102209100",
-                  "adnm": "二组（梯子口）",
-                  "pcount": 71,
-                  "htcount": 21,
-                  "ldarea": 3.77,
-                  "prevtp": "2",
-                  "lgtd": 110.947618,
-                  "lttd": 30.2309287
-                },
-                {
-                  "adcd": "420529102209101",
-                  "adnm": "四组（杨家坪）",
-                  "pcount": 73,
-                  "htcount": 23,
-                  "ldarea": 3.75,
-                  "prevtp": "1",
-                  "lgtd": 110.961822,
-                  "lttd": 30.2315995
-                },
-                {
-                  "adcd": "420529102209102",
-                  "adnm": "一组（陆家台）",
-                  "pcount": 77,
-                  "htcount": 25,
-                  "ldarea": 3.95,
-                  "prevtp": "2",
-                  "lgtd": 110.91351,
-                  "lttd": 30.231454
-                },
-                {
-                  "adcd": "420529102209103",
-                  "adnm": "五组（杨家坪）",
-                  "pcount": 79,
-                  "htcount": 28,
-                  "ldarea": 4.14,
-                  "prevtp": "2",
-                  "lgtd": 110.974717,
-                  "lttd": 30.2239784
-                },
-                {
-                  "adcd": "420529102209104",
-                  "adnm": "三组（岩板铺子）",
-                  "pcount": 76,
-                  "htcount": 26,
-                  "ldarea": 3.91,
-                  "prevtp": "2",
-                  "lgtd": 110.929226,
-                  "lttd": 30.229398
-                }
-              ]
-            },
-            {
-              "adcd": "420529102210000",
-              "adnm": "青岩冲村",
-              "pcount": 2002,
-              "htcount": 560,
-              "ldarea": 40.51,
-              "prevtp": "0",
-              "lgtd": 110.782404,
-              "lttd": 30.185819,
-              "children": [
-                {
-                  "adcd": "420529102210100",
-                  "adnm": "四组（小林口）",
-                  "pcount": 986,
-                  "htcount": 266,
-                  "ldarea": 20.85,
-                  "prevtp": "2",
-                  "lgtd": 110.820876,
-                  "lttd": 30.202646
-                },
-                {
-                  "adcd": "420529102210102",
-                  "adnm": "六组（青岩冲）",
-                  "pcount": 1016,
-                  "htcount": 294,
-                  "ldarea": 23.66,
-                  "prevtp": "1",
-                  "lgtd": 110.781604,
-                  "lttd": 30.187083
-                }
-              ]
-            },
-            {
-              "adcd": "420529102211000",
-              "adnm": "桥坪村",
-              "pcount": 1198,
-              "htcount": 331,
-              "ldarea": 24.77,
-              "prevtp": "0",
-              "lgtd": 110.766741,
-              "lttd": 30.231465,
-              "children": [
-                {
-                  "adcd": "420529102211100",
-                  "adnm": "四组（桥坪）",
-                  "pcount": 258,
-                  "htcount": 71,
-                  "ldarea": 7.81,
-                  "prevtp": "2",
-                  "lgtd": 110.745652,
-                  "lttd": 30.233487
-                },
-                {
-                  "adcd": "420529102211101",
-                  "adnm": "六组（曹家湾）",
-                  "pcount": 349,
-                  "htcount": 95,
-                  "ldarea": 8.74,
-                  "prevtp": "2",
-                  "lgtd": 110.772836,
-                  "lttd": 30.236809
-                },
-                {
-                  "adcd": "420529102211102",
-                  "adnm": "五组（桥坪）",
-                  "pcount": 314,
-                  "htcount": 89,
-                  "ldarea": 8.55,
-                  "prevtp": "2",
-                  "lgtd": 110.752264,
-                  "lttd": 30.235366
-                },
-                {
-                  "adcd": "420529102211103",
-                  "adnm": "六组（凉水井）",
-                  "pcount": 277,
-                  "htcount": 76,
-                  "ldarea": 7.67,
-                  "prevtp": "2",
-                  "lgtd": 110.765834,
-                  "lttd": 30.236687
-                }
-              ]
-            },
-            {
-              "adcd": "420529102212000",
-              "adnm": "菖蒲溪村",
-              "pcount": 911,
-              "htcount": 282,
-              "ldarea": 36.28,
-              "prevtp": "0",
-              "lgtd": 110.777564,
-              "lttd": 30.237061,
-              "children": [
-                {
-                  "adcd": "420529102212100",
-                  "adnm": "四组（将军洞）",
-                  "pcount": 189,
-                  "htcount": 62,
-                  "ldarea": 10.15,
-                  "prevtp": "1",
-                  "lgtd": 110.812549,
-                  "lttd": 30.235984
-                },
-                {
-                  "adcd": "420529102212101",
-                  "adnm": "三组（岩屋垴）",
-                  "pcount": 246,
-                  "htcount": 71,
-                  "ldarea": 10.98,
-                  "prevtp": "2",
-                  "lgtd": 110.797305,
-                  "lttd": 30.238971
-                },
-                {
-                  "adcd": "420529102212102",
-                  "adnm": "二组（骆家坪）",
-                  "pcount": 233,
-                  "htcount": 69,
-                  "ldarea": 10.29,
-                  "prevtp": "2",
-                  "lgtd": 110.788782,
-                  "lttd": 30.237532
-                },
-                {
-                  "adcd": "420529102212103",
-                  "adnm": "一组（菖蒲溪）",
-                  "pcount": 243,
-                  "htcount": 80,
-                  "ldarea": 12.86,
-                  "prevtp": "2",
-                  "lgtd": 110.778274,
-                  "lttd": 30.238085
-                }
-              ]
-            },
-            {
-              "adcd": "420529102213000",
-              "adnm": "大湾村",
-              "pcount": 1052,
-              "htcount": 298,
-              "ldarea": 20.31,
-              "prevtp": "0",
-              "lgtd": 110.707941,
-              "lttd": 30.186264,
-              "children": []
-            },
-            {
-              "adcd": "420529102214000",
-              "adnm": "白鹿庄村",
-              "pcount": 1518,
-              "htcount": 432,
-              "ldarea": 21.58,
-              "prevtp": "0",
-              "lgtd": 110.729787,
-              "lttd": 30.19293,
-              "children": [
-                {
-                  "adcd": "420529102214100",
-                  "adnm": "三组（白鹿庄下）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735589,
-                  "lttd": 30.198371
-                },
-                {
-                  "adcd": "420529102214101",
-                  "adnm": "三组（白鹿庄上）",
-                  "pcount": 759,
-                  "htcount": 216,
-                  "ldarea": 12.79,
-                  "prevtp": "2",
-                  "lgtd": 110.735173,
-                  "lttd": 30.201783
-                }
-              ]
-            },
-            {
-              "adcd": "420529102215000",
-              "adnm": "石桥沟村",
-              "pcount": 1192,
-              "htcount": 357,
-              "ldarea": 12.93,
-              "prevtp": "0",
-              "lgtd": 110.712097,
-              "lttd": 30.204806,
-              "children": []
-            },
-            {
-              "adcd": "420529102216000",
-              "adnm": "红鱼潭村",
-              "pcount": 940,
-              "htcount": 243,
-              "ldarea": 14.87,
-              "prevtp": "0",
-              "lgtd": 110.722212,
-              "lttd": 30.221909,
-              "children": [
-                {
-                  "adcd": "420529102216100",
-                  "adnm": "二组（下红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 121,
-                  "ldarea": 11.4,
-                  "prevtp": "2",
-                  "lgtd": 110.712448,
-                  "lttd": 30.220817
-                },
-                {
-                  "adcd": "420529102216101",
-                  "adnm": "二组（上红鱼潭）",
-                  "pcount": 470,
-                  "htcount": 122,
-                  "ldarea": 7.5,
-                  "prevtp": "2",
-                  "lgtd": 110.714051,
-                  "lttd": 30.228049
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529103000000",
-          "adnm": "渔洋关镇",
-          "pcount": 45920,
-          "htcount": 17817,
-          "ldarea": 356,
-          "prevtp": "0",
-          "lgtd": 111.045286,
-          "lttd": 30.160398,
-          "children": [
-            {
-              "adcd": "420529103001000",
-              "adnm": "曹家坪社区",
-              "pcount": 5666,
-              "htcount": 2376,
-              "ldarea": 16.08,
-              "prevtp": "0",
-              "lgtd": 111.071315,
-              "lttd": 30.174626,
-              "children": [
-                {
-                  "adcd": "420529103001100",
-                  "adnm": "五组（松林坪）",
-                  "pcount": 368,
-                  "htcount": 111,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.033933,
-                  "lttd": 30.1556506
-                },
-                {
-                  "adcd": "420529103001101",
-                  "adnm": "四组（松林坪）",
-                  "pcount": 238,
-                  "htcount": 63,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.040689,
-                  "lttd": 30.1503546
-                },
-                {
-                  "adcd": "420529103001103",
-                  "adnm": "六组（松林坪）",
-                  "pcount": 335,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.039322,
-                  "lttd": 30.160644
-                },
-                {
-                  "adcd": "420529103001105",
-                  "adnm": "二组（曹家坪）",
-                  "pcount": 572,
-                  "htcount": 158,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064373,
-                  "lttd": 30.166271
-                },
-                {
-                  "adcd": "420529103001106",
-                  "adnm": "九组（(簸箕山)）",
-                  "pcount": 431,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052448,
-                  "lttd": 30.176902
-                },
-                {
-                  "adcd": "420529103001107",
-                  "adnm": "三组（青岗岭）",
-                  "pcount": 203,
-                  "htcount": 69,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.057881,
-                  "lttd": 30.156
-                }
-              ]
-            },
-            {
-              "adcd": "420529103002000",
-              "adnm": "大房坪社区",
-              "pcount": 6224,
-              "htcount": 2839,
-              "ldarea": 15.17,
-              "prevtp": "0",
-              "lgtd": 111.074047,
-              "lttd": 30.169517,
-              "children": [
-                {
-                  "adcd": "420529103002106",
-                  "adnm": "六组（李家坪）",
-                  "pcount": 337,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.107587,
-                  "lttd": 30.172462
-                },
-                {
-                  "adcd": "420529103002107",
-                  "adnm": "大房坪",
-                  "pcount": 3742,
-                  "htcount": 1761,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.076431,
-                  "lttd": 30.170897
-                },
-                {
-                  "adcd": "420529103002108",
-                  "adnm": "四组（城墙口）",
-                  "pcount": 331,
-                  "htcount": 90,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.095059,
-                  "lttd": 30.146079
-                },
-                {
-                  "adcd": "420529103002109",
-                  "adnm": "七组（麻溪冲）",
-                  "pcount": 287,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.104708,
-                  "lttd": 30.176352
-                },
-                {
-                  "adcd": "420529103002110",
-                  "adnm": "八组（麻溪冲）",
-                  "pcount": 655,
-                  "htcount": 221,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.096686,
-                  "lttd": 30.184931
-                }
-              ]
-            },
-            {
-              "adcd": "420529103003000",
-              "adnm": "桥河社区",
-              "pcount": 7415,
-              "htcount": 3338,
-              "ldarea": 18.36,
-              "prevtp": "0",
-              "lgtd": 111.083223,
-              "lttd": 30.182641,
-              "children": [
-                {
-                  "adcd": "420529103003100",
-                  "adnm": "花桥",
-                  "pcount": 2035,
-                  "htcount": 945,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.064716,
-                  "lttd": 30.178022
-                },
-                {
-                  "adcd": "420529103003101",
-                  "adnm": "桥河",
-                  "pcount": 1372,
-                  "htcount": 590,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.092056,
-                  "lttd": 30.190173
-                },
-                {
-                  "adcd": "420529103003102",
-                  "adnm": "刘家坪",
-                  "pcount": 676,
-                  "htcount": 192,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.068048,
-                  "lttd": 30.203047
-                }
-              ]
-            },
-            {
-              "adcd": "420529103201000",
-              "adnm": "汉马池村",
-              "pcount": 4363,
-              "htcount": 1476,
-              "ldarea": 43.92,
-              "prevtp": "0",
-              "lgtd": 111.010216,
-              "lttd": 30.145828,
-              "children": [
-                {
-                  "adcd": "420529103201100",
-                  "adnm": "五组（千山）",
-                  "pcount": 301,
-                  "htcount": 85,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.972477,
-                  "lttd": 30.1393608
-                },
-                {
-                  "adcd": "420529103201101",
-                  "adnm": "四组（桥板洞）",
-                  "pcount": 207,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.001791,
-                  "lttd": 30.15045
-                },
-                {
-                  "adcd": "420529103201102",
-                  "adnm": "三组（桂花树）",
-                  "pcount": 377,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991827,
-                  "lttd": 30.150599
-                },
-                {
-                  "adcd": "420529103201103",
-                  "adnm": "一组（杨家坝子）",
-                  "pcount": 538,
-                  "htcount": 153,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.015634,
-                  "lttd": 30.137185
-                },
-                {
-                  "adcd": "420529103201104",
-                  "adnm": "六组（阮家洞）",
-                  "pcount": 191,
-                  "htcount": 51,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 110.963332,
-                  "lttd": 30.138323
-                },
-                {
-                  "adcd": "420529103201105",
-                  "adnm": "九组",
-                  "pcount": 544,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018838,
-                  "lttd": 30.188615
-                },
-                {
-                  "adcd": "420529103201107",
-                  "adnm": "七组（长冲子)",
-                  "pcount": 471,
-                  "htcount": 136,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.977879,
-                  "lttd": 30.171188
-                },
-                {
-                  "adcd": "420529103201108",
-                  "adnm": "十组（穿心店）",
-                  "pcount": 619,
-                  "htcount": 98,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.008591,
-                  "lttd": 30.176473
-                },
-                {
-                  "adcd": "420529103201109",
-                  "adnm": "二组（汉马池）",
-                  "pcount": 560,
-                  "htcount": 171,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.011178,
-                  "lttd": 30.156577
-                },
-                {
-                  "adcd": "420529103201110",
-                  "adnm": "九组（杨家湾）",
-                  "pcount": 550,
-                  "htcount": 120,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.991313,
-                  "lttd": 30.198529
-                }
-              ]
-            },
-            {
-              "adcd": "420529103202000",
-              "adnm": "三房坪村",
-              "pcount": 3822,
-              "htcount": 1327,
-              "ldarea": 20.39,
-              "prevtp": "0",
-              "lgtd": 111.070836,
-              "lttd": 30.148837,
-              "children": [
-                {
-                  "adcd": "420529103202100",
-                  "adnm": "八组（樱桃山)",
-                  "pcount": 407,
-                  "htcount": 126,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.052614,
-                  "lttd": 30.133604
-                },
-                {
-                  "adcd": "420529103202101",
-                  "adnm": "九组（樱桃山）",
-                  "pcount": 273,
-                  "htcount": 80,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.047375,
-                  "lttd": 30.134426
-                },
-                {
-                  "adcd": "420529103202102",
-                  "adnm": "七组（赶子坪）",
-                  "pcount": 349,
-                  "htcount": 109,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.063756,
-                  "lttd": 30.130336
-                },
-                {
-                  "adcd": "420529103202103",
-                  "adnm": "四组（砂滩口）",
-                  "pcount": 239,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.06732,
-                  "lttd": 30.133277
-                },
-                {
-                  "adcd": "420529103202104",
-                  "adnm": "一组(青屋树)",
-                  "pcount": 433,
-                  "htcount": 160,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.066485,
-                  "lttd": 30.155661
-                },
-                {
-                  "adcd": "420529103202105",
-                  "adnm": "三组（小河）",
-                  "pcount": 400,
-                  "htcount": 131,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.072293,
-                  "lttd": 30.141717
-                },
-                {
-                  "adcd": "420529103202106",
-                  "adnm": "七组（灌沟）",
-                  "pcount": 230,
-                  "htcount": 103,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.071064,
-                  "lttd": 30.134573
-                }
-              ]
-            },
-            {
-              "adcd": "420529103203000",
-              "adnm": "火田坑村",
-              "pcount": 1785,
-              "htcount": 604,
-              "ldarea": 32.21,
-              "prevtp": "0",
-              "lgtd": 110.928335,
-              "lttd": 30.251524,
-              "children": [
-                {
-                  "adcd": "420529103203103",
-                  "adnm": "四组（余堰子）",
-                  "pcount": 206,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.923367,
-                  "lttd": 30.256976
-                },
-                {
-                  "adcd": "420529103203104",
-                  "adnm": "七组（漩涡埫）",
-                  "pcount": 202,
-                  "htcount": 58,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.872437,
-                  "lttd": 30.247461
-                },
-                {
-                  "adcd": "420529103203105",
-                  "adnm": "四组（大坑埫）",
-                  "pcount": 200,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.935343,
-                  "lttd": 30.263216
-                }
-              ]
-            },
-            {
-              "adcd": "420529103204000",
-              "adnm": "鞍山村",
-              "pcount": 1709,
-              "htcount": 636,
-              "ldarea": 20.78,
-              "prevtp": "0",
-              "lgtd": 110.985901,
-              "lttd": 30.274849,
-              "children": []
-            },
-            {
-              "adcd": "420529103205000",
-              "adnm": "涨水坪村",
-              "pcount": 1709,
-              "htcount": 616,
-              "ldarea": 15.96,
-              "prevtp": "0",
-              "lgtd": 111.016591,
-              "lttd": 30.263112,
-              "children": [
-                {
-                  "adcd": "420529103205100",
-                  "adnm": "二组（涨水坪下）",
-                  "pcount": 323,
-                  "htcount": 105,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.018725,
-                  "lttd": 30.257364
-                },
-                {
-                  "adcd": "420529103205101",
-                  "adnm": "四组（茅葫山）",
-                  "pcount": 264,
-                  "htcount": 75,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.037879,
-                  "lttd": 30.270009
-                },
-                {
-                  "adcd": "420529103205102",
-                  "adnm": "六组（小龙潭）",
-                  "pcount": 334,
-                  "htcount": 97,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.010953,
-                  "lttd": 30.28058
-                },
-                {
-                  "adcd": "420529103205103",
-                  "adnm": "七组（云龙山）",
-                  "pcount": 247,
-                  "htcount": 68,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.013247,
-                  "lttd": 30.285109
-                },
-                {
-                  "adcd": "420529103205104",
-                  "adnm": "二组（涨水坪上）",
-                  "pcount": 300,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.019735,
-                  "lttd": 30.255388
-                }
-              ]
-            },
-            {
-              "adcd": "420529103206000",
-              "adnm": "王家坪村",
-              "pcount": 2372,
-              "htcount": 887,
-              "ldarea": 21,
-              "prevtp": "0",
-              "lgtd": 111.012233,
-              "lttd": 30.244419,
-              "children": [
-                {
-                  "adcd": "420529103206100",
-                  "adnm": "王家坪（五组）",
-                  "pcount": 389,
-                  "htcount": 122,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.007657,
-                  "lttd": 30.243316
-                },
-                {
-                  "adcd": "420529103206103",
-                  "adnm": "碓臼坑（九组）",
-                  "pcount": 297,
-                  "htcount": 93,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.030894,
-                  "lttd": 30.231012
-                },
-                {
-                  "adcd": "420529103206104",
-                  "adnm": "陈家埫（八组）",
-                  "pcount": 193,
-                  "htcount": 55,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.999815,
-                  "lttd": 30.236805
-                },
-                {
-                  "adcd": "420529103206106",
-                  "adnm": "史家坪（四组）",
-                  "pcount": 389,
-                  "htcount": 125,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.020009,
-                  "lttd": 30.234829
-                }
-              ]
-            },
-            {
-              "adcd": "420529103207000",
-              "adnm": "枚二冲村",
-              "pcount": 2406,
-              "htcount": 904,
-              "ldarea": 20.72,
-              "prevtp": "0",
-              "lgtd": 111.048321,
-              "lttd": 30.224802,
-              "children": []
-            },
-            {
-              "adcd": "420529103208000",
-              "adnm": "清水湾村",
-              "pcount": 1775,
-              "htcount": 603,
-              "ldarea": 37.11,
-              "prevtp": "0",
-              "lgtd": 110.965572,
-              "lttd": 30.080175,
-              "children": [
-                {
-                  "adcd": "420529103208100",
-                  "adnm": "四组（龙潭湾）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.932338,
-                  "lttd": 30.085706
-                },
-                {
-                  "adcd": "420529103208101",
-                  "adnm": "四组（唐黄坪）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.939173,
-                  "lttd": 30.082635
-                },
-                {
-                  "adcd": "420529103208102",
-                  "adnm": "六组（玉占花）",
-                  "pcount": 185,
-                  "htcount": 48,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.927351,
-                  "lttd": 30.111314
-                },
-                {
-                  "adcd": "420529103208103",
-                  "adnm": "四组（翻水洞）",
-                  "pcount": 106,
-                  "htcount": 30,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.941731,
-                  "lttd": 30.084026
-                },
-                {
-                  "adcd": "420529103208104",
-                  "adnm": "一组（清水堰））",
-                  "pcount": 178,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.963492,
-                  "lttd": 30.0893062
-                },
-                {
-                  "adcd": "420529103208105",
-                  "adnm": "一组（清水湾）",
-                  "pcount": 178,
-                  "htcount": 50,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.96647,
-                  "lttd": 30.080914
-                },
-                {
-                  "adcd": "420529103208106",
-                  "adnm": "二组（下坪）",
-                  "pcount": 390,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.98068,
-                  "lttd": 30.073403
-                },
-                {
-                  "adcd": "420529103208107",
-                  "adnm": "四组（洈水）",
-                  "pcount": 300,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.94587,
-                  "lttd": 30.082252
-                },
-                {
-                  "adcd": "420529103208108",
-                  "adnm": "二组（上坪）",
-                  "pcount": 280,
-                  "htcount": 52,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.968959,
-                  "lttd": 30.075928
-                }
-              ]
-            },
-            {
-              "adcd": "420529103209000",
-              "adnm": "三板桥村",
-              "pcount": 1584,
-              "htcount": 538,
-              "ldarea": 28.56,
-              "prevtp": "0",
-              "lgtd": 110.987244,
-              "lttd": 30.101781,
-              "children": [
-                {
-                  "adcd": "420529103209100",
-                  "adnm": "八组（三板桥）",
-                  "pcount": 223,
-                  "htcount": 56,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.990816,
-                  "lttd": 30.100481
-                },
-                {
-                  "adcd": "420529103209101",
-                  "adnm": "五组（跑马岭）",
-                  "pcount": 143,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 110.993049,
-                  "lttd": 30.105093
-                },
-                {
-                  "adcd": "420529103209102",
-                  "adnm": "三组（云台观）",
-                  "pcount": 200,
-                  "htcount": 57,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 110.980796,
-                  "lttd": 30.122885
-                },
-                {
-                  "adcd": "420529103209103",
-                  "adnm": "一组（横溪河）",
-                  "pcount": 156,
-                  "htcount": 43,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.002633,
-                  "lttd": 30.124493
-                },
-                {
-                  "adcd": "420529103209104",
-                  "adnm": "九组（高家岭）",
-                  "pcount": 204,
-                  "htcount": 59,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.006308,
-                  "lttd": 30.093283
-                }
-              ]
-            },
-            {
-              "adcd": "420529103210000",
-              "adnm": "石柱山村",
-              "pcount": 1232,
-              "htcount": 430,
-              "ldarea": 11.22,
-              "prevtp": "0",
-              "lgtd": 111.030437,
-              "lttd": 30.108528,
-              "children": [
-                {
-                  "adcd": "420529103210100",
-                  "adnm": "一组（石柱山）",
-                  "pcount": 344,
-                  "htcount": 88,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.026903,
-                  "lttd": 30.113098
-                },
-                {
-                  "adcd": "420529103210101",
-                  "adnm": "黄土包",
-                  "pcount": 240,
-                  "htcount": 66,
-                  "ldarea": 2,
-                  "prevtp": "0",
-                  "lgtd": 111.01604,
-                  "lttd": 30.124506
-                },
-                {
-                  "adcd": "420529103210102",
-                  "adnm": "四组（横溪河）",
-                  "pcount": 329,
-                  "htcount": 100,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014129,
-                  "lttd": 30.128574
-                }
-              ]
-            },
-            {
-              "adcd": "420529103211000",
-              "adnm": "沙埫村",
-              "pcount": 2002,
-              "htcount": 674,
-              "ldarea": 23.24,
-              "prevtp": "0",
-              "lgtd": 111.082426,
-              "lttd": 30.115336,
-              "children": []
-            },
-            {
-              "adcd": "420529103212000",
-              "adnm": "南河村",
-              "pcount": 1794,
-              "htcount": 569,
-              "ldarea": 30.34,
-              "prevtp": "0",
-              "lgtd": 111.069873,
-              "lttd": 30.066705,
-              "children": [
-                {
-                  "adcd": "420529103212100",
-                  "adnm": "杨木洞",
-                  "pcount": 452,
-                  "htcount": 128,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.076144,
-                  "lttd": 30.071189
-                },
-                {
-                  "adcd": "420529103212101",
-                  "adnm": "田家坪",
-                  "pcount": 220,
-                  "htcount": 60,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.041095,
-                  "lttd": 30.078329
-                },
-                {
-                  "adcd": "420529103212102",
-                  "adnm": "谦敬坪",
-                  "pcount": 326,
-                  "htcount": 110,
-                  "ldarea": 2,
-                  "prevtp": "1",
-                  "lgtd": 111.014608,
-                  "lttd": 30.077743
-                },
-                {
-                  "adcd": "420529103212103",
-                  "adnm": "郑家台",
-                  "pcount": 220,
-                  "htcount": 54,
-                  "ldarea": 2,
-                  "prevtp": "2",
-                  "lgtd": 111.026223,
-                  "lttd": 30.082011
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529104000000",
-          "adnm": "仁和坪镇",
-          "pcount": 16117,
-          "htcount": 5069,
-          "ldarea": 199.46,
-          "prevtp": "0",
-          "lgtd": 111.242259,
-          "lttd": 30.104032,
-          "children": [
-            {
-              "adcd": "420529104001000",
-              "adnm": "仁和坪社区",
-              "pcount": 1247,
-              "htcount": 487,
-              "ldarea": 5,
-              "prevtp": "0",
-              "lgtd": 111.238323,
-              "lttd": 30.104003,
-              "children": []
-            },
-            {
-              "adcd": "420529104201000",
-              "adnm": "仁和坪村",
-              "pcount": 1653,
-              "htcount": 499,
-              "ldarea": 17.46,
-              "prevtp": "0",
-              "lgtd": 111.235606,
-              "lttd": 30.098939,
-              "children": [
-                {
-                  "adcd": "420529104201100",
-                  "adnm": "五组（檀木岗）",
-                  "pcount": 610,
-                  "htcount": 186,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.251975,
-                  "lttd": 30.099848
-                },
-                {
-                  "adcd": "420529104201101",
-                  "adnm": "五组（洋线沟）",
-                  "pcount": 40,
-                  "htcount": 6,
-                  "ldarea": 2.23,
-                  "prevtp": "2",
-                  "lgtd": 111.258799,
-                  "lttd": 30.094674
-                },
-                {
-                  "adcd": "420529104201102",
-                  "adnm": "六组（松林坑）",
-                  "pcount": 480,
-                  "htcount": 145,
-                  "ldarea": 7,
-                  "prevtp": "1",
-                  "lgtd": 111.267794,
-                  "lttd": 30.085327
-                },
-                {
-                  "adcd": "420529104201103",
-                  "adnm": "四组（杉林子）",
-                  "pcount": 493,
-                  "htcount": 155,
-                  "ldarea": 8,
-                  "prevtp": "2",
-                  "lgtd": 111.250484,
-                  "lttd": 30.111344
-                },
-                {
-                  "adcd": "420529104201104",
-                  "adnm": "一组（王家湾）",
-                  "pcount": 30,
-                  "htcount": 7,
-                  "ldarea": 2.23,
-                  "prevtp": "1",
-                  "lgtd": 111.235377,
-                  "lttd": 30.089216
-                }
-              ]
-            },
-            {
-              "adcd": "420529104202000",
-              "adnm": "杨家埫村",
-              "pcount": 361,
-              "htcount": 128,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.224634,
-              "lttd": 30.10431,
-              "children": []
-            },
-            {
-              "adcd": "420529104203000",
-              "adnm": "枫香坪村",
-              "pcount": 718,
-              "htcount": 193,
-              "ldarea": 4.9,
-              "prevtp": "0",
-              "lgtd": 111.228783,
-              "lttd": 30.0674,
-              "children": [
-                {
-                  "adcd": "420529104203100",
-                  "adnm": "六组（水井坪）",
-                  "pcount": 351,
-                  "htcount": 85,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.260666,
-                  "lttd": 30.073385
-                },
-                {
-                  "adcd": "420529104203101",
-                  "adnm": "四组（简家坪）",
-                  "pcount": 82,
-                  "htcount": 25,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.209618,
-                  "lttd": 30.076108
-                },
-                {
-                  "adcd": "420529104203102",
-                  "adnm": "四组（枫香坪）",
-                  "pcount": 198,
-                  "htcount": 56,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.222942,
-                  "lttd": 30.0692433
-                },
-                {
-                  "adcd": "420529104203103",
-                  "adnm": "三组（剪刀溪）",
-                  "pcount": 87,
-                  "htcount": 27,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.216989,
-                  "lttd": 30.08405
-                }
-              ]
-            },
-            {
-              "adcd": "420529104204000",
-              "adnm": "罗汉淌",
-              "pcount": 300,
-              "htcount": 140,
-              "ldarea": 3,
-              "prevtp": "0",
-              "lgtd": 111.221815,
-              "lttd": 30.052427,
-              "children": []
-            },
-            {
-              "adcd": "420529104205000",
-              "adnm": "船山坪村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 111.266407,
-              "lttd": 30.057388,
-              "children": []
-            },
-            {
-              "adcd": "420529104206000",
-              "adnm": "梅坪村",
-              "pcount": 350,
-              "htcount": 128,
-              "ldarea": 1.76,
-              "prevtp": "0",
-              "lgtd": 111.301527,
-              "lttd": 30.064403,
-              "children": []
-            },
-            {
-              "adcd": "420529104207000",
-              "adnm": "业产坪村",
-              "pcount": 298,
-              "htcount": 285,
-              "ldarea": 5.8,
-              "prevtp": "0",
-              "lgtd": 111.292338,
-              "lttd": 30.111742,
-              "children": [
-                {
-                  "adcd": "420529104207100",
-                  "adnm": "四组（多竹溪）",
-                  "pcount": 85,
-                  "htcount": 22,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.304219,
-                  "lttd": 30.088104
-                },
-                {
-                  "adcd": "420529104207101",
-                  "adnm": "七组（杨树坳）",
-                  "pcount": 88,
-                  "htcount": 21,
-                  "ldarea": 3.5,
-                  "prevtp": "2",
-                  "lgtd": 111.32324,
-                  "lttd": 30.119831
-                },
-                {
-                  "adcd": "420529104207102",
-                  "adnm": "四组（百担淌）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 2.5,
-                  "prevtp": "2",
-                  "lgtd": 111.316391,
-                  "lttd": 30.094219
-                },
-                {
-                  "adcd": "420529104207103",
-                  "adnm": "一组（业产坪）",
-                  "pcount": 85,
-                  "htcount": 75,
-                  "ldarea": 4.3,
-                  "prevtp": "1",
-                  "lgtd": 111.290478,
-                  "lttd": 30.109408
-                }
-              ]
-            },
-            {
-              "adcd": "420529104208000",
-              "adnm": "杨柳池村",
-              "pcount": 220,
-              "htcount": 82,
-              "ldarea": 2.5,
-              "prevtp": "0",
-              "lgtd": 111.281557,
-              "lttd": 30.126121,
-              "children": [
-                {
-                  "adcd": "420529104208100",
-                  "adnm": "四组（甘沟子）",
-                  "pcount": 220,
-                  "htcount": 82,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 111.318239,
-                  "lttd": 30.130386
-                }
-              ]
-            },
-            {
-              "adcd": "420529104209000",
-              "adnm": "林家坪村",
-              "pcount": 300,
-              "htcount": 85,
-              "ldarea": 2.1,
-              "prevtp": "0",
-              "lgtd": 111.229568,
-              "lttd": 30.136506,
-              "children": []
-            },
-            {
-              "adcd": "420529104210000",
-              "adnm": "大檀树村",
-              "pcount": 685,
-              "htcount": 206,
-              "ldarea": 12,
-              "prevtp": "0",
-              "lgtd": 111.169768,
-              "lttd": 30.128698,
-              "children": [
-                {
-                  "adcd": "420529104210100",
-                  "adnm": "四组（大堰）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5,
-                  "prevtp": "2",
-                  "lgtd": 111.191456,
-                  "lttd": 30.140086
-                },
-                {
-                  "adcd": "420529104210102",
-                  "adnm": "二组（摊子坡）",
-                  "pcount": 280,
-                  "htcount": 83,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.178975,
-                  "lttd": 30.125395
-                },
-                {
-                  "adcd": "420529104210103",
-                  "adnm": "五组（余家坪）",
-                  "pcount": 195,
-                  "htcount": 58,
-                  "ldarea": 6.5,
-                  "prevtp": "2",
-                  "lgtd": 111.181009,
-                  "lttd": 30.144807
-                }
-              ]
-            },
-            {
-              "adcd": "420529104211000",
-              "adnm": "升子坪村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 111.168879,
-              "lttd": 30.105211,
-              "children": []
-            },
-            {
-              "adcd": "420529104212000",
-              "adnm": "富裕冲村",
-              "pcount": 353,
-              "htcount": 121,
-              "ldarea": 1.62,
-              "prevtp": "0",
-              "lgtd": 111.143766,
-              "lttd": 30.117854,
-              "children": []
-            },
-            {
-              "adcd": "420529104213000",
-              "adnm": "桥梁村",
-              "pcount": 127,
-              "htcount": 31,
-              "ldarea": 2.7,
-              "prevtp": "0",
-              "lgtd": 111.101141,
-              "lttd": 30.108951,
-              "children": [
-                {
-                  "adcd": "420529104213100",
-                  "adnm": "一组（翻水坳）",
-                  "pcount": 11,
-                  "htcount": 3,
-                  "ldarea": 2.2,
-                  "prevtp": "1",
-                  "lgtd": 111.104619,
-                  "lttd": 30.115265
-                },
-                {
-                  "adcd": "420529104213101",
-                  "adnm": "六组（麒麟观）",
-                  "pcount": 20,
-                  "htcount": 4,
-                  "ldarea": 2.6,
-                  "prevtp": "1",
-                  "lgtd": 111.110327,
-                  "lttd": 30.08415
-                },
-                {
-                  "adcd": "420529104213102",
-                  "adnm": "一组（道家湾）",
-                  "pcount": 48,
-                  "htcount": 12,
-                  "ldarea": 2.8,
-                  "prevtp": "2",
-                  "lgtd": 111.099774,
-                  "lttd": 30.118108
-                },
-                {
-                  "adcd": "420529104213103",
-                  "adnm": "四组（桥梁）",
-                  "pcount": 22,
-                  "htcount": 6,
-                  "ldarea": 2.5,
-                  "prevtp": "1",
-                  "lgtd": 111.102086,
-                  "lttd": 30.107225
-                },
-                {
-                  "adcd": "420529104213104",
-                  "adnm": "三组（流满沟)",
-                  "pcount": 26,
-                  "htcount": 6,
-                  "ldarea": 2.6,
-                  "prevtp": "2",
-                  "lgtd": 111.082384,
-                  "lttd": 30.104546
-                }
-              ]
-            },
-            {
-              "adcd": "420529104214000",
-              "adnm": "大栗树村",
-              "pcount": 1680,
-              "htcount": 502,
-              "ldarea": 24,
-              "prevtp": "0",
-              "lgtd": 111.142519,
-              "lttd": 30.059065,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529105000000",
-          "adnm": "湾潭镇",
-          "pcount": 15721,
-          "htcount": 4650,
-          "ldarea": 295.53,
-          "plarea": 38929,
-          "prevtp": "0",
-          "lgtd": 110.425002,
-          "lttd": 30.050047,
-          "wscd": "HBWS000000002",
-          "children": [
-            {
-              "adcd": "420529105001000",
-              "adnm": "湾潭社区",
-              "pcount": 1313,
-              "htcount": 398,
-              "ldarea": 16.21,
-              "plarea": 1153,
-              "prevtp": "0",
-              "lgtd": 110.42388,
-              "lttd": 30.047864,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105001100",
-                  "adnm": "上街",
-                  "pcount": 249,
-                  "htcount": 74,
-                  "ldarea": 5.24,
-                  "plarea": 225,
-                  "prevtp": "2",
-                  "lgtd": 110.425785,
-                  "lttd": 30.053044,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001101",
-                  "adnm": "中街",
-                  "pcount": 285,
-                  "htcount": 86,
-                  "ldarea": 5.39,
-                  "plarea": 229,
-                  "prevtp": "2",
-                  "lgtd": 110.425614,
-                  "lttd": 30.048871,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001102",
-                  "adnm": "下街",
-                  "pcount": 291,
-                  "htcount": 88,
-                  "ldarea": 5.49,
-                  "plarea": 218,
-                  "prevtp": "2",
-                  "lgtd": 110.427007,
-                  "lttd": 30.041187,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001103",
-                  "adnm": "四组",
-                  "pcount": 300,
-                  "htcount": 94,
-                  "ldarea": 5.68,
-                  "plarea": 289,
-                  "prevtp": "2",
-                  "lgtd": 110.435104,
-                  "lttd": 30.057728,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001104",
-                  "adnm": "三组（黄家湾上）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.2,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.421384,
-                  "lttd": 30.061152,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105001105",
-                  "adnm": "三组（黄家湾下）",
-                  "pcount": 94,
-                  "htcount": 28,
-                  "ldarea": 3.21,
-                  "plarea": 96,
-                  "prevtp": "2",
-                  "lgtd": 110.423788,
-                  "lttd": 30.052927,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105201000",
-              "adnm": "龙桥村",
-              "pcount": 1806,
-              "htcount": 524,
-              "ldarea": 21.15,
-              "plarea": 2719,
-              "prevtp": "0",
-              "lgtd": 110.427125,
-              "lttd": 30.034791,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105201100",
-                  "adnm": "五组（田家坪）",
-                  "pcount": 424,
-                  "htcount": 124,
-                  "ldarea": 6.96,
-                  "plarea": 632,
-                  "prevtp": "2",
-                  "lgtd": 110.425186,
-                  "lttd": 30.030705,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201101",
-                  "adnm": "二组（胡家坪）",
-                  "pcount": 386,
-                  "htcount": 113,
-                  "ldarea": 6.52,
-                  "plarea": 576,
-                  "prevtp": "2",
-                  "lgtd": 110.439722,
-                  "lttd": 30.055551,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201102",
-                  "adnm": "三组",
-                  "pcount": 361,
-                  "htcount": 106,
-                  "ldarea": 6.24,
-                  "plarea": 540,
-                  "prevtp": "1",
-                  "lgtd": 110.457203,
-                  "lttd": 30.049073,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201103",
-                  "adnm": "四组（覃家坪）",
-                  "pcount": 340,
-                  "htcount": 100,
-                  "ldarea": 6,
-                  "plarea": 510,
-                  "prevtp": "2",
-                  "lgtd": 110.430404,
-                  "lttd": 30.036725,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201104",
-                  "adnm": "一组（八里铺）",
-                  "pcount": 295,
-                  "htcount": 81,
-                  "ldarea": 5.43,
-                  "plarea": 461,
-                  "prevtp": "2",
-                  "lgtd": 110.458963,
-                  "lttd": 30.074837,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105201105",
-                  "adnm": "二组（白果湾）",
-                  "pcount": 193,
-                  "htcount": 56,
-                  "ldarea": 4.26,
-                  "plarea": 288,
-                  "prevtp": "2",
-                  "lgtd": 110.436559,
-                  "lttd": 30.051893,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105202000",
-              "adnm": "九门村",
-              "pcount": 1191,
-              "htcount": 330,
-              "ldarea": 27.38,
-              "plarea": 3720,
-              "prevtp": "0",
-              "lgtd": 110.424995,
-              "lttd": 29.994538,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105202100",
-                  "adnm": "四组",
-                  "pcount": 187,
-                  "htcount": 52,
-                  "ldarea": 4.66,
-                  "prevtp": "1",
-                  "lgtd": 111.019734,
-                  "lttd": 30.038212
-                },
-                {
-                  "adcd": "420529105202101",
-                  "adnm": "三组（大岭）",
-                  "pcount": 170,
-                  "htcount": 46,
-                  "ldarea": 4.38,
-                  "prevtp": "1",
-                  "lgtd": 110.466198,
-                  "lttd": 30.017541
-                }
-              ]
-            },
-            {
-              "adcd": "420529105203000",
-              "adnm": "小凤池村",
-              "pcount": 1236,
-              "htcount": 362,
-              "ldarea": 17.03,
-              "plarea": 3512,
-              "prevtp": "0",
-              "lgtd": 110.39745,
-              "lttd": 30.054112,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105203100",
-                  "adnm": "三组（横渡口）",
-                  "pcount": 870,
-                  "htcount": 256,
-                  "ldarea": 14.12,
-                  "plarea": 2484,
-                  "prevtp": "2",
-                  "lgtd": 110.397542,
-                  "lttd": 30.052772,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203102",
-                  "adnm": "二组（小凤池上）",
-                  "pcount": 186,
-                  "htcount": 56,
-                  "ldarea": 4.51,
-                  "plarea": 528,
-                  "prevtp": "2",
-                  "lgtd": 110.41154,
-                  "lttd": 30.032823,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105203103",
-                  "adnm": "二组（小凤池下）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 4.4,
-                  "plarea": 500,
-                  "prevtp": "2",
-                  "lgtd": 110.406546,
-                  "lttd": 30.024965,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105204000",
-              "adnm": "茅庄村",
-              "pcount": 1668,
-              "htcount": 489,
-              "ldarea": 65.77,
-              "plarea": 1947,
-              "prevtp": "0",
-              "lgtd": 110.481058,
-              "lttd": 30.081057,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105204100",
-                  "adnm": "五组（三板桥）",
-                  "pcount": 119,
-                  "htcount": 35,
-                  "ldarea": 6.69,
-                  "plarea": 138,
-                  "prevtp": "1",
-                  "lgtd": 110.385549,
-                  "lttd": 30.084092,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204101",
-                  "adnm": "四组（三峰岗）",
-                  "pcount": 139,
-                  "htcount": 41,
-                  "ldarea": 7.49,
-                  "plarea": 159,
-                  "prevtp": "1",
-                  "lgtd": 110.456626,
-                  "lttd": 30.106181,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204103",
-                  "adnm": "一组（土坪）",
-                  "pcount": 187,
-                  "htcount": 55,
-                  "ldarea": 9.37,
-                  "plarea": 214,
-                  "prevtp": "1",
-                  "lgtd": 110.510515,
-                  "lttd": 30.127021,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204104",
-                  "adnm": "二组（横河）",
-                  "pcount": 214,
-                  "htcount": 63,
-                  "ldarea": 10.44,
-                  "plarea": 246,
-                  "prevtp": "2",
-                  "lgtd": 110.47501,
-                  "lttd": 30.097844,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204105",
-                  "adnm": "三组（关岔口）",
-                  "pcount": 197,
-                  "htcount": 58,
-                  "ldarea": 9.77,
-                  "plarea": 226,
-                  "prevtp": "2",
-                  "lgtd": 110.47866,
-                  "lttd": 30.080996,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105204106",
-                  "adnm": "二组（茅庄）",
-                  "pcount": 289,
-                  "htcount": 85,
-                  "ldarea": 13.39,
-                  "plarea": 332,
-                  "prevtp": "2",
-                  "lgtd": 110.487741,
-                  "lttd": 30.117695,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105205000",
-              "adnm": "红烈村",
-              "pcount": 1743,
-              "htcount": 545,
-              "ldarea": 18.88,
-              "plarea": 3378,
-              "prevtp": "0",
-              "lgtd": 110.402328,
-              "lttd": 30.018152,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105205100",
-                  "adnm": "二组（红旗1）",
-                  "pcount": 105,
-                  "htcount": 34,
-                  "ldarea": 3.18,
-                  "plarea": 200,
-                  "prevtp": "2",
-                  "lgtd": 110.403549,
-                  "lttd": 30.021536,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205101",
-                  "adnm": "二组（红旗2）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 3,
-                  "plarea": 190,
-                  "prevtp": "2",
-                  "lgtd": 110.403766,
-                  "lttd": 30.016641,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205102",
-                  "adnm": "三组(幺牌）",
-                  "pcount": 318,
-                  "htcount": 91,
-                  "ldarea": 5.09,
-                  "plarea": 555,
-                  "prevtp": "2",
-                  "lgtd": 110.407947,
-                  "lttd": 30.013943,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105205103",
-                  "adnm": "一组（龚家坪）",
-                  "pcount": 89,
-                  "htcount": 23,
-                  "ldarea": 2.78,
-                  "plarea": 140,
-                  "prevtp": "1",
-                  "lgtd": 110.370446,
-                  "lttd": 30.04961,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105206000",
-              "adnm": "红旗坪村",
-              "pcount": 1006,
-              "htcount": 308,
-              "ldarea": 19,
-              "plarea": 1998,
-              "prevtp": "0",
-              "lgtd": 110.396358,
-              "lttd": 30.002951,
-              "wscd": "HBWS000000002",
-              "children": []
-            },
-            {
-              "adcd": "420529105207000",
-              "adnm": "三台坡村",
-              "pcount": 784,
-              "htcount": 240,
-              "ldarea": 33.06,
-              "plarea": 3637,
-              "prevtp": "0",
-              "lgtd": 110.348317,
-              "lttd": 30.078608,
-              "wscd": "HBWS000000002",
-              "children": [
-                {
-                  "adcd": "420529105207100",
-                  "adnm": "三组",
-                  "pcount": 144,
-                  "htcount": 45,
-                  "ldarea": 9.68,
-                  "plarea": 675,
-                  "prevtp": "1",
-                  "lgtd": 110.348484,
-                  "lttd": 30.077671,
-                  "wscd": "HBWS000000002"
-                },
-                {
-                  "adcd": "420529105207101",
-                  "adnm": "二组",
-                  "pcount": 381,
-                  "htcount": 118,
-                  "ldarea": 19.28,
-                  "plarea": 1770,
-                  "prevtp": "1",
-                  "lgtd": 110.353433,
-                  "lttd": 30.090529,
-                  "wscd": "HBWS000000002"
-                }
-              ]
-            },
-            {
-              "adcd": "420529105208000",
-              "adnm": "锁山金村",
-              "pcount": 1944,
-              "htcount": 550,
-              "ldarea": 24.27,
-              "prevtp": "0",
-              "lgtd": 110.310285,
-              "lttd": 29.967872,
-              "children": [
-                {
-                  "adcd": "420529105208100",
-                  "adnm": "一组（岗坪）",
-                  "pcount": 196,
-                  "htcount": 56,
-                  "ldarea": 2.47,
-                  "prevtp": "0",
-                  "lgtd": 110.310224,
-                  "lttd": 29.966106
-                },
-                {
-                  "adcd": "420529105208101",
-                  "adnm": "四组（大树垭）",
-                  "pcount": 252,
-                  "htcount": 72,
-                  "ldarea": 2.69,
-                  "prevtp": "0",
-                  "lgtd": 110.335138,
-                  "lttd": 29.976205
-                },
-                {
-                  "adcd": "420529105208102",
-                  "adnm": "二组",
-                  "pcount": 161,
-                  "htcount": 46,
-                  "ldarea": 1.71,
-                  "prevtp": "0",
-                  "lgtd": 110.30384,
-                  "lttd": 29.960653
-                }
-              ]
-            },
-            {
-              "adcd": "420529105209000",
-              "adnm": "茶园村",
-              "pcount": 956,
-              "htcount": 445,
-              "ldarea": 22.25,
-              "prevtp": "0",
-              "lgtd": 110.321912,
-              "lttd": 30.00915,
-              "children": []
-            },
-            {
-              "adcd": "420529105210000",
-              "adnm": "鹿耳庄村",
-              "pcount": 1588,
-              "htcount": 462,
-              "ldarea": 22.5,
-              "plarea": 2025,
-              "prevtp": "0",
-              "lgtd": 110.362793,
-              "lttd": 29.995701,
-              "wscd": "HBWS000000002",
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529201000000",
-          "adnm": "付家堰乡",
-          "pcount": 17205,
-          "htcount": 5427,
-          "ldarea": 92.28,
-          "prevtp": "0",
-          "lgtd": 110.487421,
-          "lttd": 30.349922,
-          "children": [
-            {
-              "adcd": "420529201001000",
-              "adnm": "付家堰社区",
-              "pcount": 386,
-              "htcount": 168,
-              "ldarea": 5.68,
-              "prevtp": "2",
-              "lgtd": 110.478735,
-              "lttd": 30.3065179,
-              "children": []
-            },
-            {
-              "adcd": "420529201201000",
-              "adnm": "付家堰村",
-              "pcount": 2492,
-              "htcount": 775,
-              "ldarea": 5.84,
-              "prevtp": "0",
-              "lgtd": 110.480256,
-              "lttd": 30.307638,
-              "children": [
-                {
-                  "adcd": "420529201201101",
-                  "adnm": "一组（饶家湾）",
-                  "pcount": 410,
-                  "htcount": 122,
-                  "ldarea": 2.95,
-                  "prevtp": "2",
-                  "lgtd": 110.473528,
-                  "lttd": 30.3011483
-                },
-                {
-                  "adcd": "420529201201102",
-                  "adnm": "六组（排山）",
-                  "pcount": 392,
-                  "htcount": 131,
-                  "ldarea": 2.81,
-                  "prevtp": "1",
-                  "lgtd": 110.456762,
-                  "lttd": 30.2860972
-                },
-                {
-                  "adcd": "420529201201103",
-                  "adnm": "一组（段沟）",
-                  "pcount": 450,
-                  "htcount": 420,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.479115,
-                  "lttd": 30.304886
-                }
-              ]
-            },
-            {
-              "adcd": "420529201202000",
-              "adnm": "火山村",
-              "pcount": 1996,
-              "htcount": 605,
-              "ldarea": 11.46,
-              "prevtp": "0",
-              "lgtd": 110.469095,
-              "lttd": 30.319452,
-              "children": [
-                {
-                  "adcd": "420529201202100",
-                  "adnm": "二组",
-                  "pcount": 402,
-                  "htcount": 122,
-                  "ldarea": 4.33,
-                  "prevtp": "1",
-                  "lgtd": 110.469635,
-                  "lttd": 30.3418893
-                },
-                {
-                  "adcd": "420529201202101",
-                  "adnm": "三组",
-                  "pcount": 382,
-                  "htcount": 113,
-                  "ldarea": 4.2,
-                  "prevtp": "1",
-                  "lgtd": 110.463773,
-                  "lttd": 30.3235754
-                },
-                {
-                  "adcd": "420529201202102",
-                  "adnm": "五组（毛沟湾）",
-                  "pcount": 361,
-                  "htcount": 128,
-                  "ldarea": 4.5,
-                  "prevtp": "2",
-                  "lgtd": 110.461409,
-                  "lttd": 30.307311
-                },
-                {
-                  "adcd": "420529201202103",
-                  "adnm": "五组（桂竹溪）",
-                  "pcount": 360,
-                  "htcount": 120,
-                  "ldarea": 4,
-                  "prevtp": "2",
-                  "lgtd": 110.463332,
-                  "lttd": 30.306439
-                }
-              ]
-            },
-            {
-              "adcd": "420529201203000",
-              "adnm": "马蹄井村",
-              "pcount": 1624,
-              "htcount": 458,
-              "ldarea": 14.07,
-              "prevtp": "0",
-              "lgtd": 110.443532,
-              "lttd": 30.3156,
-              "children": [
-                {
-                  "adcd": "420529201203100",
-                  "adnm": "张家池",
-                  "pcount": 310,
-                  "htcount": 92,
-                  "ldarea": 4.82,
-                  "prevtp": "1",
-                  "lgtd": 110.438819,
-                  "lttd": 30.3408115
-                },
-                {
-                  "adcd": "420529201203101",
-                  "adnm": "一组（岩板上）",
-                  "pcount": 330,
-                  "htcount": 112,
-                  "ldarea": 5.02,
-                  "prevtp": "2",
-                  "lgtd": 110.453829,
-                  "lttd": 30.336959
-                },
-                {
-                  "adcd": "420529201203102",
-                  "adnm": "一组（李家埫）",
-                  "pcount": 200,
-                  "htcount": 82,
-                  "ldarea": 4.35,
-                  "prevtp": "2",
-                  "lgtd": 110.449439,
-                  "lttd": 30.33028
-                },
-                {
-                  "adcd": "420529201203103",
-                  "adnm": "一组（陈家沟）",
-                  "pcount": 210,
-                  "htcount": 78,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.450861,
-                  "lttd": 30.32628
-                }
-              ]
-            },
-            {
-              "adcd": "420529201204000",
-              "adnm": "田家山村",
-              "pcount": 1326,
-              "htcount": 458,
-              "ldarea": 9.19,
-              "prevtp": "0",
-              "lgtd": 110.4688,
-              "lttd": 30.391132,
-              "children": [
-                {
-                  "adcd": "420529201204100",
-                  "adnm": "一组",
-                  "pcount": 420,
-                  "htcount": 130,
-                  "ldarea": 4.29,
-                  "prevtp": "1",
-                  "lgtd": 110.436456,
-                  "lttd": 30.350601
-                }
-              ]
-            },
-            {
-              "adcd": "420529201205000",
-              "adnm": "左泉洞村",
-              "pcount": 1738,
-              "htcount": 574,
-              "ldarea": 8.35,
-              "prevtp": "0",
-              "lgtd": 110.491354,
-              "lttd": 30.38796,
-              "children": [
-                {
-                  "adcd": "420529201205100",
-                  "adnm": "二组（莲蓬溪）",
-                  "pcount": 350,
-                  "htcount": 128,
-                  "ldarea": 3.76,
-                  "prevtp": "2",
-                  "lgtd": 110.485923,
-                  "lttd": 30.404639
-                },
-                {
-                  "adcd": "420529201205101",
-                  "adnm": "五组（炉子坡）",
-                  "pcount": 282,
-                  "htcount": 110,
-                  "ldarea": 3.56,
-                  "prevtp": "1",
-                  "lgtd": 110.503146,
-                  "lttd": 30.3823
-                }
-              ]
-            },
-            {
-              "adcd": "420529201206000",
-              "adnm": "大龙坪村",
-              "pcount": 1784,
-              "htcount": 545,
-              "ldarea": 7.41,
-              "prevtp": "0",
-              "lgtd": 110.471902,
-              "lttd": 30.36017,
-              "children": [
-                {
-                  "adcd": "420529201206100",
-                  "adnm": "三组（刘家湾)",
-                  "pcount": 412,
-                  "htcount": 154,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.468727,
-                  "lttd": 30.357258
-                },
-                {
-                  "adcd": "420529201206101",
-                  "adnm": "二组（大龙坪）",
-                  "pcount": 421,
-                  "htcount": 160,
-                  "ldarea": 3.83,
-                  "prevtp": "2",
-                  "lgtd": 110.470463,
-                  "lttd": 30.363806
-                },
-                {
-                  "adcd": "420529201206102",
-                  "adnm": "三组（冲门沟）",
-                  "pcount": 364,
-                  "htcount": 155,
-                  "ldarea": 3.65,
-                  "prevtp": "2",
-                  "lgtd": 110.469068,
-                  "lttd": 30.365667
-                }
-              ]
-            },
-            {
-              "adcd": "420529201207000",
-              "adnm": "白庙村",
-              "pcount": 1685,
-              "htcount": 532,
-              "ldarea": 11.54,
-              "prevtp": "0",
-              "lgtd": 110.50056,
-              "lttd": 30.31767,
-              "children": [
-                {
-                  "adcd": "420529201207100",
-                  "adnm": "五组（八坪）",
-                  "pcount": 282,
-                  "htcount": 89,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.505149,
-                  "lttd": 30.306069
-                },
-                {
-                  "adcd": "420529201207101",
-                  "adnm": "六组（八坪）",
-                  "pcount": 281,
-                  "htcount": 105,
-                  "ldarea": 1.78,
-                  "prevtp": "0",
-                  "lgtd": 110.507719,
-                  "lttd": 30.30555
-                },
-                {
-                  "adcd": "420529201207102",
-                  "adnm": "一组（白庙聚宝石）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 3.1,
-                  "prevtp": "2",
-                  "lgtd": 110.517796,
-                  "lttd": 30.34481
-                },
-                {
-                  "adcd": "420529201207103",
-                  "adnm": "四组（果坪埫2）",
-                  "pcount": 168,
-                  "htcount": 48,
-                  "ldarea": 3.04,
-                  "prevtp": "2",
-                  "lgtd": 110.495698,
-                  "lttd": 30.315614
-                },
-                {
-                  "adcd": "420529201207105",
-                  "adnm": "三组（白庙）",
-                  "pcount": 150,
-                  "htcount": 48,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.503506,
-                  "lttd": 30.319506
-                },
-                {
-                  "adcd": "420529201207106",
-                  "adnm": "一组（白庙黑潭河）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 3.05,
-                  "prevtp": "2",
-                  "lgtd": 110.500862,
-                  "lttd": 30.32349
-                },
-                {
-                  "adcd": "420529201207107",
-                  "adnm": "四组（果坪埫1）",
-                  "pcount": 100,
-                  "htcount": 40,
-                  "ldarea": 3,
-                  "prevtp": "2",
-                  "lgtd": 110.496291,
-                  "lttd": 30.295625
-                }
-              ]
-            },
-            {
-              "adcd": "420529201208000",
-              "adnm": "鸭儿坪村",
-              "pcount": 2458,
-              "htcount": 810,
-              "ldarea": 14.48,
-              "prevtp": "0",
-              "lgtd": 110.523218,
-              "lttd": 30.37112,
-              "children": [
-                {
-                  "adcd": "420529201208100",
-                  "adnm": "一组（廖家湾）",
-                  "pcount": 512,
-                  "htcount": 162,
-                  "ldarea": 5.06,
-                  "prevtp": "2",
-                  "lgtd": 110.522115,
-                  "lttd": 30.369879
-                },
-                {
-                  "adcd": "420529201208101",
-                  "adnm": "三组",
-                  "pcount": 525,
-                  "htcount": 170,
-                  "ldarea": 5.24,
-                  "prevtp": "1",
-                  "lgtd": 110.535948,
-                  "lttd": 30.387679
-                }
-              ]
-            },
-            {
-              "adcd": "420529201209000",
-              "adnm": "桥料村",
-              "pcount": 2102,
-              "htcount": 670,
-              "ldarea": 9.94,
-              "prevtp": "0",
-              "lgtd": 110.543481,
-              "lttd": 30.369273,
-              "children": [
-                {
-                  "adcd": "420529201209100",
-                  "adnm": "四组（蒿坪）",
-                  "pcount": 353,
-                  "htcount": 121,
-                  "ldarea": 3.62,
-                  "prevtp": "2",
-                  "lgtd": 110.548285,
-                  "lttd": 30.358664
-                },
-                {
-                  "adcd": "420529201209101",
-                  "adnm": "六组（柞房湾）",
-                  "pcount": 386,
-                  "htcount": 116,
-                  "ldarea": 3.61,
-                  "prevtp": "2",
-                  "lgtd": 110.533869,
-                  "lttd": 30.358174
-                },
-                {
-                  "adcd": "420529201209102",
-                  "adnm": "五组（赛宝）",
-                  "pcount": 319,
-                  "htcount": 110,
-                  "ldarea": 3.52,
-                  "prevtp": "1",
-                  "lgtd": 110.546802,
-                  "lttd": 30.3667211
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "adcd": "420529202000000",
-          "adnm": "牛庄乡",
-          "pcount": 7383,
-          "htcount": 2182,
-          "ldarea": 154,
-          "prevtp": "0",
-          "lgtd": 110.353576,
-          "lttd": 30.226665,
-          "children": [
-            {
-              "adcd": "420529202201000",
-              "adnm": "牛庄村",
-              "pcount": 1425,
-              "htcount": 401,
-              "ldarea": 27.81,
-              "prevtp": "0",
-              "lgtd": 110.351812,
-              "lttd": 30.223849,
-              "children": [
-                {
-                  "adcd": "420529202201100",
-                  "adnm": "一组",
-                  "pcount": 132,
-                  "htcount": 43,
-                  "ldarea": 3.73,
-                  "prevtp": "0",
-                  "lgtd": 110.359446,
-                  "lttd": 30.234513
-                },
-                {
-                  "adcd": "420529202201101",
-                  "adnm": "七组",
-                  "pcount": 88,
-                  "htcount": 31,
-                  "ldarea": 1.96,
-                  "prevtp": "0",
-                  "lgtd": 110.342555,
-                  "lttd": 30.228869
-                },
-                {
-                  "adcd": "420529202201102",
-                  "adnm": "二组",
-                  "pcount": 105,
-                  "htcount": 36,
-                  "ldarea": 2.01,
-                  "prevtp": "0",
-                  "lgtd": 110.291595,
-                  "lttd": 30.214394
-                },
-                {
-                  "adcd": "420529202201103",
-                  "adnm": "三组",
-                  "pcount": 182,
-                  "htcount": 52,
-                  "ldarea": 3.92,
-                  "prevtp": "0",
-                  "lgtd": 110.350574,
-                  "lttd": 30.22323
-                }
-              ]
-            },
-            {
-              "adcd": "420529202202000",
-              "adnm": "池南村",
-              "pcount": 734,
-              "htcount": 223,
-              "ldarea": 16.79,
-              "prevtp": "0",
-              "lgtd": 110.337422,
-              "lttd": 30.206523,
-              "children": [
-                {
-                  "adcd": "420529202202100",
-                  "adnm": "六组",
-                  "pcount": 51,
-                  "htcount": 15,
-                  "ldarea": 3.21,
-                  "prevtp": "1",
-                  "lgtd": 110.32757,
-                  "lttd": 30.222412
-                },
-                {
-                  "adcd": "420529202202101",
-                  "adnm": "二组（池南）",
-                  "pcount": 153,
-                  "htcount": 48,
-                  "ldarea": 3.7,
-                  "prevtp": "2",
-                  "lgtd": 110.337412,
-                  "lttd": 30.206112
-                },
-                {
-                  "adcd": "420529202202102",
-                  "adnm": "四组",
-                  "pcount": 106,
-                  "htcount": 29,
-                  "ldarea": 3.37,
-                  "prevtp": "1",
-                  "lgtd": 110.330964,
-                  "lttd": 30.2055751
-                }
-              ]
-            },
-            {
-              "adcd": "420529202203000",
-              "adnm": "凌云村",
-              "pcount": 704,
-              "htcount": 201,
-              "ldarea": 14.63,
-              "prevtp": "0",
-              "lgtd": 110.335722,
-              "lttd": 30.187676,
-              "children": [
-                {
-                  "adcd": "420529202203100",
-                  "adnm": "六组（弭坪）",
-                  "pcount": 85,
-                  "htcount": 15,
-                  "ldarea": 4.33,
-                  "prevtp": "2",
-                  "lgtd": 110.287151,
-                  "lttd": 30.190698
-                },
-                {
-                  "adcd": "420529202203101",
-                  "adnm": "八组（大埫）",
-                  "pcount": 65,
-                  "htcount": 19,
-                  "ldarea": 3.45,
-                  "prevtp": "1",
-                  "lgtd": 110.278841,
-                  "lttd": 30.185058
-                },
-                {
-                  "adcd": "420529202203102",
-                  "adnm": "五组（下土鱼河）",
-                  "pcount": 112,
-                  "htcount": 22,
-                  "ldarea": 5.39,
-                  "prevtp": "2",
-                  "lgtd": 110.302724,
-                  "lttd": 30.184629
-                },
-                {
-                  "adcd": "420529202203103",
-                  "adnm": "大花坪林场",
-                  "pcount": 185,
-                  "htcount": 57,
-                  "ldarea": 8.54,
-                  "prevtp": "2",
-                  "lgtd": 110.318371,
-                  "lttd": 30.154748
-                },
-                {
-                  "adcd": "420529202203104",
-                  "adnm": "五组（上土鱼河）",
-                  "pcount": 98,
-                  "htcount": 45,
-                  "ldarea": 5.32,
-                  "prevtp": "2",
-                  "lgtd": 110.312979,
-                  "lttd": 30.183736
-                }
-              ]
-            },
-            {
-              "adcd": "420529202204000",
-              "adnm": "沙河村",
-              "pcount": 403,
-              "htcount": 111,
-              "ldarea": 11.57,
-              "prevtp": "0",
-              "lgtd": 110.36442,
-              "lttd": 30.238031,
-              "children": [
-                {
-                  "adcd": "420529202204100",
-                  "adnm": "一组（沙河)",
-                  "pcount": 86,
-                  "htcount": 23,
-                  "ldarea": 3.93,
-                  "prevtp": "2",
-                  "lgtd": 110.364422,
-                  "lttd": 30.237765
-                }
-              ]
-            },
-            {
-              "adcd": "420529202205000",
-              "adnm": "松木坪村",
-              "pcount": 644,
-              "htcount": 169,
-              "ldarea": 14.99,
-              "prevtp": "0",
-              "lgtd": 110.306926,
-              "lttd": 30.229545,
-              "children": []
-            },
-            {
-              "adcd": "420529202206000",
-              "adnm": "金山村",
-              "pcount": 1321,
-              "htcount": 383,
-              "ldarea": 21.99,
-              "prevtp": "0",
-              "lgtd": 110.288519,
-              "lttd": 30.229658,
-              "children": [
-                {
-                  "adcd": "420529202206100",
-                  "adnm": "二组（罗家湾）",
-                  "pcount": 69,
-                  "htcount": 12,
-                  "ldarea": 3.01,
-                  "prevtp": "2",
-                  "lgtd": 110.293487,
-                  "lttd": 30.2124449
-                },
-                {
-                  "adcd": "420529202206101",
-                  "adnm": "三组（任家河）",
-                  "pcount": 113,
-                  "htcount": 28,
-                  "ldarea": 5.38,
-                  "prevtp": "1",
-                  "lgtd": 110.281083,
-                  "lttd": 30.223695
-                },
-                {
-                  "adcd": "420529202206102",
-                  "adnm": "一组（李家屋场）",
-                  "pcount": 84,
-                  "htcount": 19,
-                  "ldarea": 2.34,
-                  "prevtp": "0",
-                  "lgtd": 110.311067,
-                  "lttd": 30.219306
-                },
-                {
-                  "adcd": "420529202206103",
-                  "adnm": "五组（金山坪）",
-                  "pcount": 284,
-                  "htcount": 52,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.283955,
-                  "lttd": 30.233378
-                },
-                {
-                  "adcd": "420529202206104",
-                  "adnm": "九组（鹰嘴山）",
-                  "pcount": 220,
-                  "htcount": 47,
-                  "ldarea": 6.88,
-                  "prevtp": "1",
-                  "lgtd": 110.277328,
-                  "lttd": 30.235023
-                }
-              ]
-            },
-            {
-              "adcd": "420529202207000",
-              "adnm": "九里坪村",
-              "pcount": 734,
-              "htcount": 213,
-              "ldarea": 16.16,
-              "prevtp": "0",
-              "lgtd": 110.381023,
-              "lttd": 30.278049,
-              "children": [
-                {
-                  "adcd": "420529202207100",
-                  "adnm": "六组（黄家坳）",
-                  "pcount": 75,
-                  "htcount": 16,
-                  "ldarea": 3.95,
-                  "prevtp": "1",
-                  "lgtd": 110.377058,
-                  "lttd": 30.290256
-                },
-                {
-                  "adcd": "420529202207101",
-                  "adnm": "三组（阳坡坪）",
-                  "pcount": 123,
-                  "htcount": 29,
-                  "ldarea": 5.51,
-                  "prevtp": "2",
-                  "lgtd": 110.3784,
-                  "lttd": 30.2772
-                }
-              ]
-            },
-            {
-              "adcd": "420529202208000",
-              "adnm": "横茅湖村",
-              "pcount": 1238,
-              "htcount": 411,
-              "ldarea": 23.89,
-              "prevtp": "0",
-              "lgtd": 110.39574,
-              "lttd": 30.304549,
-              "children": [
-                {
-                  "adcd": "420529202208100",
-                  "adnm": "四组（倒洞坳）",
-                  "pcount": 82,
-                  "htcount": 16,
-                  "ldarea": 4.21,
-                  "prevtp": "2",
-                  "lgtd": 110.369113,
-                  "lttd": 30.294094
-                },
-                {
-                  "adcd": "420529202208101",
-                  "adnm": "五组（红岩沟）",
-                  "pcount": 74,
-                  "htcount": 21,
-                  "ldarea": 3.26,
-                  "prevtp": "2",
-                  "lgtd": 110.376422,
-                  "lttd": 30.305973
-                }
-              ]
-            },
-            {
-              "adcd": "420529202209000",
-              "adnm": "沙湾村",
-              "pcount": 180,
-              "htcount": 70,
-              "ldarea": 4.98,
-              "prevtp": "0",
-              "lgtd": 110.405011,
-              "lttd": 30.334473,
-              "children": []
-            }
-          ]
-        },
-        {
-          "adcd": "420529203000000",
-          "adnm": "采花乡",
-          "pcount": 27228,
-          "htcount": 8128,
-          "ldarea": 285.47,
-          "prevtp": "0",
-          "lgtd": 110.450562,
-          "lttd": 30.214214,
-          "children": [
-            {
-              "adcd": "420529203001000",
-              "adnm": "采花社区",
-              "pcount": 1323,
-              "htcount": 358,
-              "ldarea": 4.53,
-              "prevtp": "0",
-              "lgtd": 110.449803,
-              "lttd": 30.213941,
-              "children": [
-                {
-                  "adcd": "420529203001106",
-                  "adnm": "中街",
-                  "pcount": 406,
-                  "htcount": 116,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450705,
-                  "lttd": 30.214687
-                },
-                {
-                  "adcd": "420529203001107",
-                  "adnm": "下街",
-                  "pcount": 315,
-                  "htcount": 89,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.450165,
-                  "lttd": 30.216293
-                },
-                {
-                  "adcd": "420529203001108",
-                  "adnm": "上街",
-                  "pcount": 602,
-                  "htcount": 153,
-                  "ldarea": 3.51,
-                  "prevtp": "2",
-                  "lgtd": 110.445732,
-                  "lttd": 30.205698
-                }
-              ]
-            },
-            {
-              "adcd": "420529203201000",
-              "adnm": "长茂司村",
-              "pcount": 750,
-              "htcount": 231,
-              "ldarea": 13.7,
-              "prevtp": "0",
-              "lgtd": 110.452802,
-              "lttd": 30.217673,
-              "children": [
-                {
-                  "adcd": "420529203201100",
-                  "adnm": "三组（胡家台）",
-                  "pcount": 350,
-                  "htcount": 101,
-                  "ldarea": 6.53,
-                  "prevtp": "2",
-                  "lgtd": 110.452846,
-                  "lttd": 30.225834
-                },
-                {
-                  "adcd": "420529203201101",
-                  "adnm": "二组（茶丘）",
-                  "pcount": 100,
-                  "htcount": 30,
-                  "ldarea": 6.61,
-                  "prevtp": "2",
-                  "lgtd": 110.45266,
-                  "lttd": 30.218348
-                },
-                {
-                  "adcd": "420529203201102",
-                  "adnm": "一组（长茂司）",
-                  "pcount": 300,
-                  "htcount": 100,
-                  "ldarea": 6.57,
-                  "prevtp": "1",
-                  "lgtd": 110.451124,
-                  "lttd": 30.208181
-                }
-              ]
-            },
-            {
-              "adcd": "420529203202000",
-              "adnm": "黄家台村",
-              "pcount": 595,
-              "htcount": 190,
-              "ldarea": 17.75,
-              "prevtp": "0",
-              "lgtd": 110.456985,
-              "lttd": 30.238609,
-              "children": [
-                {
-                  "adcd": "420529203202100",
-                  "adnm": "四组（彭家屋场）",
-                  "pcount": 180,
-                  "htcount": 50,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.458927,
-                  "lttd": 30.237277
-                },
-                {
-                  "adcd": "420529203202101",
-                  "adnm": "二组（黄家台）",
-                  "pcount": 119,
-                  "htcount": 43,
-                  "ldarea": 6.44,
-                  "prevtp": "2",
-                  "lgtd": 110.462367,
-                  "lttd": 30.241478
-                },
-                {
-                  "adcd": "420529203202102",
-                  "adnm": "七组（白水）",
-                  "pcount": 196,
-                  "htcount": 65,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.431701,
-                  "lttd": 30.255427
-                },
-                {
-                  "adcd": "420529203202103",
-                  "adnm": "一组（小河湾）",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 6.44,
-                  "prevtp": "1",
-                  "lgtd": 110.456722,
-                  "lttd": 30.248939
-                }
-              ]
-            },
-            {
-              "adcd": "420529203203000",
-              "adnm": "白鹤村",
-              "pcount": 470,
-              "htcount": 183,
-              "ldarea": 7.57,
-              "prevtp": "0",
-              "lgtd": 110.439468,
-              "lttd": 30.196909,
-              "children": [
-                {
-                  "adcd": "420529203203101",
-                  "adnm": "三组（沙坝子）",
-                  "pcount": 160,
-                  "htcount": 55,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.439307,
-                  "lttd": 30.1976174
-                },
-                {
-                  "adcd": "420529203203102",
-                  "adnm": "二组（撒花溪）",
-                  "pcount": 210,
-                  "htcount": 83,
-                  "ldarea": 3.89,
-                  "prevtp": "2",
-                  "lgtd": 110.441227,
-                  "lttd": 30.2078615
-                },
-                {
-                  "adcd": "420529203203103",
-                  "adnm": "一组(沙坝子）",
-                  "pcount": 100,
-                  "htcount": 45,
-                  "ldarea": 3.88,
-                  "prevtp": "2",
-                  "lgtd": 110.444088,
-                  "lttd": 30.2049066
-                },
-                {
-                  "adcd": "420529203203104",
-                  "adnm": "三组（周家岭）",
-                  "pcount": 200,
-                  "htcount": 73,
-                  "ldarea": 3.9,
-                  "prevtp": "2",
-                  "lgtd": 110.441688,
-                  "lttd": 30.20215
-                }
-              ]
-            },
-            {
-              "adcd": "420529203204000",
-              "adnm": "大村",
-              "pcount": 803,
-              "htcount": 235,
-              "ldarea": 19.77,
-              "prevtp": "0",
-              "lgtd": 110.43015,
-              "lttd": 30.220485,
-              "children": [
-                {
-                  "adcd": "420529203204100",
-                  "adnm": "一组（大村）",
-                  "pcount": 238,
-                  "htcount": 70,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.427983,
-                  "lttd": 30.218539
-                },
-                {
-                  "adcd": "420529203204101",
-                  "adnm": "七组（廖叶池）",
-                  "pcount": 355,
-                  "htcount": 100,
-                  "ldarea": 8.59,
-                  "prevtp": "2",
-                  "lgtd": 110.411043,
-                  "lttd": 30.2063821
-                },
-                {
-                  "adcd": "420529203204102",
-                  "adnm": "八组",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 8.59,
-                  "prevtp": "1",
-                  "lgtd": 110.404746,
-                  "lttd": 30.2028926
-                }
-              ]
-            },
-            {
-              "adcd": "420529203205000",
-              "adnm": "万里村",
-              "pcount": 363,
-              "htcount": 125,
-              "ldarea": 25,
-              "prevtp": "0",
-              "lgtd": 110.394666,
-              "lttd": 30.195858,
-              "children": [
-                {
-                  "adcd": "420529203205100",
-                  "adnm": "三组（二龙坪）",
-                  "pcount": 100,
-                  "htcount": 31,
-                  "ldarea": 10.34,
-                  "prevtp": "2",
-                  "lgtd": 110.390243,
-                  "lttd": 30.196587
-                },
-                {
-                  "adcd": "420529203205101",
-                  "adnm": "七组（地龙坪）",
-                  "pcount": 93,
-                  "htcount": 37,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.398801,
-                  "lttd": 30.1891199
-                },
-                {
-                  "adcd": "420529203205102",
-                  "adnm": "一组",
-                  "pcount": 170,
-                  "htcount": 57,
-                  "ldarea": 10.34,
-                  "prevtp": "1",
-                  "lgtd": 110.406986,
-                  "lttd": 30.1996586
-                }
-              ]
-            },
-            {
-              "adcd": "420529203206000",
-              "adnm": "前坪村",
-              "pcount": 1272,
-              "htcount": 373,
-              "ldarea": 20.24,
-              "prevtp": "0",
-              "lgtd": 110.43581,
-              "lttd": 30.165766,
-              "children": [
-                {
-                  "adcd": "420529203206100",
-                  "adnm": "一组（苦竹园）",
-                  "pcount": 320,
-                  "htcount": 85,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423108,
-                  "lttd": 30.153465
-                },
-                {
-                  "adcd": "420529203206101",
-                  "adnm": "七组（严家河）",
-                  "pcount": 140,
-                  "htcount": 36,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423214,
-                  "lttd": 30.1728369
-                },
-                {
-                  "adcd": "420529203206102",
-                  "adnm": "二组（莫家溪）",
-                  "pcount": 322,
-                  "htcount": 89,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.419841,
-                  "lttd": 30.1590782
-                },
-                {
-                  "adcd": "420529203206103",
-                  "adnm": "六组（前坪）",
-                  "pcount": 190,
-                  "htcount": 65,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.423714,
-                  "lttd": 30.167981
-                },
-                {
-                  "adcd": "420529203206104",
-                  "adnm": "三组",
-                  "pcount": 200,
-                  "htcount": 71,
-                  "ldarea": 7,
-                  "prevtp": "0",
-                  "lgtd": 110.423373,
-                  "lttd": 30.166645
-                },
-                {
-                  "adcd": "420529203206105",
-                  "adnm": "七组（关门岩）",
-                  "pcount": 100,
-                  "htcount": 35,
-                  "ldarea": 6.45,
-                  "prevtp": "2",
-                  "lgtd": 110.424368,
-                  "lttd": 30.175888
-                }
-              ]
-            },
-            {
-              "adcd": "420529203207000",
-              "adnm": "采花台村",
-              "pcount": 835,
-              "htcount": 247,
-              "ldarea": 27.8,
-              "prevtp": "0",
-              "lgtd": 110.404831,
-              "lttd": 30.134315,
-              "children": [
-                {
-                  "adcd": "420529203207100",
-                  "adnm": "八组（堰坪）",
-                  "pcount": 115,
-                  "htcount": 32,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.387513,
-                  "lttd": 30.148693
-                },
-                {
-                  "adcd": "420529203207101",
-                  "adnm": "二组（覃家台）",
-                  "pcount": 200,
-                  "htcount": 55,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.408039,
-                  "lttd": 30.140805
-                },
-                {
-                  "adcd": "420529203207102",
-                  "adnm": "七组（堰坪）",
-                  "pcount": 90,
-                  "htcount": 35,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.391524,
-                  "lttd": 30.147526
-                },
-                {
-                  "adcd": "420529203207103",
-                  "adnm": "三组（覃家台）",
-                  "pcount": 220,
-                  "htcount": 65,
-                  "ldarea": 7.56,
-                  "prevtp": "1",
-                  "lgtd": 110.397219,
-                  "lttd": 30.127049
-                },
-                {
-                  "adcd": "420529203207104",
-                  "adnm": "一组（采花台）",
-                  "pcount": 210,
-                  "htcount": 60,
-                  "ldarea": 7.56,
-                  "prevtp": "2",
-                  "lgtd": 110.40784,
-                  "lttd": 30.133373
-                }
-              ]
-            },
-            {
-              "adcd": "420529203208000",
-              "adnm": "楠木桥村",
-              "pcount": 518,
-              "htcount": 148,
-              "ldarea": 35.4,
-              "prevtp": "0",
-              "lgtd": 110.464885,
-              "lttd": 30.173719,
-              "children": [
-                {
-                  "adcd": "420529203208100",
-                  "adnm": "一组（楠木桥）",
-                  "pcount": 305,
-                  "htcount": 88,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.464482,
-                  "lttd": 30.173049
-                },
-                {
-                  "adcd": "420529203208101",
-                  "adnm": "二组（后荒）",
-                  "pcount": 55,
-                  "htcount": 15,
-                  "ldarea": 13.8,
-                  "prevtp": "2",
-                  "lgtd": 110.453234,
-                  "lttd": 30.164536
-                },
-                {
-                  "adcd": "420529203208102",
-                  "adnm": "三组",
-                  "pcount": 158,
-                  "htcount": 45,
-                  "ldarea": 13.8,
-                  "prevtp": "1",
-                  "lgtd": 110.527918,
-                  "lttd": 30.235771
-                }
-              ]
-            },
-            {
-              "adcd": "420529203209000",
-              "adnm": "星岩坪村",
-              "pcount": 1008,
-              "htcount": 295,
-              "ldarea": 21.9,
-              "prevtp": "0",
-              "lgtd": 110.472704,
-              "lttd": 30.257124,
-              "children": [
-                {
-                  "adcd": "420529203209100",
-                  "adnm": "一组（星岩坪公社湾）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.64,
-                  "prevtp": "2",
-                  "lgtd": 110.472441,
-                  "lttd": 30.255052
-                },
-                {
-                  "adcd": "420529203209101",
-                  "adnm": "七组（三渡水）",
-                  "pcount": 210,
-                  "htcount": 65,
-                  "ldarea": 5.65,
-                  "prevtp": "1",
-                  "lgtd": 110.48657,
-                  "lttd": 30.281577
-                },
-                {
-                  "adcd": "420529203209102",
-                  "adnm": "三组（张家湾）",
-                  "pcount": 50,
-                  "htcount": 12,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.477373,
-                  "lttd": 30.269899
-                },
-                {
-                  "adcd": "420529203209103",
-                  "adnm": "白果坪",
-                  "pcount": 248,
-                  "htcount": 66,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.483562,
-                  "lttd": 30.291257
-                },
-                {
-                  "adcd": "420529203209104",
-                  "adnm": "五组",
-                  "pcount": 100,
-                  "htcount": 32,
-                  "ldarea": 5.66,
-                  "prevtp": "1",
-                  "lgtd": 110.468164,
-                  "lttd": 30.2445375
-                },
-                {
-                  "adcd": "420529203209105",
-                  "adnm": "一组（褚家台）",
-                  "pcount": 190,
-                  "htcount": 55,
-                  "ldarea": 5.65,
-                  "prevtp": "2",
-                  "lgtd": 110.472318,
-                  "lttd": 30.261083
-                }
-              ]
-            },
-            {
-              "adcd": "420529203210000",
-              "adnm": "苦竹坪村",
-              "pcount": 317,
-              "htcount": 92,
-              "ldarea": 5.1,
-              "prevtp": "0",
-              "lgtd": 110.511256,
-              "lttd": 30.267272,
-              "children": [
-                {
-                  "adcd": "420529203210100",
-                  "adnm": "八组（大沙坡）",
-                  "pcount": 222,
-                  "htcount": 65,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.514562,
-                  "lttd": 30.263478
-                },
-                {
-                  "adcd": "420529203210101",
-                  "adnm": "二组（陈家大坪）",
-                  "pcount": 50,
-                  "htcount": 15,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.515786,
-                  "lttd": 30.255662
-                },
-                {
-                  "adcd": "420529203210105",
-                  "adnm": "一组（渔泉河）",
-                  "pcount": 45,
-                  "htcount": 12,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.524606,
-                  "lttd": 30.241511
-                },
-                {
-                  "adcd": "420529203210106",
-                  "adnm": "八组（大沙坝）",
-                  "pcount": 210,
-                  "htcount": 55,
-                  "ldarea": 3.28,
-                  "prevtp": "2",
-                  "lgtd": 110.510302,
-                  "lttd": 30.269807
-                }
-              ]
-            },
-            {
-              "adcd": "420529203211000",
-              "adnm": "珍珠头村",
-              "pcount": 248,
-              "htcount": 77,
-              "ldarea": 9.71,
-              "prevtp": "0",
-              "lgtd": 110.497443,
-              "lttd": 30.272249,
-              "children": [
-                {
-                  "adcd": "420529203211100",
-                  "adnm": "一组（二叉口）",
-                  "pcount": 98,
-                  "htcount": 32,
-                  "ldarea": 6.85,
-                  "prevtp": "2",
-                  "lgtd": 110.492167,
-                  "lttd": 30.294125
-                },
-                {
-                  "adcd": "420529203211102",
-                  "adnm": "五组（马家坡）",
-                  "pcount": 150,
-                  "htcount": 45,
-                  "ldarea": 6.86,
-                  "prevtp": "2",
-                  "lgtd": 110.516365,
-                  "lttd": 30.247835
-                }
-              ]
-            },
-            {
-              "adcd": "420529203212000",
-              "adnm": "红渔坪村",
-              "pcount": 1350,
-              "htcount": 428,
-              "ldarea": 18.1,
-              "prevtp": "0",
-              "lgtd": 110.496412,
-              "lttd": 30.222253,
-              "children": [
-                {
-                  "adcd": "420529203212100",
-                  "adnm": "二组（红渔坪）",
-                  "pcount": 340,
-                  "htcount": 108,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.494381,
-                  "lttd": 30.2221248
-                },
-                {
-                  "adcd": "420529203212101",
-                  "adnm": "四组（阳坡）",
-                  "pcount": 480,
-                  "htcount": 146,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.496759,
-                  "lttd": 30.228309
-                },
-                {
-                  "adcd": "420529203212102",
-                  "adnm": "三组",
-                  "pcount": 330,
-                  "htcount": 106,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.501227,
-                  "lttd": 30.22803
-                },
-                {
-                  "adcd": "420529203212103",
-                  "adnm": "五组（楠木）",
-                  "pcount": 200,
-                  "htcount": 68,
-                  "ldarea": 6.52,
-                  "prevtp": "2",
-                  "lgtd": 110.516091,
-                  "lttd": 30.2269493
-                }
-              ]
-            },
-            {
-              "adcd": "420529203213000",
-              "adnm": "白溢坪村",
-              "pcount": 547,
-              "htcount": 169,
-              "ldarea": 19,
-              "prevtp": "0",
-              "lgtd": 110.556215,
-              "lttd": 30.248125,
-              "children": [
-                {
-                  "adcd": "420529203213100",
-                  "adnm": "二组（湖坪）",
-                  "pcount": 237,
-                  "htcount": 70,
-                  "ldarea": 6.75,
-                  "prevtp": "2",
-                  "lgtd": 110.542872,
-                  "lttd": 30.2415706
-                },
-                {
-                  "adcd": "420529203213101",
-                  "adnm": "三组（湖坪）",
-                  "pcount": 132,
-                  "htcount": 42,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.545592,
-                  "lttd": 30.2411432
-                },
-                {
-                  "adcd": "420529203213102",
-                  "adnm": "七组（白溢坪）",
-                  "pcount": 108,
-                  "htcount": 32,
-                  "ldarea": 4.75,
-                  "prevtp": "0",
-                  "lgtd": 110.552356,
-                  "lttd": 30.2441797
-                },
-                {
-                  "adcd": "420529203213103",
-                  "adnm": "一组",
-                  "pcount": 70,
-                  "htcount": 25,
-                  "ldarea": 6.75,
-                  "prevtp": "1",
-                  "lgtd": 110.528468,
-                  "lttd": 30.236548
-                }
-              ]
-            },
-            {
-              "adcd": "420529203214000",
-              "adnm": "宋家河村",
-              "pcount": 1023,
-              "htcount": 385,
-              "ldarea": 30.2,
-              "prevtp": "0",
-              "lgtd": 110.557717,
-              "lttd": 30.188565,
-              "children": [
-                {
-                  "adcd": "420529203214100",
-                  "adnm": "二组（宋家河）",
-                  "pcount": 182,
-                  "htcount": 120,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.558747,
-                  "lttd": 30.187884
-                },
-                {
-                  "adcd": "420529203214101",
-                  "adnm": "六组（唐家河）",
-                  "pcount": 139,
-                  "htcount": 45,
-                  "ldarea": 9.55,
-                  "prevtp": "1",
-                  "lgtd": 110.557433,
-                  "lttd": 30.204571
-                },
-                {
-                  "adcd": "420529203214102",
-                  "adnm": "七组（甘沟河）",
-                  "pcount": 486,
-                  "htcount": 150,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.545536,
-                  "lttd": 30.2194051
-                },
-                {
-                  "adcd": "420529203214103",
-                  "adnm": "五组（云山）",
-                  "pcount": 216,
-                  "htcount": 70,
-                  "ldarea": 9.55,
-                  "prevtp": "2",
-                  "lgtd": 110.533849,
-                  "lttd": 30.1901553
-                }
-              ]
-            },
-            {
-              "adcd": "420529203215000",
-              "adnm": "栗子坪村",
-              "pcount": 951,
-              "htcount": 267,
-              "ldarea": 9.7,
-              "prevtp": "0",
-              "lgtd": 110.570566,
-              "lttd": 30.162327,
-              "children": []
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  waterList: [
-    {
-      "wscd": "11",
-      "wsnm": "百溪河"
-    },
-    {
-      "wscd": "61",
-      "wsnm": "沽洞溪"
-    },
-    {
-      "wscd": "71",
-      "wsnm": "二汊口河"
-    },
-    {
-      "wscd": "FA85W508610420000",
-      "wsnm": "泗洋河"
-    },
-    {
-      "wscd": "FA85X808780420000",
-      "wsnm": "天池河"
-    },
-    {
-      "wscd": "FF148801360420000",
-      "wsnm": "南河"
-    },
-    {
-      "wscd": "HBWS000000002",
-      "wsnm": "湾潭河"
-    },
-    {
-      "wscd": "HBWS000000003",
-      "wsnm": "渔阳河"
-    }
-  ],
-  tableData: [
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-    {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    }, {
-      name: "鸡鸣坝雨量站",
-      sumDrp: "61.5",
-      adnm: "高乐山镇",
-      wsnm: "唐崖河"
-    },
-  ]
-}
diff --git a/src/views/ysgzq/ssyq/tjfx/index.js b/src/views/ysgzq/ssyq/tjfx/index.js
deleted file mode 100644
index 8ef54af..0000000
--- a/src/views/ysgzq/ssyq/tjfx/index.js
+++ /dev/null
@@ -1,275 +0,0 @@
-import "./index.less"
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import Toolbar from './toolbar'
-import {Switch, Card, Tabs} from 'antd';
-import {useDispatch, useSelector} from "react-redux";
-import { Vector as VectorSource } from 'ol/source'
-import VectorLayer from 'ol/layer/Vector'
-import Style from 'ol/style/Style'
-import Icon from 'ol/style/Icon'
-import Text from 'ol/style/Text'
-import Feature from 'ol/Feature'
-import Point from 'ol/geom/Point.js'
-import Circle from 'ol/style/Circle'
-import Stroke from 'ol/style/Stroke'
-import FillStyle from 'ol/style/Fill'
-import { transform } from 'ol/proj';
-import data from './dataConfig'
-import Ljtj from '../ljtj'
-import Pltj from '../pltj'
-import Lyjy from '../lyjy'
-import Qyjy from '../qyjy'
-import Kqjy from '../kqjy'
-import moment from "moment";
-import {adcd,bas,freq,level,res} from "../../../../service/ssyq";
-
-const Page = () => {
-  const layerVisible = useSelector((s) => s.map.layerVisible);
-  const dispatch = useDispatch();
-  const [dataQyjy, setDataQujy] = useState([])
-  const [dataLyjy, setDataLyjy] = useState([])
-  const [dataPltj, setDataPltj] = useState([])
-  const [dataLjtj, setDataLjtj] = useState([])
-  const [dataKqjy, setDataKqjy] = useState([])
-  const [params, setParams] = useState({})
-  let mapObj = useSelector(s => s.map.map)
-
-  const doSearch = (params) => {
-    setParams(params)
-    getData(params)
-  };
-
-  const getData = async (params) => {
-    setDataQujy(await adcd(params))
-    setDataLyjy(await bas(params))
-    setDataPltj(await freq(params))
-    setDataLjtj(await level(params))
-    setDataKqjy(await res(params))
-  }
-
-  useEffect(()=>{
-    if(dataQyjy.length>0){
-      const list = []
-
-      dataQyjy.map((item1)=>{
-        if(item1.children?.length>0){
-          item1.children.map((item2)=>{
-            list.push(item2)
-          })
-        }
-      })
-      addLayer(list)
-    }
-
-    return ()=>{
-      dispatch.runtime.closeFeaturePopAll()
-      mapObj && mapObj
-        .getLayers()
-        .getArray()
-        .forEach(layer => {
-          if (
-            layer.values_.name &&
-            (layer.values_.name.indexOf('YSGZQ_SSYQ_JYXX') > -1)
-          ) {
-            layer.getSource().clear()
-          }
-        })
-    }
-  },[dataQyjy])
-
-  const getColor = (val)=>{
-    if(val===null){
-      return '#8c8c8c'
-    }else if(val<0.1){
-        return '#ffffff'
-    }else if(val>=0.1 && val<10){
-        return 'rgb(167, 240, 143)';
-    }else if(val>=10 && val<25){
-        return 'rgb(64, 215, 255)';
-    }else if(val>=25 && val<50){
-        return 'rgb(32, 143, 238)';
-    }else if(val>=50 && val<100){
-        return 'rgb(85, 86, 255)';
-    }else if(val>=100 && val<250){
-        return 'rgb(191, 90, 252)';
-    }else{
-        return 'rgb(246, 66, 66)';
-    }
-}
-
-const addLayer = (arr)=>{
-
-  var layer = new VectorLayer({
-    // @ts-ignore
-    name:"YSGZQ_SSYQ_JYXX",
-    source: new VectorSource(),
-    style: (feature,zIndex) =>{
-      const drp = feature.values_.data.drp
-      const stnm = feature.values_.data.stnm
-        return [new Style({
-          image: new Circle({
-            radius: 5,
-            fill: new FillStyle({ color: getColor(drp) }),
-            stroke: new Stroke({ color: getColor(drp), width: 2 })
-          }),
-          text: new Text({
-            text: zIndex<50?`${stnm}`:'',
-            offsetY: 24,
-            font: '12px 微软雅黑',
-            //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-            fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-            stroke: new Stroke({ color: '#fff', width: 1 }),
-            overflow: true,
-          }),
-          zIndex: drp===0?0.01:drp*10
-        })]
-      },
-      zIndex:200,
-  })
-
-  var layerDrp = new VectorLayer({
-    // @ts-ignore
-    name:"YSGZQ_SSYQ_JYXX_DRP",
-    visible:layerVisible['jcsjLayer'],
-    source: new VectorSource(),
-    style: (feature,zIndex) =>{
-      const drp = feature.values_.data.drp
-        return [new Style({
-          text: new Text({
-            text: drp===null?'-':String(drp),
-            offsetY: 12,
-            font: '12px 微软雅黑',
-            //backgroundFill: new FillStyle({ color: "rgba(255,255,255,0.5)" }),
-            fill: new FillStyle({ color: "rgba(0,0,0,0.5)"  }),
-            stroke: new Stroke({ color: '#fff', width: 1 }),
-            overflow: true,
-          })
-        })]
-      },
-      zIndex:200,
-  })
-
-
-
-  const features = arr.map((item)=>{
-    const point2 = transform([item.lgtd, item.lttd], 'EPSG:4326', 'EPSG:3857');
-    const feature = new Feature({
-      geometry: new Point(point2),
-      data:{...item,myParams:params}
-    });
-
-    return feature
-  })
-  features.forEach(feature => layer.getSource().addFeature(feature));
-  features.forEach(feature => layerDrp.getSource().addFeature(feature));
-  mapObj && mapObj.addLayer(layer);
-  mapObj && mapObj.addLayer(layerDrp);
-  
-  mapObj && mapObj.on('click', function(evt) {
-
-    //console.log("271++++",postmessageData);
-
-    var feature = mapObj && mapObj.forEachFeatureAtPixel(evt.pixel, function(feature) {
-      return feature;
-    });
-    if (feature) {
-      const data = feature.values_.data
-      if(data){
-        dispatch.runtime.setFeaturePop({
-          id: data.stcd,
-          data:{...data,myParams:params},
-          type: 'drp',
-          lgtd: data.lgtd,
-          lttd: data.lttd,
-        })
-      }
-    }
-  });
-}
-
-
-
-  // 获取当前时间
-  const currentTime = moment();
-
-  // 设置早上八点的时间
-  const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0});
-  useEffect(() => {
-    let option = "";
-    // 比较当前时间和早上八点
-    if (currentTime.isBefore(eightAM)) {
-      option = {
-        source: ["SH", "SW", "QX", "SK"],
-        stm: moment().subtract(2, 'days').startOf('day').set({hour: 8, minute: 0}).format("YYYY-MM-DD HH:mm"),
-        etm: moment().subtract(1, 'days').startOf('day').set({hour: 8, minute: 0}).format("YYYY-MM-DD HH:mm"),
-        tm: [moment().subtract(2, 'days').startOf('day').set({
-          hour: 8,
-          minute: 0
-        }), moment().subtract(1, 'days').startOf('day').set({hour: 8, minute: 0})],
-      }
-    } else {
-      option = {
-        source: ["SH", "SW", "QX", "SK"],
-        stm: moment().subtract(1, 'days').startOf('day').set({hour: 8, minute: 0}).format("YYYY-MM-DD HH:mm"),
-        etm: moment().startOf('day').set({hour: 8, minute: 0}).format("YYYY-MM-DD HH:mm"),
-        tm: [moment().subtract(1, 'days').startOf('day').set({
-          hour: 8,
-          minute: 0
-        }), moment().startOf('day').set({hour: 8, minute: 0})],
-      }
-    }
-    setParams(option)
-    getData(option)
-
-  }, [])
-  console.log(dataPltj);
-  return (
-    <div className="monitor-rainfall waterLevelBox">
-      <div style={{position:'absolute',top:0, left:'calc(100vw - 620px)', width:'300px'}}>
-        <Switch 
-          size='default' 
-          checkedChildren="监测数据" 
-          unCheckedChildren="监测数据" 
-          style={{marginRight:'20px'}}
-          onChange={(e)=>{
-            mapObj && mapObj.getLayers().getArray().forEach(layer => {
-              if (layer.values_.name && layer.values_.name === 'YSGZQ_SSYQ_JYXX_DRP') {
-                layer.setVisible(e)
-              }
-            })
-            dispatch.map.setLayerVisible({'jcsjLayer':e});
-          }} 
-          value={layerVisible['jcsjLayer']} 
-          defaultChecked={layerVisible['jcsjLayer']}
-        />
-      </div>
-
-      <div style={{margin: "0 0 0 6px"}} className="topQuery">
-        <Toolbar params={params} doSearch={doSearch}/>
-      </div>
-      <Tabs>
-        <Tabs.TabPane tab="区域降雨" key="item-1">
-          <Qyjy data={dataQyjy} params={params}/>
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="库区降雨" key="item-2">
-          <Kqjy data={dataKqjy} params={params}/>
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="流域降雨" key="item-3">
-          <Lyjy data={dataLyjy}  params={params}/>
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="频率统计" key="item-4">
-          <Pltj data={dataPltj} params={params}/>
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="量级统计" key="item-5">
-          <Ljtj data={dataLjtj} params={params}/>
-        </Tabs.TabPane>
-
-
-      </Tabs>
-
-
-    </div>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/ssyq/tjfx/index.less b/src/views/ysgzq/ssyq/tjfx/index.less
deleted file mode 100644
index 6df28ed..0000000
--- a/src/views/ysgzq/ssyq/tjfx/index.less
+++ /dev/null
@@ -1,38 +0,0 @@
-.waterLevelBox{
-  height:100%;
-  .smallTable{
-    //height: 23vh;
-    height:calc( 100% - 190px );
-  }
-}
-
-.subTitle{
-  position: relative;
-  padding-left:8px;
-  margin: 0 0 10px 10px;
-  font-weight:bold;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #eee;
-  &:after{
-    content: "";
-    display: block;
-    position: absolute;
-    width: 3px;
-    height: 16px;
-    background: #0068F4;
-    left: -2px;
-    top: 5px;
-    border-radius: 4px;
-  }
-}
-
-.summary{
-  display: flex;
-  justify-content: space-between;
-  text-align: center;
-  .sum-count{
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/ssyq/tjfx/toolbar.js b/src/views/ysgzq/ssyq/tjfx/toolbar.js
deleted file mode 100644
index 4de2930..0000000
--- a/src/views/ysgzq/ssyq/tjfx/toolbar.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {Form, Button, DatePicker, Checkbox, TreeSelect, Select} from 'antd';
-import {basNameList, adnmList} from '../../../../service/ssyq'
-import moment from 'moment';
-import { FileTextOutlined } from '@ant-design/icons';
-const CheckboxGroup = Checkbox.Group;
-const {RangePicker} = DatePicker;
-
-const ToolBar = ({doSearch,params}) => {
-  const [form] = Form.useForm();
-  const [lyList, setLylist] = useState([])
-  const [zqList, setZqList] = useState([])
-  const [showIcon, setShowIcon] = useState(false)
-  const [disabledObject, setDisabledObject] = useState({basCode:"11",adcd:"11"})
-
-  const onSearchClick = (val) => {
-    const {...rec} = form.getFieldsValue();
-    rec.stm = rec.tm[0].format('YYYY-MM-DD HH:mm');
-    rec.etm = rec.tm[1].format('YYYY-MM-DD HH:mm');
-    doSearch(rec);
-  }
-
-  const getData = async () => {
-    setLylist(await basNameList())
-    setZqList(await adnmList())
-  }
-
-   /**
-  * 
-  * @param {Object} changedValues 改变的某个字表单的值
-  * @description 某个表单值发生改变引起的表单的变化
-  */
-   const handleFormChange = (changedValues, allValues) => {
-    if (!changedValues.adcd && !changedValues.basCode) {
-      setDisabledObject({basCode:"11",adcd:"11"})
-    } else {
-      setDisabledObject(changedValues)
-    }
-  };
-  const selectTime = (params)=>{
-    let tmValue=[]
-    if(params === 1){
-      tmValue=[moment()
-            .subtract(1, 'days')
-            .startOf('day')
-            .set({ hour: 8, minute: 0 }),
-            moment()
-            ]
-    }else if(params ===2){
-      tmValue=[moment()
-        .startOf('day')
-        .set({ hour: 8, minute: 0 }),
-        moment()
-        ]
-    }else if(params ===3){
-      tmValue=[moment()
-        .subtract(1, 'days')
-        .startOf('day')
-        .set({ hour: 8, minute: 0 }),
-        moment()
-        .startOf('day')
-        .set({ hour: 8, minute: 0 })
-        ]
-    }else if(params ===4){
-      tmValue=[moment().subtract(1, 'hours'),
-        moment()
-        ]
-    }else if(params ===5){
-      tmValue=[moment().subtract(3, 'hours'),
-        moment()
-        ]
-    }else if(params ===6){
-      tmValue=[moment().subtract(6, 'hours'),
-        moment()
-        ]
-    }else if(params ===7){
-      tmValue=[moment().subtract(12, 'hours'),
-        moment()
-        ]
-    }else if(params ===8){
-      tmValue=[moment().subtract(24, 'hours'),
-        moment()
-        ]
-    }
-    form.setFieldsValue({...params,tm:tmValue})
-    onSearchClick()
-  }
-  useEffect(() => {
-    getData()
-    form.setFieldsValue(params);
-  }, [params])
-
-  const typeOptions = [
-    {label: "山洪", value: "SH"},
-    {label: "水文", value: "SW"},
-    {label: "气象", value: "QX"},
-    {label: "水库", value: "SK"},
-  ];
-
-  const selectList=[
-    {key:'昨天08:00~当前时间',value:1},
-    {key:'今天08:00~当前时间',value:2},
-    {key:'昨天08:00~今天08:00',value:3},
-    {key:'最近1小时',value:4},
-    {key:'最近3小时',value:5},
-    {key:'最近6小时',value:6},
-    {key:'最近12小时',value:7},
-    {key:'最近24小时',value:8},
-  ]
-  return (
-    <>
-      <div style={{display: 'flex', justifyContent: 'space-between',position:'relative'}}>
-        <Form
-          form={form}
-          className='toolbarBox'
-          onValuesChange={handleFormChange}
-        >
-          <Form.Item label="类型" name="source" style={{margin: "0 0 8px 0"}}>
-            <CheckboxGroup options={typeOptions} onChange={onSearchClick}/>
-          </Form.Item>
-          <Form.Item label="时段选择" name="tm" style={{margin: "0 0 8px 0"}}>
-            <RangePicker showTime style={{width: "330px"}}
-                         onChange={onSearchClick}
-                         format="YYYY-MM-DD HH:mm"
-            />
-          </Form.Item>
-          <Form.Item
-            label="流域选择"
-            name="basCode"
-            style={{ margin: "0 0 8px 0" }}
-            dependencies={["adcd"]}
-          >
-            <Select
-              allowClear
-              placeholder="请选择"
-              onChange={onSearchClick}
-              disabled={disabledObject.basCode ? false : true}
-            >
-              {
-                lyList.map(o => <Select.Option key={o.basCode} value={o.basCode}>{o.basName}</Select.Option>)
-              }
-            </Select>
-          </Form.Item>
-          <Form.Item
-            label="政区选择"
-            name="adcd"
-            style={{ margin: "0 0 8px 0" }}
-            dependencies={["basCode"]}
-          >
-            <Select
-              allowClear
-              placeholder="请选择"
-              onChange={onSearchClick}
-              disabled={disabledObject.adcd ? false : true}
-            >
-              {
-                zqList.map(o => <Select.Option key={o.adcd} value={o.adcd}>{o.adnm}</Select.Option>)
-              }
-            </Select>
-          </Form.Item>
-        </Form>
-        <div style={{display:'flex',justifyContent:'end',position:'absolute',right: 0,
-    top: 58}}
-          onClick={()=>{
-            setShowIcon(!showIcon)
-          }}
-          >
-            <FileTextOutlined style={{fontSize:24,color:'skyblue'}}/>
-             {showIcon &&<div className='selecItem' style={{position:'absolute',zIndex:2,width:200,top:30,right:-10,backgroundColor:'#fff',border:'1px solid #f0f0f0',padding:'5px 10px'}}>
-              {selectList.map((item)=>{
-                return <div style={{cursor:'pointer'}} onClick={()=>selectTime(item.value)}>{item.key}</div>
-              })}
-              </div>}
-          </div>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/ysgzq/sszq/form.js b/src/views/ysgzq/sszq/form.js
deleted file mode 100644
index 8d61ee0..0000000
--- a/src/views/ysgzq/sszq/form.js
+++ /dev/null
@@ -1,260 +0,0 @@
-import React,{useEffect,useState} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Select,Image } from 'antd';
-import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined } from '@ant-design/icons';
-import "./index.less"
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const options = [
-    {
-    label: '一般灾情 ',
-    value: 1
-    },
-    {
-      label: '较大灾情 ',
-      value: 2
-    }
-    ,
-    {
-      label: '重大灾情 ',
-      value: 3
-    }
-    ,
-    {
-      label: '特别重大灾情 ',
-      value: 4
-    }
-  ]
-  const [form] = Form.useForm();
-  const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-  useEffect(() => {
-    let initalParams = {
-      ...record,
-      severity: options.find(item => item.value == record.severity).label,
-   }
-   form.setFieldsValue(initalParams)
-  }, [record])
-  
-  return (
-    <>
-    <Form form={form}>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="灾害发生时间"
-                name="otime"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="严重程度"
-                name="severity"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="灾害发生地点"
-                name="address"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-                rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={6}>
-              <Form.Item
-                label="经度"
-                name="lgtd"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-                // rules={[{ required: true }]}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={6}>
-              <Form.Item
-                label="纬度"
-                name="lttd"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label="灾情描述"
-                name="ddscrib"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 21 }}
-                rules={[{ required: true }]}
-              >
-                <Input.TextArea disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="伤亡人数"
-                name="dpcount"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-                <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="失踪人数"
-                name="mpcount"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-              <Form.Item
-                label="转移人数"
-                name="spcount"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-            
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="损毁房屋(间)"
-                name="chcount"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-              <Form.Item
-                label="直接经济损失(万元)"
-                name="elose"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-            
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="过程降雨量(mm)"
-                name="pfrain"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-              <Form.Item
-                label="其他情况说明"
-                name="remark"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 21 }}
-              >
-                <Input.TextArea disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-        </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报人"
-                name="reporter"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-            
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="上报单位"
-                name="reportUnit"
-                labelCol={{ span: 7 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={12}>
-              <Form.Item
-                label="上报时间"
-                name="reportTime"
-                labelCol={{ span: 6 }}
-                wrapperCol={{ span: 17 }}
-              >
-              <Input disabled style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-        <Row gutter={[16]}>
-          <div style={{marginLeft:81}}>附件：</div>
-              {
-                 record?.fileList.length > 0 && record?.fileList.map(file => {
-                  return (
-                      <Col span={10}>
-                        <div className='file-item'>
-                          <div className='file-description'>
-                          {file.fileName.indexOf('.docx') > -1 ? <FileWordOutlined  style={{fontSize:40}}/> :
-                            file.fileName.indexOf('.pdf') > -1 ? <FilePdfOutlined /> : 
-                              file.fileName.indexOf('.zip') > -1 ? <FileZipOutlined /> :
-                            <Image src={ url +file?.filePath} alt='' />
-                            }
-                             <span
-                            style={
-                              {
-                                display: "inline-block",
-                                width: "230px",
-                                textOverflow: "ellipsis",
-                                overflow: "hidden",
-                                whiteSpace: "nowrap"
-                              }}>{file.fileName}</span>
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-              }
-
-              </Row>
-    </Form>
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/ysgzq/sszq/index.js b/src/views/ysgzq/sszq/index.js
deleted file mode 100644
index 621f7c4..0000000
--- a/src/views/ysgzq/sszq/index.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Table, Card, Button, message, Tabs } from 'antd';
-import {useDispatch,useSelector} from "react-redux";
-import ModalForm from './form';
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-
-const Page = () => {
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState({ projectName: '' })
-  const [tab, setTab] = useState(0)  // 0未读  1已读
-  const toolBarRef = useRef();
-  const dispatch = useDispatch();
-  const columns = [
-    {
-      title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center",
-      render: (_, record, index) => index + 1
-    },
-    { title: '灾害发生时间', key: 'otime', dataIndex: 'otime', width: 200 },
-    { title: '灾害发生地点', key: 'address', dataIndex: 'address', width: 200 },
-    {
-      title: '严重程度', key: 'severity', dataIndex: 'severity', width: 120,
-      render: (_, record) => {
-        return <span>{
-          record?.severity == 1 ? "一般灾情" : 
-            record?.severity == 2 ? "较大灾情" : 
-              record?.severity == 3 ? "重大灾情" : 
-                record?.severity == 4? "特别重大灾情" : ""
-          }</span>
-      }
-    },
-    {
-      title: '灾情描述', key: 'ddscrib', dataIndex: 'ddscrib', width: 280,
-      render: (_, record) => {
-        return (
-          <div
-            title={record?.ddscrib}
-            style={
-              {
-              width:"100%",
-              wordBreak: 'break-all',
-              overflow: 'hidden',
-              textOverflow: 'ellipsis',
-              whiteSpace: 'nowrap'
-              }
-            }
-          >{record?.ddscrib}</div>
-          
-        )
-      }
-    },
-    { title: '伤亡人数', key: 'dpcount', dataIndex: 'dpcount', width: 200 },
-    { title: '失踪人数', key: 'mpcount', dataIndex: 'mpcount', width: 200 },
-    { title: '转移人数', key: 'mpcount', dataIndex: 'mpcount', width: 200 },
-    { title: '上报人', key: 'reporter', dataIndex: 'reporter', width: 200 },
-    { title: '上报时间', key: 'reportTime', dataIndex: 'reportTime', width: 200 },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text  view={true} command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.ysgzq.sszq.page).find_noCode, {});
-  
-  
-  const command = (type) => (params) => {
-    createCrudService(apiurl.ysgzq.sszq.getFile)
-    .delGet({mtcd:params.mtcd})
-    .then(res => {
-      if (res.code == 200) {
-        refModal.current.showView({ ...params, fileList: res.data });
-        if (tab == 0) {
-         refresh();
-       }
-      }
-  })
-  }
-  const getReadStatus = () => {
-    createCrudService(apiurl.ssyq.status).delGet().then((res) => {
-      if (res.code === 200) {
-        dispatch.runtime.setIsReadObject(res.data)
-      }
-    })
-  }
-  /**
-   * @description 全部标记为已读
-   */
-  const allReadChange = () => {
-    createCrudService(apiurl.ysgzq.sszq.allRead).save().then(res => {
-      if (res.code === 200) {
-        refresh();
-        getReadStatus()
-      }
-    })
-  }
-  /**
-   * @description 渲染每一个tab
-   */
-  const renderTab = () => {
-    return [
-      {
-        key: 0,
-        label: '未读',
-        children:
-          <Table
-            columns={columns}
-            rowKey="inx"
-            {...tableProps}
-            scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-      },
-      {
-        key: 1,
-        label: '已读',
-        children:
-        <Table
-          columns={columns}
-          rowKey="inx"
-          {...tableProps}
-          scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-      },
-    ];
-  };
-  /**
-   * @description 点击tab切换
-   */
-  useEffect(() => {
-    if (searchVal) {
-      let params = {
-        search: {
-          ...searchVal,
-          projectName:searchVal.projectName || undefined,
-          isRead:tab
-          }
-        };
-      search(params)
-    }
-  }, [searchVal, tab])
-  useEffect(() => {
-    let data = tableProps.dataSource;
-    if (data?.length) {
-      getReadStatus()
-   }  
-  }, [tableProps])
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{width:"100%"}}>
-            <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              ref={toolBarRef}
-              setTab={setTab}
-              allReadChange={allReadChange}
-            />
-            </Card>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Tabs
-              defaultActiveKey="1"
-              onChange={(v) => setTab(v)}
-              items={renderTab()}
-            />
-          </div>
-        </div>
-
-        <BasicCrudModal
-          width={1000}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/ysgzq/sszq/index.less b/src/views/ysgzq/sszq/index.less
deleted file mode 100644
index 35237c4..0000000
--- a/src/views/ysgzq/sszq/index.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.ant-upload-list {
-    display: none !important;
-  }
-.file-item{
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-    align-items: center;
-    border: 1px solid #dedede;
-    justify-content: space-between;
-    padding: 1%;
-    .file-description{
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-        img{
-            width: 40px;
-            height: 40px;
-            // margin-right: 10px;
-        }
-    }
-    .delete-icon{
-        // margin-left: 1%;
-        cursor: pointer;
-    }
-}
-.view-file{
-    margin-left: 12% ;
-}
-.upload-file{
-    margin-left: 92%;
-}
-.disable-icon{
-    pointer-events: none;
-    cursor: not-allowed !important;
-}
\ No newline at end of file
diff --git a/src/views/ysgzq/sszq/toolbar.js b/src/views/ysgzq/sszq/toolbar.js
deleted file mode 100644
index 063028e..0000000
--- a/src/views/ysgzq/sszq/toolbar.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { forwardRef, useImperativeHandle } from 'react';
-import { Form,Button, DatePicker } from 'antd';
-import moment from 'moment';
-import NormalSelect from '../../../components/Form/NormalSelect';
-const ToolBar = forwardRef(({ setSearchVal, allReadChange,setTab },ref) => {
-  const [form] = Form.useForm();
-  const { RangePicker } = DatePicker;
-  const source = [
-    {
-    label: '一般险情 ',
-    value: 1
-    },
-    {
-      label: '较大险情 ',
-      value: 2
-    }
-    ,
-    {
-      label: '重大险情 ',
-      value: 3
-    }
-    ,
-    {
-      label: '特别重大险情 ',
-      value: 4
-    }
-  ]
-  useImperativeHandle(ref, () => ({
-    reset: () => {
-      form.resetFields();
-    }
-  }))
-
-  /**
-   * @description 表单提交
-   */
-  const onFinish = (values) => {
-     let timeSo;
-    if (values.tm) {
-      timeSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, timeSo});
-  };
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form
-          className='toolbarBox'
-          layout="inline"
-          onFinish={onFinish}
-          form={form}
-        >
-          <Form.Item label="严重程度" name="severity">
-            <NormalSelect options={source} style={{ width: '180px' }} />
-          </Form.Item>
-          <Form.Item label="上报时间" name="tm">
-            <RangePicker
-              allowClear
-              showTime
-              style={{ width: "250px" }}
-              format="YYYY-MM-DD HH:mm:ss"
-            />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button onClick={() => form.resetFields()}>重置</Button>
-          </Form.Item>
-          <Form.Item>
-            <Button onClick={() => {allReadChange()}}>全部标记为已读</Button>
-          </Form.Item>
-        </Form>
-      </div>
-    </>
-  );
-})
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/zbgl/zbb/form.js b/src/views/zbgl/zbb/form.js
deleted file mode 100644
index 68b45e5..0000000
--- a/src/views/zbgl/zbb/form.js
+++ /dev/null
@@ -1,303 +0,0 @@
-import React,{useEffect,useMemo,useState} from 'react';
-import { Form, Button, Row, Col, Divider, message,TreeSelect } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import { createCrudService } from '../../../components/crud/_';
-import { getDictService,getDutyTypeService } from '../../../service/SelectValue'
-import apiurl from '../../../service/apiurl';
-import NormalSelect from '../../../components/Form/NormalSelect'
-import { disable } from 'ol/rotationconstraint';
-import { httpget2,xyt_httpget2 } from '../../../utils/request';
-
-const ModalForm = ({ mode, record,onEdit,onSave,close,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const treeData = [
-    {
-      value: 'parent 1',
-      title: 'parent 1',
-      disable:true,
-      children: [
-        {
-          value: 'parent 1-0',
-          title: 'parent 1-0',
-          disable:true,
-          children: [
-            {
-              value: 'leaf1',
-              title: 'leaf1',
-              disable:false,
-              children:[]
-            },
-            {
-              value: 'leaf2',
-              title: 'leaf2',
-              disable:false,
-              children:[]
-            },
-          ],
-        },
-        {
-          value: 'parent 1-1',
-          title: 'parent 1-1',
-          children: [
-            {
-              value: 'leaf3',
-              title: (
-                <b
-                  style={{
-                    color: '#08c',
-                  }}
-                >
-                  leaf3
-                </b>
-              ),
-              children:[]
-            },
-          ],
-        },
-      ],
-    },
-  ];
-  console.log(record);
-  const [value, setValue] = useState({});
-  const [isHoliday, setIsHoliday] = useState(0)
-  const [deptList, setDeptList] = useState([])
-  const [deptUserList, setDeptUserList] = useState([])
-  /**
-   * @description 表单重置
-   */
-  const onReset = () => {
-    form.resetFields();
-  };
-  const onFinish = (values) => {
-    let params = {
-      isHoliday,
-      rotaDate: record.time,
-      userDtoList:Object.keys(values).map(item => ({
-        rotaType: item == "1" ? 1 :
-          item == "2" ? 2 :
-            item == "3" ? 3 : 4,
-        userId : values[item]
-      }))
-    }
-    if (mode == "save") {
-      onSave(apiurl.fxzb.zbb.edit,params)
-    }
-    if (mode == "edit") {
-      onEdit(apiurl.fxzb.zbb.edit,params)
-    }
-  }
-
-  /**
-   * @description 设置放假日
-   */
-  
-  const handleHoliday = () => {
-    setIsHoliday(1)
-    form.submit()
-  }
-
-  // 获取部门数据
-  const getDeptList = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist);
-      if (result.code == 200) {
-        setDeptList(result.data);
-        getDeptUser()
-      }
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  // 获取部门人员数据
-  const getDeptUser = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:999});
-      if (result.code == 200) {
-        setDeptUserList(result.rows)
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-
-  const buildTree = (data, parentId) => {
-    let tree = [];
-    data.forEach((node) => {
-        node.title = node.deptName;
-        node.key = node.deptId;
-        
-        if (node.parentId === parentId) {
-        let children = buildTree(data, node.deptId);
-        if (children.length) {
-            node.children = children;
-        }
-        tree.push(node);
-        }
-    });
-    return tree;
-}
-  const handleTreeList = (dept, user) => {
-    const deptArr = dept.map(item => {
-      return {
-        ...item,
-        value: item.deptId,
-        title: item.deptName,
-        disabled: item.userId ? false : true,
-        children: user.filter(u => u.deptId == item.deptId).map(u => ({
-          ...u,
-          value: u.userId,
-          title: u.nickName
-        }))
-      }
-    }) 
-    console.log("deptArr",deptArr);
-    const treelist = buildTree(deptArr,0)
-    return treelist
-  }
-  const treeList = useMemo(() => {
-    if (deptUserList?.length > 0 && deptList?.length > 0) {
-        return handleTreeList(deptList,deptUserList)
-    } else {
-      return []
-    }
-  },[deptUserList,deptList])
-  useEffect(() => {
-    if (mode == "edit") {
-      let initialValues = {
-        "1": record.shiftLeader.userId,
-        "2": record.dutyLeader.userId,
-      }
-      console.log(initialValues);
-      form.setFieldsValue(initialValues);
-    }
-  }, [record])
-  
-useEffect(() => {
-  getDeptList()
-  // getDeptUser()
-}, [])
-
-  return (
-    <Form form={form} {...formItemLayout} onFinish={onFinish} >
-      <Row>
-        <Col span={24}>
-            <Form.Item
-              label="带班领导"
-              name="1"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-                   treeData={treeList}
-                   treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      <Row>
-        <Col span={24}>
-            <Form.Item
-              label="值班人员"
-              name="2"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   value="leaf3"
-                   treeDefaultExpandAll
-              treeData={treeList}
-              treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      {/* <Row>
-        <Col span={24}>
-            <Form.Item
-              label="白班"
-              name="3"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-              treeData={record.tree}
-              treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      <Row>
-        <Col span={24}>
-            <Form.Item
-              label="晚班"
-              name="4"
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-              treeData={record.tree}
-              treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row> */}
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item wrapperCol={{ span: 15, offset: 9 }}>
-              <Button
-                type='primary'
-                onClick={handleHoliday}
-                style={{ marginRight: 10 }}>
-              设为放假日
-            </Button>
-            <Button onClick={onReset} style={{marginRight:10}}>
-              重置
-            </Button>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-    </Form>
-  );
-}
-
-export default ModalForm;
-
diff --git a/src/views/zbgl/zbb/index.js b/src/views/zbgl/zbb/index.js
deleted file mode 100644
index b6f0da3..0000000
--- a/src/views/zbgl/zbb/index.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import React, { Fragment, useRef, useEffect,useState } from 'react';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import { Calendar, Badge, Button } from 'antd';
-import {FormOutlined} from "@ant-design/icons"
-import HeaderRender from './toolbar';
-import { useSelector } from 'react-redux';
-import ModalForm from './form';
-import moment from 'moment';
-import './index.less';
-import { EditOutlined } from '@ant-design/icons';
-import apiurl from '../../../service/apiurl';
-import { createCrudService } from '../../../components/crud/_';
-
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-
-
-  const refModal = useRef();
-  const [tm,setTm] = useState(moment())
-
-  const [data, setData] = useState({})
-  const [personTreeData, setPersonTreeData] = useState([])
-  const [holiday, setHoliday] = useState(0) //放假日  1放假 0工作
-
-  const onChange = (newTm) => {
-    console.log("newTm",newTm);
-    if (tm.year() !== newTm.year() || tm.month() !== newTm.month()) {
-      setTm(newTm)
-    }
-  }
-
-  const dateCellRender = (value) => {
-    const record = {}
-    const sig = value.format('YYYY-MM-DD');
-    if (data.hasOwnProperty(sig)) {
-      if (data[sig].length > 0) {
-        data[sig].forEach(item => {
-          record.shiftLeader = {
-            name: item.rotaType == 1 ? item.userName : record.shiftLeader?.name,
-            userId: item.rotaType == 1 ? item.userId : record.shiftLeader?.userId,
-            isHoliday:item.rotaType == 1 ? item.isHoliday : record.shiftLeader?.isHoliday
-          }
-          record.dutyLeader = {
-            name: item.rotaType == 2 ? item.userName : record.dutyLeader?.name,
-            userId: item.rotaType == 2 ? item.userId : record.dutyLeader?.userId,
-            isHoliday:item.rotaType == 2 ? item.isHoliday : record.dutyLeader?.isHoliday
-          }
-        })
-      }
-      if (data[sig][0].isHoliday == 1) {
-        return (
-          <div style={{ position: 'relative', width: '100%' }}>
-            <span style={{
-              display:"inline-block",
-              padding: "0px 10px",
-              color: "#f56c6c",
-              border:"1px solid #f56c6c",
-            }}>放假</span>
-            <Button
-              style={{ position: 'absolute', top: 0, right: 0 }}
-              size="small"
-              icon={<EditOutlined />}
-              onClick={(e) => { e.preventDefault(); refModal.current.showSave({ ...record, time: sig,tree:personTreeData }); }} />
-          </div>
-        )
-      }
-    }
-    if (Object.values(record).some(item => item.userId  && item.name )) {
-      return (
-        <div style={{ position: 'relative', width: '100%' }}>
-          {
-            record.shiftLeader?.name && <div><Badge status="error" text={record.shiftLeader?.name} /></div>
-          }
-          {
-           record.dutyLeader?.name && <div><Badge status="processing" text={record.dutyLeader?.name} /></div>
-          }
-          <Button
-            style={{ position: 'absolute', top: 0, right: 0 }}
-            size="small" icon={<EditOutlined />}
-            onClick={(e) => {
-              e.preventDefault();
-              refModal.current.showEdit({ ...record, time: sig, tree: personTreeData });
-            }} />
-        </div>
-      );
-    } else {
-      if (tm.month() === value.month()) {
-        return (
-          <>
-              <Button style={{ float: 'right' }} size="small" onClick={(e) => { e.preventDefault(); refModal.current.showSave({ ...record, time: sig,tree:personTreeData }); }}>+</Button>
-          </>
-        )
-      }
-    }
-  }
-
-  /**
-   * @description 获取组织人员树
-   */
-  const personTree = () => {
-    createCrudService(apiurl.fxzb.zbb.ryTree).delGet().then(res => {
-      if (res.code == 200) {
-        let dataTree = res.data
-        setPersonTreeData(handelTreeData(dataTree))
-      }
-    })
-  }
-
-  /**
-   * @description 处理树节点
-   *
-   */
-  const handelTreeData = (treeData) => {
-    return treeData.map(item => {
-      return {
-        title : item.name,
-        value : item.userId || item.orgCode,
-        disabled: item.userId ? false : true,
-        children: item.children && item.children.length > 0? handelTreeData(item.children) : []
-      }
-    })
-  }
-  useEffect(()=>{
-    getData()
-  },[tm])
-
-  useEffect(() => {
-    personTree()
-  }, [])
-
-  const getData = async()=>{
-    const stm = tm.format('YYYY-MM')
-
-    // const etm = tm.endOf('months').format('YYYY-MM-DD')
-    // console.log(stm,etm);
-    createCrudService(apiurl.fxzb.zbb.page).delGet({yearMonth:stm}).then(res => {
-      if (res.code === 200) {
-        setData(res.data)
-      }
-      
-    })
-  }
-
-  return (
-    <>
-    <div className='content-root xybm'>
-    <Fragment>
-      <div className='CalendarBox' style={{margin:20}}>
-        <Calendar
-          mode="month"
-          
-          onChange={onChange}
-              headerRender={({ value, onChange }) => <HeaderRender value={value} onChange={onChange} tm={tm} callback={getData} role={role} />}//doUpload={this.canOp ? this.doUpload : null}
-          dateCellRender={dateCellRender}
-        />
-      </div>
-      <BasicCrudModal
-        width={600}
-        ref={refModal}
-        title="值班安排"
-        component={ModalForm}
-        onCrudSuccess={()=>{getData()}}
-      />
-    </Fragment>
-    </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/zbgl/zbb/index.less b/src/views/zbgl/zbb/index.less
deleted file mode 100644
index 363018b..0000000
--- a/src/views/zbgl/zbb/index.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.zbap{
-    .CalendarBox{
-        padding: 1.5em;
-        background-color: white;
-        
-        .pagetoolbar{
-            width: 100%;
-            display: inline-block;
-            .ant-form{
-                width: 100%;
-                display: inline-block;
-                .ant-form-item{
-                    display: inline-block;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/views/zbgl/zbb/toolbar.js b/src/views/zbgl/zbb/toolbar.js
deleted file mode 100644
index e9d9a3b..0000000
--- a/src/views/zbgl/zbb/toolbar.js
+++ /dev/null
@@ -1,241 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Upload, Button,Row, Col, Select, Badge, message,Modal } from 'antd';
-import {RightOutlined,LeftOutlined,FileExcelOutlined,DeleteOutlined} from '@ant-design/icons';
-import moment from 'moment';
-import { createCrudService } from '../../../components/crud/_';
-import apiurl from '../../../service/apiurl';
-import { httppost5 } from '../../../utils/request';
-import { exportFile } from '../../../utils/tools';
-const { Dragger } = Upload;
-
-const ToolBar = ({ value, onChange, tm, callback,role }) => {
-  const exportBtn = role?.rule?.find(item => item.menuName == "导入");
-  const [yearRange,setYearRange] = useState([])
-  const [monthRange,setMonthRange] = useState([])
-  const [form] = Form.useForm();
-  const [exportOPen, setExportOPen] = useState(false)
-  const [fileList, setFileList] = useState([]) //上传文件列表
-  const [loading, setLoading] = useState(false)
-  useEffect(()=>{ 
-    getDefaultValue()
-  },[])
-
-  const deleteFile = (fileId) => {
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
-    setFileList(filterFile)
-  }
-  const beforeUpload = (file) => {
-    const accept = [".xlsx",".xls"]
-    const fileType = file?.name.split(".");
-    const fileDate = fileType.slice(-1);
-    const isEecel = accept.includes(`.${fileDate[0]}`)
-    if (!isEecel) {
-      message.error('请上传.xls .xlsx格式的文件！');
-    }
-    return isEecel  ? true : Upload.LIST_IGNORE;
-  };
-
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xfflood/bzPredictionScheme/file/download/${params}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-  const fileChange = (info) => {
-    console.log(info);
-    if (info.file.status === "done") {
-      setLoading(false);
-      setExportOPen(false)
-      callback()
-    }
-    if (info.file.status === "uploading") { 
-      setLoading(true);
-    }
-    if (info.file.status === "error") {
-      message.error("文件上传失败")
-      setLoading(false);
-    }
-    setFileList(info.fileList)
-  }
-  const getDefaultValue = ()=>{
-    const tm = moment()
-    const year = tm.year();
-    let linshi1 = [];
-    for (let i = year - 5; i <= year + 1; i++) {
-      linshi1.push(i);
-    }
-    setYearRange(linshi1)
-    let linshi2 = [];
-    for (let i = 0; i < 12; i++) {
-      linshi2.push(i);
-    }
-    setMonthRange(linshi2)
-  }
-
-  const down = ()=>{
-    const stm = tm.format('YYYY-MM')+'-01'
-    const etm = tm.endOf('months').format('YYYY-MM-DD')
-    createCrudService(apiurl.informationManagement.dutyPlan.down).downLoad({
-      stm:stm,
-      etm:etm,
-    })
-  }
-
-  const downTemplate = ()=>{
-    httppost5(apiurl.rcgl.zbgl.zbb.import, {}).then(res => {
-      exportFile(`值班表.xlsx`,res.data)
-  })
-  }
-
-  const handleGclqdFileFileChange = async()=>{
-    var files = document.getElementById("gclqdFile").files;
-    const resData = await createCrudService(apiurl.informationManagement.dutyPlan.upLoad).upLoad({file:files[0]})
-    console.log('resData',resData)
-
-  }
-
- /**
-  * @description 回到今天
-  */
-  const backToday = () => {
-    const now = moment();
-    onChange(now);
-  };
-  return (
-    <>
-     <div className="pagetoolbar">
-        <Form layout="inline">
-          <Form.Item >
-            <Button
-              type="primary"
-              className='but4'
-              onClick={() => onChange(tm.clone().subtract(1, 'month'))}
-              icon={<LeftOutlined />}
-            >上一月</Button>
-          </Form.Item>
-          <Form.Item label="年份">
-            <Select
-              style={{ width: 80 }}
-              dropdownMatchSelectWidth={false}
-              onChange={newYear => {
-                const now = value.clone().year(newYear);
-                onChange(now);
-              }}
-              value={value.year()}
-            >
-              {
-                yearRange.map(o => <Select.Option key={o} value={o}>{o}</Select.Option>)
-              }
-            </Select>
-          </Form.Item>
-          <Form.Item label="月份">
-            <Select
-              style={{ width: 80 }}
-              dropdownMatchSelectWidth={false}
-              onChange={newMonth => {
-                const now = value.clone().month(newMonth);
-                onChange(now);
-              }}
-              value={value.month()}
-            >
-              {
-                monthRange.map(o => <Select.Option key={o} value={o}>{o+1}</Select.Option>)
-              }
-            </Select>
-          </Form.Item>
-          <Form.Item >
-            <Button
-              type="primary"
-              className='but4'
-              onClick={() => onChange(tm.clone().add(1, 'month'))}
-              icon={<RightOutlined />}
-            >下一月</Button>
-          </Form.Item>
-          <Form.Item>
-              <Button type="primary" onClick={() => {backToday()}}>今天</Button>
-          </Form.Item>
-          {exportBtn ?<Form.Item>
-            <Button
-              className='but4'
-              onClick={() => {setExportOPen(true)}}>导入</Button>
-          </Form.Item>: null}
-          <Form.Item style={{ marginLeft:"auto" }}>
-            <Badge status="error" text="带班领导" style={{ marginRight: 8 }} />
-            <Badge status="processing" text="值班人员" style={{ marginRight: 8 }} />
-          </Form.Item>
-        </Form>
-      </div>
-      <Modal
-        open={exportOPen}
-        width={700}
-        title="仅支持表格文件上传，请按照模板示例数据填写"
-        destroyOnClose
-        onCancel={() => setExportOPen(false)}
-        footer={null}
-      >
-        <Row>
-          <Col span={24}>
-                <Dragger
-                name='file'
-                // multiple
-                action="/gunshiApp/tsg/rota/importData"
-                onChange={fileChange}
-                beforeUpload={beforeUpload}
-                onDrop={(info) => { console.log(info); }}
-                  fileList={fileList}
-                  disabled={loading}
-                  accept=".xls, .xlsx"
-              >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.xls .xlsx
-                </p>
-              </Dragger>
-          </Col>
-        </Row>
-        {/* <Row gutter={[16]}>
-                {
-                   loading ? <span>文件正在上传中，请等待</span> :
-                  fileList.length > 0 && fileList.map(file => {
-                  return (
-                      <Col span={12}>
-                        <div className='file-item' >
-                            <div className='file-description'>
-                              <div
-                                  onClick={() => { download(file.response?.data?.fileId) }}
-                                  style={{ cursor: 'pointer' }}
-                                >
-                                  <FileExcelOutlined style={{ fontSize: 40 }} /> 
-                                </div>
-                                <span>{file.name}</span>
-                          </div>
-                        <div
-                          className='delete-icon'
-                          onClick={() => deleteFile(file.response?.data?.fileId)}
-                        >
-                          <DeleteOutlined />
-                          </div>
-                        </div>
-                      </Col>
-                  )
-                })
-                }
-
-        </Row> */}
-        <Row>
-          <Col span={24} style={{ textAlign: 'right',marginTop:15 }}>
-            <Button onClick={downTemplate} type="primary" style={{marginRight:10}}>下载模板</Button>
-            {/* <Button type="primary" onClick={() => {}}>提交</Button> */}
-          </Col>
-        </Row>
-      </Modal>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file
diff --git a/src/views/zbgl/zbrz/form.js b/src/views/zbgl/zbrz/form.js
deleted file mode 100644
index 4a3c43e..0000000
--- a/src/views/zbgl/zbrz/form.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import React,{useEffect,useState,useMemo} from 'react';
-import { Form, Button, Input, Row, Col, DatePicker, TreeSelect,Image,message,Upload } from 'antd';
-import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
-import apiurl from '../../../service/apiurl';
-import { httpget2, httppost2,xyt_httpget2 } from '../../../utils/request';
-import "./index.less"
-import moment from 'moment';
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const { Dragger } = Upload;
-
-const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
-  const [form] = Form.useForm();
-  const [deptList, setDeptList] = useState([])
-  const [deptUserList, setDeptUserList] = useState([])
-
-   // 获取部门数据
-   const getDeptList = async() => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist);
-      if (result.code == 200) {
-        setDeptList(result.data);
-        getDeptUser()
-      }
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  // 获取部门人员数据
-  const getDeptUser = async(deptId) => {
-    try {
-      const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:9999});
-      if (result.code == 200) {
-        setDeptUserList(result.rows)
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-
-  const buildTree = (data, parentId) => {
-    let tree = [];
-    data.forEach((node) => {
-        node.title = node.deptName;
-        node.key = node.deptId;
-        
-        if (node.parentId === parentId) {
-        let children = buildTree(data, node.deptId);
-        if (children.length) {
-            node.children = children;
-        }
-        tree.push(node);
-        }
-    });
-    return tree;
-}
-  const handleTreeList = (dept, user) => {
-    const deptArr = dept.map(item => {
-      return {
-        ...item,
-        value: item.deptId,
-        title: item.deptName,
-        disabled: item.userId ? false : true,
-        children: user.filter(u => u.deptId == item.deptId).map(u => ({
-          ...u,
-          value: u.userId,
-          title: u.nickName
-        }))
-      }
-    }) 
-    console.log("deptArr",deptArr);
-    const treelist = buildTree(deptArr,0)
-    return treelist
-  }
-  const treeList = useMemo(() => {
-    if (deptUserList?.length > 0 && deptList?.length > 0) {
-        return handleTreeList(deptList,deptUserList)
-    } else {
-      return []
-    }
-  },[deptUserList,deptList])
-
-  const onFinish = async (values) => {
-    if (mode === 'edit') {
-      values.id = record?.id
-      onEdit(apiurl.rcgl.zbgl.zbrz.edit,values)
-    }
-    if (mode === 'save') {
-      onSave(apiurl.rcgl.zbgl.zbrz.save,values)
-    }
-  }
-
-  // 根据年月日查询人员
-  const getRotaUser = async (date) => {
-    try {
-      const result = await httpget2(apiurl.rcgl.zbgl.zbrz.rotaUser, {rotaDate: moment(date).format('YYYY-MM-DD')});
-      if (result.code == 200 && mode == "save") {
-        if (result.data.length > 0) { 
-          const dept = result.data.find(item => item.rotaType == 2).userId;
-          const lead = result.data.find(item => item.rotaType == 1).userId;
-          form.setFieldValue("dutyUserId",dept)
-          form.setFieldValue("leaderUserId",lead)
-        } else {
-          form.setFieldValue("dutyUserId",'')
-          form.setFieldValue("leaderUserId",'')
-        }
-      } 
-      
-    } catch (error) {
-      console.log(error);
-    }
-  }
-  useEffect(() => {
-    getDeptList()
-    // getDeptUser()
-  }, [])
-  
-  return (
-    <>
-      <Form
-        form={form}
-        {...formItemLayout}
-        onFinish={onFinish}
-        initialValues={record}
-      >
-      <Row>
-          <Col span={12}>
-          <Form.Item
-                label="值班日期"
-                 name="rotaDate"
-                rules={[{ required: true }]}
-                getValueFromEvent={(e, dateString) => dateString}
-                getValueProps={value => ({
-                value: value ? moment(value) : undefined
-                })}
-            >
-               <DatePicker allowClear style={{ width: '100%' }} disabled={mode==='view'} onChange={e => getRotaUser(e)} />
-              </Form.Item>
-          </Col>
-          <Col span={12}>
-              <Form.Item
-                label="天气"
-                name="weather"
-              >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-        <Col span={12}>
-            <Form.Item
-              label="值班人员"
-              name="dutyUserId"
-              rules={[{ required: true }]}
-
-            >
-                <TreeSelect
-                   showSearch
-                   style={{
-                     width: '100%',
-                   }}
-                   disabled={mode==='view'}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-                   treeData={treeList}
-                   treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-        <Col span={12}>
-            <Form.Item
-              label="值班领导"
-              name="leaderUserId"
-            >
-                <TreeSelect
-                   showSearch
-                   disabled={mode==='view'}
-                   style={{
-                     width: '100%',
-                   }}
-                   dropdownStyle={{
-                     maxHeight: 400,
-                     overflow: 'auto',
-                   }}
-                   allowClear
-                   treeDefaultExpandAll
-                   treeData={treeList}
-                   treeNodeFilterProp='title'
-               />
-            </Form.Item>
-        </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="值班情况"
-                name="dutySituation"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-                rules={[{ required: true }]}
-                
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-              <Form.Item
-                label="待处理事项"
-                name="todoList"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 19 }}
-              >
-                <Input.TextArea disabled={mode==='view'} style={{width:'100%'}} allowClear />
-              </Form.Item>
-          </Col>
-      </Row>
-      {
-        mode==='view'?null:(
-          <>
-          <Form.Item {...btnItemLayout}>
-            <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '提交' : '修改'}
-            </Button>
-          </Form.Item>
-          </>
-        )
-      }
-      </Form>
-  
-    </>
-  );
-}
-
-export default ModalForm;
diff --git a/src/views/zbgl/zbrz/index.js b/src/views/zbgl/zbrz/index.js
deleted file mode 100644
index 8a091a2..0000000
--- a/src/views/zbgl/zbrz/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card,Modal,Form,Input,Button,Row,Col,message,Menu } from 'antd';
-import { useSelector } from 'react-redux';
-import ReactEcharts from 'echarts-for-react';
-import ToolBar from './toolbar';
-import apiurl from '../../../service/apiurl';
-import usePageTable from '../../../components/crud/usePageTable2';
-import { createCrudService } from '../../../components/crud/_';
-import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import BasicCrudModal from '../../../components/crud/BasicCrudModal';
-import ModalForm from './form';
-
-
-import { httppost5, httppost2 } from '../../../utils/request';
-
-
-import "./index.less"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑")|| true;
-  // const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-  const delBtn = role?.rule?.find(item => item.menuName == "删除")|| true;
-  const refModal = useRef();
-  const [searchVal, setSearchVal] = useState(false)
-
-  const columns = [
-    { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
-    { title: '值班日期', key: 'rotaDate', dataIndex: 'rotaDate', width:150, align: "center" },
-    { title: '值班人员', key: 'dutyUserName', dataIndex: 'dutyUserName', width:150, align: "center" },
-    { title: '值班领导', key: 'leaderUserName', dataIndex: 'leaderUserName', width:150, align: "center" },
-    { title: '值班情况', key: 'dutySituation', dataIndex: 'dutySituation', width:300, align: "center" },
-    {
-      title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
-      render: (value, row, index) => (<CrudOpRender_text
-        edit={editBtn ? true : false}
-        del={delBtn ? true : false}
-        command={(cmd) => () => command(cmd)(row)} />)
-    },
-  ];
-
- 
-  
-  const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  const command = (type) => (params) => {
-    if (type === 'save') {
-      refModal.current.showSave();
-    } else if (type === 'edit') {
-      refModal.current.showEdit({ ...params });
-    } else if (type === 'view') {
-      refModal.current.showView(params);
-    } else if (type === 'del') {
-      refModal.current.onDeleteGet(apiurl.rcgl.zbgl.zbrz.delete + `/${params.id}`);
-    }
-  }
- 
-  
-  const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.rcgl.zbgl.zbrz.page).find_noCode);
-
-  useEffect(() => {
-    if (searchVal) {
-      const params = {
-        search: {
-          ...searchVal,
-        }
-      };
-      search(params)
-    }
-  }, [searchVal])
- 
-  
-  return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='lf CrudAdcdTreeTableBox' style={{ width: "100%" }}>
-          <Card className='nonebox'>
-            <ToolBar
-              setSearchVal={setSearchVal}
-              onSave={command('save')}
-              role={role}
-            />
-          </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-          <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width, y: "calc( 100vh - 400px )" }} />
-          </div>
-        </div>
-        <BasicCrudModal
-          width={800}
-          ref={refModal}
-          title=""
-          component={ModalForm}
-          onCrudSuccess={refresh}
-        />
-      </div>
-    </>
-  );
-}
-
-export default Page;
diff --git a/src/views/zbgl/zbrz/index.less b/src/views/zbgl/zbrz/index.less
deleted file mode 100644
index 43fe303..0000000
--- a/src/views/zbgl/zbrz/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.basic-info{
-    position: relative;
-    font-size: 16px;
-    margin-bottom: 20px;
-    padding:5px 25px;
-    border-bottom: 1px solid #eee;
-    &::before{
-        position: absolute;
-        top:8px;
-        left:0;
-        content: "";
-        display: block;
-        width: 5px;
-        height: 20px;
-        background-color: #0079fe;
-    }
-}
-
-.first-card,.second-card{
-    color: #fff;
-    padding:15px 120px;
-    border-radius: 10px;
-}
-.first-card{
-    background-color: #e9df1e;
-}
-.second-card{
-    background-color: #d62f28;
-}
diff --git a/src/views/zbgl/zbrz/toolbar.js b/src/views/zbgl/zbrz/toolbar.js
deleted file mode 100644
index bd336eb..0000000
--- a/src/views/zbgl/zbrz/toolbar.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { useEffect,useState } from 'react';
-import { Form, Input, Button, DatePicker,Segmented } from 'antd';
-import { AppstoreOutlined, BarsOutlined } from '@ant-design/icons'
-import NormalSelect from '../../../components/Form/NormalSelect';
-import moment from 'moment';
-const { RangePicker } = DatePicker;
-const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
-  const [form] = Form.useForm();
-
-
- 
-  const onFinish = (values) => {
-    let dateSo;
-    if (values.tm) {
-      dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
-      }
-    }
-    delete values.tm
-    setSearchVal({...values, dateSo});
-  }
-
- 
-  useEffect(() => {
-    let time = [moment().subtract(7,"days"),moment()]
-     let dateSo = {
-       start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-       end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
-    }
-    form.setFieldValue("tm",time)
-    setSearchVal({dateSo})
-  }, [])
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between'}}>
-        <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
-          <Form.Item label="值班日期" name="tm">
-            <RangePicker
-              allowClear
-              style={{ width: "350px" }}
-              format="YYYY-MM-DD"
-            />
-          </Form.Item>
-          {searchBtn ? <Form.Item>
-            <Button type="primary" htmlType="submit">查询</Button>
-          </Form.Item> : null }
-          {
-            (onSave && addBtn) ?
-              <Form.Item>
-                <Button onClick={onSave}>新增</Button>
-              </Form.Item>
-            :null
-          }
-        </Form>
-      </div>
-    </>
-  );
-}
-
-export default ToolBar;
\ No newline at end of file