Commit 2ccacb7a authored by xiexingan's avatar xiexingan

调整

parent 92fedc75
<template> <template>
<div class="en-table"> <div class="en-table">
<el-table <el-table
border
stripe stripe
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
...@@ -29,6 +28,7 @@ ...@@ -29,6 +28,7 @@
v-if="isShowOp" v-if="isShowOp"
align="center" align="center"
label="操作" label="操作"
fixed='right'
:width="opNum * 65" :width="opNum * 65"
> >
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
{ {
align: 'center', align: 'center',
prop: 'name', prop: 'name',
label: '设备名称' label: '设备名称',
width: 180
}, },
{ {
align: 'center', align: 'center',
...@@ -37,17 +38,22 @@ ...@@ -37,17 +38,22 @@
{ {
align: 'center', align: 'center',
prop: 'heating_start_temperature', prop: 'heating_start_temperature',
label: '制热启动温度' label: '制热启动温度',
width: 120
}, },
{ {
align: 'center', align: 'center',
prop: 'heating_stop_temperature', prop: 'heating_stop_temperature',
label: '制热停止温度' label: '制热停止温度',
width: 120
}, },
{ {
align: 'center', align: 'center',
prop: 'indoor_ambient_temperature', prop: 'indoor_ambient_temperature',
label: '室内环境温度' label: '室内环境温度',
width: 120
}, },
{ {
align: 'center', align: 'center',
...@@ -62,12 +68,16 @@ ...@@ -62,12 +68,16 @@
{ {
align: 'center', align: 'center',
prop: 'hot_air_start_temperature', prop: 'hot_air_start_temperature',
label: '热风启动温度' label: '热风启动温度',
width: 120
}, },
{ {
align: 'center', align: 'center',
prop: 'hot_air_stop_temperature', prop: 'hot_air_stop_temperature',
label: '热风停止温度' label: '热风停止温度',
width: 120
}, },
{ {
align: 'center', align: 'center',
......
...@@ -59,34 +59,34 @@ ...@@ -59,34 +59,34 @@
span.value {{params[0].hot_water_mode}} span.value {{params[0].hot_water_mode}}
div(v-if='this.params.length&&this.params[0].water_supply_temperature') div(v-if='this.params.length&&this.params[0].water_supply_temperature')
span.type 供水温度: span.type 供水温度:
span.value {{params[0].water_supply_temperature}} span.value {{params[0].water_supply_temperature}}
div(v-if='this.params.length&&this.params[0].return_water_temperature') div(v-if='this.params.length&&this.params[0].return_water_temperature')
span.type 回水温度: span.type 回水温度:
span.value {{params[0].return_water_temperature}} span.value {{params[0].return_water_temperature}}
div(v-if='this.params.length&&this.params[0].heating_start_temperature') div(v-if='this.params.length&&this.params[0].heating_start_temperature')
span.type 制热启动温度: span.type 制热启动温度:
span.value {{params[0].heating_start_temperature}} span.value {{params[0].heating_start_temperature}}
div(v-if='this.params.length&&this.params[0].heating_stop_temperature') div(v-if='this.params.length&&this.params[0].heating_stop_temperature')
span.type 制热停止温度: span.type 制热停止温度:
span.value {{params[0].heating_stop_temperature}} span.value {{params[0].heating_stop_temperature}}
div(v-if='this.params.length&&this.params[0].indoor_ambient_temperature') div(v-if='this.params.length&&this.params[0].indoor_ambient_temperature')
span.type 室内环境温度: span.type 室内环境温度:
span.value {{params[0].indoor_ambient_temperature}} span.value {{params[0].indoor_ambient_temperature}}
div(v-if='this.params.length&&this.params[0].outlet_temperature') div(v-if='this.params.length&&this.params[0].outlet_temperature')
span.type 出风温度: span.type 出风温度:
span.value {{params[0].outlet_temperature}} span.value {{params[0].outlet_temperature}}
div(v-if='this.params.length&&this.params[0].return_air_temperature') div(v-if='this.params.length&&this.params[0].return_air_temperature')
span.type 回风温度: span.type 回风温度:
span.value {{params[0].return_air_temperature}} span.value {{params[0].return_air_temperature}}
div(v-if='this.params.length&&this.params[0].hot_air_start_temperature') div(v-if='this.params.length&&this.params[0].hot_air_start_temperature')
span.type 热风启动温度: span.type 热风启动温度:
span.value {{params[0].hot_air_start_temperature}} span.value {{params[0].hot_air_start_temperature}}
div(v-if='this.params.length&&this.params[0].hot_air_stop_temperature') div(v-if='this.params.length&&this.params[0].hot_air_stop_temperature')
span.type 热风停止温度: span.type 热风停止温度:
span.value {{params[0].hot_air_stop_temperature}} span.value {{params[0].hot_air_stop_temperature}}
div(v-if='this.params.length&&this.params[0].temperature') div(v-if='this.params.length&&this.params[0].temperature')
span.type 温度: span.type 温度:
span.value {{params[0].temperature}} span.value {{params[0].temperature}}
div(v-if='this.params.length&&this.params[0].humidity') div(v-if='this.params.length&&this.params[0].humidity')
span.type 湿度: span.type 湿度:
span.value {{params[0].humidity}} span.value {{params[0].humidity}}
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
span.value {{params[0].radiation}} span.value {{params[0].radiation}}
div(v-if='this.params.length&&this.params[0].setting_temperature') div(v-if='this.params.length&&this.params[0].setting_temperature')
span.type 设定温度: span.type 设定温度:
span.value {{params[0].setting_temperature}} span.value {{params[0].setting_temperature}}
div(v-if='this.params.length&&this.params[0].setting_mode') div(v-if='this.params.length&&this.params[0].setting_mode')
span.type 设定模式: span.type 设定模式:
span.value {{params[0].setting_mode}} span.value {{params[0].setting_mode}}
...@@ -245,7 +245,7 @@ export default { ...@@ -245,7 +245,7 @@ export default {
font-size: 14px; font-size: 14px;
margin: 5px 0 0 10px; margin: 5px 0 0 10px;
display: inline-block; display: inline-block;
width: 85px; width: 105px;
} }
.value { .value {
color: #47b320; color: #47b320;
......
...@@ -15,19 +15,19 @@ card-warp(title="室内气象数据", height="45px", showBackground) ...@@ -15,19 +15,19 @@ card-warp(title="室内气象数据", height="45px", showBackground)
.data-warp .data-warp
.data-item .data-item
.type 温度 .type 温度
.color-blue .color-blue(v-if='hcdtSnqx')
span.num(v-if="activeName == 1") {{ hcdtSnqx.temperature }} span.num(v-if="activeName == 1") {{ hcdtSnqx.temperature }}
span.num(v-else) {{ bgqySnqx.temperature }} span.num(v-else) {{ bgqySnqx.temperature }}
span.unit ℃ span.unit ℃
.data-item .data-item
.type 湿度 .type 湿度
.color-cyan .color-cyan(v-if='hcdtSnqx')
span.num(v-if="activeName == 1") {{ hcdtSnqx.humidity }} span.num(v-if="activeName == 1") {{ hcdtSnqx.humidity }}
span.num(v-else) {{ bgqySnqx.humidity }} span.num(v-else) {{ bgqySnqx.humidity }}
span.unit %RH span.unit %RH
.data-item .data-item
.type CO2 .type CO2
.color-green .color-green(v-if='hcdtSnqx')
span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }} span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }}
span.num(v-else) {{ bgqySnqx.carbon_dioxide }} span.num(v-else) {{ bgqySnqx.carbon_dioxide }}
span.unit PPM span.unit PPM
......
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