Skip to content

E
energyai_vue
Commit ff3b65e7 authored by 高超凡's avatar 高超凡
Browse files
Options

页面调整

parent 9a41b040
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 65 deletions
src/pages/eq/hall/page.vue
View file @ ff3b65e7
...@@ -39,66 +39,67 @@ ...@@ -39,66 +39,67 @@
<!-- <img :src="item.src" alt="" /> --> <!-- <img :src="item.src" alt="" /> -->
{{ item.name }} {{ item.name }}
</el-button> </el-button>
</el-form-item> <el-button style="margin-left:30px" type="info" size="mini" @click="timingControl">定时温控</el-button>
</el-col> <el-dialog
<el-col :span="24" v-if="isSaving == 1"> title="定时温控"
<el-form-item label="温度设定(℃)："> :visible.sync="timingControlDialogVisible"
<el-input append-to-body
size="mini" width="40%"
v-model="formData.temperature"
clearable=""
></el-input>
</el-form-item>
<el-form-item label="">
<el-button
type="primary"
size="mini"
@click="changeTemperature()"
>确定</el-button
> >
</el-form-item> <div v-if="isSaving == 1">
<el-row :gutter="5">
<el-col :span="5">
<el-form-item label="温度设定(℃)："></el-form-item>
</el-col>
<el-col :span="5">
<el-input size="mini" v-model="formData.temperature" clearable="" ></el-input>
</el-col>
<el-col :span="4">
<el-button type="primary" size="mini" @click="changeTemperature()">确定</el-button>
</el-col>
</el-row>
<el-form-item label="定时功能启止时间："> <el-row :gutter="5">
<el-time-select <el-col :span="5">
size="mini" <el-form-item label="定时功能启止时间："/>
placeholder="起始时间" </el-col>
v-model="formData.startTime" <el-col :span="10">
:picker-options="{ <el-time-select
start: '00:00', style="width:40%"
step: '00:15', size="mini"
end: '24:00' placeholder="起始时间"
}" v-model="formData.startTime"
> :picker-options="{
</el-time-select> start: '00:00',
<span style="padding: 0 10px">至</span> step: '00:15',
<el-time-select end: '24:00'
size="mini" }"
placeholder="结束时间" >
v-model="formData.endTime" </el-time-select>
:picker-options="{ <span style="padding: 0 10px">至</span>
start: '00:00', <el-time-select
step: '00:15', style="width:40%"
end: '24:00', size="mini"
minTime: formData.startTime placeholder="结束时间"
}" v-model="formData.endTime"
> :picker-options="{
</el-time-select> start: '00:00',
</el-form-item> step: '00:15',
<el-form-item> end: '24:00',
<div class="switch-warp" style="transform: translateY(5px)"> minTime: formData.startTime
<div }"
:class="[isOpen == 1 ? 'on' : '']" >
@click="setSendTime(1)" </el-time-select>
> </el-col>
开 <el-col :span="4">
<div class="switch-warp" style="transform: translateY(5px)">
<div :class="[isOpen == 1 ? 'on' : '']" @click="setSendTime(1)" > 开 </div>
<div :class="[isOpen == 2 ? 'on' : '']" @click="setSendTime(2)" > 关 </div>
</div>
</el-col>
</el-row>
</div> </div>
<div </el-dialog>
:class="[isOpen == 2 ? 'on' : '']"
@click="setSendTime(2)"
>
关
</div>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -280,7 +281,9 @@ export default { ...@@ -280,7 +281,9 @@ export default {
label: '电动排烟窗' label: '电动排烟窗'
} }
], ],
hallModalVisible: false hallModalVisible: false,
timingControlDialogVisible: false,
} }
}, },
computed: { computed: {
...@@ -590,6 +593,10 @@ export default { ...@@ -590,6 +593,10 @@ export default {
this.getAllHcdt() this.getAllHcdt()
} }
}) })
},
// 定时温控
timingControl(){
this.timingControlDialogVisible = true
} }
} }
} }
...@@ -646,4 +653,7 @@ export default { ...@@ -646,4 +653,7 @@ export default {
background: #4cb527 !important; background: #4cb527 !important;
border: 1px solid transparent; border: 1px solid transparent;
} }
.el-table__body-wrapper{
height: 400px;
}
</style> </style>
src/pages/eq/view/index.vue
View file @ ff3b65e7
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div v-show="transformationSta==1"> <div v-show="transformationSta==1">
<el-row style="padding-bottom:15px;height:780px;background:#fff;" :span="24"> <el-row style="padding-bottom:15px;height:780px;background:#fff;" :span="24">
<el-col class="resource-container" :style="obj" ref="drag"> <el-col class="resource-container" :style="obj" ref="drag">
<div id="map" class="map" ref='map' style="width: 100%;height: 720px;position:relative;"></div> <div id="map" class="map" ref='map' style="width: 100%;height: 720px;position:relative;" ></div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
//- </div> //- </div>
</el-card> </el-card>
</el-main> </el-main>
<query-detail v-if='queryDetailVisible' ref='queryDetail' @closeQ="closeQueryDetailVisible"></query-detail> <query-detail v-if='queryDetailVisible' ref='queryDetail' @closeQ="closeQueryDetailVisible" @click.stop></query-detail>
</el-container> </el-container>
</div> </div>
...@@ -188,6 +188,12 @@ export default { ...@@ -188,6 +188,12 @@ export default {
this.initTreeStationMap() this.initTreeStationMap()
this.initResourceTypeDicList() this.initResourceTypeDicList()
}, },
mounted(){
document.body.addEventListener('click',()=>{
console.log('触发');
this.queryDetailVisible = false;
},false);
},
methods: { methods: {
// 初始化地图 // 初始化地图
initMap(url) { initMap(url) {
...@@ -382,12 +388,14 @@ export default { ...@@ -382,12 +388,14 @@ export default {
}), }),
text: new Text({ text: new Text({
text: name, // 添加文字描述 text: name, // 添加文字描述
font: '14px font-size', // 设置字体大小 font: 'bold 14px font-size', // 设置字体大小
fill: new Fill({ fill: new Fill({
// 设置字体颜色 // 设置字体颜色
color: 'black' color: 'black',
// font:'normal bold 18px sans-serif'
}), }),
offsetY: 30 // 设置文字偏移量 offsetY: 30, // 设置文字偏移量
// offsetX: 10 // 设置文字偏移量
}) })
}) })
return style return style
......
src/pages/eq/view/query-detail.vue
View file @ ff3b65e7
<template lang="pug"> <template lang="pug">
.animation .animation(close-on-click-modal)
.info-title .info-title
| {{ dataForm.name }} | {{ dataForm.name }}
//- | 空调 //- | 空调
......
src/pages/sys/point/add-or-update.vue
View file @ ff3b65e7
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
el-select(v-model="dataForm.region" placeholder="请选择所属区域" ) el-select(v-model="dataForm.region" placeholder="请选择所属区域" )
el-option(v-for="(item,index) in regionList" :key="index" :label="item.name" :value="item.id" :code="item.id") el-option(v-for="(item,index) in regionList" :key="index" :label="item.name" :value="item.id" :code="item.id")
el-form-item(label='人工模式:' prop='modeTypes') el-form-item(label='人工模式:' prop='modeTypes')
el-checkbox-group(v-model="dataForm.modeTypes" placeholder="请选择人工模式" clearable) el-checkbox-group(v-model="dataForm.modeTypes" placeholder="请选择人工模式" @change="checkGroupChange($event)")
el-checkbox(v-for="(item, index) in modeList" :key="index" :label="item.id") {{item.name}} el-checkbox(v-for="(item, index) in modeList" :key="index" :label="item.id") {{item.name}}
el-form-item(label='部署位置:' prop='deployLocation') el-form-item(label='部署位置:' prop='deployLocation')
el-input(v-model='dataForm.deployLocation' placeholder='请填写部署位置') el-input(v-model='dataForm.deployLocation' placeholder='请填写部署位置')
...@@ -344,6 +344,8 @@ export default { ...@@ -344,6 +344,8 @@ export default {
if (this.dataForm.modeTypes) { if (this.dataForm.modeTypes) {
console.log('111111:') console.log('111111:')
this.dataForm.modeTypes = this.dataForm.modeTypes.split(',') this.dataForm.modeTypes = this.dataForm.modeTypes.split(',')
}else{
this.dataForm.modeTypes = []
} }
} }
console.log('dataForm:', this.dataForm) console.log('dataForm:', this.dataForm)
...@@ -638,6 +640,10 @@ export default { ...@@ -638,6 +640,10 @@ export default {
}) })
}) })
return style return style
},
// 多选框组改变事件
checkGroupChange(val){
this.$set(this.dataForm,this.dataForm.modeTypes,val)
} }
} }
} }
......
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