admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-rain' into bjxz-dev

Browse Source
This commit is contained in:
Vce 2024-05-17 07:44:53 +08:00
commit a72f728c93
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/projectFront/specialWork/blindPlugWork.vue
View File

@ -164,9 +164,9 @@
{{ workDetail.jobApplicationTime }} {{ workDetail.jobApplicationTime }}
</el-form-item> </el-form-item>
<el-form-item label="设备、管道名称：" :label-width="formLabelWidthDetail"> <el-form-item label="设备、管道名称：" :label-width="formLabelWidthDetail">
{{ workDetail.fireLocationAndFirePart }} {{ workDetail.devPipelineName }}
</el-form-item> </el-form-item>
<el-form-item label="介质：" :label-width="formLabelWidthDetail"> <!-- <el-form-item label="介质：" :label-width="formLabelWidthDetail">
{{ workDetail.jobContent }} {{ workDetail.jobContent }}
</el-form-item> </el-form-item>
<el-form-item label="温度：" :label-width="formLabelWidthDetail"> <el-form-item label="温度：" :label-width="formLabelWidthDetail">
@ -183,7 +183,7 @@
</el-form-item> </el-form-item>
<el-form-item label="编号：" :label-width="formLabelWidthDetail"> <el-form-item label="编号：" :label-width="formLabelWidthDetail">
{{ workDetail.jobContent }} {{ workDetail.jobContent }}
</el-form-item> </el-form-item> -->
<el-form-item label="作业人：" :label-width="formLabelWidthDetail"> <el-form-item label="作业人：" :label-width="formLabelWidthDetail">
{{ workDetail.jobPersonName }} {{ workDetail.jobPersonName }}
</el-form-item> </el-form-item>
@ -196,6 +196,7 @@
</div> </div>
</span> </span>
<!-- {{ workDetail.blindPlatePic }} --> <!-- {{ workDetail.blindPlatePic }} -->
{{workDetail.blindPlatePic&& JSON.parse(workDetail.blindPlatePic) instanceof Array && JSON.parse(workDetail.blindPlatePic).map(item => item.name).join('、')}}
</el-form-item> </el-form-item>
<el-form-item label="盲板编号：" :label-width="formLabelWidthDetail"> <el-form-item label="盲板编号：" :label-width="formLabelWidthDetail">
{{ workDetail.blindPlateNo }} {{ workDetail.blindPlateNo }}

17
src/views/projectFront/specialWork/fireWork.vue
View File

@ -65,8 +65,8 @@
<div :style="scope.row.hotWorkLevel == '特级' ?'color:#f56c6c' : scope.row.hotWorkLevel == '一级' ? 'color:#DAA520' : scope.row.hotWorkLevel == '二级' ? 'color:#5181F6' : ''"> {{ scope.row.hotWorkLevel }}</div> <div :style="scope.row.hotWorkLevel == '特级' ?'color:#f56c6c' : scope.row.hotWorkLevel == '一级' ? 'color:#DAA520' : scope.row.hotWorkLevel == '二级' ? 'color:#5181F6' : ''"> {{ scope.row.hotWorkLevel }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="动火人" prop="firemanName"></el-table-column> <el-table-column align="center" label="动火人及证书编号" prop="firemanAndCertificateNo"></el-table-column>
<el-table-column align="center" label="证书编号" prop="certificateNo"></el-table-column> <!-- <el-table-column align="center" label="证书编号" prop="certificateNo"></el-table-column> -->
<el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column> <el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
<el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column> <el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
<!-- 状态 --> <!-- 状态 -->
@ -339,15 +339,18 @@
<el-form-item label="作业负责人：" :label-width="formLabelWidthDetail"> <el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
{{ workDetail.assignmentPersonInChargeName }} {{ workDetail.assignmentPersonInChargeName }}
</el-form-item> </el-form-item>
<el-form-item label="动火人：" :label-width="formLabelWidthDetail"> <!-- <el-form-item label="动火人：" :label-width="formLabelWidthDetail">
{{ workDetail.firemanName }} {{ workDetail.firemanName }}
</el-form-item> -->
<el-form-item label="动火人及证书编号：" :label-width="formLabelWidthDetail">
{{ workDetail.firemanAndCertificateNo }}
</el-form-item> </el-form-item>
<el-form-item label="安全作业票编号：" :label-width="formLabelWidthDetail"> <el-form-item label="关联的其他特殊作业及安全作业票编号：" :label-width="formLabelWidthDetail">
{{ workDetail.safetyWorkTicketCode }} {{ workDetail.otherRelatedSpecialTask }}
</el-form-item> </el-form-item>
<el-form-item label="证书编号：" :label-width="formLabelWidthDetail"> <!-- <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
{{ workDetail.certificateNo }} {{ workDetail.certificateNo }}
</el-form-item> </el-form-item> -->
<el-form-item label="动火作业实施时间：" :label-width="formLabelWidthDetail"> <el-form-item label="动火作业实施时间：" :label-width="formLabelWidthDetail">
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange" <el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"