From a12530b835ccbf2d11b23ddb16d9052943799444 Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 20 Sep 2023 10:57:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/graphs/line.vue | 228 +++++++++--------- .../qualityStatistics/graphPage.vue | 10 +- .../monitoring/qualityStatistics/index.vue | 66 +++++ 3 files changed, 188 insertions(+), 116 deletions(-) diff --git a/src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue b/src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue index 3dc97400..b982bcf0 100644 --- a/src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue +++ b/src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue @@ -96,8 +96,8 @@ export default { tooltip: { trigger: 'axis', axisPointer: { - type: 'shadow' - } + type: 'shadow', + }, }, legend: { data: this.legend, @@ -121,29 +121,29 @@ export default { // color: 'red' }, }, - // data: this.xProps, - data: [ - '设备1', - '设备2', - '设备3', - '设备4', - '设备5', - '设备6', - '设备7', - '设备8', - '设备9', - '设备10', - '设备11', - '设备12', - '设备13', - '设备14', - '设备15', - '设备16', - '设备17', - '设备18', - '设备19', - '设备20', - ], + data: this.xProps, + // data: [ + // '设备1', + // '设备2', + // '设备3', + // '设备4', + // '设备5', + // '设备6', + // '设备7', + // '设备8', + // '设备9', + // '设备10', + // '设备11', + // '设备12', + // '设备13', + // '设备14', + // '设备15', + // '设备16', + // '设备17', + // '设备18', + // '设备19', + // '设备20', + // ], }, yAxis: { type: 'value', @@ -161,95 +161,95 @@ export default { dataZoom: { type: 'inside', }, - // series: this.series, - series: [ - { - name: '上片数', - type: 'bar', - // barWidth: 12, - data: [ - 10, - 12, - 43, - 4, - 22, - 32, - 12, - 8, - 122, - 0, - , - 43, - 4, - 22, - 32, - 12, - 8, - 122, - 77, - 99, - ], - }, - { - name: '下片数', - type: 'bar', - // barWidth: 12, - data: [ - 10, - 12, - 43, - 4, - 22, - 32, - 12, - 8, - 122, - 0, - 4, - 22, - 32, - 12, - 8, - 122, - 0, - , - 43, - 4, - 22, - 32, - ], - }, - { - name: '检测数', - type: 'bar', - // barWidth: 12, - barCategoryGap: 12, - data: [ - 10, - 12, - 43, - 4, - 22, - 4, - 22, - 32, - 12, - 8, - 122, - 0, - , - 43, - 4, - 22, - 32, - 32, - 12, - 8, - 122, - 0, - ], - }, - ], + series: this.series, + // series: [ + // { + // name: '上片数', + // type: 'bar', + // // barWidth: 12, + // data: [ + // 10, + // 12, + // 43, + // 4, + // 22, + // 32, + // 12, + // 8, + // 122, + // 0, + // , + // 43, + // 4, + // 22, + // 32, + // 12, + // 8, + // 122, + // 77, + // 99, + // ], + // }, + // { + // name: '下片数', + // type: 'bar', + // // barWidth: 12, + // data: [ + // 10, + // 12, + // 43, + // 4, + // 22, + // 32, + // 12, + // 8, + // 122, + // 0, + // 4, + // 22, + // 32, + // 12, + // 8, + // 122, + // 0, + // , + // 43, + // 4, + // 22, + // 32, + // ], + // }, + // { + // name: '检测数', + // type: 'bar', + // // barWidth: 12, + // barCategoryGap: 12, + // data: [ + // 10, + // 12, + // 43, + // 4, + // 22, + // 4, + // 22, + // 32, + // 12, + // 8, + // 122, + // 0, + // , + // 43, + // 4, + // 22, + // 32, + // 32, + // 12, + // 8, + // 122, + // 0, + // ], + // }, + // ], }; }, }, diff --git a/src/views/quality/monitoring/qualityStatistics/graphPage.vue b/src/views/quality/monitoring/qualityStatistics/graphPage.vue index d6f92350..ab67b5c6 100644 --- a/src/views/quality/monitoring/qualityStatistics/graphPage.vue +++ b/src/views/quality/monitoring/qualityStatistics/graphPage.vue @@ -15,7 +15,12 @@ --> - +
暂无数据
+ @@ -56,7 +61,8 @@ export default { console.log('this.list', this.lineData.list, this.lineData.xProps); const seriesItem = { name: item.inspectionContent, - type: 'line', + type: 'bar', + barCategoryGap: 12, data: [], }; diff --git a/src/views/quality/monitoring/qualityStatistics/index.vue b/src/views/quality/monitoring/qualityStatistics/index.vue index 2e0834d3..8376217b 100644 --- a/src/views/quality/monitoring/qualityStatistics/index.vue +++ b/src/views/quality/monitoring/qualityStatistics/index.vue @@ -99,11 +99,55 @@ import GraphPage from './graphPage.vue'; import summaryTable from './components/summaryTable.vue'; +class DateGetter { + constructor() { + this.today = new Date(); + this.y = this.today.getFullYear(); + this.m = this.today.getMonth(); + this.d = this.today.getDate(); + } + getWeekRange() { + const weekStart = new Date(this.y, this.m, this.d - this.today.getDay()); + const weekEnd = new Date( + this.y, + this.m, + this.d + (6 - this.today.getDay()), + 23, + 59, + 59 + ); + // console.log('week', [weekStart, weekEnd]); + return [weekStart, weekEnd]; + } + + getMonthRange() { + const monthStart = new Date(this.y, this.m, 1); + const monthEnd = new Date(this.y, this.m + 1, 0, 23, 59, 59); + // console.log('month', [monthStart, monthEnd]); + return [monthStart, monthEnd]; + } + + getQuarterRange() { + const quarterStart = new Date(this.y, this.m - (this.m % 3), 1); + const quarterEnd = new Date( + this.y, + this.m - (this.m % 3) + 3, + 0, + 23, + 59, + 59 + ); + // console.log('quarter', [quarterStart, quarterEnd]); + return [quarterStart, quarterEnd]; + } +} + export default { name: 'QualityStatistics', components: { GraphPage, summaryTable }, props: {}, data() { + const dateGetter = new DateGetter(); return { // mode: 'table', // defaults to 'table' activeName: 'table', // defaults to 'table' @@ -121,6 +165,28 @@ export default { endPlaceholder: '结束日期', defaultTime: ['00:00:00', '23:59:59'], param: 'timerange', + pickerOptions: { + shortcuts: [ + { + text: '本周', + onClick(picker) { + picker.$emit('pick', dateGetter.getWeekRange()); + }, + }, + { + text: '本月', + onClick(picker) { + picker.$emit('pick', dateGetter.getMonthRange()); + }, + }, + { + text: '本季', + onClick(picker) { + picker.$emit('pick', dateGetter.getQuarterRange()); + }, + }, + ], + }, }, { type: 'button',