|
|
@@ -426,8 +426,8 @@
|
|
|
<div>{{form_add_louceng.building}}</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="楼层：" :label-width="formLabelWidth" prop="floor" :required="true">
|
|
|
- <el-input v-model="form_add_louceng.floor" autocomplete="off" placeholder="请输入楼层名称"
|
|
|
- ref="ref_louceng" maxlength="3"></el-input>
|
|
|
+ <el-input v-model="form_add_louceng.floor" autocomplete="off" placeholder="请输入楼层号"
|
|
|
+ ref="ref_louceng" maxlength="1" @keydown.enter.native="dialog_add_louceng_click"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -461,8 +461,8 @@
|
|
|
<div>{{form_add_room.floor}}</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="房间：" :label-width="formLabelWidth" :required="true" prop="room">
|
|
|
- <el-input v-model="form_add_room.room" autocomplete="off" placeholder="请输入房间名称" ref="ref_room"
|
|
|
- maxlength="4"></el-input>
|
|
|
+ <el-input v-model="form_add_room.room" autocomplete="off" placeholder="请输入房间名称" ref="ref_add_room"
|
|
|
+ maxlength="10" @keydown.enter.native="dialog_add_room_click"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -523,8 +523,8 @@
|
|
|
<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-input v-model="form_modify_room.room" autocomplete="off" placeholder="请输入房间号" ref="ref_modi_room"
|
|
|
+ maxlength="4" @keydown.enter.native="dialog_modify_room_click(show_modify_room)"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -594,12 +594,12 @@
|
|
|
}
|
|
|
var checklouceng = (rule, value, callback) => {
|
|
|
if (!value) {
|
|
|
- return callback(new Error('请输入楼层名称'));
|
|
|
+ return callback(new Error('请输入数字楼层号'));
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- var reg = /^[1-9][0-9]?[楼]{1,3}$/
|
|
|
+ var reg = /^[1-9]{1}$/
|
|
|
if (!reg.test(value)) {
|
|
|
- callback(new Error('1到2位数字+楼，不能0打头，如：1楼 或 99楼'));
|
|
|
+ callback(new Error('楼层只能输入 1 到 9 的数字'));
|
|
|
} else {
|
|
|
callback();
|
|
|
}
|
|
|
@@ -607,17 +607,17 @@
|
|
|
}
|
|
|
var checkroom = (rule, value, callback) => {
|
|
|
if (!value) {
|
|
|
- return callback(new Error('请输入房间名称'));
|
|
|
+ return callback(new Error('请输入房间号'));
|
|
|
}
|
|
|
|
|
|
setTimeout(() => {
|
|
|
- var regH = /[^\d]/g;
|
|
|
+ var regH = /[\d]$/g;
|
|
|
var floor = this.currentData.floor.replace(regH, '');
|
|
|
- var reg = /^[1-9]+[0-9]{2,3}$/
|
|
|
+ var reg = /[1-9]{1}[0-9]{2,3}$/
|
|
|
if (value.indexOf(floor)) {
|
|
|
- callback(new Error('必须以楼层号开头！'));
|
|
|
+ callback(new Error('房间号数字部分，必须以楼层号开头！'));
|
|
|
} else if (!reg.test(value)) {
|
|
|
- callback(new Error('为3-4个数字，非0开头！栋号不需要添加！'));
|
|
|
+ callback(new Error('房间号数字部分，为3-4个数字，非0开头！栋号不需要添加！'));
|
|
|
} else {
|
|
|
callback();
|
|
|
}
|
|
|
@@ -1069,20 +1069,21 @@
|
|
|
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) {
|
|
|
+ '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) {
|
|
|
+ '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)
|
|
|
}
|
|
|
@@ -1116,15 +1117,16 @@
|
|
|
this.$message.error('返回数据格式问题，code未获取到！');
|
|
|
return;
|
|
|
}
|
|
|
+ // console.log(res.data);
|
|
|
// 校区
|
|
|
let school = JSON.parse(res.data);
|
|
|
// console.log('school', school);
|
|
|
- if (typeof school !== 'undefined' && school !== '') {
|
|
|
+ if (school.length > 0) {
|
|
|
this.navData = []
|
|
|
let tmpSchool = []
|
|
|
for (var i = 0; i < school.length; i++) {
|
|
|
let nData = []
|
|
|
- let builds = school[i]["builds"]
|
|
|
+ let builds = school[i].builds
|
|
|
for (var j = 0; j < builds.length; j++) {
|
|
|
let tmpBuilds = {}
|
|
|
let tmpFloors = []
|
|
|
@@ -1140,7 +1142,9 @@
|
|
|
tmpFloors.push(floor);
|
|
|
}
|
|
|
// 楼层排序
|
|
|
- tmpFloors.sort((a, b) => a.label.localeCompare(b.label))
|
|
|
+ tmpFloors.sort((a, b) => {
|
|
|
+ return (a.label - b.label)
|
|
|
+ })
|
|
|
tmpBuilds.id = builds[j].id
|
|
|
tmpBuilds.label = builds[j].building
|
|
|
tmpBuilds.isShow = true
|
|
|
@@ -1622,9 +1626,9 @@
|
|
|
|
|
|
setTimeout(() => {
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.ref_room.focus()
|
|
|
+ this.$refs.ref_add_room.focus()
|
|
|
})
|
|
|
- }, 100)
|
|
|
+ }, 500)
|
|
|
},
|
|
|
/**
|
|
|
* 添加楼层
|
|
|
@@ -1644,7 +1648,7 @@
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.ref_louceng.focus()
|
|
|
})
|
|
|
- }, 100)
|
|
|
+ }, 500)
|
|
|
},
|
|
|
/**
|
|
|
* 告警状态: 异常
|
|
|
@@ -1672,7 +1676,7 @@
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.ref_loudong.focus()
|
|
|
})
|
|
|
- }, 100)
|
|
|
+ }, 500)
|
|
|
},
|
|
|
/**
|
|
|
* 添加楼栋对话框
|
|
|
@@ -1878,7 +1882,7 @@
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.ref_cao.focus()
|
|
|
})
|
|
|
- }, 100)
|
|
|
+ }, 500)
|
|
|
},
|
|
|
/**
|
|
|
* 操作编辑修改房间
|
|
|
@@ -1892,6 +1896,12 @@
|
|
|
this.form_modify_room.room = room.split('-')[1]
|
|
|
this.show_modify_room = room
|
|
|
this.dialog_modify_room = true
|
|
|
+
|
|
|
+ setTimeout(()=>{
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.$refs.ref_modi_room.focus()
|
|
|
+ })
|
|
|
+ }, 500)
|
|
|
},
|
|
|
/**
|
|
|
* 操作删除房间
|
程志平