diff --git a/public/assets/mapicon/anzhidian2.png b/public/assets/mapicon/anzhidian2.png new file mode 100644 index 0000000..0b89611 Binary files /dev/null and b/public/assets/mapicon/anzhidian2.png differ diff --git a/public/assets/mapicon/flow.png b/public/assets/mapicon/flow.png index 6fc51fa..403074a 100644 Binary files a/public/assets/mapicon/flow.png and b/public/assets/mapicon/flow.png differ diff --git a/public/assets/mapicon/flowtest.png b/public/assets/mapicon/flowtest.png new file mode 100644 index 0000000..975abd1 Binary files /dev/null and b/public/assets/mapicon/flowtest.png differ diff --git a/public/assets/mapicon/flowtest2.png b/public/assets/mapicon/flowtest2.png new file mode 100644 index 0000000..420b483 Binary files /dev/null and b/public/assets/mapicon/flowtest2.png differ diff --git a/public/assets/mapicon/flowtest3.png b/public/assets/mapicon/flowtest3.png new file mode 100644 index 0000000..3f80be5 Binary files /dev/null and b/public/assets/mapicon/flowtest3.png differ diff --git a/public/assets/mapicon/hdsw.png b/public/assets/mapicon/hdsw.png index 9eb0f9c..d0859e4 100644 Binary files a/public/assets/mapicon/hdsw.png and b/public/assets/mapicon/hdsw.png differ diff --git a/public/assets/mapicon/qishiyedanwei2.png b/public/assets/mapicon/qishiyedanwei2.png new file mode 100644 index 0000000..7c08f58 Binary files /dev/null and b/public/assets/mapicon/qishiyedanwei2.png differ diff --git a/public/assets/mapicon/sl.png b/public/assets/mapicon/sl.png index cd665e8..e1bee8f 100644 Binary files a/public/assets/mapicon/sl.png and b/public/assets/mapicon/sl.png differ diff --git a/public/assets/mapicon/sy.png b/public/assets/mapicon/sy.png index bb5bcf8..308689a 100644 Binary files a/public/assets/mapicon/sy.png and b/public/assets/mapicon/sy.png differ diff --git a/public/assets/mapicon/video.png b/public/assets/mapicon/video.png index 5b9d1cd..0494f42 100644 Binary files a/public/assets/mapicon/video.png and b/public/assets/mapicon/video.png differ diff --git a/public/assets/mapicon/weixianqu2.png b/public/assets/mapicon/weixianqu2.png new file mode 100644 index 0000000..58decd4 Binary files /dev/null and b/public/assets/mapicon/weixianqu2.png differ diff --git a/public/assets/mapicon/wy.png b/public/assets/mapicon/wy.png index 409428c..b8dabb6 100644 Binary files a/public/assets/mapicon/wy.png and b/public/assets/mapicon/wy.png differ diff --git a/public/assets/mapicon/yanhejuminhu2.png b/public/assets/mapicon/yanhejuminhu2.png new file mode 100644 index 0000000..31d47e6 Binary files /dev/null and b/public/assets/mapicon/yanhejuminhu2.png differ diff --git a/src/service/apiurl.js b/src/service/apiurl.js index 994bad2..bf2f3db 100644 --- a/src/service/apiurl.js +++ b/src/service/apiurl.js @@ -27,6 +27,7 @@ const apiurl = { sdzlist: service + '/reservoir/water/listV2',//水电站-基础设施没有监测数据 }, monitor: { + globalSearch: service +"/globalSearch/findByName",//首页-全局搜索 sk: { detail: service + '/reservoir/water/detail', //监测数据-下方表格 picture: service + '/reservoir/water/monitor/data', diff --git a/src/views/Home/MapCtrl/Markers/AZDMarker.js b/src/views/Home/MapCtrl/Markers/AZDMarker.js index b277635..1ab0923 100644 --- a/src/views/Home/MapCtrl/Markers/AZDMarker.js +++ b/src/views/Home/MapCtrl/Markers/AZDMarker.js @@ -13,7 +13,8 @@ function renderMarker({ rzWarning, rzState }, { width }) {