Merge branch 'dev-220228' into dev

src/js/dai/request.js

@@ -2,8 +2,9 @@
  |                           请求接口封装                           |
  ---------------------------------------------------------------*/
 import axios from "axios";
-import message from "dai-js/modules/message/message";
+// import message from "dai-js/modules/message/message";
 import curry from "dai-js/tools/curry";
+import { Message } from "element-ui";
 
 const request = curry(
   (method, url, data = {}, headers = {}, progress = () => {}) => {
@@ -36,7 +37,12 @@ const request = curry(
         // 	retData = Vue.$afterRequestHook(retData);
         // }
         if (res.data.code > 8000 && res.data.code < 10000) {
-          message.error(res.data.msg);
+          // message.error(res.data.msg);
+         Message({
+            showClose: true,
+            message: res.data.msg,
+            duration: 0
+          })
         }
 
         reslove(retData);

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

@@ -441,9 +441,10 @@ export default {
         this.loadTable()
       } else if (code > 8000) {
         // this.$message({
-        //   type: "success",
-        //   message: msg
-        // });
+        //   showClose: true,
+        //   message: msg,
+        //   duration: 0
+        // })
         this.$emit('refreshTree')
         this.loadTable()
       } else {

src/views/modules/base/resi.vue

@@ -94,8 +94,9 @@
         <div class="div_del">
           <el-checkbox :indeterminate="isIndeterminate"
                       v-model="selAllFlag"
+                      :disabled="tableData.length==0"
                       @change="handleSelectAll">全选</el-checkbox>
-          <el-button style="margin-left:15px"
+          <el-button v-if="selection.length > 0" style="margin-left:15px"
                     type="danger"
                     size="small"
                     @click="deleteBatch">删除</el-button>
@@ -370,6 +371,10 @@ export default {
       }
     },
     handleSelectAll (selectAllFlag) {
+      // if (this.tableData.length == 0) {
+      //   this.selAllFlag = false
+      //   return
+      // }
       this.$refs.ref_table.clearSelection();
       if (selectAllFlag) {
         this.tableData.forEach(row => {
@@ -407,7 +412,7 @@ export default {
 
           });
       } else {
-        this.$message.warning('请先选择要删除的小区')
+        this.$message.warning('请先选择要删除的居民')
       }
     },
     handleSizeChange (val) {
@@ -542,13 +547,13 @@ export default {
         .post('/epmetuser/icresiuser/importExcel', formData).then(res => {
           console.log('res-up', res)
           if (res.data.code == 0 && res.data.msg == 'success') {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
             this.getTableData()
           } else this.$message.error(res.data.msg)
         }).catch(err => {
           console.log('失败', err)
           file.onError() //上传失败的文件会从文件列表中删除
-          this.$message.error('导入失败')
+          // this.$message.error('导入失败')
         })
       // await axios({
       //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',

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

@@ -385,7 +385,7 @@ export default {
         .post('/resi/partymember/icpartymemberstyle/import', formData).then(res => {
           console.log('res-up', res)
           if (res.data.code == 0 && res.data.msg == 'success') {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
             this.getTableData()
           } else {
             this.$message.error(res.data.msg)
@@ -393,7 +393,7 @@ export default {
         }).catch(err => {
           console.log('失败', err)
           file.onError() //上传失败的文件会从文件列表中删除
-          this.$message.error('导入失败')
+          // this.$message.error('导入失败')
         })
       // await axios({
       //   url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',

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

@@ -284,13 +284,13 @@ export default {
         .post('/heart/iccommunityselforganization/importcommunityselforganization', formData).then(res => {
           console.log('res-up', res)
           if (res.data.code == 0 && res.data.msg == 'success') {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
             this.getTableData()
           } else this.$message.error(res.data.msg)
         }).catch(err => {
           console.log('失败', err)
           file.onError() //上传失败的文件会从文件列表中删除
-          this.$message.error('导入失败')
+          // this.$message.error('导入失败')
         })
       // axios({
       //   url:

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

@@ -436,9 +436,9 @@ export default {
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
       console.log('time-rtt', this.timeFormat(start), this.timeFormat(end))
-      this.timeRange = [this.timeFormat(start), this.timeFormat(end)]
+      this.timeRange = [this.timeFormat(start, '00:00:00'), this.timeFormat(end, '23:59:59')]
     },
-    timeFormat (date) {
+    timeFormat (date, h) {
       if (!date || typeof date === 'string') {
         return false
       }
@@ -448,7 +448,7 @@ export default {
       var d = date.getDate() //日
       if (d < 10) d = '0' + d
 
-      return y + '-' + m + '-' + d + ' 00:00:00'
+      return y + '-' + m + '-' + d + ' ' + h
     },
     async loadUnit () {
       const url = "/heart/serviceitem/dict-list"