src/views/Home/InfoPops/RealSkPop/index.js

@@ -174,26 +174,19 @@ function RealSkTip({ record, dispatch,view }) {
   const changePic = () => {
     setpicidx([picidx[0] === 1 ? 2 : 1, picidx[1] === 1 ? 2 : 1])
   }
-  const openSw = () => {
-    window.open("http://local.gunshiiot.com:18083/zhtmp/#/mgr/home")
-  }
 
   return (
     <>
       <div className="boxhead"></div>
       <div className="featuretip-title">
         <div className="name">{record.stnm}
-        {record.stnm == '浮桥河水库' ?
+        {
           record?.setView&&view===200?
-          <span style={{cursor:'pointer',color:'#50b1f9',marginLeft:20}} onClick={()=>{
+          <span style={{cursor:'pointer',color:'#50b1f9'}} onClick={()=>{
             dispatch.map.setView(203)
             sessionStorage.setItem('lastCenter',JSON.stringify(record))
           }}>  进入水库模块</span>
-              : null :
+          :null
-            record.stnm == '小玉潭水库' ?
-              <span style={{ cursor: 'pointer', color: '#50b1f9',marginLeft:20 }} onClick={openSw}>
-              进入三维模块
-          </span>:null
         }
         </div>
         <div className="extra cursor-pointer" onClick={viewInfo}>详细</div>

src/views/Home/MapCtrl/index.js

@@ -143,7 +143,7 @@ export default function MapCtrl({ initParams, onLoad }) {
                dispatch?.runtime.setInfoDlg({ layerId: 'SyjcLayer', properties: record })
           }else if (record.cd_nm == 'WE1') {
                dispatch?.runtime.setInfoDlg({ layerId: 'SljcLayer', properties: record })
-          }else if (record.cd == '0AB3ED') {
+          }else if (record.cd_nm == '0EA5DE') {
               dispatch?.runtime.setInfoDlg({ layerId: 'ByjcLayer', properties: record })
           }else if (record.stnm == '浮桥河水库') {
               dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: record })

src/views/Home/panels/Cxsk/ARzSk.js

@@ -194,12 +194,12 @@ function ARzSk({data}) {
           {
             data.map((tableRow,index)=>
             <TableBody>
-              <DpTableRow key={tableRow.stcd} onClick={()=>{
+              <DpTableRow key={tableRow.stcd}>
+                <DpTableCell align="center" >
+                  <div className="table-ellipsis cursor-pointer" onClick={()=>{
                     flyTo(tableRow)
                     setSkLayer([tableRow])
                   }}>
-                <DpTableCell align="center" >
-                  <div className="table-ellipsis cursor-pointer" >
                     {tableRow.stnm}
                   </div>
                   </DpTableCell>

src/views/Home/panels/Skzl/collapsePage.js

@@ -8,7 +8,7 @@ function Page({ type,name,num1,num2,skType,setSkType,icon }) {
             <img src={`${process.env.PUBLIC_URL}/assets/icon/${icon}`} width={15} height={15} alt=""/>
             <div style={{flex:1,paddingLeft:'0.8rem',marginBottom:'-0.1rem'}}>{name}</div>
             <div style={{marginBottom:'-0.1rem'}}>{num1}座</div>
-            <div style={{ margin: '0 1rem -0.1rem 1rem' }}>{num2}{(type !=1 && type != 2) ?"万m³":"亿m³"}</div>
+            <div style={{margin:'0 1rem -0.1rem 1rem'}}>{num2}亿m³</div>
             <img src={`${process.env.PUBLIC_URL}/assets/icon/${skType===type?'收起':'展开'}.png`} style={{cursor:'pointer'}} width={20} alt="" />
         </div>
       )

src/views/Home/panels/Skzl/index.js

@@ -136,7 +136,7 @@ function DrpReal({ style }) {
       {
         skTypeObj.map((item) =>
         (<>
-          <CollapsePage type={item.type} name={item.name} num1={item.num1} num2={`${item.num2}/${item.num3}`} skType={skType} setSkType={setSkType} />
+          <CollapsePage type={item.type} icon={item.icon} name={item.name} num1={item.num1} num2={item.num2} skType={skType} setSkType={setSkType} />
           <Collapse in={skType === item.type} timeout="auto" unmountOnExit>
             <TableContainer style={{ maxHeight: 'calc( 100vh - 28.2rem )' }}>
               <Table size="small" stickyHeader>