Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

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
     }

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}>

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>