Commit ce0cd38b authored by 王晓倩's avatar 王晓倩

隐患信息详情显示处理状态问题、实时数据详情字段名显示单位

parent 8edec1e3
<template> <template>
<div class="app-container detail" style="background-color: rgb(238, 241, 245);"> <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
<div style="padding-top: 10px;background: #fff;height: 100%;"> <div style="padding-top: 10px;background: #fff;height: 100%;">
<el-row> <el-row>
<el-col :span="24" style="padding-left: 15px;"> <el-col :span="24" style="padding-left: 15px;">
<div style="height: 45px;" @click="$router.go(-1)"> <div style="height: 45px;" @click="$router.go(-1)">
...@@ -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>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-row> </el-row>
<template v-if="$route.query.deviceType !='0'"> <template v-if="$route.query.deviceType !='0'">
<el-row v-if="form.deviceType != '4'"> <el-row v-if="form.deviceType != '4'">
<el-col :span="12" style="padding: 10px;"> <el-col :span="12" style="padding: 10px;">
...@@ -87,19 +87,19 @@ ...@@ -87,19 +87,19 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- <div v-if="form.deviceType != '4'" style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;"> --> <!-- <div v-if="form.deviceType != '4'" style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;"> -->
<!-- </div> --> <!-- </div> -->
<!-- <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;"> --> <!-- <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;"> -->
<!-- </div> --> <!-- </div> -->
</template> </template>
</div> </div>
</div> </div>
...@@ -222,11 +222,11 @@ ...@@ -222,11 +222,11 @@
}); });
}, },
initData(getData1, getData2, getData3) { initData(getData1, getData2, getData3) {
// 基于准备好的dom,初始化echarts实例 // 基于准备好的dom,初始化echarts实例
var myChart1 = echarts.init(document.getElementById('main1')); var myChart1 = echarts.init(document.getElementById('main1'));
// 绘制图表 // 绘制图表
myChart1.setOption({ myChart1.setOption({
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
drawPieChart(getData4, getData5, getData3) { drawPieChart(getData4, getData5, getData3) {
// 基于准备好的dom,初始化echarts实例 // 基于准备好的dom,初始化echarts实例
var myChart2 = echarts.init(document.getElementById('main2')); var myChart2 = echarts.init(document.getElementById('main2'));
// 绘制图表 // 绘制图表
myChart2.setOption({ myChart2.setOption({
title: { title: {
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
main3(getData6, getData3) { main3(getData6, getData3) {
// 基于准备好的dom,初始化echarts实例 // 基于准备好的dom,初始化echarts实例
var myChart3 = echarts.init(document.getElementById('main3')); var myChart3 = echarts.init(document.getElementById('main3'));
// 绘制图表 // 绘制图表
myChart3.setOption({ myChart3.setOption({
...@@ -566,7 +566,7 @@ ...@@ -566,7 +566,7 @@
handleDownload(file) { handleDownload(file) {
console.log(file); console.log(file);
}, },
getData() { getData() {
getData(this.deviceId).then(response => { getData(this.deviceId).then(response => {
const { deviceName, deviceCode, deviceType, standardConditionAccumulation, const { deviceName, deviceCode, deviceType, standardConditionAccumulation,
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
console.log("this.form", this.form) console.log("this.form", this.form)
// if (this.form.length > 0) { // if (this.form.length > 0) {
// } // }
// for (var i = 0; i < this.form.length; i++) { // for (var i = 0; i < this.form.length; i++) {
// let obj = this.form[i]; // let obj = this.form[i];
...@@ -622,9 +622,9 @@ ...@@ -622,9 +622,9 @@
if (this.form.orderType == '1') { if (this.form.orderType == '1') {
// 获取设备列表树 // 获取设备列表树
...@@ -730,4 +730,4 @@ ...@@ -730,4 +730,4 @@
font-size: 15px; font-size: 15px;
font-weight: 900; font-weight: 900;
} }
</style> </style>
\ No newline at end of file
...@@ -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