From 5f0d0cfcc57c30efabf78169e4f75ffcf56d96d9 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Thu, 10 Apr 2025 17:59:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix():=20=E5=B9=B4=E5=BA=A6=E4=BD=8D?=
 =?UTF-8?q?=E7=A7=BB=E7=BB=9F=E8=AE=A1=E8=A1=A8=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/gcaqjc/sjtjcx/ndwytjb/index.js | 2 +-
 src/views/rcgl/wxyh/form.js              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
index 4aa1bd03a..871477159 100644
--- a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
+++ b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
@@ -125,7 +125,7 @@ const Page = () => {
   const exportExcel = () => {
     let params = {
       ...searchVal,
-      stationCodes: trData.map(s => s.stationCode),
+      stationCodes: [trData.find(s => s.stationCode == wyObj.wy)?.stationCode],
       type:2,
       id:1
     }
diff --git a/src/views/rcgl/wxyh/form.js b/src/views/rcgl/wxyh/form.js
index 094304dcf..8c2053630 100644
--- a/src/views/rcgl/wxyh/form.js
+++ b/src/views/rcgl/wxyh/form.js
@@ -244,7 +244,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
               } 
               <Row gutter={[16]}>
               {
-                   imgloading ? <span>文件正在上传中，请等待</span> :
+                  //  imgloading ? <span>文件正在上传中，请等待</span> :
                   imgfileList.length > 0 && imgfileList.map(file => {
                   return (
                       <Col span={12}>
@@ -295,7 +295,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
               }
               <Row gutter={[16]}>
                 {
-                   videoLoading ? <span>文件正在上传中，请等待</span> :
+                  //  videoLoading ? <span>文件正在上传中，请等待</span> :
                   videoFileList.length > 0 && videoFileList.map(file => {
                   return (
                       <Col span={12}>

From 0f8049f40ed0422eb34f08d96da4281c5772fdcd Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Fri, 11 Apr 2025 09:28:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat():=20=E4=BF=AE=E6=94=B9=E6=B0=B4?=
 =?UTF-8?q?=E5=BA=93=E6=BA=A2=E6=B4=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sq/qth/skyh/sssw.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/sq/qth/skyh/sssw.js b/src/views/sq/qth/skyh/sssw.js
index 910bef067..b64238f59 100644
--- a/src/views/sq/qth/skyh/sssw.js
+++ b/src/views/sq/qth/skyh/sssw.js
@@ -32,7 +32,7 @@ export default function Sssw({ data }) {
         <div
           className='report-time'
         >数据更新时间: {detail?.createTime}</div>
-          <div className='drp-content'>
+          <div className='drp-content' style={{justifyContent:'start'}}>
           <div className='drp-item'>
               <div className='value'>{getVal(detail?.val) ?? '-' }&nbsp;<span style={{fontSize:14}}>m³/s</span></div>
             <div className='name'>溢洪流量</div>
@@ -45,17 +45,18 @@ export default function Sssw({ data }) {
             <div className='value'>{getVal(detail?.currMonthSum) ?? '-' }&nbsp;<span style={{fontSize:14}}>万m³</span></div>
             <div className='name'>当月溢洪量</div>
           </div>
-          <div className='drp-item'>
+          {/* <div className='drp-item'>
             <div className='value'>{getVal(detail?.currYearSum) ?? '-' }&nbsp;<span style={{fontSize:14}}>万m³</span></div>
             <div className='name'>当年溢洪量</div>
-          </div>
-          <div className='drp-item'>
+          </div> */}
+          {/* <div className='drp-item'>
             <div className='value'>{getVal(detail?.currYearCount) ?? '-' }&nbsp;<span style={{fontSize:14}}>次</span></div>
             <div className='name'>本年溢洪次数</div>
-         </div> <div className='drp-item'>
+            </div> */}
+            {/* <div className='drp-item'>
             <div className='value'>{getVal(detail?.currYearMaxVal) ?? '-' }&nbsp;<span style={{fontSize:14}}>万m³</span></div>
             <div className='name'>本年单次最大溢洪量</div>
-         </div>
+         </div> */}
        </div>
       </div>
     </div>