-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
搜 索
-
重置搜索
-
-
同步房源
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜 索
+ 重置搜索
+
+ 同步房源
-
-
-
-
-
-
-
-
-
-
- 绑定设备
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 绑定设备
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/room.vue b/src/views/room.vue
index 935c4bf..07723b4 100644
--- a/src/views/room.vue
+++ b/src/views/room.vue
@@ -1005,8 +1005,7 @@ export default {
});
},
addressChange(arr) {
- console.log(arr);
- console.log(CodeToText[arr[0]], CodeToText[arr[1]], CodeToText[arr[2]]);
+
},
onSelected1(data) {
this.dataProvince1 = data
@@ -1016,15 +1015,15 @@ export default {
},
onChangeProvince(data) {
this.selectaddress2.province = data
- console.log(this.selectaddress2, data)
+
},
onChangeCity(data) {
this.selectaddress2.city = data
- console.log(this.selectaddress2, data)
+
},
onChangeArea(data) {
this.selectaddress2.area = data
- console.log(this.selectaddress2, data)
+
},
handleChange() {
var loc = "";
@@ -1244,7 +1243,7 @@ export default {
this.isRoom = true
this.onetypeget(data.id, function (data) {
that.addrow = data;
- console.log(that.addrow)
+
});
this.editVisible1 = true;
},
@@ -1256,6 +1255,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
res.data.list.list.map(li => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
if (countNum) {
@@ -1508,7 +1508,7 @@ export default {
};
await this.getcount(data)
httpGet(data, this.$api.getSiteList).then(res => {
- console.log(res)
+ console.log(res);
this.projectNum = res.data.list.total
var schoollist = res.data.list.list;
this.schoollist = schoollist
@@ -1536,6 +1536,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
this.Building = res.data.list.total;
});
},
@@ -1587,7 +1588,7 @@ export default {
this.buildingNum = buildingNum
this.checkin = checkin
this.unboundNum = unboundNum
- this.emptyroomNum = roomNum - unboundNum - checkin
+ this.emptyroomNum = roomNum - checkin
})
},
// 获取设备
@@ -1657,6 +1658,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var pageuserlist = [],
userlist = [];
res.data.list.list.map((li, index) => {
@@ -1740,6 +1742,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var userlist = [];
res.data.list.list.map((li, index) => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
@@ -1782,6 +1785,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var userlist = [];
res.data.list.list.map((li, index) => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
@@ -1824,6 +1828,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var userlist = [];
res.data.list.list.map((li, index) => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
@@ -1865,6 +1870,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var userlist = [];
res.data.list.list.map((li, index) => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
@@ -1904,6 +1910,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var userlist = [],
pageuserlist = [];
res.data.list.list.map((li, index) => {
@@ -1949,7 +1956,7 @@ export default {
handleClick(tab, event) { },
handleClick1(tab, event) {
- console.log(tab, event);
+
},
getalllist() {
var data = {};
@@ -1975,6 +1982,7 @@ export default {
var arrdata = uniqueArray(list, "id")
this.allRoomList = arrdata
this.zNodes = ztreeToElementTree(arrdata, {});
+ console.log(this.zNodes);
});
},
getalllist1(row) {
@@ -1988,6 +1996,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getTree).then((res) => {
+ console.log(res);
var userlist = [];
var temp = {},
arr = [];
@@ -2064,6 +2073,7 @@ export default {
};
}
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var pageuserlist = [],
userlist = [];
res.data.list.list.map((li, index) => {
@@ -2116,6 +2126,7 @@ export default {
};
this.getalllist1(row);
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var pageuserlist = [],
userlist = [];
res.data.list.list.map((li, index) => {
@@ -2192,6 +2203,7 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
let newArr = []
res.data.list.list.map(li => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
@@ -2236,7 +2248,6 @@ export default {
}
str += '\n'
});
- // console.log(str)
// encodeURIComponent解决中文乱码
const uri = 'data:text/xlsx;charset=utf-8,\ufeff' + encodeURIComponent(str);
// 通过创建a标签实现
@@ -2262,11 +2273,14 @@ export default {
};
var data = {
q: JSON.stringify(q),
+ orderBy: 'index'
};
this.getalllist1(row);
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var pageuserlist = [],
userlist = [];
+ res.data.list.list.sort((a, b) => { return a.index - b.index })
res.data.list.list.map((li, index) => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
if (countNum) {
@@ -2366,7 +2380,6 @@ export default {
li.count = 0
}
});
- console.log(pageuserlist);
this.pageuserlist = pageuserlist;
var userlist = []
pageuserlist.map((li, index) => {
@@ -2374,7 +2387,6 @@ export default {
userlist.push(li);
}
});
- console.log(userlist);
this.userlist = userlist;
this.total = pageuserlist.length;
});
@@ -2465,7 +2477,6 @@ export default {
// 单个绑定
dbing() {
var list = this.multipleSelection;
- console.log(this.multipleSelection);
if (list.length == 0) {
this.$message.error("请勾选需要删除的数据");
} else {
@@ -2691,6 +2702,7 @@ export default {
},
// 单个房间创建
saveEdit2() {
+ console.log(this.addrow);
var info = localStorage.getItem("info");
var expand = {
type: "0",
@@ -2701,7 +2713,6 @@ export default {
} else {
isRoom = 0
}
- console.log(this.addrow)
var data = {
acreage: parseInt(this.form.acreage),
ancestor: this.addid,
@@ -2711,12 +2722,13 @@ export default {
isRoom: isRoom,
type: parseInt(this.addrow.type) + 1,
enterpriseId: JSON.parse(info).enterpriseId,
+ orderBy: JSON.stringify({ index: this.addrow.index })
};
- console.log("123")
if (this.form.name == "") {
this.$message.error("公寓名称不能为空");
} else {
httpPost(data, this.$api.sitAddChild).then((res) => {
+ console.log(res);
this.editVisible1 = false;
this.getlistChildren1();
this.getlist();
@@ -2765,7 +2777,7 @@ export default {
this.activeiconfont2 = t;
},
handleSizeChange(val) {
- console.log(`每页 ${val} 条`);
+
},
handleSizeChangeSearch(val) {
this.pageSizeSearch = val
@@ -2800,6 +2812,7 @@ export default {
pageSize: 10
};
httpGet(data, this.$api.getSiteList).then((res) => {
+ console.log(res);
var schoollist = res.data.list.list;
this.schoollist = schoollist
this.setSchoolTotal()
@@ -3266,4 +3279,5 @@ export default {
.h700 {
height: 300px;
}
-}
+}
+
diff --git a/src/views/userManagement.vue b/src/views/userManagement.vue
index 569ecd2..30af5ae 100644
--- a/src/views/userManagement.vue
+++ b/src/views/userManagement.vue
@@ -2544,7 +2544,21 @@ export default {
};
httpPost(data, this.$api.getlistNum).then((res1) => {
console.log(res1)
+ // res1.data.list.map((li, index) => {
+ // li['rommNameText'] = this.screenRoomName(li.id)
+ // });
+ let para = [];
res1.data.list.map((li, index) => {
+ let userTelephone = JSON.parse(li.info) ? JSON.parse(li.info).userTelephone : ''
+ let str = {
+ imei: li.imei,
+ userTelephone: userTelephone,
+ password: "",
+ operateMode: 1,
+ };
+ para.push(str);
+ this.$store.commit("increment", 1);
+ li.status = 3;
li['rommNameText'] = this.screenRoomName(li.id)
});
this.userlist = res1.data.list;
@@ -6205,6 +6219,19 @@ export default {
let roomAbout = this.$store.state.roomAbout
httpPost(data, this.$api.getlistNum).then((res1) => {
if (res1.success) {
+ // let para = [];
+ // res1.data.list.map((li, index) => {
+ // let userTelephone = JSON.parse(li.info) ? JSON.parse(li.info).userTelephone : ''
+ // let str = {
+ // imei: li.imei,
+ // userTelephone: userTelephone,
+ // password: "",
+ // operateMode: 1,
+ // };
+ // para.push(str);
+ // li.status = 3;
+ // li['rommNameText'] = this.screenRoomName(li.id)
+ // });
let para = [];
res1.data.list.map((li, index) => {
let userTelephone = JSON.parse(li.info) ? JSON.parse(li.info).userTelephone : ''
@@ -6215,6 +6242,7 @@ export default {
operateMode: 1,
};
para.push(str);
+ this.$store.commit("increment", 1);
li.status = 3;
li['rommNameText'] = this.screenRoomName(li.id)
});