flx：修改动火作业
This commit is contained in:
Vce
parent
cb237539b0
commit
d69dba3ee7
@ -353,64 +353,88 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template v-slot:gasanalysis>
|
<template v-slot:gasanalysis>
|
||||||
<div>
|
<div class="gastable">
|
||||||
<el-form :model="detailData">
|
<el-row>
|
||||||
<el-row>
|
<el-col :span="2">
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="分析项目：" :label-width="formLabelWidthDetail">
|
|
||||||
受限空间
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="6">
|
||||||
<el-form-item label="有毒有害气体名称" :label-width="formLabelWidthDetail">
|
有毒有害气体名称
|
||||||
一氧化碳
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="6">
|
||||||
<el-form-item label="可燃气体名称：" :label-width="formLabelWidthDetail">
|
可燃气体名称
|
||||||
天然气
|
</el-col>
|
||||||
</el-form-item>
|
<el-col :span="2">
|
||||||
|
氧气含量
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
取样分析时间
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
分析部位
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
分析人
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="2">
|
||||||
<el-form-item label="合格标准：" :label-width="formLabelWidthDetail">
|
分析项目
|
||||||
100
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="3">
|
||||||
<el-form-item label="氧气含氧量(19.5%~21%)：" :label-width="formLabelWidthDetail">
|
二氧化硫
|
||||||
20%
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="3">
|
||||||
<el-form-item label="取样分析时间：" :label-width="formLabelWidthDetail">
|
氧化硫
|
||||||
<el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="date"
|
</el-col>
|
||||||
:picker-options="pickerOptions" value-format="yyyy-MM-dd">
|
<el-col :span="3">
|
||||||
</el-date-picker>
|
甲烷
|
||||||
</el-form-item>
|
</el-col>
|
||||||
|
<el-col :span="3">
|
||||||
|
氢气
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
--
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
--
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
--
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
--
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="2">
|
||||||
<el-form-item label="分析部位：" :label-width="formLabelWidthDetail">
|
合格标准
|
||||||
顶部
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="3">
|
||||||
<el-form-item label="分析人：" :label-width="formLabelWidthDetail">
|
5%
|
||||||
刘大大
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="10">
|
<el-col :span="3">
|
||||||
<el-form-item label="分析数据：" :label-width="formLabelWidthDetail">
|
5%
|
||||||
|
</el-col>
|
||||||
<el-input v-model="detailData.engineeringSurvey" :disabled="isDisabledDetail"
|
<el-col :span="3">
|
||||||
placeholder="一氧化碳/天然气/20%/2024-01-12/顶部/刘大大" autocomplete="off"></el-input>
|
5%
|
||||||
</el-form-item>
|
</el-col>
|
||||||
|
<el-col :span="3">
|
||||||
|
5%
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
5%
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
--
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
--
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="2">
|
||||||
|
--
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</detail>
|
</detail>
|
||||||
@ -951,6 +975,37 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
.gastable {
|
||||||
|
padding: 10px 20px;
|
||||||
|
.el-row:first-child {
|
||||||
|
.el-col {
|
||||||
|
border-top: 1px solid #E1E1E1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.el-row:last-child {
|
||||||
|
.el-col {
|
||||||
|
border-bottom: 1px 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 {
|
.el-button--text {
|
||||||
color: #262d47;
|
color: #262d47;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -226,6 +226,24 @@
|
|||||||
<!-- <el-col :span="2">丁曼容</el-col> -->
|
<!-- <el-col :span="2">丁曼容</el-col> -->
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="info border-top_1">
|
||||||
|
<div class="box-title-danger">
|
||||||
|
<span>其它安全措施</span>
|
||||||
|
</div>
|
||||||
|
<div class="info-content">
|
||||||
|
<el-form class="form-box" :model="workDetail">
|
||||||
|
<el-form-item label="其它安全措施内容：" :label-width="formLabelWidth">
|
||||||
|
{{workDetail.safetyInformantName}}
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="是否涉及：" :label-width="formLabelWidth">
|
||||||
|
{{workDetail.acceptTheInformantName}}
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="编制人：" :label-width="formLabelWidth">
|
||||||
|
{{workDetail.guardianName}}
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="info border-top_1">
|
<div class="info border-top_1">
|
||||||
<div class="box-title-danger">
|
<div class="box-title-danger">
|
||||||
<span>安全交底人</span>
|
<span>安全交底人</span>
|
||||||
@ -235,7 +253,7 @@
|
|||||||
<el-form-item label="安全交底人：" :label-width="formLabelWidth">
|
<el-form-item label="安全交底人：" :label-width="formLabelWidth">
|
||||||
{{workDetail.safetyInformantName}}
|
{{workDetail.safetyInformantName}}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="接受交底人：" :label-width="formLabelWidth">
|
<el-form-item label="技术交底人：" :label-width="formLabelWidth">
|
||||||
{{workDetail.acceptTheInformantName}}
|
{{workDetail.acceptTheInformantName}}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="监护人：" v-if="COMPANY != 'longguang'" :label-width="formLabelWidth">
|
<el-form-item label="监护人：" v-if="COMPANY != 'longguang'" :label-width="formLabelWidth">
|
||||||
@ -1619,10 +1637,12 @@ export default {
|
|||||||
|
|
||||||
.el-row:first-child {
|
.el-row:first-child {
|
||||||
color: #868490;
|
color: #868490;
|
||||||
|
padding-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
.el-row:not(:first-child ){
|
||||||
.el-row {
|
|
||||||
padding: 8px 0;
|
padding: 8px 0;
|
||||||
|
}
|
||||||
|
.el-row {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
||||||
.green {
|
.green {
|
||||||
|
|||||||
@ -339,10 +339,10 @@
|
|||||||
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
||||||
{{ workDetail.riskIdentificationResult }}
|
{{ workDetail.riskIdentificationResult }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!--
|
||||||
<el-form-item label="作业类型：" :label-width="formLabelWidthDetail">
|
<el-form-item label="作业类型：" :label-width="formLabelWidthDetail">
|
||||||
动火作业
|
动火作业
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<!-- <el-form-item label="危大工程概况：" :label-width="formLabelWidthDetail">
|
<!-- <el-form-item label="危大工程概况：" :label-width="formLabelWidthDetail">
|
||||||
<el-input v-model="detailData.engineeringSurvey" :disabled="isDisabled"
|
<el-input v-model="detailData.engineeringSurvey" :disabled="isDisabled"
|
||||||
placeholder="请输入危大工程概况" autocomplete="off"></el-input>
|
placeholder="请输入危大工程概况" autocomplete="off"></el-input>
|
||||||
@ -382,6 +382,12 @@
|
|||||||
<!-- <el-col :span="3">50%</el-col>
|
<!-- <el-col :span="3">50%</el-col>
|
||||||
<el-col :span="3">50%</el-col> -->
|
<el-col :span="3">50%</el-col> -->
|
||||||
</el-row>
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="3">分析人</el-col>
|
||||||
|
<el-col :span="3" v-for="item in workDetail.xzGasAnalyzeList" :key="item.id">{{ item.analyzer }}</el-col>
|
||||||
|
<!-- <el-col :span="3">50%</el-col>
|
||||||
|
<el-col :span="3">50%</el-col> -->
|
||||||
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</detail>
|
</detail>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user