diff --git a/src/views/gcaqjc/bzt2/index.js b/src/views/gcaqjc/bzt2/index.js
index 7df33f1e4..72f9b11e9 100644
--- a/src/views/gcaqjc/bzt2/index.js
+++ b/src/views/gcaqjc/bzt2/index.js
@@ -45,10 +45,10 @@ 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>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>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: '监测时间', 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>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>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> },
   ]
 
 
@@ -134,13 +134,13 @@ export default function Page({isHome}) {
             {
               wyList.map((item)=>
                 <div 
-                  className={'gcaqjc_bzt_wy_'+item.stationCode} 
+                  className={'gcaqjc_bzt_wy_'+item.cdnm} 
                   onClick={()=>{
                     setOpenWy(true)
                     setModalData(item)
                   }}
                 >
-                  <span>{item.stationCode}</span>
+                  <span>{item.cdnm}</span>
                   <img width={10} height={10} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${(item.xstatus===1||item.ystatus===1||item.hstatus===1)?'wy2.png':'wy.png'}`} alt="" id="img" draggable="false" />
                 </div>
               )
diff --git a/src/views/gcaqjc/bzt2/index.less b/src/views/gcaqjc/bzt2/index.less
index ea1ddc01d..8ae203be5 100644
--- a/src/views/gcaqjc/bzt2/index.less
+++ b/src/views/gcaqjc/bzt2/index.less
@@ -334,135 +334,284 @@
 
 
 
-    .gcaqjc_bzt_wy_WY-01{
+    .gcaqjc_bzt_wy_WY01{
       left: 961px;
       top: 1003px;
     }
-    .gcaqjc_bzt_wy_WY-02{
-      left: 971px;
-      top: 872px;
+    .gcaqjc_bzt_wy_WY02{
+      left: 968px;
+      top: 892px;
     } 
-    .gcaqjc_bzt_wy_WY-03{
+    .gcaqjc_bzt_wy_WY03{
       left: 979px;
       top: 764px;
     }
-    .gcaqjc_bzt_wy_WY-04{
+    .gcaqjc_bzt_wy_WY04{
       left: 986px;
-      top: 650px;
+      top: 672px;
     }
-    .gcaqjc_bzt_wy_WY-05{
+    .gcaqjc_bzt_wy_WY05{
       left: 981px;
       top: 547px;
     }
-    .gcaqjc_bzt_wy_WY-06{
+    .gcaqjc_bzt_wy_WY06{
       left: 973px;
-      top: 443px;
+      top: 455px;
     }
-    .gcaqjc_bzt_wy_WY-07{
+    .gcaqjc_bzt_wy_WY07{
       left: 965px;
       top: 327px;
     } 
-    .gcaqjc_bzt_wy_WY-08{
+    .gcaqjc_bzt_wy_WY08{
       left: 974px;
       top: 1004px;
     }
-    .gcaqjc_bzt_wy_WY-09{
-      left: 983px;
-      top: 876px;
+    .gcaqjc_bzt_wy_WY09{
+      left: 989px;
+      top: 893px;
     } 
-    .gcaqjc_bzt_wy_WY-10{
+    .gcaqjc_bzt_wy_WY10{
       left: 992px;
       top: 766px;
     }
-    .gcaqjc_bzt_wy_WY-11{
-      left: 996px;
-      top: 656px;
+    .gcaqjc_bzt_wy_WY11{
+      left: 1005px;
+      top: 673px;
     }
-    .gcaqjc_bzt_wy_WY-12{
+    .gcaqjc_bzt_wy_WY12{
       left: 993px;
       top: 546px;
     }
-    .gcaqjc_bzt_wy_WY-13{
-      left: 986px;
-      top: 436px;
+    .gcaqjc_bzt_wy_WY13{
+      left: 993px;
+      top: 454px;
     }
-    .gcaqjc_bzt_wy_WY-14{
+    .gcaqjc_bzt_wy_WY14{
       left: 978px;
       top: 325.5px;
     } 
-    .gcaqjc_bzt_wy_WY-15{
+    .gcaqjc_bzt_wy_WY15{
       left: 1031px;
       top: 1009px;
     }
-    .gcaqjc_bzt_wy_WY-16{
-      left: 1045px;
-      top: 879px;
+    .gcaqjc_bzt_wy_WY16{
+      left: 1041px;
+      top: 898px;
     } 
-    .gcaqjc_bzt_wy_WY-17{
+    .gcaqjc_bzt_wy_WY17{
       left: 1049px;
       top: 771px;
     }
-    .gcaqjc_bzt_wy_WY-18{
-      left: 1061px;
-      top: 663px;
+    .gcaqjc_bzt_wy_WY18{
+      left: 1058px;
+      top: 677px;
     }
-    .gcaqjc_bzt_wy_WY-19{
+    .gcaqjc_bzt_wy_WY19{
       left: 1050px;
       top: 543px;
     }
-    .gcaqjc_bzt_wy_WY-20{
+    .gcaqjc_bzt_wy_WY20{
       left: 1045px;
-      top: 434px;
+      top: 450px
     }
-    .gcaqjc_bzt_wy_WY-21{
+    .gcaqjc_bzt_wy_WY21{
       left: 1037px;
       top: 322px;
     } 
-    .gcaqjc_bzt_wy_WY-22{
+    .gcaqjc_bzt_wy_WY22{
       left: 1070px;
       top: 1012px;
     }
-    .gcaqjc_bzt_wy_WY-23{
-      left: 1079px;
-      top: 882px;
+    .gcaqjc_bzt_wy_WY23{
+      left: 1069px;
+      top: 900px;
     }
-    .gcaqjc_bzt_wy_WY-24{
+    .gcaqjc_bzt_wy_WY24{
       left: 1088px;
       top: 774px;
     }
-    .gcaqjc_bzt_wy_WY-25{
-      left: 1091px;
-      top: 666px;
+    .gcaqjc_bzt_wy_WY25{
+      left: 1083px;
+      top: 679px;
     }
-    .gcaqjc_bzt_wy_WY-26{
+    .gcaqjc_bzt_wy_WY26{
       left: 1088px;
       top: 542px;
     }
-    .gcaqjc_bzt_wy_WY-27{
+    .gcaqjc_bzt_wy_WY27{
       left: 1081px;
       top: 432.5px;
     }
-    .gcaqjc_bzt_wy_WY-28{
+    .gcaqjc_bzt_wy_WY28{
       left: 1040px;
       top: 20px;
     }
-    .gcaqjc_bzt_wy_WY-29{
+    .gcaqjc_bzt_wy_WY29{
       left: 974px;
       top: 95px;  
     }
-    .gcaqjc_bzt_wy_WY-30{
+    .gcaqjc_bzt_wy_WY30{
       left: 1057px;
       top: 34px;
     }
-    .gcaqjc_bzt_wy_WY-31{
+    .gcaqjc_bzt_wy_WY31{
       left: 991px;
       top: 111px;
     }
-    .gcaqjc_bzt_wy_WY-32{
+    .gcaqjc_bzt_wy_WY32{
       left: 660px;
       top: 1266px;
     }
 
+    .gcaqjc_bzt_wy_ZY01{
+      left: 58px;
+      top: 1462px;
+    }
+    .gcaqjc_bzt_wy_ZY02{
+      left: 23px;
+      top: 1449px;
+    }
+    .gcaqjc_bzt_wy_ZY03{
+      left: 40px;
+      top: 1518px;  
+    }
+
+    .gcaqjc_bzt_wy_ZY04{
+      left: 4px;
+      top: 1507px;
+    }
+
+    .gcaqjc_bzt_wy_ZY05{
+      left: 1080px;
+      top: 67px;
+    }
+    .gcaqjc_bzt_wy_ZY06{
+      left: 1104px;
+      top: 98px;
+    }
+    .gcaqjc_bzt_wy_ZY07{
+      left: 1128px;
+      top: 129px;
+    }
+    .gcaqjc_bzt_wy_ZY08{
+      left: 1151px;
+      top: 158px;
+    }
+    .gcaqjc_bzt_wy_ZY09{
+      left: 1176px;
+      top: 185px;
+    }
+    .gcaqjc_bzt_wy_ZY10{
+      left: 1203px;
+      top: 208px;
+    }
+    .gcaqjc_bzt_wy_ZY11{
+      left: 1233px;
+      top: 234px;
+    }
+    .gcaqjc_bzt_wy_ZY12{
+      left: 1259px;
+      top: 255px;
+    }
+    .gcaqjc_bzt_wy_ZY13{
+      left: 1288px;
+      top: 281px;
+    }
+    .gcaqjc_bzt_wy_ZY14{
+      left: 1314px;
+      top: 304px;
+    }
+    .gcaqjc_bzt_wy_ZY15{
+      left: 1344px;
+      top: 328px;
+    }
+    .gcaqjc_bzt_wy_ZY16{
+      left: 1026px;
+      top: 133px;
+    }
+    .gcaqjc_bzt_wy_ZY17{
+      left: 1058px;
+      top: 153px;
+    }
+    .gcaqjc_bzt_wy_ZY18{
+      left: 1092px;
+      top: 172px;
+    }
+    .gcaqjc_bzt_wy_ZY19{
+      left: 1124px;
+      top: 192px;
+    }
+    .gcaqjc_bzt_wy_ZY20{
+      left: 1152px;
+      top: 213px;
+    }
+    .gcaqjc_bzt_wy_ZY21{
+      left: 1181px;
+      top: 234px;
+    }
+    .gcaqjc_bzt_wy_ZY22{
+      left: 1210px;
+      top: 259px;
+    }
+    .gcaqjc_bzt_wy_ZY23{
+      left: 1237px;
+      top: 283px;
+    }
+    .gcaqjc_bzt_wy_ZY24{
+      left: 1266px;
+      top: 308px;
+    }
+    .gcaqjc_bzt_wy_ZY25{
+      left: 1292px;
+      top: 330px;
+    }
+    .gcaqjc_bzt_wy_ZY26{
+      left: 1320px;
+      top: 354px;
+    }
+    .gcaqjc_bzt_wy_ZY27{
+      left: 1213px;
+      top: 198px;
+    }
+    .gcaqjc_bzt_wy_ZY28{
+      left: 1242px;
+      top: 224px;
+    }
+    .gcaqjc_bzt_wy_ZY29{
+      left: 1268px;
+      top: 245px;
+    }
+    .gcaqjc_bzt_wy_ZY30{
+      left: 1297px;
+      top: 271px;
+    }
+    .gcaqjc_bzt_wy_ZY31{
+      left: 1324px;
+      top: 293px;
+    }
+
+
+    .gcaqjc_bzt_wy_ZY32{
+      left: 1251px;
+      top: 213px;
+    }
+    .gcaqjc_bzt_wy_ZY33{
+      left: 1277px;
+      top: 234px;
+    }
+    .gcaqjc_bzt_wy_ZY34{
+      left: 1307px;
+      top: 259px;
+    }
+    .gcaqjc_bzt_wy_ZY35{
+      left: 1261px;
+      top: 202px;
+    }
+    .gcaqjc_bzt_wy_ZY36{
+      left: 1289px;
+      top: 219px;
+    }
+
     .gcaqjc_bzt_sl_LS0423{
       left: 1144px;
       top: 437px;