盲板表格绘制完成

This commit is contained in:
Vce 2024-05-18 01:10:24 +08:00
parent 1fec7cc2cb
commit b08e8984b4
3 changed files with 131 additions and 142 deletions

View File

@ -37,10 +37,10 @@
<view class="list-info"> <view class="list-info">
实际作业开始时间<text class="detail-data">{{detailData.actualJobBeginTime}}</text> 实际作业开始时间<text class="detail-data">{{detailData.actualJobBeginTime}}</text>
</view> </view>
<view class="list-info"> <!-- <view class="list-info">
设备管道名称<text class="detail-data">{{detailData.devPipelineName}}</text> 设备管道名称<text class="detail-data">{{detailData.devPipelineName}}</text>
</view> </view> -->
<view class="list-info"> <!-- <view class="list-info">
温度介质压力<text class="detail-data"> 温度介质压力<text class="detail-data">
<text v-for="(item,i) in JSON.parse(detailData.blindPlateParameter)"> <text v-for="(item,i) in JSON.parse(detailData.blindPlateParameter)">
<text style="margin-right: 12rpx;">{{item.temperature||'无'}}</text> <text style="margin-right: 12rpx;">{{item.temperature||'无'}}</text>
@ -48,8 +48,8 @@
<text style="margin-right: 12rpx;">{{item.pressure||'无'}}</text> <text style="margin-right: 12rpx;">{{item.pressure||'无'}}</text>
</text> </text>
</text> </text>
</view> </view> -->
<view class="list-info"> <!-- <view class="list-info">
材质数量规格<text class="detail-data"> 材质数量规格<text class="detail-data">
<text v-for="(item,i) in JSON.parse(detailData.pipelineParameter)"> <text v-for="(item,i) in JSON.parse(detailData.pipelineParameter)">
<text style="margin-right: 12rpx;">{{item.materialQuality||'无'}}</text> <text style="margin-right: 12rpx;">{{item.materialQuality||'无'}}</text>
@ -57,16 +57,10 @@
<text style="margin-right: 12rpx;">{{item.specifications||'无'}}</text> <text style="margin-right: 12rpx;">{{item.specifications||'无'}}</text>
</text> </text>
</text> </text>
</view> </view> -->
<view class="list-info"> <view class="list-info">
监护人<text class="detail-data">{{detailData.guardianName}}</text> 监护人<text class="detail-data">{{detailData.guardianName}}</text>
</view> </view>
<view class="list-info">
风险辨识结果<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</view>
<view class="list-info">
关联的其他特殊作业及安全作业票编号<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
</view>
<view class="list-info"> <view class="list-info">
盲板编号<text class="detail-data">{{detailData.blindPlateNo}}</text> 盲板编号<text class="detail-data">{{detailData.blindPlateNo}}</text>
</view> </view>
@ -82,34 +76,47 @@
</text> </text>
</text> </text>
</view> </view>
<!-- <view class="table-info" style=""> <view class="list-info">
<view class="teble-list"> 编制人<text class="detail-data">{{detailData.organizer}}</text>
</view>
<view class="list-info">
编制日期<text class="detail-data">{{detailData.organizerDate}}</text>
</view>
<view class="list-info">
风险辨识结果<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</view>
<view class="list-info">
关联的其他特殊作业及安全作业票编号<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
</view>
<view class="table-info" style="">
<scroll-view :scroll-x="true" class="teble-list">
<view class="teble-item"> <view class="teble-item">
<view class="item-col" style="background-color: lightgray;">气体取样分析时间</view> <view class="table-item-inner">
<view class="item-col" style="background-color: lightgray;">代表性气体</view> <view class="item-col" style="display: flex;justify-content: center;align-items: flex-end;line-height: 20rpx;"><text>设备管道</text></view>
<view class="item-col" style="background-color: lightgray;">分析结果/%</view> <view class="item-col" style="width: 665rpx;">管道参数</view>
<view class="item-col" style="margin-bottom: 5rpx;background-color: lightgray;">分析人</view> <view class="item-col" style="margin-right: 5rpx;width: 665rpx;">盲板参数</view>
</view> </view>
<view class="teble-item"> <view class="table-item-inner">
<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</view> <view class="item-col" style="margin-top: 0;display: flex;justify-content: center;align-items: flex-start;line-height: 20rpx;">名称</view>
<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</view> <view class="item-col" style="">介质</view>
<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</view> <view class="item-col" style="">温度</view>
<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzer:''}}</view> <view class="item-col" style="">压力</view>
<view class="item-col" style="">材质</view>
<view class="item-col" style="">规格</view>
<view class="item-col" style="margin-right: 5rpx;">编号</view>
</view> </view>
<view class="teble-item"> <view class="table-item-inner" style="padding-bottom: 5rpx;">
<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</view> <view class="item-col" style="">{{detailData.devPipelineName}}</view>
<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</view> <view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0].medium}}</view>
<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</view> <view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0].temperature}}</view>
<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzer:''}}</view> <view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0].pressure}}</view>
</view> <view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0].materialQuality}}</view>
<view class="teble-item"> <view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0].specifications}}</view>
<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view> <view class="item-col" style="margin-right: 5rpx;">{{JSON.parse(detailData.pipelineParameter)[0].number}}</view>
<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
</view> </view>
</view> </view>
</view> --> </scroll-view>
</view>
<view class="safe-mesure"> <view class="safe-mesure">
<view class="safe-btn" @click="goSafeMesure">查看安全措施</view> <view class="safe-btn" @click="goSafeMesure">查看安全措施</view>
</view> </view>
@ -410,29 +417,33 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
// background-color: lightgray;
.teble-list{ .teble-list{
display: flex; display: flex;
justify-content: flex-start;
width: 100%;
font-size: 18rpx; font-size: 18rpx;
background-color: gainsboro; width: 99%;
.teble-item{
width: 24.8%;
line-height: 40rpx;
// border: 1rpx solid black;
// background-color: darkred;
.item-col{
// margin: 0 5rpx; // margin: 0 5rpx;
margin-left: 5rpx;
margin-top: 5rpx;
padding: 3rpx;
text-align: center;
background-color: #fff; background-color: #fff;
white-space: nowrap;
.teble-item{
display: inline-block;
white-space: normal;
.table-item-inner{
background-color: lightgray;
display: flex;
// min-width: 200rpx;
.item-col{
width: 220rpx;
padding: 3rpx;
margin-top: 5rpx;
margin-left: 5rpx;
line-height: 50rpx;
text-align: center;
background-color: #F6F6F6;
} }
} }
} }
.u-td{
height: auto;
} }
} }
.dangerbig-details{ .dangerbig-details{

View File

@ -55,7 +55,6 @@
风险辨识结果<text class="detail-data">{{detailData.riskIdentificationResult}}</text> 风险辨识结果<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</view> </view>
<view class="table-info" style=""> <view class="table-info" style="">
<!-- <view class="teble-list"> -->
<scroll-view :scroll-x="true" class="teble-list"> <scroll-view :scroll-x="true" class="teble-list">
<view class="teble-item"> <view class="teble-item">
<view class="item-col" style="background-color: lightgray;">气体取样分析时间</view> <view class="item-col" style="background-color: lightgray;">气体取样分析时间</view>
@ -368,44 +367,23 @@
background-color: #fff; background-color: #fff;
.teble-list{ .teble-list{
display: flex; display: flex;
// justify-content: flex-start;
// width: auto;
// max-width: 100%;
// width: 100rpx;
// width: auto;
font-size: 18rpx; font-size: 18rpx;
// background-color: gainsboro;
background-color: #fff; background-color: #fff;
white-space: nowrap; white-space: nowrap;
.teble-item{ .teble-item{
display: inline-block; display: inline-block;
white-space: normal; white-space: normal;
// width: 24.8%;
width: 220rpx; width: 220rpx;
// line-height: 40rpx;
// border: 1rpx solid black;
// background-color: darkred;
// margin-left: 5rpx;
// margin-top: 5rpx;
// padding: 3rpx;
.item-col{ .item-col{
padding: 3rpx; padding: 3rpx;
margin-top: 5rpx; margin-top: 5rpx;
margin-left: 5rpx; margin-left: 5rpx;
// margin: 0 5rpx;
line-height: 50rpx; line-height: 50rpx;
// min-height: 50rpx;
// height: 50rpx;
text-align: center; text-align: center;
background-color: #F6F6F6; background-color: #F6F6F6;
} }
} }
} }
.u-td{
height: auto;
}
} }
.dangerbig-details{ .dangerbig-details{
min-height: 100%; min-height: 100%;