From 0e6167b1333dfbf47d221f990490b3fab3096c0c Mon Sep 17 00:00:00 2001
From: xiaoheiiskinder <11674173+xiaohei102908@user.noreply.gitee.com>
Date: Fri, 3 Nov 2023 18:03:11 +0800
Subject: [PATCH] =?UTF-8?q?11.03=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dist/index.html | 2 +-
dist/static/config.js | 10 +++++++++-
src/views/room.vue | 12 ++++++++----
src/views/visualization/flatsIndex.vue | 20 +++++++++++---------
4 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/dist/index.html b/dist/index.html
index 68ff38a..d205770 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -1 +1 @@
-智慧公寓管理系统
\ No newline at end of file
+智慧公寓管理系统
\ No newline at end of file
diff --git a/dist/static/config.js b/dist/static/config.js
index 4d509a4..ed73ae4 100644
--- a/dist/static/config.js
+++ b/dist/static/config.js
@@ -285,7 +285,15 @@ export default {
"label": "LWJ_LOCK",
"productID": "LWJ_LOCK",
"value": 1201
- }],
+ },{
+ "label": "LWJ_BL_LOCK",
+ "productID": "LWJ_BL_LOCK",
+ "value": 1231
+ },{
+ "label": "LWJ_WIFI_FACE_LOCK",
+ "productID": "LWJ_WIFI_FACE_LOCK",
+ "value": 1241
+ }],
//门磁
doorMagnetism: [{
"label": "FULI_HOUSESENSOR",
diff --git a/src/views/room.vue b/src/views/room.vue
index 237b9fd..6efe3a0 100644
--- a/src/views/room.vue
+++ b/src/views/room.vue
@@ -1729,6 +1729,7 @@ export default {
var roomNum = 0;
var buildingNum = 0
var checkin = 0
+ var unboundNum = 0
res.data.list.list.map((li, index) => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
if (countNum) {
@@ -1744,6 +1745,9 @@ export default {
if (li.isRoom == 1 && li.count > 0) {
checkin++
}
+ if(li.isRoom == 1 && !li.imei) {
+ unboundNum++
+ }
// if (li.expand) {
// if (JSON.parse(li.expand).type == "0") {
// if (li.layout != null) {
@@ -1759,6 +1763,7 @@ export default {
this.buildingNum = buildingNum
this.checkin = checkin
this.emptyroomNum = roomNum - checkin
+ this.unboundNum = unboundNum
})
},
// 获取设备
@@ -2186,6 +2191,7 @@ export default {
var list = res.data.sort((pre, cur) => pre.id - cur.id)
var arrdata = uniqueArray(list, "id")
this.zNodes = ztreeToElementTree(arrdata, {});
+ this.getcount('')
});
},
// 获取列表
@@ -2549,9 +2555,7 @@ export default {
} else {
li.count = 0
}
- if(li.isRoom == '1' && !li.imei) {
- this.unboundNum++
- }
+
});
this.pageuserlist = pageuserlist;
var userlist = []
@@ -2904,7 +2908,7 @@ export default {
console.log(res);
this.editVisible1 = false;
this.getlistChildren1();
- this.getlist();
+ this.getcount('')
});
}
},
diff --git a/src/views/visualization/flatsIndex.vue b/src/views/visualization/flatsIndex.vue
index 73b116c..d037c7e 100644
--- a/src/views/visualization/flatsIndex.vue
+++ b/src/views/visualization/flatsIndex.vue
@@ -1006,15 +1006,17 @@ export default {
// })
// let listSort = listQuarters.sort((pre, cur) => pre.rent - cur.rent)
// listSort.map(li => {
- res.data.map(li => {
- middleChartExtendThree.series.map(li2 => {
- if (li.name == li2.name) {
- li2.data[li.month - 1] = li.rent
- }
- })
- // middleChartExtendThree.yAxis.data.push(li.name)
- // middleChartExtendThree.series[0].data.push(li.rent)
- })
+
+
+ // res.data.map(li => {
+ // middleChartExtendThree.series.map(li2 => {
+ // if (li.name == li2.name) {
+ // li2.data[li.month - 1] = li.rent
+ // }
+ // })
+ // // middleChartExtendThree.yAxis.data.push(li.name)
+ // // middleChartExtendThree.series[0].data.push(li.rent)
+ // })
let myMiddleChartObjThree = this.$echarts.init(
document.getElementById("myMiddleChartThree")
);