diff --git a/src/views/home/components/profitBar.vue b/src/views/home/components/profitBar.vue
index d6318e02..8a5e0b31 100644
--- a/src/views/home/components/profitBar.vue
+++ b/src/views/home/components/profitBar.vue
@@ -113,7 +113,7 @@ export default {
symbolSize: 6
},
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 18,
diff --git a/src/views/home/components/profitLineChart.vue b/src/views/home/components/profitLineChart.vue
index 098fa13c..b2ddedd6 100644
--- a/src/views/home/components/profitLineChart.vue
+++ b/src/views/home/components/profitLineChart.vue
@@ -78,7 +78,7 @@ export default {
return PlaceNames.map(place => {
const targetItem = dataSource.find(item => item.name === place);
return {
- targetValue: targetItem?.[`${field}Target`] || 0, // 对应指标的目标值字段(如 profitTarget)
+ targetValue: targetItem?.[`${field}Target`] || 0, // 对应指标的预算值字段(如 profitTarget)
value: targetItem?.[field] || 0, // 对应指标的实际值
proportion: (targetItem?.[`${field}Proportion`] || 0), // 对应指标的占比(转百分比)
completed: targetItem?.[`${field}Completed`] ?? 0 // 状态字段(复用分公司的 completed)
diff --git a/src/views/home/components/psr-item.vue b/src/views/home/components/psr-item.vue
index 976305d7..56d32176 100644
--- a/src/views/home/components/psr-item.vue
+++ b/src/views/home/components/psr-item.vue
@@ -8,7 +8,7 @@
{{ item.targetValue || 0 }}
-
目标值
+
预算值
diff --git a/src/views/home/components/top-product-item.vue b/src/views/home/components/top-product-item.vue
index 04df2126..d586362f 100644
--- a/src/views/home/components/top-product-item.vue
+++ b/src/views/home/components/top-product-item.vue
@@ -7,7 +7,7 @@
{{ item.target }}
-
目标值
+
预算值
@@ -132,7 +132,7 @@ export default {
getColor(index) {
const { actual, target, progress } = this.itemList[index];
- // 新增条件:如果实际值、目标值和进度都为0,则显示绿色
+ // 新增条件:如果实际值、预算值和进度都为0,则显示绿色
if (actual === 0 && target === 0 && progress === 0) {
return "rgba(98, 213, 180, 1)"; // 绿色
}
diff --git a/src/views/home/costComponents/cost-item.vue b/src/views/home/costComponents/cost-item.vue
index bffb8af5..3c3b30ae 100644
--- a/src/views/home/costComponents/cost-item.vue
+++ b/src/views/home/costComponents/cost-item.vue
@@ -7,7 +7,7 @@
{{ item.targetValue || 0 }}
-
目标值
+
预算值
diff --git a/src/views/home/costComponents/costBaseBarChart.vue b/src/views/home/costComponents/costBaseBarChart.vue
index a5173001..7524f0d7 100644
--- a/src/views/home/costComponents/costBaseBarChart.vue
+++ b/src/views/home/costComponents/costBaseBarChart.vue
@@ -137,7 +137,7 @@ export default {
series: [
// 目标数据柱状图
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 24,
diff --git a/src/views/home/costComponents/operatingLineBar.vue b/src/views/home/costComponents/operatingLineBar.vue
index ed2641ce..0c618050 100644
--- a/src/views/home/costComponents/operatingLineBar.vue
+++ b/src/views/home/costComponents/operatingLineBar.vue
@@ -183,7 +183,7 @@ export default {
symbolSize: 6
},
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/costComponents/processingCost-Item.vue b/src/views/home/costComponents/processingCost-Item.vue
index 8d7cad07..13b49e89 100644
--- a/src/views/home/costComponents/processingCost-Item.vue
+++ b/src/views/home/costComponents/processingCost-Item.vue
@@ -9,11 +9,11 @@
-
+
{{ item.targetValue || 0 }}
-
目标值
+
预算值
diff --git a/src/views/home/costComponents/product-Item.vue b/src/views/home/costComponents/product-Item.vue
index 5f5f7b6b..4f7176b6 100644
--- a/src/views/home/costComponents/product-Item.vue
+++ b/src/views/home/costComponents/product-Item.vue
@@ -9,11 +9,11 @@
diff --git a/src/views/home/costComponents/profitBar.vue b/src/views/home/costComponents/profitBar.vue
index a3220e9b..573bdfc1 100644
--- a/src/views/home/costComponents/profitBar.vue
+++ b/src/views/home/costComponents/profitBar.vue
@@ -130,7 +130,7 @@ export default {
// 更新 ECharts 数据(包含 flag 字段)
this.echartData = {
locations, // x轴:地名列表
- target, // 目标值数组
+ target, // 预算值数组
value, // 实际值数组
proportion,
flag
diff --git a/src/views/home/costComponents/purchase-Item.vue b/src/views/home/costComponents/purchase-Item.vue
index 9c6a5348..7d3a3004 100644
--- a/src/views/home/costComponents/purchase-Item.vue
+++ b/src/views/home/costComponents/purchase-Item.vue
@@ -9,11 +9,11 @@
-
+
{{ item.targetValue }}
-
目标值
+
预算值
diff --git a/src/views/home/costComponents/raw-Item.vue b/src/views/home/costComponents/raw-Item.vue
index 549ffed4..82f86227 100644
--- a/src/views/home/costComponents/raw-Item.vue
+++ b/src/views/home/costComponents/raw-Item.vue
@@ -11,7 +11,7 @@
{{ item.target }}
-
目标值
+
预算值
diff --git a/src/views/home/costComponents/rawSheet-Item.vue b/src/views/home/costComponents/rawSheet-Item.vue
index 795158a8..15f18293 100644
--- a/src/views/home/costComponents/rawSheet-Item.vue
+++ b/src/views/home/costComponents/rawSheet-Item.vue
@@ -9,11 +9,11 @@
-
+
{{ item.targetValue || 0 }}
-
目标值
+
预算值
diff --git a/src/views/home/costComponents/top-item.vue b/src/views/home/costComponents/top-item.vue
index b033f01b..f082cda0 100644
--- a/src/views/home/costComponents/top-item.vue
+++ b/src/views/home/costComponents/top-item.vue
@@ -8,7 +8,7 @@
{{ item.targetValue }}
-
目标值
+
预算值
diff --git a/src/views/home/costComponents/top-product-item.vue b/src/views/home/costComponents/top-product-item.vue
index 0b11c294..30a66d06 100644
--- a/src/views/home/costComponents/top-product-item.vue
+++ b/src/views/home/costComponents/top-product-item.vue
@@ -7,12 +7,12 @@
@@ -34,12 +34,12 @@
@@ -61,12 +61,12 @@
@@ -88,12 +88,12 @@
@@ -115,12 +115,12 @@
diff --git a/src/views/home/expenseAnalysisComponents/operatingBar.vue b/src/views/home/expenseAnalysisComponents/operatingBar.vue
index 19ec7820..411b1c12 100644
--- a/src/views/home/expenseAnalysisComponents/operatingBar.vue
+++ b/src/views/home/expenseAnalysisComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/expenseAnalysisComponents/operatingLineChart.vue b/src/views/home/expenseAnalysisComponents/operatingLineChart.vue
index 4c8cdfcc..b42360bc 100644
--- a/src/views/home/expenseAnalysisComponents/operatingLineChart.vue
+++ b/src/views/home/expenseAnalysisComponents/operatingLineChart.vue
@@ -100,7 +100,7 @@ export default {
this.groupData = this.monthData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -133,7 +133,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue
index 373b6ca4..e4b25f86 100644
--- a/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue
@@ -95,7 +95,7 @@ export default {
this.groupData = this.ytdData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -128,7 +128,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/expenseAnalysisComponents/operatingTopBar.vue b/src/views/home/expenseAnalysisComponents/operatingTopBar.vue
index affa6eef..d8afea7c 100644
--- a/src/views/home/expenseAnalysisComponents/operatingTopBar.vue
+++ b/src/views/home/expenseAnalysisComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/expenseAnalysisComponents/verticalBarChart.vue b/src/views/home/expenseAnalysisComponents/verticalBarChart.vue
index 03f29309..0ed4bba3 100644
--- a/src/views/home/expenseAnalysisComponents/verticalBarChart.vue
+++ b/src/views/home/expenseAnalysisComponents/verticalBarChart.vue
@@ -145,7 +145,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
// 固定label尺寸:68px×20px
width: 68,
height: 20,
diff --git a/src/views/home/fullCostAnalysis/fullCostAnalysis.vue b/src/views/home/fullCostAnalysis/fullCostAnalysis.vue
index 11e6a09c..a98e607e 100644
--- a/src/views/home/fullCostAnalysis/fullCostAnalysis.vue
+++ b/src/views/home/fullCostAnalysis/fullCostAnalysis.vue
@@ -1,6 +1,5 @@
-
diff --git a/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue b/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue
index f8758e80..741489bd 100644
--- a/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue
+++ b/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue
@@ -76,7 +76,7 @@ export default {
months: [], // 月份数组(x轴标签)
rates: [], // 完成率(completeRate)
reals: [], // 实际值(real)
- targets: [], // 目标值(target)
+ targets: [], // 预算值(target)
flags: [], // 达标状态
diffs:[]
};
@@ -155,7 +155,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
@@ -171,7 +171,7 @@ export default {
borderRadius: [4, 4, 0, 0],
borderWidth: 0
},
- data: targets, // 动态目标值
+ data: targets, // 动态预算值
},
// 3. 实际(柱状图,含达标状态)
{
diff --git a/src/views/home/fullCostAnalysisComponents/operatingBar.vue b/src/views/home/fullCostAnalysisComponents/operatingBar.vue
index e56d3a22..95a7ae43 100644
--- a/src/views/home/fullCostAnalysisComponents/operatingBar.vue
+++ b/src/views/home/fullCostAnalysisComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/fullCostAnalysisComponents/operatingLineBarSale.vue b/src/views/home/fullCostAnalysisComponents/operatingLineBarSale.vue
index 74fe3429..2becd693 100644
--- a/src/views/home/fullCostAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/fullCostAnalysisComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: '元/m2',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/fullCostAnalysisComponents/operatingLineBarSaleGroup.vue b/src/views/home/fullCostAnalysisComponents/operatingLineBarSaleGroup.vue
index 586d1ffd..2cff40cd 100644
--- a/src/views/home/fullCostAnalysisComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/fullCostAnalysisComponents/operatingLineBarSaleGroup.vue
@@ -111,7 +111,7 @@ export default {
// 左侧Y轴:营业收入、成本(单位万元)
{
type: 'value',
- name: '万元',
+ name: '元/m2',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/fullCostAnalysisComponents/operatingLineChart.vue b/src/views/home/fullCostAnalysisComponents/operatingLineChart.vue
index de65b292..d22bc816 100644
--- a/src/views/home/fullCostAnalysisComponents/operatingLineChart.vue
+++ b/src/views/home/fullCostAnalysisComponents/operatingLineChart.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/fullCostAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/fullCostAnalysisComponents/operatingLineChartCumulative.vue
index 8ba97c58..7e874244 100644
--- a/src/views/home/fullCostAnalysisComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/fullCostAnalysisComponents/operatingLineChartCumulative.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue b/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue
index 2dde124d..a8e3e21e 100644
--- a/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue
+++ b/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue b/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue
index f6a58307..79ee50ca 100644
--- a/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue
+++ b/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue
@@ -107,7 +107,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,
diff --git a/src/views/home/grossMarginComponents/dataTrendBar.vue b/src/views/home/grossMarginComponents/dataTrendBar.vue
index f4416c08..563588bd 100644
--- a/src/views/home/grossMarginComponents/dataTrendBar.vue
+++ b/src/views/home/grossMarginComponents/dataTrendBar.vue
@@ -262,7 +262,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/grossMarginComponents/operatingBar.vue b/src/views/home/grossMarginComponents/operatingBar.vue
index 19ec7820..411b1c12 100644
--- a/src/views/home/grossMarginComponents/operatingBar.vue
+++ b/src/views/home/grossMarginComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/grossMarginComponents/operatingLineBarSale.vue b/src/views/home/grossMarginComponents/operatingLineBarSale.vue
index dbb80fc1..36e9a441 100644
--- a/src/views/home/grossMarginComponents/operatingLineBarSale.vue
+++ b/src/views/home/grossMarginComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: '%',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/grossMarginComponents/operatingLineBarSaleGroup.vue b/src/views/home/grossMarginComponents/operatingLineBarSaleGroup.vue
index 8b220958..9d763ce9 100644
--- a/src/views/home/grossMarginComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/grossMarginComponents/operatingLineBarSaleGroup.vue
@@ -111,7 +111,7 @@ export default {
// 左侧Y轴:营业收入、成本(单位万元)
{
type: 'value',
- name: '万元',
+ name: '%',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/grossMarginComponents/operatingLineChart.vue b/src/views/home/grossMarginComponents/operatingLineChart.vue
index 9ddc778d..547a3ead 100644
--- a/src/views/home/grossMarginComponents/operatingLineChart.vue
+++ b/src/views/home/grossMarginComponents/operatingLineChart.vue
@@ -102,7 +102,7 @@ export default {
this.groupData = this.monthData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -135,7 +135,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/grossMarginComponents/operatingLineChartCumulative.vue b/src/views/home/grossMarginComponents/operatingLineChartCumulative.vue
index 0343b93c..6089d7bb 100644
--- a/src/views/home/grossMarginComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/grossMarginComponents/operatingLineChartCumulative.vue
@@ -97,7 +97,7 @@ export default {
this.groupData = this.ytdData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -130,7 +130,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/grossMarginComponents/verticalBarChart.vue b/src/views/home/grossMarginComponents/verticalBarChart.vue
index 03f29309..0ed4bba3 100644
--- a/src/views/home/grossMarginComponents/verticalBarChart.vue
+++ b/src/views/home/grossMarginComponents/verticalBarChart.vue
@@ -145,7 +145,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
// 固定label尺寸:68px×20px
width: 68,
height: 20,
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 6b233cf5..87e7a219 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,5 +1,6 @@
@@ -40,9 +41,10 @@ import orderProgress from './components/orderProgress.vue'
import keyWork from './components/keyWork.vue'
// import moment from 'moment'
import { getOperateCockpit, getOrderDetail } from '@/api/cockpit'
+import { Sidebar } from "../../layout/components";
export default {
name: 'DayReport',
- components: { ReportHeader, coreSalesKPIs, keyProductionIndicators, coreBottomLeft, keyWork, orderProgress, financeCosts },
+ components: { ReportHeader, coreSalesKPIs, keyProductionIndicators, coreBottomLeft, keyWork, orderProgress, financeCosts, Sidebar },
data() {
return {
isFullScreen: false,
@@ -68,6 +70,25 @@ export default {
this.windowWidth(document.documentElement.clientWidth)
},
computed: {
+ // ...mapState({
+ // theme: (state) => state.settings.theme,
+ // sideTheme: (state) => state.settings.sideTheme,
+ // sidebar: (state) => state.app.sidebar,
+ // device: (state) => state.app.device,
+ // needTagsView: (state) => state.settings.tagsView,
+ // fixedHeader: (state) => state.settings.fixedHeader,
+ // }),
+ // classObj() {
+ // return {
+ // hideSidebar: !this.sidebar.opened,
+ // openSidebar: this.sidebar.opened,
+ // withoutAnimation: this.sidebar.withoutAnimation,
+ // mobile: this.device === "mobile",
+ // };
+ // },
+ // variables() {
+ // return variables;
+ // },
// ...mapGetters(['sidebar']),
styles() {
const v = Math.floor(this.value * this.beilv * 100) / 10000
diff --git a/src/views/home/inputOutputRatioComponents/operatingBar.vue b/src/views/home/inputOutputRatioComponents/operatingBar.vue
index 19ec7820..411b1c12 100644
--- a/src/views/home/inputOutputRatioComponents/operatingBar.vue
+++ b/src/views/home/inputOutputRatioComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/inputOutputRatioComponents/operatingLineBarSale.vue b/src/views/home/inputOutputRatioComponents/operatingLineBarSale.vue
index ac987024..8db29e89 100644
--- a/src/views/home/inputOutputRatioComponents/operatingLineBarSale.vue
+++ b/src/views/home/inputOutputRatioComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: '%',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/inputOutputRatioComponents/operatingLineBarSaleGroup.vue b/src/views/home/inputOutputRatioComponents/operatingLineBarSaleGroup.vue
index 8b220958..9d763ce9 100644
--- a/src/views/home/inputOutputRatioComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/inputOutputRatioComponents/operatingLineBarSaleGroup.vue
@@ -111,7 +111,7 @@ export default {
// 左侧Y轴:营业收入、成本(单位万元)
{
type: 'value',
- name: '万元',
+ name: '%',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/inputOutputRatioComponents/operatingLineChart.vue b/src/views/home/inputOutputRatioComponents/operatingLineChart.vue
index cf25bf05..9da2f4a3 100644
--- a/src/views/home/inputOutputRatioComponents/operatingLineChart.vue
+++ b/src/views/home/inputOutputRatioComponents/operatingLineChart.vue
@@ -102,7 +102,7 @@ export default {
this.groupData = this.monthData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -135,7 +135,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/inputOutputRatioComponents/operatingLineChartCumulative.vue b/src/views/home/inputOutputRatioComponents/operatingLineChartCumulative.vue
index 76fa772c..c9145bbb 100644
--- a/src/views/home/inputOutputRatioComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/inputOutputRatioComponents/operatingLineChartCumulative.vue
@@ -96,7 +96,7 @@ export default {
this.groupData = this.ytdData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -129,7 +129,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/inputOutputRatioComponents/operatingTopBar.vue b/src/views/home/inputOutputRatioComponents/operatingTopBar.vue
index affa6eef..d8afea7c 100644
--- a/src/views/home/inputOutputRatioComponents/operatingTopBar.vue
+++ b/src/views/home/inputOutputRatioComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/inputOutputRatioComponents/verticalBarChart.vue b/src/views/home/inputOutputRatioComponents/verticalBarChart.vue
index 03f29309..0ed4bba3 100644
--- a/src/views/home/inputOutputRatioComponents/verticalBarChart.vue
+++ b/src/views/home/inputOutputRatioComponents/verticalBarChart.vue
@@ -145,7 +145,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
// 固定label尺寸:68px×20px
width: 68,
height: 20,
diff --git a/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue b/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue
index 2f641e04..7269910f 100644
--- a/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue
+++ b/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue
@@ -75,7 +75,7 @@ export default {
months: [], // 月份数组(x轴标签)
rates: [], // 完成率(completeRate)
reals: [], // 实际值(real)
- targets: [], // 目标值(target)
+ targets: [], // 预算值(target)
flags: [], // 达标状态
diffs: [],
};
@@ -152,7 +152,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
@@ -168,7 +168,7 @@ export default {
borderRadius: [4, 4, 0, 0],
borderWidth: 0
},
- data: targets, // 动态目标值
+ data: targets, // 动态预算值
},
// 3. 实际(柱状图,含达标状态)
{
diff --git a/src/views/home/netPriceAnalysisComponents/operatingBar.vue b/src/views/home/netPriceAnalysisComponents/operatingBar.vue
index ad4ef5b5..1f484a89 100644
--- a/src/views/home/netPriceAnalysisComponents/operatingBar.vue
+++ b/src/views/home/netPriceAnalysisComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/netPriceAnalysisComponents/operatingLineBarSale.vue b/src/views/home/netPriceAnalysisComponents/operatingLineBarSale.vue
index e2a27183..f95b7a6e 100644
--- a/src/views/home/netPriceAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/netPriceAnalysisComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: '元',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/netPriceAnalysisComponents/operatingLineBarSaleGroup.vue b/src/views/home/netPriceAnalysisComponents/operatingLineBarSaleGroup.vue
index 586d1ffd..d87d2da8 100644
--- a/src/views/home/netPriceAnalysisComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/netPriceAnalysisComponents/operatingLineBarSaleGroup.vue
@@ -111,7 +111,7 @@ export default {
// 左侧Y轴:营业收入、成本(单位万元)
{
type: 'value',
- name: '万元',
+ name: '元',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/netPriceAnalysisComponents/operatingLineChart.vue b/src/views/home/netPriceAnalysisComponents/operatingLineChart.vue
index 76658b6b..779a0021 100644
--- a/src/views/home/netPriceAnalysisComponents/operatingLineChart.vue
+++ b/src/views/home/netPriceAnalysisComponents/operatingLineChart.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/netPriceAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/netPriceAnalysisComponents/operatingLineChartCumulative.vue
index 8ba97c58..7e874244 100644
--- a/src/views/home/netPriceAnalysisComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/netPriceAnalysisComponents/operatingLineChartCumulative.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue b/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue
index 2dde124d..a8e3e21e 100644
--- a/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue
+++ b/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue b/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue
index f6a58307..79ee50ca 100644
--- a/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue
+++ b/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue
@@ -107,7 +107,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,
diff --git a/src/views/home/operatingComponents/operatingBar.vue b/src/views/home/operatingComponents/operatingBar.vue
index 19ec7820..411b1c12 100644
--- a/src/views/home/operatingComponents/operatingBar.vue
+++ b/src/views/home/operatingComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/operatingComponents/operatingLineChart.vue b/src/views/home/operatingComponents/operatingLineChart.vue
index 72efe977..64c6ba20 100644
--- a/src/views/home/operatingComponents/operatingLineChart.vue
+++ b/src/views/home/operatingComponents/operatingLineChart.vue
@@ -102,7 +102,7 @@ export default {
this.groupData = this.monthData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -135,7 +135,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/operatingComponents/operatingLineChartCumulative.vue b/src/views/home/operatingComponents/operatingLineChartCumulative.vue
index 4b9f03c5..14a470b4 100644
--- a/src/views/home/operatingComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/operatingComponents/operatingLineChartCumulative.vue
@@ -98,7 +98,7 @@ export default {
this.groupData = this.ytdData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -131,7 +131,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/operatingComponents/operatingTopBar.vue b/src/views/home/operatingComponents/operatingTopBar.vue
index affa6eef..d8afea7c 100644
--- a/src/views/home/operatingComponents/operatingTopBar.vue
+++ b/src/views/home/operatingComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/operatingComponents/verticalBarChart.vue b/src/views/home/operatingComponents/verticalBarChart.vue
index 080056f2..7cd3406c 100644
--- a/src/views/home/operatingComponents/verticalBarChart.vue
+++ b/src/views/home/operatingComponents/verticalBarChart.vue
@@ -145,7 +145,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
// 固定label尺寸:68px×20px
width: 68,
height: 20,
diff --git a/src/views/home/operatingProfitComponents/dataTrend.vue b/src/views/home/operatingProfitComponents/dataTrend.vue
index 59e6af45..7f07e5b8 100644
--- a/src/views/home/operatingProfitComponents/dataTrend.vue
+++ b/src/views/home/operatingProfitComponents/dataTrend.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/operatingProfitComponents/dataTrendBar.vue b/src/views/home/operatingProfitComponents/dataTrendBar.vue
index f6235a43..2d39ef62 100644
--- a/src/views/home/operatingProfitComponents/dataTrendBar.vue
+++ b/src/views/home/operatingProfitComponents/dataTrendBar.vue
@@ -120,7 +120,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/operatingProfitComponents/operatingBar.vue b/src/views/home/operatingProfitComponents/operatingBar.vue
index ce1ec1b2..cccc5a8b 100644
--- a/src/views/home/operatingProfitComponents/operatingBar.vue
+++ b/src/views/home/operatingProfitComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/operatingProfitComponents/operatingLineChart.vue b/src/views/home/operatingProfitComponents/operatingLineChart.vue
index 7c6babb6..d56bb9a5 100644
--- a/src/views/home/operatingProfitComponents/operatingLineChart.vue
+++ b/src/views/home/operatingProfitComponents/operatingLineChart.vue
@@ -71,7 +71,7 @@ export default {
topBarData: { // levelId=1的整合数据
locations: [], // 固定为["凯盛新能"]
diff: [], // 差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
@@ -79,7 +79,7 @@ export default {
barData: { // levelId≠1的整合数据
locations: [], // levelId对应的baseIndexToNameMap中的地名
diff: [], // 对应差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
diff --git a/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue b/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue
index eac4095a..6726ba86 100644
--- a/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/operatingProfitComponents/operatingLineChartCumulative.vue
@@ -71,7 +71,7 @@ export default {
topBarData: { // levelId=1的整合数据
locations: [], // 固定为["凯盛新能"]
diff: [], // 差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
@@ -79,7 +79,7 @@ export default {
barData: { // levelId≠1的整合数据
locations: [], // levelId对应的baseIndexToNameMap中的地名
diff: [], // 对应差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
diff --git a/src/views/home/operatingProfitComponents/operatingTopBar.vue b/src/views/home/operatingProfitComponents/operatingTopBar.vue
index 13134cc0..02d552cb 100644
--- a/src/views/home/operatingProfitComponents/operatingTopBar.vue
+++ b/src/views/home/operatingProfitComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/operatingProfitComponents/verticalBarChart.vue b/src/views/home/operatingProfitComponents/verticalBarChart.vue
index 02d55ba0..60378661 100644
--- a/src/views/home/operatingProfitComponents/verticalBarChart.vue
+++ b/src/views/home/operatingProfitComponents/verticalBarChart.vue
@@ -108,7 +108,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,
diff --git a/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue b/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue
index 7fcad202..ca2131a7 100644
--- a/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue
+++ b/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue
@@ -77,7 +77,7 @@ export default {
months: [], // 月份数组(x轴标签)
rates: [], // 完成率(completeRate)
reals: [], // 实际值(real)
- targets: [], // 目标值(target)
+ targets: [], // 预算值(target)
flags: [], // 达标状态
diffs: [],
};
@@ -155,7 +155,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
@@ -171,7 +171,7 @@ export default {
borderRadius: [4, 4, 0, 0],
borderWidth: 0
},
- data: targets, // 动态目标值
+ data: targets, // 动态预算值
},
// 3. 实际(柱状图,含达标状态)
{
diff --git a/src/views/home/procurementGainAnalysisComponents/operatingBar.vue b/src/views/home/procurementGainAnalysisComponents/operatingBar.vue
index ad4ef5b5..1f484a89 100644
--- a/src/views/home/procurementGainAnalysisComponents/operatingBar.vue
+++ b/src/views/home/procurementGainAnalysisComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/procurementGainAnalysisComponents/operatingLineChart.vue b/src/views/home/procurementGainAnalysisComponents/operatingLineChart.vue
index 76658b6b..779a0021 100644
--- a/src/views/home/procurementGainAnalysisComponents/operatingLineChart.vue
+++ b/src/views/home/procurementGainAnalysisComponents/operatingLineChart.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/procurementGainAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/procurementGainAnalysisComponents/operatingLineChartCumulative.vue
index 8ba97c58..7e874244 100644
--- a/src/views/home/procurementGainAnalysisComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/procurementGainAnalysisComponents/operatingLineChartCumulative.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue b/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue
index f6a58307..79ee50ca 100644
--- a/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue
+++ b/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue
@@ -107,7 +107,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,
diff --git a/src/views/home/productionCostAnalysis/originalSheetCost.vue b/src/views/home/productionCostAnalysis/originalSheetCost.vue
index cfeb5cec..6ea260e9 100644
--- a/src/views/home/productionCostAnalysis/originalSheetCost.vue
+++ b/src/views/home/productionCostAnalysis/originalSheetCost.vue
@@ -16,7 +16,7 @@
gap: 12px;
grid-template-columns:1624px;
">
-
+
@@ -25,7 +25,8 @@
gap: 12px;
grid-template-columns: 1624px;
">
-
+
diff --git a/src/views/home/productionCostAnalysis/processingCostAnalysis.vue b/src/views/home/productionCostAnalysis/processingCostAnalysis.vue
index 99dd00b4..b2a48349 100644
--- a/src/views/home/productionCostAnalysis/processingCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/processingCostAnalysis.vue
@@ -16,7 +16,7 @@
gap: 12px;
grid-template-columns:1624px;
">
-
+
@@ -25,7 +25,8 @@
gap: 12px;
grid-template-columns: 1624px;
">
-
+
diff --git a/src/views/home/productionCostAnalysis/productionCostAnalysis.vue b/src/views/home/productionCostAnalysis/productionCostAnalysis.vue
index cabfefb0..a7e616a3 100644
--- a/src/views/home/productionCostAnalysis/productionCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/productionCostAnalysis.vue
@@ -16,7 +16,7 @@
gap: 12px;
grid-template-columns:1624px;
">
-
+
@@ -25,7 +25,7 @@
gap: 12px;
grid-template-columns: 1624px;
">
-
+
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrend.vue b/src/views/home/productionCostAnalysisComponents/dataTrend.vue
index 7f47f83f..80ec8679 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrend.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrend.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue
index 33ddc538..140c966e 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue
@@ -119,7 +119,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue
index 40b7b0d4..2b6b335f 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue
@@ -117,7 +117,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue
index 245517be..6384e5a5 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue
@@ -118,7 +118,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue
index 1e9a2965..e9bf1b5d 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue
@@ -119,7 +119,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue
index 46af9d71..8fff78c6 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue
@@ -117,7 +117,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue
index 4f8bb405..1f6641d9 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue
@@ -117,7 +117,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue
index dea09c1b..84a1c458 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue
@@ -119,7 +119,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue
index fac6886a..953841c8 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue
@@ -116,7 +116,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue
index b0e475f5..8fae1798 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue
@@ -120,7 +120,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue
index cb5fcd90..c9f43030 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue
@@ -116,7 +116,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue
index 9d72f968..1517a1d7 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue
@@ -118,7 +118,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue
index c20428e9..e887e16a 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue
@@ -117,7 +117,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendCombustible.vue b/src/views/home/productionCostAnalysisComponents/dataTrendCombustible.vue
index 0ed554d6..5c942417 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendCombustible.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendCombustible.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendFactoryBurden.vue b/src/views/home/productionCostAnalysisComponents/dataTrendFactoryBurden.vue
index 49df47fb..cce6517d 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendFactoryBurden.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendFactoryBurden.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendFuel.vue
index d405373e..81b3f30c 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendFuel.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendPro.vue b/src/views/home/productionCostAnalysisComponents/dataTrendPro.vue
index 19fda49c..79d3efe0 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendPro.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendPro.vue
@@ -44,7 +44,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendProcAuxMat.vue b/src/views/home/productionCostAnalysisComponents/dataTrendProcAuxMat.vue
index e5cebb16..bf751179 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendProcAuxMat.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendProcAuxMat.vue
@@ -44,7 +44,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendProcess.vue b/src/views/home/productionCostAnalysisComponents/dataTrendProcess.vue
index 93d9ed3e..52d787ff 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendProcess.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendProcess.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingFuel.vue
index 30084c98..cc4109d3 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingFuel.vue
@@ -44,7 +44,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue
index 0ec3dd22..06b14f6b 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendProduct.vue b/src/views/home/productionCostAnalysisComponents/dataTrendProduct.vue
index 36340ee4..b5119493 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendProduct.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendProduct.vue
@@ -44,7 +44,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendSingleCombustible.vue b/src/views/home/productionCostAnalysisComponents/dataTrendSingleCombustible.vue
index cbc6fa91..b31294c2 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendSingleCombustible.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendSingleCombustible.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendSingleFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendSingleFuel.vue
index b901fd39..a9544024 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendSingleFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendSingleFuel.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/productionCostAnalysisComponents/operatingBar.vue b/src/views/home/productionCostAnalysisComponents/operatingBar.vue
index 9c126156..b38c4d9a 100644
--- a/src/views/home/productionCostAnalysisComponents/operatingBar.vue
+++ b/src/views/home/productionCostAnalysisComponents/operatingBar.vue
@@ -39,7 +39,8 @@
-
+
@@ -51,7 +52,7 @@ import * as echarts from 'echarts';
export default {
name: "Container",
components: { operatingLineBar },
- props: ["chartData", 'baseUrl','dateData'],
+ props: ["chartData", 'baseUrl', 'dateData','yName'],
emits: ['sort-change'], // 声明事件(Vue3 推荐)
data() {
return {
@@ -95,10 +96,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/productionCostAnalysisComponents/operatingLineBarSale.vue b/src/views/home/productionCostAnalysisComponents/operatingLineBarSale.vue
index 5c75058d..b007c225 100644
--- a/src/views/home/productionCostAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/productionCostAnalysisComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: '元/m²',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/productionCostAnalysisComponents/operatingLineBarSaleGroup.vue b/src/views/home/productionCostAnalysisComponents/operatingLineBarSaleGroup.vue
index 586d1ffd..5b8181a6 100644
--- a/src/views/home/productionCostAnalysisComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/productionCostAnalysisComponents/operatingLineBarSaleGroup.vue
@@ -21,7 +21,11 @@ export default {
// validator: (value) => {
// return Array.isArray(value.series) && Array.isArray(value.allPlaceNames);
// }
- }
+ },
+ yName: {
+ type: String,
+ default: () => ''
+ },
},
mounted() {
this.$nextTick(() => {
@@ -111,7 +115,7 @@ export default {
// 左侧Y轴:营业收入、成本(单位万元)
{
type: 'value',
- name: '万元',
+ name: this.yName,
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/productionCostAnalysisComponents/operatingLineChart.vue b/src/views/home/productionCostAnalysisComponents/operatingLineChart.vue
index 19d42318..affeae29 100644
--- a/src/views/home/productionCostAnalysisComponents/operatingLineChart.vue
+++ b/src/views/home/productionCostAnalysisComponents/operatingLineChart.vue
@@ -20,7 +20,7 @@
">
集团情况
-
+
-
+
@@ -64,6 +64,10 @@ export default {
type: Object,
default: () => {},
},
+ yName: {
+ type: String,
+ default: () => '',
+ },
baseUrl: {
type: String,
default: () => '',
@@ -75,7 +79,7 @@ export default {
topBarData: { // levelId=1的整合数据
locations: [], // 固定为["凯盛新能"]
diff: [], // 差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
@@ -83,7 +87,7 @@ export default {
barData: { // levelId≠1的整合数据
locations: [], // levelId对应的baseIndexToNameMap中的地名
diff: [], // 对应差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
diff --git a/src/views/home/productionCostAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/productionCostAnalysisComponents/operatingLineChartCumulative.vue
index 94eafe66..5bc0faf6 100644
--- a/src/views/home/productionCostAnalysisComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/productionCostAnalysisComponents/operatingLineChartCumulative.vue
@@ -20,7 +20,7 @@
">
集团情况
-
+
-
+
@@ -64,6 +64,10 @@ export default {
type: Object,
default: () => {},
},
+ yName: {
+ type: String,
+ default: () => '',
+ },
baseUrl: {
type: String,
default: () => '',
@@ -75,7 +79,7 @@ export default {
topBarData: { // levelId=1的整合数据
locations: [], // 固定为["凯盛新能"]
diff: [], // 差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
@@ -83,7 +87,7 @@ export default {
barData: { // levelId≠1的整合数据
locations: [], // levelId对应的baseIndexToNameMap中的地名
diff: [], // 对应差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
diff --git a/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue b/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue
index 13134cc0..6d9c2b41 100644
--- a/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue
+++ b/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue
@@ -1,7 +1,7 @@
@@ -13,7 +13,7 @@ import * as echarts from 'echarts';
export default {
name: "Container",
components: { operatingLineBar },
- props: ["chartData"],
+ props: ["chartData",'yName'],
data() {
return {
activeButton: 0,
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/productionCostAnalysisComponents/productionOperatingLineBarSale.vue b/src/views/home/productionCostAnalysisComponents/productionOperatingLineBarSale.vue
index 7bfeeb98..8650ae2b 100644
--- a/src/views/home/productionCostAnalysisComponents/productionOperatingLineBarSale.vue
+++ b/src/views/home/productionCostAnalysisComponents/productionOperatingLineBarSale.vue
@@ -29,6 +29,10 @@ export default {
type: Object,
default: () => ({}),
},
+ yName: {
+ type: String,
+ default: () => '',
+ },
baseUrl: {
type: String,
default: () => '',
@@ -157,7 +161,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: this.yName,
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue b/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue
index 02d55ba0..60378661 100644
--- a/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue
+++ b/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue
@@ -108,7 +108,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,
diff --git a/src/views/home/rawSheetYieldComponents/operatingBar.vue b/src/views/home/rawSheetYieldComponents/operatingBar.vue
index 19ec7820..411b1c12 100644
--- a/src/views/home/rawSheetYieldComponents/operatingBar.vue
+++ b/src/views/home/rawSheetYieldComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/rawSheetYieldComponents/operatingLineBarSale.vue b/src/views/home/rawSheetYieldComponents/operatingLineBarSale.vue
index 21e26241..0f2ea07d 100644
--- a/src/views/home/rawSheetYieldComponents/operatingLineBarSale.vue
+++ b/src/views/home/rawSheetYieldComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: '%',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/rawSheetYieldComponents/operatingLineBarSaleGroup.vue b/src/views/home/rawSheetYieldComponents/operatingLineBarSaleGroup.vue
index edba9c35..0190a5cf 100644
--- a/src/views/home/rawSheetYieldComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/rawSheetYieldComponents/operatingLineBarSaleGroup.vue
@@ -103,7 +103,7 @@ export default {
],
yAxis: {
type: 'value',
- name: '万元',
+ name: '%',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/rawSheetYieldComponents/operatingLineChart.vue b/src/views/home/rawSheetYieldComponents/operatingLineChart.vue
index 9ddc778d..547a3ead 100644
--- a/src/views/home/rawSheetYieldComponents/operatingLineChart.vue
+++ b/src/views/home/rawSheetYieldComponents/operatingLineChart.vue
@@ -102,7 +102,7 @@ export default {
this.groupData = this.monthData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -135,7 +135,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/rawSheetYieldComponents/operatingLineChartCumulative.vue b/src/views/home/rawSheetYieldComponents/operatingLineChartCumulative.vue
index 76fa772c..c9145bbb 100644
--- a/src/views/home/rawSheetYieldComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/rawSheetYieldComponents/operatingLineChartCumulative.vue
@@ -96,7 +96,7 @@ export default {
this.groupData = this.ytdData.group || { rate: 0, diff: 0, real: 0, target: 0 };
// 集团各维度数据数组(单条数据,对应凯盛新能)
- const groupTarget = [this.groupData.target]; // 目标值数组
+ const groupTarget = [this.groupData.target]; // 预算值数组
const groupDiff = [this.groupData.diff]; // 差值数组
const groupReal = [this.groupData.real]; // 实际值数组
const groupRate = [this.groupData.rate]; // 完成率数组
@@ -129,7 +129,7 @@ export default {
// 集团数据(对应凯盛新能)
group: {
locations: ['凯盛新能'], // 集团名称
- targets: groupTarget, // 集团目标值数组
+ targets: groupTarget, // 集团预算值数组
diff: groupDiff, // 集团差值数组
reals: groupReal, // 集团实际值数组
rate: groupRate, // 集团完成率数组
diff --git a/src/views/home/rawSheetYieldComponents/verticalBarChart.vue b/src/views/home/rawSheetYieldComponents/verticalBarChart.vue
index 03f29309..0ed4bba3 100644
--- a/src/views/home/rawSheetYieldComponents/verticalBarChart.vue
+++ b/src/views/home/rawSheetYieldComponents/verticalBarChart.vue
@@ -145,7 +145,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
// 固定label尺寸:68px×20px
width: 68,
height: 20,
diff --git a/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue b/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue
index 1f4e9061..0b745bb9 100644
--- a/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue
@@ -77,7 +77,7 @@ export default {
months: [], // 月份数组(x轴标签)
rates: [], // 完成率(completeRate)
reals: [], // 实际值(real)
- targets: [], // 目标值(target)
+ targets: [], // 预算值(target)
flags: [], // 达标状态
diffs: [],
};
@@ -155,7 +155,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
@@ -171,7 +171,7 @@ export default {
borderRadius: [4, 4, 0, 0],
borderWidth: 0
},
- data: targets, // 动态目标值
+ data: targets, // 动态预算值
},
// 3. 实际(柱状图,含达标状态)
{
diff --git a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue
index fb76c23d..50659f5e 100644
--- a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue
@@ -77,7 +77,7 @@ export default {
months: [], // 月份数组(x轴标签)
rates: [], // 完成率(completeRate)
reals: [], // 实际值(real)
- targets: [], // 目标值(target)
+ targets: [], // 预算值(target)
flags: [], // 达标状态
diffs: [],
};
@@ -157,7 +157,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
@@ -173,7 +173,7 @@ export default {
borderRadius: [4, 4, 0, 0],
borderWidth: 0
},
- data: targets, // 动态目标值
+ data: targets, // 动态预算值
},
// 3. 实际(柱状图,含达标状态)
{
diff --git a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue
index bb803ab9..4630394d 100644
--- a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue
@@ -76,7 +76,7 @@ export default {
months: [], // 月份数组(x轴标签)
rates: [], // 完成率(completeRate)
reals: [], // 实际值(real)
- targets: [], // 目标值(target)
+ targets: [], // 预算值(target)
flags: [], // 达标状态
diffs: [],
};
@@ -157,7 +157,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
@@ -173,7 +173,7 @@ export default {
borderRadius: [4, 4, 0, 0],
borderWidth: 0
},
- data: targets, // 动态目标值
+ data: targets, // 动态预算值
},
// 3. 实际(柱状图,含达标状态)
{
diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue b/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue
index ad4ef5b5..1f484a89 100644
--- a/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSale.vue b/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSale.vue
index 18ef8075..aa927068 100644
--- a/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '万元',
+ name: '万m2',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSaleGroup.vue b/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSaleGroup.vue
index 586d1ffd..e6eb3920 100644
--- a/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/operatingLineBarSaleGroup.vue
@@ -111,7 +111,7 @@ export default {
// 左侧Y轴:营业收入、成本(单位万元)
{
type: 'value',
- name: '万元',
+ name: '万m2',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingLineChart.vue b/src/views/home/salesVolumeAnalysisComponents/operatingLineChart.vue
index c84a06b8..238a41fa 100644
--- a/src/views/home/salesVolumeAnalysisComponents/operatingLineChart.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/operatingLineChart.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/salesVolumeAnalysisComponents/operatingLineChartCumulative.vue
index 8ba97c58..7e874244 100644
--- a/src/views/home/salesVolumeAnalysisComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/operatingLineChartCumulative.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue b/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue
index 2dde124d..a8e3e21e 100644
--- a/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue b/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue
index f6a58307..79ee50ca 100644
--- a/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue
+++ b/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue
@@ -107,7 +107,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,
diff --git a/src/views/home/totalProfitComponents/dataTrend.vue b/src/views/home/totalProfitComponents/dataTrend.vue
index 7f47f83f..80ec8679 100644
--- a/src/views/home/totalProfitComponents/dataTrend.vue
+++ b/src/views/home/totalProfitComponents/dataTrend.vue
@@ -45,7 +45,7 @@ export default {
const timeArr = []; // 格式化后的年月数组
const valueArr = []; // 实际值数组
const diffValueArr = []; // 差异值数组
- const targetValueArr = []; // 目标值数组
+ const targetValueArr = []; // 预算值数组
const proportionArr = []; // 占比数组
const completedArr = []; // 完成率数组
diff --git a/src/views/home/totalProfitComponents/dataTrendBar.vue b/src/views/home/totalProfitComponents/dataTrendBar.vue
index c035c27e..db39525f 100644
--- a/src/views/home/totalProfitComponents/dataTrendBar.vue
+++ b/src/views/home/totalProfitComponents/dataTrendBar.vue
@@ -121,7 +121,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
diff --git a/src/views/home/totalProfitComponents/operatingBar.vue b/src/views/home/totalProfitComponents/operatingBar.vue
index ce1ec1b2..cccc5a8b 100644
--- a/src/views/home/totalProfitComponents/operatingBar.vue
+++ b/src/views/home/totalProfitComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/totalProfitComponents/operatingLineChart.vue b/src/views/home/totalProfitComponents/operatingLineChart.vue
index f520a536..6169515c 100644
--- a/src/views/home/totalProfitComponents/operatingLineChart.vue
+++ b/src/views/home/totalProfitComponents/operatingLineChart.vue
@@ -71,7 +71,7 @@ export default {
topBarData: { // levelId=1的整合数据
locations: [], // 固定为["凯盛新能"]
diff: [], // 差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
@@ -79,7 +79,7 @@ export default {
barData: { // levelId≠1的整合数据
locations: [], // levelId对应的baseIndexToNameMap中的地名
diff: [], // 对应差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
diff --git a/src/views/home/totalProfitComponents/operatingLineChartCumulative.vue b/src/views/home/totalProfitComponents/operatingLineChartCumulative.vue
index 981774b0..fec2b978 100644
--- a/src/views/home/totalProfitComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/totalProfitComponents/operatingLineChartCumulative.vue
@@ -71,7 +71,7 @@ export default {
topBarData: { // levelId=1的整合数据
locations: [], // 固定为["凯盛新能"]
diff: [], // 差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
@@ -79,7 +79,7 @@ export default {
barData: { // levelId≠1的整合数据
locations: [], // levelId对应的baseIndexToNameMap中的地名
diff: [], // 对应差值数组
- targets: [], // 目标值数组
+ targets: [], // 预算值数组
reals: [], // 实际值数组
rate: [], // 完成率数组
flags: [] // 完成状态数组(0/1)
diff --git a/src/views/home/totalProfitComponents/operatingTopBar.vue b/src/views/home/totalProfitComponents/operatingTopBar.vue
index 13134cc0..02d552cb 100644
--- a/src/views/home/totalProfitComponents/operatingTopBar.vue
+++ b/src/views/home/totalProfitComponents/operatingTopBar.vue
@@ -270,7 +270,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/totalProfitComponents/verticalBarChart.vue b/src/views/home/totalProfitComponents/verticalBarChart.vue
index 02d55ba0..60378661 100644
--- a/src/views/home/totalProfitComponents/verticalBarChart.vue
+++ b/src/views/home/totalProfitComponents/verticalBarChart.vue
@@ -108,7 +108,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,
diff --git a/src/views/home/unitPriceAnalysisComponents/dataTrendBar.vue b/src/views/home/unitPriceAnalysisComponents/dataTrendBar.vue
index a09428a1..e0a70470 100644
--- a/src/views/home/unitPriceAnalysisComponents/dataTrendBar.vue
+++ b/src/views/home/unitPriceAnalysisComponents/dataTrendBar.vue
@@ -65,8 +65,8 @@ export default {
profitOptions: [
'实际值:高~低',
'实际值:低~高',
- '目标值:高~低',
- '目标值:低~高',
+ '预算值:高~低',
+ '预算值:低~高',
]
};
@@ -122,7 +122,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0, // 左侧Y轴(万元)
barWidth: 14,
@@ -205,7 +205,7 @@ export default {
},
// 2. 目标(柱状图)
{
- name: '目标',
+ name: '预算',
type: 'bar',
yAxisIndex: 0,
barWidth: 14,
diff --git a/src/views/home/unitPriceAnalysisComponents/operatingBar.vue b/src/views/home/unitPriceAnalysisComponents/operatingBar.vue
index ad4ef5b5..1f484a89 100644
--- a/src/views/home/unitPriceAnalysisComponents/operatingBar.vue
+++ b/src/views/home/unitPriceAnalysisComponents/operatingBar.vue
@@ -95,10 +95,10 @@ export default {
case 2: // 实际值:低~高
dataWithIndex.sort((a, b) => a.real - b.real);
break;
- case 3: // 目标值:高~低
+ case 3: // 预算值:高~低
dataWithIndex.sort((a, b) => b.rate - a.rate);
break;
- case 4: // 目标值:低~高
+ case 4: // 预算值:低~高
dataWithIndex.sort((a, b) => a.rate - b.rate);
break;
default:
diff --git a/src/views/home/unitPriceAnalysisComponents/operatingLineBarSale.vue b/src/views/home/unitPriceAnalysisComponents/operatingLineBarSale.vue
index ba6f6c45..c7e0f9d5 100644
--- a/src/views/home/unitPriceAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/unitPriceAnalysisComponents/operatingLineBarSale.vue
@@ -153,7 +153,7 @@ export default {
yAxis: [
{
type: 'value',
- name: '单位/万㎡',
+ name: '元',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/unitPriceAnalysisComponents/operatingLineBarSaleGroup.vue b/src/views/home/unitPriceAnalysisComponents/operatingLineBarSaleGroup.vue
index 8b220958..967b130d 100644
--- a/src/views/home/unitPriceAnalysisComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/unitPriceAnalysisComponents/operatingLineBarSaleGroup.vue
@@ -111,7 +111,7 @@ export default {
// 左侧Y轴:营业收入、成本(单位万元)
{
type: 'value',
- name: '万元',
+ name: '元',
nameTextStyle: {
color: 'rgba(0, 0, 0, 0.45)',
fontSize: 12,
diff --git a/src/views/home/unitPriceAnalysisComponents/operatingLineChart.vue b/src/views/home/unitPriceAnalysisComponents/operatingLineChart.vue
index 76658b6b..779a0021 100644
--- a/src/views/home/unitPriceAnalysisComponents/operatingLineChart.vue
+++ b/src/views/home/unitPriceAnalysisComponents/operatingLineChart.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/unitPriceAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/unitPriceAnalysisComponents/operatingLineChartCumulative.vue
index 8ba97c58..7e874244 100644
--- a/src/views/home/unitPriceAnalysisComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/unitPriceAnalysisComponents/operatingLineChartCumulative.vue
@@ -116,7 +116,7 @@ export default {
// 3. 组装工厂chartData(格式与集团一致,适配子组件)
this.chartData = {
locations: factoryKeys, // 工厂名称数组
- targets: factoryDataList.map(item => item.target || 0), // 目标值
+ targets: factoryDataList.map(item => item.target || 0), // 预算值
diff: factoryDataList.map(item => item.diff || 0), // 差值
reals: factoryDataList.map(item => item.real || 0), // 实际值
rates: factoryDataList.map(item => item.completeRate || 0), // 完成率
diff --git a/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue b/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue
index 2a64154d..5bda6f30 100644
--- a/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue
+++ b/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue
@@ -51,8 +51,8 @@ export default {
// profitOptions: [
// '实际值:高~低',
// '实际值:低~高',
- // '目标值:高~低',
- // '目标值:低~高',
+ // '预算值:高~低',
+ // '预算值:低~高',
// ]
};
diff --git a/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue b/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue
index f6a58307..79ee50ca 100644
--- a/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue
+++ b/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue
@@ -107,7 +107,7 @@ export default {
label: {
show: true,
position: 'right',
- offset: [-60, 25],
+ offset: [0, 25],
width: 68,
height: 20,
formatter: `{rate|${diffValue}}{text|差值}`,