14 changed files with 116 additions and 212 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -50,7 +50,6 @@
        "react-cookies": "^0.1.1",
        "react-dom": "^18.2.0",
        "react-konva": "^18.2.3",
-        "react-org-tree": "^1.0.1",
        "react-pdf": "^7.3.3",
        "react-redux": "^8.0.2",
        "react-rnd": "^10.4.11",
@ -18884,14 +18883,6 @@
      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
    },
-    "node_modules/react-org-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/react-org-tree/-/react-org-tree-1.0.1.tgz",
-      "integrity": "sha512-NK1d8VIAzxJyMC/Rx9MupAusoFnokYr81Hw3oEpqxqBLQmpBVAexjvPSAJmhCmsom9Zymu+BMNrjRw5D54n7aw==",
-      "dependencies": {
-        "classnames": "^2.2.6"
-      }
-    },
    "node_modules/react-pdf": {
      "version": "7.3.3",
      "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-7.3.3.tgz",
--- a/package.json
+++ b/package.json
@ -45,7 +45,6 @@
    "react-cookies": "^0.1.1",
    "react-dom": "^18.2.0",
    "react-konva": "^18.2.3",
-    "react-org-tree": "^1.0.1",
    "react-pdf": "^7.3.3",
    "react-redux": "^8.0.2",
    "react-rnd": "^10.4.11",
--- a/src/models/auth/_.ts
+++ b/src/models/auth/_.ts
@ -289,9 +289,8 @@ export async function loadMenu(): Promise<MenuItem[]> {
            }
          ]
        },
-        { id: id(), title: '制度管理', path: '/mgr/sz/zdgl' },
        { id: id(), title: '法律法规', path: '/mgr/sz/flfg' },
-        
+        { id: id(), title: '制度管理', path: '/mgr/sz/zdgl' },

      ]
    },
--- a/src/views/gcaqjc/bzt/index.less
+++ b/src/views/gcaqjc/bzt/index.less
@ -29,7 +29,7 @@
      top: 30px;
      border-radius: 5px;
      border: 1px solid #eee;
-    
+      transition: all 0.2s ease 0s;

      .ant-tabs-nav{
        margin-bottom: 5px;
--- a/src/views/sq/qys/xyys/index.js
+++ b/src/views/sq/qys/xyys/index.js
@ -11,13 +11,8 @@ const Page = () => {
                    <Image src={title} />保护对象
                </div>
                <div className={styles.content}>
-                    水库防洪标准按
-                    <span className={styles.color}>50</span>
-                    年一遇设计，<span className={styles.color}>1000</span>年一遇校核，设计洪水位<span className={styles.color}>111.51</span>米，
-                    校核洪水位 <span className={styles.color}>112.75</span> 米,
-                    水库担负着红安县城、七里坪、杏花、城关等城镇，
-                    以及京九铁路汉麻连络线、省道S234、国道G230,京九铁路汉麻联络线等交通设施安全的防洪重任、防洪保护人口<span className={styles.color}>32</span>万
-                    人，保护耕地 <span className={styles.color}>15</span> 万亩。
+                    水库防洪标准按50年一遇设计，1000年一遇校核，设计洪水位111.51米，校核洪水位 112.75 米,水库担负着红安县城、七里坪、杏花、城关等城镇，以及京九铁路汉麻连络线、省道S234、国道G230,京九铁路汉麻联络线等交通设施安全的防洪重任、防洪保护人口32万
+                    人，保护耕地 15 万亩。
                </div>

            </div>
--- a/src/views/sq/qys/xyys/index.module.less
+++ b/src/views/sq/qys/xyys/index.module.less
@ -8,6 +8,3 @@
    font-size: 17px;
    padding: 0 20px;
 }
-.color{
-    color: #409eff;
-}
--- a/src/views/sz/flfg/form.js
+++ b/src/views/sz/flfg/form.js
@ -223,7 +223,6 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                  onDrop={(info) => { console.log(info.dataTransfer.files); }}
                  fileList={fileList}
                  disabled={loading}
-                  maxCount={1}
                // onSuccess={handleSuccess}
                >
                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
--- a/src/views/sz/flfg/index.js
+++ b/src/views/sz/flfg/index.js
@ -48,7 +48,7 @@ const Page = () => {
            title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate'
        },
        {
-            title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate'
+            title: '上传时间', key: 'eventsDesc', dataIndex: 'eventsDesc'
        },
        {
            title: '附件', key: 'files', dataIndex: 'files',render:(v,r)=><a onClick={()=>download(v[0].fileId,v[0]?.fileName)}><PaperClipOutlined />{v[0]?.fileName}</a>
--- a/src/views/sz/szzf/ajdj/bajz.js
+++ b/src/views/sz/szzf/ajdj/bajz.js
@ -39,7 +39,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
    const [isModal, setIsModal] = useState(false)
    const getInfo = () => {
        form.validateFields().then((values) => {
-            getFormInfo({ ...fileListHj,...values,  })
+            getFormInfo({ ...values, ...fileListHj })
+            form.resetFields()
            setFileList([])
        }).catch((errorInfo) => {
            console.log(errorInfo, 'error');
@ -130,9 +131,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {

    }
    useEffect(() => {
-        
        setFileHj(formJsonData)
-        form.setFieldsValue(formJsonData)
    }, [])
    return (
        <Form form={form} onFinish={onFinish} >
--- a/src/views/sz/szzf/ajdj/config.js
+++ b/src/views/sz/szzf/ajdj/config.js
@ -1,85 +1,4 @@

-const treeData = [
-    {
-      value: '行政处理',
-      title: '行政处理',
-      children: [
-        {
-          value: '责令停止违法行为',
-          title: '责令停止违法行为',
-        },
-        {
-          value: '责令补办许可手续',
-          title: '责令补办许可手续',
-        },
-        {
-            value: '责令限期拆除',
-            title: '责令限期拆除',
-          },
-          {
-            value: '责令采取补救措施',
-            title: '责令采取补救措施',
-          },
-          {
-            value: '责令停止施工',
-            title: '责令停止施工',
-          },
-          {
-            value: '责令赔偿损失',
-            title: '责令赔偿损失',
-          },
-      ],
-    },
-    {
-        value: '行政处罚',
-        title: '行政处罚',
-        children: [
-          {
-            value: '警告',
-            title: '警告',
-          },
-          {
-            value: '罚款',
-            title: '罚款',
-          },
-          {
-            value: '没收违法所得、非法财产',
-            title: '没收违法所得、非法财产',
-          },
-          {
-            value: '责令停产停业',
-            title: '责令停产停业',
-          },
-          {
-            value: '暂扣许可证、执照',
-            title: '暂扣许可证、执照',
-          },
-          {
-            value: '吊销许可证、执照',
-            title: '吊销许可证、执照',
-          },
-
-        ],
-      },
-      {
-        value: '行政强制措施',
-        title: '行政强制措施',
-        children: [
-          {
-            value: '查封或扣押设施',
-            title: '查封或扣押设施',
-          },
-          {
-            value: '查封或扣罚财务',
-            title: '查封或扣罚财务',
-          },
-          {
-            value: '其他',
-            title: '其他',
-          },
-        ],
-      },
-  ];
 const basicData = [
    {
        label: '填报人',
@ -157,7 +76,7 @@ const basicData = [
    },
    {
        label: '违法时间',
-        key: 'illegalDate',
+        key: 'IllegalDate',
        type: 'DatePicker',
        span: 12
    },
@ -225,17 +144,14 @@ const clqkData = [
    {
        label: '处理依据',
        key: 'treatmentBasis',
-        type: 'TreeSelect',
+        type: 'input',
        span: 12,
-        treeData:[],
-        fieldNames:{label: 'legalName', value: 'legalName', children: 'children'}
    },
    {
        label: '处理措施',
        key: 'treatmentMeasure',
-        type: 'TreeSelect',
-        span: 12,
-        treeData:treeData
+        type: 'Select',
+        span: 12
    },
    {
        label: '移送处理情况',
@ -272,7 +188,6 @@ const clqkData = [
    {
        label: '直接损失金额(万元)',
        key: 'directLossAmount',
-        labelCol:{span:7},
        type: 'input',
        span: 12
    },
--- a/src/views/sz/szzf/ajdj/editTabs.js
+++ b/src/views/sz/szzf/ajdj/editTabs.js
@ -33,23 +33,11 @@ const items = [

 const Page = ({ mode, onCrudSuccess,record,submit }) => {
    const [formData,setFormData] =useState({})
-    const [clqkDataConfig,setConfig] =useState([])
-
    // debugger;
    const [key, setKeys] = useState('1')
-    const onChange = async(key) => {
+    const onChange = (key) => {
        console.log(key);
        setKeys(key)
-        if(key == 2){
-            const res = await httpget(apiurl.szzf.clyj.tree)
-            const arr = clqkData.map(item=>{
-                if(item.key == 'treatmentBasis'){
-                    item.treeData = res.data
-                }
-                return item
-            })
-            setConfig(arr)
-        }
    };
    const getFormInfo = (e) => {
        if(!e){
@ -60,7 +48,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => {
            ...formData,
            ...e,
            caseDate: dayjs(e.caseDate).format("YYYY-MM-DD HH:mm:ss"),
-            illegalDate: e.illegalDate ? dayjs(e.v).format("YYYY-MM-DD HH:mm:ss") : e.illegalDate,
+            IllegalDate: e.IllegalDate ? dayjs(e.IllegalDate).format("YYYY-MM-DD HH:mm:ss") : e.IllegalDate,
        }
        
        if (mode == 'save') {
@ -92,8 +80,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => {
    }
    useEffect(()=>{
        if(mode == 'edit' || mode =='view'){
-            httpget(apiurl.szzf.ajdj.detail + record.id).then(async res=>{
-           
+            httpget(apiurl.szzf.ajdj.detail + record.id).then(res=>{
                let obj = {
                    createName: localStorage.getItem('userName'),
                    createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
@ -102,12 +89,12 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => {
                if(res.data?.caseDate){
                    obj.caseDate=dayjs(res.data.caseDate)
                }
-                if(res.data?.illegalDate){
-                    obj.illegalDate=dayjs(res.data.illegalDate)
-                }
-                // if(res.data.IllegalDate){
-                //     obj.IllegalDate = dayjs(res.data.IllegalDate)
+                // if(res.data?.illegalDate){
+                //     obj.illegalDate=dayjs(res.data.illegalDate)
                // }
+                if(res.data.IllegalDate){
+                    obj.IllegalDate = dayjs(res.data.IllegalDate)
+                }
               
                setFormData({...res.data,...obj})
            })
@ -126,7 +113,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => {
            <Tabs defaultActiveKey="1" items={items} onChange={onChange} />
            <>
                {key == 1 && <BascForm formJson={basicData} formJsonData={formData} fileKey='files1'type={mode} getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></BascForm>}
-                {key == 2 && <BascForm formJson={clqkDataConfig} fileKey='files2' formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></BascForm>}
+                {key == 2 && <BascForm formJson={clqkData} fileKey='files2' formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></BascForm>}
                {key == 3 && <BascForm formJson={xzfy} formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></BascForm>}
                {key == 4 && <Bajz formJson={xzfy} formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></Bajz>}
                {key == 5 && <Lsyx formJson={xzfy} formJsonData={formData} type={mode}  getFormInfo={getFormInfo} uploadUrl={apiurl.szzf.ajdj.upload} downloadUrl={apiurl.szzf.ajdj.download}></Lsyx>}
--- a/src/views/sz/szzf/form/index.js
+++ b/src/views/sz/szzf/form/index.js
@ -166,7 +166,6 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
                                    <Form.Item
                                        label={item.label}
                                        name={item.key}
-                                        labelCol={item.labelCol}
                                        rules={[{ required: item.required, message: '请输入' + item.label }]}
                                    >
                                        <Input disabled={type == 'view' || item.disabled} placeholder={item.placeholder} addonAfter={item.addonAfter}/>
--- a/src/views/sz/zdgl/form.js
+++ b/src/views/sz/zdgl/form.js
@ -178,7 +178,6 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                  onDrop={(info) => { console.log(info.dataTransfer.files); }}
                  fileList={fileList}
                  disabled={loading}
-                  maxCount={1}
                // onSuccess={handleSuccess}
                >
                  <p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
--- a/src/views/sz/zzjgck/jgoption.js
+++ b/src/views/sz/zzjgck/jgoption.js
@ -1,6 +1,6 @@

 export default function jgOption(data1) {
-  console.log("123", data1);
+  console.log("123",data1);
  const one = `${process.env.PUBLIC_URL}/assets/images/one.png`;
  const two = `${process.env.PUBLIC_URL}/assets/images/two.png`;
  const three = `${process.env.PUBLIC_URL}/assets/images/three.png`;
@ -17,9 +17,9 @@ export default function jgOption(data1) {
 			right: '25%',
 			avoidLabelOverlap: true,//防止标签重叠
 			roam: true, //移动+缩放  'scale' 或 'zoom'：只能够缩放。 'move' 或 'pan'：只能够平移。
-      scaleLimit: { //缩放比例
-        min: 0.7,//最小的缩放值
-        max: 4,//最大的缩放值  
+			scaleLimit:{ //缩放比例
+				min:0.7,//最小的缩放值
+				max:4,//最大的缩放值  
 		    },
 			layout: 'orthogonal',//树图布局，orthogonal水平垂直方向，radial径向布局 是指以根节点为圆心，每一层节点为环，一层层向外
 			orient: 'TB', //树形方向  TB为上下结构  LR为左右结构
@ -45,10 +45,37 @@ export default function jgOption(data1) {
        align: 'center', // 文字水平对齐方式，默认自动，left，right，center
        fontSize: 16, // 字体大小
        color: '#000', // 字体颜色
-        overflow: 'breakAll',
        formatter: (params) => {
-          let len = params.data.title
-          let str = `{parent3|${len}}`
+          let newName = ''
+          let len = params.data.title.length
+          let strLen = (params.data.parentId === 0 || params.data.parentId === 100 ) ? 100 : 1 //一行显示几个字
+          let rowNum = Math.ceil(len / strLen)
+          if (len > strLen) {
+          
+            for (let p = 0; p < rowNum; p++) {
+              let tempStr = ''
+              let start = p * strLen
+              let end = start + strLen
+              if (p == rowNum - 1) {
+                tempStr = params.data.title.substring(start, len)
+              } else {
+                tempStr = params.data.title.substring(start, end) + '\n'
+              }
+              newName += tempStr
+            }
+          } else {
+            newName = params.data.title
+          }
+          let n = newName
+          if (n.length > 16) {
+            n = n.slice(0, 16) + '...'
+          }
+          let parentId = params.data.parentId
+          let userId = params.data.userId;
+          let str = parentId === 0 ? `{parent|${n}}` : 
+            parentId === 100 ? `{parent1|${n}}` : userId != undefined ? `{parent3|${n}}` : `{parent2|${n}}`
+            // let str = parentId === 0 ? `<div class='org-parent'>${n}</div>` :
+          // parentId === 100 ? `<div class='org-parent1'>${n}</div>` : userId != undefined ? `<div class='org-parent3'>${n}</div>` : `<div class='org-parent2'>${n}</div>`
          return  str;
        },
     
@ -57,16 +84,16 @@ export default function jgOption(data1) {
            color: '#000',
            padding: [20, 20],
            backgroundColor: {
-              image: one
+              image:one
            },
-            height: 40,
+            
            fontSize: 20
          },
          parent1: {
            color: '#000',
            padding: [10, 10],
            backgroundColor: {
-              image: two
+              image:two
            },
            fontSize: 18
          },
@ -83,8 +110,6 @@ export default function jgOption(data1) {
          parent3: {
            color: '#000',
            padding: [10, 10],
-            width:10,
-            overflow:'break',
            backgroundColor: {
              image: four,
              repeat: "no-repeat",
@ -99,7 +124,7 @@ export default function jgOption(data1) {
 				label: {
 					// backgroundColor: '#81c5f7',
 					backgroundColor: '#fff',
-          color: '#333',
+					color:'#333',
 					position: 'bottom',
 					rotate: 0,//标签旋转。
 					verticalAlign: 'middle',
@ -115,8 +140,8 @@ export default function jgOption(data1) {
 					//  return str
 				  //  },
 				   //或者 
-          overflow: 'break',//break为文字折行，  truncate为文字超出部分省略号显示
-          lineOverflow: 'truncate',//文字超出高度后 直接截取
+				   overflow:'break',//break为文字折行，  truncate为文字超出部分省略号显示
+				   lineOverflow:'truncate',//文字超出高度后 直接截取
 				}
 			},
 			expandAndCollapse: true, //默认展开树形结构