From 14e02654e0545ee69456d64aef2f35c7c219d708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 11:26:49 +0800
Subject: [PATCH] 地图模式设备状态修改

---
 src/views/healthcode/healthcode.vue |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index e003b15..ae02016 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -49,10 +49,9 @@
                       @click="handleExport">导出
           </el-button>
           <el-button type="warning"
-          style="display:none"
                       size="small"
                       plain
-                      icon="el-icon-download"
+                      icon="el-icon-pie-chart"
                       @click="handleExportStatis">导出报表
           </el-button>
         </template>
@@ -81,7 +80,7 @@
         option: {
           menu:false,
           height:'auto',
-          calcHeight: 30,
+          calcHeight: 54,
           border: false,
           stripe:true,
           tip: false,
@@ -233,7 +232,10 @@
       beforeOpen(done, type) {
       },
       searchReset() {
+        //清空搜索框中的内容
         this.query = {};
+        //清空this.$route.query
+        this.$router.push({ query: {} });
         this.onLoad(this.page);
       },
       searchChange(params, done) {
@@ -297,7 +299,7 @@
       },
       //数据导出
       handleExport() {
-        this.$confirm("是否导出用户数据?", "提示", {
+        this.$confirm("是否导出健康码数据?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -307,17 +309,12 @@
       },
       //数据报表导出
       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(`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;

--
Gitblit v1.9.3