Signed-off-by: zhaobao <528046418@qq.com>

libs/request.js

@@ -25,7 +25,7 @@ export async function request(parmas) {
 								mask: true,
 								icon: "none",
 								complete() {
-									uni.navigateTo({
+									uni.reLaunch({
 										url: '/pages/login/login'
 									})
 								}

pages/mine/mine.vue

@@ -77,7 +77,7 @@
 						if (res.confirm) {
 							logout().then(()=>{
 								uni.clearStorageSync()
-								uni.navigateTo({
+								uni.reLaunch({
 									url:'/pages/login/login'
 								})							
 							})

pages/risk/check/form/form.vue

@@ -34,13 +34,13 @@
 			return {
 				formData:{
 					'hdangerId': undefined,
-					'formCode': 'submit',
+					'formCode': 'accept',
 					'hdangerTitle': '', // 隐患标题
 					'dangerCatId': undefined, // 隐患类别ID
 					'hdangerLevel': 1, // 隐患等级
 					'hdangerDesc': '', // 描述
 					'acceptRemark':"",
-					'submitTime': parseTime(new Date()),
+					'acceptTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
 					'goafId': undefined,
 					'checklistId': '',
@@ -110,7 +110,7 @@
 				}).then(()=>{
 					//renshengkuduan !
 					this.formData.status=4
-					this.formData.submitTime=parseTime(this.formData.submitTime)
+					this.formData.acceptTime=parseTime(this.formData.acceptTime)
 					this.formData.dangerDeadline=parseTime(this.formData.dangerDeadline)
 					updateDanger(this.formData).then((resp) => {
 						uni.switchTab({

pages/risk/rectify/form/form.vue

@@ -52,12 +52,12 @@
 			return {
 				formData:{
 					'hdangerId': undefined,
-					'formCode': 'submit',
+					'formCode': 'rectify',
 					'hdangerTitle': '', // 预警标题
 					'dangerCatId': undefined, // 预警类别ID
 					'hdangerLevel': 1, // 预警等级
 					'rectifyRemark': '', // 描述
-					'submitTime': parseTime(new Date()),
+					'rectifyTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
 					'goafId': undefined,
 					'checklistId': '',
@@ -162,7 +162,7 @@
 					  if (flow.curActivityCode === 'accept') {
 						this.formData.status = 3
 					  }
-						this.formData.submitTime=parseTime(this.formData.submitTime)
+						this.formData.rectifyTime=parseTime(this.formData.rectifyTime)
 						this.formData.dangerDeadline=parseTime(this.formData.dangerDeadline)
 						updateDanger(this.formData).then((resp) => {
 							uni.switchTab({

pages/risk/review/form/form.vue

@@ -63,13 +63,13 @@
 			return {
 				formData:{
 					'hdangerId': undefined,
-					'formCode': 'submit',
+					'formCode': 'review',
 					'hdangerTitle': '', // 预警标题
 					'dangerCatId': undefined, // 预警类别ID
 					'hdangerLevel': 0, // 预警等级
 					'reviewRemark': '', // 描述
 					'hdangerDesc':"",
-					'submitTime': parseTime(new Date()),
+					'reviewTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
 					'goafId': undefined,
 					'checklistId': '',
@@ -186,7 +186,7 @@
 					  if (flow.curActivityCode === 'accept') {
 						this.formData.status = 3
 					  }
-					this.formData.submitTime=parseTime(this.formData.submitTime)
+					this.formData.reviewTime=parseTime(this.formData.reviewTime)
 					this.formData.dangerDeadline=parseTime(this.formData.dangerDeadline)
 					updateDanger(this.formData).then((resp) => {
 						uni.switchTab({