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

修复一下

parents 1d096feb ce0cd38b
<template>
<div class="app-container detail" style="background-color: rgb(238, 241, 245);">
<div style="padding-top: 10px;background: #fff;height: 100%;">
<el-row>
<el-col :span="24" style="padding-left: 15px;">
<div style="height: 45px;" @click="$router.go(-1)">
......@@ -24,20 +24,20 @@
<span v-if="scope.row.deviceType == '4'">压力表</span>
</template>
</el-table-column>
<el-table-column label="标况累计量" align="center" prop="standardConditionAccumulation" />
<el-table-column label="标况累计量(m³)" align="center" prop="standardConditionAccumulation" />
</el-table>
<el-table :data="dataListdetail2" style="width: 100%;margin-top: 20px;">
<el-table-column label="工况累计量" align="center" prop="workingConditionAccumulation" />
<el-table-column label="剩余量" align="center" prop="residualQuantity" />
<el-table-column label="标况流量" align="center" prop="standardConditionFlow" />
<el-table-column label="工况流量" align="center" prop="workingConditionFlow" />
<el-table-column label="工况累计量(m³)" align="center" prop="workingConditionAccumulation" />
<el-table-column label="剩余量(m³)" align="center" prop="residualQuantity" />
<el-table-column label="标况流量(m³/h)" align="center" prop="standardConditionFlow" />
<el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
</el-table>
<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="pressure" />
<el-table-column label="温度(℃)" align="center" prop="temperature" />
<el-table-column label="压力(KPa)" align="center" prop="pressure" />
<el-table-column label="上报时间" align="center" prop="reportTime" />
<el-table-column label="设备状态" align="center" prop="deviceStatus">
</el-table-column>
......@@ -52,7 +52,7 @@
</el-row>
<template v-if="$route.query.deviceType !='0'">
<el-row v-if="form.deviceType != '4'">
<el-col :span="12" style="padding: 10px;">
......@@ -87,19 +87,19 @@
</el-col>
</el-row>
<!-- <div v-if="form.deviceType != '4'" style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;"> -->
<!-- </div> -->
<!-- <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;"> -->
<!-- </div> -->
</template>
</div>
</div>
......@@ -222,11 +222,11 @@
});
},
initData(getData1, getData2, getData3) {
// 基于准备好的dom,初始化echarts实例
var myChart1 = echarts.init(document.getElementById('main1'));
// 绘制图表
myChart1.setOption({
......@@ -322,7 +322,7 @@
drawPieChart(getData4, getData5, getData3) {
// 基于准备好的dom,初始化echarts实例
var myChart2 = echarts.init(document.getElementById('main2'));
// 绘制图表
myChart2.setOption({
title: {
......@@ -411,7 +411,7 @@
main3(getData6, getData3) {
// 基于准备好的dom,初始化echarts实例
var myChart3 = echarts.init(document.getElementById('main3'));
// 绘制图表
myChart3.setOption({
......@@ -566,7 +566,7 @@
handleDownload(file) {
console.log(file);
},
getData() {
getData(this.deviceId).then(response => {
const { deviceName, deviceCode, deviceType, standardConditionAccumulation,
......@@ -585,7 +585,7 @@
console.log("this.form", this.form)
// if (this.form.length > 0) {
// }
// for (var i = 0; i < this.form.length; i++) {
// let obj = this.form[i];
......@@ -622,9 +622,9 @@
if (this.form.orderType == '1') {
// 获取设备列表树
......@@ -730,4 +730,4 @@
font-size: 15px;
font-weight: 900;
}
</style>
\ No newline at end of file
</style>
......@@ -50,14 +50,12 @@
<font>{{form.createTime}}</font>
</el-form-item>
<el-form-item label="处理状态:" prop="dealStatus">
<template slot-scope="scope">
<span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span>
<span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '') &&
scope.row.orderId != null && scope.row.orderId != ''">暂未处理</span>
<span v-if="scope.row.dealStatus == 1">不需处理</span>
<span v-if="scope.row.dealStatus == 2">已处理完成</span>
<span v-if="scope.row.dealStatus == 3">未处理完成</span>
</template>
<span v-if="form.orderId == null || form.orderId == ''">未生成工单</span>
<span v-if="(form.dealStatus == null || form.dealStatus == '') &&
form.orderId != null && form.orderId != ''">暂未处理</span>
<span v-if="form.dealStatus == 1">不需处理</span>
<span v-if="form.dealStatus == 2">已处理完成</span>
<span v-if="form.dealStatus == 3">未处理完成</span>
</el-form-item>
</el-form>
</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