From 286e46b3b85fae05b122d501309fcfc3c223fe9d Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Mon, 22 Apr 2024 08:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataReport/components/line.vue | 11 ++++++---- src/views/dataReport/index.vue | 3 ++- src/views/homePage/Echarts/index.vue | 8 +++---- src/views/homePage/arrester/index.vue | 22 +++++++++++++++++-- src/views/homePage/clamp/index.vue | 22 +++++++++++++++++-- .../homePage/oilChromatography/index.vue | 22 +++++++++++++++++-- .../homePage/partialDischarges/index.vue | 22 +++++++++++++++++-- src/views/homePage/sf6/index.vue | 22 +++++++++++++++++-- .../homePage/windingTemperature/index.vue | 22 +++++++++++++++++-- 9 files changed, 133 insertions(+), 21 deletions(-) diff --git a/src/views/dataReport/components/line.vue b/src/views/dataReport/components/line.vue index 052af1d1..ef5fc28d 100644 --- a/src/views/dataReport/components/line.vue +++ b/src/views/dataReport/components/line.vue @@ -84,14 +84,17 @@ export default { dataZoom: [ { type: "inside", - start: 0, - end: 20, + start: 80, + end: 100, }, { - start: 0, - end: 20, + start: 80, + end: 100, }, ], + grid: { + containLabel: true, + }, xAxis: { type: "category", name: "时间", diff --git a/src/views/dataReport/index.vue b/src/views/dataReport/index.vue index 86aee416..126235c6 100644 --- a/src/views/dataReport/index.vue +++ b/src/views/dataReport/index.vue @@ -231,7 +231,7 @@ export default { key: "compositeKey", // 确保这里使用的是 uniqueKey }, formdata: { - dayValue: 4, + dayValue: -1, }, //查询定义的form数据 dayOptions: [ { @@ -706,6 +706,7 @@ export default { this.chartDataArr = []; getDetailApi({ id: id, + timeAsc: 1, startTime: stime, endTime: eTime, }) diff --git a/src/views/homePage/Echarts/index.vue b/src/views/homePage/Echarts/index.vue index 38e425fd..838d08a5 100644 --- a/src/views/homePage/Echarts/index.vue +++ b/src/views/homePage/Echarts/index.vue @@ -103,10 +103,10 @@ export default { type: "slider", xAxisIndex: [0], filterMode: "filter", - start: 0, - end: 5, - startValue: 0, - endValue: 10, + start: 90, + end: 100, + // startValue: 90, + // endValue: 100, textStyle: { color: this.xFontColor, }, diff --git a/src/views/homePage/arrester/index.vue b/src/views/homePage/arrester/index.vue index d24fb6c2..6df7954f 100644 --- a/src/views/homePage/arrester/index.vue +++ b/src/views/homePage/arrester/index.vue @@ -45,10 +45,27 @@ export default { "234,124,204", "3,188,255", ], + stime: "", + eTime: "", }; }, created() { this.getarresterdata(); + const thirtyDaysAgo = new Date(); + const startDate = new Date( + thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30) + ); + startDate.setHours(0); // 0 + startDate.setMinutes(0); // 0 + startDate.setSeconds(0); // 0 + this.stime = this.$moment(startDate).format("YYYY-MM-DD HH:mm:ss"); + + const endDate = new Date(); + endDate.setHours(23); // 设置小时为23 + endDate.setMinutes(59); // 设置分钟为59 + endDate.setSeconds(59); // 设置秒数为59 + this.eTime = this.$moment(endDate).format("YYYY-MM-DD HH:mm:ss"); + console.log(this.stime, this.eTime); }, methods: { getarresterdata() { @@ -74,8 +91,9 @@ export default { this.tendencyChartTitle = row.name; getDetailApi({ id: row.id, - pageNum: this.page, - pageSize: this.pageSize, + timeAsc: 1, + startTime: this.stime, + endTime: this.eTime, }) .then((res) => { console.log(res); diff --git a/src/views/homePage/clamp/index.vue b/src/views/homePage/clamp/index.vue index 8e5d0751..9f754492 100644 --- a/src/views/homePage/clamp/index.vue +++ b/src/views/homePage/clamp/index.vue @@ -44,10 +44,27 @@ export default { "234,124,204", "3,188,255", ], + stime: "", + eTime: "", }; }, created() { this.getclampdata(); + const thirtyDaysAgo = new Date(); + const startDate = new Date( + thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30) + ); + startDate.setHours(0); // 0 + startDate.setMinutes(0); // 0 + startDate.setSeconds(0); // 0 + this.stime = this.$moment(startDate).format("YYYY-MM-DD HH:mm:ss"); + + const endDate = new Date(); + endDate.setHours(23); // 设置小时为23 + endDate.setMinutes(59); // 设置分钟为59 + endDate.setSeconds(59); // 设置秒数为59 + this.eTime = this.$moment(endDate).format("YYYY-MM-DD HH:mm:ss"); + console.log(this.stime, this.eTime); }, methods: { getclampdata() { @@ -74,8 +91,9 @@ export default { this.tendencyChartTitle = row.name; getDetailApi({ id: row.id, - pageNum: this.page, - pageSize: this.pageSize, + timeAsc: 1, + startTime: this.stime, + endTime: this.eTime, }) .then((res) => { console.log(res); diff --git a/src/views/homePage/oilChromatography/index.vue b/src/views/homePage/oilChromatography/index.vue index cf2c7496..e9aeb17b 100644 --- a/src/views/homePage/oilChromatography/index.vue +++ b/src/views/homePage/oilChromatography/index.vue @@ -45,10 +45,27 @@ export default { "234,124,204", "3,188,255", ], + stime: "", + eTime: "", }; }, created() { this.getoildata(); + const thirtyDaysAgo = new Date(); + const startDate = new Date( + thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30) + ); + startDate.setHours(0); // 0 + startDate.setMinutes(0); // 0 + startDate.setSeconds(0); // 0 + this.stime = this.$moment(startDate).format("YYYY-MM-DD HH:mm:ss"); + + const endDate = new Date(); + endDate.setHours(23); // 设置小时为23 + endDate.setMinutes(59); // 设置分钟为59 + endDate.setSeconds(59); // 设置秒数为59 + this.eTime = this.$moment(endDate).format("YYYY-MM-DD HH:mm:ss"); + console.log(this.stime, this.eTime); }, mounted() {}, methods: { @@ -77,8 +94,9 @@ export default { this.tendencyChartTitle = row.name; getDetailApi({ id: row.id, - pageNum: this.page, - pageSize: this.pageSize, + timeAsc: 1, + startTime: this.stime, + endTime: this.eTime, }) .then((res) => { console.log(res); diff --git a/src/views/homePage/partialDischarges/index.vue b/src/views/homePage/partialDischarges/index.vue index 606b5255..7613a91b 100644 --- a/src/views/homePage/partialDischarges/index.vue +++ b/src/views/homePage/partialDischarges/index.vue @@ -75,10 +75,27 @@ export default { "234,124,204", "3,188,255", ], + stime: "", + eTime: "", }; }, created() { this.getarresterdata(); + const thirtyDaysAgo = new Date(); + const startDate = new Date( + thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30) + ); + startDate.setHours(0); // 0 + startDate.setMinutes(0); // 0 + startDate.setSeconds(0); // 0 + this.stime = this.$moment(startDate).format("YYYY-MM-DD HH:mm:ss"); + + const endDate = new Date(); + endDate.setHours(23); // 设置小时为23 + endDate.setMinutes(59); // 设置分钟为59 + endDate.setSeconds(59); // 设置秒数为59 + this.eTime = this.$moment(endDate).format("YYYY-MM-DD HH:mm:ss"); + console.log(this.stime, this.eTime); }, methods: { changePartial(val) { @@ -109,8 +126,9 @@ export default { this.tendencyChartTitle = row.name; getDetailApi({ id: row.id, - pageNum: this.page, - pageSize: this.pageSize, + timeAsc: 1, + startTime: this.stime, + endTime: this.eTime, }) .then((res) => { console.log(res); diff --git a/src/views/homePage/sf6/index.vue b/src/views/homePage/sf6/index.vue index a9ca0434..a609b3ca 100644 --- a/src/views/homePage/sf6/index.vue +++ b/src/views/homePage/sf6/index.vue @@ -44,6 +44,8 @@ export default { "234,124,204", "3,188,255", ], + stime: "", + eTime: "", }; }, mounted() { @@ -52,6 +54,21 @@ export default { }, created() { this.getsf6data(); + const thirtyDaysAgo = new Date(); + const startDate = new Date( + thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30) + ); + startDate.setHours(0); // 0 + startDate.setMinutes(0); // 0 + startDate.setSeconds(0); // 0 + this.stime = this.$moment(startDate).format("YYYY-MM-DD HH:mm:ss"); + + const endDate = new Date(); + endDate.setHours(23); // 设置小时为23 + endDate.setMinutes(59); // 设置分钟为59 + endDate.setSeconds(59); // 设置秒数为59 + this.eTime = this.$moment(endDate).format("YYYY-MM-DD HH:mm:ss"); + console.log(this.stime, this.eTime); }, methods: { //获取装置类型 @@ -84,8 +101,9 @@ export default { this.tendencyChartTitle = row.name; getDetailApi({ id: row.id, - pageNum: this.page, - pageSize: this.pageSize, + timeAsc: 1, + startTime: this.stime, + endTime: this.eTime, }) .then((res) => { console.log(res); diff --git a/src/views/homePage/windingTemperature/index.vue b/src/views/homePage/windingTemperature/index.vue index 00ff256c..c3b15437 100644 --- a/src/views/homePage/windingTemperature/index.vue +++ b/src/views/homePage/windingTemperature/index.vue @@ -44,10 +44,27 @@ export default { "234,124,204", "3,188,255", ], + stime: "", + eTime: "", }; }, created() { this.getwinddata(); + const thirtyDaysAgo = new Date(); + const startDate = new Date( + thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30) + ); + startDate.setHours(0); // 0 + startDate.setMinutes(0); // 0 + startDate.setSeconds(0); // 0 + this.stime = this.$moment(startDate).format("YYYY-MM-DD HH:mm:ss"); + + const endDate = new Date(); + endDate.setHours(23); // 设置小时为23 + endDate.setMinutes(59); // 设置分钟为59 + endDate.setSeconds(59); // 设置秒数为59 + this.eTime = this.$moment(endDate).format("YYYY-MM-DD HH:mm:ss"); + console.log(this.stime, this.eTime); }, methods: { getwinddata() { @@ -74,8 +91,9 @@ export default { this.tendencyChartTitle = row.name; getDetailApi({ id: row.id, - pageNum: this.page, - pageSize: this.pageSize, + timeAsc: 1, + startTime: this.stime, + endTime: this.eTime, }) .then((res) => { console.log(res);