|
|
@@ -73,8 +73,8 @@
|
|
|
<div class="panel-title">{{currentData.rooms[0].room}} 房间情况一览</div>
|
|
|
</div>
|
|
|
<div class="panel-title-btns">
|
|
|
- <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline">
|
|
|
- 编辑</el-button>
|
|
|
+ <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline"
|
|
|
+ @click="operate_modify_room(currentData.rooms[0].room)">编辑</el-button>
|
|
|
<el-button class="panel-title-btn" type="text" icon="el-icon-delete"
|
|
|
@click="operate_delete_room(currentData.rooms[0].room)">删除
|
|
|
</el-button>
|
|
|
@@ -147,8 +147,8 @@
|
|
|
<div class="panel-title">{{currentData.rooms[1].room}} 房间情况一览</div>
|
|
|
</div>
|
|
|
<div class="panel-title-btns">
|
|
|
- <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline">
|
|
|
- 编辑</el-button>
|
|
|
+ <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline"
|
|
|
+ @click="operate_modify_room(currentData.rooms[1].room)">编辑</el-button>
|
|
|
<el-button class="panel-title-btn" type="text" icon="el-icon-delete"
|
|
|
@click="operate_delete_room(currentData.rooms[1].room)">删除
|
|
|
</el-button>
|
|
|
@@ -223,8 +223,8 @@
|
|
|
<div class="panel-title">{{currentData.rooms[2].room}} 房间情况一览</div>
|
|
|
</div>
|
|
|
<div class="panel-title-btns">
|
|
|
- <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline">
|
|
|
- 编辑</el-button>
|
|
|
+ <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline"
|
|
|
+ @click="operate_modify_room(currentData.rooms[2].room)">编辑</el-button>
|
|
|
<el-button class="panel-title-btn" type="text" icon="el-icon-delete"
|
|
|
@click="operate_delete_room(currentData.rooms[2].room)">删除
|
|
|
</el-button>
|
|
|
@@ -297,8 +297,8 @@
|
|
|
<div class="panel-title">{{currentData.rooms[3].room}} 房间情况一览</div>
|
|
|
</div>
|
|
|
<div class="panel-title-btns">
|
|
|
- <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline">
|
|
|
- 编辑</el-button>
|
|
|
+ <el-button class="panel-title-btn" type="text" icon="el-icon-edit-outline"
|
|
|
+ @click="operate_modify_room(currentData.rooms[3].room)">编辑</el-button>
|
|
|
<el-button class="panel-title-btn" type="text" icon="el-icon-delete"
|
|
|
@click="operate_delete_room(currentData.rooms[3].room)">删除
|
|
|
</el-button>
|
|
|
@@ -455,8 +455,8 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="操作员:" :label-width="formLabelWidth" prop="cao" :required="true">
|
|
|
- <el-input v-model="form_add_device.cao" autocomplete="off" placeholder="请输入操作员"
|
|
|
- ref="ref_cao" maxlength="10"></el-input>
|
|
|
+ <el-input v-model="form_add_device.cao" autocomplete="off" placeholder="请输入操作员" ref="ref_cao"
|
|
|
+ maxlength="10"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="手机号码:" :label-width="formLabelWidth" prop="contact" :required="true">
|
|
|
<el-input v-model="form_add_device.contact" autocomplete="off" placeholder="请输入手机号码"
|
|
|
@@ -484,6 +484,29 @@
|
|
|
<el-button type="primary" @click="dialog_add_air_click">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <!-- 编辑房间 -->
|
|
|
+ <el-dialog title="编辑房间" custom-class="el-dialog-modify-room" :visible.sync="dialog_modify_room"
|
|
|
+ :close-on-click-modal="false" :close-on-press-escape="false" @close="dialog_close('form_modify_room')">
|
|
|
+ <el-form :model="form_modify_room" ref="modify_room_form" :rules="form_modify_room_rules">
|
|
|
+ <el-form-item label="校区:" :label-width="formLabelWidth">
|
|
|
+ <div>{{form_modify_room.school}}</div>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="楼栋:" :label-width="formLabelWidth">
|
|
|
+ <div>{{form_modify_room.building}}</div>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="楼层:" :label-width="formLabelWidth">
|
|
|
+ <div>{{form_modify_room.floor}}</div>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="房间:" :label-width="formLabelWidth" :required="true" prop="room">
|
|
|
+ <el-input v-model="form_modify_room.room" autocomplete="off" placeholder="请输入房间名称" ref="ref_room"
|
|
|
+ maxlength="4"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="dialog_modify_room = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="dialog_modify_room_click(show_modify_room)">确 定</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
<!-- 删除房间 -->
|
|
|
<el-dialog custom-class="el-dialog-delete-room" :visible.sync="dialog_delete_room" :close-on-click-modal="false"
|
|
|
:close-on-press-escape="false" :show-close="false">
|
|
|
@@ -493,7 +516,7 @@
|
|
|
</div>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dialog_delete_room = false"> 否 </el-button>
|
|
|
- <el-button type="primary" @click="dialog_delete_room = false"> 是 </el-button>
|
|
|
+ <el-button type="primary" @click="dialog_delete_rooms_click(show_delete_room)"> 是 </el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 删除空调 -->
|
|
|
@@ -519,7 +542,11 @@
|
|
|
addRooms,
|
|
|
addAirs,
|
|
|
getRoomAirs,
|
|
|
- deleteAirs
|
|
|
+ deleteAirs,
|
|
|
+ getRoomsAndAirs,
|
|
|
+ getOpeningAndAbnomal,
|
|
|
+ updateRooms,
|
|
|
+ delRooms
|
|
|
} from '@/api/serveAC'
|
|
|
const deviceOptions = ['1匹', '1.5匹', '2匹', '3匹', '天花机器(3匹)'];
|
|
|
export default {
|
|
|
@@ -572,7 +599,7 @@
|
|
|
if (!value) {
|
|
|
return callback(new Error('请输入操作员'));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
setTimeout(() => {
|
|
|
var reg = /^[\u4e00-\u9fa5]{2,10}$/
|
|
|
if (!reg.test(value)) {
|
|
|
@@ -586,9 +613,10 @@
|
|
|
if (!value) {
|
|
|
return callback(new Error('请输入手机号码'));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
setTimeout(() => {
|
|
|
- var reg = /^((13[0-9])|(14[0|5|6|7|9])|(15[0-3])|(15[5-9])|(16[6|7])|(17[2|3|5|6|7|8])|(18[0-9])|(19[1|8|9]))\d{8}$/
|
|
|
+ var reg =
|
|
|
+ /^((13[0-9])|(14[0|5|6|7|9])|(15[0-3])|(15[5-9])|(16[6|7])|(17[2|3|5|6|7|8])|(18[0-9])|(19[1|8|9]))\d{8}$/
|
|
|
if (!reg.test(value)) {
|
|
|
callback(new Error('手机号码输入不规范!'));
|
|
|
} else {
|
|
|
@@ -673,6 +701,19 @@
|
|
|
validator: checkroom
|
|
|
}]
|
|
|
},
|
|
|
+ // 修改房间
|
|
|
+ dialog_modify_room: false,
|
|
|
+ form_modify_room: { // 修改房间数据
|
|
|
+ school: '',
|
|
|
+ building: '',
|
|
|
+ floor: '',
|
|
|
+ room: ''
|
|
|
+ },
|
|
|
+ form_modify_room_rules: { // 修改房间表单验证
|
|
|
+ room: [{
|
|
|
+ validator: checkroom
|
|
|
+ }]
|
|
|
+ },
|
|
|
// 添加设备
|
|
|
dialog_add_device: false,
|
|
|
form_add_device: { // 添加设备数据
|
|
|
@@ -713,8 +754,9 @@
|
|
|
contact: ''
|
|
|
},
|
|
|
dialog_delete_room: false, // 删除房间
|
|
|
- show_delete_room: '', // 删除房间对话框中用于显示给用户看的
|
|
|
+ show_delete_room: '', // 记录需要删除的房间
|
|
|
dialog_delete_air: false, // 删除空调
|
|
|
+ show_modify_room: '', // 记录需要修改的房间
|
|
|
btnActive: 'all',
|
|
|
louceng_click_id: '',
|
|
|
// 左侧导航数据:校区,楼栋,楼层
|
|
|
@@ -773,6 +815,124 @@
|
|
|
},
|
|
|
methods: {
|
|
|
/**
|
|
|
+ * 编辑修改房间
|
|
|
+ */
|
|
|
+ dialog_modify_room_click(room) {
|
|
|
+ updateRooms({
|
|
|
+ school: this.form_modify_room.school,
|
|
|
+ build: this.form_modify_room.building,
|
|
|
+ floors: this.form_modify_room.floor,
|
|
|
+ dom: this.form_modify_room.room,
|
|
|
+ old_dom: room
|
|
|
+ }).then((res) => {
|
|
|
+ // console.log(res);
|
|
|
+ if (typeof res.code == 'undefined' || res.code == '') {
|
|
|
+ this.$message.error('返回数据格式问题,code未获取到!')
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if (res.code == 200) {
|
|
|
+ // 隐藏删除对话框
|
|
|
+ this.dialog_modify_room = false
|
|
|
+ // 更新本地变量中的房间
|
|
|
+ let tmp = this.navData
|
|
|
+ for (var i = 0; i < tmp.length; i++) {
|
|
|
+ if (tmp[i].label == this.form_modify_room.school && typeof tmp[i].children !==
|
|
|
+ 'undefined' && tmp[i]
|
|
|
+ .children.length > 0) {
|
|
|
+ let tmp1 = tmp[i].children
|
|
|
+ for (var j = 0; j < tmp1.length; j++) {
|
|
|
+ if (tmp1[j].label == this.form_modify_room.building && typeof tmp1[j]
|
|
|
+ .children !== 'undefined' &&
|
|
|
+ tmp1[j]
|
|
|
+ .children.length > 0) {
|
|
|
+ let tmp2 = tmp1[j].children
|
|
|
+ for (var k = 0; k < tmp2.length; k++) {
|
|
|
+ if (tmp2[k].label == this.form_modify_room.floor && typeof tmp2[k]
|
|
|
+ .rooms !== 'undefined' &&
|
|
|
+ tmp2[k].rooms.length > 0) {
|
|
|
+ let tmp3 = tmp2[k].rooms
|
|
|
+ for (var p = 0; p < tmp3.length; p++) {
|
|
|
+ if (tmp3[p] == room) {
|
|
|
+ this.navData[i].children[j].children[k].rooms[p] = this
|
|
|
+ .form_modify_room.building + '-' + this
|
|
|
+ .form_modify_room.room
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 自动点击
|
|
|
+ this.currentData.clickElement.click()
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ }).catch((err) => {
|
|
|
+ // console.log(err);
|
|
|
+ this.$message.error(err.message)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 删除房间
|
|
|
+ * @param {Object} room
|
|
|
+ */
|
|
|
+ dialog_delete_rooms_click(room) {
|
|
|
+ let data = this.currentData.title_any_where.split('-')
|
|
|
+ delRooms({
|
|
|
+ school: data[0],
|
|
|
+ build: data[1],
|
|
|
+ floors: data[2],
|
|
|
+ dom: room
|
|
|
+ }).then((res) => {
|
|
|
+ // console.log(res);
|
|
|
+ if (typeof res.code == 'undefined' || res.code == '') {
|
|
|
+ this.$message.error('返回数据格式问题,code未获取到!')
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if (res.code == 200) {
|
|
|
+ // 隐藏删除对话框
|
|
|
+ this.dialog_delete_room = false
|
|
|
+ // 更新本地变量中的房间
|
|
|
+ let tmp = this.navData
|
|
|
+ for (var i = 0; i < tmp.length; i++) {
|
|
|
+ if (tmp[i].label == data[0] && typeof tmp[i].children !== 'undefined' && tmp[i]
|
|
|
+ .children.length > 0) {
|
|
|
+ let tmp1 = tmp[i].children
|
|
|
+ for (var j = 0; j < tmp1.length; j++) {
|
|
|
+ if (tmp1[j].label == data[1] && typeof tmp1[j].children !== 'undefined' &&
|
|
|
+ tmp1[j]
|
|
|
+ .children.length > 0) {
|
|
|
+ let tmp2 = tmp1[j].children
|
|
|
+ for (var k = 0; k < tmp2.length; k++) {
|
|
|
+ if (tmp2[k].label == data[2] && typeof tmp2[k].rooms !== 'undefined' &&
|
|
|
+ tmp2[k].rooms.length > 0) {
|
|
|
+ let tmp3 = tmp2[k].rooms
|
|
|
+ for (var p = 0; p < tmp3.length; p++) {
|
|
|
+ if (tmp3[p] == room) {
|
|
|
+ this.navData[i].children[j].children[k].rooms.splice(p, 1)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 自动点击
|
|
|
+ this.currentData.clickElement.click()
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ }).catch((err) => {
|
|
|
+ // console.log(err);
|
|
|
+ this.$message.error(err.message)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ /**
|
|
|
* 获取楼栋信息
|
|
|
*/
|
|
|
get_loudong_data() {
|
|
|
@@ -821,7 +981,7 @@
|
|
|
}
|
|
|
tmpSchool.sort((a, b) => b.label.localeCompare(a.label))
|
|
|
this.navData = tmpSchool
|
|
|
- // console.log(this.navData);
|
|
|
+ // console.log(JSON.stringify(this.navData));
|
|
|
} else {
|
|
|
this.navData = []
|
|
|
this.$message.warning('没有符合条件的数据!')
|
|
|
@@ -853,24 +1013,68 @@
|
|
|
if (typeof data !== 'undefined' && data !== '') {
|
|
|
let tmpTableData = []
|
|
|
for (var i = 0; i < data.length; i++) {
|
|
|
- let room = {
|
|
|
- name: data[i].air_name, // 名称
|
|
|
- ip: data[i].air_ip, // 空调ip或id
|
|
|
- building: data[i].build, // 楼栋
|
|
|
- device: data[i].air_config, // 空调配置
|
|
|
- userTime: data[i].duration_use, // 使用时长
|
|
|
- alarmStatus: data[i].is_normal == 1 ? '正常' : '异常', // 是否正常
|
|
|
- onOffStatus: data[i].is_on, // 是否开启
|
|
|
- userName: data[i].cao, // 操作员
|
|
|
- contact: '待接口返回,待优化' // 联系方式
|
|
|
+ let room = {}
|
|
|
+ let param = this.btnActive
|
|
|
+ if (param == 'all') {
|
|
|
+ room = {
|
|
|
+ name: data[i].air_name, // 名称
|
|
|
+ ip: data[i].air_ip, // 空调ip或id
|
|
|
+ building: data[i].build, // 楼栋
|
|
|
+ device: data[i].air_config, // 空调配置
|
|
|
+ userTime: data[i].duration_use, // 使用时长
|
|
|
+ alarmStatus: data[i].is_normal == 1 ? '正常' : '异常', // 是否正常
|
|
|
+ onOffStatus: data[i].is_on, // 是否开启
|
|
|
+ userName: data[i].cao, // 操作员
|
|
|
+ contact: '待接口返回,待优化' // 联系方式
|
|
|
+ }
|
|
|
+ } else if (param == 'powerOn' && data[i].is_on == '1') {
|
|
|
+ room = {
|
|
|
+ name: data[i].air_name, // 名称
|
|
|
+ ip: data[i].air_ip, // 空调ip或id
|
|
|
+ building: data[i].build, // 楼栋
|
|
|
+ device: data[i].air_config, // 空调配置
|
|
|
+ userTime: data[i].duration_use, // 使用时长
|
|
|
+ alarmStatus: data[i].is_normal == 1 ? '正常' : '异常', // 是否正常
|
|
|
+ onOffStatus: data[i].is_on, // 是否开启
|
|
|
+ userName: data[i].cao, // 操作员
|
|
|
+ contact: '待接口返回,待优化' // 联系方式
|
|
|
+ }
|
|
|
+ } else if (param == 'powerOff' && data[i].is_on == '0') {
|
|
|
+ room = {
|
|
|
+ name: data[i].air_name, // 名称
|
|
|
+ ip: data[i].air_ip, // 空调ip或id
|
|
|
+ building: data[i].build, // 楼栋
|
|
|
+ device: data[i].air_config, // 空调配置
|
|
|
+ userTime: data[i].duration_use, // 使用时长
|
|
|
+ alarmStatus: data[i].is_normal == 1 ? '正常' : '异常', // 是否正常
|
|
|
+ onOffStatus: data[i].is_on, // 是否开启
|
|
|
+ userName: data[i].cao, // 操作员
|
|
|
+ contact: '待接口返回,待优化' // 联系方式
|
|
|
+ }
|
|
|
+ } else if (param == 'abnormal' && data[i].is_normal == '0') {
|
|
|
+ room = {
|
|
|
+ name: data[i].air_name, // 名称
|
|
|
+ ip: data[i].air_ip, // 空调ip或id
|
|
|
+ building: data[i].build, // 楼栋
|
|
|
+ device: data[i].air_config, // 空调配置
|
|
|
+ userTime: data[i].duration_use, // 使用时长
|
|
|
+ alarmStatus: data[i].is_normal == 1 ? '正常' : '异常', // 是否正常
|
|
|
+ onOffStatus: data[i].is_on, // 是否开启
|
|
|
+ userName: data[i].cao, // 操作员
|
|
|
+ contact: '待接口返回,待优化' // 联系方式
|
|
|
+ }
|
|
|
}
|
|
|
- // 每个房间的设备循环添加
|
|
|
- tmpTableData.push(room)
|
|
|
+ if (JSON.stringify(room) !== '{}') {
|
|
|
+ // 每个房间的设备循环添加
|
|
|
+ tmpTableData.push(room)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (tmpTableData.length > 0) {
|
|
|
+ tmpTableData.sort((a, b) => a.ip.localeCompare(b.ip))
|
|
|
+ this.currentData.rooms[index].tableData = tmpTableData
|
|
|
}
|
|
|
- tmpTableData.sort((a, b) => a.ip.localeCompare(b.ip))
|
|
|
- this.currentData.rooms[index].tableData = tmpTableData
|
|
|
} else {
|
|
|
- this.$message.warning(room + ' 没有设备的数据!')
|
|
|
+ // this.$message.warning(room + ' 没有设备的数据!')
|
|
|
}
|
|
|
this.currentData.rooms[index].room = room
|
|
|
} else {
|
|
|
@@ -968,13 +1172,77 @@
|
|
|
this.currentData.floor = labels[0]
|
|
|
this.currentData.allRooms = rooms
|
|
|
// 给右侧窗口标题赋值
|
|
|
- this.currentData.title_any_where = labels[2] + '-' + labels[1] + '-' + labels[0]
|
|
|
+ this.currentData.title_any_where = this.currentData.school + '-' + this.currentData.building + '-' + this
|
|
|
+ .currentData.floor
|
|
|
// 赋值分页数据
|
|
|
this.pagination.total = rooms.length
|
|
|
- // this.pagination.currentPage = 1
|
|
|
// 进行分页处理
|
|
|
this.roomDataPagination(this.pagination.currentPage, this.pagination.pageSize, this.currentData.allRooms,
|
|
|
- this.currentData.school, this.currentData.building, this.currentData.floor)
|
|
|
+ this.currentData.school, this.currentData.building, this.currentData.floor);
|
|
|
+ // 某层房间空调数
|
|
|
+ this.getRoomsAndAirs(this.currentData.school, this.currentData.building, this.currentData.floor)
|
|
|
+ // 某层空调开启和异常统计
|
|
|
+ this.getOpeningAndAbnomal(this.currentData.school, this.currentData.building, this.currentData.floor)
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 某层空调开启和异常统计
|
|
|
+ * @param {Object} school
|
|
|
+ * @param {Object} build
|
|
|
+ * @param {Object} floors
|
|
|
+ */
|
|
|
+ getOpeningAndAbnomal(school, build, floors) {
|
|
|
+ getOpeningAndAbnomal({
|
|
|
+ school,
|
|
|
+ build,
|
|
|
+ floors
|
|
|
+ }).then((res) => {
|
|
|
+ // console.log(res);
|
|
|
+ if (typeof res.code == 'undefined' || res.code == '') {
|
|
|
+ this.$message.error('返回数据格式问题,code未获取到!')
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if (res.code == 200) {
|
|
|
+ // 填充数据
|
|
|
+ this.open_number = res.onNum
|
|
|
+ this.warning_number = res.stateNum
|
|
|
+ } else {
|
|
|
+ // this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ }).catch((err) => {
|
|
|
+ // console.log(err);
|
|
|
+ this.$message.error(err.message)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 某层房间空调数
|
|
|
+ * @param {Object} school
|
|
|
+ * @param {Object} build
|
|
|
+ * @param {Object} floors
|
|
|
+ */
|
|
|
+ getRoomsAndAirs(school, build, floors) {
|
|
|
+ getRoomsAndAirs({
|
|
|
+ school,
|
|
|
+ build,
|
|
|
+ floors
|
|
|
+ }).then((res) => {
|
|
|
+ // console.log(res);
|
|
|
+ if (typeof res.code == 'undefined' || res.code == '') {
|
|
|
+ this.$message.error('返回数据格式问题,code未获取到!')
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if (res.code == 200) {
|
|
|
+ // 填充数据
|
|
|
+ this.room_number = res.domNum
|
|
|
+ this.device_number = res.airNum
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ }).catch((err) => {
|
|
|
+ // console.log(err);
|
|
|
+ this.$message.error(err.message)
|
|
|
+ })
|
|
|
},
|
|
|
/**
|
|
|
* 实现分页
|
|
|
@@ -996,8 +1264,8 @@
|
|
|
(function(t, school, build, floors, room, index) { // 注意这里是形参
|
|
|
setTimeout(function() {
|
|
|
_this.get_room_airs_data(school, build, floors, room, index)
|
|
|
- }, 50 * t); // 还是每秒执行一次,不是累加的
|
|
|
- })(i, school, build, floors, rooms[i], index) // 注意这里是实参,这里把要用的参数传进去
|
|
|
+ }, 50 * t); // 还是0.05执行一次,不是累加的
|
|
|
+ })(i, school, build, floors, rooms[i], index); // 注意这里是实参,这里把要用的参数传进去
|
|
|
index = index + 1
|
|
|
}
|
|
|
},
|
|
|
@@ -1070,7 +1338,7 @@
|
|
|
})
|
|
|
}, 100)
|
|
|
},
|
|
|
- // 添加楼栋
|
|
|
+ // 添加楼栋对话框
|
|
|
dialog_add_loudong_click() {
|
|
|
this.$refs["add_loudong_form"].validate(validate => {
|
|
|
if (validate) {
|
|
|
@@ -1099,7 +1367,7 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 添加楼层
|
|
|
+ // 添加楼层对话框
|
|
|
dialog_add_louceng_click() {
|
|
|
this.$refs["add_louceng_form"].validate(validate => {
|
|
|
if (validate) {
|
|
|
@@ -1128,7 +1396,7 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 添加房间
|
|
|
+ // 添加房间对话框
|
|
|
dialog_add_room_click() {
|
|
|
this.$refs["add_room_form"].validate(validate => {
|
|
|
if (validate) {
|
|
|
@@ -1161,7 +1429,7 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 添加空调
|
|
|
+ // 添加空调对话框
|
|
|
dialog_add_air_click() {
|
|
|
this.$refs["add_device_form"].validate(validate => {
|
|
|
if (validate) {
|
|
|
@@ -1198,7 +1466,7 @@
|
|
|
})
|
|
|
},
|
|
|
/**
|
|
|
- * 刪除空调
|
|
|
+ * 刪除空调对话框
|
|
|
*/
|
|
|
dialog_delete_air_click() {
|
|
|
let delAir = {
|
|
|
@@ -1236,19 +1504,19 @@
|
|
|
top_btn_click(param) {
|
|
|
this.btnActive = param
|
|
|
if (param == 'all') {
|
|
|
- console.log(param);
|
|
|
+ this.currentData.clickElement.click()
|
|
|
} else if (param == 'powerOn') {
|
|
|
- console.log(param);
|
|
|
+ this.currentData.clickElement.click()
|
|
|
} else if (param == 'powerOff') {
|
|
|
- console.log(param);
|
|
|
+ this.currentData.clickElement.click()
|
|
|
} else if (param == 'abnormal') {
|
|
|
- console.log(param);
|
|
|
+ this.currentData.clickElement.click()
|
|
|
} else {
|
|
|
- this.$message.error('出现错误!');
|
|
|
+ this.$message.error('出现位置错误!');
|
|
|
}
|
|
|
},
|
|
|
/**
|
|
|
- * 添加设备
|
|
|
+ * 添加空调设备
|
|
|
* @param {Object} room
|
|
|
*/
|
|
|
add_device(room) {
|
|
|
@@ -1269,6 +1537,19 @@
|
|
|
}, 100)
|
|
|
},
|
|
|
/**
|
|
|
+ * 操作编辑修改房间
|
|
|
+ * @param {Object} room
|
|
|
+ */
|
|
|
+ operate_modify_room(room) {
|
|
|
+ let tmpData = this.currentData.title_any_where.split('-');
|
|
|
+ this.form_modify_room.school = tmpData[0]
|
|
|
+ this.form_modify_room.building = tmpData[1]
|
|
|
+ this.form_modify_room.floor = tmpData[2]
|
|
|
+ this.form_modify_room.room = room.split('-')[1]
|
|
|
+ this.show_modify_room = room
|
|
|
+ this.dialog_modify_room = true
|
|
|
+ },
|
|
|
+ /**
|
|
|
* 操作删除房间
|
|
|
*/
|
|
|
operate_delete_room(room) {
|
|
|
@@ -1314,6 +1595,15 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (param == 'form_modify_room') {
|
|
|
+ this.form_modify_room = {
|
|
|
+ school: '',
|
|
|
+ building: '',
|
|
|
+ floor: '',
|
|
|
+ room: ''
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (param == 'form_add_device') {
|
|
|
this.form_add_device = {
|
|
|
school: '',
|
|
|
@@ -1343,7 +1633,7 @@
|
|
|
* @param {Object} val
|
|
|
*/
|
|
|
currentPageChange(val) {
|
|
|
- console.log('当前页:' + val);
|
|
|
+ // console.log('当前页:' + val);
|
|
|
// 清理一下当前数据中的rooms
|
|
|
this.currentData.rooms = [{
|
|
|
room: '',
|
|
|
@@ -1637,7 +1927,7 @@
|
|
|
|
|
|
.panel-left,
|
|
|
.panel-right {
|
|
|
-
|
|
|
+
|
|
|
.panel-header {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
@@ -1888,6 +2178,10 @@
|
|
|
height: 420px !important;
|
|
|
}
|
|
|
|
|
|
+ .el-dialog-modify-room {
|
|
|
+ height: 420px !important;
|
|
|
+ }
|
|
|
+
|
|
|
.el-dialog-add-louceng {
|
|
|
height: 360px !important;
|
|
|
}
|