mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改

Browse Source
This commit is contained in:
‘937886381’
2026-01-09 17:53:34 +08:00
parent b76f3bfd37
commit b491f24126
50 changed files with 256 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/home/grossMarginComponents/dataTrendBar.vue
View File

@@ -64,7 +64,7 @@ export default {
selectedProfit: null, // 选中的名称，初始为null
profitOptions: [
'毛利率',
'收入',
'营业收入',
'全成本',
]
};

8
src/views/home/grossMarginComponents/monthlyRelatedMetrics.vue
View File

@@ -6,7 +6,7 @@
<!-- 累计指标1 -->
<div class="dashboard left" @click="handleDashboardClick('/operatingRevenue/operatingRevenueBase')">
<div class="title">
收入·万元
营业收入·万元
</div>
<div class="chart-wrap">
<operatingSingleBar :detailData="ytdIncomeData"></operatingSingleBar>
@@ -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字段

28
src/views/home/grossMarginComponents/yearRelatedMetrics.vue
View File

@@ -6,7 +6,7 @@
<!-- 收入模块（传递整合了flag的incomeData） -->
<div class="dashboard left" @click="handleDashboardClick('/operatingRevenue/operatingRevenueBase')">
<div class="title">
收入·万元
营业收入·万元
</div>
<div class="chart-wrap">
<operatingSingleBar :detailData="incomeData"></operatingSingleBar>
@@ -15,7 +15,7 @@
<!-- 全成本模块（传递整合了flag的totalCostData） -->
<div class="dashboard right" @click="handleDashboardClick('/fullCostAnalysis/fullCostAnalysisBase')">
<div class="title">
全成本·万元
全成本·元/㎡
</div>
<div class="chart-wrap">
<operatingSingleBar :detailData="totalCostData"></operatingSingleBar>
@@ -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字段到收入/全成本数据中