|
@@ -97,10 +97,16 @@ export default {
|
|
|
let selIndex = 0;
|
|
let selIndex = 0;
|
|
|
|
|
|
|
|
// 房间分组排序
|
|
// 房间分组排序
|
|
|
- const cbOrder = this.data.end_order || 0;
|
|
|
|
|
|
|
+ // const cbOrder = this.data.end_order || 0;
|
|
|
standalone.forEach((item, index) => {
|
|
standalone.forEach((item, index) => {
|
|
|
// 计算默认选中的位置
|
|
// 计算默认选中的位置
|
|
|
- if (item.cbOrder == cbOrder) {
|
|
|
|
|
|
|
+ // if (item.cbOrder == cbOrder) {
|
|
|
|
|
+ // item.selection = true;
|
|
|
|
|
+ // selIndex = index;
|
|
|
|
|
+ // } else {
|
|
|
|
|
+ // item.selection = false;
|
|
|
|
|
+ // }
|
|
|
|
|
+ if (index == 0) {
|
|
|
item.selection = true;
|
|
item.selection = true;
|
|
|
selIndex = index;
|
|
selIndex = index;
|
|
|
} else {
|
|
} else {
|
|
@@ -123,6 +129,7 @@ export default {
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
// 计算已经选中的indexPath
|
|
// 计算已经选中的indexPath
|
|
|
|
|
+ /*
|
|
|
for (let i = 0; i < this.areaList.length; i++) {
|
|
for (let i = 0; i < this.areaList.length; i++) {
|
|
|
const area = this.areaList[i];
|
|
const area = this.areaList[i];
|
|
|
const deviceList = this.areaMap[area];
|
|
const deviceList = this.areaMap[area];
|
|
@@ -135,6 +142,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ */
|
|
|
|
|
|
|
|
// 获取实时数据与设备详情
|
|
// 获取实时数据与设备详情
|
|
|
if (selIndex < standalone.length) {
|
|
if (selIndex < standalone.length) {
|
|
@@ -236,7 +244,7 @@ export default {
|
|
|
margin-top: 12px;
|
|
margin-top: 12px;
|
|
|
border-radius: 5px;
|
|
border-radius: 5px;
|
|
|
border: 1px solid #d5d5d5;
|
|
border: 1px solid #d5d5d5;
|
|
|
- padding: 10px;
|
|
|
|
|
|
|
+ padding: 10px 0;
|
|
|
|
|
|
|
|
.end-area-item {
|
|
.end-area-item {
|
|
|
font-size: 16px;
|
|
font-size: 16px;
|
|
@@ -245,6 +253,7 @@ export default {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
|
|
+ padding: 0 15px;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
