Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

src/views/modules/base/community/communityTable.vue

@@ -109,12 +109,18 @@
     </div>
 
     <div class="div_table">
-      <el-table :data="tableData"
+      <el-table ref="ref_table"
+                :data="tableData"
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                style="width: 100%">
+                style="width: 100%"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         width="55">
+        </el-table-column>
         <el-table-column prop="neighborHoodName"
                          label="小区名称"
                          min-width="100">
@@ -173,6 +179,16 @@
                        :total="total">
         </el-pagination>
       </div>
+
+      <div class="div_del">
+        <el-checkbox :indeterminate="isIndeterminate"
+                     v-model="selAllFlag"
+                     @change="handleSelectAll">全选</el-checkbox>
+        <el-button style="margin-left:15px"
+                   type="red"
+                   size="small"
+                   @click="deleteBatch">删除</el-button>
+      </div>
     </div>
 
     <!-- 修改弹出框 -->
@@ -210,11 +226,14 @@ export default {
       pageSize: 20,
       pageNo: 0,
       tableLoading: true,
+      selAllFlag: false,
+      isIndeterminate: false,//复选框的不确定状态
 
       agencyObj: {},//树所选的组织对象
       ownerName: '',
       ownerPhone: '',
       tableData: [],
+      selection: [],
 
       //form相关
       formShow: false,
@@ -244,7 +263,61 @@ export default {
     ...mapGetters(['clientHeight'])
   },
   methods: {
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          this.$refs.ref_table.toggleRowSelection(row);
+        });
+      }
+    },
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("确认删除选择的小区?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteCommunityBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的小区')
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection
 
+      if (selection.length > 0) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+    selectionChange (selection) {
+      this.selection = selection
+
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true
+        this.isIndeterminate = false
+      } else if (selection.length > 0) {
+        this.selAllFlag = false
+        this.isIndeterminate = true
+      } else {
+        this.selAllFlag = false
+        this.isIndeterminate = false
+      }
+    },
     handleSearch () {
       this.loadTable()
     },
@@ -339,6 +412,26 @@ export default {
         });
     },
 
+    async deleteCommunityBatch () {
+      const url = "/gov/org/neighborhood/neighborhooddel"
+
+      let params = {
+        neighborHoodId: row.neighborHoodId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
     async deleteCommunity (row) {
       const url = "/gov/org/neighborhood/neighborhooddel"
 
@@ -610,6 +703,12 @@ export default {
 
 .div_table {
   margin-top: 20px;
+  position: relative;
+}
+.div_del {
+  position: absolute;
+  left: 10px;
+  bottom: 0;
 }
 .div_search {
   display: flex;

src/views/modules/base/resi.vue

@@ -32,11 +32,15 @@
         </el-upload>
 
       </div>
-      <el-table :data="tableData"
+      <el-table ref="ref_table" :data="tableData"
                 v-loading="tableLoading"
                 border
                 style="width: 100%"
-                class="resi-table">
+                class="resi-table"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         width="55" />
         <el-table-column label="序号"
                          type="index"
                          align="center"
@@ -86,15 +90,27 @@
           </template>
         </el-table-column>
       </el-table>
-      <div>
+      <div class="div-flex">
-        <el-pagination @size-change="handleSizeChange"
+        <div class="div_del">
-                       @current-change="handleCurrentChange"
+          <el-checkbox :indeterminate="isIndeterminate"
-                       :current-page.sync="currentPage"
+                      v-model="selAllFlag"
-                       :page-sizes="[20, 50, 100, 200]"
+                      @change="handleSelectAll">全选</el-checkbox>
-                       :page-size="pageSize"
+          <el-button style="margin-left:15px"
-                       layout="sizes, prev, pager, next"
+                    type="danger"
-                       :total="total">
+                    size="small"
-        </el-pagination>
+                    @click="deleteBatch">删除</el-button>
+        </div>
+        <div>
+          <el-pagination @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :current-page.sync="currentPage"
+                        :page-sizes="[20, 50, 100, 200]"
+                        :page-size="pageSize"
+                        layout="sizes, prev, pager, next, total"
+                        :total="total">
+          </el-pagination>
+        </div>
+        
       </div>
     </el-card>
 
@@ -240,6 +256,8 @@ export default {
       btnLoading: false,
       disabled: false,
       pageLoading: false,
+      selAllFlag: false,
+      isIndeterminate: false,
       dialogEditVisible: false,
       dialogVisible: false,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
@@ -262,6 +280,7 @@ export default {
       formList: [],
       tableHeader: [],
       tabsList: [],
+      selection: [],
 
       defaultCategotyKey: '',
 
@@ -336,6 +355,61 @@ export default {
       const { user } = this.$store.state
       return id === user.agencyId
     },
+    selectionChange (selection) {
+      this.selection = selection
+
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true
+        this.isIndeterminate = false
+      } else if (selection.length > 0) {
+        this.selAllFlag = false
+        this.isIndeterminate = true
+      } else {
+        this.selAllFlag = false
+        this.isIndeterminate = false
+      }
+    },
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          this.$refs.ref_table.toggleRowSelection(row);
+        });
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length > 0) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteresiBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的小区')
+      }
+    },
     handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
@@ -627,7 +701,7 @@ export default {
     handleDel (row) {
       let params = {
         formCode: 'resi_base_info',
-        icResiUserId: row.icResiUserId
+        userIds: [row.icResiUserId]
       }
       console.log('row1', row)
       this.$http
@@ -926,7 +1000,29 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
-    }
+    },
+    async deleteresiBatch () {
+      if (this.selection.length === 0) return this.$message.error('请选择之后进行操作')
+      let userIds = this.selection.map(item => item.icResiUserId)
+      let params = {
+        formCode: 'resi_base_info',
+        userIds
+      }
+      this.$http
+        .post('/epmetuser/icresiuser/delete', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('删除成功')
+            this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
   }
 }
 </script>
@@ -1033,4 +1129,13 @@ export default {
   margin-top: 20px;
   text-align: center;
 }
+.div-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  .div_del {
+    margin-top: 15px;
+  }
+}
 </style>

src/views/modules/communityService/sqzzz/index.vue

@@ -270,34 +270,53 @@ export default {
       }
       return fileType && isLt1M;
     },
-    uploadHttpRequest(file) {
+    async uploadHttpRequest(file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
-      axios({
+      await this.$http
-        url:
+        .post('/heart/iccommunityselforganization/importcommunityselforganization', formData).then(res => {
-          window.SITE_CONFIG["apiURL"] +
+          console.log('res-up', res)
-          "/heart/iccommunityselforganization/importcommunityselforganization",
+          if (res.data.code == 0 && res.data.msg == 'success') {
-        method: "post",
+            this.$message.success('导入成功')
-        data: formData,
+            this.getTableData()
-        // responseType: "blob",
+          } else this.$message.error(res.data.msg)
-      })
+        }).catch(err => {
-        .then((res) => {
+          console.log('失败', err)
-          this.importLoading = false;
+          file.onError() //上传失败的文件会从文件列表中删除
-          this.importBtnTitle = "excel导入";
+          this.$message.error('导入失败')
-          console.log("resresresresresresres", res);
-
-          this.getTableData();
-          if (res.data.code == 0) {
-            return this.$message.success(res.data.data || "导入成功");
-          } else {
-            return this.$message.error(res.data.msg);
-          }
         })
-        .catch((err) => {
+      // axios({
-          console.log("失败", err);
+      //   url:
-        });
+      //     window.SITE_CONFIG["apiURL"] +
+      //     "/heart/iccommunityselforganization/importcommunityselforganization",
+      //   method: "post",
+      //   data: formData,
+      //   // responseType: "blob",
+      // })
+      //   .then((res) => {
+      //     this.importLoading = false;
+      //     this.importBtnTitle = "excel导入";
+      //     console.log("resresresresresresres", res);
+
+      //     this.getTableData();
+      //     if (res.data.code == 0) {
+      //       return this.$message.success(res.data.data || "导入成功");
+      //     } else {
+      //       return this.$message.error(res.data.msg);
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log("失败", err);
+      //   });
+        this.importLoading = false
+      this.importBtnTitle = 'excel导入'
       this.$refs.upload.clearFiles();
     },
 

src/views/modules/visual/communityParty/community.vue

@@ -36,7 +36,8 @@
                           prefix-icon="el-icon-caret-bottom"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           :clearable="false"
-                          :default-time="['00:00:00', '23:59:59']">
+                          :default-time="['00:00:00', '23:59:59']"
+                          @change="handleTimeChange">
           </el-date-picker>
         </div>
       </div>
@@ -121,6 +122,7 @@
 
 <script>
 import { requestPost } from "@/js/dai/request";
+import util from '@js/util.js';
 import screenTable from "../components/screen-table/index";
 import cptCard from "@/views/modules/visual/cpts/card";
 import nextTick from "dai-js/tools/nextTick";
@@ -232,12 +234,27 @@ export default {
   watch: {
     timeRange (val) {
       console.log('val-www', val)
-      this.getList(this.agencyId);
+      // this.getList(this.agencyId);
-      this.getCateCount(this.agencyId)
+      // this.getCateCount(this.agencyId)
     }
   },
   methods: {
-
+    handleTimeChange (time) {
+      if (time) {
+        const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+        const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+        const startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+        const endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+        this.timeRange = [startTime, endTime]
+        // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        this.initTime()
+      }
+      this.getList(this.agencyId);
+      this.getCateCount(this.agencyId)
+    },
     //具体人员列表
     async getList (agencyId) {
       this.visibleLoading = true

src/views/modules/visual/communityParty/elegant.vue

@@ -555,7 +555,7 @@ export default {
   flex-wrap: wrap;
   padding: 30px 0 20px;
   .elegant-item {
-    width: 19%;
+    width: calc((100% - 80px) / 5);
     margin-right: 20px;
     margin-bottom: 36px;
     box-sizing: border-box;

src/views/modules/visual/communityParty/elegantInfo.vue

@@ -41,7 +41,8 @@
                   v-for="(item, index) in info.imageList" :key="index"
                   style="width: 200px; height: 200px;margin-right: 10px;"
                   :src="item" 
-                  :preview-src-list="info.imageList">
+                  :preview-src-list="info.imageList"
+                  :z-index="99999">
                 </el-image>
               </div>
               <!-- <span>{{ info.peopleCount }}</span> -->