From c93f08e0d0a4673d48782c8ea2322eb5af512555 Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Fri, 27 Sep 2024 17:52:34 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sz/flfg/form.js          |  1 +
 src/views/sz/flfg/index.js         |  2 +-
 src/views/sz/szzf/ajdj/config.js   |  2 +-
 src/views/sz/szzf/ajdj/editTabs.js | 12 +++----
 src/views/sz/zdgl/form.js          |  1 +
 src/views/sz/zzjgck/jgoption.js    | 51 ++++++++++++++----------------
 6 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/views/sz/flfg/form.js b/src/views/sz/flfg/form.js
index cf617fbc1..779aa3c2c 100644
--- a/src/views/sz/flfg/form.js
+++ b/src/views/sz/flfg/form.js
@@ -223,6 +223,7 @@ 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>
diff --git a/src/views/sz/flfg/index.js b/src/views/sz/flfg/index.js
index 98efb74d8..8630c4ad5 100644
--- 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: 'eventsDesc', dataIndex: 'eventsDesc'
+            title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate'
         },
         {
             title: '附件', key: 'files', dataIndex: 'files',render:(v,r)=><a onClick={()=>download(v[0].fileId,v[0]?.fileName)}><PaperClipOutlined />{v[0]?.fileName}</a>
diff --git a/src/views/sz/szzf/ajdj/config.js b/src/views/sz/szzf/ajdj/config.js
index dbaf3378f..66bdac0eb 100644
--- a/src/views/sz/szzf/ajdj/config.js
+++ b/src/views/sz/szzf/ajdj/config.js
@@ -76,7 +76,7 @@ const basicData = [
     },
     {
         label: '违法时间',
-        key: 'IllegalDate',
+        key: 'illegalDate',
         type: 'DatePicker',
         span: 12
     },
diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js
index 32375b388..e41f81477 100644
--- a/src/views/sz/szzf/ajdj/editTabs.js
+++ b/src/views/sz/szzf/ajdj/editTabs.js
@@ -48,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.IllegalDate).format("YYYY-MM-DD HH:mm:ss") : e.IllegalDate,
+            illegalDate: e.illegalDate ? dayjs(e.v).format("YYYY-MM-DD HH:mm:ss") : e.illegalDate,
         }
         
         if (mode == 'save') {
@@ -89,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})
             })
diff --git a/src/views/sz/zdgl/form.js b/src/views/sz/zdgl/form.js
index 3637f75fe..4002aa348 100644
--- a/src/views/sz/zdgl/form.js
+++ b/src/views/sz/zdgl/form.js
@@ -178,6 +178,7 @@ 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>
diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
index 7e4bd30b6..416af42f2 100644
--- a/src/views/sz/zzjgck/jgoption.js
+++ b/src/views/sz/zzjgck/jgoption.js
@@ -1,3 +1,8 @@
+import { Space } from 'antd';
+import one from '../../../assets/img/u0.png'
+// const one = `${process.env.PUBLIC_URL}/assets/img/u0.png`;
+console.log(one);
+
 const getBackground = () => {
   return {
     type: 'linear',
@@ -100,6 +105,12 @@ export default function jgOption() {
 			//layerPadding: 30,//连接线长度 （发现没用）
 			symbol: 'circle', //图形形状  rect方形  roundRect圆角 emptyCircle圆形 circle实心圆
 			symbolSize: 14, //状态大小
+      symbol: function(value, params) {
+        console.log("params", value, params);
+        // params.data节点的所有数据
+  
+           return "image://" + require("../../../assets/img/u0.png");
+          },
 			edgeShape: 'polyline', //线条类型  curve曲线
 			initialTreeDepth: 1, //初始展开的层级
 			expandAndCollapse: true,//子树折叠和展开的交互，默认打开
@@ -123,41 +134,25 @@ export default function jgOption() {
         borderWidth: 1, // 文字块边框宽度
         borderType: 'solid', // 文字块边框描边类型 solid dashed dotted
         borderRadius: 2, // 文字块的圆角
-        padding: [6, 6], // 文字块内边距
+        padding: [0,0,0, 0], // 文字块内边距
         shadowColor: 'rgba(0,121,221,0.3)', // 文字块的背景阴影颜色
         shadowBlur: 6, // 文字块的背景阴影长度
         formatter: (params) => {
-          let newName = ''
-          let len = params.data.name.length
-          let strLen = params.data.relationType === 0 ? 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.name.substring(start, len)
-              } else {
-                tempStr = params.data.name.substring(start, end) + '\n'
-              }
-              newName += tempStr
-            }
-          } else {
-            newName = params.data.name
-          }
-          let n = newName
-          if (n.length > 16) {
-            n = n.slice(0, 16) + '...'
-          }
-          let str = `{name|${n}}`
-          let isMain = params.data.relationType === 0
-          str = isMain ? `{name|${n}} {current|本企业} {main|总部}` : str
+          let t = params.data.name
+          
+          let str = [`{name|}${t}`].join('\n')
           return str
         },
         rich: {
+          b:{
+            fontSize: 14,
+          },
           name: {
-            fontSize: 14
+            fontSize: 14,
+            padding:[0,0,0,5],
+            backgroundColor:{
+              image:one,
+            },
           },
           current: {
             fontSize: 12,

From bfacef21298843b92d7f4c9ae9153dfb8e690e7a Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Sun, 29 Sep 2024 17:42:30 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix():=20=E6=B5=B8=E6=B6=A6=E7=BA=BFbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/images/four.png             | Bin 3161 -> 3037 bytes
 public/assets/images/three.png            | Bin 2563 -> 2436 bytes
 src/components/crud/_.js                  |   6 ++
 src/service/apiurl.js                     |   2 +-
 src/service/sssq.js                       |   4 +-
 src/views/gcaqjc/gcaqfx/jrx/index.js      |   4 +-
 src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js |   8 +--
 src/views/rcgl/jdkh/khrwgl/PfDetail.js    |  18 ++++--
 src/views/rcgl/jdkh/khrwgl/mbForm.js      |  12 +++-
 src/views/sz/zzjgck/index.less            |   2 +-
 src/views/sz/zzjgck/jgoption.js           |  73 +++++++++++-----------
 11 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/public/assets/images/four.png b/public/assets/images/four.png
index d114e6bdcba0f1a667d6eb627ce96370c91dc4d5..edde7a8f0bdf4b43665732380ac35e8e2907fd23 100644
GIT binary patch
literal 3037
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

literal 3161
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

diff --git a/public/assets/images/three.png b/public/assets/images/three.png
index 03637859489c99006c8f6b2ce4510c4701832739..2e587b94294ef7854b9b4de5a0821393d83897a1 100644
GIT binary patch
literal 2436
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
CBf}E_

literal 2563
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
Z{{cCI5aWV7-c0}i002ovPDHLkV1iKb3Jw4O

diff --git a/src/components/crud/_.js b/src/components/crud/_.js
index 005fec4e0..1cf029846 100644
--- a/src/components/crud/_.js
+++ b/src/components/crud/_.js
@@ -156,6 +156,11 @@ export function createCrudService(urlSet) {
     const resData = await httppost2(urlSet, params) || {};
     return resData;
   }
+
+  const edit1 = async (params) => {
+    const resData = await httppost2(urlSet, params) || {};
+    return resData;
+  }
   const insert = async (params) => {
     const resData = await httppost2(urlSet + `/${params}`) || {};
     return resData;
@@ -241,6 +246,7 @@ export function createCrudService(urlSet) {
     todo: todo,
     save: save,
     edit: edit,
+    edit1: edit1,
     del: del,
     insert:insert,
     delGet:delGet,
diff --git a/src/service/apiurl.js b/src/service/apiurl.js
index 512f6f049..0fbab2969 100644
--- a/src/service/apiurl.js
+++ b/src/service/apiurl.js
@@ -909,7 +909,7 @@ const apiurl = {
     reservoirsummaryInfo: service_fxdd + '/reservoir/water/summaryInfo', //实时水情-水库水情汇总
     //河道弹框详情
     monitor: service_fxdd + '/river/water/monitor/data', //监测数据
-    detail: service_fxdd + '/river/water/detail', //监测数据-下方表格
+    detail: service_fxdd + '/reservoir/water/detail', //监测数据-下方表格
     zqrl: service_fxdd + '/river/water/zqrl', //水位流量关系
     channel: service_fxdd + '/reservoir/water/image/channel', //图像监测-视角
     imageinfo: service_fxdd + '/reservoir/water/image/info', //图像监测-列表
diff --git a/src/service/sssq.js b/src/service/sssq.js
index 7c043eb0a..021323409 100644
--- a/src/service/sssq.js
+++ b/src/service/sssq.js
@@ -23,9 +23,9 @@ export async function reservoirlist(params) {
   if (code !== 200) {
     message.error(msg || '请求失败');
   }
-  const list = data?.filter(o => o.lgtd && o.lttd)
+  // const list = data?.filter(o => o.lgtd && o.lttd)
 
-  return list;
+  return data;
 }
 
 
diff --git a/src/views/gcaqjc/gcaqfx/jrx/index.js b/src/views/gcaqjc/gcaqfx/jrx/index.js
index 4fd48a546..b25aeda2f 100644
--- a/src/views/gcaqjc/gcaqfx/jrx/index.js
+++ b/src/views/gcaqjc/gcaqfx/jrx/index.js
@@ -90,8 +90,8 @@ export default function Xmzlmb() {
           ...obj,
         }
       })
-      let res1 = result.map(item => ({...item,rz:(item.rz - 100).toFixed(2)})) //为了测试  最后需要删除
-      setDateSources(res1)
+      // let res1 = result.map(item => ({...item,rz:(item.rz - 100).toFixed(2)})) //为了测试  最后需要删除
+      setDateSources(result)
     } catch (error) {
       console.log(error);
     }
diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
index 2b8de4a64..5900a5c83 100644
--- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
+++ b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
@@ -35,12 +35,12 @@ const textColor = '#666'
       [];
    
    const gz3 = data[alltype[2]] ?
-   type == "1" ? [[73, 161], [73, data[alltype[2]]]] :
+   type == "1" ? [[72.5, 161], [72.5, data[alltype[2]]]] :
    type == "2" ? [[66.5, 162], [66.5, data[alltype[2]]]] :
             [[73, 161], [73, data[alltype[2]]]] : [];
    
    const gz4 = data[alltype[3]] ?
-   type == "1" ? [[85, 166], [85, data[alltype[3]]]] :
+   type == "1" ? [[84.5, 166], [84.5, data[alltype[3]]]] :
    type == "2" ? [[77, 161], [77, data[alltype[3]]]] :
             [[85, 166], [85, data[alltype[3]]]] : [];
    
@@ -50,8 +50,8 @@ const textColor = '#666'
          [xValue, data?.rz],
          [51.6, data[alltype[0]]],
          [53.6, data[alltype[1]]],
-         [73, data[alltype[2]]],
-         [85, data[alltype[3]]]
+         [72.5, data[alltype[2]]],
+         [84.5, data[alltype[3]]]
          ] :
          type == "2" ?
       [
diff --git a/src/views/rcgl/jdkh/khrwgl/PfDetail.js b/src/views/rcgl/jdkh/khrwgl/PfDetail.js
index 672c17d31..d341555a2 100644
--- a/src/views/rcgl/jdkh/khrwgl/PfDetail.js
+++ b/src/views/rcgl/jdkh/khrwgl/PfDetail.js
@@ -110,7 +110,7 @@ const EditableRow = ({ index, ...props }) => {
           title: '标准分数',
           key: 'standardScore',
           dataIndex: 'standardScore',
-          width: 60,
+          width: 70,
           align: "center",
         },
         {
@@ -380,12 +380,20 @@ const EditableRow = ({ index, ...props }) => {
         setClickItem(record)
     }
     const handleRadioChange = (e) => {
-        if (e.target.value == 1) {
-            setTableData(tableDataRef.current)
+      if (e.target.value == 1) {
+        if (tabs == 2) {
+          getQdViewData(Item?.id)
         } else {
-            const newData = tableData.filter(item => item.standardScore > item.assessScore)
-            setTableData(newData);
+          getZbTableData(Item?.id,2)
         }
+      } else {
+        const newData = tableData.filter(item => item.standardScore > item.assessScore)
+        newData.forEach(item => {
+          if (item.rowSpan) delete item.rowSpan;
+        })
+      const res = handleData(newData, "name")
+          setTableData(res);
+      }
     }
 
     // 整改
diff --git a/src/views/rcgl/jdkh/khrwgl/mbForm.js b/src/views/rcgl/jdkh/khrwgl/mbForm.js
index 4d284ce64..355f46d81 100644
--- a/src/views/rcgl/jdkh/khrwgl/mbForm.js
+++ b/src/views/rcgl/jdkh/khrwgl/mbForm.js
@@ -1,5 +1,5 @@
 import React,{useEffect,useState,useMemo,useRef} from 'react';
-import { Form, Button, Input, Row,Table, Col, Popconfirm, InputNumber,Image,Modal,Typography, message} from 'antd';
+import { Form, Button, Input, Row,Table, Col, Tooltip, InputNumber,Image,Modal,Typography, message} from 'antd';
 import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
 import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
 import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
@@ -27,6 +27,16 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
       dataIndex: 'indicatorName',
       width: 250,
       align: "center",
+      render: (v, r) => {
+        const titleDom = r.indicatorRatings ? 
+          r.indicatorRatings.map((item,i) => <div key={i}>{item?.ratingDesc}&nbsp;({item?.standardScore})</div>)
+         : ''
+        return (
+          <Tooltip title={titleDom}>
+            <span>{v}</span>
+        </Tooltip>
+        )
+      }
     },
     {
       title: '标准分数',
diff --git a/src/views/sz/zzjgck/index.less b/src/views/sz/zzjgck/index.less
index 234c82eb9..71a8ea86a 100644
--- a/src/views/sz/zzjgck/index.less
+++ b/src/views/sz/zzjgck/index.less
@@ -21,4 +21,4 @@
     color: '#000';
     padding: 10px;
     background: url(../../../../public/assets/images/four.png) 0 0 no-repeat;
-}
\ No newline at end of file
+}
diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
index e4b93d36b..aeeeede31 100644
--- a/src/views/sz/zzjgck/jgoption.js
+++ b/src/views/sz/zzjgck/jgoption.js
@@ -8,13 +8,12 @@ export default function jgOption(data1) {
   return {
 		series: [{
 			type: 'tree',
-			id: 0,
 			name: 'tree1',
 			data: data1,
 			top: '10%',
-			left: '0%',
+			left: '10%',
 			bottom: '20%',
-			right: '25%',
+			right: '30%',
 			avoidLabelOverlap: true,//防止标签重叠
 			roam: true, //移动+缩放  'scale' 或 'zoom'：只能够缩放。 'move' 或 'pan'：只能够平移。
 			scaleLimit:{ //缩放比例
@@ -22,7 +21,7 @@ export default function jgOption(data1) {
 				max:4,//最大的缩放值  
 		    },
 			layout: 'orthogonal',//树图布局，orthogonal水平垂直方向，radial径向布局 是指以根节点为圆心，每一层节点为环，一层层向外
-			orient: 'TB', //树形方向  TB为上下结构  LR为左右结构
+			orient: 'LR', //树形方向  TB为上下结构  LR为左右结构
 			// nodePadding: 100,//结点间距 （发现没用）
 			//layerPadding: 30,//连接线长度 （发现没用）
 			symbol: 'circle', //图形形状  rect方形  roundRect圆角 emptyCircle圆形 circle实心圆
@@ -39,37 +38,38 @@ export default function jgOption(data1) {
         // 每个节点对应的文本标签样式
         show: true, // 是否显示标签
         // rotate:90,
-        distance: 8, // 文本距离图形元素的距离
+        distance: 1, // 文本距离图形元素的距离
         position: ['50%', '50%'], // 标签位置
         verticalAlign: 'middle', // 文字垂直对齐方式，默认自动，top，middle，bottom
         align: 'center', // 文字水平对齐方式，默认自动，left，right，center
         fontSize: 16, // 字体大小
         color: '#000', // 字体颜色
         formatter: (params) => {
-          let newName = ''
-          let len = params.data.title.length
-          let strLen = (params.data.parentId === 0 || params.data.parentId === 100 ) ? 100 : 1 //一行显示几个字
-          let rowNum = Math.ceil(len / strLen)
-          if (len > strLen) {
+          // 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) + '...'
-          }
+          //   for (let p = 0; p < rowNum; p++) {
+          //     let tempStr = ''
+          //     let start = p * strLen
+          //     let end = start + strLen
+          //     if (p == rowNum - 1) {
+          //       tempStr = params.data.title.substring(start, len)
+          //     } else {
+          //       tempStr = params.data.title.substring(start, end) + '\n'
+          //     }
+          //     newName += tempStr
+          //   }
+          // } else {
+          //   newName = params.data.title
+          // }
+          // let n = newName
+          // if (n.length > 16) {
+          //   n = n.slice(0, 16) + '...'
+          // }
+          let n = params.data.title;
           let parentId = params.data.parentId
           let userId = params.data.userId;
           let str = parentId === 0 ? `{parent|${n}}` : 
@@ -78,15 +78,14 @@ export default function jgOption(data1) {
           // parentId === 100 ? `<div class='org-parent1'>${n}</div>` : userId != undefined ? `<div class='org-parent3'>${n}</div>` : `<div class='org-parent2'>${n}</div>`
           return  str;
         },
-     
+       
         rich: {
           parent: {
             color: '#000',
-            padding: [20, 20],
+            padding: [15, 15],
             backgroundColor: {
               image:one
             },
-            
             fontSize: 20
           },
           parent1: {
@@ -104,17 +103,18 @@ export default function jgOption(data1) {
             padding: [10, 10], 
             backgroundColor: {
               image: three,
-              repeat: "no-repeat",
+              repeat: "norepeat",
             },
           },
           parent3: {
+            width:200,
             color: '#000',
             padding: [10, 10],
             backgroundColor: {
               image: four,
-              repeat: "no-repeat",
             },
-            fontSize: 18
+            align: 'center',
+            fontSize: 18,
           },
         }
       },
@@ -128,7 +128,8 @@ export default function jgOption(data1) {
 					position: 'bottom',
 					rotate: 0,//标签旋转。
 					verticalAlign: 'middle',
-					align: 'center',
+          align: 'center',
+          position: ['50%', '50%'], // 标签位置
 					//文本框内文字超过6个字折行
 					//  formatter: function(val) {
 					//  let strs = val.name.split(''); //字符串数组
@@ -146,7 +147,7 @@ export default function jgOption(data1) {
 			},
 			expandAndCollapse: true, //默认展开树形结构
 			animationDuration: 550,
-			animationDurationUpdate: 750
+      animationDurationUpdate: 750,
 		}]
 	};
 }

From eb4e287226b0fad911e9a0c0374b20737c4e204b Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Sun, 29 Sep 2024 17:48:01 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix():=E5=86=B2=E7=AA=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sz/zzjgck/jgoption.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
index a39a136bd..c1ed7bb51 100644
--- a/src/views/sz/zzjgck/jgoption.js
+++ b/src/views/sz/zzjgck/jgoption.js
@@ -111,7 +111,6 @@ export default function jgOption(data1) {
             width:200,
             color: '#000',
             padding: [10, 10],
-            width:10,
             overflow:'break',
             backgroundColor: {
               image: four,

From 56042ad3db31b3821742269144fc8cc09fd0a7b8 Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Sun, 29 Sep 2024 17:56:08 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sz/flfg/form.js          | 47 +++++++++++++++---------------
 src/views/sz/szzf/ajdj/bajz.js     |  9 ++++--
 src/views/sz/szzf/ajdj/editTabs.js |  2 ++
 src/views/sz/szzf/ajdj/lsyx.js     |  6 +++-
 src/views/sz/szzf/form/index.js    | 13 +++++----
 src/views/sz/szzf/form/pdfView.js  |  1 +
 src/views/sz/zdgl/form.js          |  4 +--
 7 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/src/views/sz/flfg/form.js b/src/views/sz/flfg/form.js
index 779aa3c2c..476254584 100644
--- a/src/views/sz/flfg/form.js
+++ b/src/views/sz/flfg/form.js
@@ -95,22 +95,22 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
  * @param {string}  id 删除的id
  */
   const deleteFile = (fileId) => {
-    console.log(fileId);
-    let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId);
+    console.log(fileId,fileList);
+    let filterFile = fileList.filter(item => item.fileId !== fileId);
     setFileList(filterFile)
   }
   useEffect(() => {
     if (mode != 'save') {
-      // const imgFile = record?.files?.map(o => ({
-      //   name: o.name,
-      //   response: {
-      //     data: {
-      //       filePath: o.filePath,
-      //       fileId: o.fileId
-      //     }
-      //   },
-      // }))
-      setFileList(record?.files)
+      const imgFile = record?.files?.map(o => ({
+        name: o.fileName,
+        response: {
+          data: {
+            filePath: o.filePath,
+            fileId: o.fileId
+          }
+        },
+      }))
+      setFileList(imgFile)
     }
   }, [record, mode])
 
@@ -232,6 +232,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                   </p>
                 </Dragger>
               }
+              {JSON.stringify(fileList)}
               <Row gutter={[16]}>
                 {
                   fileList.length > 0 && fileList.map(file => {
@@ -239,9 +240,9 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                       <Col span={12}>
                         <div className="file-item" style={{ width: "75%",marginTop:5 }}>
                           <div className='file-description'>
-                            {file?.fileName?.indexOf('.docx') > -1 ?
+                            {file.name?.indexOf('.docx') > -1 ?
                               <div
-                                onClick={() => { download(file.fileId) }}
+                                onClick={() => { download(file.response?.data?.fileId) }}
                                 style={{ cursor: 'pointer' }}
                               >
                                 <FileWordOutlined
@@ -249,35 +250,35 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                                 />
                               </div>
                               :
-                              file?.fileName?.indexOf('.pdf') > -1 ?
+                              file.name?.indexOf('.pdf') > -1 ?
                                 <div
-                                  onClick={() => { viewPdf(file.fileId) }}
+                                  onClick={() => { viewPdf(file.response?.data?.fileId) }}
                                   style={{ cursor: 'pointer' }}
                                 >
                                   <FilePdfOutlined style={{ fontSize: 40 }} />
                                 </div>
                                 :
-                                file?.fileName?.indexOf('.zip') > -1 ?
+                                file.name?.indexOf('.zip') > -1 ?
                                   <div
-                                    onClick={() => { download(file.fileId) }}
+                                    onClick={() => { download(file.response?.data?.fileId) }}
                                     style={{ cursor: 'pointer' }}
                                   >
                                     <FileZipOutlined style={{ fontSize: 40 }} />
                                   </div>
                                   :
-                                  file?.fileName?.indexOf('.xlsx') > -1 ?
+                                  file.name?.indexOf('.xlsx') > -1 ?
                                     <div
-                                      onClick={() => { download(file.fileId) }}
+                                      onClick={() => { download(file.response?.data?.fileId) }}
                                       style={{ cursor: 'pointer' }}
                                     >
                                       <FileExcelOutlined style={{ fontSize: 40 }} />
                                     </div>
                                     :
-                                    <Image width={60} src={url + file.filePath} alt='' />
+                                    <Image width={60} src={url + file.response?.data?.filePath} alt='' />
                             }
-                            <span>{file?.fileName}</span>
+                            <span>{file.name}</span>
                           </div>
-                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() => deleteFile(file.fileId)}>
+                          <div className={mode == "view" ? 'delete-icon disable-icon' : 'delete-icon'} onClick={() => deleteFile(file.response?.data?.fileId)}>
                             <DeleteOutlined />
                           </div>
                         </div>
diff --git a/src/views/sz/szzf/ajdj/bajz.js b/src/views/sz/szzf/ajdj/bajz.js
index 431f620bf..c4d4ee5e0 100644
--- a/src/views/sz/szzf/ajdj/bajz.js
+++ b/src/views/sz/szzf/ajdj/bajz.js
@@ -37,6 +37,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
     const [fileListHj, setFileHj] = useState({'files3': [],'files4': [],'files5': [],'files6': [],'files7': []})
     const [url, setUrl] = useState('')
     const [isModal, setIsModal] = useState(false)
+  const [loading, setLoading] = useState(false)
+
     const getInfo = () => {
         form.validateFields().then((values) => {
             getFormInfo({ ...fileListHj,...values,  })
@@ -72,8 +74,9 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                 // }
             },
             customRequest(e) {
-
+                setLoading(true);
                 httppostAddfile(uploadUrl, e).then(res => {
+                    
                     if(fileListHj[keys]){
                         fileListHj[keys].push(res.data)
                     }else{
@@ -82,6 +85,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                     }
                     
                     setFileHj({ ...fileListHj })
+                    setLoading(false);
+
                 })
             }
         }
@@ -202,7 +207,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                 </Row>))}
             <div className="flex flex-end" style={{ marginTop: 10, justifyContent: "flex-end" }}>
                 <Button type="" style={{ marginRight: 10 }} onClick={cancel}>取消</Button>
-                <Button type="primary" onClick={getInfo}>确定</Button>
+                <Button type="primary" onClick={getInfo} loading={loading}>确定</Button>
             </div>
         </Form >
 
diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js
index c0caad98c..e7aab420a 100644
--- a/src/views/sz/szzf/ajdj/editTabs.js
+++ b/src/views/sz/szzf/ajdj/editTabs.js
@@ -34,6 +34,8 @@ const items = [
 const Page = ({ mode, onCrudSuccess,record,submit }) => {
     const [formData,setFormData] =useState({})
     const [clqkDataConfig,setConfig] =useState([])
+    const [recordData,setRecord] =useState({})
+
 
     // debugger;
     const [key, setKeys] = useState('1')
diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js
index 87c2a2ade..f2e300932 100644
--- a/src/views/sz/szzf/ajdj/lsyx.js
+++ b/src/views/sz/szzf/ajdj/lsyx.js
@@ -26,6 +26,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
     const [fileListHj, setFileHj] = useState({'files3': [],'files4': [],'files5': [],'files6': [],'files7': []})
     const [url, setUrl] = useState('')
     const [isModal, setIsModal] = useState(false)
+  const [loading, setLoading] = useState(false)
+
     const getInfo = () => {
         form.validateFields().then((values) => {
             getFormInfo({ ...values, ...fileListHj })
@@ -62,6 +64,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                 // }
             },
             customRequest(e) {
+                setLoading(true);
 
                 httppostAddfile(uploadUrl, e).then(res => {
                     if(fileListHj[keys]){
@@ -72,6 +75,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                     }
                     
                     setFileHj({ ...fileListHj })
+                    setLoading(false);
                 })
             }
         }
@@ -167,7 +171,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                 </Row>))}
             <div className="flex flex-end" style={{ marginTop: 10, justifyContent: "flex-end" }}>
                 <Button type="" style={{ marginRight: 10 }} onClick={cancel}>取消</Button>
-                <Button type="primary" onClick={getInfo}>确定</Button>
+                <Button type="primary" onClick={getInfo} loading={loading}>确定</Button>
             </div>
         </Form >
 
diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js
index 44b68d13a..fc05878a8 100644
--- a/src/views/sz/szzf/form/index.js
+++ b/src/views/sz/szzf/form/index.js
@@ -20,6 +20,8 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
     const [fileListUp, setFileLisUp] = useState([])
     const [url, setUrl] = useState('')
     const [isModal, setIsModal] = useState(false)
+  const [loading, setLoading] = useState(false)
+
 
 
     // 
@@ -71,8 +73,9 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
             }
         },
         customRequest(e) {
-            setFileLisUp([...fileListUp, e.file])
+            setLoading(true);
             httppostAddfile(uploadUrl, e).then(res => {
+                setLoading(false);
                 setFileList([...fileList, res.data])
             })
         }
@@ -102,9 +105,9 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
         return null;
     }
     const preView = (item) => {
-        if (checkMediaType(item.name) == 'pdf') {
+        if (checkMediaType(item.fileName) == 'pdf') {
             // window.open(baseUrl + item.previewUrl)
-            setUrl(item.previewUrl)
+            setUrl(item.fileId)
             setIsModal(true)
         }
 
@@ -305,10 +308,10 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
             {
                 type !== 'view' && <div className="flex flex-end" style={{ marginTop: 10, justifyContent: "flex-end" }}>
                     <Button type="" style={{ marginRight: 10 }} onClick={cancel}>取消</Button>
-                    <Button type="primary" onClick={getInfo}>确定</Button>
+                    <Button type="primary" onClick={getInfo} loading={loading}>确定</Button>
                 </div>
             }
-            <PdfView url={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/rescue/goods/file/download/${url}`)}`} isModal={isModal} setModalN={(e)=>setIsModal(e)}/>
+            <PdfView url={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/rescue/goods/file/download/${url}`)}`} isModal={isModal} setModalN={(e)=>setIsModal(e)}/>
 
 
         </div >
diff --git a/src/views/sz/szzf/form/pdfView.js b/src/views/sz/szzf/form/pdfView.js
index 041c8f887..fa913aac4 100644
--- a/src/views/sz/szzf/form/pdfView.js
+++ b/src/views/sz/szzf/form/pdfView.js
@@ -26,6 +26,7 @@ const Pdf = ({ url,isModal,setModalN }) => {
         onOk={handleOk}
         footer={false}
         onCancel={handleCancel}
+        style={{ marginTop: "-5%" }}
         destroyOnClose>
         <div style={{ padding: "0 10px" }}>
           <iframe
diff --git a/src/views/sz/zdgl/form.js b/src/views/sz/zdgl/form.js
index 4002aa348..8b8bc0e41 100644
--- a/src/views/sz/zdgl/form.js
+++ b/src/views/sz/zdgl/form.js
@@ -103,7 +103,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
   }
   useEffect(() => {
     if (mode != 'save') {
-      const imgFile = record?.files?.map(o => ({
+       const imgFile = record?.files?.map(o => ({
         name: o.fileName,
         response: {
           data: {
@@ -273,7 +273,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
             border: 0,
             marginTop: 20,
           }}
-          src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/projectEvents/file/download/${iframeSrc}`)}`}
+          src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`}
         />
       </Modal>
     </>

From 3ddf3eb338f252f2c36112d5c5b75e5f1e152acb Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Sun, 29 Sep 2024 18:05:53 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sz/szzf/ajdj/bajz.js  | 8 ++++----
 src/views/sz/szzf/ajdj/lsyx.js  | 4 ++--
 src/views/sz/szzf/form/index.js | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/sz/szzf/ajdj/bajz.js b/src/views/sz/szzf/ajdj/bajz.js
index c4d4ee5e0..249f45262 100644
--- a/src/views/sz/szzf/ajdj/bajz.js
+++ b/src/views/sz/szzf/ajdj/bajz.js
@@ -152,7 +152,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                         label='保管人员'
                         name='custodian'
                     >
-                        <Input />
+                        <Input disabled={type == 'view'}/>
                     </Form.Item>
                 </Col>
                 <Col span={10}>
@@ -160,7 +160,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                         label='保管地点'
                         name='storageLocation'
                     >
-                        <Input />
+                        <Input disabled={type == 'view'}/>
                     </Form.Item>
                 </Col>
             </Row>
@@ -176,12 +176,12 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                             label='附件'
                             name='files'
                         >
-                            <Dragger {...props(item1.key)}>
+                            {type !== 'view' &&<Dragger {...props(item1.key)} disabled={type == 'view'}>
                                 <p className="ant-upload-drag-icon">
                                     <InboxOutlined />
                                 </p>
                                 <p className="ant-upload-text">点击或将文件拖拽到这里上传 支持扩展名：jpeg、png</p>
-                            </Dragger>
+                            </Dragger>}
                             <div className='flex'>
                                 {fileListHj?.[item1.key]?.map((item) => {
                                     return <div className='flex align-center file-item' style={{marginTop:5,marginRight:'3%',width:'30%', minHeight: "50px", fontSize: 14, columnGap: 10, cursor: checkMediaType(item.fileName) == 'image' || checkMediaType(item.fileName) == 'pdf' ? 'pointer' : "not-allowed" }}>
diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js
index f2e300932..45f6031f5 100644
--- a/src/views/sz/szzf/ajdj/lsyx.js
+++ b/src/views/sz/szzf/ajdj/lsyx.js
@@ -140,12 +140,12 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
                             label='附件'
                             name='files'
                         >
-                            <Dragger {...props(item1.key)}>
+                            {type !== 'view'&&<Dragger {...props(item1.key)}>
                                 <p className="ant-upload-drag-icon">
                                     <InboxOutlined />
                                 </p>
                                 <p className="ant-upload-text">点击或将文件拖拽到这里上传 支持扩展名：jpeg、png</p>
-                            </Dragger>
+                            </Dragger>}
                             <div className='flex'>
                                 {fileListHj?.[item1.key]?.map((item) => {
                                     return <div className='flex align-center file-item' style={{marginTop:5,marginRight:'3%',width:'30%', minHeight: "50px", fontSize: 14, columnGap: 10, cursor: checkMediaType(item.fileName) == 'image' || checkMediaType(item.fileName) == 'pdf' ? 'pointer' : "not-allowed" }}>
diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js
index fc05878a8..bf4dc8b57 100644
--- a/src/views/sz/szzf/form/index.js
+++ b/src/views/sz/szzf/form/index.js
@@ -251,11 +251,11 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
                                         showSearch
                                         style={{ width: '100%' }}
                                         dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-                                        placeholder="Please select"
                                         allowClear
                                         fieldNames={item.fieldNames}
                                         treeData={item.treeData}
                                         treeCheckable={item.multiple}
+                                        disabled={type == 'view'}
                                     />
                                     
                                 </Form.Item>}