diff --git a/src/components/crud/BasicCrudModal2.js b/src/components/crud/BasicCrudModal2.js
new file mode 100644
index 000000000..53ca425fb
--- /dev/null
+++ b/src/components/crud/BasicCrudModal2.js
@@ -0,0 +1,217 @@
+import React from 'react';
+import { Modal, message } from 'antd';
+import { createCrudService } from './_';
+import apiurl from '../../service/apiurl';
+
+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).edit1(values).then((result) => {
+      if (result?.code === 200) {
+        message.success('修改成功');
+        this.setState({ open: false });
+
+        if (this.props.onCrudSuccess) {
+          this.props.onCrudSuccess();
+        }
+        if (this.props.extraFun) {
+          this.props.extraFun();
+        }
+      } 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();
+        }
+        if (this.props.extraFun) {
+          this.props.extraFun();
+        }
+      } 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();
+        }
+        if (this.props.extraFun) {
+          this.props.extraFun();
+        }
+      } else {
+        message.error(result?.msg||'删除失败');
+      }
+    })
+  }
+
+  onDeletePost= (path,values) => {
+    createCrudService(path).edit1(values).then((result) => {
+      if (result?.code === 200) {
+        message.success('删除成功');
+        this.setState({ open: false });
+        if (this.props.onCrudSuccess) {
+          this.props.onCrudSuccess();
+        }
+        if (this.props.extraFun) {
+          this.props.extraFun();
+        }
+      } 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,extraFun } = 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/models/auth/_.ts b/src/models/auth/_.ts
index e0ef8d364..259968102 100644
--- a/src/models/auth/_.ts
+++ b/src/models/auth/_.ts
@@ -193,46 +193,133 @@ export async function loadMenu(): Promise<MenuItem[]> {
   const id = idgen()
   return [
     { id: id(), title: '水库一张图', path: '/mgr/home', icon: 'jbqk' },
-    
-    { id: id(), title: '四预', redirect: '/mgr/sy/fhxzfx', icon: 'fxzb',
+    {
+      id: id(), title: '四制', redirect: '/mgr/sz/gltx/zzjgck', icon: 'jbqk',
       children: [
-        { id: id(), title: '防洪现状分析', path: '/mgr/sy/fhxzfx'},
-        { id: id(), title: '天气预报', path: '/mgr/sy/tqyb'},
         {
-          id: id(), title: '洪水预报', redirect: '/mgr/sy/hsyb/hyybjs',
+          id: id(), title: '管理体系', redirect: '/mgr/sz/gltx/zzjgck',
           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/sz/gltx/zzjgck',
+            },
+            {
+              id: id(), title: '责任人管理', path: '/mgr/sz/gltx/zrrgl',
+            }
           ]
         },
-        { id: id(), title: '调度规程', path: '/mgr/fxzb/ddgc'},
-        { id: id(), title: '防汛预案', path: '/mgr/fxzb/fxya'},
+        {
+          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: '四预', redirect: '/mgr/sy/fhxzfx', icon: 'fxzb',
+      children: [
+        { id: id(), title: '防洪形势', path: '/mgr/sy/fhxzfx'},
+        // { 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/sy/fxya'},
+        { id: id(), title: '调度规程', path: '/mgr/sy/ddgc'},
         {
           id: id(),
           title: '抢险物料',
-          path: '/mgr/fxzb/qxwl',
+          path: '/mgr/sy/qxwl',
         },
         {
           id: id(),
           title: '抢险队伍',
-          path: '/mgr/fxzb/qxdw',
+          path: '/mgr/sy/qxdw',
         },
       ],
     },
-
-    {
-      id: id(),
-      title: '工程安全监测',
-      redirect: '/mgr/gcaqjc/gcaqyj/bzt',
-      icon: 'fxzb',
+    { id: id(), title: '四管', redirect: '/mgr/sg/xcxj/xcrw', icon: 'fxzb',
       children: [
-        { id: id(), title: '布置图', path: '/mgr/gcaqjc/gcaqyj/bzt' },
+        {
+          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/wxyh',
+        },
+        {
+          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: 'fxzb',
+      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: '浸润线', path: '/mgr/gcaqjc/gcaqfx/jrx'},
           ]
         },
         {
@@ -240,23 +327,19 @@ export async function loadMenu(): Promise<MenuItem[]> {
           children: [
             { id: id(), title: '隐患预警', path: '/mgr/gcaqjc/gcaqyj/yhyj' },
             { id: id(), title: '预警规则配置', path: '/mgr/gcaqjc/gcaqyj/yjgzpz' },
-            
           ]
         },
         {
-          id: id(), title: '数据统计查询', redirect: '/mgr/gcaqjc/sjtjcx/sljx',
+          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/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' },
-            
           ]
         },
-      
       ],
     },
     
diff --git a/src/service/apiurl.js b/src/service/apiurl.js
index 058492be4..0a4f2a2ea 100644
--- a/src/service/apiurl.js
+++ b/src/service/apiurl.js
@@ -7,6 +7,13 @@ const zdkapi = 'https://slt-sh.chutianyun.gov.cn:8002' //中电科的市级平
 const service_fxdd = '/gunshiApp/xyt'
 const service_shzh = '/shzh'
 const apiurl = {
+  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: {
@@ -414,11 +421,10 @@ const apiurl = {
       controler:service_fxdd + "/attCctvBase/control"
     }
   },
-  sdz:{
+  sdz: {
     zrrByCode:service_fxdd + '/hEHystSafePerson/hystCode',
     gctp:service_fxdd + '/attHystBase/projectImgList',
     sjzl:service_fxdd + '/attHystBase/desFileList',
-    fxya:service_fxdd + '/attHystBase/planList',
     delGctp:service_fxdd + '/hEHystProjectImg/delete',
     filedNameById:service_fxdd + '/hEHystProjectImg/file/get/'
   },
diff --git a/src/views/AppRouters.tsx b/src/views/AppRouters.tsx
index 0b41e1b57..e86283d6a 100644
--- a/src/views/AppRouters.tsx
+++ b/src/views/AppRouters.tsx
@@ -79,6 +79,10 @@ import Gstjfx from "./gxsl/gstjfx"
 import Spjk from "./video"
 import AiWarn from "./spjk/aiWarn"
 
+
+// 四制 - 组织机构查看
+import Zzjgck from './sz/zzjgck'
+
 const HomePage = lazy(() => import('./Home'))
 
 const IframePage = lazy(() => import('./Iframe'))
@@ -118,16 +122,16 @@ const AppRouters: React.FC = () => {
         { path: 'sy/hsyb/csgl', element: <Csgl /> },
 
         // 调度规程
-        { path: 'fxzb/ddgc', element: <Ddgc /> },
+        { path: 'sy/ddgc', element: <Ddgc /> },
 
         // 防汛预案
-        { path: 'fxzb/fxya', element: <Fxya /> },
+        { path: 'sy/fxya', element: <Fxya /> },
 
         // 抢险物料
-        { path: 'fxzb/qxwl', element: <Qxwl_Gc /> },
+        { path: 'sy/qxwl', element: <Qxwl_Gc /> },
 
         // 抢险队伍
-        { path: 'fxzb/qxdw', element: <Qxdw_Gc /> },
+        { path: 'sy/qxdw', element: <Qxdw_Gc /> },
 
         
         // 工程安全监测
@@ -149,33 +153,33 @@ const AppRouters: React.FC = () => {
         { path: 'gcaqjc/gcaqfx/jrx', element: <Jrx /> },
         
         // 日常管理-水质整编
-        { path: 'rcgl/btbb/rjswbb', element: <Rjswnbb /> },
-        { path: 'rcgl/btbb/rjylnbb', element: <Rjylnbb /> },
-        { path: 'rcgl/btbb/sdswbb', element: <Sdswrbb /> },
-        { path: 'rcgl/btbb/sdjyrbb', element: <Sdjyrbb /> },
-        { path: 'rcgl/xcxj/xcrw', element: <Xjrw /> },
-        { path: 'rcgl/xcxj/xjwtcl', element: <Xjwtcl /> },
-        { path: 'rcgl/xcxj/xjxpz', element: <Xjxpz/> },
-        { path: 'byfz/fzxc', element: <Fzxc /> },
-        { path: 'byfz/bypc', element: <Bypc /> },
-        { path: 'rcgl/wxyh', element: <Wxyh /> },
-        { path: 'rcgl/aqgl/aqjcgl', element: <Aqjcgl /> },
-        { path: 'rcgl/aqgl/fxgkqd', element: <Fxgkqd /> },
-        { path: 'rcgl/aqgl/cxjbtz', element: <Cxjgtz /> },
-        { path: 'rcgl/aqgl/aqjdtz', element: <Aqjdtz /> },
-        { path: 'rcgl/aqgl/aqyhpc', element: <Aqyhpc /> },
-        { path: 'rcgl/aqgl/aqsgdj', element: <Aqsgdj /> },
-        { path: 'rcgl/gcdsj', element: <Gcdsj /> },
-        { path: 'rcgl/szzb', element: <Szzb /> },
+        { 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/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: 'rcgl/stlljc', element: <Stlljc /> },
-        { path: 'rcgl/zbgl/zbb', element: <Zbb /> },
-        { path: 'rcgl/zbgl/zbrz', element: <Zbrz /> },
+        { path: 'sg/zbgl/zbb', element: <Zbb /> },
+        { path: 'sg/zbgl/zbrz', element: <Zbrz /> },
         // 日常管理-监督考核
-        { path: 'rcgl/jdkh/khtj', element: <Khtj /> },
-        { path: 'rcgl/jdkh/khzbgl', element: <Khzbgl /> },
-        { path: 'rcgl/jdkh/khmbgl', element: <Khmbgl /> },
-        { path: 'rcgl/jdkh/khwtzg', element: <Khwtzg /> },
-        { path: 'rcgl/jdkh/khrwgl', element: <Khrwgl /> },
+        { 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 /> },
 
 
         // 供水兴利
@@ -188,7 +192,7 @@ const AppRouters: React.FC = () => {
         { path: 'fxzb/jczw/sqz', element: <HomePage /> },
         // 视频监控
         { path: 'spjk/spjk', element: <Spjk /> },
-        { path: 'spjk/aiWarn', element: <AiWarn /> },
+        { path: 'sg/gjgl/aigj', element: <AiWarn /> },
 
         // { path: 'fxzb/zbb', element: <Zbb /> },
         // { path: 'fxzb/txl', element: <Txl /> },
@@ -207,6 +211,9 @@ const AppRouters: React.FC = () => {
         { path: 'fxdd/ddjc/yjxy', element: <Yjxy /> },
         { path: 'fxdd/ddjc/ddzl', element: <Ddzl /> },
         { path: 'videoSurveillance', element: <VideoList /> },
+
+        // 四制-组织机构查看
+        { path: 'sz/gltx/zzjgck', element: <Zzjgck /> },
       ],
     },
     { path: '/login', element: <LoginPage /> },
diff --git a/src/views/fxzb/ddgc/form.js b/src/views/fxzb/ddgc/form.js
index f9d3777eb..8770a8a5a 100644
--- a/src/views/fxzb/ddgc/form.js
+++ b/src/views/fxzb/ddgc/form.js
@@ -1,38 +1,96 @@
-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 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 { createCrudService } from '../../../components/crud/_';
+import { httpget2 } from '../../../utils/request';
 import moment from 'moment';
-const { Dragger } = Upload;
+import "./index.less";
 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 ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
   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)
+  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)
   }
-   /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-   const download = (params) => {
+
+  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/xfflood/xfIdeoImgB/file/download/${params}`;
+        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/resPlanB/file/download/${params}`;
         downloadLink.download = `${params.fileName}`;
         downloadLink.style.display = "none";
         // 将链接添加到页面中
@@ -41,153 +99,120 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
         // 模拟点击事件，开始下载
         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])
+    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="imgName"
+                label="调度规程名称"
+                name="planName"
+                labelCol={{ span: 3, offset: 0 }}
+                wrapperCol={{span:21,offset:0}}
                 rules={[{ required: true }]}
               >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
+              <Input
+                style={{ width: '100%' }}
+                allowClear
+              />
               </Form.Item>
           </Col>
+         
       </Row>
-      <Row>
-          <Col span={24}>
+
+        <Row>
+        <Col span={12}>
               <Form.Item
-                label="制作单位"
-                name="prodUnitName"
+                label="编制单位"
+                name="prepOrg"
                 rules={[{ required: true }]}
               >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
+               <Input
+                style={{ width: '100%' }}
+                allowClear
+              />
               </Form.Item>
           </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
+           <Col span={12}>
               <Form.Item
-                label="制作时间"
-                name="myTm"
+                label="编制日期"
+                name="prepTime"
+                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%'}}
-                />
+              <DatePicker allowClear style={{width:'280px'}} />
               </Form.Item>
           </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-            <Form.Item
-                label="附件"
-                // label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
+        </Row>
+        <Row>
+        <Col span={12}>
+              <Form.Item
+                label="批复部门"
+                name="apprOrg"
+                rules={[{ required: true }]}
               >
-              {mode !== "view" && 
-                <Dragger
+               <Input
+                style={{ width: '100%' }}
+                allowClear
+              />
+              </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'}} />
+              </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'
-                // multiple
-                action="/gunshiApp/xfflood/xfIdeoImgB/file/upload/singleSimple"
+                action="/gunshiApp/xyt/resPlanB/file/upload/singleSimple"
                 onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
+                fileList={fileList}
+                maxCount={1}
+                disabled={loading}
+                showUploadList={false}
+                beforeUpload={beforeUpload}
               >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
+                {mode == "view" ? null :
+              <div style={{display:"flex",alignItems:"center",columnGap:10,color:"#4f85ec",cursor:"pointer"}}>
+              <PaperClipOutlined />
+                    <a style={{ cursor: "pointer" }}>上传PDF文件
+                      <span style={{ marginLeft:10,color:"#dfdfdf" }}>(支持扩展名：.xls .xlsx .doc .docx .pdf .jpg .png)</span></a>
+              </div>
+                }
+          </Upload>
+          </Form.Item>  
+          </Col>
+         
+        </Row>   
+        <Row gutter={[16]}>
                 {
                   loading ? <span>文件正在上传中，请等待</span> :
                   fileList.length > 0 && fileList.map(file => {
@@ -239,25 +264,28 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
                             <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)}>
+                        </div>
+                        {mode !== "view" && 
+                          <div
+                            className="delete-icon"
+                            onClick={() =>  deleteFile(file.response?.data?.fileId)}
+                          >
                               <DeleteOutlined />
                           </div>
+                        }
                         </div>
                       </Col>
                   )
                 })
                 }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
+        </Row>
+                
       {
         mode==='view'?null:(
           <>
           <Form.Item {...btnItemLayout}>
             <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '增加' : '修改'}
+              {mode === 'save' ? '提交' : '修改'}
             </Button>
           </Form.Item>
           </>
@@ -265,13 +293,13 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
       }
       </Form>
       <Modal
-        open={pdfViewOPen}
+        open={perviewOpen}
         width={1000}
         title=""
         footer={null}
         style={{marginTop:"-5%"}}
         onCancel={() => {
-          setPdfViewOPen(false)
+          setPerviewOpen(false)
         }}
       >
       <iframe
@@ -281,7 +309,7 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
             border: 0,
             marginTop: 20,
           }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfIdeoImgB/file/download/${iframeSrc}`)}`}
+         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/resPlanB/file/download/${iframeId}`)}`}
         />
       </Modal>
     </>
diff --git a/src/views/fxzb/ddgc/index.js b/src/views/fxzb/ddgc/index.js
index af77b1cca..ef0d2af4d 100644
--- a/src/views/fxzb/ddgc/index.js
+++ b/src/views/fxzb/ddgc/index.js
@@ -1,121 +1,107 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Modal, Image } from 'antd';
-import { useSelector } from 'react-redux';
+import React,{useEffect,useState,useRef,useMemo} from 'react'
+import { Table, Button,Modal} from 'antd'
+import ModalForm from './form';
 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';
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const downloadBtn = role?.rule?.find(item => item.menuName == "下载");
-  const [visible, setVisible] = 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: (rec) => <span>{rec?moment(rec).format("YYYY-MM-DD"):''}</span>
-     },
-    { title: '批复部门', key: 'apprOrg', dataIndex: 'apprOrg', width: 200 ,align:"center" },
-    {
-      title: '批复日期', key: 'apprTime', dataIndex: 'apprTime', width: 200, align: "center",
-      render: (rec) => <span>{rec?moment(rec).format("YYYY-MM-DD"):''}</span>
-      
-     },
-    {
-      title: '文件', key: 'planName', dataIndex: 'planName', width: 200, align: "center",
-      render: (rec, record) =>
-        (<div>
-          <a onClick={() => reviewFile(record?.files[0])}>{record?.files[0]?.fileName}</a>
-          <Image
-            src={url + record?.files[0]?.filePath}
-            style={{
-              display: 'none',
-            }}
-            preview={{
-              visible,
-              src:url + record?.files[0]?.filePath ,
-              onVisibleChange: (value) => {
-                setVisible(value);
-              },
-            }}
-          />
-          </div>)
-     },
-    { title: '上传时间', key: 'moditime', dataIndex: 'moditime', width: 150,align:"center"  },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (downloadBtn ?<a onClick={() => download(row?.files[0])}>下载</a> : null)
-    },
-  ];
-  const [dataSources, setDataSources] = useState([])
+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 width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/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 if (params.fileName.split('.').pop() == "png" ||
-      params.fileName.split('.').pop() == "jpg" || 
-      params.fileName.split('.').pop() == "jpeg"
-    ) {
-      setVisible(true)
+    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);
+            
+        }
     }
-    else{
-      download(params)
+    const download = (params) => {
+      let downloadLink = document.createElement("a");
+          downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/resPlanB/file/download/${params?.fileId}`;
+          downloadLink.download = `${params.fileName}`;
+          downloadLink.style.display = "none";
+          // 将链接添加到页面中
+          document.body.appendChild(downloadLink);
+  
+          // 模拟点击事件，开始下载
+          downloadLink.click();
     }
-  }
-  const getList = async() => {
-   try {
-     const res = await httppost2(apiurl.fxzb1.ddgc.page, { resCode: "42120250085" })
-     let newData = res.data.filter(s => s.type == 2)
-     setDataSources(newData.map((item,i) => ({...item,idx:i+1})))
-   } catch (error) {
-    console.log(error);
-   }
- }
-  useEffect(()=>{
-    getList()
-  },[])
-
+    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 className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='adcdTableBox'>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              columns={columns}
+      <div style={{background:"#fff",padding:10}}>
+         <h1><Button type='primary' onClick={() => {refModal.current.showSave({})}}>新增</Button></h1>
+          <Table
               rowKey="id"
-              dataSource={dataSources}
+              columns={columns}
+              dataSource={data}
               pagination={false}
               scroll={{
                 x: width,
                 y: "calc( 100vh - 400px )"
-              }} />
-          </div>
-        </div>
-        <Modal
+              }} 
+          />
+
+        <BasicCrudModal
+          width={800}
+          ref={refModal}
+          title=""
+          component={ModalForm}
+          onCrudSuccess={getData}
+      />
+      
+      <Modal
         open={pdfViewOPen}
         width={1000}
         title=""
@@ -135,9 +121,6 @@ const Page = () => {
          src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/resPlanB/file/download/${iframeSrc.fileId}`)}`}
         />
       </Modal>
-      </div>
-    </>
-  );
+    </div>
+  )
 }
-
-export default Page;
diff --git a/src/views/fxzb/ddgc/index.less b/src/views/fxzb/ddgc/index.less
new file mode 100644
index 000000000..46e62de46
--- /dev/null
+++ b/src/views/fxzb/ddgc/index.less
@@ -0,0 +1,23 @@
+.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/ddgc/toolbar.js b/src/views/fxzb/ddgc/toolbar.js
deleted file mode 100644
index 9692bb245..000000000
--- a/src/views/fxzb/ddgc/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/fxya/form.js b/src/views/fxzb/fxya/form.js
index f9d3777eb..d3c3c0007 100644
--- a/src/views/fxzb/fxya/form.js
+++ b/src/views/fxzb/fxya/form.js
@@ -1,38 +1,96 @@
-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 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 { createCrudService } from '../../../components/crud/_';
+import { httpget2 } from '../../../utils/request';
 import moment from 'moment';
-const { Dragger } = Upload;
+import "./index.less";
 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 ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
   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)
+  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)
   }
-   /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-   const download = (params) => {
+
+  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/xfflood/xfIdeoImgB/file/download/${params}`;
+        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/resPlanB/file/download/${params}`;
         downloadLink.download = `${params.fileName}`;
         downloadLink.style.display = "none";
         // 将链接添加到页面中
@@ -41,153 +99,120 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
         // 模拟点击事件，开始下载
         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])
+    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="imgName"
+                label="预案名称"
+                name="planName"
+                labelCol={{ span: 3, offset: 0 }}
+                wrapperCol={{span:21,offset:0}}
                 rules={[{ required: true }]}
               >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
+              <Input
+                style={{ width: '100%' }}
+                allowClear
+              />
               </Form.Item>
           </Col>
+         
       </Row>
-      <Row>
-          <Col span={24}>
+
+        <Row>
+        <Col span={12}>
               <Form.Item
-                label="制作单位"
-                name="prodUnitName"
+                label="编制单位"
+                name="prepOrg"
                 rules={[{ required: true }]}
               >
-                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
+               <Input
+                style={{ width: '100%' }}
+                allowClear
+              />
               </Form.Item>
           </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
+           <Col span={12}>
               <Form.Item
-                label="制作时间"
-                name="myTm"
+                label="编制日期"
+                name="prepTime"
+                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%'}}
-                />
+              <DatePicker allowClear style={{width:'280px'}} />
               </Form.Item>
           </Col>
-      </Row>
-      <Row>
-          <Col span={24}>
-            <Form.Item
-                label="附件"
-                // label={mode !== "view" ? "附件" : ''}
-                name="fieldId"
+        </Row>
+        <Row>
+        <Col span={12}>
+              <Form.Item
+                label="批复部门"
+                name="apprOrg"
+                rules={[{ required: true }]}
               >
-              {mode !== "view" && 
-                <Dragger
+               <Input
+                style={{ width: '100%' }}
+                allowClear
+              />
+              </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'}} />
+              </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'
-                // multiple
-                action="/gunshiApp/xfflood/xfIdeoImgB/file/upload/singleSimple"
+                action="/gunshiApp/xyt/resPlanB/file/upload/singleSimple"
                 onChange={fileChange}
-                onDrop={(info) => { console.log(info.dataTransfer.files); }}
-                  fileList={fileList}
-                  disabled={loading}
-                // onSuccess={handleSuccess}
+                fileList={fileList}
+                maxCount={1}
+                disabled={loading}
+                showUploadList={false}
+                beforeUpload={beforeUpload}
               >
-                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
-                  <p className="ant-upload-hint">
-                    支持扩展名：.rar .zip .doc .docx .pdf .jpg .png .ppt
-                </p>
-              </Dragger>
-              } 
-              <Row gutter={[16]}>
+                {mode == "view" ? null :
+              <div style={{display:"flex",alignItems:"center",columnGap:10,color:"#4f85ec",cursor:"pointer"}}>
+              <PaperClipOutlined />
+                    <a style={{ cursor: "pointer" }}>上传PDF文件
+                      <span style={{ marginLeft:10,color:"#dfdfdf" }}>(支持扩展名：.xls .xlsx .doc .docx .pdf .jpg .png)</span></a>
+              </div>
+                }
+          </Upload>
+          </Form.Item>  
+          </Col>
+         
+        </Row>   
+        <Row gutter={[16]}>
                 {
                   loading ? <span>文件正在上传中，请等待</span> :
                   fileList.length > 0 && fileList.map(file => {
@@ -239,25 +264,28 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
                             <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)}>
+                        </div>
+                        {mode !== "view" && 
+                          <div
+                            className="delete-icon"
+                            onClick={() =>  deleteFile(file.response?.data?.fileId)}
+                          >
                               <DeleteOutlined />
                           </div>
+                        }
                         </div>
                       </Col>
                   )
                 })
                 }
-              </Row>
-              </Form.Item>
-          </Col>
-      </Row>
+        </Row>
+                
       {
         mode==='view'?null:(
           <>
           <Form.Item {...btnItemLayout}>
             <Button type="primary" htmlType="submit">
-              {mode === 'save' ? '增加' : '修改'}
+              {mode === 'save' ? '提交' : '修改'}
             </Button>
           </Form.Item>
           </>
@@ -265,13 +293,13 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
       }
       </Form>
       <Modal
-        open={pdfViewOPen}
+        open={perviewOpen}
         width={1000}
         title=""
         footer={null}
         style={{marginTop:"-5%"}}
         onCancel={() => {
-          setPdfViewOPen(false)
+          setPerviewOpen(false)
         }}
       >
       <iframe
@@ -281,7 +309,7 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => {
             border: 0,
             marginTop: 20,
           }}
-         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xfflood/xfIdeoImgB/file/download/${iframeSrc}`)}`}
+         src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/resPlanB/file/download/${iframeId}`)}`}
         />
       </Modal>
     </>
diff --git a/src/views/fxzb/fxya/index.js b/src/views/fxzb/fxya/index.js
index 9f29b6a8b..961bf6157 100644
--- a/src/views/fxzb/fxya/index.js
+++ b/src/views/fxzb/fxya/index.js
@@ -1,126 +1,106 @@
-import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
-import { Table, Card, Modal, Image } from 'antd';
-import { useSelector } from 'react-redux';
+import React,{useEffect,useState,useRef,useMemo} from 'react'
+import { Table, Button,Modal} from 'antd'
+import ModalForm from './form';
 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';
-const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
-const Page = () => {
-  const role = useSelector(state => state.auth.role);
-  const downloadBtn = role?.rule?.find(item => item.menuName == "下载");
-  const [visible, setVisible] = 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: (rec) => <span>{rec?moment(rec).format("YYYY-MM-DD"):''}</span>
-      
-     },
-    { title: '批复部门', key: 'apprOrg', dataIndex: 'apprOrg', width: 200 ,align:"center" },
-    {
-      title: '批复日期', key: 'apprTime', dataIndex: 'apprTime', width: 200, align: "center",
-      render: (rec) => <span>{rec?moment(rec).format("YYYY-MM-DD"):''}</span>
-      
-     },
-    {
-      title: '文件', key: 'planName', dataIndex: 'planName', width: 200, align: "center",
-      render: (rec, record) =>
-      (<div>
-        <a onClick={() => reviewFile(record?.files[0])}>{record?.files[0]?.fileName}</a>
-        <Image
-          src={url + record?.files[0]?.filePath}
-          style={{
-            display: 'none',
-          }}
-          preview={{
-            visible,
-            src:url + record?.files[0]?.filePath ,
-            onVisibleChange: (value) => {
-              setVisible(value);
-            },
-          }}
-        />
-        </div>)
-     },
-    { title: '上传时间', key: 'moditime', dataIndex: 'moditime', width: 150,align:"center"  },
-    {
-      title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
-      render: (value, row, index) => (downloadBtn ?<a onClick={() => download(row?.files[0])}>下载</a> : null)
-    },
-  ];
-  const [dataSources, setDataSources] = useState([])
+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 width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
-  /**
-   * @description 文件下载
-   * @param {String} params 文件fileId
-   */
-  const download = (params) => {
-    let downloadLink = document.createElement("a");
-        downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/resPlanB/file/download/${params?.fileId}`;
-        downloadLink.download = `${params.fileName}`;
-        downloadLink.style.display = "none";
-        // 将链接添加到页面中
-        document.body.appendChild(downloadLink);
-
-        // 模拟点击事件，开始下载
-        downloadLink.click();
-  }
-
-  const reviewFile = (params) => {
-    console.log("params",params);
+    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/xyt/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();
+    }, [])
     
-    if (params?.fileName.split('.').pop() == "pdf") {
-      setPdfViewOPen(true)
-      setIframeSrc(params)
-    } else if (params.fileName.split('.').pop() == "png" ||
-      params.fileName.split('.').pop() == "jpg" || 
-      params.fileName.split('.').pop() == "jpeg"
-    ) {
-      setVisible(true)
-    }
-    else{
-      download(params)
-    }
-  }
-
-  const getList = async() => {
-   try {
-     const res = await httppost2(apiurl.fxzb1.ddgc.page, { resCode: "42120250085",type:"1" })
-     let newData = res.data.filter(s => s.type == 1)
-     setDataSources(newData.map((item,i) => ({...item,idx:i+1})))
-   } catch (error) {
-    console.log(error);
-   }
- }
-  useEffect(()=>{
-    getList()
-  },[])
-
   return (
-    <>
-      <div className='content-root clearFloat xybm' style={{paddingRight:"0",paddingBottom:"0"}}>
-        <div className='adcdTableBox'>
-          <div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
-            <Table
-              columns={columns}
+      <div style={{background:"#fff",padding:10}}>
+         <h1><Button type='primary' onClick={() => {refModal.current.showSave({})}}>新增</Button></h1>
+          <Table
               rowKey="id"
-              dataSource={dataSources}
+              columns={columns}
+              dataSource={data}
               pagination={false}
               scroll={{
                 x: width,
                 y: "calc( 100vh - 400px )"
-              }} />
-          </div>
-        </div>
-       
-      </div>
+              }} 
+          />
+
+        <BasicCrudModal
+          width={800}
+          ref={refModal}
+          title=""
+          component={ModalForm}
+          onCrudSuccess={getData}
+      />
+      
       <Modal
         open={pdfViewOPen}
         width={1000}
@@ -141,8 +121,6 @@ const Page = () => {
          src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/resPlanB/file/download/${iframeSrc.fileId}`)}`}
         />
       </Modal>
-    </>
-  );
+    </div>
+  )
 }
-
-export default Page;
diff --git a/src/views/fxzb/fxya/index.less b/src/views/fxzb/fxya/index.less
new file mode 100644
index 000000000..46e62de46
--- /dev/null
+++ b/src/views/fxzb/fxya/index.less
@@ -0,0 +1,23 @@
+.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/fxya/toolbar.js b/src/views/fxzb/fxya/toolbar.js
deleted file mode 100644
index 9692bb245..000000000
--- a/src/views/fxzb/fxya/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/qxdw/gc/index.js b/src/views/fxzb/qxdw/gc/index.js
index 9d6f6670b..a946f9467 100644
--- a/src/views/fxzb/qxdw/gc/index.js
+++ b/src/views/fxzb/qxdw/gc/index.js
@@ -16,9 +16,9 @@ import {getAdcdTreeData1, getGcTreeData5} from '../../../../service/warn';
 
 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 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)
diff --git a/src/views/fxzb/qxdw/gc/toolbar.js b/src/views/fxzb/qxdw/gc/toolbar.js
index f903b0172..bbea57a78 100644
--- a/src/views/fxzb/qxdw/gc/toolbar.js
+++ b/src/views/fxzb/qxdw/gc/toolbar.js
@@ -8,8 +8,8 @@ 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 == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  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) {
diff --git a/src/views/fxzb/qxwl/gc/index.js b/src/views/fxzb/qxwl/gc/index.js
index 91819e621..a55bb40e5 100644
--- a/src/views/fxzb/qxwl/gc/index.js
+++ b/src/views/fxzb/qxwl/gc/index.js
@@ -16,9 +16,9 @@ import {getAdcdTreeData1, getGcTreeData4} from '../../../../service/warn';
 
 const Page = () => {
   const role = useSelector(state => state.auth.role);
-  const editBtn = role?.rule?.find(item => item.menuName == "编辑");
-  const copyBtn = role?.rule?.find(item => item.menuName == "复制");
-  const delBtn = role?.rule?.find(item => item.menuName == "删除");
+  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();
diff --git a/src/views/fxzb/qxwl/gc/toolbar.js b/src/views/fxzb/qxwl/gc/toolbar.js
index 9e7cb8382..ca7962e9a 100644
--- a/src/views/fxzb/qxwl/gc/toolbar.js
+++ b/src/views/fxzb/qxwl/gc/toolbar.js
@@ -7,8 +7,8 @@ import { config } from '../../../../config';
 import moment from 'moment';
 
 const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  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) => {
diff --git a/src/views/gcaqjc/gcaqfx/jrx/toolbar.js b/src/views/gcaqjc/gcaqfx/jrx/toolbar.js
index 12b9e701f..27c057031 100644
--- a/src/views/gcaqjc/gcaqfx/jrx/toolbar.js
+++ b/src/views/gcaqjc/gcaqfx/jrx/toolbar.js
@@ -5,8 +5,8 @@ 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 == "导出");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  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) => {
diff --git a/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js b/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js
index 3d027dc6c..9ce570623 100644
--- a/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js
+++ b/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js
@@ -7,7 +7,7 @@ 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 == "查询");
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const optionsType = [
     {
       label: "渗压监测",
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/index.js b/src/views/gcaqjc/gcaqyj/yjgzpz/index.js
index 7bc547e3d..84d974dd0 100644
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/index.js
+++ b/src/views/gcaqjc/gcaqyj/yjgzpz/index.js
@@ -11,9 +11,9 @@ 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 == "编辑");
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看");
-  const delBtn = role?.rule?.find(item => item.menuName == "删除");
+  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: "渗流监测",
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js b/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js
index 4468825d7..f6e1994de 100644
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js
+++ b/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js
@@ -7,8 +7,8 @@ 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 == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const optionsType = [
     {
       label: "渗压监测",
diff --git a/src/views/gcaqjc/sjtjcx/czcx/toolbar.js b/src/views/gcaqjc/sjtjcx/czcx/toolbar.js
index f6a4b2138..e7428b938 100644
--- a/src/views/gcaqjc/sjtjcx/czcx/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/czcx/toolbar.js
@@ -5,7 +5,7 @@ import { AppstoreOutlined, BarsOutlined } from '@ant-design/icons'
 const { RangePicker } = DatePicker;
 
 const ToolBar = ({ setSearchVal, onSave, onChecked,role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const [form] = Form.useForm();
   const [checked, setChecked] = useState("多图单线")
   const options = [
diff --git a/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js
index 941284f68..f5dfb2b3d 100644
--- a/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js
@@ -8,8 +8,8 @@ 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 == "导出");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  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 dataSo;
diff --git a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
index c07415bde..4a9b5bb08 100644
--- a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
@@ -8,8 +8,8 @@ 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 == "导出");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  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 () => {
diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js
index d2b07665a..b2e0b9540 100644
--- a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js
@@ -8,8 +8,8 @@ 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 == "导出");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  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 dataSo;
diff --git a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js b/src/views/gcaqjc/sjtjcx/sljc/toolbar.js
index 36c97f42b..8d99e6ea3 100644
--- a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/sljc/toolbar.js
@@ -7,7 +7,7 @@ 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 == "查询");
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const optionsType = [
     {
       label: "今日",
diff --git a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js
index d78af7fe8..71e71249d 100644
--- a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js
@@ -9,7 +9,7 @@ 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 == "查询");
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const optionsType = [
     {
       label: "今日",
diff --git a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js b/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js
index d0d9c0fad..9386de1f8 100644
--- a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js
@@ -9,7 +9,7 @@ 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 == "查询");
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   
   const optionsType = [
     {
diff --git a/src/views/rcgl/aqgl/aqjcgl/index.js b/src/views/rcgl/aqgl/aqjcgl/index.js
index 3713877e3..883d801f4 100644
--- a/src/views/rcgl/aqgl/aqjcgl/index.js
+++ b/src/views/rcgl/aqgl/aqjcgl/index.js
@@ -13,9 +13,9 @@ 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 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: "年度检查",
diff --git a/src/views/rcgl/aqgl/aqjcgl/toolbar.js b/src/views/rcgl/aqgl/aqjcgl/toolbar.js
index a6ec2661d..dc60c9dae 100644
--- a/src/views/rcgl/aqgl/aqjcgl/toolbar.js
+++ b/src/views/rcgl/aqgl/aqjcgl/toolbar.js
@@ -4,8 +4,8 @@ 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 addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
diff --git a/src/views/rcgl/aqgl/aqjdtz/toolbar.js b/src/views/rcgl/aqgl/aqjdtz/toolbar.js
index c2f9955fb..cc0fe6a6e 100644
--- a/src/views/rcgl/aqgl/aqjdtz/toolbar.js
+++ b/src/views/rcgl/aqgl/aqjdtz/toolbar.js
@@ -4,7 +4,7 @@ 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 addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
diff --git a/src/views/rcgl/aqgl/aqsgdj/index.js b/src/views/rcgl/aqgl/aqsgdj/index.js
index ab0a7e760..175030b1f 100644
--- a/src/views/rcgl/aqgl/aqsgdj/index.js
+++ b/src/views/rcgl/aqgl/aqsgdj/index.js
@@ -13,9 +13,9 @@ 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 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: "较大事故",
diff --git a/src/views/rcgl/aqgl/aqsgdj/toolbar.js b/src/views/rcgl/aqgl/aqsgdj/toolbar.js
index bdf7d18b0..d268b5810 100644
--- a/src/views/rcgl/aqgl/aqsgdj/toolbar.js
+++ b/src/views/rcgl/aqgl/aqsgdj/toolbar.js
@@ -4,8 +4,8 @@ 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 addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
diff --git a/src/views/rcgl/aqgl/aqyhpc/index.js b/src/views/rcgl/aqgl/aqyhpc/index.js
index da9071da7..6194d08a7 100644
--- a/src/views/rcgl/aqgl/aqyhpc/index.js
+++ b/src/views/rcgl/aqgl/aqyhpc/index.js
@@ -13,9 +13,9 @@ 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 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 = [
diff --git a/src/views/rcgl/aqgl/aqyhpc/toolbar.js b/src/views/rcgl/aqgl/aqyhpc/toolbar.js
index fb8a13ac4..0cadf8be0 100644
--- a/src/views/rcgl/aqgl/aqyhpc/toolbar.js
+++ b/src/views/rcgl/aqgl/aqyhpc/toolbar.js
@@ -4,8 +4,8 @@ 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 addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
diff --git a/src/views/rcgl/aqgl/cxjgtz/index.js b/src/views/rcgl/aqgl/cxjgtz/index.js
index bdf43b363..7bc850e69 100644
--- a/src/views/rcgl/aqgl/cxjgtz/index.js
+++ b/src/views/rcgl/aqgl/cxjgtz/index.js
@@ -13,9 +13,9 @@ 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 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: "中央规划",
diff --git a/src/views/rcgl/aqgl/cxjgtz/toolbar.js b/src/views/rcgl/aqgl/cxjgtz/toolbar.js
index c2f9955fb..cc0fe6a6e 100644
--- a/src/views/rcgl/aqgl/cxjgtz/toolbar.js
+++ b/src/views/rcgl/aqgl/cxjgtz/toolbar.js
@@ -4,7 +4,7 @@ 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 addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
diff --git a/src/views/rcgl/aqgl/fxgkqd/index.js b/src/views/rcgl/aqgl/fxgkqd/index.js
index bdb404173..c5287ea72 100644
--- a/src/views/rcgl/aqgl/fxgkqd/index.js
+++ b/src/views/rcgl/aqgl/fxgkqd/index.js
@@ -16,9 +16,9 @@ const Page = () => {
   const role = useSelector(state => state.auth.role);
   console.log(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 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: "一般风险",
diff --git a/src/views/rcgl/aqgl/fxgkqd/toolbar.js b/src/views/rcgl/aqgl/fxgkqd/toolbar.js
index 65ed72e43..217b383b3 100644
--- a/src/views/rcgl/aqgl/fxgkqd/toolbar.js
+++ b/src/views/rcgl/aqgl/fxgkqd/toolbar.js
@@ -6,7 +6,7 @@ const { RangePicker } = DatePicker;
 const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
   console.log("role",role);
   
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
+  const addBtn = role?.rule?.find(item => item.menuName == "新增")||true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
diff --git a/src/views/rcgl/btbb/rjswnbb/toolbar.js b/src/views/rcgl/btbb/rjswnbb/toolbar.js
index 864ac1c8f..19d291e46 100644
--- a/src/views/rcgl/btbb/rjswnbb/toolbar.js
+++ b/src/views/rcgl/btbb/rjswnbb/toolbar.js
@@ -4,8 +4,8 @@ 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 == "查询");
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出");
+  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 dataSo;
diff --git a/src/views/rcgl/btbb/rjynbb/toolbar.js b/src/views/rcgl/btbb/rjynbb/toolbar.js
index 864ac1c8f..19d291e46 100644
--- a/src/views/rcgl/btbb/rjynbb/toolbar.js
+++ b/src/views/rcgl/btbb/rjynbb/toolbar.js
@@ -4,8 +4,8 @@ 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 == "查询");
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出");
+  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 dataSo;
diff --git a/src/views/rcgl/btbb/sdjyrbb/toolbar.js b/src/views/rcgl/btbb/sdjyrbb/toolbar.js
index ad3d74d34..6ba297651 100644
--- a/src/views/rcgl/btbb/sdjyrbb/toolbar.js
+++ b/src/views/rcgl/btbb/sdjyrbb/toolbar.js
@@ -4,8 +4,8 @@ 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 == "查询");
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出");
+  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 dataSo;
diff --git a/src/views/rcgl/btbb/sdswrbb/toolbar.js b/src/views/rcgl/btbb/sdswrbb/toolbar.js
index ad3d74d34..6ba297651 100644
--- a/src/views/rcgl/btbb/sdswrbb/toolbar.js
+++ b/src/views/rcgl/btbb/sdswrbb/toolbar.js
@@ -4,8 +4,8 @@ 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 == "查询");
-  const exportBtn = role?.rule?.find(item => item.menuName == "导出");
+  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 dataSo;
diff --git a/src/views/rcgl/byfz/bypc/index.js b/src/views/rcgl/byfz/bypc/index.js
index a44e4554c..41e0d6977 100644
--- a/src/views/rcgl/byfz/bypc/index.js
+++ b/src/views/rcgl/byfz/bypc/index.js
@@ -13,9 +13,9 @@ 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 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: "定期普查",
diff --git a/src/views/rcgl/byfz/bypc/toolbar.js b/src/views/rcgl/byfz/bypc/toolbar.js
index 2f6169908..2e10c2000 100644
--- a/src/views/rcgl/byfz/bypc/toolbar.js
+++ b/src/views/rcgl/byfz/bypc/toolbar.js
@@ -5,8 +5,8 @@ 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 == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  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) => {
diff --git a/src/views/rcgl/byfz/fzxc/index.js b/src/views/rcgl/byfz/fzxc/index.js
index 3107f341a..373e4cf5b 100644
--- a/src/views/rcgl/byfz/fzxc/index.js
+++ b/src/views/rcgl/byfz/fzxc/index.js
@@ -13,7 +13,7 @@ const Page = () => {
   const role = useSelector(state => state.auth.role);
   console.log("role",role);
   
-  const uploadBtn = role?.rule?.find(item => item.menuName == "上传");
+  const uploadBtn = role?.rule?.find(item => item.menuName == "上传") || true;
   const refModal = useRef();
   const [fileList, setFileList] = useState([]) //上传文件列表
   const [loading, setLoading] = useState(false)
diff --git a/src/views/rcgl/byfz/fzxc/toolbar.js b/src/views/rcgl/byfz/fzxc/toolbar.js
index 65ed72e43..46076442c 100644
--- a/src/views/rcgl/byfz/fzxc/toolbar.js
+++ b/src/views/rcgl/byfz/fzxc/toolbar.js
@@ -6,7 +6,7 @@ const { RangePicker } = DatePicker;
 const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
   console.log("role",role);
   
-  const addBtn = role?.rule?.find(item => item.menuName == "新增");
+  const addBtn = role?.rule?.find(item => item.menuName == "新增") || true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {
diff --git a/src/views/rcgl/jdkh/khmbgl/index.js b/src/views/rcgl/jdkh/khmbgl/index.js
index 2bad1ff84..999832098 100644
--- a/src/views/rcgl/jdkh/khmbgl/index.js
+++ b/src/views/rcgl/jdkh/khmbgl/index.js
@@ -13,8 +13,8 @@ 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 delBtn = role?.rule?.find(item => item.menuName == "删除");
+  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" },
diff --git a/src/views/rcgl/jdkh/khmbgl/toolbar.js b/src/views/rcgl/jdkh/khmbgl/toolbar.js
index 4a84dedea..977b0c00f 100644
--- a/src/views/rcgl/jdkh/khmbgl/toolbar.js
+++ b/src/views/rcgl/jdkh/khmbgl/toolbar.js
@@ -4,7 +4,7 @@ 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 addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
   const [form] = Form.useForm();
   const onFinish = (values) => {
     setSearchVal({...values});
diff --git a/src/views/rcgl/jdkh/khrwgl/index.js b/src/views/rcgl/jdkh/khrwgl/index.js
index 1ec5eb852..2eec0a2a6 100644
--- a/src/views/rcgl/jdkh/khrwgl/index.js
+++ b/src/views/rcgl/jdkh/khrwgl/index.js
@@ -14,7 +14,7 @@ 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 == "清单");
+  const qd = role?.rule?.find(item => item.menuName == "清单") || true;
   const khLevel = {
     1: "优秀",
     2: "良好",
diff --git a/src/views/rcgl/jdkh/khrwgl/toolbar.js b/src/views/rcgl/jdkh/khrwgl/toolbar.js
index 1c8782264..8b3aa35dd 100644
--- a/src/views/rcgl/jdkh/khrwgl/toolbar.js
+++ b/src/views/rcgl/jdkh/khrwgl/toolbar.js
@@ -4,7 +4,7 @@ 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 == "新增");
+  const addBtn = role?.rule?.find(item => item.menuName == "新增") || true;
   const types = [
     {label:"未启动",value:0},
     {label:"评分中",value:1},
diff --git a/src/views/rcgl/jdkh/khzbgl/index.js b/src/views/rcgl/jdkh/khzbgl/index.js
index c95aa288c..354896dee 100644
--- a/src/views/rcgl/jdkh/khzbgl/index.js
+++ b/src/views/rcgl/jdkh/khzbgl/index.js
@@ -14,8 +14,8 @@ 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 delBtn = role?.rule?.find(item => item.menuName == "删除");
+  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" },
diff --git a/src/views/rcgl/wxyh/index.js b/src/views/rcgl/wxyh/index.js
index 39376b582..ffd2a5c45 100644
--- a/src/views/rcgl/wxyh/index.js
+++ b/src/views/rcgl/wxyh/index.js
@@ -13,9 +13,9 @@ 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 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: '溢洪道淸障',
diff --git a/src/views/rcgl/wxyh/toolbar.js b/src/views/rcgl/wxyh/toolbar.js
index 38120d753..b479927b0 100644
--- a/src/views/rcgl/wxyh/toolbar.js
+++ b/src/views/rcgl/wxyh/toolbar.js
@@ -5,8 +5,8 @@ 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 == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
 
   const types = [
     {label:"溢洪道淸障",value:1},
diff --git a/src/views/rcgl/xcxj/xjrw/index.js b/src/views/rcgl/xcxj/xjrw/index.js
index c3ce41209..64f70cfc7 100644
--- a/src/views/rcgl/xcxj/xjrw/index.js
+++ b/src/views/rcgl/xcxj/xjrw/index.js
@@ -14,9 +14,9 @@ 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 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: "进行中",
diff --git a/src/views/rcgl/xcxj/xjrw/toolbar.js b/src/views/rcgl/xcxj/xjrw/toolbar.js
index 1d24b58c2..521eb6fbf 100644
--- a/src/views/rcgl/xcxj/xjrw/toolbar.js
+++ b/src/views/rcgl/xcxj/xjrw/toolbar.js
@@ -5,8 +5,8 @@ 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 == "创建任务");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  const addBtn = role?.rule?.find(item => item.menuName == "创建任务")||true;
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
 
   const types = [
     {label:"日常巡查",value:1},
diff --git a/src/views/spjk/aiWarn/toolbar.js b/src/views/spjk/aiWarn/toolbar.js
index 68c7eab9a..84dc0187a 100644
--- a/src/views/spjk/aiWarn/toolbar.js
+++ b/src/views/spjk/aiWarn/toolbar.js
@@ -6,7 +6,7 @@ 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 == "查询");  
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;  
   
   const warnTypes = [
     {
diff --git a/src/views/sz/zzjgck/index.js b/src/views/sz/zzjgck/index.js
new file mode 100644
index 000000000..9a9e274df
--- /dev/null
+++ b/src/views/sz/zzjgck/index.js
@@ -0,0 +1,23 @@
+import React, { useState, useMemo, useEffect } from 'react'
+import ReactEcharts from 'echarts-for-react';
+import jgOption from './jgoption'
+import "./index.less"
+export default function Zzjgck() {
+
+    const jgOptions = useMemo(() => {
+        return jgOption();
+      }, [])
+  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
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
new file mode 100644
index 000000000..c2a9b57ac
--- /dev/null
+++ b/src/views/sz/zzjgck/jgoption.js
@@ -0,0 +1,137 @@
+export default function jgOption() {
+  return {
+        tooltip: {
+          trigger: "item",
+          triggerOn: "mousemove",
+          color: "#fff",
+          backgroundColor: "skyblue",
+          borderColor: "skyblue",
+        },
+        animationDurationUpdate: 1500,
+        animationEasingUpdate: "quinticInOut",
+        series: [
+          {
+            type: "tree",
+            symbolSize: 75,
+            symbol: "roundRect",
+            edgeShape: "polyline",
+            edgeForkPosition: "50%",
+            edgeSymbol: ["circle", "arrow"],
+            edgeSymbolSize: [4, 10],
+            edgeLabel: {
+              normal: {
+                textStyle: {
+                  fontSize: 18,
+                },
+              },
+            },
+            initialTreeDepth: 2,
+            orient: "vertical",
+      
+            itemStyle: {
+              color: "#FFC125",
+              borderColor: "#FFC125",
+            },
+            roam: true, // 可移动,可缩放
+            expandAndCollapse: true,
+            animationDuration: 550,
+            animationDurationUpdate: 750,
+            //线条的颜色
+            lineStyle: {
+              normal: {
+                opacity: 0.9,
+                color: "#93beff",
+                // type: "dashed",
+                width: 2,
+              },
+            },
+      
+            label: {
+              show: true,
+              position: "inside",
+              textStyle: {
+                fontSize: 15,
+                color: "#fff",
+              },
+            },
+      
+            leaves: {
+              label: {
+                position: "inside",
+                color: "#fff",
+              },
+              itemStyle: {
+                color: "#dfdfdf",
+                borderColor: "#dfdfdf",
+              },
+            },
+      
+            data: [
+              {
+                name: "根节点",
+                url: "",
+                // 根节点样式设置
+                itemStyle: {
+                  color: "#18a849",
+                  borderColor: "#18a849",
+                },
+                children: [
+                  {
+                    name: "子节点1",
+                    children: [
+                      {
+                        name: "叶子节点1",
+                        itemStyle: {
+                          color: "#5470C6",
+                          borderColor: "#5470C6",
+                        },
+                      },
+                      {
+                        name: "叶子节点2",
+                        itemStyle: {
+                          color: "#5470C6",
+                          borderColor: "#5470C6",
+                        },
+                      },
+                      {
+                        name: "叶子节点3",
+                        itemStyle: {
+                          color: "#5470C6",
+                          borderColor: "#5470C6",
+                        },
+                      },
+                    ],
+                  },
+                  {
+                    name: "子节点2",
+                    children: [
+                      {
+                        name: "叶子节点4",
+                        itemStyle: {
+                          color: "#5470C6",
+                          borderColor: "#5470C6",
+                        },
+                      },
+                      {
+                        name: "叶子节点5",
+                        itemStyle: {
+                          color: "#5470C6",
+                          borderColor: "#5470C6",
+                        },
+                      },
+                      {
+                        name: "叶子节点6",
+                        itemStyle: {
+                          color: "#5470C6",
+                          borderColor: "#5470C6",
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      };
+}
\ No newline at end of file
diff --git a/src/views/zbgl/zbrz/index.js b/src/views/zbgl/zbrz/index.js
index 3478fc93d..8a091a22e 100644
--- a/src/views/zbgl/zbrz/index.js
+++ b/src/views/zbgl/zbrz/index.js
@@ -17,9 +17,9 @@ 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 == "编辑");
+  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 == "删除");
+  const delBtn = role?.rule?.find(item => item.menuName == "删除")|| true;
   const refModal = useRef();
   const [searchVal, setSearchVal] = useState(false)
 
diff --git a/src/views/zbgl/zbrz/toolbar.js b/src/views/zbgl/zbrz/toolbar.js
index c60bdb018..f86e904ca 100644
--- a/src/views/zbgl/zbrz/toolbar.js
+++ b/src/views/zbgl/zbrz/toolbar.js
@@ -5,8 +5,8 @@ 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 == "新增");
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  const addBtn = role?.rule?.find(item => item.menuName == "新增")|| true;
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")|| true;
   const [form] = Form.useForm();