Skip to content

E
energyai_vue
Commit 564c5197 authored by xiexingan's avatar xiexingan
Browse files
Options

Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

parents 959b172b 3fc9de24
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 109 deletions
src/pages/analysis/energy/page.vue
View file @ 564c5197
...@@ -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() {
......
src/pages/eq/hall/config.js
View file @ 564c5197
...@@ -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',
......
src/pages/eq/office/config.js
View file @ 564c5197
...@@ -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',
...@@ -68,3 +68,26 @@ ...@@ -68,3 +68,26 @@
label: '设备编号' label: '设备编号'
} }
] ]
export const tableColumsThree = [
{
align: 'center',
prop: 'name',
label: '设备名称'
},
{
align: 'center',
prop: 'deployLocation',
label: '设备位置'
},
{
align: 'center',
prop: 'statusName',
label: '设备状态'
},
{
align: 'center',
prop: 'code',
label: '设备编号'
}
]
src/pages/eq/office/page.vue
View file @ 564c5197
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
import cardList from '../../components/cardList' import cardList from '../../components/cardList'
import enTabs from '../../components/enTabs' import enTabs from '../../components/enTabs'
import enTable from '../../components/enTable' import enTable from '../../components/enTable'
import { tableColumsOne, tableColumsTwo } from './config' import { tableColumsOne, tableColumsTwo, tableColumsThree } from './config'
import tablePagination from '@/pages/components/tablePagination' import tablePagination from '@/pages/components/tablePagination'
export default { export default {
name: 'officeAreaControl', name: 'officeAreaControl',
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
}, },
{ {
id: 'c788ce98c1f248f590434394da485ce4', id: 'c788ce98c1f248f590434394da485ce4',
label: '防火卷帘门' label: '电动卷帘门'
}, },
{ {
id: '173466a2cf9a42a6a17b2bdfbeae36d5', id: '173466a2cf9a42a6a17b2bdfbeae36d5',
...@@ -110,7 +110,11 @@ export default { ...@@ -110,7 +110,11 @@ export default {
}, },
{ {
id: '49f5921a6d7f43cfa222c09f0223ae04', id: '49f5921a6d7f43cfa222c09f0223ae04',
label: '换气扇' label: '电动排烟窗'
},
{
id: '8f0787103561423887324f8ac3c36b89',
label: '多联新风处理机室内机'
} }
] ]
} }
...@@ -130,6 +134,9 @@ export default { ...@@ -130,6 +134,9 @@ export default {
}, },
dlsnjList() { dlsnjList() {
return this.$store.state.d2admin.paramsList.list.dlsnjList return this.$store.state.d2admin.paramsList.list.dlsnjList
},
dlxfsnjList() {
return this.$store.state.d2admin.paramsList.list.dlxfsnjList
} }
}, },
watch: { watch: {
...@@ -147,7 +154,7 @@ export default { ...@@ -147,7 +154,7 @@ export default {
this.tableColums = tableColumsOne this.tableColums = tableColumsOne
break break
case 'c788ce98c1f248f590434394da485ce4': case 'c788ce98c1f248f590434394da485ce4':
this.tableColums = tableColumsOne this.tableColums = tableColumsThree
break break
case '173466a2cf9a42a6a17b2bdfbeae36d5': case '173466a2cf9a42a6a17b2bdfbeae36d5':
this.tableColums = tableColumsTwo this.tableColums = tableColumsTwo
...@@ -156,7 +163,10 @@ export default { ...@@ -156,7 +163,10 @@ export default {
this.tableColums = tableColumsOne this.tableColums = tableColumsOne
break break
case '49f5921a6d7f43cfa222c09f0223ae04': case '49f5921a6d7f43cfa222c09f0223ae04':
this.tableColums = tableColumsOne this.tableColums = tableColumsThree
break
case '8f0787103561423887324f8ac3c36b89':
this.tableColums = tableColumsTwo
break break
} }
} }
...@@ -195,11 +205,7 @@ export default { ...@@ -195,11 +205,7 @@ export default {
//排风机 //排风机
this.pfjList.forEach((e) => { this.pfjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if ( } else if (
...@@ -208,11 +214,7 @@ export default { ...@@ -208,11 +214,7 @@ export default {
//机房空调(220V) //机房空调(220V)
this.jfktpList.forEach((e) => { this.jfktpList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if ( } else if (
...@@ -221,39 +223,50 @@ export default { ...@@ -221,39 +223,50 @@ export default {
//机房空调(380V) //机房空调(380V)
this.jfktgList.forEach((e) => { this.jfktgList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if ( } else if (
this.tableData[i].type === 'c788ce98c1f248f590434394da485ce4' this.tableData[i].type === 'c788ce98c1f248f590434394da485ce4'
) { ) {
//防火卷帘门 //自动卷帘门
} else if ( } else if (
this.tableData[i].type === '49f5921a6d7f43cfa222c09f0223ae04' this.tableData[i].type === '49f5921a6d7f43cfa222c09f0223ae04'
) { ) {
//换气扇 //电动排烟窗
} else if ( } else if (
this.tableData[i].type === '8f5530fee2484e8eb107c0ca672132b2' this.tableData[i].type === '8f5530fee2484e8eb107c0ca672132b2'
) { ) {
//多联室外机 //多联室外机
this.dlswjList.forEach((e) => { this.dlswjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
}
})
} else if (
this.tableData[i].type === '173466a2cf9a42a6a17b2bdfbeae36d5'
) {
//多联室内机
this.dlsnjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(
this.tableData[i], this.tableData[i],
'electric_energy', 'setting_temperature',
e.electric_energy e.setting_temperature
)
this.$set(this.tableData[i], 'setting_mode', e.setting_mode)
this.$set(
this.tableData[i],
'setting_wind_speed',
e.setting_wind_speed
) )
} }
}) })
} else if ( } else if (
this.tableData[i].type === '173466a2cf9a42a6a17b2bdfbeae36d5' this.tableData[i].type === '8f0787103561423887324f8ac3c36b89'
) { ) {
//多联室外机 //多联新风处理机室内机
this.dlsnjList.forEach((e) => { this.dlxfsnjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(
this.tableData[i], this.tableData[i],
......
src/pages/eq/view/query-detail.vue
View file @ 564c5197
...@@ -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%;
} }
.el-icon-dlxfsnj6 { .el-icon-dlxfsnj6 {
......
src/pages/kb/power/config.js
View file @ 564c5197
...@@ -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
}, },
// { // {
......
src/pages/kb/power/page.vue
View file @ 564c5197
...@@ -140,10 +140,6 @@ export default { ...@@ -140,10 +140,6 @@ export default {
value: 'b47661ca1d454f9792ba5369f3cb2bc5', value: 'b47661ca1d454f9792ba5369f3cb2bc5',
label: '机房空调(380V)' label: '机房空调(380V)'
}, },
{
value: 'c788ce98c1f248f590434394da485ce4',
label: '防火卷帘门'
},
{ {
value: 'b45827c068254695864ee3c1d42573cb', value: 'b45827c068254695864ee3c1d42573cb',
label: '风冷热泵机组' label: '风冷热泵机组'
...@@ -233,11 +229,7 @@ export default { ...@@ -233,11 +229,7 @@ export default {
//排风机 //排风机
this.pfjList.forEach((e) => { this.pfjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if ( } else if (
...@@ -246,11 +238,7 @@ export default { ...@@ -246,11 +238,7 @@ export default {
//机房空调(220V) //机房空调(220V)
this.jfktpList.forEach((e) => { this.jfktpList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if ( } else if (
...@@ -259,28 +247,16 @@ export default { ...@@ -259,28 +247,16 @@ export default {
//机房空调(380V) //机房空调(380V)
this.jfktgList.forEach((e) => { this.jfktgList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if (
this.tableData[i].type === 'c788ce98c1f248f590434394da485ce4'
) {
//防火卷帘门
} else if ( } else if (
this.tableData[i].type === 'b45827c068254695864ee3c1d42573cb' this.tableData[i].type === 'b45827c068254695864ee3c1d42573cb'
) { ) {
//风冷热泵机组 //风冷热泵机组
this.flrbList.forEach((e) => { this.flrbList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if ( } else if (
...@@ -289,11 +265,7 @@ export default { ...@@ -289,11 +265,7 @@ export default {
//室内机风柜 //室内机风柜
this.sljfgList.forEach((e) => { this.sljfgList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} else if ( } else if (
...@@ -302,11 +274,7 @@ export default { ...@@ -302,11 +274,7 @@ export default {
//多联室外机 //多联室外机
this.dlswjList.forEach((e) => { this.dlswjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set( this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.tableData[i],
'electric_energy',
e.electric_energy
)
} }
}) })
} }
......
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