From e63956dfd86bc06821c3bb0072432d1395e346d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Fri, 29 Dec 2023 18:16:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/board/mixData.js | 2 +- src/api/index.js | 10 + src/views/board/liner/index.vue | 13 +- src/views/dashboard/LineChart.vue | 135 +-------- src/views/dashboard/LineChart1.vue | 82 +----- src/views/dashboard/PanelGroup.vue | 51 ++-- src/views/dashboard/PieChart.vue | 72 ++--- src/views/index_v1.vue | 351 ++++++++++++++++++------ src/views/model/companyIntroduction.vue | 1 + src/views/model/dataCentre.vue | 2 +- vue.config.js | 7 + 11 files changed, 351 insertions(+), 375 deletions(-) create mode 100644 src/api/index.js diff --git a/src/api/board/mixData.js b/src/api/board/mixData.js index 8a7c1a5..19b9306 100644 --- a/src/api/board/mixData.js +++ b/src/api/board/mixData.js @@ -11,7 +11,7 @@ export function mixData(params) { method: params?.i || '' }).then(val2 => { (params?.f || (() => { - }))(val2) + }))(val2?.data || []) }) } }) diff --git a/src/api/index.js b/src/api/index.js new file mode 100644 index 0000000..77a94d9 --- /dev/null +++ b/src/api/index.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 登录方法 +export function getData(data) { + return request({ + url: '/boardReport/homePageInterface', + method: 'post', + data: data + }) +} diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue index c5ed1dc..44e0426 100644 --- a/src/views/board/liner/index.vue +++ b/src/views/board/liner/index.vue @@ -279,6 +279,7 @@ export default { e: 'nd-07', i: "SCADA_INV_STATS_01('')", f: (e) => { + console.log(e) this.$refs.chart2.setData({ tooltip: { trigger: "axis", @@ -295,7 +296,7 @@ export default { containLabel: true, }, legend: { - data: e.y.map(val => val.name), + data:['内胆','箱壳'], right: 'center', top: 0, textStyle: { @@ -307,7 +308,7 @@ export default { }, xAxis: { type: "category", - data: e.x, + data: e.map(val=>val.X_VALUE), axisLine: { lineStyle: { color: "white", @@ -337,7 +338,7 @@ export default { }, series: [ { - name: e.y[0].name, + name: '内胆', type: "bar", barWidth: "30%", barMaxWidth: 50, @@ -367,10 +368,10 @@ export default { ]), }, }, - data: e.y[0].data, + data: e.map(val=>val.Y_VALUE_ONE), }, { - name: e.y[1].name, + name: '箱壳', type: "bar", barWidth: "30%", barMaxWidth: 50, @@ -400,7 +401,7 @@ export default { ]), }, }, - data: e.y[1].data, + data: e.map(val=>val.Y_VALUE_TWO), }, ], }) diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue index b93e42b..310b9e4 100644 --- a/src/views/dashboard/LineChart.vue +++ b/src/views/dashboard/LineChart.vue @@ -32,6 +32,7 @@ export default { type: Object, required: true } + }, data() { return { @@ -61,139 +62,9 @@ export default { methods: { initChart() { this.chart = echarts.init(this.$el, 'macarons') - this.setOptions(this.chartData) }, - setOptions({expectedData, actualData,expedData} = {}) { - 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: `第${week()}周产量`, - textStyle: { - align: 'center', - color: '#000', - fontSize: 20, - }, - top: '0%', - left: '0%', - }, - xAxis: { - data: ['2023-12-11', '2023-12-12', '2023-12-13', '2023-12-14', '2023-12-15', '2023-12-16', '2023-12-17'], - // boundaryGap: false, - axisTick: { - show: false - } - }, - grid: { - left: 10, - right: 10, - bottom: 20, - top: 50, - containLabel: true - }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'cross' - }, - padding: [5, 10] - }, - yAxis: [ - { - axisTick: { - show: false - } - }, - { - axisTick: { - show: false - }, - axisLabel:{ - formatter:'{value}%' - } - } - ], - legend: { - data: ['expected', 'actual'] - }, - series: [ - { - name: '订单履约率', - type: 'line', - yAxisIndex:1, - itemStyle: { - normal: { - color: '#3888fa', - lineStyle: { - color: '#3888fa', - width: 2 - }, - // areaStyle: { - // color: '#f3f8ff' - // } - } - }, - label: { - normal: { - show: true, - position: "top", - textStyle: { - color: "#a8aab0", - fontStyle: "normal", - fontFamily: "微软雅黑", - fontSize: 0.75 * vw, - }, - }, - }, - data: expectedData, - animationDuration: 1000, - animationEasing: 'quadraticOut' - }, - { - name: '产量', - smooth: false, - type: 'bar', - barMaxWidth:60, - label: { - normal: { - show: true, - position: "top", - textStyle: { - color: "#a8aab0", - fontStyle: "normal", - fontFamily: "微软雅黑", - fontSize: 0.75 * vw, - }, - }, - }, - itemStyle: { - normal: { - color: '#9fe080', - lineStyle: { - color: '#9fe080', - width: 2 - }, - areaStyle: { - color: '#f3f8ff' - } - } - }, - data: expedData, - animationDuration: 1000, - animationEasing: 'quadraticOut' - } - ] - }) + setOptions(val) { + this.chart.setOption(val) } } } diff --git a/src/views/dashboard/LineChart1.vue b/src/views/dashboard/LineChart1.vue index 4d5f6a3..d5963cc 100644 --- a/src/views/dashboard/LineChart1.vue +++ b/src/views/dashboard/LineChart1.vue @@ -59,87 +59,9 @@ export default { methods: { initChart() { this.chart = echarts.init(this.$el, 'macarons') - 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: `第${week()}周清单率`, - textStyle: { - align: 'center', - color: '#000', - fontSize: 20, - }, - top: '0%', - left: '0%', - }, - xAxis: { - data: ['2023-12-11', '2023-12-12', '2023-12-13', '2023-12-14', '2023-12-15', '2023-12-16', '2023-12-17'], - boundaryGap: false, - axisTick: { - show: false - } - }, - grid: { - left: 10, - right: 10, - bottom: 20, - top: 50, - containLabel: true - }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'cross' - }, - padding: [5, 10] - }, - yAxis: { - axisTick: { - show: false - }, - axisLabel:{ - formatter:'{value}%' - } - }, - legend: { - data: ['expected', 'actual'] - }, - series: [ - - { - name: '清单率', - smooth: false, - type: 'line', - itemStyle: { - normal: { - color: '#3888fa', - lineStyle: { - color: '#3888fa', - width: 2 - }, - areaStyle: { - color: '#f3f8ff' - } - } - }, - data: actualData, - animationDuration: 2800, - animationEasing: 'quadraticOut' - }] - }) + setOptions(val) { + this.chart.setOption(val) } } } diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 8610b0f..0766167 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -1,54 +1,54 @@