1
This commit is contained in:
parent
9d7024f5e5
commit
30dcda5c25
@ -1607,6 +1607,13 @@ const routes2 = [
|
||||
component: () =>
|
||||
import("@/views/projectFront/specialWork/disconnectionWork.vue"),
|
||||
},
|
||||
// 应急处置
|
||||
{
|
||||
path: "/project/emergencyDisposal/emergencyDisposal",
|
||||
name: "应急处置",
|
||||
component: () =>
|
||||
import("@/views/projectFront/emergencyDisposal/emergencyDisposal.vue"),
|
||||
},
|
||||
//卸料平台
|
||||
{
|
||||
path: "/project/unload/basicInfo", //卸料平台 基本信息
|
||||
|
||||
@ -103,7 +103,7 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -137,7 +137,7 @@
|
||||
<el-page-header @back="goBack" :content="dialogTitle" class="backText"
|
||||
:class="{ dark: styleType == 2 }"></el-page-header>
|
||||
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
|
||||
<detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="4" :COMPANY_Type="'longguang'" @cancleSave="goBack"
|
||||
<detail :id="detailId" :isSuperDanger="isSuperDanger" :tableName="'管道、盲板分析'" :workType="4" :COMPANY_Type="'longguang'" @cancleSave="goBack"
|
||||
:workDetail="workDetail" v-if="isEdit">
|
||||
<template v-slot:basicinfo>
|
||||
<div class="info-content">
|
||||
@ -171,7 +171,7 @@
|
||||
<el-form-item label="编制时间：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.organizerDate }}
|
||||
</el-form-item>
|
||||
<el-form-item label="设备、管道名称：" :label-width="formLabelWidthDetail">
|
||||
<!-- <el-form-item label="设备、管道名称：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.devPipelineName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="管道参数：" :label-width="formLabelWidthDetail">
|
||||
@ -179,7 +179,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="盲板参数：" :label-width="formLabelWidthDetail">
|
||||
{{workDetail.blindPlateParameter&& JSON.parse(workDetail.blindPlateParameter) instanceof Array && JSON.parse(workDetail.blindPlateParameter).map(item => `材质(${item.medium? item.medium : ''})、规格(${item.temperature? item.temperature : ''})、编号(${item.pressure? item.pressure : ''})`).join('，')}}
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
|
||||
<!-- <el-form-item label="介质：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.jobContent }}
|
||||
@ -206,8 +206,13 @@
|
||||
<span class="value" v-if="workDetail.blindPlatePic && JSON.parse(workDetail.blindPlatePic).length > 0"
|
||||
style="display: flex;justify-content:flex-start;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
|
||||
<div v-for="(item,index) in JSON.parse(workDetail.blindPlatePic)" :key="index" style="">
|
||||
<img :preview="item ? $store.state.FILEURL + item.url : ''"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
|
||||
<!-- <img :preview="item ? $store.state.FILEURL + item.url : ''"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/> -->
|
||||
<el-image
|
||||
style="width: 50px; height: 50px;margin-right: 10px;"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''"
|
||||
:preview-src-list="[item ? $store.state.FILEURL + item.url : '']">
|
||||
</el-image>
|
||||
</div>
|
||||
</span>
|
||||
<!-- {{ workDetail.blindPlatePic }} -->
|
||||
@ -228,6 +233,9 @@
|
||||
<el-form-item label="监护人：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.guardianName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="编制人：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.organizer }}
|
||||
</el-form-item>
|
||||
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.riskIdentificationResult }}
|
||||
</el-form-item>
|
||||
@ -238,74 +246,76 @@
|
||||
{{ workDetail.safetyWorkTicketCode }}
|
||||
</el-form-item> -->
|
||||
<el-form-item label="实际作业开始时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.workExecutionBeginTime" type="date"
|
||||
<el-date-picker v-model="workDetail.actualJobBeginTime" type="date"
|
||||
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
<!-- <template v-slot:gasanalysis>
|
||||
<div>
|
||||
<el-form :model="detailData">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="分析项目：" :label-width="formLabelWidthDetail">
|
||||
受限空间
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="有毒有害气体名称" :label-width="formLabelWidthDetail">
|
||||
一氧化碳
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="可燃气体名称：" :label-width="formLabelWidthDetail">
|
||||
天然气
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="合格标准：" :label-width="formLabelWidthDetail">
|
||||
100
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="氧气含氧量(19.5%~21%)：" :label-width="formLabelWidthDetail">
|
||||
20%
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="取样分析时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="date"
|
||||
:picker-options="pickerOptions" value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="分析部位：" :label-width="formLabelWidthDetail">
|
||||
顶部
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="分析人：" :label-width="formLabelWidthDetail">
|
||||
刘大大
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="10">
|
||||
<el-form-item label="分析数据：" :label-width="formLabelWidthDetail">
|
||||
<template v-slot:gasanalysis>
|
||||
<div class="gastable">
|
||||
|
||||
<el-input v-model="detailData.engineeringSurvey" :disabled="isDisabledDetail"
|
||||
placeholder="一氧化碳/天然气/20%/2024-01-12/顶部/刘大大" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-row>
|
||||
<el-col :span="3">
|
||||
|
||||
</el-col>
|
||||
<el-col :span="9">
|
||||
管道参数
|
||||
</el-col>
|
||||
<el-col :span="9">
|
||||
盲板参数
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<el-row>
|
||||
<el-col :span="3">
|
||||
设备管道名称
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
介质
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
温度
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
压力
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
材质
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
规格
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
编号
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row v-for="(item,index) in pipelineUp" :key="index">
|
||||
<el-col :span="3">
|
||||
{{ workDetail.devPipelineName}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{ item.materialQuality ? item.materialQuality : '--' }}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{ item.specifications ? item.specifications : '--' }}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{ item.number ? item.number : '--' }}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{ item.medium ? item.medium : '--' }}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{ item.temperature ? item.temperature : '--' }}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{ item.pressure ? item.pressure : '--' }}
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</div>
|
||||
</template> -->
|
||||
</template>
|
||||
</detail>
|
||||
<editPlan :title="operateTitle" :editId="editId" @cancleSave="goBack" v-if="isUpdate"></editPlan>
|
||||
</div>
|
||||
@ -416,6 +426,29 @@ export default {
|
||||
isUpdate: false
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
pipelineUp() {
|
||||
|
||||
// .map(item => `介质(${})、温度(${})、压力(${})`)
|
||||
let newResult = [];
|
||||
if(this.workDetail.pipelineParameter&& JSON.parse(this.workDetail.pipelineParameter) instanceof Array ){
|
||||
newResult = JSON.parse(this.workDetail.pipelineParameter);
|
||||
}
|
||||
|
||||
if(this.workDetail.blindPlateParameter&& JSON.parse(this.workDetail.blindPlateParameter) instanceof Array ){
|
||||
const blindPlateParameter = JSON.parse(this.workDetail.blindPlateParameter);
|
||||
newResult = newResult.reduce((prev,item,index) => {
|
||||
prev.push({
|
||||
...item,
|
||||
...blindPlateParameter[index],
|
||||
})
|
||||
return prev;
|
||||
},[]);
|
||||
}
|
||||
|
||||
return newResult;
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.projectSn = this.$store.state.projectSn
|
||||
this.styleType = this.$store.state.userInfo.styleType;
|
||||
@ -500,7 +533,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getPlatePlugSafePageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
@ -848,6 +881,52 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.gastable {
|
||||
padding: 10px 20px;
|
||||
|
||||
.el-row:first-child {
|
||||
.el-col {
|
||||
border-top: 2px solid #E1E1E1;
|
||||
background-color: #E9E9E9;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.el-row:nth-child(2){
|
||||
.el-col {
|
||||
background-color: #E9E9E9;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.el-row:last-child {
|
||||
.el-col {
|
||||
border-bottom: 2px solid #E1E1E1;
|
||||
}
|
||||
}
|
||||
|
||||
.el-row {
|
||||
font-size: 14px;
|
||||
|
||||
// color: #000;
|
||||
.el-col {
|
||||
height: 40px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px solid #E1E1E1;
|
||||
}
|
||||
|
||||
.el-col:first-child {
|
||||
border-left: 2px solid #E1E1E1;
|
||||
}
|
||||
|
||||
.el-col:last-child {
|
||||
border-right: 2px solid #E1E1E1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.el-button--text {
|
||||
color: #262d47;
|
||||
}
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -365,7 +365,7 @@
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
@ -609,6 +609,13 @@ export default {
|
||||
if(this.workDetail.combustibleGasInformation && JSON.parse(this.workDetail.combustibleGasInformation) instanceof Array ) {
|
||||
newResult = [...newResult, ...JSON.parse(this.workDetail.combustibleGasInformation)]
|
||||
}
|
||||
// console.log(newResult.length < 4,newResult.length, 4);
|
||||
if(newResult.length < 4) {
|
||||
for (let index = 0; index <= (4 - newResult.length); index++) {
|
||||
newResult.push({})
|
||||
}
|
||||
}
|
||||
// console.log(newResult);
|
||||
return newResult;
|
||||
},
|
||||
gasAnalysisDataUp() {
|
||||
@ -704,7 +711,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getSpaceSafePageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
@ -1058,9 +1065,10 @@ export default {
|
||||
.el-row:first-child {
|
||||
.el-col {
|
||||
border-top: 2px solid #E1E1E1;
|
||||
background-color: #E9E9E9;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.el-row:last-child {
|
||||
.el-col {
|
||||
border-bottom: 2px solid #E1E1E1;
|
||||
@ -1080,6 +1088,8 @@ export default {
|
||||
}
|
||||
|
||||
.el-col:first-child {
|
||||
font-weight: bold;
|
||||
background-color: #E9E9E9;
|
||||
border-left: 2px solid #E1E1E1;
|
||||
}
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
</div>
|
||||
<div class="control-point">
|
||||
<div class="box-title" v-if="$slots.gasanalysis">
|
||||
气体分析
|
||||
{{tableName ? tableName : '气体分析'}}
|
||||
</div>
|
||||
<slot name="gasanalysis"></slot>
|
||||
<!-- <div class="gasanalysis-table">
|
||||
@ -283,7 +283,7 @@
|
||||
<el-table-column prop="createUserName" label="记录人">
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="记录时间"> </el-table-column>
|
||||
<el-table-column label="操作" width="80">
|
||||
<el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == workDetail.assignmentPersonInCharge)">
|
||||
<template slot-scope="scope">
|
||||
<div class="delete" @click="deleteDangerousEngineeringProgressRecord(scope.row.id)">
|
||||
<i class="el-icon-delete delete-btn"></i>
|
||||
@ -309,7 +309,7 @@
|
||||
<el-table-column prop="createUserName" label="记录人">
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="记录时间"> </el-table-column>
|
||||
<el-table-column label="操作" width="80">
|
||||
<el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == workDetail.assignmentPersonInCharge)">
|
||||
<template slot-scope="scope">
|
||||
<div class="delete" @click="deleteDangerousEngineeringSideStation(scope.row.id)">
|
||||
<i class="el-icon-delete delete-btn"></i>
|
||||
@ -349,7 +349,7 @@
|
||||
<el-table-column prop="acceptanceUserName" label="记录人">
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="记录时间"> </el-table-column>
|
||||
<el-table-column label="操作" width="80">
|
||||
<el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == workDetail.assignmentPersonInCharge)">
|
||||
<template slot-scope="scope">
|
||||
<div class="delete" @click="deleteDangerousEngineeringAcceptanceCheck(scope.row.id)">
|
||||
<i class="el-icon-delete delete-btn" ></i>
|
||||
@ -466,7 +466,7 @@
|
||||
<a style="cursor: pointer;color: #409EFF" @click="previewDetail(scope.row)">查看详情</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="80">
|
||||
<el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == workDetail.assignmentPersonInCharge)">
|
||||
<template slot-scope="scope">
|
||||
<div class="delete" @click="deletehiddenDangerInspectRecord(scope.row.id, 1)">
|
||||
<i class="el-icon-delete delete-btn"></i>
|
||||
@ -510,7 +510,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" width="180" label="检查时间"> </el-table-column>
|
||||
<el-table-column prop="enterpriseName" label="分包单位"> </el-table-column>
|
||||
<el-table-column label="操作" width="80">
|
||||
<el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == workDetail.assignmentPersonInCharge)">
|
||||
<template slot-scope="scope">
|
||||
<div class="delete" @click="deletehiddenDangerInspectRecord(scope.row.id, 2)">
|
||||
<i class="el-icon-delete delete-btn"></i>
|
||||
@ -921,7 +921,7 @@ import {
|
||||
|
||||
import moment from "moment";
|
||||
export default {
|
||||
props: ["id", "isSuperDanger", "COMPANY_Type","workDetail","workType"],
|
||||
props: ["id", "isSuperDanger", "COMPANY_Type","workDetail","workType","tableName"],
|
||||
data() {
|
||||
return {
|
||||
responsibilityList: [],
|
||||
|
||||
@ -38,11 +38,12 @@
|
||||
<el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
|
||||
@selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
|
||||
<!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
|
||||
<el-table-column label="序号" type="index" align="center" ></el-table-column>
|
||||
<el-table-column label="序号" type="index" align="center"></el-table-column>
|
||||
<el-table-column align="center" label="作业票编号" width="200" prop="workTicketCode">
|
||||
<template slot-scope="scope">
|
||||
<div class="" style="display: flex;justify-content:center;font-weight:bold">
|
||||
<div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
|
||||
<div style="display: flex"
|
||||
:style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
|
||||
<el-tag type="danger" effect="dark" size="mini"
|
||||
v-if="scope.row.engineeringState === 3">超期</el-tag>
|
||||
<!-- <el-tag type="danger" effect="dark" size="mini">超期</el-tag> -->
|
||||
@ -58,11 +59,13 @@
|
||||
{{ scope.row.jobApplicationUnitName }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="涉及相关单位" prop="involveRelatedUnit" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="涉及相关单位" prop="involveRelatedUnit"
|
||||
show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="断路原因" prop="breakReason"></el-table-column>
|
||||
<!-- <el-table-column align="center" label="作业内容" prop="jobContent"></el-table-column> -->
|
||||
<el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName"
|
||||
show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
|
||||
<!-- 状态 -->
|
||||
<el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
|
||||
@ -97,7 +100,9 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<el-button
|
||||
v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)"
|
||||
@click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -131,8 +136,8 @@
|
||||
<el-page-header @back="goBack" :content="dialogTitle" class="backText"
|
||||
:class="{ dark: styleType == 2 }"></el-page-header>
|
||||
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
|
||||
<detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="9" :COMPANY_Type="'longguang'" @cancleSave="goBack"
|
||||
:workDetail="workDetail" v-if="isEdit">
|
||||
<detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="9" :COMPANY_Type="'longguang'"
|
||||
@cancleSave="goBack" :workDetail="workDetail" v-if="isEdit">
|
||||
<template v-slot:basicinfo>
|
||||
<div class="info-content">
|
||||
<el-form class="form-box" :model="workDetail">
|
||||
@ -167,11 +172,17 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="断路地段示意图：" :label-width="formLabelWidthDetail">
|
||||
<!-- {{ workDetail.breakLocationDiagram }} -->
|
||||
<span class="value" v-if="workDetail.breakLocationDiagram && JSON.parse(workDetail.breakLocationDiagram).length > 0"
|
||||
<span class="value"
|
||||
v-if="workDetail.breakLocationDiagram && JSON.parse(workDetail.breakLocationDiagram).length > 0"
|
||||
style="display: flex;justify-content:flex-start;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
|
||||
<div v-for="(item,index) in JSON.parse(workDetail.breakLocationDiagram)" :key="index" style="">
|
||||
<img :preview="item ? $store.state.FILEURL + item.url : ''"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
|
||||
<div v-for="(item, index) in JSON.parse(workDetail.breakLocationDiagram)"
|
||||
:key="index" style="">
|
||||
<!-- <img :preview="item ? $store.state.FILEURL + item.url : ''"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/> -->
|
||||
<el-image style="width: 50px; height: 50px;margin-right: 10px;"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''"
|
||||
:preview-src-list="[item ? $store.state.FILEURL + item.url : '']">
|
||||
</el-image>
|
||||
</div>
|
||||
</span>
|
||||
</el-form-item>
|
||||
@ -188,7 +199,7 @@
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
@ -300,7 +311,7 @@ export default {
|
||||
formInline: {
|
||||
firemanName: '',
|
||||
enterpriseId: '',
|
||||
workTicketCode:"",
|
||||
workTicketCode: "",
|
||||
},
|
||||
formLabelWidthDetail: "270px",
|
||||
detailData: {},
|
||||
@ -456,7 +467,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getOpenCircuitPageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
|
||||
@ -107,7 +107,9 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<!-- {{$store.state.userInfo.accountType}} -->
|
||||
<!-- {{($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)}} -->
|
||||
<el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -633,7 +635,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getFireSafetyPageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
@ -1015,9 +1017,9 @@ export default {
|
||||
.gasanalysis-table {
|
||||
padding: 10px 20px;
|
||||
|
||||
.el-row:first-child .el-col {
|
||||
background-color: #E9E9E9;
|
||||
}
|
||||
// .el-row:first-child .el-col {
|
||||
// background-color: #E9E9E9;
|
||||
// }
|
||||
|
||||
.el-row {
|
||||
font-size: 14px;
|
||||
@ -1025,6 +1027,7 @@ export default {
|
||||
|
||||
.el-col:first-child {
|
||||
background-color: #E9E9E9;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.el-col {
|
||||
|
||||
@ -67,6 +67,7 @@
|
||||
<el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="指挥人" prop="commanderName"></el-table-column>
|
||||
<el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
|
||||
<!-- 状态 -->
|
||||
<el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
|
||||
<template slot-scope="scope">
|
||||
@ -100,7 +101,7 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -162,6 +163,9 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="作业人负责人：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.assignmentPersonInChargeName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="吊装作业人：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.workTicketCode }}
|
||||
</el-form-item>
|
||||
@ -183,7 +187,7 @@
|
||||
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.riskIdentificationResult }}
|
||||
</el-form-item>
|
||||
<el-form-item label="吊物质量：" :label-width="formLabelWidthDetail">
|
||||
<el-form-item label="吊物质量(t)：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.hoistWeight }}
|
||||
</el-form-item>
|
||||
<el-form-item label="指挥人员：" :label-width="formLabelWidthDetail">
|
||||
@ -193,7 +197,7 @@
|
||||
{{ workDetail.hotWorkLevel }}
|
||||
</el-form-item> -->
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
@ -461,7 +465,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getHoistSafetyPageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -173,8 +173,13 @@
|
||||
<span class="value" v-if="workDetail.jobRangeContentPic && JSON.parse(workDetail.jobRangeContentPic).length > 0"
|
||||
style="display: flex;justify-content:flex-start;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
|
||||
<div v-for="(item,index) in JSON.parse(workDetail.jobRangeContentPic)" :key="index" style="">
|
||||
<img :preview="item ? $store.state.FILEURL + item.url : ''"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
|
||||
<!-- <img :preview="item ? $store.state.FILEURL + item.url : ''"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/> -->
|
||||
<el-image
|
||||
style="width: 50px; height: 50px;margin-right: 10px;"
|
||||
:src="item ? $store.state.FILEURL + item.url : ''"
|
||||
:preview-src-list="[item ? $store.state.FILEURL + item.url : '']">
|
||||
</el-image>
|
||||
</div>
|
||||
</span>
|
||||
</el-form-item>
|
||||
@ -188,7 +193,7 @@
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
:disabled="isDisabledDetail"
|
||||
range-separator="至"
|
||||
@ -458,7 +463,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getGroundSafetPageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
|
||||
@ -103,7 +103,7 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -192,23 +192,23 @@
|
||||
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.riskIdentificationResult }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业人：" :label-width="formLabelWidthDetail">
|
||||
<el-form-item label="作业人及电工编号：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.jobPersonName }}
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="电工证号1：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.electricianNum1 }} -->
|
||||
</el-form-item>
|
||||
{{ workDetail.electricianNum1 }}
|
||||
</el-form-item> -->
|
||||
<el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.assignmentPersonInChargeName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="电工证号：" :label-width="formLabelWidthDetail">
|
||||
<el-form-item label="作业负责人电工证号：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.electricianNum2 }}
|
||||
</el-form-item>
|
||||
<el-form-item label="关联的其他特殊作业及安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
:disabled="isDisabledDetail"
|
||||
range-separator="至"
|
||||
@ -241,16 +241,16 @@
|
||||
</el-row>
|
||||
<el-row v-for="(item, index) in (workDetail.combustibleGasAnalysis && JSON.parse(workDetail.combustibleGasAnalysis) instanceof Array && JSON.parse(workDetail.combustibleGasAnalysis))" :key="index">
|
||||
<el-col :span="3">
|
||||
{{item.result}}
|
||||
{{item.result ? item.result : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{item.time}}
|
||||
{{item.time? item.time : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{workDetail.analysePlace}}
|
||||
{{workDetail.analysePlace? workDetail.analysePlace : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{workDetail.analysePerson}}
|
||||
{{workDetail.analysePerson? workDetail.analysePerson : '--'}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@ -449,7 +449,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getTemporaryPageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
@ -787,6 +787,7 @@ export default {
|
||||
// xzGasAnalyzeList: res.result.xzGasAnalyzeList,
|
||||
hotWorkExecutionTime:[res.result.workExecutionBeginTime,res.result.workExecutionEndTime]
|
||||
};
|
||||
console.log(this.workDetail.hotWorkExecutionTime);
|
||||
}
|
||||
})
|
||||
|
||||
@ -803,6 +804,8 @@ export default {
|
||||
.el-row:first-child {
|
||||
.el-col {
|
||||
border-top: 2px solid #E1E1E1;
|
||||
background-color: #E9E9E9;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
<i class="el-icon-edit"></i>
|
||||
</el-button> -->
|
||||
<!-- v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" -->
|
||||
<el-button @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<el-button v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == scope.row.assignmentPersonInCharge)" @click.stop="deleteRow(scope.$index, tableData)" type="text" size="small">
|
||||
<i class="el-icon-delete"></i>
|
||||
删除
|
||||
</el-button>
|
||||
@ -186,7 +186,7 @@
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
|
||||
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
@ -396,7 +396,7 @@ export default {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn,
|
||||
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
|
||||
}
|
||||
getHighJobPageApi(data).then((res) => {
|
||||
if (res.result) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user