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/parcel/parcelKind.vue | 109 +++++++++++++++++
src/views/animalHeat/animalHeat.vue | 55 ++++++---
src/views/healthcode/healthcode.vue | 37 ++++-
src/views/supervisoryConsole/data.vue | 1
src/views/parcel/parcel.vue | 108 +++++++++++++++++
5 files changed, 275 insertions(+), 35 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 591582d..fe51a63 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -244,14 +244,44 @@
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;
},
+
+ //本日，本周，本月 按钮
+ getAnimalData(e) {
+ this.activeClass=e;
+ this.query={};
+ this.$router.push({ query: {} });
+ //type 0:本日 1：本周 2：本月 status: 0:正常 1：异常
+ var params = {
+ type: e
+ };
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ },
+
//数据导出
handleExport() {
this.$confirm("是否导出体温数据?", "提示", {
@@ -293,23 +323,14 @@
closeViewer() {
this.showViewer = false
},
- getAnimalData(e) {
- this.activeClass=e;
- //type 0:本日 1：本月 2：本年 status: 0:正常 1：异常
- var params = {
- type: e
- };
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- },
+
//体温状态回填
getAnimalType(){
if (this.$route.query.status != undefined) {
return this.$route.query.status
}
},
- onLoad(page, params = {}) {
+ onLoad(page, params) {
const { dateTime } = this.query;
let values = {
...params,
@@ -335,13 +356,9 @@
endTime: this.$route.query.endTime
}
this.activeClass=4;
- }else{
- params = {
- status:this.$route.query.status,
- type:this.$route.query.type
- }
}
-
+
+ //初始进入默认展示当天数据
if(this.activeClass==0 && this.query.dateTime==null){
params = {
type:this.activeClass
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 = {
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 37b74b0..1a52596 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -34,6 +34,27 @@
</template> -->
<template slot="menuLeft">
+ <el-button
+ v-bind:class="activeClass == 0 ? 'btn-color' : ''"
+ size="small "
+ @click="getParcelData(0)"
+ >本日
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 1 ? 'btn-color' : ''"
+ size="small "
+ @click="getParcelData(1)"
+ >本周
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 2 ? 'btn-color' : ''"
+ size="small "
+ @click="getParcelData(2)"
+ >本月
+ </el-button>
+ </template>
+
+ <template slot="menuLeft">
<el-button type="warning"
size="small"
plain
@@ -277,13 +298,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+ " 00:00:00";
},
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+ " 23:59:59";
},
getIsKindParams(){
if(this.$route.query.decisioDiagramResult && this.$route.query!='' && this.$route.query!=null && this.$route.query!=undefined){
@@ -298,6 +335,71 @@
color:"#fe1515"
}
}
+ },
+ getParcelData(e) {
+ var that = this;
+ this.query={};
+ //清空this.$route.query
+ this.$router.push({ query: {} });
+ that.activeClass = e;
+ var today = new Date();
+ if(e==0){
+ var params = {
+ startTime:this.showToDay(today)+ " 00:00:00",
+ endTime:this.showToDay(today)+ " 23:59:59"
+ };
+ }
+ if(e==1){
+ var params = {
+ startTime:this.showWeekFirstDay(today)+ " 00:00:00",
+ endTime:this.showToDay(today)+ " 23:59:59"
+ };
+ }
+ if(e==2){
+ var params = {
+ startTime:this.showMonthFirstDay(today)+ " 00:00:00",
+ endTime:this.showToDay(today)+ " 23:59:59"
+ };
+ }
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ },
+ //本日
+ showToDay(Nowdate){
+ var M=Number(Nowdate.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = Nowdate.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return Nowdate.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本周第一天
+ showWeekFirstDay(Nowdate){
+ var WeekFirstDay=new Date(Nowdate-(Nowdate.getDay()-1)*86400000);
+ var M=Number(WeekFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = WeekFirstDay.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return WeekFirstDay.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本月第一天
+ showMonthFirstDay(Nowdate){
+ var MonthFirstDay=new Date(Nowdate.getFullYear(),Nowdate.getMonth(),1);
+ var M=Number(MonthFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ return MonthFirstDay.getFullYear()+"-"+M+"-"+"0"+MonthFirstDay.getDate();
},
//数据导出
handleExport() {
@@ -318,7 +420,7 @@
//window.open(`http://localhost:8108/ureport/excel?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
},
- onLoad(page, params = {}) {
+ onLoad(page, params) {
const { dateTime } = this.query;
let values = {
...params,
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 3f54c2f..22decde 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -31,6 +31,27 @@
</el-button>
</template> -->
<template slot="menuLeft">
+ <el-button
+ v-bind:class="activeClass == 0 ? 'btn-color' : ''"
+ size="small "
+ @click="getParcelKindData(0)"
+ >本日
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 1 ? 'btn-color' : ''"
+ size="small "
+ @click="getParcelKindData(1)"
+ >本周
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 2 ? 'btn-color' : ''"
+ size="small "
+ @click="getParcelKindData(2)"
+ >本月
+ </el-button>
+ </template>
+
+ <template slot="menuLeft">
<el-button type="warning"
size="small"
plain
@@ -260,13 +281,94 @@
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+ " 00:00:00";
},
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+ " 23:59:59";
+ },
+ getParcelKindData(e) {
+ var that = this;
+ this.query={};
+ //清空this.$route.query
+ this.$router.push({ query: {} });
+ that.activeClass = e;
+ var today = new Date();
+ if(e==0){
+ var params = {
+ startTime:this.showToDay(today)+ " 00:00:00",
+ endTime:this.showToDay(today)+ " 23:59:59"
+ };
+ }
+ if(e==1){
+ var params = {
+ startTime:this.showWeekFirstDay(today)+ " 00:00:00",
+ endTime:this.showToDay(today)+ " 23:59:59"
+ };
+ }
+ if(e==2){
+ var params = {
+ startTime:this.showMonthFirstDay(today)+ " 00:00:00",
+ endTime:this.showToDay(today)+ " 23:59:59"
+ };
+ }
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ },
+ //本日
+ showToDay(Nowdate){
+ var M=Number(Nowdate.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = Nowdate.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return Nowdate.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本周第一天
+ showWeekFirstDay(Nowdate){
+ var WeekFirstDay=new Date(Nowdate-(Nowdate.getDay()-1)*86400000);
+ var M=Number(WeekFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = WeekFirstDay.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return WeekFirstDay.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本月第一天
+ showMonthFirstDay(Nowdate){
+ var MonthFirstDay=new Date(Nowdate.getFullYear(),Nowdate.getMonth(),1);
+ var M=Number(MonthFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ return MonthFirstDay.getFullYear()+"-"+M+"-"+"0"+MonthFirstDay.getDate();
},
//给行加颜色
rowStyle({row, column, rowIndex}){
@@ -294,7 +396,8 @@
//window.open(`http://localhost:8108/ureport/preview?_u=blade-parcelKind.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-parcelKind.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
},
- onLoad(page, params = {}) {
+ onLoad(page, params) {
+ debugger;
const { dateTime } = this.query;
let values = {
...params,
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index 29be65a..748c08a 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -320,7 +320,6 @@
methods: {
drawPie() {
var that = this;
- debugger;
var myChart = this.$echarts.init(
document.getElementById("base_information_pie_echarts")
);
--
Gitblit v1.9.3