lishenfeng
/
mcfxkh-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lishenfeng:d4a3f222a2b5b7b2e6ce15aecc6de5382c5857ea
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:lsf-dev
..
compare: lishenfeng:fded4a1282c84096642fc33e733f7b7ba1cfe51a
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:lsf-dev

No commits in common. "d4a3f222a2b5b7b2e6ce15aecc6de5382c5857ea" and "fded4a1282c84096642fc33e733f7b7ba1cfe51a" have entirely different histories.
d4a3f222a2 ... fded4a1282

3 changed files with 5 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
src/views/Home/MapCtrl/index.js
View File

@ -134,7 +134,9 @@ export default function MapCtrl({ initParams, onLoad }) {
dispatch.runtime.setFeaturePop({ type: record.layerPop, properties: record, coordinates: [record.lgtd, record.lttd] }); dispatch.runtime.setFeaturePop({ type: record.layerPop, properties: record, coordinates: [record.lgtd, record.lttd] });
} }
} }
if(feature.layer.id==='临时线'){
debugger
}
if (feature.layer.id === '关联站点') { if (feature.layer.id === '关联站点') {
const record = feature.properties const record = feature.properties
if (record.cd_nm == 'GN1') { if (record.cd_nm == 'GN1') {

2
src/views/Home/MapCtrl/map.less
View File

@ -12,7 +12,7 @@
} }
.mapboxgl-popup-content { .mapboxgl-popup-content {
background:rgba(4, 8, 27, 0.8) !important; background:rgba(4, 8, 27, 0.8);
border-radius: 0px; border-radius: 0px;
padding: 0; padding: 0;
box-shadow: 0 0 0.5rem 0 rgba(31, 95, 102, 0.7); box-shadow: 0 0 0.5rem 0 rgba(31, 95, 102, 0.7);

2
src/views/Home/panels/Sksltj/index.js
View File

@ -276,7 +276,7 @@ function DrpReal({ style }) {
:null :null
} }
{ {
tab==='灌溉发电'? tab==='发电'?
<div style={{width:"100%",display:'flex',fontSize:'12px',justifyContent:'space-around',padding:'0.5rem 0'}}> <div style={{width:"100%",display:'flex',fontSize:'12px',justifyContent:'space-around',padding:'0.5rem 0'}}>
<div style={{width:'8rem',padding:'0.5rem 0.5rem',background:'#2a5278',display:'flex',flexDirection:'column',justifyContent:'flex-start',alignItems:'center',color:"#ffffff"}}> <div style={{width:'8rem',padding:'0.5rem 0.5rem',background:'#2a5278',display:'flex',flexDirection:'column',justifyContent:'flex-start',alignItems:'center',color:"#ffffff"}}>
<div><span style={{color:'#76b1d4',fontSize:'22px'}}>2.41</span> m³/s</div> <div><span style={{color:'#76b1d4',fontSize:'22px'}}>2.41</span> m³/s</div>