Commit d5130508 authored by xiexingan's avatar xiexingan

tj

parent ffe28556
......@@ -30,9 +30,9 @@ export default {
<style lang="scss" scoped>
.card-list {
width: 100%;
height: 100%;
height: 80%;
background: #fff;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
// box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
&-line {
display: flex;
justify-content: space-between;
......
......@@ -7,6 +7,7 @@
:total="newtotalSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
style='margin-right:20px;'
>
</el-pagination>
</template>
......
......@@ -32,7 +32,7 @@
:key="item.id"
:class="[
item.id == currentId ? 'isActive' : '',
item.icon
item.icon,
]"
>
<!-- <img :src="item.src" alt="" /> -->
......@@ -56,7 +56,7 @@
:picker-options="{
start: '00:00',
step: '00:15',
end: '24:00'
end: '24:00',
}"
>
</el-time-select>
......@@ -68,7 +68,7 @@
start: '00:00',
step: '00:15',
end: '24:00',
minTime: formData.startTime
minTime: formData.startTime,
}"
>
</el-time-select>
......@@ -131,13 +131,13 @@
>
</template>
</enTable>
<table-pagination
:pageSize="pageSize"
:totalSize="totalSize"
@parentMethod="getDataList"
></table-pagination>
</div>
</cardList>
<table-pagination
:pageSize="pageSize"
:totalSize="totalSize"
@parentMethod="getDataList"
></table-pagination>
<hall-modal
v-on:cancelhandle="cancelhandle"
:hallModalVisible="hallModalVisible"
......@@ -326,7 +326,11 @@ export default {
'hot_air_stop_temperature',
e.hot_air_stop_temperature
)
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -335,7 +339,11 @@ export default {
//室内机风柜
this.sljfgList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
this.$set(
this.tableData[i],
'current_frequency',
......@@ -465,9 +473,9 @@ export default {
<style lang="scss">
.hall {
height: 100%;
.el-input__inner {
height: 30px;
}
// .el-input__inner {
// height: 30px;
// }
.el-form-item {
margin-bottom: 10px;
}
......
......@@ -53,6 +53,11 @@
</en-table>
</div>
</cardList>
<table-pagination
:pageSize="pageSize"
:totalSize="totalSize"
@parentMethod="getDataList"
></table-pagination>
</div>
</template>
<script>
......@@ -60,13 +65,14 @@ import cardList from '../../components/cardList'
import enTabs from '../../components/enTabs'
import enTable from '../../components/enTable'
import { tableColumsOne, tableColumsTwo } from './config'
import tablePagination from '@/pages/components/tablePagination'
export default {
name: 'officeAreaControl',
components: {
cardList,
enTabs,
enTable
enTable,
tablePagination
},
data() {
......@@ -189,7 +195,11 @@ export default {
//排风机
this.pfjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -198,7 +208,11 @@ export default {
//机房空调(220V)
this.jfktpList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -207,7 +221,11 @@ export default {
//机房空调(380V)
this.jfktgList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -224,7 +242,11 @@ export default {
//多联室外机
this.dlswjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......
......@@ -162,7 +162,7 @@
</div>
</el-col>
</el-row>
<div style="height: calc(100% - 130px)">
<div style="height: calc(100% - 30px)">
<!-- <energy-total-charts></energy-total-charts> -->
<chart
id="home"
......
......@@ -3,7 +3,7 @@ card-warp(title="室内气象数据", height="45px", showBackground)
div(slot="right")
router-link(:to="{ name: 'analysis-indoor' }")
el-button(size="mini", type="primary") 综合图形
div(slot="content", style="height: 90%")
div(slot="content", style="height: 40%")
el-tabs.myTabs(v-model="activeName", @tab-click="tabClick")
el-tab-pane(label="候车室区域", name="1")
el-tab-pane(label="办公区域", name="2")
......@@ -15,19 +15,19 @@ card-warp(title="室内气象数据", height="45px", showBackground)
.data-warp
.data-item
.type 温度
.color-blue(v-if='hcdtSnqx')
.color-blue(v-if="hcdtSnqx")
span.num(v-if="activeName == 1") {{ hcdtSnqx.temperature }}
span.num(v-else) {{ bgqySnqx.temperature }}
span.unit ℃
.data-item
.type 湿度
.color-cyan(v-if='hcdtSnqx')
.color-cyan(v-if="hcdtSnqx")
span.num(v-if="activeName == 1") {{ hcdtSnqx.humidity }}
span.num(v-else) {{ bgqySnqx.humidity }}
span.unit %RH
.data-item
.type CO2
.color-green(v-if='hcdtSnqx')
.color-green(v-if="hcdtSnqx")
span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }}
span.num(v-else) {{ bgqySnqx.carbon_dioxide }}
span.unit PPM
......
<template>
<div class="use-electro-data">
<div class="use-electro-data" style="height: 100%">
<cardList cardListTitle="用电数据">
<div slot="right">
<!-- <i class="el-icon-menu"></i> -->
......@@ -77,13 +77,13 @@
>
</template>
</enTable>
<tablePagination
:pageSize="pageSize"
:totalSize="totalSize"
@parentMethod="getDataList"
></tablePagination>
</div>
</cardList>
<tablePagination
:pageSize="pageSize"
:totalSize="totalSize"
@parentMethod="getDataList"
></tablePagination>
<history-data-modal
:historyDataModalVisible="historyDataModalVisible"
ref="historyDataModal"
......@@ -233,7 +233,11 @@ export default {
//排风机
this.pfjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -242,7 +246,11 @@ export default {
//机房空调(220V)
this.jfktpList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -251,7 +259,11 @@ export default {
//机房空调(380V)
this.jfktgList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -264,7 +276,11 @@ export default {
//风冷热泵机组
this.flrbList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -273,7 +289,11 @@ export default {
//室内机风柜
this.sljfgList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
} else if (
......@@ -282,7 +302,11 @@ export default {
//多联室外机
this.dlswjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(
this.tableData[i],
'electric_energy',
e.electric_energy
)
}
})
}
......@@ -311,7 +335,6 @@ export default {
</script>
<style lang="scss">
.use-electro-data {
padding: 0px 0 40px 0px;
.el-form-item {
margin-bottom: 15px;
margin-top: 15px;
......
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