From 4f71230e02acafe2925692aaa975bb4be159581c Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 21 Mar 2025 16:56:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../confined_space/gas/list.vue | 35 ++++++++++---------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/pages/eight_assignments/confined_space/gas/list.vue b/pages/eight_assignments/confined_space/gas/list.vue
index 0a711de..f2bb2a5 100644
--- a/pages/eight_assignments/confined_space/gas/list.vue
+++ b/pages/eight_assignments/confined_space/gas/list.vue
@@ -1,5 +1,8 @@
<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">
@@ -51,7 +54,8 @@ export default {
GAS_NAME4: '',
EW_RU_TASK_ID: '',
EW_RU_JOB_ID: '',
- list: []
+ list: [],
+ isView: '0'
}
},
onLoad(query) {
@@ -61,21 +65,7 @@ export default {
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/confined_space/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,
- }
- })
- }
+ this.isView = query.isView
},
onShow() {
this.resetList()
@@ -110,6 +100,19 @@ export default {
}
}
})
+ },
+ goToAdd() {
+ uni.$u.route({
+ url: '/pages/eight_assignments/confined_space/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,
+ }
+ })
}
},
}
From a04dbcc3d28f566c664709d82f67e2544c47b96b Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 24 Mar 2025 16:55:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../confined_space/gas/list.vue | 2 +-
.../confined_space/gas/name.vue | 84 +++++++++++--------
2 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/pages/eight_assignments/confined_space/gas/list.vue b/pages/eight_assignments/confined_space/gas/list.vue
index f2bb2a5..63f665a 100644
--- a/pages/eight_assignments/confined_space/gas/list.vue
+++ b/pages/eight_assignments/confined_space/gas/list.vue
@@ -29,7 +29,7 @@
<view class="flex-between main-title">
<text>分析人：{{ item.ANALYZE_USER_NAME }}</text>
</view>
- <view class="flex-between mt-10 subtitle">
+ <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"
diff --git a/pages/eight_assignments/confined_space/gas/name.vue b/pages/eight_assignments/confined_space/gas/name.vue
index e435f80..35b9f0c 100644
--- a/pages/eight_assignments/confined_space/gas/name.vue
+++ b/pages/eight_assignments/confined_space/gas/name.vue
@@ -3,28 +3,28 @@
<view class="card">
<u-form labelPosition="left" :model="form" :rules="rules" ref="formRef" labelWidth="140px">
<u-form-item label="有毒有害气体名称1" prop="GAS_NAME1" borderBottom>
- <u-input v-model="form.GAS_NAME1" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_NAME1" border="none"/>
</u-form-item>
<u-form-item label="合格标准" prop="GAS_STANDARD1" borderBottom>
- <u-input v-model="form.GAS_STANDARD1" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_STANDARD1" border="none"/>
</u-form-item>
<u-form-item label="有毒有害气体名称2" prop="GAS_NAME2" borderBottom>
- <u-input v-model="form.GAS_NAME2" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_NAME2" border="none"/>
</u-form-item>
<u-form-item label="合格标准" prop="GAS_STANDARD2" borderBottom>
- <u-input v-model="form.GAS_STANDARD2" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_STANDARD2" border="none"/>
</u-form-item>
<u-form-item label="可燃气体名称1" prop="GAS_NAME3" borderBottom>
- <u-input v-model="form.GAS_NAME3" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_NAME3" border="none"/>
</u-form-item>
<u-form-item label="合格标准" prop="GAS_STANDARD3" borderBottom>
- <u-input v-model="form.GAS_STANDARD3" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_STANDARD3" border="none"/>
</u-form-item>
<u-form-item label="可燃气体名称2" prop="GAS_NAME4" borderBottom>
- <u-input v-model="form.GAS_NAME4" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_NAME4" border="none"/>
</u-form-item>
<u-form-item label="合格标准" prop="GAS_STANDARD4" borderBottom>
- <u-input v-model="form.GAS_STANDARD4" border="none"/>
+ <u-input :disabled="this.isView === '1'" v-model="form.GAS_STANDARD4" border="none"/>
</u-form-item>
</u-form>
<view class="mt-10">
@@ -77,37 +77,53 @@ export default {
this.form = resData.data.aux[0] || {}
},
async fnSubmit() {
- if (!this.form.GAS_NAME1 && !this.form.GAS_NAME2 && !this.form.GAS_NAME3 && !this.form.GAS_NAME4) {
- uni.$u.toast('最少填写一项气体名称')
- return
- }
- for (let i = 0; i < 4; i++) {
- if (this.form['GAS_NAME' + (i + 1)] && !this.form['GAS_STANDARD' + (i + 1)]) {
- uni.$u.toast('请填写气体名称（' + this.form['GAS_NAME' + (i + 1)] + '）的合格标准')
+ if (this.isView === '1') {
+ uni.$u.route({
+ url: '/pages/eight_assignments/confined_space/gas/list',
+ params: {
+ isView: this.isView,
+ GAS_NAME1: this.form.GAS_NAME1,
+ GAS_NAME2: this.form.GAS_NAME2,
+ GAS_NAME3: this.form.GAS_NAME3,
+ GAS_NAME4: this.form.GAS_NAME4,
+ EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+ EW_RU_JOB_ID: this.EW_RU_JOB_ID
+ }
+ })
+ } else {
+ if (!this.form.GAS_NAME1 && !this.form.GAS_NAME2 && !this.form.GAS_NAME3 && !this.form.GAS_NAME4) {
+ uni.$u.toast('最少填写一项气体名称')
return
}
- if (this.form['GAS_STANDARD' + (i + 1)] && !this.form['GAS_NAME' + (i + 1)]) {
- uni.$u.toast('请填写合格标准（' + this.form['GAS_STANDARD' + (i + 1)] + '）的气体名称')
- return
+ for (let i = 0; i < 4; i++) {
+ if (this.form['GAS_NAME' + (i + 1)] && !this.form['GAS_STANDARD' + (i + 1)]) {
+ uni.$u.toast('请填写气体名称（' + this.form['GAS_NAME' + (i + 1)] + '）的合格标准')
+ return
+ }
+ if (this.form['GAS_STANDARD' + (i + 1)] && !this.form['GAS_NAME' + (i + 1)]) {
+ uni.$u.toast('请填写合格标准（' + this.form['GAS_STANDARD' + (i + 1)] + '）的气体名称')
+ return
+ }
}
- }
- await setConfinedSpaceGasInfoSave({
- wh: {...this.form},
- EW_RU_TASK_ID: this.EW_RU_TASK_ID,
- EW_RU_JOB_ID: this.EW_RU_JOB_ID,
- postMethod: 'application/json',
- })
- uni.$u.route({
- url: '/pages/eight_assignments/confined_space/gas/list',
- params: {
- GAS_NAME1: this.form.GAS_NAME1,
- GAS_NAME2: this.form.GAS_NAME2,
- GAS_NAME3: this.form.GAS_NAME3,
- GAS_NAME4: this.form.GAS_NAME4,
+ await setConfinedSpaceGasInfoSave({
+ wh: {...this.form},
EW_RU_TASK_ID: this.EW_RU_TASK_ID,
EW_RU_JOB_ID: this.EW_RU_JOB_ID,
- }
- })
+ postMethod: 'application/json',
+ })
+ uni.$u.route({
+ url: '/pages/eight_assignments/confined_space/gas/list',
+ params: {
+ GAS_NAME1: this.form.GAS_NAME1,
+ GAS_NAME2: this.form.GAS_NAME2,
+ GAS_NAME3: this.form.GAS_NAME3,
+ GAS_NAME4: this.form.GAS_NAME4,
+ EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+ EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+ }
+ })
+ }
+
}
},
}
From c530c66d3434e505fd144f365d7cd03026d7c852 Mon Sep 17 00:00:00 2001
From: Shan Ao <178391389@qq.com>
Date: Fri, 28 Mar 2025 09:10:12 +0800
Subject: [PATCH 3/6] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/package.json b/package.json
index 09fcb47..0fa02fd 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
"main": "main.js",
"dependencies": {
"crypto-js": "^4.2.0",
+ "dayjs": "^1.11.13",
"uview-ui": "^2.0.35",
"vue": "^2.6.14",
"vuex-persistedstate": "^3.2.1"
From 51ded1e8a339d0a31a054f1a10c532d0129b43c1 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 28 Mar 2025 11:32:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=AD=BE=E5=AD=97=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E5=9B=9E=E6=98=BEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/eight_assignments/break_ground/apply.vue | 6 +++---
pages/eight_assignments/completed_list.vue | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pages/eight_assignments/break_ground/apply.vue b/pages/eight_assignments/break_ground/apply.vue
index d5e3aee..c752387 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: '',
- WORK_LATITUDE: '',
+ WORK_LONGITUDE: '1',
+ WORK_LATITUDE: '1',
WORK_PLACE: '',
JOB_CONTENT: '',
WORK_CONTENT: '',
@@ -235,7 +235,7 @@ export default {
})
},
fnSign(event) {
- this.form.SIGN = event.filePath
+ this.form.SIGN = event.path
},
async fnSubmit() {
try {
diff --git a/pages/eight_assignments/completed_list.vue b/pages/eight_assignments/completed_list.vue
index 1103325..100844d 100644
--- a/pages/eight_assignments/completed_list.vue
+++ b/pages/eight_assignments/completed_list.vue
@@ -103,4 +103,8 @@ export default {
.quarantine {
margin-left: 5px;
}
+.flex_btn{
+ display: flex;
+ justify-content: flex-end;
+}
</style>
From 7acfd91d6d132e794fa4378d8a6e03a2958321a6 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 31 Mar 2025 17:22:30 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=9A=84=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hot_work/delay_fire_monitoring/delay.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 a860ac8..aa35268 100644
--- a/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
+++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
@@ -47,6 +47,7 @@ export default {
EW_RU_TASK_ID: '',
EW_RU_JOB_ID: '',
TYPE: '',
+ CORP_ID: '',
isView: '1'
}
},
@@ -55,6 +56,8 @@ export default {
this.EW_RU_TASK_ID = event.taskId
this.EW_RU_JOB_ID = event.EW_RU_JOB_ID
this.TYPE = event.TYPE
+ this.CORP_ID = event.CORP_ID
+ this.isView = event.isView
},
onShow() {
this.resetList()
@@ -85,7 +88,7 @@ export default {
goToTaskForword() {
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}
+ params: {taskId: this.EW_RU_TASK_ID, EW_RU_JOB_ID: this.EW_RU_JOB_ID, TYPE: this.TYPE, CORP_ID: this.CORP_ID}
});
},
/**
From c542390b0360079fa08866175b20df11b2728274 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 1 Apr 2025 10:39:25 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=9A=84=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hot_work/delay_fire_monitoring/task_forward.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/task_forward.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/task_forward.vue
index 2d22251..bccb308 100644
--- a/pages/eight_assignments/hot_work/delay_fire_monitoring/task_forward.vue
+++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/task_forward.vue
@@ -39,6 +39,7 @@ export default {
this.STATE = event.state;
this.EW_RU_TASK_ID = event.taskId
this.EW_RU_JOB_ID = event.EW_RU_JOB_ID
+ this.CORP_ID = event.CORP_ID
this.TYPE = event.TYPE
},
methods: {