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

src/views/Home/MapCtrl/components/Sqjcsj/TableData.js

@@ -6,10 +6,10 @@ import moment from 'moment'
 const Tabledata = ({data}) => {
   const columns = [
     {title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')},
-    {
+    // {
-      title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center',
+    //   title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center',
-      render: (rec) => <span>{rec ?? "-"}</span>
+    //   render: (rec) => <span>{rec ?? "-"}</span>
-    },
+    // },
     {
       title: '水位(m)', key: 'z', dataIndex: 'z', align: 'center',
       render: (rec) => <span>{rec ? rec.toFixed(2) : "-"}</span>

src/views/Home/MapCtrl/components/Sqjcsj/index.js

@@ -11,7 +11,7 @@ import {monitor,getDetail} from '../../../../../service/sssq'
 
 const { RangePicker } = DatePicker;
 
-function DrpSearch({record}) {
+function DrpSearch({ record, update = false }) {
   const [data, setData] = useState([]);
   const [params, setParams] = useState({})
   const [detail, setDetail] = useState({});
@@ -102,6 +102,7 @@ function DrpSearch({record}) {
           }
         </div>
       </div>
+      {!update ?
         <div className="footer" style={record?.height ? { fontSize: 15 } : {}}>
           <div className="footer-row">
             <div className="footer-item">
@@ -164,6 +165,19 @@ function DrpSearch({record}) {
             </div>
           </div>
         </div>
+        : <div className="footer" style={record?.height ? { fontSize: 15 } : {}}>
+          <div className="footer-row">
+          <div className="footer-item">
+              <div className="footer-name">24h水位变幅(m)</div>
+              <div className="footer-num">{detail.rzDiff > 0 ? "+" : ""}{detail.rzDiff ? detail.rzDiff.toFixed(2) : 0}</div>
+            </div>
+            <div className="footer-item">
+              <div className="footer-name">本年最高水位(mm)</div>
+              <div className="footer-num">{detail.maxRz ? detail.maxRz.toFixed(2) : 0}</div>
+            </div>
+          </div>
+        </div>
+      }
     </div>
   )
 }

src/views/gcaqjc/sjtjcx/sljc/toolbar.js

@@ -67,6 +67,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
     setSearchVal({...values, dateTimeRangeSo:dateSo});
   }
 
+   useEffect(() => {
+       let time = [moment().subtract(1,"weeks"),moment()]
+        let dateSo = {
+          start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
+          end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
+       }
+       form.setFieldValue("tm",time)
+       setSearchVal({dateTimeRangeSo:dateSo})
+     }, [])
  
 
   return (

src/views/gcaqjc/sjtjcx/syjc/toolbar.js

@@ -94,6 +94,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
    getStationCode()
  }, [])
   
+  useEffect(() => {
+     let time = [moment().subtract(1,"weeks"),moment()]
+      let dateSo = {
+        start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
+        end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
+     }
+     form.setFieldValue("tm",time)
+     setSearchVal({dateTimeRangeSo:dateSo})
+   }, [])
 
   return (
     <>

src/views/gcaqjc/sjtjcx/wyjc/toolbar.js

@@ -83,7 +83,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
    getStationCode()
  }, [])
  
-
+ useEffect(() => {
+     let time = [moment().subtract(1,"weeks"),moment()]
+      let dateSo = {
+        start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
+        end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
+     }
+     form.setFieldValue("tm",time)
+     setSearchVal({dateTimeRangeSo:dateSo})
+   }, [])
   return (
     <>
       <div style={{display:'flex',justifyContent:'space-between'}}>

src/views/sq/qfg/zcdjxx.js

@@ -1,10 +1,10 @@
 import { Image } from "antd"
 // import zd from '../../../assets/img/u0.png'
-import zd from '../../../assets/img/wait.png'
+import zd from '../../../assets/img/djz.jpg'
 const Page = () => {
     return (
         <div style={{display:'flex',justifyContent:'center',alignItems:'center',backgroundColor:'#fff',height:'100%',padding:'20px'}}>
-            <Image src={zd} style={{margin:'auto',margin:'20px',height:'130px'}} preview={false}/>
+            <Image src={zd} style={{margin:'auto',margin:'20px',height:'630px'}} preview={false}/>
         </div>
     )
 }

src/views/sq/qth/hdsq/index.js

@@ -61,7 +61,7 @@ export default function Sksq() {
             </div>
             </div>
             <div className='sjcx-content'>
-                <Sjcx record={{...tableData[0],height:true} || {}}/>
+            <Sjcx record={{ ...tableData[0], height: true } || {}} update={true} />
             </div>
           </div>
           </div>