diff --git a/.env.dev b/.env.dev index a5e7dc35..c4e944c2 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/dist.zip b/dist.zip deleted file mode 100644 index b2a699e7..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index be3285df..d934dac0 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -17,7 +17,7 @@ export default { const vnodes = [] if (icon) { - vnodes.push() + vnodes.push() } if (title) { diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index c348068a..48949fa7 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -1,19 +1,12 @@ diff --git a/src/views/home/components/Header.vue b/src/views/home/components/Header.vue index 36809742..62904417 100644 --- a/src/views/home/components/Header.vue +++ b/src/views/home/components/Header.vue @@ -102,7 +102,15 @@ export default { // 计算当月第一天00:00:00的时间戳 startTime = targetMoment.startOf('month').valueOf(); // 计算当月最后一天23:59:59的时间戳 - endTime = targetMoment.endOf('month').valueOf(); + endTime = targetMoment.clone() + .endOf('month') + .set({ + hour: 23, + minute: 59, + second: 59, + millisecond: 0 // 毫秒设为0 + }) + .valueOf(); // 调试输出 console.log('月份时间范围计算结果:', { diff --git a/src/views/home/components/noRouterHeader.vue b/src/views/home/components/noRouterHeader.vue index a7539327..1800fa78 100644 --- a/src/views/home/components/noRouterHeader.vue +++ b/src/views/home/components/noRouterHeader.vue @@ -132,7 +132,15 @@ export default { // 计算当月第一天00:00:00的时间戳 startTime = targetMoment.startOf('month').valueOf(); // 计算当月最后一天23:59:59的时间戳 - endTime = targetMoment.endOf('month').valueOf(); + endTime = targetMoment.clone() + .endOf('month') + .set({ + hour: 23, + minute: 59, + second: 59, + millisecond: 0 // 毫秒设为0 + }) + .valueOf(); // 调试输出 console.log('月份时间范围计算结果:', { diff --git a/src/views/home/components/purchase-Item.vue b/src/views/home/components/purchase-Item.vue index f76f8373..184562ab 100644 --- a/src/views/home/components/purchase-Item.vue +++ b/src/views/home/components/purchase-Item.vue @@ -89,29 +89,42 @@ export default { }, methods: { // 解析rate字符串,提取百分比数值 - parseRateString(rateStr) { - if (!rateStr || typeof rateStr !== 'string') { + // 改进的 parseRateString 方法:能处理数字和字符串类型 + parseRateString(rateValue) { + // 如果是 undefined 或 null,返回默认值 + if (rateValue === undefined || rateValue === null) { return { displayText: '0%', progressValue: 0 }; } - // 尝试匹配百分比数字,如"减亏93%"中的93 - const match = rateStr.match(/(\d+(\.\d+)?)%/); - if (match) { - const percentValue = parseFloat(match[1]); + // 如果是数字类型,直接处理 + if (typeof rateValue === 'number') { return { - displayText: rateStr, // 保持原字符串显示 - progressValue: percentValue // 提取的百分比数值用于进度条 + displayText: `${rateValue.toFixed(2)}%`, + progressValue: Math.min(Math.max(rateValue, 0), 100) }; } - // 如果没有匹配到百分比,尝试解析纯数字 - const numMatch = rateStr.match(/\d+(\.\d+)?/); - if (numMatch) { - const numValue = parseFloat(numMatch[0]); - return { - displayText: rateStr, - progressValue: numValue - }; + // 如果是字符串类型,使用正则表达式处理 + if (typeof rateValue === 'string') { + // 尝试匹配百分比数字,如"减亏93%"中的93 + const match = rateValue.match(/(\d+(\.\d+)?)%/); + if (match) { + const percentValue = parseFloat(match[1]); + return { + displayText: rateValue, + progressValue: Math.min(Math.max(percentValue, 0), 100) + }; + } + + // 如果没有匹配到百分比,尝试解析纯数字 + const numMatch = rateValue.match(/\d+(\.\d+)?/); + if (numMatch) { + const numValue = parseFloat(numMatch[0]); + return { + displayText: rateValue, + progressValue: Math.min(Math.max(numValue, 0), 100) + }; + } } // 默认返回 diff --git a/src/views/home/expenseAnalysisComponents/dataTrendBar.vue b/src/views/home/expenseAnalysisComponents/dataTrendBar.vue index 345a991a..c6adc7d1 100644 --- a/src/views/home/expenseAnalysisComponents/dataTrendBar.vue +++ b/src/views/home/expenseAnalysisComponents/dataTrendBar.vue @@ -159,15 +159,15 @@ export default { const currentDiff = diff[params.dataIndex] || 0; const currentFlag = flags[params.dataIndex] || 0; - const prefix = currentFlag === 1 ? '+' : '-'; + // const prefix = currentFlag === 1 ? '+' : '-'; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/expenseAnalysisComponents/operatingBar.vue b/src/views/home/expenseAnalysisComponents/operatingBar.vue index c95f3e7e..41f08736 100644 --- a/src/views/home/expenseAnalysisComponents/operatingBar.vue +++ b/src/views/home/expenseAnalysisComponents/operatingBar.vue @@ -185,15 +185,15 @@ export default { const currentDiff = diff[params.dataIndex] || 0; const currentFlag = flags[params.dataIndex] || 0; - const prefix = currentFlag === 1 ? '+' : '-'; + // const prefix = currentFlag === 1 ? '+' : '-'; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/expenseAnalysisComponents/operatingLineChart.vue b/src/views/home/expenseAnalysisComponents/operatingLineChart.vue index c80cf8dd..6a7b3c07 100644 --- a/src/views/home/expenseAnalysisComponents/operatingLineChart.vue +++ b/src/views/home/expenseAnalysisComponents/operatingLineChart.vue @@ -88,18 +88,18 @@ export default { * @param {number} rate 处理后的rate值(已*100) * @returns {0|1} flag值 */ -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; + }, /** * 核心处理函数:在所有数据都准备好后,才组装 chartData */ diff --git a/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue b/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue index 8d030131..66932b1a 100644 --- a/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue +++ b/src/views/home/expenseAnalysisComponents/operatingLineChartCumulative.vue @@ -84,16 +84,16 @@ export default { * @returns {0|1} flag值 */ getRateFlag(rate, real, target) { - // 先处理无效值的情况 if (isNaN(rate) || rate === null || rate === undefined) return 0; - console.log(rate, real, target) - // 实际值和目标值都为0时,算作达标 - if (real === 0 && target === 0 && rate === 0) { - return 1; // 达标 - } - // 其他情况:rate >= 100 或 rate === 0 时达标 - return (rate >= 100) ? 1 : 0; + // 1. 完成率 >= 100 => 达标 + if (rate >= 100) return 1; + + // 2. 完成率 = 0 且 (目标值=0 或 实际值=目标值=0) => 达标 + if (rate === 0 && target === 0) return 1; + + // 其他情况 => 未达标 + return 0; }, /** * 核心处理函数:在所有数据都准备好后,才组装 chartData diff --git a/src/views/home/expenseAnalysisComponents/operatingSingleBar.vue b/src/views/home/expenseAnalysisComponents/operatingSingleBar.vue index c05b8cfa..88cf05dc 100644 --- a/src/views/home/expenseAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/expenseAnalysisComponents/operatingSingleBar.vue @@ -118,14 +118,14 @@ export default { // const flags = flags || []; const currentDiff = diff || 0; const currentFlag = this.detailData?.flag || 0; - const prefix = currentFlag === 1 ? '+' : '-'; + // const prefix = currentFlag === 1 ? '+' : '-'; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/expenseAnalysisComponents/operatingTopBar.vue b/src/views/home/expenseAnalysisComponents/operatingTopBar.vue index 64e0bd7b..ca7f6fdf 100644 --- a/src/views/home/expenseAnalysisComponents/operatingTopBar.vue +++ b/src/views/home/expenseAnalysisComponents/operatingTopBar.vue @@ -164,14 +164,14 @@ export default { // const flags = flags || []; const currentDiff = diff || 0; const currentFlag = data.flags[0] || 0; - const prefix = currentFlag === 1 ? '+' : '-'; + // const prefix = currentFlag === 1 ? '+' : '-'; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/expenseAnalysisComponents/verticalBarChart.vue b/src/views/home/expenseAnalysisComponents/verticalBarChart.vue index 6268b78f..a2836f2d 100644 --- a/src/views/home/expenseAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/expenseAnalysisComponents/verticalBarChart.vue @@ -163,14 +163,14 @@ getRateFlag(rate, real, target) { // const flags = flags || []; const currentDiff = diff || 0; const currentFlag = flagValue || 0; - const prefix = currentFlag === 1 ? '+' : '-'; + // const prefix = currentFlag === 1 ? '+' : '-'; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue b/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue index f8db212e..8952e3ba 100644 --- a/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue +++ b/src/views/home/fullCostAnalysisComponents/dataTrendBar.vue @@ -196,15 +196,15 @@ export default { const currentFlag = flags[params.dataIndex] || 0; console.log('currentFlag', flags, params.dataIndex); - const prefix = currentFlag === 1 ? '+' : '-'; + // const prefix = currentFlag === 1 ? '+' : '-'; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/fullCostAnalysisComponents/operatingBar.vue b/src/views/home/fullCostAnalysisComponents/operatingBar.vue index 35cdc7a3..c79e33c4 100644 --- a/src/views/home/fullCostAnalysisComponents/operatingBar.vue +++ b/src/views/home/fullCostAnalysisComponents/operatingBar.vue @@ -185,15 +185,15 @@ export default { const currentDiff = diff[params.dataIndex] || 0; const currentFlag = flags[params.dataIndex] || 0; - const prefix = currentFlag === 1 ? '+' : '-'; + // const prefix = currentFlag === 1 ? '+' : '-'; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/fullCostAnalysisComponents/operatingSingleBar.vue b/src/views/home/fullCostAnalysisComponents/operatingSingleBar.vue index 18cd1325..25357471 100644 --- a/src/views/home/fullCostAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/fullCostAnalysisComponents/operatingSingleBar.vue @@ -118,14 +118,14 @@ export default { // const flags = flags || []; const currentDiff = diff || 0; const currentFlag = this.detailData?.flag || 0; - const prefix = currentFlag === 1 ? '+' : ''; + // const prefix = currentFlag === 1 ? '+' : ''; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue b/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue index 63cc4879..a7f47ca6 100644 --- a/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue +++ b/src/views/home/fullCostAnalysisComponents/operatingTopBar.vue @@ -164,14 +164,14 @@ export default { // const flags = flags || []; const currentDiff = diff || 0; const currentFlag = flags[0] || 0; - const prefix = currentFlag === 1 ? '+' : ''; + // const prefix = currentFlag === 1 ? '+' : ''; // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue b/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue index 4b766b32..1dcda271 100644 --- a/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/fullCostAnalysisComponents/verticalBarChart.vue @@ -121,10 +121,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/grossMarginComponents/dataTrendBar.vue b/src/views/home/grossMarginComponents/dataTrendBar.vue index 52df74da..b3689aa8 100644 --- a/src/views/home/grossMarginComponents/dataTrendBar.vue +++ b/src/views/home/grossMarginComponents/dataTrendBar.vue @@ -163,10 +163,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/grossMarginComponents/operatingBar.vue b/src/views/home/grossMarginComponents/operatingBar.vue index c95f3e7e..c47230c0 100644 --- a/src/views/home/grossMarginComponents/operatingBar.vue +++ b/src/views/home/grossMarginComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/grossMarginComponents/operatingSingleBar.vue b/src/views/home/grossMarginComponents/operatingSingleBar.vue index 997f61a4..9d5c551c 100644 --- a/src/views/home/grossMarginComponents/operatingSingleBar.vue +++ b/src/views/home/grossMarginComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/grossMarginComponents/operatingTopBar.vue b/src/views/home/grossMarginComponents/operatingTopBar.vue index a67cae09..db488586 100644 --- a/src/views/home/grossMarginComponents/operatingTopBar.vue +++ b/src/views/home/grossMarginComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/grossMarginComponents/verticalBarChart.vue b/src/views/home/grossMarginComponents/verticalBarChart.vue index 73ae2fc2..9f21d7d3 100644 --- a/src/views/home/grossMarginComponents/verticalBarChart.vue +++ b/src/views/home/grossMarginComponents/verticalBarChart.vue @@ -170,10 +170,10 @@ getRateFlag(rate, real, target) { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/inputOutputRatioComponents/dataTrendBar.vue b/src/views/home/inputOutputRatioComponents/dataTrendBar.vue index ea7607f1..9ca099d5 100644 --- a/src/views/home/inputOutputRatioComponents/dataTrendBar.vue +++ b/src/views/home/inputOutputRatioComponents/dataTrendBar.vue @@ -162,10 +162,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/inputOutputRatioComponents/operatingBar.vue b/src/views/home/inputOutputRatioComponents/operatingBar.vue index c95f3e7e..c47230c0 100644 --- a/src/views/home/inputOutputRatioComponents/operatingBar.vue +++ b/src/views/home/inputOutputRatioComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/inputOutputRatioComponents/operatingSingleBar.vue b/src/views/home/inputOutputRatioComponents/operatingSingleBar.vue index 997f61a4..9d5c551c 100644 --- a/src/views/home/inputOutputRatioComponents/operatingSingleBar.vue +++ b/src/views/home/inputOutputRatioComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/inputOutputRatioComponents/operatingTopBar.vue b/src/views/home/inputOutputRatioComponents/operatingTopBar.vue index fd995cf9..c09d7683 100644 --- a/src/views/home/inputOutputRatioComponents/operatingTopBar.vue +++ b/src/views/home/inputOutputRatioComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/inputOutputRatioComponents/verticalBarChart.vue b/src/views/home/inputOutputRatioComponents/verticalBarChart.vue index 73ae2fc2..9f21d7d3 100644 --- a/src/views/home/inputOutputRatioComponents/verticalBarChart.vue +++ b/src/views/home/inputOutputRatioComponents/verticalBarChart.vue @@ -170,10 +170,10 @@ getRateFlag(rate, real, target) { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue b/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue index d5bc88f5..137d84bf 100644 --- a/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue +++ b/src/views/home/netPriceAnalysisComponents/dataTrendBar.vue @@ -196,10 +196,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/netPriceAnalysisComponents/operatingBar.vue b/src/views/home/netPriceAnalysisComponents/operatingBar.vue index daed7d3a..5eef2aa7 100644 --- a/src/views/home/netPriceAnalysisComponents/operatingBar.vue +++ b/src/views/home/netPriceAnalysisComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/netPriceAnalysisComponents/operatingSingleBar.vue b/src/views/home/netPriceAnalysisComponents/operatingSingleBar.vue index 885e8217..07e2f6aa 100644 --- a/src/views/home/netPriceAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/netPriceAnalysisComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue b/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue index f71cbee2..cbbdd256 100644 --- a/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue +++ b/src/views/home/netPriceAnalysisComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue b/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue index f4013fe7..ad915286 100644 --- a/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/netPriceAnalysisComponents/verticalBarChart.vue @@ -119,10 +119,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingComponents/dataTrendBar.vue b/src/views/home/operatingComponents/dataTrendBar.vue index 4d5946c4..d90620a0 100644 --- a/src/views/home/operatingComponents/dataTrendBar.vue +++ b/src/views/home/operatingComponents/dataTrendBar.vue @@ -162,10 +162,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingComponents/operatingBar.vue b/src/views/home/operatingComponents/operatingBar.vue index 857fca96..69c3b583 100644 --- a/src/views/home/operatingComponents/operatingBar.vue +++ b/src/views/home/operatingComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingComponents/operatingSingleBar.vue b/src/views/home/operatingComponents/operatingSingleBar.vue index 95707826..f07a102e 100644 --- a/src/views/home/operatingComponents/operatingSingleBar.vue +++ b/src/views/home/operatingComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingComponents/operatingTopBar.vue b/src/views/home/operatingComponents/operatingTopBar.vue index fd995cf9..c09d7683 100644 --- a/src/views/home/operatingComponents/operatingTopBar.vue +++ b/src/views/home/operatingComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingComponents/verticalBarChart.vue b/src/views/home/operatingComponents/verticalBarChart.vue index 017a96f0..255b5fd8 100644 --- a/src/views/home/operatingComponents/verticalBarChart.vue +++ b/src/views/home/operatingComponents/verticalBarChart.vue @@ -170,10 +170,10 @@ getRateFlag(rate, real, target) { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingProfitComponents/dataTrendBar.vue b/src/views/home/operatingProfitComponents/dataTrendBar.vue index 81b7d66b..14eeebfc 100644 --- a/src/views/home/operatingProfitComponents/dataTrendBar.vue +++ b/src/views/home/operatingProfitComponents/dataTrendBar.vue @@ -163,10 +163,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingProfitComponents/operatingBar.vue b/src/views/home/operatingProfitComponents/operatingBar.vue index 5bc3a411..5461e6f4 100644 --- a/src/views/home/operatingProfitComponents/operatingBar.vue +++ b/src/views/home/operatingProfitComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingProfitComponents/operatingSingleBar.vue b/src/views/home/operatingProfitComponents/operatingSingleBar.vue index d40214ac..8f970bf5 100644 --- a/src/views/home/operatingProfitComponents/operatingSingleBar.vue +++ b/src/views/home/operatingProfitComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingProfitComponents/operatingTopBar.vue b/src/views/home/operatingProfitComponents/operatingTopBar.vue index a15b54a5..4515f0a6 100644 --- a/src/views/home/operatingProfitComponents/operatingTopBar.vue +++ b/src/views/home/operatingProfitComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/operatingProfitComponents/totalOverview.vue b/src/views/home/operatingProfitComponents/totalOverview.vue index 44b36ae1..22df2ad0 100644 --- a/src/views/home/operatingProfitComponents/totalOverview.vue +++ b/src/views/home/operatingProfitComponents/totalOverview.vue @@ -21,7 +21,7 @@
- +
diff --git a/src/views/home/operatingProfitComponents/verticalBarChart.vue b/src/views/home/operatingProfitComponents/verticalBarChart.vue index d7c129c7..e7df5c3f 100644 --- a/src/views/home/operatingProfitComponents/verticalBarChart.vue +++ b/src/views/home/operatingProfitComponents/verticalBarChart.vue @@ -120,10 +120,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue b/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue index 10debe1c..11286b15 100644 --- a/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue +++ b/src/views/home/procurementGainAnalysisComponents/dataTrendBar.vue @@ -198,10 +198,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/procurementGainAnalysisComponents/operatingBar.vue b/src/views/home/procurementGainAnalysisComponents/operatingBar.vue index 31113db2..2f46e71a 100644 --- a/src/views/home/procurementGainAnalysisComponents/operatingBar.vue +++ b/src/views/home/procurementGainAnalysisComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/procurementGainAnalysisComponents/operatingSingleBar.vue b/src/views/home/procurementGainAnalysisComponents/operatingSingleBar.vue index 885e8217..07e2f6aa 100644 --- a/src/views/home/procurementGainAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/procurementGainAnalysisComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/procurementGainAnalysisComponents/operatingTopBar.vue b/src/views/home/procurementGainAnalysisComponents/operatingTopBar.vue index c604b5a3..fdd29775 100644 --- a/src/views/home/procurementGainAnalysisComponents/operatingTopBar.vue +++ b/src/views/home/procurementGainAnalysisComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue b/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue index f4013fe7..ad915286 100644 --- a/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/procurementGainAnalysisComponents/verticalBarChart.vue @@ -119,10 +119,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue index ba254560..4fc8863e 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue @@ -162,10 +162,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue index e35bed82..bd663193 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue @@ -160,10 +160,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue index 982022b2..7837f9d0 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarFactoryBurden.vue @@ -161,10 +161,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue index 7a1f9fa1..50594cbf 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue @@ -162,10 +162,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue index 1328854a..aff026bd 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarPro.vue @@ -160,10 +160,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue index 7d83379e..339bf85c 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcAuxMat.vue @@ -160,10 +160,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue index 587fa7f6..952ec5ee 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcess.vue @@ -162,10 +162,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue index 7d62c0a1..d12ab0be 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingFuel.vue @@ -159,10 +159,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue index eff264d7..ed339800 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProcessingLabor.vue @@ -163,10 +163,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue index 016dd8f8..892449fd 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue @@ -159,10 +159,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue index e4f45df7..54a87472 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleCombustible.vue @@ -161,10 +161,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue index 92f51809..9521a73d 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue @@ -160,10 +160,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/operatingBar.vue b/src/views/home/productionCostAnalysisComponents/operatingBar.vue index 300f4677..eb031276 100644 --- a/src/views/home/productionCostAnalysisComponents/operatingBar.vue +++ b/src/views/home/productionCostAnalysisComponents/operatingBar.vue @@ -191,10 +191,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue b/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue index e10b8472..5bddb83a 100644 --- a/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/productionCostAnalysisComponents/operatingSingleBar.vue @@ -127,10 +127,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue b/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue index 5242c452..e458a84f 100644 --- a/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue +++ b/src/views/home/productionCostAnalysisComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue b/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue index d7c129c7..e7df5c3f 100644 --- a/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/productionCostAnalysisComponents/verticalBarChart.vue @@ -120,10 +120,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/rawSheetYieldComponents/dataTrendBar.vue b/src/views/home/rawSheetYieldComponents/dataTrendBar.vue index 12f5653a..30583a66 100644 --- a/src/views/home/rawSheetYieldComponents/dataTrendBar.vue +++ b/src/views/home/rawSheetYieldComponents/dataTrendBar.vue @@ -162,10 +162,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/rawSheetYieldComponents/operatingBar.vue b/src/views/home/rawSheetYieldComponents/operatingBar.vue index c95f3e7e..c47230c0 100644 --- a/src/views/home/rawSheetYieldComponents/operatingBar.vue +++ b/src/views/home/rawSheetYieldComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue b/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue index 997f61a4..9d5c551c 100644 --- a/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue +++ b/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/rawSheetYieldComponents/operatingTopBar.vue b/src/views/home/rawSheetYieldComponents/operatingTopBar.vue index 6bc147e0..d8e5575d 100644 --- a/src/views/home/rawSheetYieldComponents/operatingTopBar.vue +++ b/src/views/home/rawSheetYieldComponents/operatingTopBar.vue @@ -167,10 +167,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/rawSheetYieldComponents/verticalBarChart.vue b/src/views/home/rawSheetYieldComponents/verticalBarChart.vue index 73ae2fc2..9f21d7d3 100644 --- a/src/views/home/rawSheetYieldComponents/verticalBarChart.vue +++ b/src/views/home/rawSheetYieldComponents/verticalBarChart.vue @@ -170,10 +170,10 @@ getRateFlag(rate, real, target) { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue index 9f4992ea..12f003b3 100644 --- a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue +++ b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue @@ -110,6 +110,8 @@ export default { totalData: {}, trend: [], relatedData: {}, + relatedMon: {}, + relatedTotal: {}, // cusProData: {}, }; }, @@ -199,11 +201,13 @@ export default { getUnitPriceAnalysisBaseData(requestParams).then((res) => { this.monData = res.data.monData this.totalData = res.data.totalData - // this.relatedMon = res.data.relatedMon - this.relatedData = { - relatedTotal: res.data.relatedTotal, - relatedMon: res.data.relatedMon, - } + this.relatedMon = res.data.relatedMon + this.relatedTotal = res.data.relatedTotal + + // this.relatedData = { + // relatedTotal: res.data.relatedTotal, + // relatedMon: res.data.relatedMon, + // } this.trend = res.data.trend // this.relatedTotal = res.data.relatedTotal // this.cusProData = { diff --git a/src/views/home/salesVolumeAnalysis/productionSalesBase.vue b/src/views/home/salesVolumeAnalysis/productionSalesBase.vue index 83a96945..2266d501 100644 --- a/src/views/home/salesVolumeAnalysis/productionSalesBase.vue +++ b/src/views/home/salesVolumeAnalysis/productionSalesBase.vue @@ -108,8 +108,10 @@ export default { dateData: {}, monData: {}, totalData: {}, - trend: [], + trend: {}, relatedData: {}, + relatedMon: {}, + relatedTotal: {}, // cusProData: {}, }; }, @@ -191,7 +193,7 @@ export default { // index: this.index, // sort: 1, paramName: '产销率', - paramList: ['产量', '销量'], + paramList: ['产量(深加工)', '销量'], baseId: this.factory, // baseId: Number(this.factory), }; @@ -200,10 +202,9 @@ export default { this.monData = res.data.monData this.totalData = res.data.totalData // this.relatedMon = res.data.relatedMon - this.relatedData = { - relatedTotal: res.data.relatedTotal, - relatedMon: res.data.relatedMon, - } + this.relatedMon = res.data.relatedMon + this.relatedTotal = res.data.relatedTotal + this.trend = res.data.trend // this.relatedTotal = res.data.relatedTotal // this.cusProData = { diff --git a/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue b/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue index 7990dd8d..cdf17ab3 100644 --- a/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue +++ b/src/views/home/salesVolumeAnalysisComponents/dataTrendBar.vue @@ -200,10 +200,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue index 6f75f844..5c78135f 100644 --- a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue +++ b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue @@ -200,10 +200,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue index 871e8294..5fa96cfb 100644 --- a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue +++ b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarProduct.vue @@ -63,8 +63,8 @@ export default { return { activeButton: 0, isDropdownShow: false, - selectedProfit: '产量', // 关键修改:默认赋值为「净价」,初始化即展示该类目数据 - profitOptions: ['产量', '销量'] + selectedProfit: '产量(深加工)', // 关键修改:默认赋值为「净价」,初始化即展示该类目数据 + profitOptions: ['产量(深加工)', '销量'] }; }, computed: { @@ -200,10 +200,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysisComponents/monthlyRelatedMetrics.vue b/src/views/home/salesVolumeAnalysisComponents/monthlyRelatedMetrics.vue index 637e63fb..bd4711c6 100644 --- a/src/views/home/salesVolumeAnalysisComponents/monthlyRelatedMetrics.vue +++ b/src/views/home/salesVolumeAnalysisComponents/monthlyRelatedMetrics.vue @@ -11,8 +11,8 @@
diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue b/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue index daed7d3a..5eef2aa7 100644 --- a/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue +++ b/src/views/home/salesVolumeAnalysisComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingSingleBar.vue b/src/views/home/salesVolumeAnalysisComponents/operatingSingleBar.vue index 885e8217..07e2f6aa 100644 --- a/src/views/home/salesVolumeAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/salesVolumeAnalysisComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue b/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue index f71cbee2..cbbdd256 100644 --- a/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue +++ b/src/views/home/salesVolumeAnalysisComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue b/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue index f4013fe7..ad915286 100644 --- a/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/salesVolumeAnalysisComponents/verticalBarChart.vue @@ -119,10 +119,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/salesVolumeAnalysisComponents/yearRelatedMetrics.vue b/src/views/home/salesVolumeAnalysisComponents/yearRelatedMetrics.vue index 0508a35f..86766f79 100644 --- a/src/views/home/salesVolumeAnalysisComponents/yearRelatedMetrics.vue +++ b/src/views/home/salesVolumeAnalysisComponents/yearRelatedMetrics.vue @@ -11,8 +11,8 @@
diff --git a/src/views/home/totalProfitComponents/dataTrendBar.vue b/src/views/home/totalProfitComponents/dataTrendBar.vue index c37569c2..9a15c43d 100644 --- a/src/views/home/totalProfitComponents/dataTrendBar.vue +++ b/src/views/home/totalProfitComponents/dataTrendBar.vue @@ -164,10 +164,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/totalProfitComponents/operatingBar.vue b/src/views/home/totalProfitComponents/operatingBar.vue index 5bc3a411..5461e6f4 100644 --- a/src/views/home/totalProfitComponents/operatingBar.vue +++ b/src/views/home/totalProfitComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/totalProfitComponents/operatingSingleBar.vue b/src/views/home/totalProfitComponents/operatingSingleBar.vue index 86ac4245..3c975163 100644 --- a/src/views/home/totalProfitComponents/operatingSingleBar.vue +++ b/src/views/home/totalProfitComponents/operatingSingleBar.vue @@ -122,10 +122,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/totalProfitComponents/operatingTopBar.vue b/src/views/home/totalProfitComponents/operatingTopBar.vue index a15b54a5..4515f0a6 100644 --- a/src/views/home/totalProfitComponents/operatingTopBar.vue +++ b/src/views/home/totalProfitComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/totalProfitComponents/verticalBarChart.vue b/src/views/home/totalProfitComponents/verticalBarChart.vue index d7c129c7..e7df5c3f 100644 --- a/src/views/home/totalProfitComponents/verticalBarChart.vue +++ b/src/views/home/totalProfitComponents/verticalBarChart.vue @@ -120,10 +120,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/unitPriceAnalysis/unitPriceAnalysisBase.vue b/src/views/home/unitPriceAnalysis/unitPriceAnalysisBase.vue index 7b87950b..d549127d 100644 --- a/src/views/home/unitPriceAnalysis/unitPriceAnalysisBase.vue +++ b/src/views/home/unitPriceAnalysis/unitPriceAnalysisBase.vue @@ -197,7 +197,7 @@ export default { // index: this.index, // sort: 1, paramName: '单价', - paramList: ['销量','成本','运费'], + paramList: ['销量','全成本','运费'], baseId:this.factory, // baseId: Number(this.factory), }; diff --git a/src/views/home/unitPriceAnalysisComponents/monthlyRelatedMetrics.vue b/src/views/home/unitPriceAnalysisComponents/monthlyRelatedMetrics.vue index 079318fe..28ec2824 100644 --- a/src/views/home/unitPriceAnalysisComponents/monthlyRelatedMetrics.vue +++ b/src/views/home/unitPriceAnalysisComponents/monthlyRelatedMetrics.vue @@ -11,7 +11,7 @@
@@ -22,8 +22,8 @@
@@ -36,7 +36,7 @@
@@ -63,7 +63,7 @@ export default { }, dateData: { type: Object, - default: () => ({ }) + default: () => ({}) }, factory: { type: [String, Number], @@ -115,18 +115,18 @@ export default { * @param {number} rate 完成率(原始值,如89代表89%) * @returns {0|1} flag值 */ -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; + }, /** * 图表更新方法:可在这里补充全局的图表刷新逻辑 diff --git a/src/views/home/unitPriceAnalysisComponents/operatingBar.vue b/src/views/home/unitPriceAnalysisComponents/operatingBar.vue index 31113db2..2f46e71a 100644 --- a/src/views/home/unitPriceAnalysisComponents/operatingBar.vue +++ b/src/views/home/unitPriceAnalysisComponents/operatingBar.vue @@ -190,10 +190,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/unitPriceAnalysisComponents/operatingSingleBar.vue b/src/views/home/unitPriceAnalysisComponents/operatingSingleBar.vue index 885e8217..07e2f6aa 100644 --- a/src/views/home/unitPriceAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/unitPriceAnalysisComponents/operatingSingleBar.vue @@ -125,10 +125,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/unitPriceAnalysisComponents/operatingTopBar.vue b/src/views/home/unitPriceAnalysisComponents/operatingTopBar.vue index c604b5a3..fdd29775 100644 --- a/src/views/home/unitPriceAnalysisComponents/operatingTopBar.vue +++ b/src/views/home/unitPriceAnalysisComponents/operatingTopBar.vue @@ -171,10 +171,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue b/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue index 581d13ab..518b172f 100644 --- a/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue +++ b/src/views/home/unitPriceAnalysisComponents/proDataTrendBar.vue @@ -158,10 +158,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue b/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue index f4013fe7..ad915286 100644 --- a/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/unitPriceAnalysisComponents/verticalBarChart.vue @@ -119,10 +119,10 @@ export default { // 根据标志位选择不同的样式类 if (currentFlag === 1) { // 达标 - 使用 rate-achieved 样式 - return `{achieved|${prefix}${currentDiff}}{text|差值}`; + return `{achieved|${currentDiff}}{text|差值}`; } else { // 未达标 - 使用 rate-unachieved 样式 - return `{unachieved|${prefix}${currentDiff}}{text|差值}`; + return `{unachieved|${currentDiff}}{text|差值}`; } }, backgroundColor: { diff --git a/src/views/home/unitPriceAnalysisComponents/yearRelatedMetrics.vue b/src/views/home/unitPriceAnalysisComponents/yearRelatedMetrics.vue index f9af83b2..63bff7e1 100644 --- a/src/views/home/unitPriceAnalysisComponents/yearRelatedMetrics.vue +++ b/src/views/home/unitPriceAnalysisComponents/yearRelatedMetrics.vue @@ -22,8 +22,8 @@