ming vor 3 Jahren
Ursprung
Commit
0b933e72eb

+ 1 - 1
src/api/home/home.js

@@ -69,7 +69,7 @@ export default {
     // 地图撒点
     siteList_api(params) {
         return request({
-            url: `site/list`,
+            url: `site/list2`,
             method: 'GET',
             params: params
         })

BIN
src/assets/images/markIconAlarming.png


BIN
src/assets/images/markIconError.png


BIN
src/assets/images/markIconNormal.png


BIN
src/assets/images/markIconOffLine.png


+ 8 - 4
src/views/home/index.vue

@@ -164,7 +164,11 @@ import lineChart from "./components/lineChart";
 import mapStaticTop from "./components/mapStaticTop";
 import triangleChart from "./components/triangleChart";
 
-import markIconPath from "../../assets/images/markIcon.png";
+// import markIconPath from "../../assets/images/markIcon.png";
+import markIconNormal from "../../assets/images/markIconNormal.png";
+import markIconAlarming from "../../assets/images/markIconAlarming.png";
+import markIconError from "../../assets/images/markIconError.png";
+import markIconOffLine from "../../assets/images/markIconOffLine.png";
 import mapData from "../../assets/js/map-data.js";
 mapData;
 
@@ -427,11 +431,11 @@ export default {
     addMarker(lnglats) {
       // 创建标点和点击事件
       let markers = lnglats.map((val, ind) => {
-        // console.log("val");
-        // console.log(val);
+        console.log("val");
+        console.log(val);
         let marker = new AMap.Marker({
           position: new AMap.LngLat(val.longitude, val.latitude),
-          icon: markIconPath,
+          icon: val.deviceStatus==0?markIconNormal:val.deviceStatus==1?markIconOffLine:val.deviceStatus==77?markIconAlarming:val.deviceStatus==4?markIconError:'',
 
           //   icon: '//a.amap.com/jsapi_demos/static/demo-center/icons/dir-via-marker.png',
           zIndex: 9,

+ 2 - 0
vue.config.js

@@ -39,6 +39,8 @@ module.exports = {
         })
     },
     devServer: {
+
+        hot: true, //自动保存
         proxy: {
             // '/vuefiv/': {
             './': {