-
核算与评估
+
治理效果分析
@@ -555,7 +555,8 @@ export default {
dialogVisible: false,
inforname: '',
loading: true,
- zoomData: 14,
+ zoomData: 8,
+ focusZoomData: 14,
isShowLightNumber: '1',
switchValue: true,
fullscreen: false, //全屏
@@ -658,7 +659,7 @@ export default {
mapTypeSwitch() {
this.mapTypeFlag = !this.mapTypeFlag
if (this.mapTypeFlag == true) {//正常模式
- this.zoomData = 14
+ // this.zoomData = 14
if (this.isShowLight == undefined) {
let isShowLight = '1'
this.initMap(this.zoomData, isShowLight);
@@ -672,7 +673,7 @@ export default {
})
}, 1000)
} else {// 地图模式
- this.zoomData = 15
+ // this.zoomData = 15
if (this.isShowLight == undefined) {
this.initMap(this.zoomData, '1');
} else {
@@ -780,7 +781,7 @@ export default {
viewMode: '3D',
resizeEnable: true,
zoom: zoomnum,
- center: [110.719361, 36.068184],//默认的地图中心经纬度
+ center: [110.867954, 35.631413],//默认的地图中心经纬度
mapStyle: 'amap://styles/blue',
dragEnable: true,//地图是否可通过鼠标拖拽平移,默认为true。此属性可被setStatus/getStatus 方法控制
jogEnable: true,//地图是否使用缓动效果,默认值为true。此属性可被setStatus/getStatus 方法控制
@@ -801,7 +802,7 @@ export default {
if (b.type!='soil') return -1;
return 0;
});//其他类型
- console.log(Marker,'Marker')
+ // console.log(Marker,'Marker')
Marker.map(item => {
let marker = new AMap.Marker({
zIndex: item.type == 'soil' ? that.lastZIndex : (that.lastZIndex+1),
@@ -840,9 +841,9 @@ export default {
})
this.$forceUpdate();
// that.aMap.setFitView(null, false, [100,400,200,200], 16);
- that.aMap.setFitView();
+ // that.aMap.setFitView();
setTimeout(() => {
- that.aMap.setFitView(null, false, [130, 380, 480, 480], 16);
+ that.aMap.setFitView(null, false, [130, 380, 480, 480], 12);
// let temp = that.aMap.getCenter();//矫正显示标点位置在正中心
// that.aMap.setZoomAndCenter(that.aMap.getZoom()-1, [temp.lng, temp.lat - 0.15]);
}, 2000)
@@ -1142,13 +1143,13 @@ export default {
arr.map(item => {
item.setzIndex((that.lastZIndex+=2));
});
- that.aMap.setFitView(arr, false, [300, 500, 360, 360], 16);
+ that.aMap.setFitView(arr, false, [300, 500, 360, 360], that.focusZoomData);
// setTimeout(() => {
// let temp = that.aMap.getCenter();//矫正显示标点位置在正中心
// that.aMap.setZoomAndCenter(that.aMap.getZoom()-2, [temp.lng, temp.lat - 0.15]);
// },2000)
} else {
- that.aMap.setFitView(null, false, [100, 400, 360, 360], 16);
+ that.aMap.setFitView(null, false, [100, 400, 360, 360], that.zoomData);
}
}
},
diff --git a/src/pages/Login/index.vue b/src/pages/Login/index.vue
index 917d65b..332cf10 100644
--- a/src/pages/Login/index.vue
+++ b/src/pages/Login/index.vue
@@ -7,7 +7,7 @@
- 吉县农业面源污染在线监测平台
+ 稷山县农业面源污染综合治理平台
- 重要污染指标
+ 重点污染指标趋势
-
畜禽粪污处理
+
粪污处理情况分析
@@ -217,7 +217,7 @@
{{DisplayListdetailList3?.detailCode}}
-
{{DisplayListdetailList3?.detailValue}} 万头
+
@@ -2584,7 +2584,7 @@ a:hover {
border-left-color: rgb(71 105 172) !important;
}
.dataTypeEchart2{
- left: 246px;
+ left: 246px !important;
top: 0px;
}
.switchLive {
diff --git a/src/pages/weather/weather.vue b/src/pages/weather/weather.vue
index e2c3d3e..5d6ffdb 100644
--- a/src/pages/weather/weather.vue
+++ b/src/pages/weather/weather.vue
@@ -6,7 +6,7 @@
-