From fdd4495f56849e782e1d7ae5a37c6230f2ab19d5 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 07 May 2021 11:34:36 +0800
Subject: [PATCH] 地图图标
---
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js | 41 +++++++++++++++++++++++++----------------
src/views/dataL/dataL.vue | 2 +-
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
index 62482ed..39032cb 100644
--- a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
+++ b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
@@ -736,7 +736,7 @@
_graphicDraw: function (e) {
var g = e.graphic;
-
+
if (g.attributes.isCluster) {
//create the cluster graphics if this is a cluster being drawn
var cl = this._getClusterFromGraphic(g);
@@ -749,7 +749,7 @@
sh.moveToBack();
}
-
+
return this.inherited(arguments);
},
@@ -1005,24 +1005,33 @@
this.singles.push(single);
delete single.graphic;
var symbol;
- if(single.tenant_id == undefined){//如果不是业主
- if (single.state != '') {
+ if (single.tenant_id == undefined) {//如果不是业主
+ if (single.dtype == 3) {
symbol = new esri.symbol.PictureMarkerSymbol("./images/by-jingbao.png", 40, 40);
- } else {
- if (single.jtype == 1) {
- symbol = new esri.symbol.PictureMarkerSymbol("./images/selfbaojin2.gif", 80, 80);
- } else {
- if (single.onlineStatus == 1) {
- symbol = new esri.symbol.PictureMarkerSymbol("./images/zx-jingbao.png", 40, 40);
- } else {
- symbol = new esri.symbol.PictureMarkerSymbol("./images/dx-jingbao.png", 40, 40);
- }
- }
+ } else if (single.dtype == 2) {
+ symbol = new esri.symbol.PictureMarkerSymbol("./images/selfbaojin2.gif", 80, 80);
+ } else if (single.dtype == 1) {
+ symbol = new esri.symbol.PictureMarkerSymbol("./images/zx-jingbao.png", 40, 40);
+ } else if (single.dtype == 0) {
+ symbol = new esri.symbol.PictureMarkerSymbol("./images/dx-jingbao.png", 40, 40);
}
- }else{//是业主
+ // if (single.state != '') {
+ // symbol = new esri.symbol.PictureMarkerSymbol("./images/by-jingbao.png", 40, 40);
+ // } else {
+ // if (single.jtype == 1) {
+ // symbol = new esri.symbol.PictureMarkerSymbol("./images/selfbaojin2.gif", 80, 80);
+ // } else {
+ // if (single.onlineStatus == 1) {
+ // symbol = new esri.symbol.PictureMarkerSymbol("./images/zx-jingbao.png", 40, 40);
+ // } else {
+ // symbol = new esri.symbol.PictureMarkerSymbol("./images/dx-jingbao.png", 40, 40);
+ // }
+ // }
+ // }
+ } else {//是业主
symbol = new esri.symbol.PictureMarkerSymbol("./images/Yz.png", 40, 40);
}
-
+
var point = new Point(single[this.xPropertyName], single[this.yPropertyName], this.spatialRef);
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 7c93d72..01d2b7a 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -1249,7 +1249,7 @@
dom.play();
});
that.hls.on(Hls.Events.ERROR, function (event, data) {
- console.log(data, 4566824159, "视频播放有问题！！！");
+ // console.log(data, 4566824159, "视频播放有问题！！！");
if (data.fatal) {
switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR:
--
Gitblit v1.9.3