From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/staff/index.vue |  452 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 238 insertions(+), 214 deletions(-)

diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index d541d13..aa7dd2b 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -48,245 +48,269 @@
 </template>
 
 <script>
-import {
-	logoutPost,
-	stagingHead,
-	wxAuthorize,
-	refreshToken,
-	app_url
-} from '@/api'
-export default {
-	data() {
-		return {
-			userInfo: uni.getStorageSync('userInfo') || {
-				permissions: []
-			},
-			taskInfo: 0,
-			list1: [{
-				name: '璁垮鎶ュ',
-				url: '/pages/staff/visitorReport',
-				img: require('@/static/home/ic_fangkebaobei@3x.png'),
-				auth: 'weixin:menu:visitcar'
-			},
-			{
-				name: '闅愭偅闅忔墜鎷�',
-				url: '/pages/staff/snapshot',
-				img: require('@/static/home/ic_yinhuansuishoupai@3x.png'),
-				auth: 'weixin:menu:hiddendanger'
-			},
-			{
-				name: '鐢ㄨ溅鐢宠',
-				url: '/pages/staff/vehicle/index',
-				img: require('@/static/home/ic_yongcheshenqing@3x.png'),
-				auth: 'weixin:menu:usecar'
-			},
-			{
-				name: '棰勭害浼氳瀹�',
-				url: '/pages/staff/meetingSub',
-				img: require('@/static/home/ic_yuyuehuiyishi@3x.png'),
-				auth: 'weixin:menu:meeting'
-			},
-			{
-				name: '淇敼瀵嗙爜',
-				url: '/pages/changePassword/changePassword',
-				img: require('@/static/home/ic_xiugaimima@3x.png'),
-				auth: 'weixin:menu:password'
-			},
-			{
-				name: '鎴戠殑鑰冨嫟',
-				url: '/pages/staff/signin',
-				img: require('@/static/home/ic_kaoqin@3x.png'),
-				auth: 'weixin:menu:attendance'
-			},
-			],
-			list2: [{
-				name: '浠诲姟涓績',
-				url: '/pages/staff/task/index',
-				img: require('@/static/home/ic_renwuzhongxin@3x.png'),
-				auth: 'weixin:menu:taskcenter'
-			},
-			{
-				name: '鎴戠殑浼氳鏃ュ巻',
-				url: '/pages/staff/meetingCalendar',
-				img: require('@/static/home/ic_wodehuiyi@3x.png'),
-				auth: 'weixin:menu:meetingcalendar'
-			},
-			{
-				name: '娲捐溅璁板綍',
-				url: '/pages/staff/vehicle/sendACar',
-				img: require('@/static/home/ic_paichejilu@3x.png'),
-				auth: 'weixin:menu:usecarrecord'
-			},
-			{
-				name: '浼氳瀹ょ鐞�',
-				url: '/pages/staff/meetingManager',
-				img: require('@/static/home/ic_huiyishiguanli@3x.png'),
-				auth: 'weixin:menu:meetingmanage'
+	import {
+		logoutPost,
+		stagingHead,
+		wxAuthorize,
+		refreshToken,
+		app_url
+	} from '@/api'
+	export default {
+		data() {
+			return {
+				userInfo: uni.getStorageSync('userInfo') || {
+					permissions: []
+				},
+				taskInfo: 0,
+				list1: [{
+						name: '璁垮鎶ュ',
+						url: '/pages/staff/visitorReport',
+						img: require('@/static/home/ic_fangkebaobei@3x.png'),
+						auth: 'weixin:menu:visitcar'
+					},
+					{
+						name: '闅愭偅闅忔墜鎷�',
+						url: '/pages/staff/snapshot',
+						img: require('@/static/home/ic_yinhuansuishoupai@3x.png'),
+						auth: 'weixin:menu:hiddendanger'
+					},
+					{
+						name: '鐢ㄨ溅鐢宠',
+						url: '/pages/staff/vehicle/index',
+						img: require('@/static/home/ic_yongcheshenqing@3x.png'),
+						auth: 'weixin:menu:usecar'
+					},
+					{
+						name: '棰勭害浼氳瀹�',
+						url: '/pages/staff/meetingSub',
+						img: require('@/static/home/ic_yuyuehuiyishi@3x.png'),
+						auth: 'weixin:menu:meeting'
+					},
+					{
+						name: '淇敼瀵嗙爜',
+						url: '/pages/changePassword/changePassword',
+						img: require('@/static/home/ic_xiugaimima@3x.png'),
+						auth: 'weixin:menu:password'
+					},
+					{
+						name: '鎴戠殑鑰冨嫟',
+						url: '/pages/staff/signin',
+						img: require('@/static/home/ic_kaoqin@3x.png'),
+						auth: 'weixin:menu:attendance'
+					},
+				],
+				list2: [{
+						name: '浠诲姟涓績',
+						url: '/pages/staff/task/index',
+						img: require('@/static/home/ic_renwuzhongxin@3x.png'),
+						auth: 'weixin:menu:taskcenter'
+					},
+					{
+						name: '鎴戠殑浼氳鏃ュ巻',
+						url: '/pages/staff/meetingCalendar',
+						img: require('@/static/home/ic_wodehuiyi@3x.png'),
+						auth: 'weixin:menu:meetingcalendar'
+					},
+					{
+						name: '娲捐溅璁板綍',
+						url: '/pages/staff/vehicle/sendACar',
+						img: require('@/static/home/ic_paichejilu@3x.png'),
+						auth: 'weixin:menu:usecarrecord'
+					},
+					{
+						name: '浼氳瀹ょ鐞�',
+						url: '/pages/staff/meetingManager',
+						img: require('@/static/home/ic_huiyishiguanli@3x.png'),
+						auth: 'weixin:menu:meetingmanage'
+					}
+				],
+
 			}
-			],
-
-		}
-	},
-	mounted() {
-	},
-
-	onShow() {
-		setTimeout(() => {
-			this.getTaskInfo()
-		}, 300)
-	},
-	methods: {
-		jump(path) {
-			if (path == '/pages/staff/signin') {
-				window.open('https://atwl.ahzyssl.com/dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index')
-			} else {
-				uni.navigateTo({
-					url: path
-				})
-			}
-
 		},
-		checkAuth(str) {
-			const permissions = this.userInfo.permissions
-			return permissions.indexOf(str) > -1
-		},
-		loginOut() {
-			logoutPost({isH5: 1})
-			this.$store.commit('empty')
-			window.location.href = app_url
-		},
-		getTaskInfo() {
-			stagingHead({
-				isDetail: '1'
-			}).then(res => {
-				this.taskInfo = res.data.noticeWaitNum + res.data.noticeCopyNum
-				if (this.taskInfo && this.taskInfo > 99) {
-					this.taskInfo = 99
+		onLoad() {
+			const ywinfo = uni.getStorageSync('ywinfo') || {}
+			if (ywinfo.ywid && ywinfo.type == 2) {
+				setTimeout(() => {
+					uni.removeStorageSync('ywinfo')
+				}, 500)
+				const yw = ywinfo.yw
+				if (yw == 1 || yw == 6) {
+					this.jump('/pages/staff/meetingDetail?id=' + ywinfo.ywid)
+				} else if (yw == 2) {
+					this.jump('/pages/staff/task/visitorApprove?id=' + ywinfo.ywid)
+				} else if (yw == 3) {
+					this.jump('/pages/staff/task/visitorReport?id=' + ywinfo.ywid)
+				} else if (yw == 4) {
+					this.jump('/pages/staff/task/vDangetAppr?id=' + ywinfo.ywid)
+				} else if (yw == 7) {
+					this.jump('/pages/staff/task/driver?id=' + ywinfo.ywid)
+				} else if (yw == 5) {
+					this.jump('/pages/staff/vehicle/index')
 				}
-			})
+			}
 		},
+		onShow() {
+			setTimeout(() => {
+				this.getTaskInfo()
+			}, 300)
+		},
+		methods: {
+			jump(path) {
+				if (path == '/pages/staff/signin') {
+					window.open('https://atwl.ahzyssl.com/dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index')
+				} else {
+					uni.navigateTo({
+						url: path
+					})
+				}
+
+			},
+			checkAuth(str) {
+				const permissions = this.userInfo.permissions
+				return permissions.indexOf(str) > -1
+			},
+			loginOut() {
+				logoutPost({
+					isH5: 1
+				}).then(res => {
+					this.$store.commit('empty')
+					setTimeout(() => {
+						window.location.href = app_url
+					}, 300)
+				})
+			},
+			getTaskInfo() {
+				stagingHead({
+					isDetail: '1'
+				}).then(res => {
+					this.taskInfo = res.data.noticeWaitNum + res.data.noticeCopyNum
+					if (this.taskInfo && this.taskInfo > 99) {
+						this.taskInfo = 99
+					}
+				})
+			},
+		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-.title_wrap {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 24rpx;
-	padding-top: 10rpx;
-
-	.name {
-		font-weight: 600;
-		font-size: 34rpx;
-		color: #222222;
-	}
-
-	.btn {
-		width: 144rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 1rpx solid $uni-color-primary;
-		font-size: 26rpx;
-		color: $uni-color-primary;
+	.title_wrap {
 		display: flex;
-		justify-content: center;
+		justify-content: space-between;
 		align-items: center;
-	}
-}
+		margin-bottom: 24rpx;
+		padding-top: 10rpx;
 
-.main_app {
-	padding-top: 12rpx;
-}
-
-.list {
-	display: flex;
-	width: 100%;
-	flex-wrap: wrap;
-
-	.item {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		width: 25%;
-		margin-bottom: 40rpx;
-		font-size: 26rpx;
-		position: relative;
-
-		image {
-			width: 88rpx;
-			height: 88rpx;
-			margin-bottom: 20rpx;
+		.name {
+			font-weight: 600;
+			font-size: 34rpx;
+			color: #222222;
 		}
 
-		.task_num {
-			position: absolute;
-			top: -10rpx;
-			right: 28rpx;
-			font-size: 24rpx;
-			width: 36rpx;
-			height: 36rpx;
-			background-color: red;
-			color: #fff;
-			border-radius: 50%;
+		.btn {
+			width: 144rpx;
+			height: 56rpx;
+			border-radius: 36rpx;
+			border: 1rpx solid $uni-color-primary;
+			font-size: 26rpx;
+			color: $uni-color-primary;
 			display: flex;
 			justify-content: center;
 			align-items: center;
 		}
 	}
-}
 
-.banner_wrap {
-	padding: 54rpx 44rpx;
-	color: #fff;
-	position: relative;
-	width: 688rpx;
-	height: 270rpx;
-	margin-bottom: 40rpx;
-
-	.h1 {
-		font-weight: bold;
-		line-height: 66rpx;
-		font-size: 44rpx;
-		margin-bottom: 14rpx;
+	.main_app {
+		padding-top: 12rpx;
 	}
 
-	.banner {
-		position: absolute;
-		top: 0;
-		left: 0;
+	.list {
+		display: flex;
 		width: 100%;
-		z-index: -1;
+		flex-wrap: wrap;
+
+		.item {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			width: 25%;
+			margin-bottom: 40rpx;
+			font-size: 26rpx;
+			position: relative;
+
+			image {
+				width: 88rpx;
+				height: 88rpx;
+				margin-bottom: 20rpx;
+			}
+
+			.task_num {
+				position: absolute;
+				top: -10rpx;
+				right: 28rpx;
+				font-size: 24rpx;
+				width: 36rpx;
+				height: 36rpx;
+				background-color: red;
+				color: #fff;
+				border-radius: 50%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
 	}
-}
 
-.container1 {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 10rpx 0 10rpx;
-}
+	.banner_wrap {
+		padding: 54rpx 44rpx;
+		color: #fff;
+		position: relative;
+		width: 688rpx;
+		height: 270rpx;
+		margin-bottom: 40rpx;
 
-.container2 {
-	display: flex;
-	flex-wrap: wrap;
-}
+		.h1 {
+			font-weight: bold;
+			line-height: 66rpx;
+			font-size: 44rpx;
+			margin-bottom: 14rpx;
+		}
 
-.copyright {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 24rpx;
-	color: #666666;
-	position: fixed;
-	width: 100%;
-	left: 0;
-	bottom: 48rpx;
-
-	image {
-		width: 40rpx;
-		height: 40rpx;
+		.banner {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			z-index: -1;
+		}
 	}
-}
+
+	.container1 {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 10rpx 0 10rpx;
+	}
+
+	.container2 {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.copyright {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 24rpx;
+		color: #666666;
+		position: fixed;
+		width: 100%;
+		left: 0;
+		bottom: 48rpx;
+
+		image {
+			width: 40rpx;
+			height: 40rpx;
+		}
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3