merge: 合并冲突

src/views/Home/MapCtrl/index.js

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

src/views/Home/MapCtrl/map.less

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

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

@@ -276,7 +276,7 @@ function DrpReal({ style }) {
         :null
       }
       {
-        tab==='发电'?
+        tab==='灌溉发电'?
         <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><span style={{color:'#76b1d4',fontSize:'22px'}}>2.41</span> m³/s</div>