Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev

This commit is contained in:
kun 2024-05-18 18:49:33 +08:00
commit 758ec55bf1
2 changed files with 7 additions and 4 deletions

View File

@ -109,12 +109,12 @@
</view>
<view class="table-item-inner" style="padding-bottom: 5rpx;">
<view class="item-col" style="">{{detailData.devPipelineName||'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].medium||'--':'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].temperature||'--':'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].pressure||'--':'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].materialQuality||'--':'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].specifications||'--':'--'}}</view>
<view class="item-col" style="margin-right: 5rpx;">{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].number||'--':'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].number||'--':'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].medium||'--':'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].temperature||'--':'--'}}</view>
<view class="item-col" style="margin-right: 5rpx;">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].pressure||'--':'--'}}</view>
</view>
</view>
</scroll-view>

View File

@ -75,6 +75,9 @@
<view class="list-info">
风险辨识结果<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</view>
<view class="list-info">
作业实施时间<text class="detail-data" v-if="detailData.workExecutionBeginTime && detailData.workExecutionEndTime">{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}}</text>
</view>
<!-- <view class="list-info">
证书编号<text class="detail-data">{{detailData.certificateNo}}</text>
</view> -->