diff --git a/pages.json b/pages.json
index 8c913ba..b6b705e 100644
--- a/pages.json
+++ b/pages.json
@@ -308,6 +308,18 @@
"navigationBarTitleText": "已办"
}
},
+ {
+ "path": "pages/eight_assignments/hot_work/delay_fire_monitoring/list",
+ "style": {
+ "navigationBarTitleText": "延时监火"
+ }
+ },
+ {
+ "path": "pages/eight_assignments/hot_work/delay_fire_monitoring/detail",
+ "style": {
+ "navigationBarTitleText": "动火审批表"
+ }
+ },
{
"path": "pages/eight_assignments/security_measures",
"style": {
diff --git a/pages/eight_assignments/confined_space/gas/add.vue b/pages/eight_assignments/confined_space/gas/add.vue
index f1a8959..2093eb4 100644
--- a/pages/eight_assignments/confined_space/gas/add.vue
+++ b/pages/eight_assignments/confined_space/gas/add.vue
@@ -119,7 +119,9 @@ export default {
})
uni.$u.toast('保存成功')
setTimeout(() => {
- uni.navigateBack()
+ uni.switchTab({
+ url: '/pages/index/index'
+ })
}, 2000)
} catch {
}
diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue
new file mode 100644
index 0000000..e995265
--- /dev/null
+++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.QUESTION }}
+ {{ item.TEXT_INFO || item.ANSWER }}
+
+
+
+
+ {{ item1.TEXT_INFO }}:{{ item1.ANSWER }}
+
+
+
+
+
+
+
+
+
+
+ 部门:{{ item.DEPARTMENT_NAME }}
+ 人员:{{ item.USER_NAME }}
+
+
+ 审批意见:{{ item.APPROVAL_OPINIONS }}
+ 审批意见:{{ item.APPROVAL_TIME }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue
new file mode 100644
index 0000000..857b122
--- /dev/null
+++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+ 作业证编号: {{ item.JOB_NUMBER }}
+ 动火等级: {{ item.HOT_WORK_LEVEL_NAME }}
+
+
+ 申请办理人: {{ item.APPLY_USER_NAME }}
+ 作业类型: {{ item.JOB_TYPE_NAME }}
+
+
+ 现场负责人:{{ item.SITE_LEADER_NAME }}
+ 动火单位负责人:{{ item.HOT_WORK_UNIT_LEADER_NAME }}
+
+
+ 动火部位:{{ item.HOT_WORK_POSITION }}
+ 作业内容:{{ item.JOB_CONTENT }}
+
+
+ 审核状态:延时监火
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/eight_assignments/hot_work/gas/add.vue b/pages/eight_assignments/hot_work/gas/add.vue
index e69de29..264dab6 100644
--- a/pages/eight_assignments/hot_work/gas/add.vue
+++ b/pages/eight_assignments/hot_work/gas/add.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (%LEL)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/eight_assignments/hot_work/gas/list.vue b/pages/eight_assignments/hot_work/gas/list.vue
index deecb28..9d23ee6 100644
--- a/pages/eight_assignments/hot_work/gas/list.vue
+++ b/pages/eight_assignments/hot_work/gas/list.vue
@@ -3,34 +3,21 @@
- 分析时间:{{ item.ANALYZE_TIME }}
+ 动火分析时间: {{ item.GAS_TIME }}
- 分析地点:{{ item.ANALYZE_PLACE }}
-
-
- {{ GAS_NAME1 }}:{{ item.DATA1 }}
-
-
- {{ GAS_NAME2 }}:{{ item.DATA2 }}
-
-
- {{ GAS_NAME3 }}:{{ item.DATA3 }}
-
-
- {{ GAS_NAME4 }}:{{ item.DATA4 }}
+ 分析点名称: {{ item.GAS_NAME }}
- 含氧量:{{ item.OXYGEN_CONTENT }}
+ 分析数据(%LEL): {{ item.GAS_NUMBER }}
- 分析人:{{ item.ANALYZE_USER_NAME }}
+ 分析人:{{ item.userName }}
-
+
@@ -45,34 +32,28 @@ 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;
+ // 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,
+ // 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,
}
})
}
@@ -82,12 +63,19 @@ export default {
},
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];
+ // 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',
+ // });
+ let mockData = [{
+ // Number(new Date())
+ GAS_TIME: '2024-08-30 15:23:43',
+ GAS_NAME: '234',
+ GAS_NUMBER: 'fasf',
+ userName: 'zhangxiao'
+ }]
+ this.list = [...this.list, ...mockData];
},
resetList() {
this.list = []
diff --git a/pages/eight_assignments/hot_work/gas/name.vue b/pages/eight_assignments/hot_work/gas/name.vue
index e69de29..c302ea5 100644
--- a/pages/eight_assignments/hot_work/gas/name.vue
+++ b/pages/eight_assignments/hot_work/gas/name.vue
@@ -0,0 +1,13 @@
+
+ name的预留位置
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/eight_assignments/subordinate_index.vue b/pages/eight_assignments/subordinate_index.vue
index 106f5d1..c23dcf5 100644
--- a/pages/eight_assignments/subordinate_index.vue
+++ b/pages/eight_assignments/subordinate_index.vue
@@ -2,7 +2,7 @@
-
+
{{ item.title }}
@@ -43,7 +43,15 @@ export default {
this.title = query.title;
uni.setNavigationBarTitle({
title: this.title
- })
+ });
+ // 若得到的 type 类型为 [动火作业],为baseList动态添加 [延时监火] 模块
+ if (query.type === "hotWork") {
+ this.baseList.push({
+ img: require('../../static/icon-apps/i12.png'),
+ title: '延时监火',
+ url: '/pages/eight_assignments/hot_work/delay_fire_monitoring/list'
+ })
+ }
},
methods: {
fnNavigator(e) {
diff --git a/static/icon-apps/i12.png b/static/icon-apps/i12.png
new file mode 100644
index 0000000..10fb431
Binary files /dev/null and b/static/icon-apps/i12.png differ