From 8309637c222f33b7cf83bf70ef88e4c8ae32f6a7 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Mon, 27 Oct 2025 17:02:52 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=AE=E6=94=B9=E5=B8=83=E7=BD=AE?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=AD=E5=8F=B3=E4=BE=A7=E6=B8=97=E5=8E=8B=E3=80=81?=
 =?UTF-8?q?=E6=B8=97=E6=B5=81=E3=80=81=E4=BD=8D=E7=A7=BB=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homePanelsLayoutPage/item_gongcheng.js    | 50 ++++++++++++++++---
 src/views/gcaqjc/bzt2/index.js                | 48 +++++++++++++++---
 2 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
index d8539d0b9..3d1e2e4f3 100644
--- a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
+++ b/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]);
diff --git a/src/views/gcaqjc/bzt2/index.js b/src/views/gcaqjc/bzt2/index.js
index 9eacf565b..78cadf9b9 100644
--- a/src/views/gcaqjc/bzt2/index.js
+++ b/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>
+    },
   ]