|
|
@@ -772,16 +772,19 @@ export default {
|
|
|
// this.showDetail = false;
|
|
|
let startTime = this.$moment(this.ruleForm.activeTime[0]).format(`YYYY-MM-DDTHH:mm:ss`);
|
|
|
let endTime = this.$moment(this.ruleForm.activeTime[1]).format(`YYYY-MM-DDTHH:mm:ss`);
|
|
|
- let userVos = [];
|
|
|
- let obj = {};
|
|
|
- let arr1 = this.selectDataHouseTreeData.userID;
|
|
|
+ var userVos = [];
|
|
|
+ let arr1 = this.selectDataHouseTreeData.userList;
|
|
|
let arr2 = this.selectDataPeopleTreeData.userList;
|
|
|
+ console.log('arr1==================', arr1);
|
|
|
+ console.log('arr2==================', arr2);
|
|
|
let treeData = [];
|
|
|
- treeData[0] = JSON.stringify(arr1);
|
|
|
+ treeData[0] = JSON.stringify(this.selectDataHouseTreeData.userID);
|
|
|
treeData[1] = JSON.stringify(arr2);
|
|
|
if (arr1.length > 0) {
|
|
|
for (let index = 0; index < arr1.length; index++) {
|
|
|
let element = arr1[index];
|
|
|
+ console.log('arr1====element==============', element);
|
|
|
+ let obj = {};
|
|
|
obj.noticeId = '';
|
|
|
obj.userId = element;
|
|
|
obj.userType = 0;
|
|
|
@@ -790,11 +793,12 @@ export default {
|
|
|
}
|
|
|
if (arr2.length > 0) {
|
|
|
for (let index = 0; index < arr2.length; index++) {
|
|
|
+ console.log('arr2====element==============', element);
|
|
|
+ let obj = {};
|
|
|
let element = arr2[index];
|
|
|
- console.log('arr2', element);
|
|
|
obj.noticeId = '';
|
|
|
obj.userId = element;
|
|
|
- obj.userType = 0;
|
|
|
+ obj.userType = 1;
|
|
|
userVos.push(obj);
|
|
|
}
|
|
|
}
|
long