From f8e0d85bbfdfe5b57784f6f5659f6bdf1891dfa3 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 15:45:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 src/views/healthcode/healthcode.vue |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 6cb2be0..7d85b58 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -71,6 +71,7 @@
         query: {},
         search:{},
         loading: true,
+        activeClass: 0,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -80,13 +81,12 @@
         option: {
           menu:false,
           height:'auto',
-          calcHeight: 30,
+          calcHeight: 54,
           border: false,
           stripe:true,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
-          activeClass: 0,
           index: true,
           viewBtn: true,
           selection: true,
@@ -236,9 +236,12 @@
         this.query = {};
         //清空this.$route.query
         this.$router.push({ query: {} });
+        this.activeClass=0;
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+        //清空this.$route.query
+        this.$router.push({ query: {} });
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
@@ -309,55 +312,54 @@
       },
       //数据报表导出
       handleExportStatis() {
-        this.$confirm("是否导出健康码报表数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
           let begTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
           let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
           let type = this.$route.query.type==undefined? '':this.$route.query.type;
           let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
           //window.open(`http://localhost:8108/ureport/excel?_u=blade-healthcode.statis.xml.ureport.xml&begTime=${begTime}&endTime=${endTime}&type=${type}&timeDesc=${timeDesc}`);
           window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-healthcode.statis.xml.ureport.xml&begTime=${begTime}&endTime=${endTime}&type=${type}&timeDesc=${timeDesc}`);
-        });
       },
       onLoad(page, params = {}) {
         const { dateTime } = this.query;
         let values = {
           ...params,
         };
-
         if (this.$route.query.status!=undefined && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
             if (this.$route.query.type != undefined) {
-              this.activeClass = this.$route.query.status;
               this.page.currentPage = 1;
               params = {
                 status:this.$route.query.status,
                 type:this.$route.query.type
               }
             } else {
-              this.activeClass = 0;
               this.page.currentPage = 1;
               params = {
                 type:this.$route.query.status
               };
             }
+            this.activeClass =4;
         }else if(this.$route.query.type != undefined){
           params = {
             type: this.$route.query.type,
             begTime: this.$route.query.startTime,
             endTime: this.$route.query.endTime
           }
+          this.activeClass =4;
         }else{
-            params = {
-                status:this.$route.query.status,
-                type:this.$route.query.type
-            }
+          params = {
+              status:this.$route.query.status,
+              type:this.$route.query.type
+          }
+        }
 
+        if(this.activeClass == 0 && this.query.dateTime==null){
+          params = {
+              status:this.activeClass,
+          }
         }
 
         if (dateTime) {
+          this.activeClass =4;
           values = {
             ...params,
             begTime: dateTime[0],

--
Gitblit v1.9.3