diff --git a/src/assets/css/index.css b/src/assets/css/index.css index e732a0d..53425f9 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -26,7 +26,7 @@ .btn_right_time{ position : relative; float : right; - width : 97%; + /*width : 97%;*/ height : 1.6vw; text-align : right; line-height : 1.6vw; diff --git a/src/assets/css/index2.css b/src/assets/css/index2.css index 3c9c8ce..4e4849b 100644 --- a/src/assets/css/index2.css +++ b/src/assets/css/index2.css @@ -53,7 +53,7 @@ .btn_right_time{ position : relative; float : right; - width : 97%; + /*width : 97%;*/ height : 1.6vw; text-align : right; line-height : 1.6vw; diff --git a/src/pages/CqyzList/index.vue b/src/pages/CqyzList/index.vue index 44eb9f7..2466947 100644 --- a/src/pages/CqyzList/index.vue +++ b/src/pages/CqyzList/index.vue @@ -665,7 +665,9 @@ export default { // 弹窗个人信息 infor(){ var onformation = JSON.parse(window.sessionStorage.getItem('password')); - this.inforname = onformation.realname + if(onformation){ + this.inforname = onformation.realname + } }, // 实时时间 getNowTime () { @@ -925,7 +927,7 @@ export default { .btn_right_time{ position : relative; float : right; - width : 97%; + //width : 97%; height : 1.6vw; text-align : right; line-height : 1.6vw; diff --git a/src/pages/Home/index map.vue b/src/pages/Home/index map.vue index e804575..5820c11 100644 --- a/src/pages/Home/index map.vue +++ b/src/pages/Home/index map.vue @@ -92,16 +92,16 @@ 农田面源污染监测站 个 -
- - 畜禽养殖污染监测站 - 个 -
-
- - 太阳能诱虫灯 - 盏 -
+ + + + + + + + + +
@@ -638,7 +638,7 @@ export default { this.briefconValue = res.result.project_brief.detailList this.pestLightCount = res.result.pestLightCount this.stationCount0 = res.result.stationCount[0].stationCount - this.stationCount1 = res.result.stationCount[1].stationCount + // this.stationCount1 = res.result.stationCount[1].stationCount this.climate_env = res.result.climate_env.detailList this.water_conser = res.result.water_conser.detailList this.roll_info = res.result.roll_info @@ -1180,7 +1180,9 @@ export default { // 弹窗个人信息 infor(){ var onformation = JSON.parse(window.sessionStorage.getItem('password')); - this.inforname = onformation.realname + if(onformation){ + this.inforname = onformation.realname + } }, guanbi(){ this.dialogTableVisible = false diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue index 3513826..c7b3855 100644 --- a/src/pages/Home/index.vue +++ b/src/pages/Home/index.vue @@ -19,10 +19,10 @@
- {{ nowTime }} + {{ nowTime }}
-
+
@@ -97,11 +97,11 @@ 农田面源污染监测站 个
-
- - 畜禽养殖污染监测站 - 个 -
+ + + + + @@ -754,7 +754,7 @@ export default { this.briefconValue = res.result.project_brief.detailList this.pestLightCount = res.result.pestLightCount this.stationCount0 = res.result.stationCount[0].stationCount - this.stationCount1 = res.result.stationCount[1].stationCount + // this.stationCount1 = res.result.stationCount[1].stationCount this.climate_env = res.result.climate_env.detailList this.water_conser = res.result.water_conser.detailList this.roll_info = res.result.roll_info @@ -985,7 +985,7 @@ export default { viewMode:'3D', resizeEnable: true, zoom: zoomnum, - center:[110.632024, 35.548859],//默认的地图中心经纬度 + center:[111.436625,36.771975],//默认的地图中心经纬度 mapStyle: 'amap://styles/blue', dragEnable: true,//地图是否可通过鼠标拖拽平移，默认为true。此属性可被setStatus/getStatus 方法控制 jogEnable: true,//地图是否使用缓动效果，默认值为true。此属性可被setStatus/getStatus 方法控制 @@ -997,7 +997,7 @@ export default { showIndoorMap: false, // 隐藏地图自带的室内地图图层 expandZoomRange: true,//是否支持可以扩展最大缩放级别,和zooms属性配合使用设置为true的时候，zooms的最大级别在PC上可以扩大到20级，移动端还是高清19/非高清20 forceVector: true, - scale:(2,2.5) + scale:(2 , 2.5) }); that.aMap.on('complete', (e) =>{ // 创建 AMap.LabelsLayer 图层 @@ -1081,10 +1081,8 @@ export default { this.$forceUpdate() that.aMap.setFitView(); setTimeout(() => { - // that.aMap.setZoom(that.aMap.getZoom()-2); let temp = that.aMap.getCenter();//矫正显示标点位置在正中心 - console.log(temp); - that.aMap.setZoomAndCenter(that.aMap.getZoom()-2, [temp.lng, temp.lat - 0.03]); + that.aMap.setZoomAndCenter(that.aMap.getZoom()-2, [temp.lng, temp.lat - 0.15]); },2000) }); }) @@ -1533,7 +1531,9 @@ export default { // 弹窗个人信息 infor(){ var onformation = JSON.parse(window.sessionStorage.getItem('password')); - this.inforname = onformation.realname + if(onformation){ + this.inforname = onformation.realname + } }, guanbi(){ this.dialogTableVisible = false diff --git a/src/pages/MywrList/index.vue b/src/pages/MywrList/index.vue index de77f46..9ca4729 100644 --- a/src/pages/MywrList/index.vue +++ b/src/pages/MywrList/index.vue @@ -796,7 +796,9 @@ export default { // 弹窗个人信息 infor(){ var onformation = JSON.parse(window.sessionStorage.getItem('password')); - this.inforname = onformation.realname + if(onformation){ + this.inforname = onformation.realname + } }, // 实时时间 getNowTime () { @@ -1081,7 +1083,7 @@ export default { .btn_right_time{ position : relative; float : right; - width : 97%; + //width : 97%; height : 1.6vw; text-align : right; line-height : 1.6vw; diff --git a/src/pages/weather/weather.vue b/src/pages/weather/weather.vue index 387031a..b5143a3 100644 --- a/src/pages/weather/weather.vue +++ b/src/pages/weather/weather.vue @@ -1,41 +1,18 @@ -新的组件(.vue文件） 中 -