Merge branch 'master' into qzc-dev

src/views/Home/homePanelsLayoutPage/item_gongcheng.js

@@ -14,6 +14,8 @@ const Page = () => {
     const dispatch = useDispatch();
     const [ tableData, setTableData ] = useState([])
     const [checked, setChecked] = useState('渗压监测')
+    const [filteredWyList, setFilteredWyList] = useState([])  // 添加过滤后的位移列表状态
+    const [showAllWyData, setShowAllWyData] = useState(false) // 控制是否显示所有数据
     const columns = useMemo(() => {
         if(checked==='渗压监测'){
             return [
@@ -57,6 +59,15 @@ const Page = () => {
             message.error('查询失败')
             return 
         }
+        if (val === '位移监测') {
+             // 过滤符合条件的数据：监测点为ZY开头且有监测时间和x、y、h方向的值
+            const filtered = data?.filter(item =>
+                item.de ||
+                item.dn ||
+                item.du
+            ) || [];
+            setFilteredWyList(filtered)
+        }
         setChecked(val)
         setTableData(data)
         console.log('list',data)
@@ -89,12 +100,13 @@ const Page = () => {
                 <Table rowKey="stationCode"
                     sticky
                     columns={columns}
-                    pagination={checked == '位移监测' ?{
-                    pageSize: 100,
-                    showSizeChanger: true,
-                    pageSizeOptions: [ '100', '200']}:false}
-                    dataSource={tableData}
-                    scroll={{ y: "300px"}}
+                    pagination={false}
+                    // pagination={checked == '位移监测' ?{
+                    // pageSize: 100,
+                    // showSizeChanger: true,
+                    // pageSizeOptions: [ '100', '200']}:false}
+                    dataSource={checked != '位移监测' ?tableData : showAllWyData?tableData:filteredWyList}
+                    scroll={{ y: "650px"}}
                     onRow={
                         (data)=>({
                             onClick:()=>{
@@ -109,6 +121,11 @@ const Page = () => {
                         })
                     }
                 />
+                {checked == '位移监测' &&<div style={{ display: 'flex', justifyContent: 'center', marginTop: '10px' }}>
+                    <a onClick={() => setShowAllWyData(!showAllWyData)}>
+                      {showAllWyData ? '收起更多信息' : '更多信息'}
+                    </a>
+                  </div>}
             </div>
         </div>
         </>

src/views/gcaqjc/bzt2/index.js

@@ -24,6 +24,10 @@ export default function Page({isHome}) {
   const [openSl, setOpenSl] = useState(false)
   const [openWy, setOpenWy] = useState(false)
   const [openDm, setOpenDm] = useState(false)
+
+  const [filteredWyList, setFilteredWyList] = useState([])  // 添加过滤后的位移列表状态
+  const [showAllWyData, setShowAllWyData] = useState(false) // 控制是否显示所有数据
+
   const myWidth = window.innerWidth
   const myHeight = window.innerHeight
 
@@ -84,6 +88,14 @@ export default function Page({isHome}) {
     }
     const list = data?.map((item) => ({ ...item, stationCode: item.cd }))
     setWyList(list || [])
+
+    // 过滤符合条件的数据：监测点为ZY开头且有监测时间和x、y、h方向的值
+    const filtered = list?.filter(item =>
+      item.de ||
+      item.dn ||
+      item.du
+    ) || []
+    setFilteredWyList(filtered)
   }
 
   const getDmData = async () => {
@@ -192,16 +204,17 @@ export default function Page({isHome}) {
               </Tabs.TabPane>
               <Tabs.TabPane tab={<div style={{ fontSize: '16px', fontWeight: 500, padding: '0 15px' }}>位移监测</div>} key="3">
                 <div className='gcaqjc_bzt_rightBox_table'>
+                  
                   <Table rowKey="stationCode"
                     sticky
                     columns={columnsWy}
-                  // pagination={false}
-                  dataSource={wyList}
-                  pagination={{ 
-                    pageSize: 100,
-                    showSizeChanger: true,
-                    pageSizeOptions: [ '100', '200'],
-                  }}
+                    pagination={false}
+                    dataSource={showAllWyData ? wyList : filteredWyList}
+                    // pagination={{ 
+                    //   pageSize: 100,
+                    //   showSizeChanger: true,
+                    //   pageSizeOptions: [ '100', '200'],
+                    // }}
                     scroll={{ y: "650px" }}
                     onRow={
                       (data) => ({
@@ -212,6 +225,11 @@ export default function Page({isHome}) {
                       })
                     }
                   />
+                  <div style={{ display: 'flex', justifyContent: 'center', marginTop: '10px' }}>
+                    <a onClick={() => setShowAllWyData(!showAllWyData)}>
+                      {showAllWyData ? '收起更多信息' : '更多信息'}
+                    </a>
+                  </div>
                 </div>
               </Tabs.TabPane>
             </Tabs>