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

Compare commits

base: guoyuepeng:97f070fac6aea53df2b8cc657799ee964d67283d
Branches Tags
guoyuepeng:dev
guoyuepeng:hyx_2024-10-18_BUG
guoyuepeng:hyx_2024-10-23_tongbu
guoyuepeng:liujun-2024-06-06
guoyuepeng:main
guoyuepeng:mengfanliang-dev-pitfall
guoyuepeng:pet
guoyuepeng:八项作业
..
compare: guoyuepeng:69fc1d651639333600cf9f10abce46b64754a33e
Branches Tags
guoyuepeng:dev
guoyuepeng:hyx_2024-10-18_BUG
guoyuepeng:hyx_2024-10-23_tongbu
guoyuepeng:liujun-2024-06-06
guoyuepeng:main
guoyuepeng:mengfanliang-dev-pitfall
guoyuepeng:pet
guoyuepeng:八项作业

No commits in common. "97f070fac6aea53df2b8cc657799ee964d67283d" and "69fc1d651639333600cf9f10abce46b64754a33e" have entirely different histories.
97f070fac6 ... 69fc1d6516

11 changed files with 5 additions and 493 deletions
Show Stats Expand all files Collapse all files

4
api/index.js
View File

@ -41,10 +41,6 @@ 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) // 动火方法选择列表

40
pages.json
View File

@ -226,34 +226,6 @@
"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": {
@ -308,18 +280,6 @@
"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": {

4
pages/eight_assignments/confined_space/gas/add.vue
View File

@ -119,9 +119,7 @@ export default {
})
uni.$u.toast('保存成功')
setTimeout(() => {
uni.switchTab({
url: '/pages/index/index'
})
uni.navigateBack()
}, 2000)
} catch {
}

97
pages/eight_assignments/hot_work/delay_fire_monitoring/detail.vue
View File

@ -1,97 +0,0 @@
<template>
<view class="content">
<view class="card">
<u-cell-group>
<block v-for="(item, index) in form" :key="index">
<u-cell v-if="item.TYPE === 0" :key="index" :title="item.ITEM" :value="item.ITEM_VALUE"></u-cell>
</block>
</u-cell-group>
<u-divider text="安全措施" textPosition="left" textColor="#3c9cff" lineColor="#3c9cff" />
<u-cell-group>
<u-cell v-for="(item, index) in questionnaires" :key="index" :title="item.QUESTION">
<template #title>
<view style="display: flex;justify-content: space-between">
<view>{{ item.QUESTION }}</view>
<view>{{ item.TEXT_INFO || item.ANSWER }}</view>
</view>
</template>
<template #label>
<block v-for="(item1, index1) in item.answers" :key="index1">
<view>{{ item1.TEXT_INFO }}：{{ item1.ANSWER }}</view>
</block>
</template>
</u-cell>
</u-cell-group>
<u-divider text="审批人员" textPosition="left" textColor="#3c9cff" lineColor="#3c9cff" />
<u-cell-group>
<block v-for="(item, index) in jobs" :key="index">
<u-cell :key="index" :title="item.TYPE_DESCRIBE">
<template #label>
<view class="mt-10">
<view>部门：{{ item.DEPARTMENT_NAME }}</view>
<view>人员：{{ item.USER_NAME }}</view>
<view v-if="item.SIGN_PICTURE">
<u-image width="400rpx" height="200rpx" :src="$filePath + '/' + item.SIGN_PICTURE" mode="widthFix" />
<view>审批意见：{{ item.APPROVAL_OPINIONS }}</view>
<view>审批意见：{{ item.APPROVAL_TIME }}</view>
</view>
</view>
</template>
</u-cell>
</block>
</u-cell-group>
</view>
</view>
</template>
<script>
import { getTaskInfo } from "@/api";
import { resolveNextOperation } from "@/utils/submitHomeworkProcess";
export default {
data() {
return {
taskId: '',
type: '',
jobId: '',
form: [],
jobs: [],
questionnaires: [],
}
},
onLoad(query) {
this.taskId = query.taskId
this.type = query.type
this.jobId = query.jobId
this.fnGetData(query.taskId)
uni.setNavigationBarTitle({
title: query.title + '查看'
})
},
methods: {
async fnGetData(taskId) {
let resData = await getTaskInfo({ EW_RU_TASK_ID: taskId })
this.form = resData.list.form
this.jobs = resData.list.jobs
this.questionnaires = resData.list.simpleQues[0]
},
async fnSubmit() {
let CORP_ID = ''
for (let i = 0; i < this.form.length; i++) {
if (this.form[i].FK_NAME === 'CORP_ID') {
CORP_ID = this.form[i].FK_VALUE
break
}
}
await resolveNextOperation({
EW_RU_TASK_ID: this.taskId,
TYPE: this.type,
CORP_ID,
EW_RU_JOB_ID: this.jobId,
})
},
},
}
</script>
<style scoped lang="scss"></style>

116
pages/eight_assignments/hot_work/delay_fire_monitoring/list.vue
View File

@ -1,116 +0,0 @@
<!-- 延时监火页面 列表 -->
<template>
<view class="content">
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
<view @click="goToDetail(item)">
<view class="flex-between main-title bold">
<text>作业证编号: {{ item.JOB_NUMBER }}</text>
<text>动火等级: {{ item.HOT_WORK_LEVEL_NAME }}</text>
</view>
<view class="flex-between main-title">
<text>申请办理人: {{ item.APPLY_USER_NAME }}</text>
<text>作业类型: {{ item.JOB_TYPE_NAME }}</text>
</view>
<view class="flex-between main-title">
<text>现场负责人：{{ item.SITE_LEADER_NAME }}</text>
<text>动火单位负责人：{{ item.HOT_WORK_UNIT_LEADER_NAME }}</text>
</view>
<view class="flex-between main-title">
<text>动火部位：{{ item.HOT_WORK_POSITION }}</text>
<text>作业内容：{{ item.JOB_CONTENT }}</text>
</view>
<view class="flex-between main-title">
<text>审核状态：延时监火</text>
</view>
<view class="flex-between mt-10 subtitle">
<view></view>
<view class="flex-between">
<u-button type="primary" text="延时监火" size="mini" class="bth-mini ml-10" @click="$u.route({
url: '/pages/eight_assignments/view_info',
params: { taskId: item.taskId, jobId: item.jobId, type, title }
})" />
</view>
</view>
</view>
</u-list-item>
</u-list>
<empty v-else></empty>
</view>
</template>
<script>
export default {
data() {
return {
type: '',
title: '',
pageSize: 10,
currentPage: 1,
totalPage: 0,
list: []
}
},
onLoad(query) {
this.type = query.type
this.title = query.title
},
onShow() {
this.resetList()
},
methods: {
async getData() {
// 这里请求列表数据
// let resData = await getToDoTaskList({
// showCount: this.pageSize,
// currentPage: this.currentPage,
// TYPE: this.type,
// vectors: '0'
// });
const mockData = [
{
HOTWORKAPPLICATION_ID: '0',
JOB_NUMBER: 'DFIO-FPI',
HOT_WORK_LEVEL_NAME: '一级',
APPLY_USER_NAME: '孙喊问',
JOB_TYPE_NAME: '内部作业',
SITE_LEADER_NAME: '王某某',
HOT_WORK_UNIT_LEADER_NAME: '王某某',
HOT_WORK_POSITION: '测试',
JOB_CONTENT: '测试',
taskId: 'f4eb31f4b61b408e8a88e849017558d4',
jobId: 'c4f007f2ef5c487d96c31e297f5ff29b'
}
]
this.list = mockData || [];
this.totalPage = 0;
},
resetList() {
this.pageSize = 10
this.currentPage = 1
this.list = []
this.getData()
},
goToDetail(item) {
uni.$u.route({
url: '/pages/eight_assignments/hot_work/delay_fire_monitoring/detail',
params: {
taskId: item.taskId,
jobId: item.jobId,
type: this.type,
title: this.title
}
})
}
}
}
</script>
<style lang="scss" scoped>
.content {
.bold {
font-weight: bold;
}
}
</style>

104
pages/eight_assignments/hot_work/gas/add.vue
View File

@ -1,104 +0,0 @@
<template>
<view class="content">
<view class="card">
<u-form labelPosition="left" :model="form" :rules="rules" ref="formRef" labelWidth="140px">
<u-form-item label="动火分析时间" prop="GAS_TIME" borderBottom required @click="fnDateTimePickerClick('GAS_TIME')">
<u-input v-model="form.GAS_TIME" border="none" readonly />
<u-icon name="arrow-right"></u-icon>
</u-form-item>
<u-form-item label="分析点名称" prop="GAS_NAME" borderBottom required>
<u-input v-model="form.GAS_NAME" border="none" />
</u-form-item>
<u-form-item label="分析数据(%LEL)" prop="GAS_NUMBER" borderBottom required>
<u-input v-model="form.GAS_NUMBER" border="none" type="number" placeholder="0" />
<view class="title">(%LEL)</view>
</u-form-item>
<u-form-item label="分析人" prop="gasUserName" borderBottom required>
<u-input v-model="form.gasUserName" 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: {
/** 动火分析时间 */
GAS_TIME: '',
/** 分析点名称 */
GAS_NAME: '',
/** 分析数据(%LEL) */
GAS_NUMBER: '',
/** 分析人 */
gasUserName: this.$store.getters.getUserInfo.NAME
},
rules: {
GAS_TIME: [{ type: 'string', required: true, message: '请选择动火分析时间', trigger: ['blur', 'change'] }],
GAS_NAME: [{ type: 'string', required: true, message: '请输入分析点名称', trigger: ['blur', 'change'] }],
GAS_NUMBER: [{ type: 'string', required: true, message: '请输入分析数据', trigger: ['blur', 'change'] }],
gasUserName: [{ type: 'string', required: true, message: '请输入分析人', trigger: ['blur', 'change'] }],
},
dateTimePicker: {
show: false,
value: Number(new Date()),
max: new Date().getTime(),
mode: 'datetime',
type: 'datetime-picker'
},
}
},
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 {
// for (let i = 0; i < 4; i++) {
// if (this[`GAS_NAME${i + 1}`] && !this.form[`DATA${i + 1}`]) this.form[`DATA${i + 1}`] = 0
// }
await getHotWorkGasInfoSave({
data: { ...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.toast('保存成功')
setTimeout(() => {
uni.switchTab({
url: '/pages/index/index'
})
}, 2000)
} catch {
}
} catch (e) {
uni.$u.toast('请补全必填项')
}
}
}
}
</script>
<style scoped lang="scss"></style>

104
pages/eight_assignments/hot_work/gas/list.vue
View File

@ -1,104 +0,0 @@
<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.GAS_TIME }}</text>
</view>
<view class="flex-between main-title">
<text>分析点名称: {{ item.GAS_NAME }}</text>
</view>
<view class="flex-between main-title">
<text>分析数据(%LEL): {{ item.GAS_NUMBER }}</text>
</view>
<view class="flex-between main-title">
<text>分析人：{{ item.userName }}</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 {
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',
// });
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 = []
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>

13
pages/eight_assignments/hot_work/gas/name.vue
View File

@ -1,13 +0,0 @@
<template>
<view>name的预留位置</view>
</template>
<script>
export default {
data() {
return {}
}
}
</script>
<style scoped lang="scss"></style>

10
pages/eight_assignments/subordinate_index.vue
View File

@ -2,7 +2,7 @@
<view class="content">
<view class="card">
<view class="items">
<view class="item" v-for="(item, index) in baseList" :key="index" @click="fnNavigator(index)">
<view class="item" v-for="(item,index) in baseList" :key="index" @click="fnNavigator(index)">
<image :src="item.img" mode=""></image>
<view class="text">
<text>{{ item.title }}</text>
@ -43,15 +43,7 @@ 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) {

4
pages/eight_assignments/to_do_list.vue
View File

@ -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" v-if="item.canEditFlag === '1'" @click="handleEditTask(item)" />
<u-button type="primary" text="修改" size="mini" class="bth-mini" @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" v-if="item.canEditFlag !== '1'"
<u-button type="primary" text="审批" size="mini" class="bth-mini ml-10"
@click="$u.route({
url: '/pages/eight_assignments/view_info',
params: {taskId:item.taskId,jobId:item.jobId,type,title}

BIN
static/icon-apps/i12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.8 KiB