Merge branch 'qzc-dev'

src/views/Home/MapCtrl/Pops/TuRang/TableData.js

@@ -7,7 +7,7 @@ const Tabledata = ({tableData}) => {
   const columns = [
     { title: '序号', key: '', dataIndex: '', align: 'center',width:'40px',render:(a,b,c)=>c+1},
     { title: '数据时间', key: 'createTime', dataIndex: 'createTime', align: 'center',width:'200px',render: (rec) => <span>{rec ?? "-"}</span> },
-    { title: '湿度', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => <span>{getVal(rec)}</span> },
+    { title: '湿度(%RH)', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => <span>{getVal(rec)}</span> },
   ];
 
   const getVal = (v)=>{

src/views/Home/MapCtrl/components/GsJcsj/drpOption.js

@@ -3,7 +3,6 @@ import { useMemo } from 'react';
 import echarts from 'echarts/lib/echarts';
 
 export default function DrpOption(data, num) {
-  console.log("num",num);
   const minL = Math.floor(Math.min(...data?.map(s => s.q)));
   const maxL = Math.ceil(Math.max(...data?.map(s => s.q)));
   const minS = Math.floor(Math.min(...data?.map(s => s.v)));
@@ -48,6 +47,7 @@ export default function DrpOption(data, num) {
       {
         type: 'category',
         data: data?.map(item => item.tm),
+        inverse:true,
         splitLine: {
           show: false
         },
@@ -115,7 +115,7 @@ export default function DrpOption(data, num) {
         axisTick: {
           show: false,
         },
-        min: minS - 1,
+        min: minS,
         max: maxS
       }
     ],

src/views/Home/homePanelsLayoutPage/item_gongcheng.js

@@ -32,10 +32,10 @@ const Page = () => {
         }else{
             return [
                 { title: '监测点', key: 'cdnm', dataIndex: 'cdnm',align: "center",width: 80, ellipsis: true },
-                { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}><div>{v?.slice(5,10)}</div><div>{v?.slice(11,16)}</div></div> },
+                { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}><div>{v?.slice(5,10)}</div><div>{v?.slice(11,16)|| '-'}</div></div> },
-                { title: <div><div>x方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
+                { title: <div><div>x方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v !== null ?v: '-'}</div> },
-                { title: <div><div>y方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
+                { title: <div><div>y方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v !== null ?v: '-'}</div> },
-                { title: <div><div>h方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
+                { title: <div><div>h方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v !== null ?v: '-'}</div> },
             ]
         }
     }, [checked]);

src/views/Home/homePanelsLayoutPage/item_gongshui.js

@@ -51,7 +51,7 @@ const Page = () => {
                     <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
                         <div style={{display:'flex'}}>
                             <div className="lf">实时流量: </div>
-                            <div className="rf">{data1.q}</div>
+                            <div className="rf">{data1.q}m³/s</div>
                         </div>
                         <div style={{marginBottom:'10px', display:'flex'}}>
                             {/* <div className="lf2" style={{color:'#70B603'}}></div>
@@ -64,7 +64,7 @@ const Page = () => {
                     </div>
                     <div className="home_gongshui_item_text">
                         <div className="lf">今日水量: </div>
-                        <div className="rf">{data1.v}</div>
+                        <div className="rf">{data1.v}m³</div>
                     </div>
                 </div>
                 <div className="home_gongshui_item">
@@ -75,7 +75,7 @@ const Page = () => {
                     <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
                         <div style={{display:'flex'}}>
                             <div className="lf">实时流量: </div>
-                            <div className="rf">{data2.q}</div>
+                            <div className="rf">{data2.q}m³/s</div>
                         </div>
                         <div style={{marginBottom:'10px', display:'flex'}}>
                             {/* <div className="lf2" style={{color:'#70B603'}}></div>
@@ -88,7 +88,7 @@ const Page = () => {
                     </div>
                     <div className="home_gongshui_item_text">
                         <div className="lf">今日水量: </div>
-                        <div className="rf">{data2.v}</div>
+                        <div className="rf">{data2.v}m³</div>
                     </div>
                 </div>
             </div>

src/views/Home/homePanelsLayoutPage/item_shipindian.js

@@ -18,7 +18,7 @@ const Page = () => {
     const columns = [
         // { title: '序号', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 50, ellipsis: true, render: (text, rec, index) => index + 1 },
         { title: '视频点名称', key: 'name', dataIndex: 'name',align: "center",width:80, ellipsis: true, },
-        { title: '所属区域', key: 'name', dataIndex: 'name',align: "center",width: 150, ellipsis: true },
+        { title: '所属区域', key: 'menuName', dataIndex: 'menuName',align: "center",width: 150, ellipsis: true },
     ];
     const getData = async(val)=>{ 
         setChecked(val)

src/views/Home/homePanelsLayoutPage/item_turangshangqing.js

@@ -10,7 +10,7 @@ const Page = () => {
     const [ tableData, setTableData ] = useState([])//在线 
     const columns = [
         { title: '站点', key: 'stnm', dataIndex: 'stnm',align: "center",width:80, ellipsis: true, },
-        { title: '湿度', key: 'val', dataIndex: 'val',align: "center",width:80, ellipsis: true,render:(v)=>typeof v ==='number'?v.toFixed(2):'' },
+        { title: '湿度(%RH)', key: 'val', dataIndex: 'val',align: "center",width:80, ellipsis: true,render:(v)=>typeof v ==='number'?v.toFixed(2):'' },
         { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true },
     ];
 

src/views/gcaqjc/bzt2/index.js

@@ -50,9 +50,9 @@ export default function Page({ isHome }) {
   const columnsWy = [
     { title: '监测点', key: 'cdnm', dataIndex: 'cdnm', align: "center", width: 150, ellipsis: true },
     { title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 80, ellipsis: true, render: (v, row) => <div style={{ color: row.flag === 1 ? 'red' : '#3B4859' }}><div>{v?.slice(5, 10)}</div><div>{v?.slice(11, 16) || '-'}</div></div> },
-    { title: <div><div>x方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.xstatus === 1 ? 'red' : '#3B4859' }}>{v || '-'}</div> },
+    { title: <div><div>x方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.xstatus === 1 ? 'red' : '#3B4859' }}>{v !== null ?v: '-'}</div> },
-    { title: <div><div>y方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.ystatus === 1 ? 'red' : '#3B4859' }}>{v || '-'}</div> },
+    { title: <div><div>y方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.ystatus === 1 ? 'red' : '#3B4859' }}>{v !== null ?v: '-'}</div> },
-    { title: <div><div>h方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.hstatus === 1 ? 'red' : '#3B4859' }}>{v || '-'}</div> },
+    { title: <div><div>h方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.hstatus === 1 ? 'red' : '#3B4859' }}>{v !== null ?v: '-'}</div> },
   ]
 
 

src/views/gxsl/gstjfx/gsOption.js

@@ -100,7 +100,7 @@ export default function drpOption (data) {
         type: 'value',
         // gridIndex:0,
         position: 'left',
-        // name: '水位(m)',
+        name: '供水量(万m³)',
         splitLine: {
           show: true,
           lineStyle: {

src/views/gxsl/gstjfx/tjOption.js

@@ -67,7 +67,7 @@ return{
       },
       labelLine: {
         normal: {
-          length: 80,
+          length: 60,
         //   length2: 120,
           lineStyle: {
             color: "#e6e6e6",

src/views/gxsl/zfzl/shuiguan/drpOption.js

@@ -60,6 +60,7 @@ export default function DrpOption(data, num) {
       {
         type: 'category',
         data: data?.map(item => item.tm),
+        inverse:true,
         splitLine: {
           show: false
         },

src/views/sq/qth/trsq/sjcx.js

@@ -17,7 +17,7 @@ export default function Sjcx({ data }) {
     const columns = [
         { title: '序号', key: '', dataIndex: '', align: 'center',width:'80px',render:(a,b,c)=>c+1},
         { title: '数据时间', key: 'createTime', dataIndex: 'createTime', align: 'center',width:'200px',render: (rec) => <span>{rec ?? "-"}</span> },
-        { title: '湿度', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
+        { title: '湿度(%RH)', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => <span>{rec ?? "-"}</span> },
     ];