From 3a4153f941c25920bc8c0328b1072f310ad7769b Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Tue, 2 Sep 2025 17:27:53 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B8=97=E5=8E=8B=E3=80=81=E6=B8=97?=
 =?UTF-8?q?=E6=B5=81=E5=92=8C=E4=BD=8D=E7=A7=BB=E6=95=B0=E6=8D=AE=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/homePanelsLayoutPage/item_gongcheng.js   | 13 ++++++++-----
 src/views/gcaqjc/bzt2/index.js                    | 15 ++++++++++-----
 src/views/gcaqjc/sjtjcx/ndsltjb/index.js          |  2 +-
 src/views/gcaqjc/sjtjcx/ndwytjb/index.js          |  4 ++--
 src/views/rcgl/byfz/bypc/index.js                 |  4 ++--
 src/views/rcgl/byfz/bypc/toolbar.js               |  2 +-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
index df37a6ebf..03dc12f78 100644
--- a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
+++ b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
@@ -29,11 +29,11 @@ const Page = () => {
             ]
         }else{
             return [
-                { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 80, ellipsis: true },
+                { title: '监测点', key: 'cd', dataIndex: 'cd',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: 'x', dataIndex: 'x',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
-                { title: <div><div>Y方向</div><div>(mm)</div></div>, key: 'y', dataIndex: 'y',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
-                { title: <div><div>H方向</div><div>(mm)</div></div>, key: 'h', dataIndex: 'h',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
+                { title: <div><div>e方向</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>n方向</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>u方向</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> },
             ]
         }
     }, [checked]);
@@ -89,7 +89,10 @@ const Page = () => {
                 <Table rowKey="stationCode"
                     sticky
                     columns={columns}
-                    pagination={false}
+                    pagination={checked == '位移监测' ?{
+                    pageSize: 100,
+                    showSizeChanger: true,
+                    pageSizeOptions: [ '100', '200']}:false}
                     dataSource={tableData}
                     scroll={{ y: "300px"}}
                     onRow={
diff --git a/src/views/gcaqjc/bzt2/index.js b/src/views/gcaqjc/bzt2/index.js
index 4914f99b3..3f2d6a836 100644
--- a/src/views/gcaqjc/bzt2/index.js
+++ b/src/views/gcaqjc/bzt2/index.js
@@ -44,11 +44,11 @@ export default function Page({isHome}) {
   ]
 
   const columnsWy = [
-    { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 80, ellipsis: true },
+    { title: '监测点', key: 'cd', dataIndex: 'cd',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: 'x', dataIndex: 'x',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
-    { title: <div><div>Y方向</div><div>(mm)</div></div>, key: 'y', dataIndex: 'y',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
-    { title: <div><div>H方向</div><div>(mm)</div></div>, key: 'h', dataIndex: 'h',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
+    { title: <div><div>e方向</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>n方向</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>u方向</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> },
   ]
 
 
@@ -194,8 +194,13 @@ export default function Page({isHome}) {
               <Table rowKey="stationCode"
                   sticky
                   columns={columnsWy}
-                  pagination={false}
+                  // pagination={false}
                   dataSource={wyList}
+                    pagination={{ 
+                    pageSize: 100,
+                    showSizeChanger: true,
+                    pageSizeOptions: [ '100', '200'],
+                  }}
                   scroll={{ y: "650px"}}
                   onRow={
                       (data)=>({
diff --git a/src/views/gcaqjc/sjtjcx/ndsltjb/index.js b/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
index edb40a265..2561fce2c 100644
--- a/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
+++ b/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
@@ -70,7 +70,7 @@ const Page = () => {
       let newArr = [];
       let newData = res.data?.map((s, i) => {
        newArr.push(s.list?.map(c => ({
-         [c.stationCode]: c.value || '-',
+         [c.stationCode]: (c.value || c.value == 0) ? c.value : '-',
          tm:c.tm
         })))
         return {
diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
index 3b91bfb51..aa851779c 100644
--- a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
+++ b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
@@ -83,7 +83,7 @@ const Page = () => {
       let newArr = [];
       let newData = res.data?.map((s, i) => {
         newArr.push(s.list?.map((c, i) => ({
-          [c.cd]: c.value || '-',
+          [c.cd]: (c.value || c.value == 0) ? c.value : '-',
            [`e_${c.cd}`]:c.de ,
            [`n_${c.cd}`]:c.dn ,
            [`u_${c.cd}`]:c.du ,
@@ -171,7 +171,7 @@ const Page = () => {
       }
       getTable2Data(params)
     }
-  }, [trData,wyObj])
+  }, [trData,wyObj,searchVal])
   
   useEffect(() => {
     getDmTree()
diff --git a/src/views/rcgl/byfz/bypc/index.js b/src/views/rcgl/byfz/bypc/index.js
index 3e5948157..befb635cd 100644
--- a/src/views/rcgl/byfz/bypc/index.js
+++ b/src/views/rcgl/byfz/bypc/index.js
@@ -83,8 +83,8 @@ const Page = () => {
     },
     {
       title: '测点编号',
-      dataIndex: 'mnNo',
-      key: 'mnNo',
+      dataIndex: 'order',
+      key: 'order',
       width: 120,
         align:'center'
     },
diff --git a/src/views/rcgl/byfz/bypc/toolbar.js b/src/views/rcgl/byfz/bypc/toolbar.js
index 033b9bcee..7d1b4afd5 100644
--- a/src/views/rcgl/byfz/bypc/toolbar.js
+++ b/src/views/rcgl/byfz/bypc/toolbar.js
@@ -37,7 +37,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
               style={{ width: "240px" }}
             />
           </Form.Item>
-          <Form.Item label="测点编号" name="mnNo">
+          <Form.Item label="测点编号" name="order">
             <Input 
               allowClear
               style={{ width: "240px" }}