diff --git a/api/index.js b/api/index.js
index 8323c60..f10dc0d 100644
--- a/api/index.js
+++ b/api/index.js
@@ -41,6 +41,10 @@ export const getConfinedSpaceSelectList = (params) => post("/app/csSpe/getSpace"
 export const getConfinedSpaceGasInfo = (params) => post("/app/csSpe/getGasInfo",params) //获取受限空间气体检测详情
 export const setConfinedSpaceGasInfoSave = (params) => post("/app/csSpe/initGas", params) //受限空间气体检测详情保存
 export const setConfinedSpaceGasDelete = (params) => post("/app/csSpe/deleteGas", params) //保存受限空间气体检测删除
+export const getHotWorkGasAll = (params) => post("/app/elSpe/getAll", params) // 获取动火作业的所有受限空间气体检测数据
+export const getHotWorkGasInfo = (params) => post("/app/elSpe/getInfo", params) //获取动火作业的受限空间气体检测详情
+export const getHotWorkGasInfoSave = (params) => post("/app/elSpe/init", params) //获取动火作业的受限空间气体检测详情保存
+export const getHotWorkGasDelete = (params) => post("/app/elSpe/delete", params) // 动火作业的受限空间气体检测删除
 export const getOtherAssignmentsSelectList = (params) => post("/app/Task/getAllUnEndList", params) //关联的其他特殊作业及安全作业票编号选择列表
 export const getRiskIdentificationResultsSelectList = (params) => post("/app/eightWork/getInfo", params) //风险辨识结果选择列表
 export const getHotWorkMethodSelectList = (params) => post("/app/util/getDicList", params) // 动火方法选择列表
diff --git a/pages.json b/pages.json
index 19d42c5..8c913ba 100644
--- a/pages.json
+++ b/pages.json
@@ -226,6 +226,34 @@
 				"navigationBarTitleText": "动火作业申请"
 			}
 		},
+		{
+			"path": "pages/eight_assignments/hot_work/gas/name",
+			"style": {
+				"navigationBarTitleText": "动火作业气体分析"
+			}
+		},
+		{
+			"path": "pages/eight_assignments/hot_work/gas/list",
+			"style": {
+				"navigationBarTitleText": "动火作业气体分析",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "新建",
+							"fontSize": "15",
+							"float": "right",
+							"width": "40px"
+						}]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/eight_assignments/hot_work/gas/add",
+			"style": {
+				"navigationBarTitleText": "动火作业气体分析"
+			}
+		},
 		{
 			"path": "pages/eight_assignments/high_work/apply",
 			"style": {
diff --git a/pages/eight_assignments/hot_work/gas/add.vue b/pages/eight_assignments/hot_work/gas/add.vue
new file mode 100644
index 0000000..e69de29
diff --git a/pages/eight_assignments/hot_work/gas/list.vue b/pages/eight_assignments/hot_work/gas/list.vue
new file mode 100644
index 0000000..deecb28
--- /dev/null
+++ b/pages/eight_assignments/hot_work/gas/list.vue
@@ -0,0 +1,116 @@
+<template>
+  <view class="content">
+    <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" v-if="GAS_NAME1 && item.DATA1">
+          <text>{{ GAS_NAME1 }}：{{ item.DATA1 }}</text>
+        </view>
+        <view class="flex-between main-title" v-if="GAS_NAME2 && item.DATA2">
+          <text>{{ GAS_NAME2 }}：{{ item.DATA2 }}</text>
+        </view>
+        <view class="flex-between main-title" v-if="GAS_NAME3 && item.DATA3">
+          <text>{{ GAS_NAME3 }}：{{ item.DATA3 }}</text>
+        </view>
+        <view class="flex-between main-title" v-if="GAS_NAME4 && item.DATA4">
+          <text>{{ GAS_NAME4 }}：{{ item.DATA4 }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>含氧量：{{ item.OXYGEN_CONTENT }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>分析人：{{ item.ANALYZE_USER_NAME }}</text>
+        </view>
+        <view 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";
+
+export default {
+  data() {
+    return {
+      GAS_NAME1: '',
+      GAS_NAME2: '',
+      GAS_NAME3: '',
+      GAS_NAME4: '',
+      EW_RU_TASK_ID: '',
+      EW_RU_JOB_ID: '',
+      list: []
+    }
+  },
+  onLoad(query) {
+    this.GAS_NAME1 = query.GAS_NAME1;
+    this.GAS_NAME2 = query.GAS_NAME2;
+    this.GAS_NAME3 = query.GAS_NAME3;
+    this.GAS_NAME4 = query.GAS_NAME4;
+    this.EW_RU_TASK_ID = query.EW_RU_TASK_ID;
+    this.EW_RU_JOB_ID = query.EW_RU_JOB_ID;
+  },
+  onNavigationBarButtonTap(e) {
+    if (e.index === 0) {
+      uni.$u.route({
+        url: '/pages/eight_assignments/hot_work/gas/add',
+        params: {
+          GAS_NAME1: this.GAS_NAME1,
+          GAS_NAME2: this.GAS_NAME2,
+          GAS_NAME3: this.GAS_NAME3,
+          GAS_NAME4: this.GAS_NAME4,
+          EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+          EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+        }
+      })
+    }
+  },
+  onShow() {
+    this.resetList()
+  },
+  methods: {
+    async getData() {
+      let resData = await getHotWorkGasInfo({
+        EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+        EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+        postMethod: 'application/json',
+      });
+      this.list = [...this.list, ...resData.data.main];
+    },
+    resetList() {
+      this.list = []
+      this.getData()
+    },
+    fnDelete(item) {
+      uni.showModal({
+        title: '提示',
+        content: '确定要删除这条记录？',
+        success: async res => {
+          if (res.confirm) {
+            await getHotWorkGasDelete({
+              data: item,
+              EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+              EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+              postMethod: 'application/json',
+            })
+            uni.$u.toast('删除成功')
+            this.resetList()
+          }
+        }
+      })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/pages/eight_assignments/hot_work/gas/name.vue b/pages/eight_assignments/hot_work/gas/name.vue
new file mode 100644
index 0000000..e69de29
diff --git a/pages/eight_assignments/to_do_list.vue b/pages/eight_assignments/to_do_list.vue
index c8b2c41..4f4dc4c 100644
--- a/pages/eight_assignments/to_do_list.vue
+++ b/pages/eight_assignments/to_do_list.vue
@@ -20,13 +20,13 @@
         <view class="flex-between mt-10 subtitle">
           <view></view>
           <view class="flex-between">
-            <u-button type="primary" text="修改" size="mini" class="bth-mini" @click="handleEditTask(item)" />
+            <u-button type="primary" text="修改" size="mini" class="bth-mini" v-if="item.canEditFlag === '1'" @click="handleEditTask(item)" />
             <u-button type="primary" text="流程" size="mini" class="bth-mini ml-10"
                       @click="$u.route({
                         url: '/pages/eight_assignments/technological_process',
                         params: {taskId:item.taskId,type,title}
                       })"/>
-            <u-button type="primary" text="审批" size="mini" class="bth-mini ml-10"
+            <u-button type="primary" text="审批" size="mini" class="bth-mini ml-10" v-if="item.canEditFlag !== '1'"
                       @click="$u.route({
                         url: '/pages/eight_assignments/view_info',
                         params: {taskId:item.taskId,jobId:item.jobId,type,title}