From f0bbe0f16b5cc5a8820a481b6ae1174a37da0dc9 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 21 Apr 2021 11:28:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/healthcode/healthcode.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 31f69a7..e317a34 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>
@@ -307,7 +306,7 @@
},
//数据报表导出
handleExportStatis() {
- this.$confirm("是否导出健康码数据?", "提示", {
+ this.$confirm("是否导出健康码报表数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -316,7 +315,8 @@
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(`http://localhost:8108/ureport/preview?_u=blade-healthcode.statis.xml.ureport.xml&begTime=${begTime}&endTime=${endTime}&type=${type}&timeDesc=${timeDesc}`);
});
},
onLoad(page, params = {}) {
--
Gitblit v1.9.3