From bf3a2e525caba3b3abfd0c60bc4308f6d1a54fc8 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 6 Nov 2024 15:57:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81bug=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E8=B7=AF=E7=94=B1=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=202=E3=80=81bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=96=B9=E7=AB=AF=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=E5=90=8E?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C=E5=BB=B6=E8=BF=9F=E7=9B=91?=
 =?UTF-8?q?=E7=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/fab_button/up_index.vue            | 39 +++++++++++++++++++
 .../confined_space/apply.vue                  |  4 +-
 .../hot_work/delay_fire_monitoring/delay.vue  | 19 +++++++++
 utils/request.js                              |  2 +-
 utils/submitHomeworkProcess.js                |  2 +-
 5 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 components/fab_button/up_index.vue

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 @@
+<template>
+  <view class="fab_button" @click="$emit('click')">
+    <block v-if="type === 'plus'">
+      <u-icon name="plus" color="#fff" size="28rpx"></u-icon>
+    </block>
+    <block v-if="type === 'search'">
+      <u-icon name="search" color="#fff" size="28rpx"></u-icon>
+    </block>
+    <block v-if="type === 'edit'">
+      <u-icon name="edit-pen" color="#fff" size="28rpx"></u-icon>
+    </block>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    type: {
+      type: String,
+      default: "plus",
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.fab_button {
+  position: fixed;
+  bottom: 200rpx;
+  right: 30rpx;
+  background-color: #3377ff;
+  border-radius: 50%;
+  width: 80rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
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 @@
       </view>
       <empty v-else></empty>
     </view>
+    <app-fab-button v-if="isView !== '1'" type="plus" @click="fnScan" />
+    <app-fab-up-button v-if="isView !== '1'" type="edit" @click="fnUpScan" />
   </view>
 </template>
 
 <script>
 import { getHotWorkRecord, setTaskSign} from "../../../../api";
+import AppFabButton from "@/components/fab_button/index.vue";
+import AppFabUpButton from "@/components/fab_button/up_index.vue";
 
 export default {
+  components: {
+    AppFabButton,AppFabUpButton
+  },
   data() {
     return {
       list: [],
@@ -104,6 +111,18 @@ export default {
         })
       }, 2000)
      },
+    fnScan() {
+      uni.$u.route({
+        url: '/pages/eight_assignments/hot_work/delay_fire_monitoring/add',
+        params: {taskId: this.EW_RU_TASK_ID, EW_RU_JOB_ID:this.EW_RU_JOB_ID,TYPE:this.TYPE}
+      });
+    },
+    fnUpScan(){
+      uni.$u.route({
+        url: '/pages/eight_assignments/hot_work/delay_fire_monitoring/task_forward',
+        params: {taskId: this.EW_RU_TASK_ID, EW_RU_JOB_ID:this.EW_RU_JOB_ID,TYPE:this.TYPE}
+      });
+    }
   }
 }
 </script>
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({