fixed():修复ui走查提出来的问题

src/assets/fonts/font_pda/iconfont.json

@@ -6,6 +6,48 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "705663",
+      "name": "定位",
+      "font_class": "dingwei",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "39156615",
+      "name": "定位-copy",
+      "font_class": "dingwei-copy",
+      "unicode": "e8c9",
+      "unicode_decimal": 59593
+    },
+    {
+      "icon_id": "39089076",
+      "name": "点位-有时间",
+      "font_class": "dianwei-youshijian",
+      "unicode": "e7a7",
+      "unicode_decimal": 59303
+    },
+    {
+      "icon_id": "39089078",
+      "name": "下班",
+      "font_class": "xiaban",
+      "unicode": "e7a8",
+      "unicode_decimal": 59304
+    },
+    {
+      "icon_id": "39089077",
+      "name": "上班",
+      "font_class": "shangban",
+      "unicode": "e7a9",
+      "unicode_decimal": 59305
+    },
+    {
+      "icon_id": "29284076",
+      "name": "点位",
+      "font_class": "dianwei",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
       "icon_id": "14144510",
       "name": "展开",
       "font_class": "zhankai1",

src/pages/NewEnergy/NewEnergyOverview/Map.jsx

@@ -5,7 +5,8 @@ import Charge50 from "@/assets/images/map/charge50.png"
 import Charge20 from "@/assets/images/map/charge20.png"
 import Chargelow from "@/assets/images/map/chargelow.png"
 import mapLocation from '@/assets/images/map/map-location.png'
-
+import errorImg from '@/assets/images/error-img-new.png'
+import { Icon } from "@/components"
 import citys from './data'
 import ajax from "@/services";
 function BaseMap(props) {
@@ -46,18 +47,23 @@ function BaseMap(props) {
   
   let style = [{
     url: Charge50,
-    anchor: new AMap.Pixel(22, 22),
-    size: new AMap.Size(44, 44)
+    anchor: new AMap.Pixel(16, 24),
+    size: new AMap.Size(32, 48)
   }, {
     url: Charge20,
-    anchor: new AMap.Pixel(22, 22),
-    size: new AMap.Size(44, 44)
+    anchor: new AMap.Pixel(16, 24),
+    size: new AMap.Size(32, 48)
   }, {
     url: Chargelow,
-    anchor: new AMap.Pixel(22, 22),
-    size: new AMap.Size(44, 44)
+    anchor: new AMap.Pixel(16, 24),
+    size: new AMap.Size(32, 48)
   }
   ];
+  const handleImgError = (e) => {
+    let evn = e || event
+    let img = evn.srcElement ? evn.srcElement : evn.target
+    img.src = errorImg
+}
 
 
   const initMap = () => {
@@ -120,8 +126,6 @@ function BaseMap(props) {
       infoRef.current=true
     }
   },[childInfo])
-  console.log(info);
-
   useEffect(() => {
     if (map&&data.length!=0) {
       var mass = new AMap.MassMarks(data, {
@@ -194,8 +198,8 @@ function BaseMap(props) {
         {hasInit ? renderChildren(map) : null}
        {  showInfo&&<div className="map-item">
             <div className="name">{info.name}</div>
-            <div className="location"><img src={mapLocation} title={info.location} />{info.location}</div>
-            <div className="pic"><img src={info.pic} /></div>
+            <div className="location" title={info.location}><Icon type="dingwei-copy"></Icon>{info.location}</div>
+            <div className="pic"><img src={info.pic} onError={handleImgError} /></div>
             <div className="item"><div>慢充占用</div><div>{info.slow_charge}</div></div>
             <div className="item"><div>快充占用</div><div>{info.fast_charge}</div></div>
             <div className="item"><div>所属厂家</div><div>{info.factory}</div></div>

src/pages/NewEnergy/NewEnergyOverview/index.scss

@@ -1,4 +1,5 @@
 .overview-map{
+    opacity: 0.8;
     .search{
         .select-map{
             position: absolute;
@@ -6,7 +7,8 @@
             background-color:#303950 ;
             top: 20px;
             left: 20px;
-            border-radius: 20px;
+            // border-radius: 20px;
+            overflow: hidden;
             .ant-select-selector{
                 height: 40px;
                 border:0px;
@@ -20,15 +22,15 @@
             
         }
         .search-pic{
-            background-image: url("../../../assets/images/search.png");
-            width: 30px;
-            height: 30px;
+            background-image: url("../../../assets/images/search-map.png");
+            width: 25px;
+            height: 25px;
             background-repeat: no-repeat;
             background-size: 100% 100%;
             z-index: 1002;
             position: absolute;
             left: 310px;
-            top: 25px;
+            top: 27px;
         }
     }
     .right-bottom{
@@ -76,7 +78,7 @@
             padding: 20px;
             width: 340px;
             height: 392px;
-            background: linear-gradient(180deg,#1e283c, #293144);
+            background: #303950;
             border: #1e283c;
             top: 62px !important;
             left: 20px !important;
@@ -104,8 +106,8 @@
             }
             .item{
                 padding:10px 0px;
-                border-bottom: 1px solid#EEEFF1;
-                opacity: 0.7;
+                border-bottom: 1px solid#3C4558;
+                opacity: 0.88;
                 display: flex;
                 justify-content: space-between;
             }

src/pages/NewEnergy/NewEnergyOverview/loadable.jsx

@@ -36,6 +36,13 @@ function NewEnergyOverview() {
   (option?.label ?? '').toLowerCase().includes(input.toLowerCase());
   useEffect(()=>{
     getPointData()
+    //页面加载时加上样式，页面销毁时隐藏样式
+    document.getElementsByClassName("cc-container")[0].style.paddingLeft="10px"
+    document.getElementsByClassName("cc-container")[0].style.paddingTop="10px"
+    return ()=>{
+      document.getElementsByClassName("cc-container")[0].style.paddingTop="0px"
+      document.getElementsByClassName("cc-container")[0].style.paddingLeft="0px"
+    }
   },[])
   useEffect(()=>{
     if(data.length!=0){
@@ -59,7 +66,8 @@ function NewEnergyOverview() {
           className="select-map"
           style={{
             width: 340,
-            height:40
+            height:40,
+            borderRadius:"20px"
           }}
           options={option}
           filterOption={filterOption}