From f5a707f00606722f0d288df0d707c7bc9098fcdd Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 10 May 2021 14:55:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/healthcode/healthcode.vue | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 7d85b58..424675e 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -274,13 +274,29 @@
if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
return this.$route.query.startTime
}
- return '';
+ // 当前时间
+ var date = new Date();
+ //年
+ var Y = date.getFullYear();
+ //月
+ var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ //日
+ var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+ return Y + "-" + M + "-" + D;
},
getEndTime(){
if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
return this.$route.query.endTime
}
- return '';
+ // 当前时间
+ var date = new Date();
+ //年
+ var Y = date.getFullYear();
+ //月
+ var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ //日
+ var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+ return Y + "-" + M + "-" + D;
},
getHealthcodeType(){
if (this.$route.query.type != undefined) {
@@ -291,15 +307,17 @@
},
getHealthcodeData(e) {
var that = this;
+ this.query={};
+ this.$router.push({ query: {} });
that.activeClass = e;
//status 0:本日 1：本月 2：本年 type: 1:绿色 2：黄色 3：红色
var params = {
status: e
};
- this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
},
+
//数据导出
handleExport() {
this.$confirm("是否导出健康码数据?", "提示", {
@@ -319,7 +337,7 @@
//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 = {}) {
+ onLoad(page, params) {
const { dateTime } = this.query;
let values = {
...params,
@@ -345,12 +363,13 @@
endTime: this.$route.query.endTime
}
this.activeClass =4;
- }else{
- params = {
- status:this.$route.query.status,
- type:this.$route.query.type
- }
}
+ // else{
+ // params = {
+ // status:this.$route.query.status,
+ // type:this.$route.query.type
+ // }
+ // }
if(this.activeClass == 0 && this.query.dateTime==null){
params = {
--
Gitblit v1.9.3