diff --git a/src/views/modules/base/microGrid/microGridHouse.vue b/src/views/modules/base/microGrid/microGridHouse.vue
index cafe1644..9f6e1c1e 100644
--- a/src/views/modules/base/microGrid/microGridHouse.vue
+++ b/src/views/modules/base/microGrid/microGridHouse.vue
@@ -40,28 +40,31 @@
:value="item.value">
+
-
+
-
+ 选取
@@ -198,7 +201,7 @@ export default {
getUniList() {
this.$http
.post('/gov/org/icbuildingunit/unitoption', {
- buildingId: this.BUILD_ID.join(',')
+ buildingId: this.BUILD_ID
})
.then(({ data: res }) => {
if (res.code !== 0) {
@@ -215,7 +218,7 @@ export default {
},
getHouseList() {
this.$http
- .post('/gov/org/ichouse/houseoption', { unitId: this.UNIT_ID.join(',') })
+ .post('/gov/org/ichouse/houseoption', { unitId: this.UNIT_ID })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
@@ -236,61 +239,69 @@ export default {
this.getBuildList()
},
handleChangeB(val) {
- const selected = val.filter(item => !this.prevSelectedOptionsB.includes(item));
- const unselected = this.prevSelectedOptionsB.filter(item => !val.includes(item));
- console.log(unselected);
- if (unselected.length > 0) {
- this.selArr = this.selArr.filter(item => item.id !== unselected[0])
- } else {
- this.getMicroGridHouseName(selected[selected.length - 1], 'building')
- }
- this.prevSelectedOptionsB = [...val];
+ // const selected = val.filter(item => !this.prevSelectedOptionsB.includes(item));
+ // const unselected = this.prevSelectedOptionsB.filter(item => !val.includes(item));
+ // console.log(unselected);
+ // if (unselected.length > 0) {
+ // this.selArr = this.selArr.filter(item => item.id !== unselected[0])
+ // } else {
+ // this.getMicroGridHouseName(selected[selected.length - 1], 'building')
+ // }
+ // this.prevSelectedOptionsB = [...val];
// 在这里处理选中或取消选中的逻辑
this.UNIT_ID = ''
this.HOME_ID = ''
this.getUniList()
},
handleChangeD(val) {
- const selected = val.filter(item => !this.prevSelectedOptionsD.includes(item));
- const unselected = this.prevSelectedOptionsD.filter(item => !val.includes(item));
- if (unselected.length > 0) {
- this.selArr = this.selArr.filter(item => item.id !== unselected[0])
- } else {
- this.getMicroGridHouseName(selected[selected.length - 1], 'unit')
- }
- this.prevSelectedOptionsD = [...val];
+ // const selected = val.filter(item => !this.prevSelectedOptionsD.includes(item));
+ // const unselected = this.prevSelectedOptionsD.filter(item => !val.includes(item));
+ // if (unselected.length > 0) {
+ // this.selArr = this.selArr.filter(item => item.id !== unselected[0])
+ // } else {
+ // this.getMicroGridHouseName(selected[selected.length - 1], 'unit')
+ // }
+ // this.prevSelectedOptionsD = [...val];
this.HOME_ID = ''
this.getHouseList()
},
handleChangeH(val) {
- const selected = val.filter(item => !this.prevSelectedOptionsH.includes(item));
- const unselected = this.prevSelectedOptionsH.filter(item => !val.includes(item));
- if (unselected.length > 0) {
- this.selArr = this.selArr.filter(item => item.id !== unselected[0])
- } else {
- this.getMicroGridHouseName(selected[selected.length - 1], 'house')
- }
- this.prevSelectedOptionsH = [...val];
+ // const selected = val.filter(item => !this.prevSelectedOptionsH.includes(item));
+ // const unselected = this.prevSelectedOptionsH.filter(item => !val.includes(item));
+ // if (unselected.length > 0) {
+ // this.selArr = this.selArr.filter(item => item.id !== unselected[0])
+ // } else {
+ // this.getMicroGridHouseName(selected[selected.length - 1], 'house')
+ // }
+ // this.prevSelectedOptionsH = [...val];
},
handleClearVillage() {
this.BUILD_ID = ''
this.HOME_ID = ''
},
+ handelClickCheck(){
+ if(this.HOME_ID.length > 0){
+ for(let i in this.HOME_ID){
+ this.getMicroGridHouseName(this.HOME_ID[i],'house')
+ }
+ }else if(this.UNIT_ID){
+ this.getMicroGridHouseName(this.UNIT_ID,'unit')
+ }else if(this.BUILD_ID){
+ this.getMicroGridHouseName(this.BUILD_ID,'building')
+ }
+ },
handleClearBuild() {
this.BUILD_ID = ''
this.UNIT_ID = ''
this.HOME_ID = ''
- this.selArr = []
},
handleClearDan() {
this.UNIT_ID = ''
this.HOME_ID = ''
- this.selArr = this.selArr.filter(item => item.level !== 'unit' || item.level !== 'house') || []
},
handleClearHouse() {
- this.selArr = this.selArr.filter(item => item.level !== 'house') || []
},
handleSizeChange(val) {
this.pageSize = val
@@ -330,13 +341,6 @@ export default {
this.tableLoading = false
},
handelClickDel(val) {
- if (val.level === "building") {
- this.BUILD_ID = this.BUILD_ID.filter(item => item !== val.id);
- } else if (val.level === "unit") {
- this.UNIT_ID = this.UNIT_ID.filter(item => item !== val.id);
- } else if (val.level === "house") {
- this.HOME_ID = this.HOME_ID.filter(item => item !== val.id);
- }
this.selArr = this.selArr.filter(item => item.id !== val.id);
},
handleClose() {
@@ -357,9 +361,9 @@ export default {
},
async handelSave() {
let parm = {
- houseIds: this.HOME_ID ? this.HOME_ID.join(',') : '',
- unitIds: this.UNIT_ID ? this.UNIT_ID.join(',') : '',
- buildingIds: this.BUILD_ID ? this.BUILD_ID.join(',') : '',
+ houseIds: this.selArr.filter(item=>item.level == 'house').map(item=>item.id).join(',') || '',
+ unitIds: this.selArr.filter(item=>item.level == 'unit').map(item=>item.id).join(',') || '',
+ buildingIds: this.selArr.filter(item=>item.level == 'building').map(item=>item.id).join(',')|| '' ,
microGridId: this.microGridId
}
let url = '/gov/org/house/addMicroGridHouse'