Commit 15c9e30b authored by 纪泽龙's avatar 纪泽龙

修复一下

parents 1d096feb ce0cd38b
...@@ -24,20 +24,20 @@ ...@@ -24,20 +24,20 @@
<span v-if="scope.row.deviceType == '4'">压力表</span> <span v-if="scope.row.deviceType == '4'">压力表</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标况累计量" align="center" prop="standardConditionAccumulation" /> <el-table-column label="标况累计量(m³)" align="center" prop="standardConditionAccumulation" />
</el-table> </el-table>
<el-table :data="dataListdetail2" style="width: 100%;margin-top: 20px;"> <el-table :data="dataListdetail2" style="width: 100%;margin-top: 20px;">
<el-table-column label="工况累计量" align="center" prop="workingConditionAccumulation" /> <el-table-column label="工况累计量(m³)" align="center" prop="workingConditionAccumulation" />
<el-table-column label="剩余量" align="center" prop="residualQuantity" /> <el-table-column label="剩余量(m³)" align="center" prop="residualQuantity" />
<el-table-column label="标况流量" align="center" prop="standardConditionFlow" /> <el-table-column label="标况流量(m³/h)" align="center" prop="standardConditionFlow" />
<el-table-column label="工况流量" align="center" prop="workingConditionFlow" /> <el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
</el-table> </el-table>
<el-table :data="dataListdetail3" style="width: 100%;margin-top: 20px;"> <el-table :data="dataListdetail3" style="width: 100%;margin-top: 20px;">
<el-table-column label="温度" align="center" prop="temperature" /> <el-table-column label="温度(℃)" align="center" prop="temperature" />
<el-table-column label="压力" align="center" prop="pressure" /> <el-table-column label="压力(KPa)" align="center" prop="pressure" />
<el-table-column label="上报时间" align="center" prop="reportTime" /> <el-table-column label="上报时间" align="center" prop="reportTime" />
<el-table-column label="设备状态" align="center" prop="deviceStatus"> <el-table-column label="设备状态" align="center" prop="deviceStatus">
</el-table-column> </el-table-column>
......
...@@ -50,14 +50,12 @@ ...@@ -50,14 +50,12 @@
<font>{{form.createTime}}</font> <font>{{form.createTime}}</font>
</el-form-item> </el-form-item>
<el-form-item label="处理状态:" prop="dealStatus"> <el-form-item label="处理状态:" prop="dealStatus">
<template slot-scope="scope"> <span v-if="form.orderId == null || form.orderId == ''">未生成工单</span>
<span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span> <span v-if="(form.dealStatus == null || form.dealStatus == '') &&
<span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '') && form.orderId != null && form.orderId != ''">暂未处理</span>
scope.row.orderId != null && scope.row.orderId != ''">暂未处理</span> <span v-if="form.dealStatus == 1">不需处理</span>
<span v-if="scope.row.dealStatus == 1">不需处理</span> <span v-if="form.dealStatus == 2">已处理完成</span>
<span v-if="scope.row.dealStatus == 2">已处理完成</span> <span v-if="form.dealStatus == 3">未处理完成</span>
<span v-if="scope.row.dealStatus == 3">未处理完成</span>
</template>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment