guoyuepeng
/
qa-regulatory-gwj-app
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0

pet-2.0
guoyuepeng 2025-04-20 10:37:50 +08:00
parent 0d7a240a58 c542390b03
commit 27ec4145ad
7 changed files with 83 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -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"

6
pages/eight_assignments/break_ground/apply.vue
View File

@ -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 {

4
pages/eight_assignments/completed_list.vue
View File

@ -103,4 +103,8 @@ export default {
.quarantine {
margin-left: 5px;
}
.flex_btn{
display: flex;
justify-content: flex-end;
}
</style>

37
pages/eight_assignments/confined_space/gas/list.vue
View File

@ -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">
@ -26,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"
@ -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,
}
})
}
},
}

84
pages/eight_assignments/confined_space/gas/name.vue
View File

@ -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,
}
})
}
}
},
}

5
pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
View File

@ -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}
});
},
/**

1
pages/eight_assignments/hot_work/delay_fire_monitoring/task_forward.vue
View File

@ -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: {