Skip to content

E
energyai_vue
Commit 636a814a authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

页面调整

parent 5689716a
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 69 deletions
src/pages/components/enTable.vue
View file @ 636a814a
......@@ -7,10 +7,10 @@
style="width: 100%"
:header-cell-style="{
background: 'rgba(0, 151, 255, 0.08)',
color: '#333333',
color: '#333333'
}"
>
<el-table-column align="center" label="序号" width="100">
<el-table-column align="center" label="序号" width="50">
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template>
......@@ -23,17 +23,21 @@
:width="item.width"
:align="item.align"
>
</el-table-column>
</template>
<el-table-column v-if='isShowOp' align="center" label="操作" :width="opNum*80" >
<template slot-scope="scope" >
<slot name='operation' :scope='scope'></slot>
<el-table-column
v-if="isShowOp"
align="center"
label="操作"
:width="opNum * 65"
>
<template slot-scope="scope">
<slot name="operation" :scope="scope"></slot>
</template>
</el-table-column>
</el-table>
<div
v-if="isShowPage"
v-if="isShowPage"
style="
display: flex;
justify-content: flex-end;
......@@ -51,7 +55,7 @@
</div>
</template>
<script >
<script>
export default {
name: 'enTable',
props: {
......@@ -71,13 +75,11 @@ export default {
default: 3
},
isShowPage: {
default: true
},
isEdit: {
default: true
default: true
}
},
data() {
return {}
......@@ -89,7 +91,7 @@ export default {
}
}
</script>
<style lang="scss">
<style lang="scss">
.record-color {
color: #0097ff;
}
......@@ -99,13 +101,15 @@ export default {
.marg_r_8 {
margin-right: 8px;
}
.en-table{
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{
.en-table {
.el-pagination.is-background .btn-next,
.el-pagination.is-background .btn-prev,
.el-pagination.is-background .el-pager li {
margin: 0 !important;
}
/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
color: #32a5ea !important;
background-color: red !important;
}
/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
color: #32a5ea !important;
background-color: red !important;
}
}
</style>
src/pages/eq/hall/config.js
View file @ 636a814a
......@@ -2,38 +2,82 @@
{
align: 'center',
prop: 'name',
label: '设备名称',
width: 132
label: '设备名称'
},
{
align: 'center',
prop: 'deployLocation',
label: '设备位置'
// width: 112,
},
{
align: 'center',
prop: 'status',
label: '设备状态',
width: 182
label: '设备状态'
},
{
align: 'center',
prop: 'electric_energy',
label: '今日用电量',
width: 182
prop: 'feng_shui_mode',
label: '风水模式'
},
{
align: 'center',
prop: 'hot_water_mode',
label: '热水模式'
},
{
align: 'center',
prop: 'water_supply_temperature',
label: '供水温度'
},
{
align: 'center',
prop: 'return_water_temperature',
label: '回水温度'
},
{
align: 'center',
prop: 'heating_start_temperature',
label: '制热启动温度'
},
{
align: 'center',
prop: 'heating_stop_temperature',
label: '制热停止温度'
},
{
align: 'center',
prop: 'indoor_ambient_temperature',
label: '室内环境温度'
},
{
align: 'center',
prop: 'outlet_temperature',
label: '出风温度'
},
{
align: 'center',
prop: 'return_air_temperature',
label: '回风温度'
},
{
align: 'center',
prop: 'hot_air_start_temperature',
label: '热风启动温度'
},
{
align: 'center',
prop: 'E',
label: '本月用电量',
width: 182
prop: 'hot_air_stop_temperature',
label: '热风停止温度'
},
{
align: 'center',
prop: 'electric_energy',
label: '用电量'
},
{
align: 'center',
prop: 'code',
label: '设备编号',
width: 132
label: '设备编号'
}
]
......@@ -41,43 +85,64 @@
{
align: 'center',
prop: 'name',
label: '设备名称',
width: 132
label: '设备名称'
},
{
align: 'center',
prop: 'deployLocation',
label: '设备位置'
// width: 112,
},
{
align: 'center',
prop: 'current_frequency',
label: '当前频率',
width: 182
label: '当前频率'
},
{
align: 'center',
prop: 'status',
label: '设备状态',
width: 182
label: '设备状态'
},
{
align: 'center',
prop: 'electric_energy',
label: '今日用电量',
width: 182
label: '今日用电量'
},
{
align: 'center',
prop: 'F',
label: '本月用电量',
width: 182
label: '本月用电量'
},
{
align: 'center',
prop: 'code',
label: '设备编号'
}
]
export const tableColumsThree = [
{
align: 'center',
prop: 'name',
label: '设备名称'
},
{
align: 'center',
prop: 'deployLocation',
label: '设备位置'
},
{
align: 'center',
prop: 'current_frequency',
label: '当前频率'
},
{
align: 'center',
prop: 'status',
label: '设备状态'
},
{
align: 'center',
prop: 'code',
label: '设备编号',
width: 132
label: '设备编号'
}
]
src/pages/eq/hall/page.vue
View file @ 636a814a
......@@ -120,13 +120,13 @@
<el-button
type="text"
@click="statusHandle"
v-if="activeTab == '01'"
v-if="activeTab == 'b45827c068254695864ee3c1d42573cb'"
>故障复位</el-button
>
<el-button
type="text"
@click="handleBtnClick"
v-if="activeTab != '01'"
v-if="activeTab != 'b45827c068254695864ee3c1d42573cb'"
>设置频率</el-button
>
</template>
......@@ -151,7 +151,7 @@ import enTabs from '../../components/enTabs'
import hallModal from './components/hallModal'
import tablePagination from '@/pages/components/tablePagination'
import { tableColumsOne, tableColumsTwo } from './config'
import { tableColumsOne, tableColumsTwo, tableColumsThree } from './config'
export default {
components: {
......@@ -238,7 +238,7 @@ export default {
// this.tableData = tableDataTwo
break
case 'f4c840711eae4bcb9536a890cdfda493':
this.tableColums = tableColumsTwo
this.tableColums = tableColumsThree
// this.tableData = tableDataThree
break
}
......@@ -279,6 +279,53 @@ export default {
//风冷热泵机组
this.flrbList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'feng_shui_mode', e.feng_shui_mode)
this.$set(this.tableData[i], 'hot_water_mode', e.hot_water_mode)
this.$set(
this.tableData[i],
'water_supply_temperature',
e.water_supply_temperature
)
this.$set(
this.tableData[i],
'return_water_temperature',
e.return_water_temperature
)
this.$set(
this.tableData[i],
'heating_start_temperature',
e.heating_start_temperature
)
this.$set(
this.tableData[i],
'heating_stop_temperature',
e.heating_stop_temperature
)
this.$set(
this.tableData[i],
'indoor_ambient_temperature',
e.indoor_ambient_temperature
)
this.$set(
this.tableData[i],
'outlet_temperature',
e.outlet_temperature
)
this.$set(
this.tableData[i],
'return_air_temperature',
e.return_air_temperature
)
this.$set(
this.tableData[i],
'hot_air_start_temperature',
e.hot_air_start_temperature
)
this.$set(
this.tableData[i],
'hot_air_stop_temperature',
e.hot_air_stop_temperature
)
this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
}
})
......@@ -302,7 +349,6 @@ export default {
//水泵
this.sbList.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],
'current_frequency',
......
src/pages/eq/office/config.js
View file @ 636a814a
......@@ -2,38 +2,32 @@
{
align: 'center',
prop: 'name',
label: '设备名称',
width: 132
label: '设备名称'
},
{
align: 'center',
prop: 'deployLocation',
label: '设备位置'
// width: 150
},
{
align: 'center',
prop: 'status',
label: '设备状态',
width: 182
label: '设备状态'
},
{
align: 'center',
prop: 'electric_energy',
label: '今日用电量',
width: 182
label: '今日用电量'
},
{
align: 'center',
prop: 'E',
label: '本月用电量',
width: 182
label: '本月用电量'
},
{
align: 'center',
prop: 'code',
label: '设备编号',
width: 132
label: '设备编号'
}
]
......@@ -42,24 +36,35 @@
align: 'center',
prop: 'name',
label: '设备名称'
// width: 132
},
{
align: 'center',
prop: 'deployLocation',
label: '设备位置'
// width: 150
},
{
align: 'center',
prop: 'setting_temperature',
label: '设定温度'
},
{
align: 'center',
prop: 'setting_mode',
label: '设定模式'
},
{
align: 'center',
prop: 'setting_wind_speed',
label: '设定风速'
},
{
align: 'center',
prop: 'status',
label: '设备状态'
// width: 182
},
{
align: 'center',
prop: 'code',
label: '设备编号'
// width: 132
}
]
src/pages/eq/office/page.vue
View file @ 636a814a
......@@ -121,6 +121,9 @@ export default {
},
dlswjList() {
return this.$store.state.d2admin.paramsList.list.dlswjList
},
dlsnjList() {
return this.$store.state.d2admin.paramsList.list.dlsnjList
}
},
watch: {
......@@ -211,16 +214,12 @@ export default {
this.tableData[i].type === 'c788ce98c1f248f590434394da485ce4'
) {
//防火卷帘门
} else if (
this.tableData[i].type === '173466a2cf9a42a6a17b2bdfbeae36d5'
) {
//多联室内机
} else if (
this.tableData[i].type === '49f5921a6d7f43cfa222c09f0223ae04'
) {
//换气扇
} else if (
this.tableData[i].type === '173466a2cf9a42a6a17b2bdfbeae36d5'
this.tableData[i].type === '8f5530fee2484e8eb107c0ca672132b2'
) {
//多联室外机
this.dlswjList.forEach((e) => {
......@@ -228,6 +227,25 @@ export default {
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) {
this.$set(
this.tableData[i],
'setting_temperature',
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
)
}
})
}
}
},
......
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