diff --git a/src/views/energySources/component/load.vue b/src/views/energySources/component/load.vue index 5906367..e82bdce 100644 --- a/src/views/energySources/component/load.vue +++ b/src/views/energySources/component/load.vue @@ -30,6 +30,8 @@ export default { return { radio: 0, selectDate: '', + xAxisArr: [], + seriesJson: null }; }, components: { @@ -37,6 +39,7 @@ export default { }, created() { this.selectDate = this.$moment().format('YYYY-MM-DD') + this.getWeekData('created') this.$nextTick(() => { if (this.radio) { @@ -56,6 +59,7 @@ export default { this.$nextTick(() => { if (v) { this.getWeekData() + this.echartsInitWeek(this.xAxisArr, this.seriesJson) } else { this.getDayData() } @@ -112,7 +116,7 @@ export default { }, // 获取周分析 - getWeekData() { + getWeekData(t) { getWeekElectricity({ manufacturerBrand: this.userInfo.dept_name, today: this.selectDate }).then(res => { console.log('res1 ====>', res) @@ -131,7 +135,12 @@ export default { seriesJson.ping.push(data[k].ping) seriesJson.gu.push(data[k].gu) } - this.echartsInitWeek(xAxisArr, seriesJson) + if (t) { + this.xAxisArr = xAxisArr + this.seriesJson = seriesJson + } else { + this.echartsInitWeek(xAxisArr, seriesJson) + } }) }, echartsInitDay(xAxisArr, seriesJson) { @@ -169,7 +178,7 @@ export default { axisLine: { show: true }, - + splitLine: { show: true, lineStyle: { diff --git a/src/views/energySourcesProvince/component/pathMap.vue b/src/views/energySourcesProvince/component/pathMap.vue index 0534876..c551c84 100644 --- a/src/views/energySourcesProvince/component/pathMap.vue +++ b/src/views/energySourcesProvince/component/pathMap.vue @@ -83,15 +83,15 @@ export default { }, created() { this.$nextTick(() => { - this.getData() - // setTimeout(() => { - // this.initMap(); - // }, 0); - // window.addEventListener('resize', () => { - // if (this.baiduMap) { - // this.backMap(); - // } - // }); + // this.getData() + setTimeout(() => { + this.initMap(); + }, 0); + window.addEventListener('resize', () => { + if (this.baiduMap) { + this.backMap(); + } + }); }) }, mounted() { @@ -124,7 +124,7 @@ export default { }, //回到原中心点 backMap() { - var point = new BMapGL.Point(112.37558, 25.59342); + var point = new BMapGL.Point(112.415542, 25.582733); this.infoShow = false; this.baiduMap.centerAndZoom(point, 12); if (this.polyline) { @@ -134,26 +134,33 @@ export default { // this.baiduMap.closeInfoWindow(); }, initMap() { - var point = new BMapGL.Point(112.37558, 25.59342); + var point = new BMapGL.Point(112.415542, 25.582733); if (this.baiduMap) { this.baiduMap.centerAndZoom(point, 12); } else { - this.baiduMap = new BMapGL.Map('container', {enableMapClick: false}); + this.baiduMap = new BMapGL.Map('container', { enableMapClick: false }); this.baiduMap.centerAndZoom(point, 12); this.baiduMap.enableScrollWheelZoom(true); this.baiduMap.setMinZoom(12); // this.baiduMap.setMaxZoom(12) // this.baiduMap.disableDragging(); - // this.baiduMap.setCurrentCity('嘉禾县'); - // var b = new BMapGL.Bounds(new BMapGL.Point(112.37558, 25.59342), new BMapGL.Point(112.832025, 40.126349)); - // console.log(b) - // try { - // BMapLib.AreaRestriction.setBounds(this.baiduMap, b); - // } catch (e) { - // alert(e); - // } + + var bound = new BMapGL.Bounds(new BMapGL.Point(112.415542, 25.582733), new BMapGL.Point(112.415542, 25.582733)); + this.baiduMap.enableScrollWheelZoom(); + this.baiduMap.addOverlay(new BMapGL.Polygon([ + new BMapGL.Point(bound.sw.lng, bound.sw.lat), + new BMapGL.Point(bound.sw.lng, bound.ne.lat), + new BMapGL.Point(bound.ne.lng, bound.ne.lat), + new BMapGL.Point(bound.ne.lng, bound.sw.lat) + ])) + + try { + BMapGLLib.AreaRestriction.setBounds(map, bound); + } catch (e) { + alert(e); + } // var opts = { type: BMAP_NAVIGATION_CONTROL_SMALL } // this.baiduMap.addControl(new BMapGL.NavigationControl(opts)); // this.baiduMap.setMapStyleV2({ style: 'midnight' }); @@ -222,18 +229,41 @@ export default { }); this.baiduMap.addOverlay(prism); - // var prism1 = new BMapGL.Prism(path, 1000, { - - // topFillColor: '#8dc6ff', - // topFillOpacity: 0.3, - // sideFillColor: '#8dc6ff', - // sideFillOpacity: 0 - - // }); - // this.baiduMap.addOverlay(prism1); } }) + this.baiduMap.enableScrollWheelZoom(); + + // bdary.get('郴州市嘉禾县', (rs) => { + // // 绘制行政区 + // for (var i = 0; i < rs.boundaries.length; i++) { + // var path = []; + // var xyArr = rs.boundaries[i].split(';'); + // var ptArr = []; + // for (var j = 0; j < xyArr.length; j++) { + // var tmp = xyArr[j].split(','); + // var pt = new BMapGL.Point(tmp[0], tmp[1]); + // ptArr.push(pt); + // } + // var mapmask = new BMapGL.MapMask(ptArr, { + // isBuildingMask: true, + // isPoiMask: true, + // isMapMask: true, + // showRegion: 'inside', + // topFillColor: '#5679ea', + // topFillOpacity: 0.5, + // sideFillColor: '#5679ea', + // sideFillOpacity: 0.9 + // }); + // this.baiduMap.addOverlay(mapmask); + // var border = new BMapGL.Polyline(ptArr, { + // strokeColor: '#4ca7a2', + // strokeWeight: 3, + // strokeOpacity: 1 + // }); + // this.baiduMap.addOverlay(border); + // } + // }); this.baiduMap.setMapStyleV2({ styleJson: styleJson }); diff --git a/src/views/energySourcesProvince/index.vue b/src/views/energySourcesProvince/index.vue index 5f88e33..0023f64 100644 --- a/src/views/energySourcesProvince/index.vue +++ b/src/views/energySourcesProvince/index.vue @@ -2,7 +2,7 @@
- +