diff --git a/packDetail/pages/Site/detail.vue b/packDetail/pages/Site/detail.vue index 8629a84..1b475eb 100644 --- a/packDetail/pages/Site/detail.vue +++ b/packDetail/pages/Site/detail.vue @@ -128,7 +128,7 @@ - 水五常监测监测 + 水质监测常规五项 diff --git a/packDetail/pages/analysis/index.vue b/packDetail/pages/analysis/index.vue index cd2b7af..6223317 100644 --- a/packDetail/pages/analysis/index.vue +++ b/packDetail/pages/analysis/index.vue @@ -95,8 +95,8 @@ - - {{item.stationName}} + + {{item.fullDeviceName}} @@ -259,23 +259,23 @@ getazsurvMulchRecord() { this.array = [] this.arrays = [] - this.array1 = ['全部监测站点', ] + this.array1 = ['全部监测设备', ] this.arrays1 = [{ - label: '全部监测站点', + label: '全部监测设备', value: '' }] - this.$http.get('/applet/survStationInfo/list').then(res => { + this.$http.get('/applet/survDeviceDeploy/survDeviceList').then(res => { for (var i = 0; i < res.data.data.length; i++) { this.arrays.push({ - label: res.data.data[i].stationName, - value: res.data.data[i].stationCode + label: res.data.data[i].fullDeviceName, + value: res.data.data[i].id }) this.arrays1.push({ - label: res.data.data[i].stationName, - value: res.data.data[i].stationCode + label: res.data.data[i].fullDeviceName, + value: res.data.data[i].id }) - this.array.push(res.data.data[i].stationName) - this.array1.push(res.data.data[i].stationName) + this.array.push(res.data.data[i].fullDeviceName) + this.array1.push(res.data.data[i].fullDeviceName) } }) }, @@ -284,7 +284,7 @@ let params = {} params.pageNo = this.pageNo params.pageSize = this.pageSize - params.stationCode = this.stationCode1 + params.deployId = this.stationCode1 params.yearStr = this.yearStr uni.showLoading({ title: '加载中' @@ -350,7 +350,7 @@ let params = {} params.pageNo = this.pageNo params.pageSize = this.pageSize - params.stationCode = this.stationCode1 + params.deployId = this.stationCode1 params.yearStr = this.yearStr this.$http.get('/applet/wxclient/alertRecord', { params: params @@ -717,7 +717,7 @@ this.stationCode1 = this.arrays1[i].value } } - if (this.stationName1 == '全部监测站点') { + if (this.stationName1 == '全部监测设备') { this.stationCode1 = null } this.pageNo = 1 diff --git a/packDetail1/pages/about/index.vue b/packDetail1/pages/about/index.vue index 615f53f..1e0ca77 100644 --- a/packDetail1/pages/about/index.vue +++ b/packDetail1/pages/about/index.vue @@ -8,11 +8,11 @@ - 版本号 + 版本号 v1.0.1 - + - Copyright ◎ 汾西县农业农村局 + Copyright © 汾西县农业农村局 @@ -98,6 +98,7 @@ font-family: SourceHanSansCN; font-weight: 400; color: #000000; + margin: 0 auto; } .item_right{ font-size: 28rpx; @@ -111,5 +112,6 @@ left: 50%; transform: translate(-50%); color: #000; + width: 52%; } diff --git a/pages/index/index.vue b/pages/index/index.vue index 3ad85f1..9e79bf0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -145,7 +145,7 @@ path: '/packDetail/pages/analysis/index' }, { - name: '站点管理', + name: '监测站点', img: require('../../static/home_icon_jiance.png'), path: '/packDetail/pages/Site/index' }, @@ -160,7 +160,7 @@ path: '/packDetail1/pages/device/index' }, { - name: '设备管理', + name: '土壤监测', img: require('../../static/home_icon_shebei.png'), path: '/packDetail/pages/vidio/index' },