diff --git a/components/fab_button/up_index.vue b/components/fab_button/up_index.vue new file mode 100644 index 0000000..c22127e --- /dev/null +++ b/components/fab_button/up_index.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue index 83f80a8..232e272 100644 --- a/pages/eight_assignments/confined_space/apply.vue +++ b/pages/eight_assignments/confined_space/apply.vue @@ -119,8 +119,8 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '2', WORK_USER: '', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue index 95f6351..a860ac8 100644 --- a/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue +++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue @@ -26,13 +26,20 @@ + + diff --git a/utils/request.js b/utils/request.js index 21b18a2..56996d9 100644 --- a/utils/request.js +++ b/utils/request.js @@ -13,7 +13,7 @@ function post(url, data) { data, method: 'POST', header: { - 'Content-type': 'application/x-www-form-urlencoded' + 'Content-type': data?.postMethod || 'application/x-www-form-urlencoded' }, success: (res) => { if (data && data.loading !== false) { diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js index 40e095f..fc21de9 100644 --- a/utils/submitHomeworkProcess.js +++ b/utils/submitHomeworkProcess.js @@ -183,7 +183,7 @@ export const addFlowInfo = async ({form, list, taskId, EW_RU_JOB_ID, TYPE,CORP_I export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TYPE = '', EW_RU_JOB_ID = '',vernier = ''}, isLastStep = true) => { let stepNum = 0 if (isLastStep) { - const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID, VERNIER: vernier}) + const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID, VERNIER: vernier, REQUEST_SOURCE: '1'}) // 选人 if (info.chooseNextFlag === '1') { uni.navigateTo({