From 9198ccfa24524b60cefd056c61ec305708212a86 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Wed, 19 Mar 2025 13:26:44 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MapCtrl/components/Sqjcsj/drpOption.js    |   4 +-
 src/views/rcgl/xcxj/xjrw/detailForm.js        |   2 +-
 src/views/rcgl/xcxj/xjrw/form.js              |   6 +-
 src/views/sz/flfg/form.js                     |   8 +-
 src/views/sz/flfg/index.js                    |   6 +-
 src/views/sz/flfg/toolbar.js                  |   4 +-
 src/views/sz/pxjhgl/form.js                   |   2 +-
 src/views/sz/pxjlgl/index.js                  |   5 +-
 src/views/sz/szzf/ajdj/bajz.js                |   2 +-
 src/views/sz/szzf/ajdj/lsyx.js                |   2 +-
 src/views/sz/szzf/ajdj/toolbar.js             |  10 +-
 src/views/sz/szzf/clyj/content.js             |   2 +-
 src/views/sz/szzf/clyj/treeSelectZdy.js       |  18 ++-
 src/views/sz/szzf/form/index.js               |  14 +-
 src/views/sz/zdgl/index.js                    |   2 +-
 src/views/sz/zzjgck/index.js                  | 139 +++++++++++++++---
 src/views/sz/zzjgck/jgoption.js               |   4 +-
 17 files changed, 179 insertions(+), 51 deletions(-)

diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js b/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js
index 40704cfc0..fb96b1f1a 100644
--- a/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js
+++ b/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js
@@ -30,7 +30,7 @@ export default function drpOption({ data, wrz, grz }) {
       // 显示图例
       show: true,
       // 图例的位置
-      data: ['警戒水位', '危险水位', "降雨量", "水位", "转换流量"],
+      data: ['警戒水位', '保证水位', "降雨量", "水位", "转换流量"],
     },
     xAxis: [
       {
@@ -165,7 +165,7 @@ export default function drpOption({ data, wrz, grz }) {
       {
         xAxisIndex: 1,
         yAxisIndex: 1,
-        name: '危险水位',
+        name: '保证水位',
         type: 'line',
         color: "#D9001B",
         lineStyle: {
diff --git a/src/views/rcgl/xcxj/xjrw/detailForm.js b/src/views/rcgl/xcxj/xjrw/detailForm.js
index b35dddc2e..42d71aa9d 100644
--- a/src/views/rcgl/xcxj/xjrw/detailForm.js
+++ b/src/views/rcgl/xcxj/xjrw/detailForm.js
@@ -425,7 +425,7 @@ console.log(record);
                 <Col span={24}>
                 <Form.Item
                 label="处理描述"
-                name="itemProblemDesc"
+                name="handleDesc"
                 labelCol={{ span: 3 }}
                 wrapperCol={{ span: 19 }}
                 >
diff --git a/src/views/rcgl/xcxj/xjrw/form.js b/src/views/rcgl/xcxj/xjrw/form.js
index 16ef5b328..5fe7efb0e 100644
--- a/src/views/rcgl/xcxj/xjrw/form.js
+++ b/src/views/rcgl/xcxj/xjrw/form.js
@@ -20,9 +20,9 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
   const [itemParams, setItemParams] = useState([])
   const [list, setList] = useState([])
   const taskTypes = [
-    {label:"日常巡查",value:0},
-    {label:"特别检查",value:1},
-    {label:"汛前巡检",value:2},
+    {label:"日常巡查",value:1},
+    {label:"特别检查",value:2},
+    {label:"汛前巡检",value:3},
   ]
   const [form] = Form.useForm();
 
diff --git a/src/views/sz/flfg/form.js b/src/views/sz/flfg/form.js
index b0198db00..8d94c0dfd 100644
--- a/src/views/sz/flfg/form.js
+++ b/src/views/sz/flfg/form.js
@@ -182,21 +182,21 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
           <Col span={12}>
             <Form.Item
               label="施行日期"
-              name="announcementDate"
+              name="implementationDate"
               getValueFromEvent={(e, dateString) => dateString}
               getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
             >
-              <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} allowClear />
+              <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD'} style={{ width: '100%' }} allowClear />
             </Form.Item>
           </Col>
           <Col span={12}>
             <Form.Item
               label="公布日期"
-              name="implementationDate"
+              name="announcementDate"
               getValueFromEvent={(e, dateString) => dateString}
               getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
             >
-              <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} allowClear />
+              <DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD'} style={{ width: '100%' }} allowClear />
             </Form.Item>
           </Col>
         </Row>
diff --git a/src/views/sz/flfg/index.js b/src/views/sz/flfg/index.js
index 54e3250ed..8c4b0ca66 100644
--- a/src/views/sz/flfg/index.js
+++ b/src/views/sz/flfg/index.js
@@ -44,16 +44,16 @@ const Page = () => {
         },
         {
             title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate',
-            render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
+            render: (value) => <span>{value ? dayjs(value).format('YYYY-MM-DD'):''}</span>, 
         },
         {
             title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate'
         },
         {
-            title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate'
+            title: '上传时间', key: 'createTime', dataIndex: 'createTime'
         },
         {
-            title: '附件', key: 'files', dataIndex: 'files',render:(v,r)=><a onClick={()=>download(v[0].fileId,v[0]?.fileName)}><PaperClipOutlined />{v[0]?.fileName}</a>
+            title: '附件', key: 'files', dataIndex: 'files', render: (v, r) => <a onClick={() => download(v[0].fileId, v[0]?.fileName)}>{ v[0]?.fileName ?<PaperClipOutlined />:''}{v[0]?.fileName}</a>
         },
         {
             title: '操作', key: 'operation',
diff --git a/src/views/sz/flfg/toolbar.js b/src/views/sz/flfg/toolbar.js
index e9dbbbe8c..178be5ace 100644
--- a/src/views/sz/flfg/toolbar.js
+++ b/src/views/sz/flfg/toolbar.js
@@ -18,12 +18,12 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
     if (values.implementationDate) {
       // 施行日期
       values.stmIm= values.implementationDate[0].format('YYYY-MM-DD HH:mm:ss')
-      values.etmIm= values.implementationDate[0].format('YYYY-MM-DD HH:mm:ss')
+      values.etmIm= values.implementationDate[1].format('YYYY-MM-DD HH:mm:ss')
     }
     if (values.uploadTime) {
       // 上传日期
       values.stmUd= values.uploadTime[0].format('YYYY-MM-DD HH:mm:ss')
-      values.etmUd= values.uploadTime[0].format('YYYY-MM-DD HH:mm:ss')
+      values.etmUd= values.uploadTime[1].format('YYYY-MM-DD HH:mm:ss')
     }
 
     delete values.announcementDate
diff --git a/src/views/sz/pxjhgl/form.js b/src/views/sz/pxjhgl/form.js
index fadc880ea..bf64abd4f 100644
--- a/src/views/sz/pxjhgl/form.js
+++ b/src/views/sz/pxjhgl/form.js
@@ -280,7 +280,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                 labelCol={{ span: 3 }}
                 wrapperCol={{ span: 19 }}
               >
-              <InputNumber min={0} disabled={mode==='view'} style={{width:'100%'}} allowClear />
+             <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
               </Form.Item>
           </Col>
         </Row>
diff --git a/src/views/sz/pxjlgl/index.js b/src/views/sz/pxjlgl/index.js
index 38d9ace51..3f3722902 100644
--- a/src/views/sz/pxjlgl/index.js
+++ b/src/views/sz/pxjlgl/index.js
@@ -30,7 +30,8 @@ const Page = () => {
     },{
       label: "政治学习教育",
       value:4
-    },{
+    },
+    {
       label: "其他",
       value:5
     },
@@ -51,7 +52,7 @@ const Page = () => {
     { title: '主办单位', key: 'unit', dataIndex: 'unit', width: 150 },
     {
       title: '培训分类', key: 'type', dataIndex: 'type', width: 150,
-      render: (v) => <span>{types[v]?.label}</span>
+      render: (v) => <span>{types[v - 1]?.label}</span>
      },
     {
       title: '培训内容', key: 'content', dataIndex: 'content', width: 200,ellipsis: true
diff --git a/src/views/sz/szzf/ajdj/bajz.js b/src/views/sz/szzf/ajdj/bajz.js
index dbee0982e..e783a1eee 100644
--- a/src/views/sz/szzf/ajdj/bajz.js
+++ b/src/views/sz/szzf/ajdj/bajz.js
@@ -181,7 +181,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                                 <p className="ant-upload-drag-icon">
                                     <InboxOutlined />
                                 </p>
-                                <p className="ant-upload-text">点击或将文件拖拽到这里上传 支持扩展名：jpeg、png</p>
+                                <p className="ant-upload-text">点击或将文件拖拽到这里上传</p>
                             </Dragger>}
                             <div className='flex'>
                                 {fileListHj?.[item1.key]?.map((item) => {
diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js
index 36577e03c..ba0cface7 100644
--- a/src/views/sz/szzf/ajdj/lsyx.js
+++ b/src/views/sz/szzf/ajdj/lsyx.js
@@ -145,7 +145,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                                 <p className="ant-upload-drag-icon">
                                     <InboxOutlined />
                                 </p>
-                                <p className="ant-upload-text">点击或将文件拖拽到这里上传 支持扩展名：jpeg、png</p>
+                                <p className="ant-upload-text">点击或将文件拖拽到这里上传</p>
                             </Dragger>}
                             <div className='flex'>
                                 {fileListHj?.[item1.key]?.map((item) => {
diff --git a/src/views/sz/szzf/ajdj/toolbar.js b/src/views/sz/szzf/ajdj/toolbar.js
index 429e86554..14cec06b7 100644
--- a/src/views/sz/szzf/ajdj/toolbar.js
+++ b/src/views/sz/szzf/ajdj/toolbar.js
@@ -11,14 +11,14 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
   const [showGj, setShowGj] = useState(false)
   const onFinish = (values) => {
     let dateSo;
-    if (values.tm) {
+    if (values.createTime) {
       dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+        stm: moment(values.createTime[0]).format('YYYY-MM-DD'),
+        etm: moment(values.createTime[1]).format('YYYY-MM-DD')
       }
     }
-    delete values.tm
-    setSearchVal({ ...values, dateSo });
+    delete values.createTime
+    setSearchVal({ ...values, ...dateSo });
   }
 
   const opntios = [
diff --git a/src/views/sz/szzf/clyj/content.js b/src/views/sz/szzf/clyj/content.js
index b55dd49e9..e46452922 100644
--- a/src/views/sz/szzf/clyj/content.js
+++ b/src/views/sz/szzf/clyj/content.js
@@ -41,7 +41,7 @@ const Page = ({ treeSelect }) => {
             <div className={styles.listborder} style={{ padding: '0 10px', marginBottom: 5 }}>{data?.status?'启用':'禁用'}</div>
             <div className={styles.contentBor} style={{ padding: '0 10px', marginBottom: 5, height: '35%' }}>
                 <div className={styles.listborder} style={{ padding: '0 10px', height: '30%' }}>法律依据</div>
-                {data?.legalName ?? '无内容请添加'}
+                {data?.legalContent ?? '无内容请添加'}
             </div>
 
             <div style={{ display: 'flex', height: '33%' }}>
diff --git a/src/views/sz/szzf/clyj/treeSelectZdy.js b/src/views/sz/szzf/clyj/treeSelectZdy.js
index 47d02c67b..b776f72a8 100644
--- a/src/views/sz/szzf/clyj/treeSelectZdy.js
+++ b/src/views/sz/szzf/clyj/treeSelectZdy.js
@@ -131,6 +131,16 @@ const Page = ({ setTreeSelect }) => {
             return res
         }
     }
+
+   const getFirstLeafKey =(treeData) =>{
+        if (!treeData || !treeData.length) return null;
+        
+        let node = treeData[0];
+        while (node.children && node.children.length > 0) {
+          node = node.children[0];
+        }
+        return {id:node.id,name:node.legalName};
+      }
     useEffect(() => {
         httpget(apiurl.szzf.clyj.tree).then(res => {
             setData(res.data)
@@ -145,11 +155,13 @@ const Page = ({ setTreeSelect }) => {
             // setSelect([res.data[0].id])
             // getFirstChild(res.data)
        
-            setSelect([getFirstChild(res.data).id]);
+            // setSelect([getFirstChild(res.data).id]);
+            setSelect([getFirstLeafKey(res.data)?.id])
+            setExpandedKeys([getFirstLeafKey(res.data)?.id])
             setTreeSelect(
                 [{
-                    key: getFirstChild(res.data).id,
-                    name: getFirstChild(res.data).legalName,
+                    key: getFirstLeafKey(res.data)?.id,
+                    name: getFirstLeafKey(res.data)?.name,
 
                 }]
                 
diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js
index bf4dc8b57..908ac3414 100644
--- a/src/views/sz/szzf/form/index.js
+++ b/src/views/sz/szzf/form/index.js
@@ -156,6 +156,16 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
 
     }, [type, formJsonData, isModalOpen])
 
+    const disableParentNodes =(treeData) => {
+        return treeData.map(node => {
+            const newNode = { ...node };
+            if (node.children && node.children.length > 0) {
+              newNode.disabled = true;
+              newNode.children = disableParentNodes(node.children);
+            }
+            return newNode;
+          });
+      }
 
 
     return (
@@ -172,7 +182,7 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
                                         labelCol={item.labelCol}
                                         rules={[{ required: item.required, message: '请输入' + item.label }]}
                                     >
-                                        <Input disabled={type == 'view' || item.disabled} placeholder={item.placeholder} addonAfter={item.addonAfter}/>
+                                        <Input disabled={type == 'view' || item.disabled} placeholder={item.placeholder} />
                                     </Form.Item>}
                                 {item.type == "title" &&
                                     <Form.Item
@@ -253,7 +263,7 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
                                         dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
                                         allowClear
                                         fieldNames={item.fieldNames}
-                                        treeData={item.treeData}
+                                        treeData={disableParentNodes(item.treeData)}
                                         treeCheckable={item.multiple}
                                         disabled={type == 'view'}
                                     />
diff --git a/src/views/sz/zdgl/index.js b/src/views/sz/zdgl/index.js
index d8df70474..11f529e8f 100644
--- a/src/views/sz/zdgl/index.js
+++ b/src/views/sz/zdgl/index.js
@@ -33,7 +33,7 @@ const Page = () => {
         },
         {
             title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate',
-            render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
+            render: (value) => <span>{value ? dayjs(value).format('YYYY-MM-DD') : ''}</span>, 
         },
         {
             title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit'
diff --git a/src/views/sz/zzjgck/index.js b/src/views/sz/zzjgck/index.js
index f92dd4056..78b4b199f 100644
--- a/src/views/sz/zzjgck/index.js
+++ b/src/views/sz/zzjgck/index.js
@@ -5,7 +5,110 @@ import { httpget2, httppost2,xyt_httpget2 } from '../../../utils/request';
 import apiurl from '../../../service/apiurl';
 import "./index.less"
 export default function Zzjgck() {
-
+  const demoList = [
+    {
+      title: '中共红安县檀树岗水库支部委员会',
+      key: 100,
+      parentId: 0,
+      children: [
+        {
+          title: "第一党小组委员会",
+          parentId: 100,
+          key: 101,
+          children: [
+            {
+              title: "周志才",
+              parentId: 101,
+              key: 103,
+            },
+            {
+              title: "刘立新",
+              parentId: 101,
+              key: 104,
+            },
+            {
+              title: "陈辉来",
+              parentId: 101,
+              key: 105,
+            },
+            {
+              title: "王胜娣",
+              parentId: 101,
+              key: 106,
+            },
+            {
+              title: "高服气",
+              parentId: 101,
+              key: 107,
+            },
+            {
+              title: "李帅华",
+              parentId: 101,
+              key: 108,
+            },
+            {
+              title: "潘宏祥",
+              parentId: 101,
+              key: 109,
+            },
+            {
+              title: "耿协成",
+              parentId: 101,
+              key: 110,
+            }
+          ]
+        },
+        {
+          title: "第二党小组委员会",
+          parentId: 100,
+          key: 102,
+          children: [
+            {
+              title: "吴吉琛",
+              parentId: 102,
+              key: 111,
+            },
+            {
+              title: "吴胜林",
+              parentId: 102,
+              key: 112,
+            },
+            {
+              title: "刘义华",
+              parentId: 102,
+              key: 113,
+            },
+            {
+              title: "陈斌",
+              parentId: 102,
+              key: 113,
+            },
+            {
+              title: "董希贵",
+              parentId: 102,
+              key: 114,
+            },
+            {
+              title: "吴昌元",
+              parentId: 102,
+              key: 115,
+            },
+            {
+              title: "石守银",
+              parentId: 102,
+              key: 116,
+            },
+            {
+              title: "高粱",
+              parentId: 102,
+              key: 117,
+            }
+          ]
+       }
+      ]
+        
+    }
+  ]
  
   
     const [deptList, setDeptList] = useState([])
@@ -56,17 +159,17 @@ export default function Zzjgck() {
   
   // 演示用
 
-  const nameObj = {
-    "刘测": "高伟",
-    "若依": "刘立新",
-    "张雨齐": "彭双林",
-    "杜飞": "王忠明",
-    "李斯": "刘艳华",
-    "李峰": "吴吉琛",
-    "刘玉": "赵国栋",
-    "李星雨": "李星雨",
+  // const nameObj = {
+  //   "刘测": "高伟",
+  //   "若依": "刘立新",
+  //   "张雨齐": "彭双林",
+  //   "杜飞": "王忠明",
+  //   "李斯": "刘艳华",
+  //   "李峰": "吴吉琛",
+  //   "刘玉": "赵国栋",
+  //   "李星雨": "李星雨",
     
-  }
+  // }
   const handleTreeList = (dept, user) => {
     const deptArr = dept.map(item => {
       return {
@@ -77,7 +180,7 @@ export default function Zzjgck() {
         children: user.filter(u => u.deptId == item.deptId).map(u => ({
           ...u,
           value: u.userId,
-          title: nameObj[u.nickName],
+          title: u.nickName,
         }))
       }
     }) 
@@ -93,11 +196,13 @@ export default function Zzjgck() {
   }, [deptUserList, deptList])
 
   const jgOptions = useMemo(() => {
-    if (treeList.length > 0) {
-      return jgOption(treeList);
-    } else {
-      return {}
-     }
+    return jgOption(demoList)
+    // if (treeList.length > 0) {
+     
+    //   return jgOption(treeList);
+    // } else {
+    //   return {}
+    //  }
   }, [treeList])
 
   useEffect(() => {
diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
index 7ef1d8e97..cc237127d 100644
--- a/src/views/sz/zzjgck/jgoption.js
+++ b/src/views/sz/zzjgck/jgoption.js
@@ -12,7 +12,7 @@ export default function jgOption(data1) {
 			top: '10%',
 			left: '10%',
 			bottom: '20%',
-			right: '30%',
+      right: '30%',
 			avoidLabelOverlap: true,//防止标签重叠
 			roam: true, //移动+缩放  'scale' 或 'zoom'：只能够缩放。 'move' 或 'pan'：只能够平移。
 			scaleLimit:{ //缩放比例
@@ -100,7 +100,7 @@ export default function jgOption(data1) {
             fontSize: 18,
             color: '#000',
             align: 'center',
-            padding: [10, 10],
+            padding: [5, 10],
             backgroundColor: {
               image: three,
               repeat: "norepeat",