diff --git a/src/assets/icons/svg/turn-data.svg b/src/assets/icons/svg/turn-data.svg new file mode 100644 index 00000000..b27354a6 --- /dev/null +++ b/src/assets/icons/svg/turn-data.svg @@ -0,0 +1,24 @@ + + + 切换数据 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/home/components/container.vue b/src/views/home/components/container.vue index 567bd0c0..38b4dd8a 100644 --- a/src/views/home/components/container.vue +++ b/src/views/home/components/container.vue @@ -321,7 +321,7 @@ export default { display: inline-flex; position: absolute; right: 5%; - top: 10%; + top: 25px; z-index: 9999; align-items: center; border-radius: 24px; diff --git a/src/views/home/productionCostAnalysis/procPackMatCost.vue b/src/views/home/productionCostAnalysis/procPackMatCost.vue index d8da34a4..dd5a3ade 100644 --- a/src/views/home/productionCostAnalysis/procPackMatCost.vue +++ b/src/views/home/productionCostAnalysis/procPackMatCost.vue @@ -37,7 +37,7 @@ gap: 12px; grid-template-columns: 1624px; "> - + @@ -95,7 +95,10 @@ export default { monData: {}, totalData: {}, trend: [], - relatedData: {}, + relatedData: { + total:[], + current:[] + }, trendName: '包材成本', }; }, @@ -208,8 +211,9 @@ export default { this.totalData = res.data.totalMonthData.find(item => { return item.name === "包材成本"; }); - // this.relatedMon = res.data.relatedMon - ; + this.relatedData.total =res.data.totalMonthData, + this.relatedData.current= res.data.currentMonthData + this.trend = res.data.dataTrend }); }, diff --git a/src/views/home/productionCostAnalysisComponents/containerPackMatCost.vue b/src/views/home/productionCostAnalysisComponents/containerPackMatCost.vue new file mode 100644 index 00000000..60e74f52 --- /dev/null +++ b/src/views/home/productionCostAnalysisComponents/containerPackMatCost.vue @@ -0,0 +1,368 @@ + + + + + diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue index ed339800..dae77eae 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue @@ -44,7 +44,7 @@
- +
@@ -56,7 +56,7 @@ import * as echarts from 'echarts'; export default { name: "Container", components: { operatingLineBar }, - props: ["chartData"], + props: ["chartData","showRelated"], data() { return { activeButton: 0, diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue index 06b14f6b..05391021 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue @@ -1,39 +1,98 @@