From 7beda007c87f8ee82b8b5904433a546cb2a4b303 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 12 Dec 2023 13:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E7=BD=91=E6=A0=BC=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 src/assets/img/del.png                        | Bin 0 -> 600 bytes
 src/views/modules/base/microGrid/index.vue    |  11 +-
 .../modules/base/microGrid/microGridHouse.vue | 197 ++++++++++++++----
 vue.config.js                                 |   2 +-
 5 files changed, 165 insertions(+), 46 deletions(-)
 create mode 100644 src/assets/img/del.png

diff --git a/.gitignore b/.gitignore
index fda01217..4162d235 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 hs_err_pid*
 node_modules
 dist
+epmet-oper-gov
 epmet-oper
 package-lock.json
 .idea/
\ No newline at end of file
diff --git a/src/assets/img/del.png b/src/assets/img/del.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc50e586a2bb912a9741964628fc597230813a85
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%5=lfsRA@u(S<7+4Kn#^^QUFjuOeau82)E#S%uFf(D##4Z9gYNwfK-B00MG!o
zGP}kJ0o&}_J1`{TilmkF^g$1V8~@;q`wtwzwGm_l7=e-*Fj7LD*R2!U&_s;xRs12c
zKJ5^e)0b+XBA+KyI)IM9ZAL%~ZAS<K3(=i=)up!XfkNp3+M~@15F8)~2tg^M2+)*1
z5CpSct#P#gMCn8oS_ucN9X3=;;+Gy^s|*UI5I8KKnOD=Y)%G_e1LpwF6kyw5_p?M0
z!6CwK{5=iyY8j<GB29?Wdq+&Gd9OMtJcS-c+b$xF^&B%TO@o<NA7&;o?>W(IbQkp_
zLdUdQs`l(1x_QGvtMODHy`<d#3PAP*P(N*h%Gqwy0+1$IH7oQ1=_#!&<VYqO6X5V%
z;~pZcg}{TqS;SlPw6VS$K4-foTbl^oV<#Wq)?+cz2w*w)YAw|=<N%UPF#=pd3SGlZ
zyuTfI3KhM`xP-WbPA3g-V&2624DgRRg+&a1dW<FqP2NEw84kj(6=Li7&b?>}=^h<A
z=n9(U{kiU{=tx>dRZz&q91#u#r)h$iP2N7F8q==5!o1M2;?La+G0mbu=w|Xd1db$!
z_x5zjUM&Q~8z({NK$s_65LN8}k|3Z0PDtRW{;84Yy9L%qQHHuu0H%^|!VU*uB8z2g
mFal+=XF`_|Fp<SFHogGmmY7eOW@}Xd0000<MNUMnLSTa9WBh#p

literal 0
HcmV?d00001

diff --git a/src/views/modules/base/microGrid/index.vue b/src/views/modules/base/microGrid/index.vue
index fe529843..5971536c 100644
--- a/src/views/modules/base/microGrid/index.vue
+++ b/src/views/modules/base/microGrid/index.vue
@@ -77,9 +77,9 @@
   
   <script>
   
-  import microGridAdd from '../microGrid/microGridAdd'
-  import microGridDetail from '../microGrid/microGridDetail'
-  import microGridHouse from '../microGrid/microGridHouse'
+  import microGridAdd from './microGridAdd'
+  import microGridDetail from './microGridDetail'
+  import microGridHouse from './microGridHouse'
   
   import { requestPost } from "@/js/dai/request";
   import { mapGetters } from 'vuex'
@@ -204,7 +204,9 @@
         this.tableLoading = true
         const url = "/gov/org/customerMicroGrid/page"
         // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/list"
-        this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length-1]
+        if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length > 0) {
+            this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length-1]
+        }
         let params = {
           pageSize: this.pageSize,
           pageNo: this.pageNo,
@@ -266,7 +268,6 @@
       addFormOk() {
         this.formShow = false
         this.loadTable()
-  
       },
   
       async handleDelete(row) {
diff --git a/src/views/modules/base/microGrid/microGridHouse.vue b/src/views/modules/base/microGrid/microGridHouse.vue
index 4d2c1dcc..cafe1644 100644
--- a/src/views/modules/base/microGrid/microGridHouse.vue
+++ b/src/views/modules/base/microGrid/microGridHouse.vue
@@ -10,63 +10,75 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
                 <template slot-scope="scope">
-                    <el-button type="text" class="div-table-button--delete" size="small"
-                        @click="handleDelete(scope.row)">删除</el-button>
-
+                    <el-popconfirm title="确认删除？"
+                             @confirm="handleDelete(scope.row)">
+                             <el-button slot='reference' type="text" class="div-table-button--delete" size="small"
+                       >删除</el-button>
+              </el-popconfirm>
+                  
                 </template>
             </el-table-column>
         </el-table>
         <div>
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
-                :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total">
+            <el-pagination @size-change="handleSizeChange"  :current-page="pageNo" @current-change="handleCurrentChange" :total="total" :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="total,sizes, prev, pager, next">
             </el-pagination>
         </div>
-        <el-dialog :visible.sync="addHouseShow" :close-on-click-modal="false" :close-on-press-escape="false" width="920px"
-        destroy-on-close :before-close="beforeClose" top="30vh" @closed="addHouseShow = false" class="dialog-h" z-index="3000">
+        <el-dialog v-if="addHouseShow" :visible.sync="addHouseShow" :close-on-click-modal="false" :close-on-press-escape="false" width="920px"
+            destroy-on-close :before-close="beforeClose" top="30vh" @closed="addHouseShow = false" class="dialog-h"
+            z-index="3000">
             <div style="padding:10px;">
                 <div> 所属组织:{{ gridName }}</div>
                 <el-row>
-                    <el-col :span="18">
+                    <el-col :span="24">
                         <div class="resi-cell">
-                            <div class="resi-cell-label">所属房屋</div>
+                            <div class="resi-cell-label">选择房屋</div>
                             <div class="resi-cell-value">
                                 <el-select v-model.trim="VILLAGE_ID" placeholder="请选择小区" size="small" clearable
-                                    class="resi-cell-select" @clear="handleClearVillage" @change="handleChangeV" popper-class="vSelsect">
-                                    <el-option v-for="item in optionsV" :key="item.value" :label="item.label"
+                                    class="resi-cell-select" @clear="handleClearVillage" @change="handleChangeV"
+                                    popper-class="vSelsect">
+                                    <el-option v-for="(item, index) in optionsV" :key="index" :label="item.label"
                                         :value="item.value">
                                     </el-option>
                                 </el-select>
                                 <el-select v-model.trim="BUILD_ID" placeholder="楼号" size="small" clearable
                                     style="width: 150px;" class="resi-cell-select " :disabled="changeVDisabled"
-                                    @clear="handleClearBuild" multiple collapse-tags @change="handleChangeB" popper-class="vSelsect">
-                                    <el-option v-for="item in optionsB" :key="item.value" :label="item.label"
+                                    @clear="handleClearBuild" multiple collapse-tags @change="handleChangeB"
+                                    popper-class="vSelsect" ref="buildS">
+                                    <el-option v-for="(item, index) in optionsB" :key="index" :label="item.label"
                                         :value="item.value">
                                     </el-option>
                                 </el-select>
                                 <el-select v-model.trim="UNIT_ID" multiple collapse-tags :disabled="changeBDisabled"
                                     placeholder="单元" size="small" clearable style="width: 150px;" class="resi-cell-select "
-                                    @click="handleClearDan" @change="handleChangeD" popper-class="vSelsect">
-                                    <el-option v-for="item in optionsD" :key="item.value" :label="item.label"
+                                    @clear="handleClearDan" @change="handleChangeD" popper-class="vSelsect">
+                                    <el-option v-for="(item, index) in optionsD " :key="index" :label="item.label"
                                         :value="item.value">
                                     </el-option>
                                 </el-select>
                                 <el-select v-model.trim="HOME_ID" multiple collapse-tags :disabled="changeDDisabled"
-                                    placeholder="房号" size="small" clearable style="width: 150px;" class="resi-cell-select " popper-class="vSelsect">
-                                    <el-option v-for="item in optionsH" :key="item.value" :label="item.label"
+                                    placeholder="房号" size="small" clearable style="width: 150px;" class="resi-cell-select "
+                                    popper-class="vSelsect" @clear="handleClearHouse" @change="handleChangeH">
+                                    <el-option v-for="(item, index) in optionsH" :key="index" :label="item.label"
                                         :value="item.value">
                                     </el-option>
                                 </el-select>
                             </div>
                         </div>
+                        <section>
+                            <div v-for="(item, index) in selArr" :key="index" style="margin-top: 10px;">
+                                <span>{{ item.name }}</span><img src="../../../../assets/img/del.png"
+                                    style="cursor: pointer;" @click="handelClickDel(item)" width="16px" alt="">
+                            </div>
+                        </section>
+                       
+                    </el-col>
+                    <el-col :span="24">
                         <div class="btn_bto">
-                              <el-row type="flex" justify="end" >
-                                  <el-col :span="24">
-                                    <el-button type="primary" plain @click="handleClose" >取消</el-button>
+                                    <el-button type="primary" plain @click="handleClose">取消</el-button>
                                     <el-button type="primary" plain @click="handelSave"> 确定</el-button>
-                                </el-col>
-                              </el-row>
                         </div>
-                    </el-col></el-row>
+                    </el-col>
+                </el-row>
             </div>
         </el-dialog>
     </div>
@@ -75,7 +87,7 @@
 <script>
 
 
-import { requestGet } from "@/js/dai/request";
+import { requestGet, requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 
@@ -84,7 +96,7 @@ export default {
     data() {
         return {
             loading: false,
-            pageSize: 10,
+            pageSize: 20,
             pageNo: 0,
             tableLoading: false,
             microGridId: '',//微网格Id
@@ -104,7 +116,12 @@ export default {
             BUILD_ID: '',
             UNIT_ID: '',
             HOME_ID: '',
-            selArr:[]
+            selArr: [],
+            prevSelectedOptionsB: [],
+            prevSelectedOptionsD: [],
+            prevSelectedOptionsH: [],
+            total:0
+
         }
     },
     components: {
@@ -129,12 +146,13 @@ export default {
 
         async loadTable() {
             this.tableLoading = true
-            const url = `/gov/org/house/getMicroGridHouseList?microGridId=${this.microGridId}`
+            const url = `/gov/org/house/getMicroGridHouseList?microGridId=${this.microGridId}&pageSize=${this.pageSize}&pageNo=${this.pageNo}`
             // const url = "http://yapi.elinkservice.cn/mock/245/heart/userdemand/recordList"
             const { data, code, msg } = await requestGet(url)
 
             if (code === 0) {
-                this.tableData = data || []
+                this.tableData = data.list || []
+                this.total = data.total
             } else {
                 this.$message.error(msg)
             }
@@ -218,16 +236,44 @@ export default {
             this.getBuildList()
         },
         handleChangeB(val) {
-            console.log('val', 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) {
-            console.log('val', 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];
+
+        },
         handleClearVillage() {
             this.BUILD_ID = ''
             this.HOME_ID = ''
@@ -236,10 +282,15 @@ export default {
             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
@@ -255,28 +306,81 @@ export default {
             this.addHouseShow = true
             this.getValiheList()
         },
-        beforeClose(done){
-            this.VILLAGE_ID = ''
+        beforeClose(done) {
+            this.VILLAGE_ID = '';
+            this.BUILD_ID = '';
+            this.UNIT_ID = '';
+            this.HOME_ID = '';
+            this.selArr = []
             this.addHouseShow = false
         },
-        async getMicroGridHouseName(id,level) {
-            this.tableLoading = true
+        async getMicroGridHouseName(id, level) {
             const url = `/gov/org/house/getMicroGridHouseName?levelId=${id}&level=${level}`
             // const url = "http://yapi.elinkservice.cn/mock/245/heart/userdemand/recordList"
             const { data, code, msg } = await requestGet(url)
             if (code === 0) {
-                this.selArr.push(data)
+                // 判断 selArr 中是否已包含相同的 id
+                const isIdInSelArr = this.selArr.some(item => item.id === id);
+                if (!isIdInSelArr) {
+                    this.selArr.push(data);
+                }
             } else {
                 this.$message.error(msg)
             }
             this.tableLoading = false
         },
-       
-        handleClose(){
+        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() {
             this.addHouseShow = false
+            this.restData()
+        },
+        async handleDelete(row) {
+            let parm = {
+                houseId: row.homeId
+            }
+            let url = '/gov/org/house/removeMicroGridHouse'
+            const { data, code, msg } = await requestPost(url, parm)
+            if (code == 0) {
+                this.loadTable()
+            } else {
+                console.log(mas);
+            }
+        },
+        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(',') : '',
+                microGridId: this.microGridId
+            }
+            let url = '/gov/org/house/addMicroGridHouse'
+            const { data, code, msg } = await requestPost(url, parm)
+            if (code == 0) {
+                this.addHouseShow = false
+                this.restData()
+                this.loadTable()
+            } else {
+                console.log(mas);
+            }
         },
-        handelSave(){
-            console.log(this.VILLAGE_ID ,this.BUILD_ID,this.UNIT_ID,this.HOME_ID);
+        restData(){
+            this.VILLAGE_ID = '';
+            this.UNIT_ID = [];
+            this.BUILD_ID = [];
+            this.HOME_ID = [];
+            this.selArr = [];
+            this.optionsB= [];
+            this.optionsD= [];
+            this.optionsH= [];
         },
         // 开启加载动画
         startLoading() {
@@ -315,7 +419,7 @@ export default {
         ...mapGetters(['clientHeight'])
     },
     watch: {
-    
+
     },
     props: {
         serviceType: {
@@ -327,6 +431,7 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/buttonstyle.scss";
+
 // @import "@/assets/scss/common.scss";
 .div_main {
     background: #ffffff;
@@ -372,5 +477,17 @@ export default {
     margin-top: 10px;
     margin-right: 50px;
 }
+.btn_bto{
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 16px;
+}
+.resi-cell{
+    display: flex;
+    align-items: center;
+    .resi-cell-label{
+        margin-right: 10px;
+    }
+}
 </style>
   
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 1d028ff3..fc044b05 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = {
       .loader('svg-sprite-loader')
   },
   productionSourceMap: false,
-  outputDir: 'dist',
+  outputDir: 'epmet-oper-gov',
   assetsDir: 'static',
   devServer: {
     open: true,