Commit 3fc9de24 authored by co_dengxiongwen's avatar co_dengxiongwen

页面调整

parent 82de5e7e
...@@ -58,12 +58,7 @@ ...@@ -58,12 +58,7 @@
</div> </div>
<div style="height: calc(100% - 70px)"> <div style="height: calc(100% - 70px)">
<!-- <chart yAxisName='单位:kwh'></chart> --> <!-- <chart yAxisName='单位:kwh'></chart> -->
<chart <chart id="111" :data="data" :title="title" color="#21ACFC"></chart>
id="111"
:data="data"
:title="title"
color="#21ACFC"
></chart>
</div> </div>
</div> </div>
</cardList> </cardList>
...@@ -92,7 +87,8 @@ export default { ...@@ -92,7 +87,8 @@ export default {
{ name: '今年', id: 4 } { name: '今年', id: 4 }
], ],
currentActive: 1, currentActive: 1,
title: '今日能耗数据(kwh)', // title: '今日能耗数据(kwh)',
title: '能耗数据(kwh)',
data: [], data: [],
energyTabList: [ energyTabList: [
{ {
...@@ -111,10 +107,6 @@ export default { ...@@ -111,10 +107,6 @@ export default {
value: 'b47661ca1d454f9792ba5369f3cb2bc5', value: 'b47661ca1d454f9792ba5369f3cb2bc5',
label: '机房空调(380V)' label: '机房空调(380V)'
}, },
{
value: 'c788ce98c1f248f590434394da485ce4',
label: '防火卷帘门'
},
{ {
value: 'b45827c068254695864ee3c1d42573cb', value: 'b45827c068254695864ee3c1d42573cb',
label: '风冷热泵机组' label: '风冷热泵机组'
...@@ -157,20 +149,20 @@ export default { ...@@ -157,20 +149,20 @@ export default {
// 当日 ,本周 // 当日 ,本周
handleDate(i) { handleDate(i) {
this.currentActive = i this.currentActive = i
switch (i) { // switch (i) {
case 1: // case 1:
this.title = '今日能耗数据(kwh)' // this.title = '今日能耗数据(kwh)'
break // break
case 2: // case 2:
this.title = '本周能耗数据(kwh)' // this.title = '本周能耗数据(kwh)'
break // break
case 3: // case 3:
this.title = '当月能耗数据(kwh)' // this.title = '当月能耗数据(kwh)'
break // break
case 4: // case 4:
this.title = '今年能耗数据(kwh)' // this.title = '今年能耗数据(kwh)'
break // break
} // }
this.getDataList() this.getDataList()
}, },
toPowerPage() { toPowerPage() {
......
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
prop: 'hot_air_stop_temperature', prop: 'hot_air_stop_temperature',
label: '热风停止温度', label: '热风停止温度',
width: 120 width: 120
}, },
{ {
align: 'center', align: 'center',
prop: 'electric_energy', prop: 'electric_energy',
label: '用电量' label: '今日用电量(kwh)',
width: 120
}, },
{ {
align: 'center', align: 'center',
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
{ {
align: 'center', align: 'center',
prop: 'electric_energy', prop: 'electric_energy',
label: '用电量' label: '今日用电量(kwh)'
}, },
// { // {
// align: 'center', // align: 'center',
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{ {
align: 'center', align: 'center',
prop: 'electric_energy', prop: 'electric_energy',
label: '用电量' label: '今日用电量(kwh)'
}, },
// { // {
// align: 'center', // align: 'center',
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.quDetailM .quDetailM
p.leftP 设备编号&nbsp;:&nbsp;&nbsp; {{ dataForm.code }} p.leftP 设备编号&nbsp;:&nbsp;&nbsp; {{ dataForm.code }}
.quDetailM .quDetailM
p.leftP 设备品牌:&nbsp;:&nbsp;&nbsp;{{ dataForm.name }} p.leftP 设备品牌:&nbsp;:&nbsp;&nbsp; 格力
.quDetailM .quDetailM
p.leftP 设备型号:&nbsp;:&nbsp;&nbsp;{{ dataForm.equipmentModel }} p.leftP 设备型号:&nbsp;:&nbsp;&nbsp;{{ dataForm.equipmentModel }}
.quDetailM .quDetailM
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
div(:class="[state == 1 ? 'on' : '']", @click="handleSwitch(1)") 打开 div(:class="[state == 1 ? 'on' : '']", @click="handleSwitch(1)") 打开
div(:class="[state == 2 ? 'on' : '']", @click="handleSwitch(2)") 关闭 div(:class="[state == 2 ? 'on' : '']", @click="handleSwitch(2)") 关闭
el-col.text-size 当前已 el-col.text-size 当前已
span(v-if="dataForm.state == 1") 打开 span(v-if="dataForm.status == 1") 打开
span(v-else-if="dataForm.state == 2") 关闭 span(v-else-if="dataForm.status == 2") 关闭
span(v-else) 故障 span(v-else) 故障
el-col.text-size(:span="16", flex, justify-content="start" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'") el-col.text-size(:span="16", flex, justify-content="start" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
el-row el-row
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
span &nbsp;转 span &nbsp;转
el-button(type="primary", size="mini", style="margin-left: 10px") 设定 el-button(type="primary", size="mini", style="margin-left: 10px") 设定
el-col.text-size(:span="24") 当前频率: el-col.text-size(:span="24") 当前频率:
span(style="color: blue") 2289 span(style="color: blue") {{ params[0].current_frequency }}
span &nbsp;转/分 span &nbsp;转/分
//- 卷帘门 //- 卷帘门
el-col(v-if="dataForm.type=='c788ce98c1f248f590434394da485ce4'") el-col(v-if="dataForm.type=='c788ce98c1f248f590434394da485ce4'")
...@@ -351,70 +351,70 @@ export default { ...@@ -351,70 +351,70 @@ export default {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/kt.jpg") no-repeat center; background: url('../../../assets/images/imgs/kt.jpg') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-jfktp6 { .el-icon-jfktp6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/kt.jpg") no-repeat center; background: url('../../../assets/images/imgs/kt.jpg') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-pfj6 { .el-icon-pfj6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/pfj.png") no-repeat center; background: url('../../../assets/images/imgs/pfj.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-jlm6 { .el-icon-jlm6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/jlm.png") no-repeat center; background: url('../../../assets/images/imgs/jlm.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-flrbjz6 { .el-icon-flrbjz6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/flrbjz.png") no-repeat center; background: url('../../../assets/images/imgs/flrbjz.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-sb6 { .el-icon-sb6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/sb.png") no-repeat center; background: url('../../../assets/images/imgs/sb.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-dlswj6 { .el-icon-dlswj6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/dlswj.png") no-repeat center; background: url('../../../assets/images/imgs/dlswj.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-cgq6 { .el-icon-cgq6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/cgq.png") no-repeat center; background: url('../../../assets/images/imgs/cgq.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-snjfg6 { .el-icon-snjfg6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/dlswj.png") no-repeat center; background: url('../../../assets/images/imgs/dlswj.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.el-icon-swqxz6 { .el-icon-swqxz6 {
width: 100%; width: 100%;
height: 170px; height: 170px;
text-align: center; text-align: center;
background: url("../../../assets/images/imgs/swqxz.png") no-repeat center; background: url('../../../assets/images/imgs/swqxz.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
</style> </style>
...@@ -14,7 +14,7 @@ export const tableColums = [ ...@@ -14,7 +14,7 @@ export const tableColums = [
{ {
align: 'center', align: 'center',
prop: 'electric_energy', prop: 'electric_energy',
label: '当日用电量', label: '当日用电量(kwh)',
width: 162 width: 162
}, },
// { // {
......
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