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

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

# Conflicts:
#	src/views/dangerousWork/limitspace/components/detail.vue
#	src/views/dangerousWork/limitspace/components/list.vue
pet-人员中台对接-xuyifeng-7.24
guoyuepeng 2024-06-27 19:29:31 +08:00
parent 117daa34d0 3b4803ee19
commit 50dcd9c4be
18 changed files with 1029 additions and 960 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/dangerousWork/blindboard/components/detail.vue
View File

@ -7,7 +7,7 @@
<tr>
<td colspan="6" style="border: none">
<div class="level-title mt-20">
<h1>断路安全作业票</h1>
<h1>盲板作业票</h1>
<div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
</div>
</td>

2
src/views/dangerousWork/breakground/components/detail.vue
View File

@ -7,7 +7,7 @@
<tr>
<td colspan="6" style="border: none">
<div class="level-title mt-20">
<h1>断路安全作业票</h1>
<h1>动土安全作业票</h1>
<div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
</div>
</td>

17
src/views/dangerousWork/breakground/components/list.vue
View File

@ -258,22 +258,7 @@ export default {
this.listLoading = false
})
},
// 判断按钮权限，用于是否显示按钮
hasButton() {
var keys = 'cutroad:add,cutroad:del,cutroad:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.cutroadfhadminadd // 新增权限
this.del = data.cutroadfhadmindel // 删除权限
this.edit = data.cutroadfhadminedit // 修改权限
}).catch((e) => {
this.listLoading = false
})
},
goChart(row) {
this.pd = row
this.dialogFormShow = true

10
src/views/dangerousWork/lectricity/components/corpInfo.vue → src/views/dangerousWork/electricity/components/corpInfo.vue
View File

@ -33,22 +33,22 @@
<el-table-column prop="CORP_NAME" label="公司名称" />
<el-table-column prop="checkedCount" label="申请总数" align="center" >
<template slot-scope="{row}">
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
</template>
</el-table-column>
<el-table-column prop="checkedItemCount" label="完成数" align="center" >
<template slot-scope="{row}">
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
</template>
</el-table-column>
<el-table-column prop="ybCount" label="废除数" align="center" >
<template slot-scope="{row}">
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
</template>
</el-table-column>
<el-table-column prop="zdCount" label="进行数" align="center" >
<template slot-scope="{row}">
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
</template>
</el-table-column>
</el-table>
@ -108,7 +108,7 @@ export default {
return new Promise((resolve) => {
this.listLoading = true
requestFN(
'/dangerousWork/gfcutroad/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/dangerousWork/gfElectricity/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
KEYWORDS: this.KEYWORDS

269
src/views/dangerousWork/electricity/components/detail.vue Normal file
View File

@ -0,0 +1,269 @@
<template>
<div>
<div id="printTest" class="app-container print-work">
<div class="level-title">
<h1>临时用电作业许可证</h1>
<div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
</div>
<table class="table-ui">
<tr>
<td class="bbg">申请单位</td>
<td colspan="2">{{ pd.APPLY_DEPARTMENT_NAME }}</td>
<td class="bbg">作业申请时间</td>
<td colspan="2">{{ pd.CREATTIME }}</td>
</tr>
<tr>
<td class="bbg">作业地点</td>
<td colspan="2">{{ pd.WORK_PLACE }}</td>
<td class="bbg">作业内容</td>
<td colspan="2">{{ pd.WORK_CONTENT }}</td>
</tr>
<tr>
<td class="bbg">电源接入点及许可用电功率</td>
<td colspan="2">{{ pd.ALLOW_POWER }}</td>
<td class="bbg">工作电压</td>
<td colspan="2">{{ pd.WORK_VOLTAGE }}</td>
</tr>
<tr>
<td class="bbg">用电设备名称及额定功率</td>
<td>{{ pd.RATED_POWER }}</td>
<td class="bbg">监护人</td>
<td>
<div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
</div>
</td>
<td class="bbg">用电人</td>
<td>{{ pd.ELECTRICITY_USER }}</td>
</tr>
<tr>
<td class="bbg">作业人</td>
<td colspan="2">{{ pd.WORK_USER }}</td>
<td class="bbg">电工证号</td>
<td colspan="2">{{ pd.CARD_NO }}</td>
</tr>
<tr>
<td class="bbg">作业负责人</td>
<td colspan="2">{{ pd.CONFIRM_USER_NAME }}</td>
<td class="bbg">电工证号</td>
<td colspan="2">{{ pd.LEADER_CARD_NO }}</td>
</tr>
<tr>
<td class="bbg">关联的其他特殊作业及安全作业票编号</td>
<td colspan="5">{{ pd.SPECIAL_WORK }}</td>
</tr>
<tr>
<td class="bbg">风险辨识结果</td>
<td colspan="5">{{ pd.RISK_IDENTIFICATION }}</td>
</tr>
<tr>
<td class="bbg" colspan="6">可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）</td>
</tr>
<template v-for="(item,index) in gasList">
<tr :key="index">
<td class="bbg">分析时间</td>
<td colspan="2">{{ item.ANALYZE_TIME }}</td>
<td class="bbg">分析点</td>
<td colspan="2">{{ item.ANALYZE_PLACE }}</td>
</tr>
<tr :key="index">
<td class="bbg">可燃气体检测结果</td>
<td colspan="2">{{ item.ANALYZE_RESULT }}</td>
<td class="bbg">分析人</td>
<td colspan="2">{{ item.ANALYZE_USER }}</td>
</tr>
</template>
<tr>
<td class="bbg">作业实施时间</td>
<td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
</tr>
<tr>
<td colspan="6">
<table class="table-ui">
<tr>
<td>序号</td>
<td>安全措施</td>
<td>是否涉及</td>
<td>确认人</td>
</tr>
<tr v-for="(item,index) in measuresList" :key="index">
<td>{{ index + 1 }}</td>
<td>{{ item.PROTECTIVE_MEASURES }}</td>
<td>
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
<span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
</td>
<td>
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
</div>
<div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
</div>
<div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="bbg">安全交底人</td>
<td colspan="10">
<div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td class="bbg">接受交底人</td>
<td colspan="10">
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer v-if="pd.CONFIRM_USER_SIGNER_PATH" :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONFIRM_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td colspan="6">
<div>用电单位意见：{{ pd.AUDIT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer v-if="pd.AUDIT_USER_SIGNER_PATH" :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td colspan="6">
<div>配送电单位意见：{{ pd.APPROVE_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer v-if="pd.APPROVE_USER_SIGNER_PATH" :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td colspan="6">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer v-if="pd.ACCEPT_USER_SIGNER_PATH" :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
</table>
</div>
<div class="ui-height" />
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
import { requestFN } from '@/utils/request'
import dateformat from '@/utils/dateformat'
export default {
data() {
return {
config: config,
ELECTRICITY_ID: this.$parent.ELECTRICITY_ID, // 主键ID
pd: [], // 存放字段参数
measuresList: [],
gasList: [],
otherProtectiveMeasures: []
}
},
created() {
this.getData()
},
methods: {
validStr(str) {
if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
return false
},
formatTime(date, column) {
if (date) {
return dateformat(date, 'YYYY年MM月DD日HH时mm分')
} else {
return ''
}
},
formatDate(date, column) {
if (date) {
return dateformat(date, 'YYYY-MM-DD')
} else {
return ''
}
},
getRowKey(row) {
return row.ELECTRICITY_ID
},
getData() {
this.listLoading = true
requestFN(
'/dangerousWork/gfElectricity/goEdit',
{
ELECTRICITY_ID: this.ELECTRICITY_ID
}
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map
this.otherProtectiveMeasures = this.validStr(this.pd.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
}).catch((e) => {
this.listLoading = false
})
},
goBack() {
this.$parent.activeName = 'List'
}
}
}
</script>
<style lang="sass" scoped>
.print-approval-p10
padding: 20px 0
span
vertical-align: middle
.print-approval-img
width: 200px
height: 97px
display: inline-block
img
width: 100%
height: 100%
</style>

191
src/views/dangerousWork/lectricity/components/list.vue → src/views/dangerousWork/electricity/components/list.vue
View File

@ -27,58 +27,46 @@
</el-row>
</el-form>
<el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
<el-table-column :reserve-selection="true" type="selection" width="57" align="center" />
<el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
<el-table-column prop="APPLY_USER_NAME" label="填写人" />
<el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip />
<el-table-column prop="PRODUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
<template slot-scope="{row}">
{{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.LEADER_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
<el-table-column prop="CHECK_NO" label="编号" />
<el-table-column prop="APPLY_USER_NAME" label="申请人" />
<el-table-column prop="ANALYZE_USER_NAME" label="分析人" />
<el-table-column prop="CONFIRM_USER_NAME" label="作业单位负责人" />
<el-table-column prop="AUDIT_USER_NAME" label="用电单位负责人" />
<el-table-column prop="APPROVE_USER_NAME" label="配送电单位负责人" />
<el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" />
<el-table-column prop="STATUS" label="审核状态">
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">断路安全作业待提交</span>
<span v-if="row.APPLY_STATUS==0">临时用电作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==2">所在单位待审核</span>
<span v-else-if="row.APPLY_STATUS==3">消防、安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==4">审批部门待审核</span>
<span v-else-if="row.APPLY_STATUS==5">待验收</span>
<span v-else-if="row.APPLY_STATUS==6">验收归档</span>
<span v-else-if="row.APPLY_STATUS==2">用电单位待审核</span>
<span v-else-if="row.APPLY_STATUS==3">配送电单位待审核</span>
<span v-else-if="row.APPLY_STATUS==4">待验收</span>
<span v-else-if="row.APPLY_STATUS==5">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-3">所在单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">消防、安全管理部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">审批部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
<span v-else-if="row.APPLY_STATUS==-3">用电单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">配送电单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">验收打回</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="230">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-plus" @click="goChart(row)">流程图</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.CUTROAD_ID)">审批表详情</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.ELECTRICITY_ID)">审批表详情</el-button>
</template>
</el-table-column>
</el-table>
<div class="page-btn-group">
<div>
<!-- <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>-->
<!-- <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>-->
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1400px">
<el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
<el-step title="断路安全作业提交">
<el-step title="临时用电作业提交">
<template slot="description">
<div>{{ getProcessMessage().title }}</div>
<div>{{ getProcessMessage().USER_NAME }}</div>
@ -87,85 +75,40 @@
</el-step>
<el-step title="作业负责人意见">
<template slot="description">
<div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
<div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
<div>{{ pd.CONFIRM_USER_NAME }}</div>
<div>{{ pd.CONFIRM_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="所在单位意见">
<el-step title="用电单位意见">
<template slot="description">
<div v-if="getIsPase('PRODUCTION_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.PRODUCTION_USER_NAME }}</div>
<div>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</div>
<div>{{ pd.AUDIT_USER_NAME }}</div>
<div>{{ pd.AUDIT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="消防、安全管理部门意见" >
<el-step title="配送电单位意见">
<template slot="description">
<div v-if="getIsPase('SAFETY_DEPARTMENT_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.SAFETY_USER_NAME }}</div>
<div>{{ pd.SAFETY_USER_SIGNER_TIME }}</div>
<div>{{ pd.APPROVE_USER_NAME }}</div>
<div>{{ pd.APPROVE_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="审批部门意见" >
<template slot="description">
<div v-if="getIsPase('LEADER_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.LEADER_USER_NAME }}</div>
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="完成验收" description="">
<el-step title="完成验收">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="验收归档" description="">
<el-step title="验收归档">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
</el-steps>
<div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
<div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: #13ce66">
监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: red">
监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.CONFESS_USER_SIGNER_TIME">
<div style="color: red">
安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: red">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<!-- <el-button @click="dialogFormShow = false">取 消</el-button>-->
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
@ -204,18 +147,16 @@ export default {
dialogFormHuifuShow: false,
statusList: [
{ ID: '', NAME: '请选择' },
{ ID: '0', NAME: '断路安全作业待提交' },
{ ID: '0', NAME: '临时用电作业待提交' },
{ ID: '1', NAME: '作业负责人待审核' },
{ ID: '2', NAME: '所在单位待审核' },
{ ID: '3', NAME: '消防、安全管理部门待审核' },
{ ID: '4', NAME: '审批部门待审核' },
{ ID: '5', NAME: '待验收' },
{ ID: '6', NAME: '验收归档' },
{ ID: '2', NAME: '用电单位待审核' },
{ ID: '3', NAME: '配送电单位待审核' },
{ ID: '4', NAME: '待验收' },
{ ID: '5', NAME: '验收归档' },
{ ID: '-2', NAME: '作业负责人审核打回' },
{ ID: '-3', NAME: '所在单位审核打回' },
{ ID: '-4', NAME: '消防、安全管理部门审核打回' },
{ ID: '-5', NAME: '审批部门审核打回' },
{ ID: '-6', NAME: '验收打回' }
{ ID: '-3', NAME: '用电单位审核打回' },
{ ID: '-4', NAME: '配送电单位审核打回' },
{ ID: '-5', NAME: '验收打回' }
],
STATUS: '',
DEPTIDS: ''
@ -226,7 +167,7 @@ export default {
},
methods: {
getRowKey(row) {
return row.CUTROAD_ID
return row.ELECTRICITY_ID
},
// 搜索
getQuery() {
@ -242,17 +183,32 @@ export default {
getList() {
this.listLoading = true
requestFN(
'/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/dangerousWork/gfElectricity/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
}
).then((data) => {
this.listLoading = false
this.varList = data.varList
this.total = data.page.totalResult
this.hasButton()
}).catch((e) => {
this.listLoading = false
})
},
// 判断按钮权限，用于是否显示按钮
hasButton() {
var keys = 'electricity:add,electricity:del,electricity:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.electricityfhadminadd // 新增权限
this.del = data.electricityfhadmindel // 删除权限
this.edit = data.electricityfhadminedit // 修改权限
}).catch((e) => {
this.listLoading = false
})
@ -278,10 +234,7 @@ export default {
return 4
}
if (this.pd.APPLY_STATUS == '5') {
return 5
}
if (this.pd.APPLY_STATUS == '6') {
return 7
return 6
}
},
getProcessStatus() {
@ -303,32 +256,25 @@ export default {
if (this.pd.APPLY_STATUS == '-2') {
obj = {
title: '作业负责人审核打回',
USER_NAME: this.pd.CONSTRUCTION_USER_NAME,
USER_NAME: this.pd.CONFIRM_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-3') {
obj = {
title: '所在单位审核打回',
USER_NAME: this.pd.PRODUCTION_USER_NAME,
title: '用电单位审核打回',
USER_NAME: this.pd.AUDIT_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-4') {
obj = {
title: '消防、安全管理部门审核打回',
USER_NAME: this.pd.SAFETY_USER_NAME,
title: '配送电单位审核打回',
USER_NAME: this.pd.APPROVE_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-5') {
obj = {
title: '审批部门审核打回',
USER_NAME: this.pd.LEADER_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-6') {
obj = {
title: '验收打回',
AUSER_NAME: this.pd.ACCEPT_USER_NAME,
@ -342,16 +288,9 @@ export default {
return '已跳过'
}
},
goBack(){
this.$parent.activeName = 'CorpInfo'
this.$parent.CORPINFO_ID = ''
this.$parent.ticketType = ''
this.$parent.CUTROAD_ID =''
},
goDetail(id) {
console.info(id)
this.$parent.activeName = 'Detail'
this.$parent.CUTROAD_ID = id
this.$parent.ELECTRICITY_ID = id
}
}
}

21
src/views/dangerousWork/lectricity/index.vue → src/views/dangerousWork/electricity/index.vue
View File

@ -1,23 +1,32 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
<circuitList v-if="activeName=='circuit_list'"/>
<List v-show="activeName=='electricity_list'" />
<Detail v-if="activeName=='Detail'"/>
</div>
</template>
<script>
import CorpInfo from './components/corpInfo'
import circuitList from './components/list'
import List from './components/list'
import Detail from './components/detail'
export default {
components: { CorpInfo, circuitList,Detail },
components: { CorpInfo, List, Detail },
data() {
return {
activeName: 'CorpInfo',
CORPINFO_ID: '',
ticketType: '',
CUTROAD_ID: ''
ELECTRICITY_ID: ''
}
},
watch: {
activeName(val) {
if (val == 'List') {
this.$refs.list.getQuery()
}
}
}
}
</script>
<style scoped>
</style>

10
src/views/dangerousWork/highwork/components/corpInfo.vue
View File

@ -33,22 +33,22 @@
<el-table-column prop="CORP_NAME" label="公司名称" />
<el-table-column prop="checkedCount" label="申请总数" align="center" >
<template slot-scope="{row}">
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
</template>
</el-table-column>
<el-table-column prop="checkedItemCount" label="完成数" align="center" >
<template slot-scope="{row}">
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
</template>
</el-table-column>
<el-table-column prop="ybCount" label="废除数" align="center" >
<template slot-scope="{row}">
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
</template>
</el-table-column>
<el-table-column prop="zdCount" label="进行数" align="center" >
<template slot-scope="{row}">
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
</template>
</el-table-column>
</el-table>
@ -108,7 +108,7 @@ export default {
return new Promise((resolve) => {
this.listLoading = true
requestFN(
'/gfHighWork/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/dangerousWork/gfHighWork/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
KEYWORDS: this.KEYWORDS

195
src/views/dangerousWork/highwork/components/detail.vue
View File

@ -4,26 +4,41 @@
<el-page-header content="审批表详情" class="no-print" @back="goBack"/>
<table class="table-ui">
<thead>
<tr>
<td colspan="6" style="border: none">
<div class="level-title mt-20">
<h1>断路安全作业票</h1>
<div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
</div>
</td>
</tr>
<tr>
<td colspan="4" style="border: none">
<div class="level-title mt-20">
<h1>高处安全作业票</h1>
<div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
</div>
</td>
</tr>
</thead>
<tr>
<td class="bbg">申请单位</td>
<td class="bbg">作业申请单位</td>
<td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
<td class="bbg">作业单位</td>
<td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">作业负责人</td>
<td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
<td class="bbg">作业申请时间</td>
<td>{{ pd.CREATTIME }}</td>
</tr>
<tr>
<td class="bbg">涉及相关单位（部门）</td>
<td colspan="3">{{ pd.OTHER_DEPT }}</td>
<td class="bbg">作业地点</td>
<td>{{ pd.WORK_PLACE }}</td>
<td class="bbg">作业内容</td>
<td>{{ pd.WORK_CONTENT }}</td>
</tr>
<tr>
<td class="bbg">作业高度</td>
<td>{{ pd.WORK_HIGH }}</td>
<td class="bbg">高处作业级别</td>
<td>
{{ pd.WORK_LEVEL == '1' ? 'I级高处作业' : '' }}
{{ pd.WORK_LEVEL == '2' ? 'II级高处作业' : '' }}
{{ pd.WORK_LEVEL == '3' ? 'III级高处作业' : '' }}
{{ pd.WORK_LEVEL == '4' ? 'IV级高处作业' : '' }}
</td>
</tr>
<tr>
<td class="bbg">作业单位</td>
<td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">监护人</td>
<td>
<div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
@ -34,36 +49,25 @@
</td>
</tr>
<tr>
<td class="bbg">断路原因</td>
<td colspan="5">{{ pd.WORK_REASON }}</td>
<td class="bbg">作业人</td>
<td>{{ pd.PROJECT_MANAGER }}</td>
<td class="bbg">作业负责人</td>
<td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
</tr>
<tr>
<td class="bbg">关联的其他特殊作业及安全作业票编号</td>
<td colspan="5">{{ pd.SPECIAL_WORK }}</td>
</tr>
<tr>
<td colspan="6">
<div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
<div style="display: flex;justify-content: space-between;margin-top: 20px;">
<img v-viewer :src="config.fileUrl + pd.CONTENT_IMG_PATH" alt="" width="100" height="100">
<div>
编制人：
<img v-viewer :src="config.fileUrl + pd.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
{{ pd.APPLY_USER_SIGNER_TIME }}
</div>
</div>
</td>
<td colspan="3">{{ pd.SPECIAL_WORK }}</td>
</tr>
<tr>
<td class="bbg">风险辨识结果</td>
<td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
<td colspan="3">{{ pd.HAZARD_IDENTIFICATION }}</td>
</tr>
<tr>
<td class="bbg">作业实施时间</td>
<td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
<td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
</tr>
<tr>
<td colspan="6">
<td colspan="4">
<table class="table-ui">
<tr>
<td>序号</td>
@ -75,36 +79,32 @@
<td>{{ index + 1 }}</td>
<td>{{ item.PROTECTIVE_MEASURES }}</td>
<td>
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
<span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
</td>
<td>
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.PRODUCTION_USER_MEASURES || pd.SAFETY_USER_MEASURES || pd.LEADER_USER_MEASURES ">
<tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES ">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.APPLY_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPLY_USER_NAME }}</span>
</div>
<div v-if="pd.CONSTRUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }}</span>
<div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONSTRUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.PRODUCTION_USER_ID && pd.PRODUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }}</span>
<span>编制人：{{ pd.PRODUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.SAFETY_USER_ID && pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.SAFETY_USER_MEASURES }}</span>
<span>编制人：{{ pd.SAFETY_USER_NAME }}</span>
</div>
<div v-if="pd.LEADER_USER_ID && pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<div v-if="pd.LEADER_USER_ID && pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
</div>
<div v-if="pd.AUDIT_USER_ID && pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
</div>
<div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
</div>
</td>
</tr>
</table>
@ -123,15 +123,15 @@
<tr>
<td class="bbg">接受交底人</td>
<td colspan="10">
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" 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>
<img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
<td colspan="6">
<td colspan="4">
<div>作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
@ -140,29 +140,9 @@
</div>
</td>
</tr>
<tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.PRODUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.PRODUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.SAFETY_USER_SIGNER_PATH">
<td colspan="6">
<div>消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.SAFETY_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>审批部门意见：{{ pd.LEADER_CONTENT }}</div>
<td colspan="4">
<div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -170,19 +150,39 @@
</div>
</td>
</tr>
<tr v-if="imgList1.length>0">
<td colspan="10">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="4">
<div>审核部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div 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>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="4">
<div>审批部门意见：{{ pd.APPROVE_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.ACCEPT_USER_SIGNER_PATH">
<td colspan="4">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
</table>
</div>
<div style="padding-top: 100px"/>
<!-- <div class="ui-height" />-->
<div class="ui-foot">
<el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
</div>
@ -196,12 +196,10 @@ export default {
data() {
return {
config: config,
CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
HIGHWORK_ID: this.$parent.HIGHWORK_ID, // 主键ID
pd: [], // 存放字段参数
measuresList: [],
otherProtectiveMeasures: [],
imgList: [],
imgList1: [],
hazardIdentification: []
}
},
@ -228,32 +226,29 @@ export default {
}
},
getRowKey(row) {
return row.CUTROAD_ID
return row.HIGHWORK_ID
},
getData() {
this.listLoading = true
requestFN(
'/dangerousWork/gfcutroad/goEdit',
'/dangerousWork/gfHighWork/goEdit',
{
CUTROAD_ID: this.CUTROAD_ID
HIGHWORK_ID: this.HIGHWORK_ID
}
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map
this.imgList = data.imgList
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
this.pd.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.LEADER_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.AUDIT_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.APPROVE_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
}).catch((e) => {
this.listLoading = false
})
},
goBack() {
this.$parent.activeName = 'circuit_list'
this.$parent.CUTROAD_ID = ''
this.$parent.activeName = 'List'
}
}
@ -274,6 +269,6 @@ export default {
img
width: 100%
height: 100%
.level-code
margin-left: auto
.app-container
margin-bottom: 50px
</style>

156
src/views/dangerousWork/highwork/components/list.vue
View File

@ -27,39 +27,39 @@
</el-row>
</el-form>
<el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
<el-table-column :reserve-selection="true" type="selection" width="57" align="center" />
<el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
<el-table-column prop="APPLY_USER_NAME" label="填写人" />
<el-table-column prop="APPLY_USER" label="填写人" />
<el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip />
<el-table-column prop="PRODUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
<template slot-scope="{row}">
{{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
<el-table-column prop="LEADER_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.LEADER_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="AUDIT_USER_NAME" label="审核部门负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.AUDIT_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="APPROVE_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.APPROVE_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
<el-table-column prop="STATUS" label="审核状态">
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">断路安全作业待提交</span>
<span v-if="row.APPLY_STATUS==0">高处作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==2">所在单位待审核</span>
<span v-else-if="row.APPLY_STATUS==3">消防、安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==3">审核部门待审核</span>
<span v-else-if="row.APPLY_STATUS==4">审批部门待审核</span>
<span v-else-if="row.APPLY_STATUS==5">待验收</span>
<span v-else-if="row.APPLY_STATUS==6">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-3">所在单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">消防、安全管理部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">审核部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">审批部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
</template>
@ -67,51 +67,53 @@
<el-table-column label="操作" align="center" width="230">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-plus" @click="goChart(row)">流程图</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.CUTROAD_ID)">审批表详情</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HIGHWORK_ID)">审批表详情</el-button>
</template>
</el-table-column>
</el-table>
<div class="page-btn-group">
<div>
<!-- <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>-->
<!-- <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>-->
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1400px">
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1350px">
<el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
<el-step title="断路安全作业提交">
<el-step title="高处作业提交">
<template slot="description">
<div>{{ getProcessMessage().title }}</div>
<div>{{ getProcessMessage().USER_NAME }}</div>
<div>{{ getProcessMessage().OPERATTIME }}</div>
</template>
</el-step>
<el-step title="作业负责人意见">
<el-step title="作业负责人意见" description="">
<template slot="description">
<div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
<div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="所在单位意见">
<template slot="description">
<div v-if="getIsPase('PRODUCTION_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.PRODUCTION_USER_NAME }}</div>
<div>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="消防、安全管理部门意见" >
<template slot="description">
<div v-if="getIsPase('SAFETY_DEPARTMENT_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.SAFETY_USER_NAME }}</div>
<div>{{ pd.SAFETY_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="审批部门意见" >
<template slot="description">
<div v-if="getIsPase('LEADER_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.LEADER_USER_NAME }}</div>
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="审核部门意见" >
<template slot="description">
<div v-if="getIsPase('AUDIT_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.AUDIT_USER_NAME }}</div>
<div>{{ pd.AUDIT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step :description="getIsPase('APPROVE_USER_NAME')" title="审批部门意见" >
<template slot="description">
<div v-if="getIsPase('APPROVE_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.APPROVE_USER_NAME }}</div>
<div>{{ pd.APPROVE_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="完成验收" description="">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
@ -125,47 +127,11 @@
</template>
</el-step>
</el-steps>
<div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
<div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: #13ce66">
监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: red">
监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.CONFESS_USER_SIGNER_TIME">
<div style="color: red">
安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: red">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<!-- <el-button @click="dialogFormShow = false">取 消</el-button>-->
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
@ -204,16 +170,16 @@ export default {
dialogFormHuifuShow: false,
statusList: [
{ ID: '', NAME: '请选择' },
{ ID: '0', NAME: '断路安全作业待提交' },
{ ID: '0', NAME: '高处作业待提交' },
{ ID: '1', NAME: '作业负责人待审核' },
{ ID: '2', NAME: '所在单位待审核' },
{ ID: '3', NAME: '消防、安全管理部门待审核' },
{ ID: '3', NAME: '审核部门待审核' },
{ ID: '4', NAME: '审批部门待审核' },
{ ID: '5', NAME: '待验收' },
{ ID: '6', NAME: '验收归档' },
{ ID: '-2', NAME: '作业负责人审核打回' },
{ ID: '-3', NAME: '所在单位审核打回' },
{ ID: '-4', NAME: '消防、安全管理部门审核打回' },
{ ID: '-4', NAME: '审核部门审核打回' },
{ ID: '-5', NAME: '审批部门审核打回' },
{ ID: '-6', NAME: '验收打回' }
],
@ -226,7 +192,7 @@ export default {
},
methods: {
getRowKey(row) {
return row.CUTROAD_ID
return row.HIGHWORK_ID
},
// 搜索
getQuery() {
@ -242,17 +208,32 @@ export default {
getList() {
this.listLoading = true
requestFN(
'/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/dangerousWork/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
}
).then((data) => {
this.listLoading = false
this.varList = data.varList
this.total = data.page.totalResult
this.hasButton()
}).catch((e) => {
this.listLoading = false
})
},
// 判断按钮权限，用于是否显示按钮
hasButton() {
var keys = 'highwork:add,highwork:del,highwork:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.highworkfhadminadd // 新增权限
this.del = data.highworkfhadmindel // 删除权限
this.edit = data.highworkfhadminedit // 修改权限
}).catch((e) => {
this.listLoading = false
})
@ -296,7 +277,7 @@ export default {
if (this.pd.APPLY_STATUS >= '0') {
obj = {
title: '',
USER_NAME: this.pd.APPLY_USER_NAME,
USER_NAME: this.pd.APPLY_USER,
OPERATTIME: this.pd.CREATTIME
}
}
@ -310,21 +291,21 @@ export default {
if (this.pd.APPLY_STATUS == '-3') {
obj = {
title: '所在单位审核打回',
USER_NAME: this.pd.PRODUCTION_USER_NAME,
USER_NAME: this.pd.LEADER_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-4') {
obj = {
title: '消防、安全管理部门审核打回',
USER_NAME: this.pd.SAFETY_USER_NAME,
title: '审核部门审核打回',
USER_NAME: this.pd.AUDIT_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-5') {
obj = {
title: '审批部门审核打回',
USER_NAME: this.pd.LEADER_USER_NAME,
USER_NAME: this.pd.APPROVE_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
@ -342,16 +323,9 @@ export default {
return '已跳过'
}
},
goBack(){
this.$parent.activeName = 'CorpInfo'
this.$parent.CORPINFO_ID = ''
this.$parent.ticketType = ''
this.$parent.CUTROAD_ID =''
},
goDetail(id) {
console.info(id)
this.$parent.activeName = 'Detail'
this.$parent.CUTROAD_ID = id
this.$parent.HIGHWORK_ID = id
}
}
}

28
src/views/dangerousWork/highwork/index.vue
View File

@ -1,20 +1,32 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
<hotwork v-if="activeName=='hotwork'"/>
<CorpInfo v-show="activeName=='CorpInfo'" />
<List v-show="activeName=='highwork_list'" />
<Detail v-if="activeName=='Detail'"/>
</div>
</template>
<script>
import CorpInfo from './components/corpInfo'
import hotwork from './components/list'
import List from './components/list'
import Detail from './components/detail'
import CorpInfo from "./components/corpInfo";
export default {
components: { CorpInfo, hotwork },
components: {CorpInfo,List,Detail},
data() {
return {
activeName: 'CorpInfo',
CORPINFO_ID: '',
ticketType: ''
activeName: 'highwork_list',
HIGHWORK_ID: ''
}
},
watch: {
activeName(val) {
if (val == 'highwork_list') {
this.$refs.list.getQuery()
}
}
}
}
</script>
<style scoped>
</style>

10
src/views/dangerousWork/hoisting/components/corpInfo.vue
View File

@ -33,22 +33,22 @@
<el-table-column prop="CORP_NAME" label="公司名称" />
<el-table-column prop="checkedCount" label="申请总数" align="center" >
<template slot-scope="{row}">
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
</template>
</el-table-column>
<el-table-column prop="checkedItemCount" label="完成数" align="center" >
<template slot-scope="{row}">
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
</template>
</el-table-column>
<el-table-column prop="ybCount" label="废除数" align="center" >
<template slot-scope="{row}">
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
</template>
</el-table-column>
<el-table-column prop="zdCount" label="进行数" align="center" >
<template slot-scope="{row}">
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
</template>
</el-table-column>
</el-table>
@ -108,7 +108,7 @@ export default {
return new Promise((resolve) => {
this.listLoading = true
requestFN(
'/gfHoisting/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/dangerousWork/gfHoisting/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
KEYWORDS: this.KEYWORDS

246
src/views/dangerousWork/hoisting/components/detail.vue
View File

@ -7,23 +7,33 @@
<tr>
<td colspan="6" style="border: none">
<div class="level-title mt-20">
<h1>断路安全作业票</h1>
<div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
<h1>吊装安全作业票</h1>
<div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
</div>
</td>
</tr>
</thead>
<tr>
<td class="bbg">申请单位</td>
<td class="bbg">作业申请单位</td>
<td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
<td class="bbg">作业单位</td>
<td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">作业负责人</td>
<td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
<td>{{ pd.LEADER_DEPARTMENT_NAME }}</td>
<td class="bbg">作业申请时间</td>
<td>{{ pd.CREATTIME }}</td>
</tr>
<tr>
<td class="bbg">涉及相关单位（部门）</td>
<td colspan="3">{{ pd.OTHER_DEPT }}</td>
<td class="bbg">吊装地点</td>
<td>{{ pd.WORK_PLACE }}</td>
<td class="bbg">吊具名称</td>
<td>{{ pd.TOOL_NAME }}</td>
<td class="bbg">吊物内容</td>
<td>{{ pd.WORK_CONTENT }}</td>
</tr>
<tr>
<td class="bbg">吊装作业人</td>
<td>{{ pd.WORK_USER }}</td>
<td class="bbg">司索人</td>
<td>{{ pd.SISUO_USER }}</td>
<td class="bbg">监护人</td>
<td>
<div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
@ -34,29 +44,21 @@
</td>
</tr>
<tr>
<td class="bbg">断路原因</td>
<td colspan="5">{{ pd.WORK_REASON }}</td>
</tr>
<tr>
<td class="bbg">关联的其他特殊作业及安全作业票编号</td>
<td colspan="5">{{ pd.SPECIAL_WORK }}</td>
</tr>
<tr>
<td colspan="6">
<div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
<div style="display: flex;justify-content: space-between;margin-top: 20px;">
<img v-viewer :src="config.fileUrl + pd.CONTENT_IMG_PATH" alt="" width="100" height="100">
<div>
编制人：
<img v-viewer :src="config.fileUrl + pd.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
{{ pd.APPLY_USER_SIGNER_TIME }}
</div>
</div>
<td class="bbg">指挥人员</td>
<td>{{ pd.PROJECT_MANAGER }}</td>
<td class="bbg" colspan="2">吊物质量（t）及作业级别</td>
<td colspan="2">
<span>{{ pd.PART_WEIGHT }}t</span>
<span style="margin-left: 20px;">
{{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }}
{{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }}
{{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }}
</span>
</td>
</tr>
<tr>
<td class="bbg">风险辨识结果</td>
<td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
<td colspan="5">{{ pd.HAZARD_IDENTIFICATION }}</td>
</tr>
<tr>
<td class="bbg">作业实施时间</td>
@ -73,38 +75,36 @@
</tr>
<tr v-for="(item,index) in measuresList" :key="index">
<td>{{ index + 1 }}</td>
<td>{{ item.PROTECTIVE_MEASURES }}</td>
<td>{{ item.PROTECTIVE_MEASURES }}
</td>
<td>
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
<span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
</td>
<td>
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.PRODUCTION_USER_MEASURES || pd.SAFETY_USER_MEASURES || pd.LEADER_USER_MEASURES ">
<tr v-if="pd.LEADER_USER_MEASURES || pd.CONFIRM_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.APPLY_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPLY_USER_NAME }}</span>
</div>
<div v-if="pd.CONSTRUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONSTRUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.PRODUCTION_USER_ID && pd.PRODUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }}</span>
<span>编制人：{{ pd.PRODUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.SAFETY_USER_ID && pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.SAFETY_USER_MEASURES }}</span>
<span>编制人：{{ pd.SAFETY_USER_NAME }}</span>
</div>
<div v-if="pd.LEADER_USER_ID && pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
</div>
<div v-if="pd.CONSTRUCTION_USER_ID && pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONSTRUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.AUDIT_USER_ID && pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
</div>
<div v-if="pd.APPROVE_USER_ID && pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
</div>
</td>
</tr>
</table>
@ -123,46 +123,16 @@
<tr>
<td class="bbg">接受交底人</td>
<td colspan="10">
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" 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="pd.CONSTRUCTION_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONSTRUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.PRODUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.PRODUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.SAFETY_USER_SIGNER_PATH">
<td colspan="6">
<div>消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.SAFETY_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>审批部门意见：{{ pd.LEADER_CONTENT }}</div>
<div>作业指挥意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -170,20 +140,51 @@
</div>
</td>
</tr>
<tr v-if="imgList1.length>0">
<td colspan="10">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
<div 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>
<img v-viewer :src="config.fileUrl + pd.CONSTRUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="6">
<div>审核部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="6">
<div>审批部门意见：{{ pd.APPROVE_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.ACCEPT_USER_SIGNER_PATH">
<td colspan="6">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
</table>
</div>
<div style="padding-top: 100px"/>
<!-- <div class="ui-height" />-->
<div class="ui-foot">
<!-- <el-button v-print="'#printTest'" v-if="pd.APPLY_STATUS==4">打 印</el-button>-->
<el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
</div>
</div>
@ -196,21 +197,47 @@ export default {
data() {
return {
config: config,
CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
HOISTING_ID: this.$parent.HOISTING_ID, // 主键ID
pd: [], // 存放字段参数
measuresList: [],
otherProtectiveMeasures: [],
imgList: [],
imgList1: [],
hazardIdentification: []
otherProtectiveMeasures: []
}
},
created() {
this.getData()
},
methods: {
handleStr(measuresList) {
for (let i = 0; i < measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = 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,
measuresList[i]['ANSWER' + j]
)
}
}
// 将数组转回字符串
measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
}
return measuresList
},
findCharIndex(str, char, num) {
let index = str.indexOf(char)
for (let i = 0; i < num - 1; i++) {
index = str.indexOf(char, index + 1)
}
return index
},
validStr(str) {
if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) {
return true
}
return false
},
formatTime(date, column) {
@ -228,32 +255,29 @@ export default {
}
},
getRowKey(row) {
return row.CUTROAD_ID
return row.HOISTING_ID
},
getData() {
this.listLoading = true
requestFN(
'/dangerousWork/gfcutroad/goEdit',
'/dangerousWork/gfHoisting/goEdit',
{
CUTROAD_ID: this.CUTROAD_ID
HOISTING_ID: this.HOISTING_ID
}
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map
this.imgList = data.imgList
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
this.measuresList = this.handleStr(data.measuresList) // 参数map
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
}).catch((e) => {
this.listLoading = false
})
},
goBack() {
this.$parent.activeName = 'circuit_list'
this.$parent.CUTROAD_ID = ''
this.$parent.activeName = 'hoisting_list'
}
}
@ -263,17 +287,19 @@ export default {
<style lang="sass" scoped>
.print-approval-p10
padding: 20px 0
span
vertical-align: middle
.bbg
width: 270px
.print-approval-img
width: 200px
height: 97px
display: inline-block
img
width: 100%
height: 100%
.level-code
margin-left: auto
.app-container
margin-bottom: 50px
</style>

160
src/views/dangerousWork/hoisting/components/list.vue
View File

@ -27,39 +27,39 @@
</el-row>
</el-form>
<el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
<el-table-column :reserve-selection="true" type="selection" width="57" align="center" />
<el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
<el-table-column prop="APPLY_USER_NAME" label="填写人" />
<el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip />
<el-table-column prop="PRODUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
<el-table-column prop="LEADER_DEPARTMENT_NAME" label="作业单位" />
<el-table-column prop="LEADER_USER_NAME" label="作业指挥负责人" show-overflow-tooltip />
<el-table-column prop="CONSTRUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip>
<template slot-scope="{row}">
{{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
{{ row.CONSTRUCTION_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
<el-table-column prop="AUDIT_USER_NAME" label="审核部门负责人" show-overflow-tooltip>
<template slot-scope="{row}">
{{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
{{ row.AUDIT_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
<el-table-column prop="APPROVE_USER_NAME" label="审批部门负责人" show-overflow-toolti >
<template slot-scope="{row}">
{{ row.LEADER_USER_NAME || ' 已跳过' }}
{{ row.APPROVE_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
<el-table-column prop="STATUS" label="审核状态">
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">断路安全作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-if="row.APPLY_STATUS==0">吊装作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业指挥待审核</span>
<span v-else-if="row.APPLY_STATUS==2">所在单位待审核</span>
<span v-else-if="row.APPLY_STATUS==3">消防、安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==3">审核部门待审核</span>
<span v-else-if="row.APPLY_STATUS==4">审批部门待审核</span>
<span v-else-if="row.APPLY_STATUS==5">待验收</span>
<span v-else-if="row.APPLY_STATUS==6">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-2">作业指挥审核打回</span>
<span v-else-if="row.APPLY_STATUS==-3">所在单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">消防、安全管理部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">审核部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">审批部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
</template>
@ -67,49 +67,51 @@
<el-table-column label="操作" align="center" width="230">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-plus" @click="goChart(row)">流程图</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.CUTROAD_ID)">审批表详情</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOISTING_ID)">审批表详情</el-button>
</template>
</el-table-column>
</el-table>
<div class="page-btn-group">
<div>
<!-- <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>-->
<!-- <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>-->
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1400px">
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1350px">
<el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
<el-step title="断路安全作业提交">
<el-step title="吊装作业提交">
<template slot="description">
<div>{{ getProcessMessage().title }}</div>
<div>{{ getProcessMessage().USER_NAME }}</div>
<div>{{ getProcessMessage().OPERATTIME }}</div>
</template>
</el-step>
<el-step title="作业负责人意见">
<el-step title="作业指挥意见">
<template slot="description">
<div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
<div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
<div>{{ pd.LEADER_USER_NAME }}</div>
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="所在单位意见">
<template slot="description">
<div v-if="getIsPase('PRODUCTION_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.PRODUCTION_USER_NAME }}</div>
<div>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</div>
<div v-if="getIsPase('CONSTRUCTION_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.CONSTRUCTION_USER_NAME }}</div>
<div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="消防、安全管理部门意见" >
<el-step :description="getIsPase('AUDIT_USER_NAME')" title="审核部门意见" >
<template slot="description">
<div v-if="getIsPase('SAFETY_DEPARTMENT_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.SAFETY_USER_NAME }}</div>
<div>{{ pd.SAFETY_USER_SIGNER_TIME }}</div>
<div v-if="getIsPase('AUDIT_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.AUDIT_USER_NAME }}</div>
<div>{{ pd.AUDIT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="审批部门意见" >
<el-step title="审批部门意见">
<template slot="description">
<div v-if="getIsPase('LEADER_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.LEADER_USER_NAME }}</div>
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
<div v-if="getIsPase('APPROVE_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.APPROVE_USER_NAME }}</div>
<div>{{ pd.APPROVE_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="完成验收" description="">
@ -125,47 +127,11 @@
</template>
</el-step>
</el-steps>
<div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
<div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: #13ce66">
监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: red">
监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.CONFESS_USER_SIGNER_TIME">
<div style="color: red">
安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: red">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<!-- <el-button @click="dialogFormShow = false">取 消</el-button>-->
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
@ -204,16 +170,16 @@ export default {
dialogFormHuifuShow: false,
statusList: [
{ ID: '', NAME: '请选择' },
{ ID: '0', NAME: '断路安全作业待提交' },
{ ID: '1', NAME: '作业负责人待审核' },
{ ID: '0', NAME: '吊装作业待提交' },
{ ID: '1', NAME: '作业指挥待审核' },
{ ID: '2', NAME: '所在单位待审核' },
{ ID: '3', NAME: '消防、安全管理部门待审核' },
{ ID: '3', NAME: '审核部门待审核' },
{ ID: '4', NAME: '审批部门待审核' },
{ ID: '5', NAME: '待验收' },
{ ID: '6', NAME: '验收归档' },
{ ID: '-2', NAME: '作业负责人审核打回' },
{ ID: '-2', NAME: '作业指挥审核打回' },
{ ID: '-3', NAME: '所在单位审核打回' },
{ ID: '-4', NAME: '消防、安全管理部门审核打回' },
{ ID: '-4', NAME: '审核部门审核打回' },
{ ID: '-5', NAME: '审批部门审核打回' },
{ ID: '-6', NAME: '验收打回' }
],
@ -226,7 +192,7 @@ export default {
},
methods: {
getRowKey(row) {
return row.CUTROAD_ID
return row.HOISTING_ID
},
// 搜索
getQuery() {
@ -242,17 +208,32 @@ export default {
getList() {
this.listLoading = true
requestFN(
'/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/dangerousWork/gfHoisting/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
}
).then((data) => {
this.listLoading = false
this.varList = data.varList
this.total = data.page.totalResult
this.hasButton()
}).catch((e) => {
this.listLoading = false
})
},
// 判断按钮权限，用于是否显示按钮
hasButton() {
var keys = 'hoisting:add,hoisting:del,hoisting:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.hoistingfhadminadd // 新增权限
this.del = data.hoistingfhadmindel // 删除权限
this.edit = data.hoistingfhadminedit // 修改权限
}).catch((e) => {
this.listLoading = false
})
@ -296,35 +277,35 @@ export default {
if (this.pd.APPLY_STATUS >= '0') {
obj = {
title: '',
USER_NAME: this.pd.APPLY_USER_NAME,
USER_NAME: this.pd.APPLY_USER,
OPERATTIME: this.pd.CREATTIME
}
}
if (this.pd.APPLY_STATUS == '-2') {
obj = {
title: '作业负责人审核打回',
USER_NAME: this.pd.CONSTRUCTION_USER_NAME,
title: '作业指挥审核打回',
USER_NAME: this.pd.LEADER_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-3') {
obj = {
title: '所在单位审核打回',
USER_NAME: this.pd.PRODUCTION_USER_NAME,
USER_NAME: this.pd.CONSTRUCTION_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-4') {
obj = {
title: '消防、安全管理部门审核打回',
USER_NAME: this.pd.SAFETY_USER_NAME,
title: '审核部门审核打回',
USER_NAME: this.pd.AUDIT_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-5') {
obj = {
title: '审批部门审核打回',
USER_NAME: this.pd.LEADER_USER_NAME,
USER_NAME: this.pd.APPROVE_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
@ -342,16 +323,9 @@ export default {
return '已跳过'
}
},
goBack(){
this.$parent.activeName = 'CorpInfo'
this.$parent.CORPINFO_ID = ''
this.$parent.ticketType = ''
this.$parent.CUTROAD_ID =''
},
goDetail(id) {
console.info(id)
this.$parent.activeName = 'Detail'
this.$parent.CUTROAD_ID = id
this.$parent.activeName = 'Hoisting'
this.$parent.HOISTING_ID = id
}
}
}

25
src/views/dangerousWork/hoisting/index.vue
View File

@ -1,20 +1,33 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
<Hoisting v-if="activeName=='Hoisting'"/>
<List v-show="activeName=='hoisting_list'" />
<Detail v-if="activeName=='Detail'"/>
</div>
</template>
<script>
import CorpInfo from './components/corpInfo'
import Hoisting from './components/list'
import CorpInfo from './components/corpInfo'
import List from './components/list'
import Detail from './components/detail'
export default {
components: { CorpInfo, Hoisting },
components: { CorpInfo, List, Detail },
data() {
return {
activeName: 'CorpInfo',
CORPINFO_ID: '',
ticketType: ''
HOISTING_ID: ''
}
},
watch: {
activeName(val) {
if (val == 'List') {
this.$refs.list.getQuery()
}
}
}
}
</script>
<style scoped>
</style>

279
src/views/dangerousWork/lectricity/components/detail.vue
View File

@ -1,279 +0,0 @@
<template>
<div>
<div id="printTest" class="app-container print-work">
<el-page-header content="审批表详情" class="no-print" @back="goBack"/>
<table class="table-ui">
<thead>
<tr>
<td colspan="6" style="border: none">
<div class="level-title mt-20">
<h1>断路安全作业票</h1>
<div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
</div>
</td>
</tr>
</thead>
<tr>
<td class="bbg">申请单位</td>
<td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
<td class="bbg">作业单位</td>
<td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">作业负责人</td>
<td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
</tr>
<tr>
<td class="bbg">涉及相关单位（部门）</td>
<td colspan="3">{{ pd.OTHER_DEPT }}</td>
<td class="bbg">监护人</td>
<td>
<div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td class="bbg">断路原因</td>
<td colspan="5">{{ pd.WORK_REASON }}</td>
</tr>
<tr>
<td class="bbg">关联的其他特殊作业及安全作业票编号</td>
<td colspan="5">{{ pd.SPECIAL_WORK }}</td>
</tr>
<tr>
<td colspan="6">
<div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
<div style="display: flex;justify-content: space-between;margin-top: 20px;">
<img v-viewer :src="config.fileUrl + pd.CONTENT_IMG_PATH" alt="" width="100" height="100">
<div>
编制人：
<img v-viewer :src="config.fileUrl + pd.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
{{ pd.APPLY_USER_SIGNER_TIME }}
</div>
</div>
</td>
</tr>
<tr>
<td class="bbg">风险辨识结果</td>
<td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
</tr>
<tr>
<td class="bbg">作业实施时间</td>
<td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
</tr>
<tr>
<td colspan="6">
<table class="table-ui">
<tr>
<td>序号</td>
<td>安全措施</td>
<td>是否涉及</td>
<td>确认人</td>
</tr>
<tr v-for="(item,index) in measuresList" :key="index">
<td>{{ index + 1 }}</td>
<td>{{ item.PROTECTIVE_MEASURES }}</td>
<td>
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
<span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
</td>
<td>
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.PRODUCTION_USER_MEASURES || pd.SAFETY_USER_MEASURES || pd.LEADER_USER_MEASURES ">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.APPLY_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPLY_USER_NAME }}</span>
</div>
<div v-if="pd.CONSTRUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONSTRUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.PRODUCTION_USER_ID && pd.PRODUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }}</span>
<span>编制人：{{ pd.PRODUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.SAFETY_USER_ID && pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.SAFETY_USER_MEASURES }}</span>
<span>编制人：{{ pd.SAFETY_USER_NAME }}</span>
</div>
<div v-if="pd.LEADER_USER_ID && pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="bbg">安全交底人</td>
<td colspan="10">
<div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td class="bbg">接受交底人</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="pd.CONSTRUCTION_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONSTRUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.PRODUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.PRODUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.SAFETY_USER_SIGNER_PATH">
<td colspan="6">
<div>消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.SAFETY_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>审批部门意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.LEADER_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="imgList1.length>0">
<td colspan="10">
<div>完工验收：{{ pd.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>
</table>
</div>
<div style="padding-top: 100px"/>
<div class="ui-foot">
<el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
import { requestFN } from '@/utils/request'
import dateformat from '@/utils/dateformat'
export default {
data() {
return {
config: config,
CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
pd: [], // 存放字段参数
measuresList: [],
otherProtectiveMeasures: [],
imgList: [],
imgList1: [],
hazardIdentification: []
}
},
created() {
this.getData()
},
methods: {
validStr(str) {
if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
return false
},
formatTime(date, column) {
if (date) {
return dateformat(date, 'YYYY年MM月DD日HH时mm分')
} else {
return ''
}
},
formatDate(date, column) {
if (date) {
return dateformat(date, 'YYYY-MM-DD')
} else {
return ''
}
},
getRowKey(row) {
return row.CUTROAD_ID
},
getData() {
this.listLoading = true
requestFN(
'/dangerousWork/gfcutroad/goEdit',
{
CUTROAD_ID: this.CUTROAD_ID
}
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map
this.imgList = data.imgList
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}).catch((e) => {
this.listLoading = false
})
},
goBack() {
this.$parent.activeName = 'circuit_list'
this.$parent.CUTROAD_ID = ''
}
}
}
</script>
<style lang="sass" scoped>
.print-approval-p10
padding: 20px 0
span
vertical-align: middle
.bbg
width: 270px
.print-approval-img
width: 200px
height: 97px
display: inline-block
img
width: 100%
height: 100%
.level-code
margin-left: auto
</style>

79
src/views/keyprojects/platformelectronic/index.vue
View File

@ -96,13 +96,13 @@
</el-select>
</el-form-item>
<el-form-item label="所属区域" prop="bianjiequyu">
<el-select v-model="form.SUOSHUQUYU" placeholder="请选择">
<el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
<el-select v-model="form.SUOSHUQUYU" placeholder="请选择" @change="getSendDic">
<el-option v-for="item in statusList" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
</el-select>
</el-form-item>
<el-form-item label="边界入侵区域" prop="bianjiequyu">
<el-select v-model="form.bianjiequyu" multiple placeholder="请选择监理单位" style="width: 100%;">
<el-option v-for="item in quyuList" :key="item.id" :label="item.name" :value="item.id" />
<el-option v-for="item in quyuList" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
</el-select>
</el-form-item>
<el-form-item v-if="form.VIDEO_TYPE===1" label="视频选择">
@ -126,7 +126,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogForm =false">取 消</el-button>
<el-button @click="closeDia()">取 消</el-button>
<el-button type="primary" @click="upload">确 定</el-button>
</div>
</el-dialog>
@ -198,11 +198,7 @@ export default {
},
quyuList: [],
shexiangtouForm: {},
statusList: [
{ id: '0', name: '请选择' },
{ id: '1', name: '油管区' },
{ id: '2', name: '码头区' }
]
statusList: []
}
},
async created() {
@ -266,7 +262,7 @@ export default {
this.msg = 'add'
this.resetForm()
this.dialogForm = true
// this.$refs.platformvideo.init()
this.getDic()
},
resetForm() {
this.shexiangtouForm.LONGITUDE = ''
@ -312,6 +308,7 @@ export default {
).then(async(data) => {
await this.getAllList()
this.getList()
this.shexiangtouForm = {}
}).catch((e) => {
this.listLoading = false
})
@ -326,6 +323,7 @@ export default {
goEdit(row) {
this.dialogForm = true
this.listLoading = true
this.getDic()
return new Promise(resolve => {
requestFN(
'/platformelectronic/goEdit',
@ -334,15 +332,18 @@ export default {
}
).then((data) => {
this.shexiangtouForm = data.pd
this.form.bianjiequyu = data.pd.FANGQU_IDS.split(',')
this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
this.getSendDic()
this.form.bianjiequyu = data.pd.FANGQU_IDS?data.pd.FANGQU_IDS.split(','):[]
this.form.CORPINFO_ID = data.pd.CORPINFO_ID
this.form.VIDEONAME = data.pd.NAME
this.form.CODE = data.pd.INDEXCODE
this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + ',' + data.pd.LATITUDE
this.listLoading = false
resolve()
}).catch((e) => {
console.log(e)
this.listLoading = false
})
})
@ -381,8 +382,8 @@ export default {
},
// 获取列表
setPosition() {
// eslint-disable-next-line no-empty
if (this.shexiangtouForm.PLATFORMELECTRONIC_ID != null) {
}
this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE
this.shexiangtouForm.LATITUDE = this.form.LATITUDE
@ -505,6 +506,58 @@ export default {
handleBack() {
this.player.dispose()
this.dialogVideoHLS = false
},
getDic() { // 获取区域字典信息
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: 'f0bae7becdee4d779a2cb82037948ab4' }
).then((data) => {
this.statusList = JSON.parse(data.zTreeNodes)
loading.close()
}).catch((e) => {
loading.close()
})
},
getSendDic() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
this.form.bianjiequyu = []
this.form.quyuList = []
requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: this.form.SUOSHUQUYU }
).then((data) => {
loading.close()
this.quyuList = JSON.parse(data.zTreeNodes)
}).catch((e) => {
loading.close()
})
},
closeDia() {
this.dialogForm = false
this.form = {
CORPINFO_ID: '',
bianjiequyu: [],
PLATFORMELECTRONIC_ID: '',
LONGITUDEANDLATITUDE: '',
VIDEOMANAGER_ID: '',
VIDEO_RESOURCES_ID: '',
VIDEO_TYPE: 1,
VIDEONAME: '', //
VIDEOURL: '',
CODE: '',
PLATFORMVIDEOMANAGEMENT_ID: '',
LATITUDE: '',
LONGITUDE: '',
SUOSHUQUYU: ''
}
}
}
}

289
src/views/map/components/zhongdian.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="renyuan">
<div class="block1">
<layout-title title="重点工程统计"/>
<layout-title title="边界入侵统计"/>
<div class="options">
<div v-for="(item,index) in block1OptionsList" :key="index" class="option">
<div class="imger">
@ -10,39 +10,29 @@
<div class="info">
<div class="label">{{ item.title }}</div>
<div class="text">{{ item.count }}</div>
<!-- <div class="text"><count-to :start-val="0" :end-val="item.count" :duration="3600"/></div>-->
</div>
</div>
</div>
</div>
<div class="block2">
<layout-title title="区域报警数"/>
<layout-title title="区域摄像头数量"/>
<div class="options">
<div v-for="(item,index) in block2OptionsList" :key="index" class="option">
<div class="circular"><img :src="item.img" alt=""></div>
<div class="info">
<div class="title">{{ item.label }}</div>
<div class="count"> <count-to :start-val="0" :end-val="+item.count" :duration="3600"/></div>
</div>
</div>
<div id="main1"/>
</div>
</div>
<div class="block3">
<layout-title title="安全管理记录"/>
<div class="block4">
<layout-title title="报警列表"/>
<div class="content">
<div class="table">
<div class="tr">
<div class="td">公司名称</div>
<div class="td">创建数</div>
<div class="td">检查次数</div>
<div class="td">隐患数量</div>
<div class="td">区域名称</div>
<div class="td">报警设备编号</div>
<div class="td">状态告警</div>
</div>
<div v-for="(item,index) in block3List" :key="index" class="tr">
<div class="td">{{ item.CORP_NAME }}</div>
<div class="td">{{ item.OUTSOURCED_COUNT }}</div>
<div class="td">{{ item.CHECK_COUNT }}</div>
<div class="td">{{ item.HIDDEN_COUNT }}</div>
<div v-for="(item,index) in block4List" :key="index" class="tr">
<div class="td">{{ item.alarmName }}</div>
<div class="td">{{ item.equipmentName }}</div>
<div class="td">{{ item.statusName }}</div>
</div>
</div>
</div>
@ -54,7 +44,9 @@
import layoutTitle from './title.vue'
import CountTo from 'vue-count-to'
import { requestFN } from '@/utils/request'
import * as echarts from 'echarts'
let Echarts1
export default {
components: {
CountTo,
@ -78,26 +70,15 @@ export default {
return {
block1OptionsList: [
{
title: '开工数量',
title: '报警数量',
img: require('../../../assets/map/zhongdian/ico1.png'),
count: '-'
},
{
title: '视频数量',
title: '监控数量',
img: require('../../../assets/map/zhongdian/ico2.png'),
count: '-'
},
{
title: '检查次数',
img: require('../../../assets/map/zhongdian/ico3.png'),
count: '-'
},
{
title: '发现隐患数量',
img: require('../../../assets/map/zhongdian/ico4.png'),
count: '-'
}
],
block2OptionsList: [
{
@ -120,12 +101,19 @@ export default {
CHECK_COUNT: '-',
HIDDEN_COUNT: '-'
}
]
],
block4List: []
}
},
mounted() {
this.getCount()
this.initNum()
this.initgetTable()
window.onresize = function() {
Echarts1 && Echarts1.resize()
}
},
beforeDestroy() {
Echarts1 = null
},
methods: {
getCount() {
@ -147,6 +135,22 @@ export default {
this.block2OptionsList[1].count = data.pd.AMOUT_SUM
})
},
initNum() {
requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId, source: '0' }
).then((data0) => {
this.block1OptionsList[0].count = data0.alarmList.page.total
requestFN('/map/mapPlatformelectronic/listAllLocation', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' }
).then((data1) => {
this.block4List = data0.alarmList.list
this.block1OptionsList[1].count = data1.varList.length
this.initEcharts1(data1.iconData)
}).catch((e) => {
this.$message.error(e)
})
}).catch((e) => {
this.$message.error(e)
})
},
initgetTable() {
requestFN(
'/map/keyProject/list?showCount=10&currentPage=1',
@ -158,6 +162,112 @@ export default {
).then((data) => {
this.block3List = data.varList
})
},
initEcharts1(data) {
console.log(data)
const XaxisData = []
const seriesData1 = []
for (const optionKey in data) {
console.log(data[optionKey])
for (let i = 0; i < data[optionKey].length; i++) {
console.log(data[optionKey][i])
XaxisData.push(data[optionKey][i].NAME)
seriesData1.push(data[optionKey][i].num)
}
}
// eslint-disable-next-line no-undef
Echarts1 = echarts.init(document.querySelector('#main1'))
const option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
grid: {
left: '2%',
right: '4%',
bottom: '5%',
top: '12%',
containLabel: true
},
legend: {
top: '0%',
right: '0%',
textStyle: {
color: '#fff',
fontSize: 14
},
itemWidth: 12,
itemHeight: 10
},
xAxis: {
type: 'category',
data: XaxisData,
axisLine: {
lineStyle: {
color: '#fff'
}
},
axisLabel: {
textStyle: {
fontSize: 12
}
}
},
yAxis: {
type: 'value',
max: '50',
axisLine: {
show: false,
lineStyle: {
color: '#fff'
}
},
splitLine: {
show: true,
lineStyle: {
color: '#8c9493'
}
},
axisLabel: {
textStyle: {
fontSize: 14
}
}
},
series: [
{
name: '摄像头',
type: 'bar',
barWidth: '10%',
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{
offset: 0,
color: '#00f0ff'
},
{
offset: 1,
color: '#0066ff'
}
],
false
)
}
},
data: seriesData1
}
]
}
Echarts1.setOption(option)
}
}
}
@ -243,6 +353,7 @@ export default {
}
}
}
.block2 {
width: 410px;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
@ -253,66 +364,11 @@ export default {
border: 1px solid;
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
border-top: none;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
position: relative;
height: 150px;
.option{
width: 50%;
display: flex;
align-items: center;
justify-content: space-around;
.circular {
margin-top: 5px;
background-image: url("../../../assets/map/anquan/icobg.png");
background-size: 100% 100%;
background-repeat: no-repeat;
width: 70px;
height: 70px;
text-align: center;
padding-top: 13px;
img {
width: 25px;
height: 26px;
animation: slideY 2s infinite;
}
}
.info{
flex: 1;
text-align: center;
.title{
background-image: url("../../../assets/map/anquan/label.png");
background-size: 100% 100%;
background-repeat: no-repeat;
width: 120px;
height: 24px;
margin-top: 5px;
font-size: 12px;
line-height: 25px;
text-align: center;
color: #fff;
}
.count{
margin-top: 10px;
font-size: 24px;
background: linear-gradient(to top, #48bbf0, #ffffff);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
font-weight: bold;
font-family: "PingFang SC", "Helvetica Neue", "Hiragino Sans GB", "Segoe UI", "Microsoft YaHei", "微软雅黑", sans-serif;
}
}
#main1 {
width: 100%;
height: 250px;
}
}
}
@ -357,6 +413,48 @@ export default {
}
}
}
.block4 {
margin-top: 10px;
width: 410px;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
.content {
border: 1px solid;
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
border-top: none;
padding: 10px;
.options {
display: flex;
justify-content: flex-end;
.title {
cursor: pointer;
}
}
.table {
margin-top: 5px;
.tr {
display: flex;
&:nth-child(odd) {
background-color: rgba(42, 86, 158, 0.53);
}
.td {
flex: 1;
text-align: center;
font-size: 12px;
color: #fff;
padding: 5px;
}
}
}
}
}
}
@keyframes scale {
@ -370,6 +468,7 @@ export default {
transform: scale(0.9);
}
}
@keyframes slideY {
0% {
transform: translateY(0);