From b491f2412633cfccf04590ce662b9061d947a502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Fri, 9 Jan 2026 17:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 4 +- .../grossMarginComponents/dataTrendBar.vue | 2 +- .../monthlyRelatedMetrics.vue | 8 +-- .../yearRelatedMetrics.vue | 28 +++++----- .../monthlyRelatedMetrics.vue | 4 +- .../yearRelatedMetrics.vue | 4 +- .../monthlyRelatedMetrics.vue | 2 +- .../yearRelatedMetrics.vue | 2 +- .../monthlyRelatedMetrics.vue | 2 +- .../yearRelatedMetrics.vue | 2 +- .../operatingProfit/operatingProfitBase.vue | 2 +- .../dataTrendBar.vue | 2 +- .../monthlyOverview.vue | 2 +- .../operatingLineChart.vue | 4 +- .../operatingLineChartCumulative.vue | 4 +- .../operatingSingleBar.vue | 2 +- .../relatedIndicatorsAnalysis.vue | 2 +- .../totalOverview.vue | 2 +- .../relatedIndicatorsAnalysis.vue | 10 ++-- .../SIMFRMCostAnalysis.vue | 39 +++++++++++--- .../productionCostAnalysis/combustible.vue | 2 +- .../fuelCostAnalysis.vue | 2 +- .../procPackMatCost.vue | 4 +- .../singleCombustible.vue | 32 ++++++++++-- .../singleProcAuxMatCost.vue | 34 +++++++++++-- .../singleProcMfgOverheadCost.vue | 2 +- .../dataTrendBar.vue | 2 +- .../dataTrendBarFactoryBurden.vue | 2 +- .../dataTrendBarPro.vue | 2 +- .../monthlyOverview.vue | 6 ++- .../monthlyThreeRelatedMetricsPro.vue | 6 +-- .../operatingSingleBar.vue | 4 +- .../relateCombustibleCostAnalysis.vue | 8 +-- .../relateFactoryBurdenCostAnalysis.vue | 51 ++++++++++++------- .../relateSingleCombustible.vue | 6 +-- .../relateSingleFuelCostAnalysis.vue | 17 +++++-- .../relateSingleFuelCostAnalysisDian.vue | 6 +-- .../relatedIndicatorsAnalysis.vue | 4 +- .../yearThreeRelatedMetricsPro.vue | 6 +-- .../monthlyThreeRelatedMetrics.vue | 6 +-- .../yearThreeRelatedMetrics.vue | 6 +-- .../totalProfitComponents/dataTrendBar.vue | 2 +- .../totalProfitComponents/monthlyOverview.vue | 2 +- .../operatingSingleBar.vue | 2 +- .../relatedIndicatorsAnalysis.vue | 2 +- .../totalProfitComponents/totalOverview.vue | 2 +- .../financeCostsContainer.vue | 34 +++++++------ .../monthlyRelatedMetrics.vue | 4 +- .../totalOverview.vue | 18 +++---- .../yearRelatedMetrics.vue | 4 +- 50 files changed, 256 insertions(+), 149 deletions(-) diff --git a/.env.dev b/.env.dev index c4e944c2..a5e7dc35 100644 --- a/.env.dev +++ b/.env.dev @@ -5,11 +5,11 @@ ENV = 'development' VUE_APP_TITLE = 洛玻集团驾驶舱 # 芋道管理系统/开发环境 -# VUE_APP_BASE_API = 'http://172.16.32.18:7070' +VUE_APP_BASE_API = 'http://172.16.32.18:7070' # VUE_APP_BASE_API = 'http://172.16.32.95:7070' # VUE_APP_BASE_API = 'http://172.16.33.83:7070' -VUE_APP_BASE_API = 'http://192.168.0.35:7070' +# VUE_APP_BASE_API = 'http://192.168.0.35:7070' # 路由懒加载 diff --git a/src/views/home/grossMarginComponents/dataTrendBar.vue b/src/views/home/grossMarginComponents/dataTrendBar.vue index c348fd48..52df74da 100644 --- a/src/views/home/grossMarginComponents/dataTrendBar.vue +++ b/src/views/home/grossMarginComponents/dataTrendBar.vue @@ -64,7 +64,7 @@ export default { selectedProfit: null, // 选中的名称，初始为null profitOptions: [ '毛利率', - '收入', + '营业收入', '全成本', ] }; diff --git a/src/views/home/grossMarginComponents/monthlyRelatedMetrics.vue b/src/views/home/grossMarginComponents/monthlyRelatedMetrics.vue index 25e5e55d..f68af55a 100644 --- a/src/views/home/grossMarginComponents/monthlyRelatedMetrics.vue +++ b/src/views/home/grossMarginComponents/monthlyRelatedMetrics.vue @@ -6,7 +6,7 @@
- 收入·万元 + 营业收入·万元
@@ -39,7 +39,7 @@ export default { type: Array, // 正确写法：默认值通过 factory 函数返回（才能调用 default()） default: () => [ - { title: "收入", budget: 0, real: 0, rate: 0, diff: 0 }, + { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0 }, { title: "累计全成本", budget: 0, real: 0, rate: 0, diff: 0 } ] }, @@ -58,7 +58,7 @@ export default { }, data() { return { - ytdIncomeData: { title: "收入", budget: 0, real: 0, rate: 0, diff: 0, flag: 0 }, + ytdIncomeData: { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0, flag: 0 }, ytdCostData: { title: "累计全成本", budget: 0, real: 0, rate: 0, diff: 0, flag: 0 } } }, @@ -106,7 +106,7 @@ getRateFlag(rate, real, target) { : this.$props.monthAnalysis; // 直接取 props 默认值 // 提取累计收入（第0项）、累计全成本（第1项）数据 - const incomeItem = validData[0] || { title: "收入", budget: 0, real: 0, rate: 0, diff: 0 }; + const incomeItem = validData[0] || { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0 }; const costItem = validData[1] || { title: "全成本", budget: 0, real: 0, rate: 0, diff: 0 }; // 整合flag字段 diff --git a/src/views/home/grossMarginComponents/yearRelatedMetrics.vue b/src/views/home/grossMarginComponents/yearRelatedMetrics.vue index 88da76c7..91228b89 100644 --- a/src/views/home/grossMarginComponents/yearRelatedMetrics.vue +++ b/src/views/home/grossMarginComponents/yearRelatedMetrics.vue @@ -6,7 +6,7 @@
- 收入·万元 + 营业收入·万元
@@ -15,7 +15,7 @@
- 全成本·万元 + 全成本·元/㎡
@@ -40,7 +40,7 @@ export default { type: Array, // 默认值：收入、全成本两个对象，结构与原数据一致 default: () => [ - { title: "收入", budget: 0, real: 0, rate: 0, diff: 0 }, + { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0 }, { title: "全成本", budget: 0, real: 0, rate: 0, diff: 0 } ] }, @@ -61,7 +61,7 @@ export default { return { chart: null, // 初始化收入/全成本数据（包含flag字段） - incomeData: { title: "收入", budget: 0, real: 0, rate: 0, diff: 0, flag: 0 }, + incomeData: { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0, flag: 0 }, totalCostData: { title: "全成本", budget: 0, real: 0, rate: 0, diff: 0, flag: 0 } } }, @@ -90,18 +90,18 @@ export default { }) }, // 保留原flag判断逻辑（≥100返回1，<100返回0） -getRateFlag(rate, real, target) { - if (isNaN(rate) || rate === null || rate === undefined) return 0; + getRateFlag(rate, real, target) { + if (isNaN(rate) || rate === null || rate === undefined) return 0; - // 1. 完成率 >= 100 => 达标 - if (rate >= 100) return 1; + // 1. 完成率 >= 100 => 达标 + if (rate >= 100) return 1; - // 2. 完成率 = 0 且 (目标值=0 或 实际值=目标值=0) => 达标 - if (rate === 0 && target === 0) return 1; + // 2. 完成率 = 0 且 (目标值=0 或 实际值=目标值=0) => 达标 + if (rate === 0 && target === 0) return 1; - // 其他情况 => 未达标 - return 0; -}, + // 其他情况 => 未达标 + return 0; + }, updateChart(data) { // 数据兜底：确保是数组且长度≥2 @@ -110,7 +110,7 @@ getRateFlag(rate, real, target) { : this.$props.ytdAnalysis.default(); // 提取收入（第0项）、全成本（第1项）数据 - const incomeItem = validData[0] || { title: "收入", budget: 0, real: 0, rate: 0, diff: 0 }; + const incomeItem = validData[0] || { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0 }; const totalCostItem = validData[1] || { title: "全成本", budget: 0, real: 0, rate: 0, diff: 0 }; // 整合flag字段到收入/全成本数据中 diff --git a/src/views/home/inputOutputRatioComponents/monthlyRelatedMetrics.vue b/src/views/home/inputOutputRatioComponents/monthlyRelatedMetrics.vue index 61262ab3..8104f8d2 100644 --- a/src/views/home/inputOutputRatioComponents/monthlyRelatedMetrics.vue +++ b/src/views/home/inputOutputRatioComponents/monthlyRelatedMetrics.vue @@ -6,7 +6,7 @@
- 领用量·㎡ + 领用量·万㎡
@@ -15,7 +15,7 @@
- 加工产量·㎡ + 加工产量·万㎡
diff --git a/src/views/home/inputOutputRatioComponents/yearRelatedMetrics.vue b/src/views/home/inputOutputRatioComponents/yearRelatedMetrics.vue index 6cef2502..09a20860 100644 --- a/src/views/home/inputOutputRatioComponents/yearRelatedMetrics.vue +++ b/src/views/home/inputOutputRatioComponents/yearRelatedMetrics.vue @@ -6,7 +6,7 @@
- 领用量·㎡ + 领用量·万㎡
@@ -15,7 +15,7 @@
- 加工产量·㎡ + 加工产量·万㎡
diff --git a/src/views/home/netPriceAnalysisComponents/monthlyRelatedMetrics.vue b/src/views/home/netPriceAnalysisComponents/monthlyRelatedMetrics.vue index 33fed4cf..fc8484b7 100644 --- a/src/views/home/netPriceAnalysisComponents/monthlyRelatedMetrics.vue +++ b/src/views/home/netPriceAnalysisComponents/monthlyRelatedMetrics.vue @@ -18,7 +18,7 @@
- 运费·万㎡ + 运费·万元
- 运费·万㎡ + 运费·万元
- 单价·万㎡ + 单价·元/㎡
diff --git a/src/views/home/operatingComponents/yearRelatedMetrics.vue b/src/views/home/operatingComponents/yearRelatedMetrics.vue index 41acb64f..5bd0ad21 100644 --- a/src/views/home/operatingComponents/yearRelatedMetrics.vue +++ b/src/views/home/operatingComponents/yearRelatedMetrics.vue @@ -15,7 +15,7 @@
- 单价·万㎡ + 单价·元/㎡
diff --git a/src/views/home/operatingProfit/operatingProfitBase.vue b/src/views/home/operatingProfit/operatingProfitBase.vue index 3dac1a67..b5fa60ed 100644 --- a/src/views/home/operatingProfit/operatingProfitBase.vue +++ b/src/views/home/operatingProfit/operatingProfitBase.vue @@ -37,7 +37,7 @@ gap: 12px; grid-template-columns: 1624px; "> - +
diff --git a/src/views/home/operatingProfitComponents/dataTrendBar.vue b/src/views/home/operatingProfitComponents/dataTrendBar.vue index 16c668fa..81b7d66b 100644 --- a/src/views/home/operatingProfitComponents/dataTrendBar.vue +++ b/src/views/home/operatingProfitComponents/dataTrendBar.vue @@ -65,7 +65,7 @@ export default { '经营性利润', '销量', '单价', - '成本', + '制造成本', '管理费用', '销售费用', '财务费用', diff --git a/src/views/home/operatingProfitComponents/monthlyOverview.vue b/src/views/home/operatingProfitComponents/monthlyOverview.vue index a385093c..2306d13f 100644 --- a/src/views/home/operatingProfitComponents/monthlyOverview.vue +++ b/src/views/home/operatingProfitComponents/monthlyOverview.vue @@ -66,7 +66,7 @@ export default { */ factoryData() { // 整合原始数据 + 计算flag return { - completeRate: this.monData.proportion ? Number(this.monData.proportion).toFixed(2) : 0, + completeRate: this.monData.proportion ? Number(this.monData.proportion) : 0, diff: this.monData.diffValue, real: this.monData.value, target: this.monData.targetValue, diff --git a/src/views/home/operatingProfitComponents/operatingLineChart.vue b/src/views/home/operatingProfitComponents/operatingLineChart.vue index d56bb9a5..b3cdb2b0 100644 --- a/src/views/home/operatingProfitComponents/operatingLineChart.vue +++ b/src/views/home/operatingProfitComponents/operatingLineChart.vue @@ -61,8 +61,8 @@ export default { default: () => [], }, dateData: { - type: Array, - default: () => [], + type: Object, + default: () => {}, }, }, data() { diff --git a/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue b/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue index 6726ba86..fec2b978 100644 --- a/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue +++ b/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue @@ -61,8 +61,8 @@ export default { default: () => [], }, dateData: { - type: Array, - default: () => [], + type: Object, + default: () => {}, }, }, data() { diff --git a/src/views/home/operatingProfitComponents/operatingSingleBar.vue b/src/views/home/operatingProfitComponents/operatingSingleBar.vue index 4bb84b68..d40214ac 100644 --- a/src/views/home/operatingProfitComponents/operatingSingleBar.vue +++ b/src/views/home/operatingProfitComponents/operatingSingleBar.vue @@ -23,7 +23,7 @@ export default { chartD() { // 背景图片路径（若不需要可注释） // const bgImageUrl = require('@/assets/img/labelBg.png'); - const rate = this.detailData?.proportion ? Number(this.detailData?.proportion).toFixed(2) : 0 + const rate = this.detailData?.proportion ? Number(this.detailData?.proportion) : 0 const diff = this.detailData?.diffValue || 0 console.log('diff', diff); diff --git a/src/views/home/operatingProfitComponents/relatedIndicatorsAnalysis.vue b/src/views/home/operatingProfitComponents/relatedIndicatorsAnalysis.vue index 0f4f69cf..ab05fded 100644 --- a/src/views/home/operatingProfitComponents/relatedIndicatorsAnalysis.vue +++ b/src/views/home/operatingProfitComponents/relatedIndicatorsAnalysis.vue @@ -124,7 +124,7 @@ export default { }, // 3. 成本数据：从当前激活数据集中筛选 costData() { - return (this.activeData.find(item => item.name === "成本")) || { + return (this.activeData.find(item => item.name === "制造成本")) || { targetValue: 0, value: 0, completed: 0, diff --git a/src/views/home/operatingProfitComponents/totalOverview.vue b/src/views/home/operatingProfitComponents/totalOverview.vue index 5ba0db7b..44b36ae1 100644 --- a/src/views/home/operatingProfitComponents/totalOverview.vue +++ b/src/views/home/operatingProfitComponents/totalOverview.vue @@ -69,7 +69,7 @@ export default { */ factoryData() { // 整合原始数据 + 计算flag return { - completeRate: Number(this.totalData.proportion).toFixed(2), + completeRate: Number(this.totalData.proportion), diff: this.totalData.diffValue, real: this.totalData.value, target: this.totalData.targetValue, diff --git a/src/views/home/procurementGainAnalysisComponents/relatedIndicatorsAnalysis.vue b/src/views/home/procurementGainAnalysisComponents/relatedIndicatorsAnalysis.vue index d65e0c67..1c68761b 100644 --- a/src/views/home/procurementGainAnalysisComponents/relatedIndicatorsAnalysis.vue +++ b/src/views/home/procurementGainAnalysisComponents/relatedIndicatorsAnalysis.vue @@ -6,7 +6,7 @@
- 大宗类·万㎡ + 大宗类·万元
- 石料类·m³/㎡ + 石料类·万元
- 材料类·m³ + 材料类·万元
- 动力类·元m³ + 动力类·万元
- 技术服务类·万㎡ + 技术服务类·万元
{ - return item.name === "硅砂成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name === '原料' + this.$route.query.name; + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name === '原料硅砂'; + } }); // this.relatedMon = res.data.relatedMon this.relatedData = { relatedMon: res.data.currentMonthData.filter(item => { - return item.name !== "硅砂成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name !== '原料' + this.$route.query.name; + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name !== '原料硅砂'; + } }), // 兜底月度数据 relatedTotal: res.data.totalMonthData.filter(item => { - return item.name !== "硅砂成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name !== '原料' + this.$route.query.name; + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name !== '原料硅砂'; + } }) // 兜底累计数据 } diff --git a/src/views/home/productionCostAnalysis/combustible.vue b/src/views/home/productionCostAnalysis/combustible.vue index fdae2cb9..d8be00c2 100644 --- a/src/views/home/productionCostAnalysis/combustible.vue +++ b/src/views/home/productionCostAnalysis/combustible.vue @@ -199,7 +199,7 @@ export default { endTime: this.dateData.endTime, // index: this.index, // sort: 1, - trendName: this.trendName, + trendName: this.trendName +'成本', analysisObject: [ "原片燃料成本", ], diff --git a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue index 77dc0fee..1bbd7622 100644 --- a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue +++ b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue @@ -189,7 +189,7 @@ export default { changeItem(item) { console.log('item', item); - this.trendName = item + this.trendName = item this.getData() }, getData() { diff --git a/src/views/home/productionCostAnalysis/procPackMatCost.vue b/src/views/home/productionCostAnalysis/procPackMatCost.vue index 5b8c01b9..ca8fe405 100644 --- a/src/views/home/productionCostAnalysis/procPackMatCost.vue +++ b/src/views/home/productionCostAnalysis/procPackMatCost.vue @@ -96,7 +96,7 @@ export default { totalData: {}, trend: [], relatedData: {}, - trendName: '加工包材成本', + trendName: '包材成本', }; }, @@ -186,7 +186,7 @@ export default { // sort: 1, trendName: this.trendName, analysisObject: [ - '加工包材成本' + '包材成本' ], // paramList: ['制造成本', '财务费用', '销售费用', '管理费用', '运费'], levelId: this.factory, diff --git a/src/views/home/productionCostAnalysis/singleCombustible.vue b/src/views/home/productionCostAnalysis/singleCombustible.vue index 45e9b9cb..182b55ca 100644 --- a/src/views/home/productionCostAnalysis/singleCombustible.vue +++ b/src/views/home/productionCostAnalysis/singleCombustible.vue @@ -209,20 +209,44 @@ export default { // 调用接口 getSingleMaterialAnalysis(requestParams).then((res) => { this.monData = res.data.currentMonthData.find(item => { - return item.name === "天然气成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name === this.$route.query.name + '成本'; + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name === '天然气成本'; + } }); console.log('this.monData', this.monData); this.totalData = res.data.totalMonthData.find(item => { - return item.name === "天然气成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name === this.$route.query.name + '成本'; + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name === '天然气成本'; + } }); // this.relatedMon = res.data.relatedMon this.relatedData = { relatedMon: res.data.currentMonthData.filter(item => { - return item.name !== "天然气成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name !== this.$route.query.name + '成本'; + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name !== '天然气成本'; + } }), // 兜底月度数据 relatedTotal: res.data.totalMonthData.filter(item => { - return item.name !== "天然气成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name !== this.$route.query.name + '成本'; + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name !== '天然气成本'; + } }) // 兜底累计数据 } diff --git a/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue b/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue index d9ca7279..32de2cd4 100644 --- a/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue +++ b/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue @@ -198,7 +198,7 @@ export default { endTime: this.dateData.endTime, // index: this.index, // sort: 1, - trendName: this.trendName, + trendName: this.$route.query.name ? this.$route.query.name + '成本' + this.trendName : '镀膜液成本' + this.trendName, analysisObject: [ this.$route.query.name ? this.$route.query.name + '成本' : '镀膜液成本' ], @@ -209,20 +209,44 @@ export default { // 调用接口 getSingleMaterialAnalysis(requestParams).then((res) => { this.monData = res.data.currentMonthData.find(item => { - return item.name === "镀膜液成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name === this.$route.query.name + '成本' + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name === '镀膜液成本'; + } }); console.log('this.monData', this.monData); this.totalData = res.data.totalMonthData.find(item => { - return item.name === "镀膜液成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name === this.$route.query.name + '成本' + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name === '镀膜液成本'; + } }); // this.relatedMon = res.data.relatedMon this.relatedData = { relatedMon: res.data.currentMonthData.filter(item => { - return item.name !== "镀膜液成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name !== this.$route.query.name + '成本' + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name === '镀膜液成本'; + } }), // 兜底月度数据 relatedTotal: res.data.totalMonthData.filter(item => { - return item.name !== "镀膜液成本"; + if (this.$route.query.name) { + // 如果有查询参数，查找 "原料" + 查询参数 的项 + return item.name !== this.$route.query.name + '成本' + } else { + // 如果没有查询参数，查找 name 为 "原料硅砂" 的项 + return item.name !== '镀膜液成本'; + } }) // 兜底累计数据 } diff --git a/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue b/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue index f30e5709..e591ffbd 100644 --- a/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue +++ b/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue @@ -94,7 +94,7 @@ export default { totalData: {}, trend: [], relatedData: {}, - trendName: '备品、机物料', + trendName: '备品丶机物料', }; }, diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue index 983f3d4b..ba254560 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue @@ -67,7 +67,7 @@ export default { '燃料成本', '电成本', '人工成本', - '制造成本', + '制造费用', ] }; }, diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue index 5b20e2b1..982022b2 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue @@ -64,7 +64,7 @@ export default { profitOptions: [ '原片制造费用成本', '包材', - '备品、机物料', + '备品丶机物料', '折旧', '其他', ] diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue index 55dd0967..1328854a 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue @@ -63,7 +63,7 @@ export default { selectedProfit: '制造费用', // 选中的名称，初始为null profitOptions: [ '制造费用', - '备品、机物料', + '备品丶机物料', '折旧', '其他', ] diff --git a/src/views/home/productionCostAnalysisComponents/monthlyOverview.vue b/src/views/home/productionCostAnalysisComponents/monthlyOverview.vue index 9c679019..53f46643 100644 --- a/src/views/home/productionCostAnalysisComponents/monthlyOverview.vue +++ b/src/views/home/productionCostAnalysisComponents/monthlyOverview.vue @@ -64,9 +64,11 @@ export default { /** * 自动提取monData中的工厂数据，并新增flag字段 */ - factoryData() { // 整合原始数据 + 计算flag + factoryData() { + console.log(this.monData,'monData'); + // 整合原始数据 + 计算flag return { - completeRate: this.monData.proportion ? Number(this.monData.proportion).toFixed(2) : 0, + completeRate: this.monData.proportion ? Number(this.monData.proportion) : 0, diff: this.monData.diffValue, real: this.monData.value, target: this.monData.targetValue, diff --git a/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue b/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue index ff83e895..f73bac2f 100644 --- a/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue +++ b/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue @@ -5,9 +5,9 @@
-
+
- 备品、机物料·元/㎡ + 备品丶机物料·元/㎡
@@ -76,7 +76,7 @@ export default { computed: { // 1. 备件丶机物料数据：精准筛选对应名称数据，兜底值统一 sparePartsData() { - return this.relatedData.find(item => (item.name || '').includes('备品、机物料')) || { + return this.relatedData.find(item => (item.name || '').includes('备品丶机物料')) || { targetValue: 0, value: 0, completed: 0, diff --git a/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue b/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue index dd5c2737..e10b8472 100644 --- a/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue @@ -23,9 +23,11 @@ export default { return ['预算', '实际']; }, chartD() { + console.log(this.detailData,'detailData'); + // 背景图片路径（若不需要可注释） // const bgImageUrl = require('@/assets/img/labelBg.png'); - const rate = this.detailData?.proportion ? Number(this.detailData?.proportion).toFixed(2) : 0 + const rate = this.detailData?.proportion ? Number(this.detailData?.proportion) : 0 const diff = this.detailData?.diffValue || 0 console.log('diff', diff); diff --git a/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue index c0d5422a..bea1ed9e 100644 --- a/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue +++ b/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue @@ -7,28 +7,28 @@
-
天然气·元/㎡
+
天然气·元/吨
-
LNG液化天然气·元/㎡
+
LNG液化天然气·元/吨
-
重油·元/㎡
+
重油·元/吨
-
水·元/㎡
+
水·元/吨
diff --git a/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue index 5ecc2ef6..21b8d5c8 100644 --- a/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue +++ b/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue @@ -1,22 +1,23 @@