Merge branch 'qzc-dev'

src/views/Home/homePanelsLayoutPage/item_gongcheng.js

@@ -20,22 +20,56 @@ const Page = () => {
         if(checked==='渗压监测'){
             return [
                 { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
-                { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-                { title: '管水位(m)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true,  render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>  },
+                {
+                    title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true,
+                    // render: (v, row) => <div style={{ color: row.flag === 1 ? 'red' : '#3B4859' }}>{v?.slice(5, 16)}</div>
+                    render: (v, row) => <div>{v?.slice(5, 16)}</div>
+                },
+                {
+                    title: '管水位(m)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+                    // render: (v, row) => <div style={{ color: row.status === 1 ? 'red' : '#3B4859' }}>{v}</div>
+                    render: (v, row) => <div>{v}</div>
+                }
             ]
         }else if(checked === '渗流监测'){
             return [
                 { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
-                { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-                { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>   },
+                {
+                    title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true,
+                    // render: (v, row) => <div style={{ color: row.flag === 1 ? 'red' : '#3B4859' }}>{v?.slice(5, 16)}</div>
+                    render: (v, row) => <div>{v?.slice(5, 16)}</div>
+                },
+                {
+                    title: '渗流量(L/s)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+                    // render: (v, row) => <div style={{ color: row.status === 1 ? 'red' : '#3B4859' }}>{v}</div>
+                    render: (v, row) => <div>{v}</div>
+                },
+
             ]
         }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: <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 !== 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 !== null ?v: '-'}</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>
+                    render: (v, row) => <div><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 !== null ? v : '-'}</div>
+                    render: (v, row) => <div>{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 !== null ? v : '-'}</div>
+                    render: (v, row) => <div>{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 !== null ? v : '-'}</div>
+                    render: (v, row) => <div>{v !== null ? v : '-'}</div>
+                },
+
             ]
         }
     }, [checked]);
@@ -106,7 +140,7 @@ const Page = () => {
                     // showSizeChanger: true,
                     // pageSizeOptions: [ '100', '200']}:false}
                     dataSource={checked != '位移监测' ?tableData : showAllWyData?tableData:filteredWyList}
-                    scroll={{ y: "650px"}}
+                    scroll={{ y: "600px"}}
                     onRow={
                         (data)=>({
                             onClick:()=>{

src/views/gcaqjc/bzt2/index.js

@@ -37,22 +37,54 @@ export default function Page({ isHome }) {
   const columnsSy = [
     { title: '监测点', key: 'stationCode', dataIndex: 'stationCode', align: "center", ellipsis: true },
     { title: '所属断面', key: 'profileName', dataIndex: 'profileName', width: 110, align: "center", ellipsis: true },
-    { title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 110, ellipsis: true, render: (v, row) => <div style={{ color: row.flag === 1 ? 'red' : '#3B4859' }}>{v?.slice(5, 16)}</div> },
-    { title: '管水位(m)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.status === 1 ? 'red' : '#3B4859' }}>{v}</div> },
+    {
+      title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 110, ellipsis: true,
+      // render: (v, row) => <div style={{ color: row.flag === 1 ? 'red' : '#3B4859' }}>{v?.slice(5, 16)}</div>
+      render: (v, row) => <div>{v?.slice(5, 16)}</div>
+    },
+    {
+      title: '管水位(m)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+      // render: (v, row) => <div style={{ color: row.status === 1 ? 'red' : '#3B4859' }}>{v}</div>
+      render: (v, row) => <div>{v}</div>
+    },
   ]
 
   const columnsSl = [
     { title: '监测点', key: 'stationCode', dataIndex: 'stationCode', align: "center", ellipsis: true },
-    { title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true, render: (v, row) => <div style={{ color: row.flag === 1 ? 'red' : '#3B4859' }}>{v?.slice(5, 16)}</div> },
-    { title: '渗流量(L/s)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true, render: (v, row) => <div style={{ color: row.status === 1 ? 'red' : '#3B4859' }}>{v}</div> },
+    {
+      title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true,
+      // render: (v, row) => <div style={{ color: row.flag === 1 ? 'red' : '#3B4859' }}>{v?.slice(5, 16)}</div>
+      render: (v, row) => <div>{v?.slice(5, 16)}</div>
+    },
+    {
+      title: '渗流量(L/s)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+      // render: (v, row) => <div style={{ color: row.status === 1 ? 'red' : '#3B4859' }}>{v}</div>
+      render: (v, row) => <div>{v}</div>
+    },
   ]
 
   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 !== 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 !== 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 !== null ?v: '-'}</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>
+      render: (v, row) => <div><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 !== null ? v : '-'}</div>
+      render: (v, row) => <div>{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 !== null ? v : '-'}</div>
+      render: (v, row) => <div>{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 !== null ? v : '-'}</div>
+      render: (v, row) => <div>{v !== null ? v : '-'}</div>
+    },
   ]
 
 

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

@@ -66,7 +66,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
       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.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]]]]
+            [[55, typeName =='7'?109.08:108.77], [55, data[alltype[0]]]]
       : [];
    
    
@@ -74,14 +74,14 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
       type == "3" ? [[typeName =='5' ?51:62, typeName =='5' ?77.18:83.50], [typeName =='5' ?51:62, data[alltype[1]]]] :
          type == "2" ? [[typeName =='3' ?50:61, typeName =='3' ?77.18:77.50], [typeName =='3' ?50:61, data[alltype[1]]]] :
          type == "1" ? [[51.5, typeName =='1' ?77.18:74.5], [51.5, data[alltype[1]]]] :
-            [[65, 109.75], [65, data[alltype[1]]]] :
+            [[65, typeName =='7'?109.32:109.36], [65, data[alltype[1]]]] :
       [];
 
    const gz3 = data[alltype[2]] ?
       type == "3" ? [[62, 81.50], [62, data[alltype[2]]]] :
          type == "2" ? [[61, 80.50], [61, data[alltype[2]]]] :
          type == "1" ? [[58, 66.50], [58, data[alltype[2]]]] :
-            [[77, 109.43], [77, data[alltype[2]]]] : [];
+            [[77, typeName =='7'?109.01:108.87], [77, data[alltype[2]]]] : [];
    
    
    const gz4 = data[alltype[3]] ?

src/views/gcaqjc/sjtjcx/czcx/dtOptions.js

@@ -89,6 +89,7 @@ let rzList =  {
    xAxis: {
       type: 'category',
       data: code.map(item => item.tm),
+      inverse:true,
       axisLabel: {
          // 坐标轴字体颜色
          color: textColor,