diff --git a/config/index.js b/config/index.js index da1b580..d71e7a5 100644 --- a/config/index.js +++ b/config/index.js @@ -61,7 +61,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/smartwell_front/', + assetsPublicPath: '/smartwell/', /** * Source Maps diff --git a/config/index.js b/config/index.js index da1b580..d71e7a5 100644 --- a/config/index.js +++ b/config/index.js @@ -61,7 +61,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/smartwell_front/', + assetsPublicPath: '/smartwell/', /** * Source Maps diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index 7fc90dd..bbd62df 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -223,7 +223,7 @@ // } }, latestAlarmTime:'', - firstAmount: true,// 是否初次加载 + alarmFirstAmount: true, // 是否初次加载 showClearBtn: false // 是否显示清除查询按钮 } }, @@ -239,8 +239,10 @@ this.listQuery.deptid = '' this.listQuery.keywords = '' this.listQuery.wellType = '' + debugger if (this.firstAmount) { // 初次加载直接调用mount if (this.type === 'massMarkers') { + debugger this.mountMassMarker() // 加载海量点 } else if (this.type === 'cluster') { this.mountClusters() // 加载聚合点 @@ -415,12 +417,14 @@ anchor: new AMap.Pixel(8, 15), size: new AMap.Size(15, 15) } + console.log('海量点初始化') // 海量点初始化 this.massMarks = new AMap.MassMarks(this.markers, { zIndex: 5, // 海量点图层叠加的顺序 zooms: [3, 20], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }) + console.log(this.massMarkers) // 将海量点添加至地图实例 this.massMarks.setMap(map) // 海量点点击事件 @@ -579,14 +583,17 @@ // 判断最新报警时间,若和旧的最新时间不一样,则判断是否需要产生声音 if(response.data.length>0){ const latestTime = response.data[0].alarmTime + console.log(latestTime,'vs', this.latestAlarmTime) if(this.latestAlarmTime