feat():供水接口修改

src/service/apiurl.js

@@ -125,7 +125,7 @@ const apiurl = {
     yhd: service_fxdd + '/attSpillwayBase/list',//溢洪道
     gs: service_fxdd + '/stStbprpB/trafficSiteDetails/realTimeTrafficList',//供水
     getGs: service_fxdd + '/stWaterRReal/getByStcd/',//获取流量站详情
-    getGsList: service_fxdd + '/stWaterRReal/list',//获取供水首页右侧面板数据
+    getGsList: service_fxdd + '/stFlowR/list',//获取供水首页右侧面板数据
     sl: service_fxdd + '/osmoticPressR/list/value?type=2',//'/osmoticFlowDevice/getDetailsAndMonitoringDataList',//渗流
     sy: service_fxdd + '/osmoticPressR/list/value?type=1',//'/osmoticPressDevice/getDetailsAndMonitoringDataList',//渗压
     syslList: service_fxdd + '/osmoticPressR/detail/value',//渗压、渗流详情数据
@@ -550,7 +550,7 @@ const apiurl = {
       videoList: service_fxdd + "/gateValveCctvRel/list",
       videosrc: service_fxdd + "/attCctvBase/preview/",
       tjzf: service_fxdd + "/gateValveReal/control",
-      input: service_fxdd + "/stWaterRReal/list",
+      input: service_fxdd + "/stFlowR/list",
       export1: service_fxdd + "/gateValveReal/log/export", //操作日志导出
       logpage: service_fxdd + "/gateValveReal/log/page", //操作日志分页
       gsStatic: service_fxdd + "/stWaterR/stat",

src/views/Home/homePanelsLayoutPage/item_gongshui.js

@@ -25,7 +25,7 @@ const Page = () => {
         }
         data?.map((item,index)=>{
             if(index<2){
-                if(item.stcd==='1111111'){
+                if(item.stcd==='10498'){
                     //灌溉流量站
                     setData1({...item})
                 }

src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js

@@ -64,7 +64,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
    // gz1、gz2、gz3、gz4分别为渗压管
    const gz1 = data[alltype[0]] ?
       type == "3" ? [[typeName =='5' ?47:51, typeName =='5' ?76.56:92.18], [typeName =='5' ?47:51, data[alltype[0]]]] :
-         type == "2" ? [[typeName =='3' ? 45.5:50, typeName =='3' ?76.16:77.18], [typeName =='3' ? 45.5:50, data[alltype[0]]]] :
+         type == "2" ? [[typeName =='3' ? 45.5:50, typeName =='3' ?76.76:77.18], [typeName =='3' ? 45.5:50, data[alltype[0]]]] :
          type == "1" ? [[44, typeName =='1' ?79.16:77.18], [44, data[alltype[0]]]] :
             [[55, 109.87], [55, data[alltype[0]]]]
       : [];

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

@@ -16,15 +16,15 @@ const Page = () => {
     { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
     // { title: '水库代码', key: 'rscd', dataIndex: 'rscd', width: 200, ellipsis: true, align:"center" },
     // { title: '水工建筑物编号', key: 'hycncd', dataIndex: 'hycncd', width: 200, align:"center"},
-    { title: '测点编号', key: 'mpcd', dataIndex: 'mpcd', width: 200, align:"center"},
+    { title: '测点编号', key: 'dvcd', dataIndex: 'dvcd', width: 200, align:"center"},
     { title: '测量时间', key: 'mstm', dataIndex: 'mstm', width: 200, align:"center"},
-    { title: '温度(°C)', key: 'tm', dataIndex: 'tm', width: 250, ellipsis: true,align:"center", },
+    // { title: '温度(°C)', key: 'tm', dataIndex: 'tm', width: 250, ellipsis: true,align:"center", },
-    { title: '渗流量(l/s)', key: 'spqn', dataIndex: 'spqn', width: 250, ellipsis: true,align:"center", },
+    { title: '渗流量(L/s)', key: 'spqn', dataIndex: 'spqn', width: 250, ellipsis: true,align:"center", },
-    {
+    // {
-      title: '标准水温渗流量(l/s)', key: 'stspqn', dataIndex: 'stspqn', width: 200, align:"center",
+    //   title: '标准水温渗流量(l/s)', key: 'stspqn', dataIndex: 'stspqn', width: 200, align:"center",
-    },
+    // },
-    { title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200, ellipsis: true,align:"center" },
+    // { title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200, ellipsis: true,align:"center" },
-    { title: '更新时间', key: 'updateTm', dataIndex: 'updateTm', width: 200, ellipsis: true,align:"center" },
+    // { title: '更新时间', key: 'updateTm', dataIndex: 'updateTm', width: 200, ellipsis: true,align:"center" },
   ];
 
   

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

@@ -59,8 +59,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
     let dateSo;
     if (values.tm) {
       dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
       }
     }
     delete values.tm
@@ -82,11 +82,11 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
     <>
       <div style={{display:'flex',justifyContent:'space-between'}}>
         <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="上报时间" name="tm">
+          <Form.Item label="测量日期" name="tm">
             <RangePicker
               allowClear
               style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
               onChange={(v)=>{
                 form.setFieldValue('ranger',null)
               }}

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

@@ -94,8 +94,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
     let dateSo;
     if (values.tm) {
       dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
       }
     }
     delete values.tm
@@ -135,12 +135,11 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
     <>
       <div style={{display:'flex',justifyContent:'space-between'}}>
         <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="上报时间" name="tm">
+          <Form.Item label="测量日期" name="tm">
             <RangePicker
               allowClear
-              showTime
               style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
               onChange={(v)=>{
                 form.setFieldValue('ranger',null)
               }}

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

@@ -86,8 +86,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
     let dateSo;
     if (values.tm) {
       dateSo = {
-        start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+        start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
-        end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+        end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
       }
     }
     delete values.tm
@@ -102,8 +102,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
  useEffect(() => {
      let time = [moment().subtract(1,"weeks"),moment()]
       let dateSo = {
-        start:moment(time[0]).format('YYYY-MM-DD HH:mm:ss'),
+        start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
-        end:moment(time[1]).format('YYYY-MM-DD HH:mm:ss'),
+        end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
      }
      form.setFieldValue("tm",time)
      setSearchVal({dateTimeRangeSo:dateSo})
@@ -112,11 +112,11 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
     <>
       <div style={{display:'flex',justifyContent:'space-between'}}>
         <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
-          <Form.Item label="上报时间" name="tm">
+          <Form.Item label="监测日期" name="tm">
             <RangePicker
               allowClear
               style={{ width: "350px" }}
-              format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
               onChange={(v)=>{
                 form.setFieldValue('ranger',null)
               }}

src/views/gxsl/gsnlfx/index.js

@@ -46,7 +46,7 @@ export default function Gsnlfx() {
       const getInputData = async() => {
         try {
             const res = await httppost2(apiurl.gsxl.zfzl.input)
-            const ssg = res.data.find(item => item.stcd == "1111111");//灌溉流量
+            const ssg = res.data.find(item => item.stcd == "10498");//灌溉流量
             const fsg = res.data.find(item => item.stcd == "2222222");//水厂流量
             setSsGData({ssg,fsg})
         } catch (error) {

src/views/rcgl/zmjk/index.js

@@ -375,13 +375,18 @@ const Page = () => {
       name: "灌溉发电流量（m³/s）",
       realData:'',
       tm:''
+    },
+     {
+      name: "水厂取水流量（m³/s）",
+      realData:'',
+      tm:''
   }
 ]
     // 闸阀历史操作
   const [zfjkSwData, setzfjkSwData] = useState([])
     const getZfjkSwData = async () => {
       try {
-        const res = await httppost2(apiurl.gsxl.zfzl.swInfo,{stcd:"10196"})
+        const res = await httppost2(apiurl.gsxl.zfzl.swInfo,{stcd:"10852"})
         if (res.code == 200) { 
           const {
             rz,
@@ -389,7 +394,9 @@ const Page = () => {
             outPowerNum,
             todayRainNumTm,
             outPowerNumTm,
-            tm
+            tm,
+            q,
+            qtm
           } = res.data;
           const newArr = swList.map(item => {
             if (item.name == '库水位（m）') {
@@ -398,9 +405,12 @@ const Page = () => {
             } else if (item.name == '今日雨量（mm）') {
               item.realData = todayRainNum;
               item.tm = todayRainNumTm;
-            } else {
+            } else if(item.name == '灌溉发电流量（m³/s）') {
               item.realData = outPowerNum;
               item.tm = outPowerNumTm;
+            } else {
+              item.realData = q;
+              item.tm = qtm;
             }
             return item;
           })