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

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

@@ -226,7 +226,7 @@ export default {
   data() {
     return {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-      importBtnTitle: '导入人员数据',
+      importBtnTitle: '导入数据',
       importLoading: false,
       exportBtn: false,
       exportBtnTitle: '导出',
@@ -424,7 +424,7 @@ export default {
       //     this.$message.error('导入失败')
       // })
       this.importLoading = false
-      this.importBtnTitle = '导入人员数据'
+      this.importBtnTitle = '导入数据'
       this.$refs.upload.clearFiles()
     },
     async handleExport() {

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