水路岛

manifest.json

@@ -33,8 +33,8 @@
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_CHECKIN_PROPERTIES\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",

pages/highWay/runData/form.vue

@@ -347,7 +347,9 @@
 					this.$request(getApp().globalData.baseUrl +
 						'/api/biz/highwayParentDataController/getSummaryDataYoYAndMoM?statDate=' + this.form.statDate +
 						'&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, "GET").then(
-						res => {
+						res => {
+							res.data.minusDaySummaryData = res.data.minusDaySummaryData ? res.data.minusDaySummaryData : {};
+							res.data.minusYearSummaryData = res.data.minusYearSummaryData ? res.data.minusYearSummaryData : {};
 							this.yoyMomSumary = res.data;
 							//各收费站同环比查询
 							this.$request(getApp().globalData.baseUrl +

pages/water/waterWay/form.vue

@@ -82,14 +82,14 @@
 						人数统计环比</view>
 					<view class="rate_item_input"
 						:style="checkNotEmpty(form.numberOfPeople) && form.numberOfPeople === yoySum.minusDaySummaryData.numberOfPeople ?'color: #EB4747':''">
-						{{formatDigit(form.numberOfPeopletMom)}}%
+						{{formatDigit(form.numberOfPeopleMom)}}%
 					</view>
 				</view>
 				<view class="line"></view>
 				<view class="rate_item">
 					<view class="rate_item_label">人数统计同比</view>
 					<view class="rate_item_input">
-						{{formatDigit(form.exitVehicleCountYoy)}}%
+						{{formatDigit(form.numberOfPeopleYoy)}}%
 					</view>
 				</view>
 			</view>
@@ -264,8 +264,9 @@
 				// this.form = JSON.parse(options.item);
 				// this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = this.form.bizWaterwayIslandDataVOList;
 				// this.queryLandList(); //陆岛权限列表
-				// this.queryTime();
-				this.queryDetailInfo2(options.statDate, options.statPeriod);
+				// this.queryTime();
+				let obj = JSON.parse(options.item);
+				this.queryDetailInfo2(obj.statDate, obj.statPeriod);
 			} else if (options.id) {
 				this.btnText = '修改并保存';
 				this.queryDetailInfo(options.id);
@@ -340,6 +341,9 @@
 								})
 							}
 						})
+						this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map((item,index) => {
+							this.calcYoyMom(index);
+						})
 					}
 				})
 			},
@@ -413,7 +417,7 @@
 			},
 			//根据日期和时段查询详情
 			queryDetailInfo2(statData, statPeriod) {
-				this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getSubData?statDate=' + statData + '&statPeriod=' + statPeriod, {},
+				this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getDataByTime?statDate=' + statData + '&statPeriod=' + statPeriod, {},
 					'GET').then(res => {
 					res.data.reportDate = statData;
 					res.data.statPeriod = statPeriod;
@@ -426,7 +430,7 @@
 							res2.data.minusDaySummaryData = res2.data.minusDaySummaryData ? res2.data.minusDaySummaryData : {};
 							res2.data.minusYearSummaryData = res2.data.minusYearSummaryData ? res2.data.minusYearSummaryData : {};
 							this.yoySum = res2.data;
-							this.calcSum();
+							// this.calcSum();
 						})
 					if(this.pageType != 'add') {
 						this.queryTime(); //统计时段
@@ -475,7 +479,7 @@
 			},
 			//时段
 			queryTime() {
-				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date
+				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=waterage_time' + '&_t=' + Date
 					.parse(
 						new Date()), {}, 'GET').then(res => {
 					this.array = res.data;

pages/water/waterWay/list.vue

@@ -3,7 +3,7 @@
 		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/water/waterWay/form', item)">
 			<view class="list_top">
 				<view class="unit_tags">报送时间</view>
-				<view>{{item.reportDate || ''}}<text
+				<view>{{item.statDate || ''}}<text
 					style="margin-left:16rpx;">{{renderTime(item.statPeriod)}}</text></view>
 			</view>
 		</view>
@@ -144,7 +144,7 @@
 			},
 			//时段
 			queryTime() {
-				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse(
+				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=waterage_time' + '&_t=' + Date.parse(
 					new Date()), {}, 'GET').then(res => {
 					this.array = res.data;
 				})