xh
/
saas0801
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

11.03，修改完成首页数据

master
xiaoheiiskinder 2 years ago
parent
e08ad93068
commit
0e6167b133
4 changed files with 29 additions and 15 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      dist/index.html
  2. +9
    -1
      dist/static/config.js
  3. +8
    -4
      src/views/room.vue
  4. +11
    -9
      src/views/visualization/flatsIndex.vue

+ 1
- 1
dist/index.html View File

@ -1 +1 @@
<!DOCTYPE html><html><head><meta http-equiv=Content-Language><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta http-equiv=Content-Type content="text/html;charset=utf-8"><title>智慧公寓管理系统</title><link href=/static/css/app.a62b1b324218f3f3c2a1dbd82990be1a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5c1fe6236a2c0166a921.js></script><script type=text/javascript src=/static/js/vendor.622945be597e735b1a7b.js></script><script type=text/javascript src=/static/js/app.62c688593aead8f6ba2d.js></script></body></html>
<!DOCTYPE html><html><head><meta http-equiv=Content-Language><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta http-equiv=Content-Type content="text/html;charset=utf-8"><title>智慧公寓管理系统</title><link href=/static/css/app.e9c51986e06635b087f180f710028da7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.14eb96a240a1cf78d936.js></script><script type=text/javascript src=/static/js/vendor.622945be597e735b1a7b.js></script><script type=text/javascript src=/static/js/app.da880979c4f33e43a1f2.js></script></body></html>

+ 9
- 1
dist/static/config.js View File

@ -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",


+ 8
- 4
src/views/room.vue View File

@ -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('')
});
}
},


+ 11
- 9
src/views/visualization/flatsIndex.vue View File

@ -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")
);


Write Preview
Loading…
Cancel
Save