Commit 75a679f7 authored by xiexingan's avatar xiexingan

提交

parent 4fafd5e5
......@@ -6,7 +6,7 @@
<el-form :inline="true" :model="formData" label-width="100">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="节能模式:">
<el-form-item label="模式选择:">
<div class="switch-warp" style="transform: translateY(7px)">
<div
:class="[isSaving == 1 ? 'on' : '']"
......@@ -22,8 +22,9 @@
</div>
</div>
</el-form-item>
<span class="btn-group" v-if="isSaving == 1">
<el-form-item label="">
</el-col>
<el-col v-if="isSaving == 1">
<el-form-item label="人工模式:">
<el-button
type="primary"
size="mini"
......@@ -32,14 +33,13 @@
:key="item.id"
:class="[
item.id == currentId && active ? 'isActive' : '',
item.icon
item.icon,
]"
>
<!-- <img :src="item.src" alt="" /> -->
{{ item.name }}
</el-button>
</el-form-item>
</span>
</el-col>
<el-col :span="24" v-if="isSaving == 1">
<el-form-item label="温度设定(℃):">
......@@ -66,7 +66,7 @@
:picker-options="{
start: '00:00',
step: '00:15',
end: '24:00'
end: '24:00',
}"
>
</el-time-select>
......@@ -79,7 +79,7 @@
start: '00:00',
step: '00:15',
end: '24:00',
minTime: formData.startTime
minTime: formData.startTime,
}"
>
</el-time-select>
......@@ -149,9 +149,7 @@
:totalSize="totalSize"
@parentMethod="getDataList"
></table-pagination>
<hall-modal
ref='hallModal'
></hall-modal>
<hall-modal ref="hallModal"></hall-modal>
</div>
</template>
<script>
......@@ -180,7 +178,7 @@ export default {
typeList: [
{
id: 1,
name: '供暖',
name: '供暖模式',
src: require('../../home/image/nan_fan_icon.png'),
icon: 'el-icon-sunny',
status: null
......@@ -345,7 +343,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 (
......@@ -354,7 +356,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',
......@@ -417,9 +423,9 @@ export default {
},
// 设置频率
handleBtnClick(data) {
this.$nextTick(() => {
this.$refs.hallModal.init(data)
})
this.$nextTick(() => {
this.$refs.hallModal.init(data)
})
},
handleType(id) {
if (id !== this.currentId) {
......
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