Merge branch 'main' into sqy_dev

@@ -118,9 +118,10 @@ export default {
 		};
 	},
 	onLoad() {
-		this.loadData();
+		console.log('Onload the dofunc');
 	},
 	created() {
+		this.loadData();
 		//获取页面路径
 		let currentPages = getCurrentPages();
 		let page = currentPages[currentPages.length - 1];

+/**
+ * 需要修改
+ */
 export const appId = 'wx0ad61d7bf6808e02'
 export const appSecrect = '74d43eca92c728b56d6e624bd0b146b8'

@@ -31,7 +31,6 @@ uni.$u.http.setConfig((config) => {
 // 请求拦截
 uni.$u.http.interceptors.request.use(
 	(config) => {
-		// 可使用async await 做异步操作
 		// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
 		config.data = config.data || {};
 		// 根据custom参数中配置的是否需要token，添加对应的请求头
@@ -41,7 +40,6 @@ uni.$u.http.interceptors.request.use(
 				uni.getStorageSync("userInfo").isToken ||
 				undefined;
 		}
-		// console.log("请求开始", config);
 		if (config?.custom?.load) {
 			//打开加载动画
 			store.commit("setLoadingShow", true);
@@ -50,7 +48,6 @@ uni.$u.http.interceptors.request.use(
 		return config;
 	},
 	(config) => {
-		// 可使用async await 做异步操作
 		return Promise.reject(config);
 	}
 );
@@ -58,65 +55,41 @@ uni.$u.http.interceptors.request.use(
 // 响应拦截
 uni.$u.http.interceptors.response.use(
 	(response) => {
-		/* 对响应成功做点什么 可使用async await 做异步操作*/
 		// 关闭加载动画
 		store.commit("setLoadingShow", false);
 		const data = response.data;
-		// 自定义参数
 		const custom = response.config?.custom;
 		// code:  200、请求成功 其他，没有更多参数 401、被迫下线重新登录、
 		if (response.statusCode == 200) {
 			return Promise.resolve(data);
-			// if (!custom.isFactory) {
-			// 	return Promise.reject(response.data)
-			// } else {
-			// 	return data.data === undefined ? {} :  Promise.reject(response.data)
-			// }
 		} else if (response.statusCode == 401) {
-			//被迫下线重新登录
 			// 清空登录信息
 			store.commit("emptyUserInfo");
 			// 20秒节流，弹窗登录
 			uni.$u.throttle(judgeLogin(), 20000);
 			return new Promise(() => {});
-		} else {
-			// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
-			if (custom.toast !== false) {
-				// uni.$u.toast(data.message || data.msg);
-			}
-			// 如果需要catch返回，则进行reject
-			if (custom?.catch) {
-				return Promise.reject(data);
-			} else {
-				// 否则返回一个pending中的promise，请求不会进入catch中
-				return new Promise(() => {});
-			}
-		}
+		} else {}
 	},
 	(response) => {
+		console.log('Response error', response)
 		// 关闭加载动画
 		store.commit("setLoadingShow", false);
-		// 对响应错误做点什么 （statusCode !== 200）
-		let errorData = "请检查网络或服务器";
+		let show = true;
+		let errorData = '请检查网络或服务器'
 		let message = response.data?.message || response?.errMsg;
 		if (message == "request:fail url not in domain list") {
 			errorData = "检查请求域名是否添加了域名白名单";
 		} else if (message == "request:fail timeout") {
 			errorData = "请求超时:请检查网络";
-		} else if (message == "Token has expired") {
+		} else if (response.data.status == 401) {
 			uni.reLaunch({
 				url: "/publicLoginSubPage/public/login",
 			});
-			store.commit("emptyUserInfo");
-		} else if (message == "Invalid username or password") {
-			uni.reLaunch({
-				url: "/publicLoginSubPage/public/login",
-			});
-			store.commit("emptyUserInfo");
+			show = false;
 		} else {
 			errorData = message || "";
 		}
-		uni.$u.toast(errorData);
+		if (show) uni.$u.toast(errorData);
 		return Promise.reject(response);
 	}
 );

@@ -290,7 +290,7 @@ export default {
 		width: 700rpx;
 		background-color: #ffffff;
 		border-radius: 10px;
-		margin-top: 80rpx;
+		margin-top: 100rpx;
 		height: 256rpx;
 		margin-left: -20rpx;
 		.info-contain {

@@ -176,6 +176,7 @@
 				</view>
 			</view>
 		</u-popup>
+		<!-- 告警筛选 -->
 		<u-calendar
 			:show="showCalendar"
 			mode="range"
@@ -195,7 +196,6 @@ import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 import { pageNumber, pageSize } from '@/config/constant.js';
 import { alertStatus, deviceType, alertLevel, timeArea } from './static/data.js';
-import { mapActions } from 'vuex';
 
 export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
@@ -245,20 +245,20 @@ export default {
 		if (this.detailStatus) {
 			this.loadData(1, null, null, null, null, null, null);
 		}
-		if (this.ordId == '') {
-		} else {
+		if (this.ordId) {
 			this.loadData(1, null, null, null, null, null, this.ordId);
 		}
 	},
 	onHide() {
 		this.ordId = '';
 		this.detailStatus = false;
-		this.loadData(1, null, null, null, null, null, null);
 	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
-		if (e.type !== undefined) {
+		if (e.type == undefined) {
+			this.loadData(1, null, null, null, null, null, null);
+		} else {
 			let params = JSON.parse(e.type);
 			let type;
 			if (Array.isArray(params)) {
@@ -267,12 +267,9 @@ export default {
 				type = params;
 			}
 			this.loadData(1, type, null, null, null, null, null);
-		} else {
-			this.loadData(1, null, null, null, null, null, null);
 		}
 	},
 	methods: {
-		...mapActions(['updateBadgeTotal']),
 		inputChanged(e) {
 			this.loadData(1, null, null, null, null, null, null, e);
 		},
@@ -365,13 +362,17 @@ export default {
 				organizationId: organizationV,
 				alarmType: alarmName
 			};
+			if (statusV == '') {
+				delete httpData.status;
+			}
+			if (severityV == '') {
+				delete httpData.severity;
+			}
 			uni.$u.http
 				.get('/yt/alarm', { params: httpData, custom: { load: false } })
 				.then(res => {
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
-					//异步实时更新告警徽标数
-					this.updateBadgeTotal(httpData);
 					this.alertTotal = res.total;
 					if (pageNo == 1) {
 						this.list = res.items;
@@ -390,7 +391,6 @@ export default {
 				url: './org/org'
 			});
 		},
-		open() {},
 		close() {
 			this.show = false;
 		},

@@ -39,19 +39,19 @@
 							<text class="item-text home-text-muted">告警统计</text>
 						</view>
 						<view class="item-child-bottom u-flex">
-							<view @click="navatorAlertUnhandle()" class="u-flex sigle-child">
+							<view @click="navigatorAlarmStatus(['ACTIVE_UNACK', 'ACTIVE_ACK'])" class="u-flex sigle-child">
 								<view class="sigle-text">
 									<text class="home-text-total">{{ alertData.noHandle }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">未处理</text></view>
 							</view>
-							<view @click="navatorAlertHandle('CLEARED_ACK')" class="u-flex sigle-child">
+							<view @click="navigatorAlarmStatus('CLEARED_ACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
 									<text class="home-text-total">{{ alertData.doneHandle }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">已处理</text></view>
 							</view>
-							<view @click="navatorAlertFalseAlarm('CLEARED_UNACK')" class="u-flex sigle-child">
+							<view @click="navigatorAlarmStatus('CLEARED_UNACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
 									<text class="home-text-total">{{ alertData.errorReport }}</text>
 								</view>
@@ -97,6 +97,7 @@
 
 <script>
 import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+import { mapActions } from 'vuex';
 
 export default {
 	components: {
@@ -122,22 +123,20 @@ export default {
 		this.getDeviceTotalData();
 	},
 	methods: {
+		...mapActions(['updateBadgeTotal']),
 		getDeviceTotalData() {
-			uni.$u.http
-				.get('/yt/homepage/app')
-				.then(res => {
-					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;
-					}
-				})
-				.catch(e => {
-					// uni.$u.toast(e.data?.message);
-				});
+			uni.$u.http.get('/yt/homepage/app').then(res => {
+				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;
+					//异步实时更新告警徽标数
+					this.updateBadgeTotal(res.totalAlarm.activedAlarm);
+				}
+			});
 		},
 		openCamera() {
 			uni.navigateTo({
@@ -149,18 +148,8 @@ export default {
 				url: 'configuration/configuration'
 			});
 		},
-		navatorAlertUnhandle() {
-			let obj = ['ACTIVE_UNACK', 'ACTIVE_ACK'];
-			uni.reLaunch({
-				url: '../alarm/alarm?type=' + JSON.stringify(obj)
-			});
-		},
-		navatorAlertHandle(e) {
-			uni.reLaunch({
-				url: '../alarm/alarm?type=' + JSON.stringify(e)
-			});
-		},
-		navatorAlertFalseAlarm(e) {
+		//告警状态查询
+		navigatorAlarmStatus(e) {
 			uni.reLaunch({
 				url: '../alarm/alarm?type=' + JSON.stringify(e)
 			});

@@ -8,25 +8,26 @@
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken">
 					<view @click="openPersonalInfo" class="u-m-r-20">
-						<image class="avatar" mode="aspectFill" :src="userInfo.avatar || userInfo.avatarUrl || '/static/default.png'"></image>
+						<image class="avatar" mode="aspectFill" :src="userInfo.avatar == '' ? '/static/default.png' : userInfo.avatar"></image>
 					</view>
-					<view @click="openPersonalInfo" class="u-flex-1">
-						<view class="nickName u-flex">
+					<view class="u-flex-1">
+						<view @click="openPersonalInfo" class="nickName u-flex">
 							<view class="name u-m-r-10" v-if="userInfo.realName || userInfo.nickName">
 								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName || userInfo.nickName }}</text>
 							</view>
 						</view>
-						<view style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
+						<view @click="openPersonalInfo" style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
 						<view v-else><text style="color:#FFFFFF;font-size: 14px;">手机号:未绑定</text></view>
+						<view v-if="userInfo.isToken" @click="clearAccountFunc(userInfo)" class="detail"><text class="text">解绑</text></view>
 					</view>
 				</block>
 				<block v-else>
 					<view class="u-m-r-20" @click="openLoginFunc">
-						<view class="avatar u-flex"><u-icon name="account-fill" color="black" size="30"></u-icon></view>
+						<view class="avatar u-flex"><image class="avatar" mode="aspectFill" src="../../static/default.png"></image></view>
 					</view>
 					<view class="u-flex-1">
 						<view @click="openLoginFunc" class="u-font-lg click-login login-btn ">请点击登录</view>
-						<view @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
+						<view v-if="!userInfo.isToken" @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 					</view>
 				</block>
 				<view v-if="userInfo.isToken"><u-icon name="arrow-right" color="white" size="13"></u-icon></view>
@@ -55,7 +56,7 @@
 					</view>
 					<view class="u-flex-1">
 						<view @click="openLoginFunc" class="u-font-lg login-btn">登录</view>
-						<view @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view>
+						<view v-if="userInfo.isToken == '' || userInfo.isToken == null" @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view>
 					</view>
 				</block>
 				<view><u-icon name="arrow-right" color="black" size="13"></u-icon></view>
@@ -75,8 +76,8 @@
 					<view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view>
 				</view>
 			</view>
-			<view v-if="userInfo.isToken" class="u-flex" style="justify-content: center; width: 600rpx">
-				<button class="submit" size="default" @click.top="onLoginoutFunc"><text class="text">退出账号</text></button>
+			<view @click="onLoginoutFunc" v-if="userInfo.isToken" class="u-flex" style="justify-content: center; width: 600rpx">
+				<button class="submit" size="default" @click="onLoginoutFunc"><text class="text">退出账号</text></button>
 			</view>
 		</view>
 		<!-- 绑定账号 -->
@@ -95,7 +96,6 @@
 							type="password"
 							placeholder="登录密码"
 							v-model="bindAccountObj.appUserSecret"
-							@change="passwordChange"
 						></u--input>
 					</view>
 					<view class="u-flex item-phone">
@@ -159,6 +159,7 @@ import base from '@/config/baseUrl';
 import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import fNavbar from '@/components/module/f-navbar/f-navbar';
 import { mapState, mapMutations } from 'vuex';
+import { appId } from '@/config/constant.js';
 
 export default {
 	components: {
@@ -191,9 +192,10 @@ export default {
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
-		if (e.obj !== null) {
-			const params = JSON.parse(e.obj);
+		if (e.obj != null) {
+			const params = JSON.parse(decodeURIComponent(e.obj));
 			this.thirdObj = params;
+			console.log(this.thirdObj);
 		}
 	},
 	computed: {
@@ -437,6 +439,18 @@ export default {
 					}
 				}
 			});
+		},
+		clearAccountFunc(e) {
+			//解绑
+			let httpData = {
+				appUserId: e.userId,
+				thirdUserId: this.thirdObj.thirdUserId
+			};
+			uni.$u.http.delete('/yt/third', httpData).then(res => {
+				if (res) {
+					this.getCodeState(); //开始倒计时
+				}
+			});
 		}
 	}
 };

@@ -17,7 +17,7 @@
 				</view>
 				<view class="form-row u-flex">
 					<view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view>
-					<view class="v-password" @click="showPasswordMode"><u-icon size="25" :name="showPassword ? 'eye-fill' : 'eye-off'"></u-icon></view>
+					<view class="v-password" @click="showPasswordMode"><u-icon color="#9a9a9a" size="25" :name="showPassword ? 'eye-fill' : 'eye-off'"></u-icon></view>
 					<u-icon></u-icon>
 				</view>
 				<button class="submit" size="default" @click="onSubmitFunc"><text class="text">登录</text></button>
@@ -81,11 +81,13 @@ export default {
 	methods: {
 		...mapMutations(['setUserInfo']),
 		//微信授权登录
+		//#ifdef MP
 		onAuthorization(e) {
 			wx.getUserProfile({
 				desc: '获取用户信息',
 				success: res => {
 					if (res) {
+						//微信官方自带解密（node）
 						let pc = new WXBizDataCrypt(appId, this.session_key);
 						let data = pc.decryptData(res.encryptedData, res.iv);
 						let obj = {
@@ -98,6 +100,10 @@ export default {
 							.get(`/yt/third/login/${this.openid}`)
 							.then(res => {
 								if (res.token == '' || res.token == null) {
+									//需要绑定，跳转我的页面
+									uni.reLaunch({
+										url: '/pages/personal/personal'
+									});
 								} else {
 									// 储存登录信息
 									let resObj = {
@@ -116,9 +122,6 @@ export default {
 										icon: 'none'
 									});
 									this.saveUserInfo();
-									// return uni.showToast({
-									// 	title: '不需要绑定'
-									// });
 								}
 							})
 							.catch(e => {
@@ -127,7 +130,7 @@ export default {
 						// #ifdef APP-PLUS||MP
 						setTimeout(() => {
 							uni.reLaunch({
-								url: '/pages/personal/personal?obj=' + JSON.stringify(obj)
+								url: '/pages/personal/personal?obj=' + encodeURIComponent(JSON.stringify(obj))
 							});
 						}, 500);
 						// #endif
@@ -135,6 +138,7 @@ export default {
 				}
 			});
 		},
+		//#endif
 		saveUserInfo() {
 			//储存个人信息
 			uni.$u.http.get('/yt/user/me/info').then(res => {

@@ -120,5 +120,6 @@
 		background: linear-gradient(241deg, #00c9a7 0%, rgba(0, 223, 252, 0.5) 100%);
 		opacity: 0.1;
 		transform: rotate(180deg);
+		z-index: -9999;
 	}
 }

@@ -34,29 +34,7 @@ export const actions = {
 		state,
 		commit
 	}, data) {
-		let httpData = {
-			page: 1,
-			pageSize: 10,
-			status: data.status == 'CLEARED_ACK' ? null : data.status,
-			startTime: data.startTime,
-			endTime: data.endTime,
-			severity: data.severity,
-			deviceType: data.deviceType,
-			organizationId: data.organizationId,
-			alarmType: data.alarmType
-		};
-		uni.$u.http
-			.get('/yt/alarm', {
-				params: httpData,
-				custom: {
-					load: false
-				}
-			})
-			.then(res => {
-				state.badgeInfo = res.total
-			})
-			.catch(e => {
-				uni.$u.toast(e.data?.message);
-			});
+		state.badgeInfo = data
+		console.log('Change total', data);
 	}
 };

@@ -23,17 +23,11 @@
 				</view>
 			</view>
 		</view>
-		<f-tabbar></f-tabbar>
 	</view>
 </template>
 
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-
 export default {
-	components: {
-		fTabbar
-	},
 	data() {
 		return {
 			notifyList: {}
@@ -43,11 +37,14 @@ export default {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 		if (e.data !== null) {
-			let params = JSON.parse(e.data);
+			let params = JSON.parse(decodeURIComponent(e.data));
 			if (params) this.notifyList = params;
+			uni.setStorageSync('storagePre', true);
 		}
 	},
-	methods: {}
+	onHide() {
+		uni.setStorageSync('storagePre', false);
+	}
 };
 </script>
 

@@ -18,8 +18,9 @@
 								<text class="text-bottom">{{ item.sysNotice.createTime }}</text>
 							</view>
 						</view>
-						<view class="item-right">
+						<view class="item-right u-flex" style="justify-content: space-between;margin-right: ;">
 							<text class="text">{{ formatType(item.sysNotice) }}</text>
+							<u-badge v-if="item.readStatus == '0'" numberType="overflow" isDot />
 						</view>
 					</view>
 				</view>
@@ -67,28 +68,29 @@ export default {
 			downOption: {
 				auto: false //是否在初始化后,自动执行downCallback; 默认true
 			},
-			list: []
+			list: [],
+			pre: false
 		};
 	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
-		this.stop();
+		this.pre = false;
+		uni.removeStorageSync('storagePre');
+	},
+	onShow() {
+		this.pre = uni.getStorageSync('storagePre');
+		if (this.pre) {
+			this.loadData(1);
+		}
+	},
+	onHide() {
+		uni.removeStorageSync('storagePre');
 	},
 	methods: {
 		formatType(e) {
 			return e?.type == 'OTHER' ? '其他' : e?.type == 'MEETING' ? '会议' : '公告';
 		},
-		stop() {
-			let interval = setInterval(function() {
-				uni.hideKeyboard(); //隐藏软键盘
-				console.log('刷新');
-			}, 20);
-			setTimeout(() => {
-				clearInterval(interval);
-				console.log('停止刷新');
-			}, 3000);
-		},
 		openTypeClick() {
 			this.showType = true;
 			uni.hideKeyboard();
@@ -134,12 +136,15 @@ export default {
 				});
 		},
 		clickNotifyDetail(e) {
-			let obj = e;
-			setTimeout(() => {
-				uni.navigateTo({
-					url: './notifyDetail?data=' + JSON.stringify(obj)
+			uni.$u.http
+				.get(`/yt/noticeUser/${e.id}`)
+				.then(res => {})
+				.catch(e => {
+					uni.$u.toast(e.data?.message);
 				});
-			}, 500);
+			uni.navigateTo({
+				url: './notifyDetail?data=' + encodeURIComponent(JSON.stringify(e))
+			});
 		}
 	}
 };