From e11b9185cf0db0d52cb689f6288df4a8b81d0920 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Tue, 3 Dec 2024 19:22:35 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8F=97=E9=99=90?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/confined_space/gas/add.vue  | 2 +-
 pages/eight_assignments/confined_space/gas/name.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/eight_assignments/confined_space/gas/add.vue b/pages/eight_assignments/confined_space/gas/add.vue
index 2093eb4..527dd80 100644
--- a/pages/eight_assignments/confined_space/gas/add.vue
+++ b/pages/eight_assignments/confined_space/gas/add.vue
@@ -27,7 +27,7 @@
           <u-input v-model="form.ANALYZE_TIME" border="none" readonly/>
           <u-icon name="arrow-right"></u-icon>
         </u-form-item>
-        <u-form-item label="分析部位" prop="ANALYZE_PLACE" borderBottom required>
+        <u-form-item label="分析地点" prop="ANALYZE_PLACE" borderBottom required>
           <u-input v-model="form.ANALYZE_PLACE" border="none"/>
         </u-form-item>
         <u-form-item label="氧气含量" prop="OXYGEN_CONTENT" borderBottom required>
diff --git a/pages/eight_assignments/confined_space/gas/name.vue b/pages/eight_assignments/confined_space/gas/name.vue
index 844d0fe..e435f80 100644
--- a/pages/eight_assignments/confined_space/gas/name.vue
+++ b/pages/eight_assignments/confined_space/gas/name.vue
@@ -28,7 +28,7 @@
         </u-form-item>
       </u-form>
       <view class="mt-10">
-        <u-button v-if="isView !== '1'" type="primary" text="气体分析" @click="$u.debounce(fnSubmit, 1000,true)"/>
+        <u-button type="primary" text="气体分析" @click="$u.debounce(fnSubmit, 1000,true)"/>
       </view>
     </view>
   </view>

From 392c25e65cb26521889ce5b22fa164fb1b9469ab Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Wed, 4 Dec 2024 17:12:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8F=97=E9=99=90?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eight_assignments/electricity/gas/add.vue | 107 ++++++++++++++++++
 .../electricity/gas/list.vue                  |  94 +++++++++++++++
 .../electricity/gas/name.vue                  |  13 +++
 3 files changed, 214 insertions(+)
 create mode 100644 pages/eight_assignments/electricity/gas/add.vue
 create mode 100644 pages/eight_assignments/electricity/gas/list.vue
 create mode 100644 pages/eight_assignments/electricity/gas/name.vue

diff --git a/pages/eight_assignments/electricity/gas/add.vue b/pages/eight_assignments/electricity/gas/add.vue
new file mode 100644
index 0000000..97a2d8e
--- /dev/null
+++ b/pages/eight_assignments/electricity/gas/add.vue
@@ -0,0 +1,107 @@
+<template>
+  <view class="content">
+    <view class="card">
+      <u-form labelPosition="left" :model="form" :rules="rules" ref="formRef" labelWidth="140px">
+        <u-form-item label="动火分析时间" prop="ANALYZE_TIME" borderBottom required @click="fnDateTimePickerClick('ANALYZE_TIME')">
+          <u-input v-model="form.ANALYZE_TIME" border="none" readonly />
+          <u-icon name="arrow-right"></u-icon>
+        </u-form-item>
+        <u-form-item label="分析点名称" prop="ANALYZE_PLACE" borderBottom required>
+          <u-input v-model="form.ANALYZE_PLACE" border="none" />
+        </u-form-item>
+        <u-form-item label="分析数据(%LEL)" prop="ANALYZE_RESULT" borderBottom required>
+          <u-input v-model="form.ANALYZE_RESULT" border="none" type="number" placeholder="0" />
+          <view class="title">(%LEL)</view>
+        </u-form-item>
+        <u-form-item label="分析人" prop="ANALYZE_USER_NAME" borderBottom required>
+          <u-input v-model="form.ANALYZE_USER_NAME" border="none" />
+        </u-form-item>
+      </u-form>
+      <view class="mt-10">
+        <u-button type="primary" text="保存" @click="$u.debounce(fnSubmit, 1000, true)" />
+      </view>
+    </view>
+
+    <u-datetime-picker :show="dateTimePicker.show" v-model="dateTimePicker.value" :mode="dateTimePicker.mode"
+      :maxDate="dateTimePicker.max" :key="dateTimePicker.type" @confirm="fnDateTimePickerConfirm"
+      @cancel="fnDateTimePickerCancel" />
+  </view>
+</template>
+
+<script>
+import { getHotWorkGasInfoSave } from "@/api";
+
+export default {
+  data() {
+    return {
+      form: {
+        /** 动火分析时间 */
+        ANALYZE_TIME: '',
+        /** 分析点名称 */
+        ANALYZE_PLACE: '',
+        /** 分析数据(%LEL) */
+        ANALYZE_RESULT: '',
+        /** 分析人 */
+        ANALYZE_USER_NAME: this.$store.getters.getUserInfo.NAME,
+        ANALYZE_USER_ID: this.$store.getters.getUserInfo.USER_ID,
+        EW_RU_TASK_ID:'',
+        EW_RU_JOB_ID:'',
+        TYPE: ''
+      },
+      rules: {
+        ANALYZE_TIME: [{ type: 'string', required: true, message: '请选择动火分析时间', trigger: ['blur', 'change'] }],
+        ANALYZE_PLACE: [{ type: 'string', required: true, message: '请输入分析点名称', trigger: ['blur', 'change'] }],
+        ANALYZE_RESULT: [{ type: 'string', required: true, message: '请输入分析数据', trigger: ['blur', 'change'] }],
+        ANALYZE_USER_NAME: [{ type: 'string', required: true, message: '请输入分析人', trigger: ['blur', 'change'] }],
+      },
+      dateTimePicker: {
+        show: false,
+        value: Number(new Date()),
+        max: new Date().getTime(),
+        mode: 'datetime',
+        type: 'datetime-picker'
+      },
+    }
+  },
+  onLoad(query) {
+    this.form.EW_RU_TASK_ID = query.EW_RU_TASK_ID
+    this.TYPE = query.TYPE
+    this.form.EW_RU_JOB_ID = query.EW_RU_JOB_ID
+  },
+  methods: {
+    fnDateTimePickerClick(event) {
+      this.dateTimePicker.type = event
+      this.dateTimePicker.value = Number(new Date(this.form[event])) || Number(new Date())
+      this.dateTimePicker.show = true
+    },
+    fnDateTimePickerConfirm(event) {
+      this.form[this.dateTimePicker.type] = uni.$u.timeFormat(event.value, 'yyyy-mm-dd hh:MM')
+      this.fnDateTimePickerCancel()
+    },
+    fnDateTimePickerCancel() {
+      this.dateTimePicker.show = false
+    },
+    async fnSubmit() {
+      try {
+        await this.$refs.formRef.validate()
+        try {
+          await getHotWorkGasInfoSave({
+             ...this.form
+          })
+          uni.$u.toast('保存成功')
+          setTimeout(() => {
+            uni.switchTab({
+              url: '/pages/index/index'
+            })
+          }, 2000)
+        } catch {
+        }
+      } catch (e) {
+        uni.$u.toast('请补全必填项')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/pages/eight_assignments/electricity/gas/list.vue b/pages/eight_assignments/electricity/gas/list.vue
new file mode 100644
index 0000000..c197ea8
--- /dev/null
+++ b/pages/eight_assignments/electricity/gas/list.vue
@@ -0,0 +1,94 @@
+<template>
+  <view class="content">
+    <view v-if="isView !== '1'" class="flex-end padding" style="padding: 20upx;">
+      <u-button type="primary" text="添加" size="mini" class="bth-mini" @click="goToAdd"/>
+    </view>
+    <u-list v-if="list.length > 0">
+      <u-list-item v-for="(item, index) in list" :key="index">
+        <view class="flex-between main-title">
+          <text>动火分析时间: {{ item.ANALYZE_TIME }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>分析点名称: {{ item.ANALYZE_PLACE }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>分析数据(%LEL): {{ item.ANALYZE_PLACE }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>分析人：{{ item.ANALYZE_USER_NAME }}</text>
+        </view>
+        <view v-if="isView !== '1'" class="flex-between mt-10 subtitle">
+          <view></view>
+          <view class="flex-between">
+            <u-button type="error" text="删除" size="mini" class="bth-mini" @click="fnDelete(item)"/>
+          </view>
+        </view>
+      </u-list-item>
+    </u-list>
+    <empty v-else></empty>
+  </view>
+</template>
+
+<script>
+import {getHotWorkGasInfo, getHotWorkGasDelete} from "@/api";
+import {getHotWorkGasAll} from "../../../../api";
+
+export default {
+  data() {
+    return {
+      list: [],
+      EW_RU_TASK_ID: '',
+      EW_RU_JOB_ID: '',
+      TYPE: '',
+      isView: '0'
+    }
+  },
+  onLoad(query) {
+    this.EW_RU_TASK_ID = query.taskId
+    this.TYPE = query.type
+    this.EW_RU_JOB_ID = query.EW_RU_JOB_ID
+    this.isView = query.isView
+  },
+  onShow() {
+    this.resetList()
+  },
+  methods: {
+    async getData() {
+      let resData = await getHotWorkGasAll({
+        EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+        EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+      });
+      this.list = [...this.list, ...resData.list];
+    },
+    resetList() {
+      this.list = []
+      this.getData()
+    },
+    fnDelete(item) {
+      uni.showModal({
+        title: '提示',
+        content: '确定要删除这条记录？',
+        success: async res => {
+          if (res.confirm) {
+            await getHotWorkGasDelete({
+              EW_SP_EG_ID: item.EW_SP_EG_ID
+            })
+            uni.$u.toast('删除成功')
+            this.resetList()
+          }
+        }
+      })
+    },
+    goToAdd() {
+      uni.$u.route({
+        url: '/pages/eight_assignments/hot_work/gas/add',
+        params: {
+          EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+          EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+          TYPE: this.TYPE
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/pages/eight_assignments/electricity/gas/name.vue b/pages/eight_assignments/electricity/gas/name.vue
new file mode 100644
index 0000000..a45b337
--- /dev/null
+++ b/pages/eight_assignments/electricity/gas/name.vue
@@ -0,0 +1,13 @@
+<template>
+  <view>name的预留位置</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  }
+}
+</script>
+
+<style scoped lang="scss"></style>

From 7d57381b3e7481fb02c35141426744825ab24b31 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Wed, 4 Dec 2024 17:15:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8F=97=E9=99=90?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pages.json b/pages.json
index e9f3c1f..f48db04 100644
--- a/pages.json
+++ b/pages.json
@@ -230,6 +230,24 @@
 				"navigationBarTitleText": "动火作业气体分析"
 			}
 		},
+		{
+			"path": "pages/eight_assignments/electricity/gas/name",
+			"style": {
+				"navigationBarTitleText": "临时用电气体分析"
+			}
+		},
+		{
+			"path": "pages/eight_assignments/electricity/gas/list",
+			"style": {
+				"navigationBarTitleText": "临时用电气体分析"
+			}
+		},
+		{
+			"path": "pages/eight_assignments/electricity/gas/add",
+			"style": {
+				"navigationBarTitleText": "临时用电气体分析"
+			}
+		},
 		{
 			"path": "pages/eight_assignments/high_work/apply",
 			"style": {

From 02312656fefd89402fd0905280982160408d9d13 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 4 Dec 2024 17:25:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E9=BB=98=E8=AE=A4=E5=80=BC=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/blind_board/apply.vue        | 4 ++--
 pages/eight_assignments/break_ground/apply.vue       | 4 ++--
 pages/eight_assignments/confined_space/apply.vue     | 4 ++--
 pages/eight_assignments/cut_road/apply.vue           | 4 ++--
 pages/eight_assignments/electricity/apply.vue        | 4 ++--
 pages/eight_assignments/high_work/apply.vue          | 4 ++--
 pages/eight_assignments/hoisting/apply.vue           | 4 ++--
 pages/eight_assignments/hot_work/select_position.vue | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pages/eight_assignments/blind_board/apply.vue b/pages/eight_assignments/blind_board/apply.vue
index ba9fef5..de97ee5 100644
--- a/pages/eight_assignments/blind_board/apply.vue
+++ b/pages/eight_assignments/blind_board/apply.vue
@@ -175,8 +175,8 @@ export default {
         BOARD_INSTALL_TIME: '',
         WORK_END_DATE: '',
         WORK_USER: '',
-        WORK_LONGITUDE: '1',
-        WORK_LATITUDE: '1',
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: '',
         MEDIUM: '',
         TEMPERATURE: '',
         PRESSURE: '',
diff --git a/pages/eight_assignments/break_ground/apply.vue b/pages/eight_assignments/break_ground/apply.vue
index 3298be7..1a7d4dc 100644
--- a/pages/eight_assignments/break_ground/apply.vue
+++ b/pages/eight_assignments/break_ground/apply.vue
@@ -128,8 +128,8 @@ export default {
         CORP_NAME: '',
         WORK_START_DATE: '',
         WORK_END_DATE: '',
-        WORK_LONGITUDE: '1',
-        WORK_LATITUDE: '1',
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: '',
         WORK_PLACE: '',
         JOB_CONTENT: '',
         WORK_CONTENT: '',
diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue
index 165e4d9..f9534c1 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: '1',
-        WORK_LATITUDE: '1',
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: '',
         WORK_USER: '',
         SPECIAL_WORK: '',
         RISK_IDENTIFICATION: '',
diff --git a/pages/eight_assignments/cut_road/apply.vue b/pages/eight_assignments/cut_road/apply.vue
index 031ea98..c6a4411 100644
--- a/pages/eight_assignments/cut_road/apply.vue
+++ b/pages/eight_assignments/cut_road/apply.vue
@@ -128,8 +128,8 @@ export default {
         CORP_NAME: '',
         WORK_START_DATE: '',
         WORK_END_DATE: '',
-        WORK_LONGITUDE: '1',
-        WORK_LATITUDE: '1',
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: '',
         OTHER_DEPT: '',
         WORK_REASON: '',
         WORK_CONTENT: '',
diff --git a/pages/eight_assignments/electricity/apply.vue b/pages/eight_assignments/electricity/apply.vue
index 77a2d28..191a851 100644
--- a/pages/eight_assignments/electricity/apply.vue
+++ b/pages/eight_assignments/electricity/apply.vue
@@ -132,8 +132,8 @@ export default {
         CORP_NAME: '',
         WORK_START_DATE: '',
         WORK_END_DATE: '',
-        WORK_LONGITUDE: '1',
-        WORK_LATITUDE: '1',
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: '',
         WORK_PLACE: '',
         WORK_CONTENT: '',
         WORK_USER: '',
diff --git a/pages/eight_assignments/high_work/apply.vue b/pages/eight_assignments/high_work/apply.vue
index e9a2a79..0c714bc 100644
--- a/pages/eight_assignments/high_work/apply.vue
+++ b/pages/eight_assignments/high_work/apply.vue
@@ -121,8 +121,8 @@ export default {
         WORK_CONTENT: '',
         WORK_START_DATE: '',
         WORK_END_DATE: '',
-        WORK_LONGITUDE: '1',
-        WORK_LATITUDE: '1',
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: '',
         SPECIAL_WORK: '',
         RISK_IDENTIFICATION: '',
       },
diff --git a/pages/eight_assignments/hoisting/apply.vue b/pages/eight_assignments/hoisting/apply.vue
index 8c8277c..9475250 100644
--- a/pages/eight_assignments/hoisting/apply.vue
+++ b/pages/eight_assignments/hoisting/apply.vue
@@ -136,8 +136,8 @@ export default {
         WORK_CONTENT: '',
         WORK_START_DATE: '',
         WORK_END_DATE: '',
-        WORK_LONGITUDE: '1',
-        WORK_LATITUDE: '1',
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: '',
         SPECIAL_WORK: '',
         RISK_IDENTIFICATION: '',
       },
diff --git a/pages/eight_assignments/hot_work/select_position.vue b/pages/eight_assignments/hot_work/select_position.vue
index 7d6b9d5..309443a 100644
--- a/pages/eight_assignments/hot_work/select_position.vue
+++ b/pages/eight_assignments/hot_work/select_position.vue
@@ -43,8 +43,8 @@ export default {
         {name: '纬度', key_name: 'WORK_LATITUDE', type: 0}
       ],
       form: {
-        WORK_LONGITUDE: '1',
-        WORK_LATITUDE: '1'
+        WORK_LONGITUDE: '',
+        WORK_LATITUDE: ''
       },
       rules: {
         WORK_LONGITUDE: [{type: 'string', required: true, message: '请输入经度', trigger: ['blur', 'change']}],