feat: mp android app两端，新增首页下拉刷新，优化首页部分代码

fengwotao
1 parent 9534a3ef
Showing 3 changed files with 36 additions and 30 deletions
pages.json
pages/index/index.vue
plugins/utils.js
--- a/pages.json
View file @f3aa509
+++ b/pages.json
View file @f3aa509
@@ -16,7 +16,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"disableScroll": true
+				"enablePullDownRefresh": true
 			}
 		},
 		{
--- a/pages/index/index.vue
View file @f3aa509
+++ b/pages/index/index.vue
View file @f3aa509
@@ -21,13 +21,13 @@
 							</view>
 							<view @click="navigatorDeviceStatus('OFFLINE')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ deviceData.unLine }}</text>
+									<text class="home-text-total">{{ deviceData.offLine }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">离线</text></view>
 							</view>
 							<view @click="navigatorDeviceStatus('INACTIVE')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ deviceData.noActive }}</text>
+									<text class="home-text-total">{{ deviceData.inActive }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">待激活</text></view>
 							</view>
@@ -42,19 +42,19 @@
 							<view @click="navigatorAlarmStatus(['ACTIVE_UNACK', 'ACTIVE_ACK'])"
 								class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ alertData.noHandle }}</text>
+									<text class="home-text-total">{{ alertData.activedAlarm }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">未处理</text></view>
 							</view>
 							<view @click="navigatorAlarmStatus('CLEARED_ACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ alertData.doneHandle }}</text>
+									<text class="home-text-total">{{ alertData.clearedAck }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">已处理</text></view>
 							</view>
 							<view @click="navigatorAlarmStatus('CLEARED_UNACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ alertData.errorReport }}</text>
+									<text class="home-text-total">{{ alertData.clearedUnack }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">误报</text></view>
 							</view>
@@ -105,7 +105,8 @@
 	import {
 		mapActions
 	} from 'vuex';
-	import api from '@/api/index.js'
+	import api from '@/api/index.js'
+	import { useNavigateTo } from '@/plugins/utils.js'
 	export default {
 		components: {
@@ -115,13 +116,13 @@
 			return {
 				deviceData: {
 					onLine: 0,
-					unLine: 0,
-					noActive: 0
+					offLine: 0,
+					inActive: 0
 				},
 				alertData: {
-					noHandle: 0,
-					doneHandle: 0,
-					errorReport: 0
+					activedAlarm: 0,
+					clearedAck: 0,
+					clearedUnack: 0
 				}
 			};
 		},
@@ -133,18 +134,21 @@
 				isConfiguration: false
 			});
 			uni.removeStorageSync('getConfiguration');
+		},
+		onPullDownRefresh() {
+			this.getDeviceTotalData();
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+				uni.$u.toast('下拉刷新成功...');
+			}, 1000);
 		},
 		methods: {
 			...mapActions(['updateBadgeTotal']),
 			async getDeviceTotalData() {
 				const res = await api.homeApi.getHomeStatisticsApi()
-				if (res) {
-					this.deviceData.onLine = res.totalDevice?.onLine;
-					this.deviceData.unLine = res.totalDevice?.offLine;
-					this.deviceData.noActive = res.totalDevice?.inActive;
-					this.alertData.noHandle = res.totalAlarm?.activedAlarm;
-					this.alertData.doneHandle = res.totalAlarm?.clearedAck;
-					this.alertData.errorReport = res.totalAlarm?.clearedUnack;
+				if (res) {
+					for(let i in this.deviceData) Reflect.set(this.deviceData,i,res.totalDevice[i])
+					for(let i in this.alertData) Reflect.set(this.alertData,i,res.totalAlarm[i])
 					//异步实时更新告警徽标数
 					this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
 				}
@@ -152,15 +156,11 @@
 			showToastWip() {
 				uni.$u.toast('拼命开发中 ...');
 			},
-			openCamera() {
-				uni.navigateTo({
-					url: 'camera/camera'
-				});
+			openCamera() {
+				useNavigateTo('camera/camera')
 			},
-			openOrgStatus() {
-				uni.navigateTo({
-					url: 'configuration/configuration'
-				});
+			openOrgStatus() {
+				useNavigateTo('configuration/configuration')
 			},
 			//告警状态查询
 			navigatorAlarmStatus(e) {
--- a/plugins/utils.js
View file @f3aa509
+++ b/plugins/utils.js
View file @f3aa509
@@ -147,7 +147,13 @@ export function formatToDate(date = undefined, format = DATE_TIME_FORMAT) {
 //封装uniapp跳转 navigateTo
 export const useNavigateTo=(path,param)=>{
 	if (!path) return
-	uni.navigateTo({
-		url: path + encodeURIComponent(JSON.stringify(param))
-	});
+	if(param){
+		uni.navigateTo({
+			url: path + encodeURIComponent(JSON.stringify(param))
+		});
+	}else{
+		uni.navigateTo({
+			url:path
+		});
+	}
 }