diff --git a/src/assets/board/model1.png b/src/assets/board/model1.png index 401a345..d445d09 100644 Binary files a/src/assets/board/model1.png and b/src/assets/board/model1.png differ diff --git a/src/assets/board/model2.png b/src/assets/board/model2.png index 4a230d8..91616b8 100644 Binary files a/src/assets/board/model2.png and b/src/assets/board/model2.png differ diff --git a/src/views/board/caseShell/index2.vue b/src/views/board/caseShell/index2.vue index b5d9ad1..dca8690 100644 --- a/src/views/board/caseShell/index2.vue +++ b/src/views/board/caseShell/index2.vue @@ -10,6 +10,7 @@ {{ i }}
平均节拍:{{ meter }} 秒/件
+
@@ -756,4 +757,15 @@ export default { font-size: 0.9vw; color: #fff; } +.centerBg { + background-image: url("../../../assets/board/model2.png"); + background-repeat: no-repeat; + background-size: 100% 100%; + position: absolute; + transform: translate(-50%, -50%); + top: 54.5%; + left: 49%; + width: 90%; + height: 22%; +} diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue index 4851735..2033cfc 100644 --- a/src/views/board/liner/index.vue +++ b/src/views/board/liner/index.vue @@ -558,10 +558,10 @@ export default { background-size: 100% 100%; position: absolute; transform: translate(-50%, -50%); - top: 56%; + top: 54.5%; left: 49%; - width: 98%; - height: 57%; + width: 90%; + height: 22%; } .headTitle { diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue index cde90c4..6121ac7 100644 --- a/src/views/dashboard/LineChart.vue +++ b/src/views/dashboard/LineChart.vue @@ -63,9 +63,21 @@ export default { this.setOptions(this.chartData) }, setOptions({expectedData, actualData} = {}) { + const week = () =>{ + let today = new Date(); + let firstDayOfYear = new Date(today.getFullYear(), 0, 1); + let dayOfWeek = firstDayOfYear.getDay(); + let spendDay = 1; + if (dayOfWeek != 0) { + spendDay = 7 - dayOfWeek + 1; + } + firstDayOfYear = new Date(today.getFullYear(), 0, spendDay); + let d = Math.ceil((today.valueOf() - firstDayOfYear.valueOf()) / 86400000); + return Math.ceil((d / 7) + 1) + } this.chart.setOption({ title: { - text: '标题1 ', + text: `第${week()}周`, textStyle: { align: 'center', color: '#000', @@ -85,7 +97,7 @@ export default { left: 10, right: 10, bottom: 20, - top: 30, + top: 50, containLabel: true }, tooltip: { diff --git a/src/views/dashboard/LineChart1.vue b/src/views/dashboard/LineChart1.vue index 2ba69d7..f71e915 100644 --- a/src/views/dashboard/LineChart1.vue +++ b/src/views/dashboard/LineChart1.vue @@ -62,9 +62,21 @@ export default { this.setOptions(this.chartData) }, setOptions({ expectedData, actualData } = {}) { + const week = () =>{ + let today = new Date(); + let firstDayOfYear = new Date(today.getFullYear(), 0, 1); + let dayOfWeek = firstDayOfYear.getDay(); + let spendDay = 1; + if (dayOfWeek != 0) { + spendDay = 7 - dayOfWeek + 1; + } + firstDayOfYear = new Date(today.getFullYear(), 0, spendDay); + let d = Math.ceil((today.valueOf() - firstDayOfYear.valueOf()) / 86400000); + return Math.ceil((d / 7) + 1) + } this.chart.setOption({ title: { - text: '标题1 ', + text: `第${week()}周`, textStyle: { align: 'center', color: '#000', diff --git a/src/views/dashboard/PieChart.vue b/src/views/dashboard/PieChart.vue index b56ec90..b13e2b4 100644 --- a/src/views/dashboard/PieChart.vue +++ b/src/views/dashboard/PieChart.vue @@ -44,9 +44,21 @@ export default { initChart() { this.chart = echarts.init(this.$el, 'macarons') + const week = () =>{ + let today = new Date(); + let firstDayOfYear = new Date(today.getFullYear(), 0, 1); + let dayOfWeek = firstDayOfYear.getDay(); + let spendDay = 1; + if (dayOfWeek != 0) { + spendDay = 7 - dayOfWeek + 1; + } + firstDayOfYear = new Date(today.getFullYear(), 0, spendDay); + let d = Math.ceil((today.valueOf() - firstDayOfYear.valueOf()) / 86400000); + return Math.ceil((d / 7) + 1) + } this.chart.setOption({ title: { - text: '标题1 ', + text: `第${week()}周`, textStyle: { align: 'center', color: '#000',