Merge branch 'dev' into 2023年12月27日V01.00.50
limingyu
commit
86f9a751b8
|
|
@ -74,7 +74,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[1].AUTOGRAPH" :src="config.fileUrl+hotUserList[1].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[1].OPERATTIME">{{ formatTime(hotUserList[1].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[1].AUTOGRAPH">{{ formatTime(hotUserList[1].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="pd.JOB_TYPE_INDEX == '1'" >
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[2].AUTOGRAPH" :src="config.fileUrl+hotUserList[2].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[2].OPERATTIME">{{ formatTime(hotUserList[2].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[2].AUTOGRAPH">{{ formatTime(hotUserList[2].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[3].AUTOGRAPH" :src="config.fileUrl+hotUserList[3].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[3].OPERATTIME">{{ formatTime(hotUserList[3].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[3].AUTOGRAPH">{{ formatTime(hotUserList[3].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[4].AUTOGRAPH" :src="config.fileUrl+hotUserList[4].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[4].OPERATTIME">{{ formatTime(hotUserList[4].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[4].AUTOGRAPH">{{ formatTime(hotUserList[4].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[5].AUTOGRAPH" :src="config.fileUrl+hotUserList[5].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[5].OPERATTIME">{{ formatTime(hotUserList[5].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[5].AUTOGRAPH">{{ formatTime(hotUserList[5].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[6].AUTOGRAPH" :src="config.fileUrl+hotUserList[6].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[6].OPERATTIME">{{ formatTime(hotUserList[6].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[6].AUTOGRAPH">{{ formatTime(hotUserList[6].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[7].AUTOGRAPH" :src="config.fileUrl+hotUserList[7].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[7].OPERATTIME">{{ formatTime(hotUserList[7].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[7].AUTOGRAPH">{{ formatTime(hotUserList[7].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[8].AUTOGRAPH" :src="config.fileUrl+hotUserList[8].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[8].OPERATTIME">{{ formatTime(hotUserList[8].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[8].AUTOGRAPH">{{ formatTime(hotUserList[8].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[9].AUTOGRAPH" :src="config.fileUrl+hotUserList[9].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[9].OPERATTIME">{{ formatTime(hotUserList[9].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[9].AUTOGRAPH">{{ formatTime(hotUserList[9].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -403,7 +403,11 @@ export default {
|
|||
this.pd = data.pd
|
||||
this.hotUserList = data.hotUserList
|
||||
for (let i = 0; i < data.hotOperator.length; i++) {
|
||||
this.hotOperatorNames += data.hotOperator[i].userName2 + ';'
|
||||
if (i === data.hotOperator.length - 1) {
|
||||
this.hotOperatorNames += data.hotOperator[i].userName2
|
||||
} else {
|
||||
this.hotOperatorNames += data.hotOperator[i].userName2 + ';'
|
||||
}
|
||||
}
|
||||
|
||||
this.corpinfo = data.corpinfo
|
||||
|
|
|
|||
|
|
@ -164,6 +164,12 @@
|
|||
icon="el-icon-view"
|
||||
@click="fnEvaluation(row.HIDDEN_ID,row.SOURCE, row.CREATOR,'edit')">考评
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="USER_ID=='1'"
|
||||
type="danger"
|
||||
icon="el-icon-view"
|
||||
@click="fnDelvaluation(row.HIDDEN_ID)">删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -420,6 +426,34 @@ export default {
|
|||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
fnDelvaluation(hiddenId) {
|
||||
this.$confirm('确定要删除选中的评审记录吗?', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.listLoading = true
|
||||
requestFN(
|
||||
'/hiddenevaluationrecord/deleteEvaluation',
|
||||
{
|
||||
HIDDEN_ID: hiddenId
|
||||
}
|
||||
).then((data) => {
|
||||
this.listLoading = false
|
||||
if (data.result === 'success') {
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
} else {
|
||||
this.$message({
|
||||
message: data.message,
|
||||
type: 'error'
|
||||
})
|
||||
}
|
||||
}).catch((e) => {
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,6 +112,10 @@
|
|||
<td v-else colspan="2">未定位</td>
|
||||
<td><el-button type="success" @click="handleMap(pd)">查看定位</el-button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tbg">具体位置</td>
|
||||
<td colspan="3">{{ pd.LOCATION }}</td>
|
||||
</tr>
|
||||
<tr v-for="(item, index) in file9" :key="index">
|
||||
<td class="tbg">安全管理协议{{ index + 1 }}</td>
|
||||
<td colspan="2">{{ item.FILE_NAME }}</td>
|
||||
|
|
|
|||
|
|
@ -2,219 +2,179 @@
|
|||
<div class="app-container print-work">
|
||||
<div class="level-title">
|
||||
<h1>有限空间作业许可证</h1>
|
||||
<div class="level-btns">编号:{{ info.WORK_PERMIT_NUMBER }}</div>
|
||||
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
||||
</div>
|
||||
<table class="table-ui">
|
||||
<tr>
|
||||
<td class="bbg-transparent">管理单位</td>
|
||||
<td>{{ info.MANAGEMENT_UNIT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业单位</td>
|
||||
<td>{{ info.WORK_UNIT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业申请单位</td>
|
||||
<td colspan="5">{{ info.APPLY_DEPARTMENT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业申请时间</td>
|
||||
<td colspan="3">{{ info.CREATTIME }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业地点</td>
|
||||
<td>{{ info.WORK_LOCATION }}</td>
|
||||
<td class="bbg-transparent">有限空间名称及编号</td>
|
||||
<td>{{ info.RESTRICTED_SPACE_NAME }}</td>
|
||||
<td class="bbg-transparent">受限空间名称</td>
|
||||
<td colspan="5">{{ info.LIMITSPACE_NAME }}</td>
|
||||
<td class="bbg-transparent">受限空间内原有介质名称</td>
|
||||
<td colspan="3">{{ info.MEDIUM_NAME }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">主要介质</td>
|
||||
<td>{{ info.MAIN_MEDIUM }}</td>
|
||||
<td class="bbg-transparent">主要危险因素</td>
|
||||
<td>{{ info.MAJOR_RISK_FACTORS }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业内容</td>
|
||||
<td colspan="3">{{ info.CONTENTS_OF_HOMEWORK }}</td>
|
||||
<td colspan="9">{{ info.WORK_CONTENT }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<td class="bbg-transparent">作业单位</td>
|
||||
<td colspan="5">{{ info.CONFIRM_DEPARTMENT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业负责人</td>
|
||||
<td colspan="3">{{ info.CONFIRM_USER_NAME }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业人</td>
|
||||
<td colspan="5">{{ info.WORK_USER }}</td>
|
||||
<td class="bbg-transparent">监护人</td>
|
||||
<td colspan="5">
|
||||
<div v-if="info.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.GUARDIAN_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">关联的其他特殊作业及安全作业票编号</td>
|
||||
<td colspan="9">{{ info.SPECIAL_WORK }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">风险辨识结果</td>
|
||||
<td colspan="9">{{ info.RISK_IDENTIFICATION }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td :rowspan="3 + gasList.length" class="bbg-transparent">气体分析</td>
|
||||
<td class="bbg-transparent" rowspan="2">分析项目</td>
|
||||
<td class="bbg-transparent" colspan="2">有毒有害气体名称</td>
|
||||
<td class="bbg-transparent" colspan="2">可燃气体名称</td>
|
||||
<td class="bbg-transparent" rowspan="2">氧气含量</td>
|
||||
<td class="bbg-transparent" rowspan="3">取样分析时间</td>
|
||||
<td class="bbg-transparent" rowspan="3">分析部位</td>
|
||||
<td class="bbg-transparent" rowspan="3">分析人</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td :style="{padding:gas.GAS_NAME1 ? '8px' : '16px'}">{{ gas.GAS_NAME1 }}</td>
|
||||
<td :style="{padding:gas.GAS_NAME2 ? '8px' : '16px'}">{{ gas.GAS_NAME2 }}</td>
|
||||
<td :style="{padding:gas.GAS_NAME3 ? '8px' : '16px'}">{{ gas.GAS_NAME3 }}</td>
|
||||
<td :style="{padding:gas.GAS_NAME4 ? '8px' : '16px'}">{{ gas.GAS_NAME4 }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">合格标准</td>
|
||||
<td>{{ gas.GAS_STANDARD1 }}</td>
|
||||
<td>{{ gas.GAS_STANDARD2 }}</td>
|
||||
<td>{{ gas.GAS_STANDARD3 }}</td>
|
||||
<td>{{ gas.GAS_STANDARD4 }}</td>
|
||||
<td>19.5% 〜21%（体积分数）</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in gasList" :key="index">
|
||||
<td v-if="index === 0" :rowspan="gasList.length" class="bbg-transparent">分析数据</td>
|
||||
<td><span v-if="gas.GAS_NAME1">{{ item.DATA1 }}</span></td>
|
||||
<td><span v-if="gas.GAS_NAME2">{{ item.DATA2 }}</span></td>
|
||||
<td><span v-if="gas.GAS_NAME3">{{ item.DATA3 }}</span></td>
|
||||
<td><span v-if="gas.GAS_NAME4">{{ item.DATA4 }}</span></td>
|
||||
<td>{{ item.OXYGEN_CONTENT }}</td>
|
||||
<td>{{ item.ANALYZE_TIME }}</td>
|
||||
<td>{{ item.ANALYZE_PLACE }}</td>
|
||||
<td>{{ item.ANALYZE_USER }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业实施时间</td>
|
||||
<td colspan="9">{{ info.WORK_START_DATE }}至{{ info.WORK_END_DATE }}止</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="10">
|
||||
<table class="table-ui">
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业人</td>
|
||||
<td>{{ info.WORKER }}</td>
|
||||
<td class="bbg-transparent">监护人</td>
|
||||
<td>{{ info.GUARDIAN }}</td>
|
||||
<td>序号</td>
|
||||
<td>安全措施</td>
|
||||
<td style="width: 100px">是否涉及</td>
|
||||
<td style="width: 100px">确认人</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业时间</td>
|
||||
<td colspan="3">
|
||||
自 {{ formatDate(info.WORK_START_DATE, 'YYYY年MM月DD日HH时mm分') }} 至
|
||||
{{ formatDate(info.WORK_END_DATE, 'YYYY年MM月DD日HH时mm分') }} 止
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td :rowspan="gasList.length+1" align="center"> 采样分析</td>
|
||||
<td align="center">分析项目</td>
|
||||
<td align="center">有毒有害物质</td>
|
||||
<td align="center">可燃气</td>
|
||||
<td align="center">含氧量</td>
|
||||
<td align="center">取样时间</td>
|
||||
<td align="center">取样部位</td>
|
||||
<td align="center">分析人</td>
|
||||
</tr>
|
||||
<template v-if="gasList.length > 0 ">
|
||||
<tr v-for="(item,index) in gasList" :key="item.CONFINEDSPACEGAS_ID">
|
||||
<td v-if="index==0" :rowspan="gasList.length">采样分析</td>
|
||||
<td>{{ item.HARMFUL_MATERIALS }}</td>
|
||||
<td>{{ item.COMBUSTIBLE_GAS }}</td>
|
||||
<td>{{ item.OXYGEN_CONTENT }}</td>
|
||||
<td>{{ item.ANALYZE_TIME }}</td>
|
||||
<td>{{ item.ANALYZE_PLACE }}</td>
|
||||
<td>{{ item.ANALYZE_USER }}</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else>
|
||||
<td colspan="8" class="bbg-transparent">暂无数据</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td style="width:80px">序号</td>
|
||||
<td>主要安全措施</td>
|
||||
<td style="width: 80px">是否合格</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in measuresList" :key="item.BUS_CONFINEDSPACE_MEASURES_ID" class="bbg-transparent">
|
||||
<tr v-for="(item,index) in measuresList" :key="index">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td>
|
||||
{{ index + 1 }}
|
||||
{{ item.PROTECTIVE_MEASURES }}
|
||||
</td>
|
||||
<td>
|
||||
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉 及</span>
|
||||
<span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
|
||||
</td>
|
||||
<td>
|
||||
{{ item.CONFIRM_NAME }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="info.CONFIRM_USER_MEASURES || info.APPROVE_USER_MEASURES" >
|
||||
<td >{{ measuresList.length + 1 }}</td>
|
||||
<td colspan="3">
|
||||
<div v-if="info.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
|
||||
<span>其他安全措施：{{ info.CONFIRM_USER_MEASURES }}</span>
|
||||
<span>编制人：{{ info.CONFIRM_USER_NAME }}</span>
|
||||
</div>
|
||||
<div v-if="info.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;">
|
||||
<span>其他安全措施：{{ info.APPROVE_USER_MEASURES }}</span>
|
||||
<span>编制人：{{ info.APPROVE_USER_NAME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>{{ item.PROTECTIVE_MEASURES }}</td>
|
||||
<td v-if="item.STATUS == 1">合格</td>
|
||||
<td v-else-if="item.STATUS == 0">不合格</td>
|
||||
<td v-else/>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr v-if="oldHazardIdentification.length > 0">
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td>危害因素辨识</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in oldHazardIdentification" :key="index">
|
||||
<td v-if="item">{{ item }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<tr>
|
||||
<td class="bbg-transparent">安全交底人</td>
|
||||
<td colspan="10">
|
||||
<div v-if="info.CONFESS_USER_SIGNER_PATH" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.CONFESS_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">接受交底人</td>
|
||||
<td colspan="10">
|
||||
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="info.CONFIRM_USER_SIGNER_PATH">
|
||||
<td colspan="10">
|
||||
<div>作业负责人意见：{{ info.CONFIRM_CONTENT }}</div>
|
||||
<div style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.CONFIRM_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr v-if="oldWorkSafetyMeasures.length > 0">
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td>作业安全措施</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in oldWorkSafetyMeasures" :key="index">
|
||||
<td v-if="item">{{ item }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>作业单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.WORK_UNIT_MANAGER_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.WORK_UNIT_MANAGER_IMG" :src="config.fileUrl+info.WORK_UNIT_MANAGER_IMG">
|
||||
</span>
|
||||
<span v-if="info.WORK_UNIT_MANAGER_TIME">{{
|
||||
formatDate(info.WORK_UNIT_MANAGER_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
<tr v-if="info.APPROVE_USER_SIGNER_PATH">
|
||||
<td colspan="10">
|
||||
<div>所在单位意见：{{ info.APPROVE_CONTENT }}</div>
|
||||
<div style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.APPROVE_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>作业现场负责人意见：</span>
|
||||
<span>
|
||||
{{ info.JOB_SITE_MANAGER_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.JOB_SITE_MANAGER_IMG" :src="config.fileUrl+info.JOB_SITE_MANAGER_IMG">
|
||||
</span>
|
||||
<span v-if="info.JOB_SITE_MANAGER_TIME">{{
|
||||
formatDate(info.JOB_SITE_MANAGER_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
<tr v-if="imgList1.length>0">
|
||||
<td colspan="10">
|
||||
<div>完工验收：{{ info.ACCEPT_CONTENT }}</div>
|
||||
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>管理单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.MANAGEMENT_UNIT_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.MANAGEMENT_UNIT_IMG" :src="config.fileUrl+info.MANAGEMENT_UNIT_IMG">
|
||||
</span>
|
||||
<span v-if="info.MANAGEMENT_UNIT_TIME">{{
|
||||
formatDate(info.MANAGEMENT_UNIT_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>完工验收作业单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.COMPLETION_ACCEPTANCE_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.COMPLETION_ACCEPTANCE_IMG" :src="config.fileUrl+info.COMPLETION_ACCEPTANCE_IMG">
|
||||
</span>
|
||||
<span v-if="info.COMPLETION_ACCEPTANCE_TIME">{{
|
||||
formatDate(info.COMPLETION_ACCEPTANCE_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<!--<tr>
|
||||
<td colspan="4">
|
||||
<div><span>完工验收管理单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.COMPLETION_ACCEPTANCE_MANAGEMENT_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img
|
||||
v-if="info.COMPLETION_ACCEPTANCE_MANAGEMENT_OPINION_IMG"
|
||||
:src="config.fileUrl+info.COMPLETION_ACCEPTANCE_MANAGEMENT_OPINION_IMG">
|
||||
</span>
|
||||
<span v-if="info.COMPLETION_ACCEPTANCE_MANAGEMENT_TIME">{{
|
||||
formatDate(info.COMPLETION_ACCEPTANCE_MANAGEMENT_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>-->
|
||||
</table>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -249,7 +209,11 @@ export default {
|
|||
measuresList: [],
|
||||
gasList: [],
|
||||
oldHazardIdentification: [],
|
||||
oldWorkSafetyMeasures: []
|
||||
oldWorkSafetyMeasures: [],
|
||||
imgList: [],
|
||||
imgList1: [],
|
||||
gas: {},
|
||||
otherProtectiveMeasures: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -266,7 +230,7 @@ export default {
|
|||
},
|
||||
getData() {
|
||||
requestFN(
|
||||
'/map/Eight/getById',
|
||||
'/map/Eight/getByIdOrder',
|
||||
{
|
||||
id: this.id,
|
||||
TYPE: this.type,
|
||||
|
|
@ -275,15 +239,30 @@ export default {
|
|||
).then((data) => {
|
||||
this.listLoading = false
|
||||
this.info = data.pd
|
||||
this.measuresList = data.measuresList || []
|
||||
this.gasList = data.gasList || []
|
||||
|
||||
if (this.info.HARM) {
|
||||
this.oldHazardIdentification = this.info.HARM.split('$$$')
|
||||
}
|
||||
if (this.info.SAFTETY) {
|
||||
this.oldWorkSafetyMeasures = this.info.SAFTETY.split('$$$')
|
||||
this.imgList = data.imgList
|
||||
this.imgList1 = data.imgList1
|
||||
for (let i = 0; i < data.measuresList.length; i++) {
|
||||
// 将字符串转成数组
|
||||
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
|
||||
for (let j = 1; j <= 3; j++) {
|
||||
// 判断字符串是否存在
|
||||
if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
|
||||
// 给字符串后面添加上需要的数据
|
||||
PROTECTIVE_MEASURES.splice(
|
||||
this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
|
||||
0,
|
||||
data.measuresList[i]['ANSWER' + j]
|
||||
)
|
||||
}
|
||||
}
|
||||
// 将数组转回字符串
|
||||
data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
|
||||
}
|
||||
this.measuresList = data.measuresList // 参数map
|
||||
this.gasList = data.gasList // 参数map
|
||||
this.gas = data.gas || {} // 参数map
|
||||
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
|
||||
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
|
||||
}).catch((e) => {
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,23 +18,21 @@
|
|||
<!--秦港一公司 边界入侵 详细页面 start-->
|
||||
<video-play-bianjieruqin v-if="type === 'bianjieruqin'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--秦港一公司 边界入侵 详细页面 end-->
|
||||
<!--秦港一公司 八项作业 详细页面 start-->
|
||||
<!--秦港一公司 动火作业 详细页面 start-->
|
||||
<hotworkFirst v-if="type === 'HOTWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6' " :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--秦港一公司 动火作业 详细页面 end-->
|
||||
<!--其他公司 动火作业 详细页面 start-->
|
||||
<hotwork v-if="type === 'HOTWORK'&& corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--其他公司 动火作业 详细页面 end-->
|
||||
<!--其他七项作业共用一个详细页面 start-->
|
||||
<confinedspace v-if="type === 'CONFINEDSPACE' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<electricity v-if="type === 'ELECTRICITY' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<highwork v-if="type === 'HIGHWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<hoisting v-if="type === 'HOISTING' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<blindboard v-if="type === 'BLINDBOARD' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--秦港一公司 八项作业 详细页面 end-->
|
||||
<!--其他公司 八项作业 详细页面 start--> <!-- 有限空间 动火 复用一公司-->
|
||||
<electricityOrder v-if="type === 'ELECTRICITY' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<highworkOrder v-if="type === 'HIGHWORK' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<hoistingOrder v-if="type === 'HOISTING' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<blindboardOrder v-if="type === 'BLINDBOARD' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<cutroadOrder v-if="type === 'CUTROAD' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<breakgroundOrder v-if="type === 'BREAKGROUND' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--其他公司 八项作业 详细页面 start-->
|
||||
<electricityOrder v-if="type === 'ELECTRICITY' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<highworkOrder v-if="type === 'HIGHWORK' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<hoistingOrder v-if="type === 'HOISTING' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<blindboardOrder v-if="type === 'BLINDBOARD' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<cutroadOrder v-if="type === 'CUTROAD' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<breakgroundOrder v-if="type === 'BREAKGROUND' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--其他七项作业共用一个详细页面 end-->
|
||||
<!--曹妃甸东 八项作业 曹实业详细页面 start-->
|
||||
<hotworkCfdD v-if="type === 'HOTWORK'&& corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
|
||||
<confinedspaceCfdD v-if="type === 'CONFINEDSPACE' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
|
||||
|
|
@ -65,10 +63,6 @@ import weatherstation from './weatherstation.vue'
|
|||
import temperaturestation from './weatherstation.vue'
|
||||
import humiditystation from './weatherstation.vue'
|
||||
import windspeedstation from './weatherstation.vue'
|
||||
import electricity from './electricity.vue'
|
||||
import highwork from './highwork.vue'
|
||||
import hoisting from './hoisting.vue'
|
||||
import blindboard from './blindboard.vue'
|
||||
import XfControl from './xfControl.vue'
|
||||
import XfPoint from './xfPoint.vue'
|
||||
import MkGateMachine from './mkGateMachine.vue'
|
||||
|
|
@ -112,10 +106,6 @@ export default {
|
|||
temperaturestation,
|
||||
humiditystation,
|
||||
windspeedstation,
|
||||
electricity,
|
||||
highwork,
|
||||
hoisting,
|
||||
blindboard,
|
||||
electricityOrder,
|
||||
highworkOrder,
|
||||
cutroadOrder,
|
||||
|
|
|
|||
|
|
@ -76,6 +76,10 @@
|
|||
<span v-if="pd.STATE == -2">结束申请中</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">具体位置</td>
|
||||
<td colspan="3">{{ pd.LOCATION }}</td>
|
||||
</tr>
|
||||
<tr v-for="(item, index) in file9" :key="index">
|
||||
<td class="bbg-transparent">安全管理协议{{ index + 1 }}</td>
|
||||
<td colspan="2">{{ item.FILE_NAME }}</td>
|
||||
|
|
|
|||
|
|
@ -686,26 +686,6 @@ export default {
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
img: require('../../assets/map/gangkou_index/img11.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/img11_on.png'),
|
||||
label: '边界入侵',
|
||||
containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
|
||||
eliminateAuthorization: [],
|
||||
pointUrl: '/map/mapPlatformelectronic/listAllLocation',
|
||||
list: [
|
||||
{
|
||||
label: '摄像头',
|
||||
dialog_width: '1200px',
|
||||
check: false,
|
||||
type: 'bianjieruqin',
|
||||
img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
|
||||
containAuthorization: [],
|
||||
eliminateAuthorization: []
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
img: require('../../assets/map/gangkou_index/img12.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/img12_on.png'),
|
||||
|
|
@ -736,6 +716,26 @@ export default {
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
img: require('../../assets/map/gangkou_index/img11.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/img11_on.png'),
|
||||
label: '边界入侵',
|
||||
containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
|
||||
eliminateAuthorization: [],
|
||||
pointUrl: '/map/mapPlatformelectronic/listAllLocation',
|
||||
list: [
|
||||
{
|
||||
label: '摄像头',
|
||||
dialog_width: '1200px',
|
||||
check: false,
|
||||
type: 'bianjieruqin',
|
||||
img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
|
||||
containAuthorization: [],
|
||||
eliminateAuthorization: []
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
img: require('../../assets/map/gangkou_index/img9.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/img9_on.png'),
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ const cfd_img1_0_3 = require('../../../assets/map/gangkou_index/point/icon29.png
|
|||
|
||||
const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
|
||||
|
||||
const img6_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
|
||||
const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
|
||||
const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png')
|
||||
|
||||
const img7_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
|
||||
const img7_1 = require('../../../assets/map/gangkou_index/point/ico31.png')
|
||||
const img7_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
|
||||
|
||||
const img8_0 = require('../../../assets/map/gangkou_index/point/ico23.png')
|
||||
const img8_1 = require('../../../assets/map/gangkou_index/point/ico24.png')
|
||||
|
|
@ -58,8 +58,8 @@ const imgMap = {
|
|||
cfd_img3_0, img3_0, img3_1,
|
||||
img4_0, img4_0_1, img4_0_2, img4_0_3, img4_1,
|
||||
img5_0,
|
||||
img6_0,
|
||||
img7_0, img7_1,
|
||||
img6_0, img6_1,
|
||||
img7_0,
|
||||
img8_0, img8_1, img8_2, img8_3,
|
||||
cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue