Prechádzať zdrojové kódy

面试提交时间更改格式

wkw 6 mesiacov pred
rodič
commit
08112bd7a6

+ 12 - 1
src/components/header/header.vue

@@ -1597,7 +1597,18 @@
 								type: 'json'
 							}).then(res => {
 								if (res.code == 0) {
-									this.saveHrInfo();
+									if(this.userType == 1){
+										ElMessage({
+											message: '保存成功',
+											type: 'success',
+											duration: 1500,
+											offset: this.screenHeight / 2
+										})
+										this.getUserInfo()
+										this.visible = false
+									}else{
+										this.saveHrInfo();
+									}
 								}
 							})
 						}).catch(() => {

+ 16 - 7
src/components/messageCom/messageCom.vue

@@ -486,15 +486,24 @@
 			},
 			formatDate(dates, type) {
 				let date = new Date(dates)
-				var year = date.getFullYear();
-				var month = ("0" + (date.getMonth() + 1)).slice(-2);
-				var day = ("0" + date.getDate()).slice(-2);
-				var hour = ("0" + date.getHours()).slice(-2);
-				var minute = ("0" + date.getMinutes()).slice(-2);
+				let year = date.getFullYear()
+				let month = ("0" + (date.getMonth() + 1)).slice(-2)
+				let day = ("0" + date.getDate()).slice(-2)
+				let hour = date.getHours()
+				let minute = ("0" + date.getMinutes()).slice(-2)
+
+				// 处理 12小时制
+				let ampm = hour >= 12 ? 'PM' : 'AM'
+				hour = hour % 12
+				hour = hour ? hour : 12 // 0点转成12
+				hour = ("0" + hour).slice(-2)
+
 				if (type == 1) {
-					return year + "-" + month + "-" + day + " " + '00' + ":" + '00' + ':00';
+					// 返回完整日期 + 固定时间
+					return `${year}-${month}-${day} 00:00:00`
 				} else {
-					return hour + ":" + minute;
+					// 返回 12小时制时间 + AM/PM
+					return `${hour}:${minute} ${ampm}`
 				}
 			},
 			submitMs() {

+ 2 - 2
src/views/home.vue

@@ -38,7 +38,7 @@
 		},
 		mounted() {
 			if (localStorage.getItem('token')) {
-				this.getCompany();
+				this.getUserInfo();
 			}
 
 		},
@@ -48,7 +48,6 @@
 					if(res.code == 0){
 						this.$store.commit('SET_COMPANY_ID', res.data.companyId)
 						localStorage.setItem('companyId', res.data.companyId);
-						this.getUserInfo()
 					}
 				})
 			},
@@ -89,6 +88,7 @@
 						} else {
 							this.$store.commit('SET_USER_TYPE', 2);
 							localStorage.setItem('userType', 2)
+							this.getCompany();
 							if (res.data.isCompanyVip == 1) { //判断企业用户是否是vip
 								this.$store.commit('SET_IS_COMPANY_VIP', true);
 							} else {

+ 19 - 10
src/views/message/index.vue

@@ -585,17 +585,26 @@
 					longitude + '&radius=100&referer=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77';
 				window.open(url)
 			},
-			formatDate(dates,type) {
+			formatDate(dates, type) {
 				let date = new Date(dates)
-				var year = date.getFullYear();
-				var month = ("0" + (date.getMonth() + 1)).slice(-2);
-				var day = ("0" + date.getDate()).slice(-2);
-				var hour = ("0" + date.getHours()).slice(-2);
-				var minute = ("0" + date.getMinutes()).slice(-2);
-				if(type == 1){
-					return year + "-" + month + "-" + day + " " + '00' + ":" + '00' + ':00';
-				}else{
-					return hour + ":" + minute;
+				let year = date.getFullYear()
+				let month = ("0" + (date.getMonth() + 1)).slice(-2)
+				let day = ("0" + date.getDate()).slice(-2)
+				let hour = date.getHours()
+				let minute = ("0" + date.getMinutes()).slice(-2)
+
+				// 处理 12小时制
+				let ampm = hour >= 12 ? 'PM' : 'AM'
+				hour = hour % 12
+				hour = hour ? hour : 12 // 0点转成12
+				hour = ("0" + hour).slice(-2)
+
+				if (type == 1) {
+					// 返回完整日期 + 固定时间
+					return `${year}-${month}-${day} 00:00:00`
+				} else {
+					// 返回 12小时制时间 + AM/PM
+					return `${hour}:${minute} ${ampm}`
 				}
 			},
 			submitMs() {