From 1bcd17b23cf4b95722edc820cb62577617a33101 Mon Sep 17 00:00:00 2001 From: zhusiyu <410827992@qq.com> Date: Tue, 11 Oct 2022 13:51:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E7=BB=93=E7=BB=9F=E8=AE=A1-=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=94=B9=E5=8F=98=E6=97=B6=E8=B0=83=E7=94=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/goodsUseCensusLarge/selfLarge.vue | 2 +- .../summaryRecord/component/deptLargeSummary.vue | 13 ++++++++++--- .../oa/summaryRecord/component/myLargeSummary.vue | 5 ++++- .../oa/summaryRecord/summaryRecordLarge.vue | 14 +++++++------- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/selfLarge.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/selfLarge.vue index c6f12b6..2d9f777 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/selfLarge.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/selfLarge.vue @@ -181,7 +181,7 @@ this.spinning = false if (result[0].data.code === 2000) { this.chartsOption = result[0].data.data.option - console.log('每日领用对比数据', result[0]) + //console.log('每日领用对比数据', result[0]) this.buildEcharts() } }) diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/deptLargeSummary.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/deptLargeSummary.vue index bd0f2c1..a2f22e5 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/deptLargeSummary.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/deptLargeSummary.vue @@ -62,6 +62,7 @@ totalRecordJson: {}, spinning: true, selectTabIndexChild: 1, + searchTimeData: '', } }, watch: { @@ -81,7 +82,7 @@ searchTime: { handler(time) { if (time !== "") { - this.searchTime = time; + this.searchTimeData = time; this.getNowTime(); } }, @@ -94,7 +95,10 @@ methods: { //部门总结-总结概览 workSummaryDeptOverview() { - let timeStr = this.searchTime; + if (this.searchTimeData == '') { + this.searchTimeData = this.searchTime + } + let timeStr = this.searchTimeData; if (timeStr !== "") { let startDate = timeStr.split("|")[0]; let endDate = timeStr.split("|")[1]; @@ -147,6 +151,9 @@ }, //机构总结-总结概览 workSummaryOrgOverview() { + if (this.searchTimeData == '') { + this.searchTimeData = this.searchTime + } let timeStr = this.searchTime; if (timeStr !== "") { let startDate = timeStr.split("|")[0]; @@ -213,7 +220,7 @@ let day = resData.data.day; this.begin_date = moment(year + "-" + month + "-01"); this.end_date = moment(year + "-" + month + "-" + day); - this.searchTime = this.begin_date + "|" + this.end_date; + this.searchTimeData = this.begin_date + "|" + this.end_date; this.workSummaryDeptOverview() this.workSummaryOrgOverview() } diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue index 124c1cc..0486e77 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue @@ -100,7 +100,7 @@ end_date: "", totalRecordJson: {}, spinning: true, - dataSearchTime: this.searchTime, + dataSearchTime: '', } }, mounted() { @@ -123,6 +123,9 @@ methods: { //我的总结-总结概览 workSummaryPersonOverview() { + if (this.dataSearchTime === '') { + this.dataSearchTime = this.searchTime + } let timeStr = this.dataSearchTime; if (timeStr !== "") { let startDate = timeStr.split("|")[0]; diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue index 83fd295..f1e9999 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue @@ -476,12 +476,12 @@ }, selected_data: { handler(select_data) { - if (select_data.length == 0) { - this.deptId = this.BaseConfig.person_info_my.dep_id; - } else { + if (select_data[select_data.length - 1].id) { this.deptId = select_data[select_data.length - 1].id this.workSummaryDeptPersonOverview() this.workSummaryDeptCycleStatistics() + } else { + this.deptId = this.BaseConfig.person_info_my.dep_id; } }, immediate: true @@ -583,7 +583,7 @@ //更改结束日期 endDate(end_date) { this.end_date = end_date; - this.searchTime = this.begin_date + "|" + this.end_date; + // this.searchTime = this.begin_date + "|" + this.end_date; this.workSummaryDeptPersonOverview() this.workSummaryOrgDeptOverview() this.workSummaryDeptCycleStatistics() @@ -592,7 +592,7 @@ // 更改开始日期 startDate(begin_date) { this.begin_date = begin_date - this.searchTime = this.begin_date + "|" + this.end_date; + // this.searchTime = this.begin_date + "|" + this.end_date; this.workSummaryDeptPersonOverview() this.workSummaryOrgDeptOverview() this.workSummaryDeptCycleStatistics() @@ -611,8 +611,8 @@ let year = resData.data.year; let month = resData.data.month; let day = resData.data.day; - this.begin_date = moment(year + "-" + month + "-01"); - this.end_date = moment(year + "-" + month + "-" + day); + this.begin_date = moment(year + "-" + month + "-01")._i; + this.end_date = moment(year + "-" + month + "-" + day)._i; this.searchTime = this.begin_date + "|" + this.end_date; this.workSummaryDeptPersonOverview() this.workSummaryOrgDeptOverview()