From 4c5413750721ebc365fe76363d8c20f4b7ddbf2f Mon Sep 17 00:00:00 2001
From: qzc <qzc@cloudowr.com>
Date: Wed, 16 Oct 2024 14:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js | 2 +-
 src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js   | 2 +-
 src/views/Home/MapCtrl/Pops/ShenLiu/index.js      | 1 -
 src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js    | 5 +----
 src/views/Home/tqyb/index.js                      | 6 +++---
 src/views/gcaqjc/bzt/index.js                     | 6 +++---
 src/views/szydd/ddjl/form.js                      | 2 +-
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
index 9778c0a1a..0bdb86d26 100644
--- a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
+++ b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
@@ -31,7 +31,7 @@ export default function drpOption(data) {
       {
         type: 'category',
         data: data.map(o => o.tm),
-        inverse: true,
+        inverse: false,
         splitLine: {
           show: false
         },
diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js b/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
index f3cdc2669..9d0733e42 100644
--- a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
+++ b/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
@@ -18,7 +18,7 @@ const ToolBar = ({search, setTabVal, setTms}) => {
             <Form className='toolbarBox' layout="inline" onFinish={onFinish}>
                 <Form.Item label="时间段" name="imgName">
                     <RangePicker
-                        allowClear
+                        allowClear={false}
                         defaultValue={[moment().add(-1,'months'),moment()]}
                         onChange={onFinish}
                         style={{ width: "300px" }}
diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/index.js b/src/views/Home/MapCtrl/Pops/ShenLiu/index.js
index 7754dbf90..027314c6e 100644
--- a/src/views/Home/MapCtrl/Pops/ShenLiu/index.js
+++ b/src/views/Home/MapCtrl/Pops/ShenLiu/index.js
@@ -72,7 +72,6 @@ function ShenLiu({ id, data, dispatch, onCancel }) {
         })
       }
     })
-    debugger
     setYjData(linshi)
   }
 
diff --git a/src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js b/src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js
index cb49f7183..9af0d8484 100644
--- a/src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js
+++ b/src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js
@@ -1,10 +1,7 @@
 export default function drpOption(data,yjData) {
   console.log("data",data);
-  const maxVal = 0//Math.max(...data.map(obj => obj.drp))
-  // const max1 = Math.max(...data.map(obj => obj.x))
   const max1 = Math.max(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)])
   const min1 = Math.min(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)])
-  // const min1 = Math.min(...data.map(obj => obj.x))
   const max2 = Math.max(...data.map(obj => obj.rz))
   const min2 = Math.min(...data.map(obj => obj.rz))
 
@@ -52,7 +49,7 @@ export default function drpOption(data,yjData) {
       {
         type: 'category',
         data: data.map(o => o.tm),
-        inverse: true,
+        inverse: false,
         splitLine: {
           show: false
         },
diff --git a/src/views/Home/tqyb/index.js b/src/views/Home/tqyb/index.js
index d52017f59..9ce110d1f 100644
--- a/src/views/Home/tqyb/index.js
+++ b/src/views/Home/tqyb/index.js
@@ -12,12 +12,13 @@ const { Panel } = Collapse;
 const Page = ({showPanels}) => {  
     const dispatch = useDispatch();
     const [myKey, setMyKey] = useState('1')
-    const [badgeType, setBadgeType] = useState('雷达回波')
+    const [badgeType, setBadgeType] = useState('')
     const [tmObj,setTmObj] = useState({
         tm:moment(),
         hours:'08'
     }) 
     useEffect(()=>{
+      setBadgeType('雷达回波')
       dispatch.runtime.setCameraTarget({
         center: [115.2, 31.18],
         zoom: 9,
@@ -66,8 +67,7 @@ const Page = ({showPanels}) => {
         </div>
 
         {
-        (badgeType === '雷达回波'&&myKey==='1') 
-        ? (
+        (badgeType === '雷达回波'&&myKey==='1') ? (
           <div className='radarPageBox'>
             <RadarPage
               activeKey={'0'}
diff --git a/src/views/gcaqjc/bzt/index.js b/src/views/gcaqjc/bzt/index.js
index 6882653b3..d94e9f7f9 100644
--- a/src/views/gcaqjc/bzt/index.js
+++ b/src/views/gcaqjc/bzt/index.js
@@ -37,7 +37,7 @@ export default function Page({isHome}) {
   const columnsSl = [
     { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
     { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-    { title: '渗流量(L/s)', key: 'q', dataIndex: 'q',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>   },
+    { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>   },
   ]
 
   const columnsWy = [
@@ -57,7 +57,7 @@ export default function Page({isHome}) {
       console.log(1111)
       // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
       if (e.wheelDelta > 0) {
-      scale += 0.05;
+      scale += 0.02;
       img.style.transform = `scale(${scale})`;
       } else {
       if (scale == 1) {
@@ -66,7 +66,7 @@ export default function Page({isHome}) {
       }
       // 缩放值大于1时,可以缩小,反之亦然
       if (scale > 1) {
-          scale -= 0.05;
+          scale -= 0.02;
           img.style.transform = `scale(${scale})`;
       }
       }
diff --git a/src/views/szydd/ddjl/form.js b/src/views/szydd/ddjl/form.js
index f9bb86af9..ad8ba75ff 100644
--- a/src/views/szydd/ddjl/form.js
+++ b/src/views/szydd/ddjl/form.js
@@ -219,7 +219,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                 </p>
               </Dragger>
               } 
-              <Row gutter={[16]}>
+              <Row gutter={[16]} style={{marginTop:"30px"}}>
                {
                   fileList?.length > 0 && fileList?.map(file => {
                   return (