From 85870cb52861961f66862283be021819509a7de9 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Fri, 28 Aug 2026 15:42:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/components/coreBottomBar.vue | 4 ++-- src/views/home/components/operatingSalesRevenue.vue | 4 ++-- src/views/home/components/pieChart.vue | 2 +- src/views/home/components/top-item.vue | 2 +- src/views/home/costComponents/purchase-Item.vue | 2 +- src/views/home/costComponents/top-item.vue | 2 +- src/views/home/salesVolumeAnalysis/doublePlatedBase.vue | 6 +++--- .../home/salesVolumeAnalysis/salesVolumeAnalysisBase.vue | 2 +- .../home/salesVolumeAnalysisComponents/dataTrendBar.vue | 2 +- .../salesVolumeAnalysisComponents/dataTrendBarDouble.vue | 6 +++--- .../monthlyThreeRelatedMetrics.vue | 4 ++-- .../relatedIndicatorsAnalysis.vue | 2 +- .../yearThreeRelatedMetrics.vue | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/views/home/components/coreBottomBar.vue b/src/views/home/components/coreBottomBar.vue index a34ca828..55e0f9d3 100644 --- a/src/views/home/components/coreBottomBar.vue +++ b/src/views/home/components/coreBottomBar.vue @@ -23,7 +23,7 @@
- 双镀销量 + 销量_双镀面板
@@ -60,7 +60,7 @@ export default { {name:'单价',unit:'元/㎡'}, {name:'净价',unit:'元/㎡'}, {name:'销量',unit:'万㎡'}, - {name:'双镀销量',unit:'万㎡'} + {name:'销量_双镀面板',unit:'万㎡'} ] }; }, diff --git a/src/views/home/components/operatingSalesRevenue.vue b/src/views/home/components/operatingSalesRevenue.vue index fea92351..ac8fa637 100644 --- a/src/views/home/components/operatingSalesRevenue.vue +++ b/src/views/home/components/operatingSalesRevenue.vue @@ -77,7 +77,7 @@ export default { completed: 1 // 销量超额达标 }, { - name: "双镀销量", + name: "销量_双镀面板", targetValue: 0, value: 0, proportion: 0, @@ -113,7 +113,7 @@ export default { "单价": "unitPrice", "净价": "netPrice", "销量": "sales", - "双镀销量": "panel", + "销量_双镀面板": "panel", "溢价产品销量": "premiumProduct" }; diff --git a/src/views/home/components/pieChart.vue b/src/views/home/components/pieChart.vue index db89f45c..5c0bf87c 100644 --- a/src/views/home/components/pieChart.vue +++ b/src/views/home/components/pieChart.vue @@ -164,7 +164,7 @@ export default { itemStyle: { color: 'rgba(39, 96, 255, 1)' } }, { - value: 735, name: '双镀销量', + value: 735, name: '销量_双镀面板', label: { normal: { align: 'left', diff --git a/src/views/home/components/top-item.vue b/src/views/home/components/top-item.vue index 97ab9cfd..ae28b3ec 100644 --- a/src/views/home/components/top-item.vue +++ b/src/views/home/components/top-item.vue @@ -78,7 +78,7 @@ export default { { key: 'unitPrice', unit: '单价·元/㎡', path: '/unitPriceAnalysis/unitPriceAnalysis' }, { key: 'netPrice', unit: '净价·元/㎡', path: '/netPriceAnalysis/netPriceAnalysis' }, { key: 'sales', unit: '销量·万㎡', path: '/salesVolumeAnalysis/salesVolumeAnalysis' }, - { key: 'panel', unit: '双镀销量·万㎡', path: '/salesVolumeAnalysis/salesVolumeAnalysis' } + { key: 'panel', unit: '销量_双镀面板·万㎡', path: '/salesVolumeAnalysis/salesVolumeAnalysis' } ]; // 遍历映射关系,转换数据 diff --git a/src/views/home/costComponents/purchase-Item.vue b/src/views/home/costComponents/purchase-Item.vue index 57108fc9..f27f8f63 100644 --- a/src/views/home/costComponents/purchase-Item.vue +++ b/src/views/home/costComponents/purchase-Item.vue @@ -53,7 +53,7 @@ export default { { unit: "利润总额·万元", targetValue: 16, currentValue: 15.2, progress: 85 }, { unit: "毛利率·%", targetValue: 16, currentValue: 15.2, progress: 85 }, { unit: "销量·万㎡", targetValue: 20, currentValue: 16, progress: 80 }, - { unit: "双镀销量·万㎡", targetValue: 15, currentValue: 13.8, progress: 92 } + { unit: "销量_双镀面板·万㎡", targetValue: 15, currentValue: 13.8, progress: 92 } ], // 拖拽相关状态 isDragging: false, // 是否正在拖拽 diff --git a/src/views/home/costComponents/top-item.vue b/src/views/home/costComponents/top-item.vue index 56d9fe3f..48810813 100644 --- a/src/views/home/costComponents/top-item.vue +++ b/src/views/home/costComponents/top-item.vue @@ -56,7 +56,7 @@ export default { progress: 80 }, { - unit: "双镀销量·万㎡", + unit: "销量_双镀面板·万㎡", targetValue: 15, currentValue: 13.8, progress: 92 diff --git a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue index 69a61f12..654eaae4 100644 --- a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue +++ b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue @@ -2,7 +2,7 @@
-
- 销量_双镀面板 + 双镀销量
diff --git a/src/views/home/components/top-item.vue b/src/views/home/components/top-item.vue index ae28b3ec..97ab9cfd 100644 --- a/src/views/home/components/top-item.vue +++ b/src/views/home/components/top-item.vue @@ -78,7 +78,7 @@ export default { { key: 'unitPrice', unit: '单价·元/㎡', path: '/unitPriceAnalysis/unitPriceAnalysis' }, { key: 'netPrice', unit: '净价·元/㎡', path: '/netPriceAnalysis/netPriceAnalysis' }, { key: 'sales', unit: '销量·万㎡', path: '/salesVolumeAnalysis/salesVolumeAnalysis' }, - { key: 'panel', unit: '销量_双镀面板·万㎡', path: '/salesVolumeAnalysis/salesVolumeAnalysis' } + { key: 'panel', unit: '双镀销量·万㎡', path: '/salesVolumeAnalysis/salesVolumeAnalysis' } ]; // 遍历映射关系,转换数据 diff --git a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue index 654eaae4..e517b83e 100644 --- a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue +++ b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue @@ -2,7 +2,7 @@
-
= 2 ? data : this.$props.monthAnalysis; // 直接取 props 默认值 - // 提取累计收入(第0项)、累计全成本(第1项)数据 - 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 }; + // 按 title 匹配目标项(不依赖数组顺序,兼容后端数据结构顺序变化) + const list = Array.isArray(validData) ? validData : [] + // 营业收入:精确匹配 + const incomeItem = list.find(item => item && item.title === '营业收入') + || { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0 }; + const costItem = list.find(item => item && item.title === '全成本') + || { title: "全成本", budget: 0, real: 0, rate: 0, diff: 0 }; // 整合flag字段 this.ytdIncomeData = { @@ -135,9 +137,6 @@ export default { ...costItem, flag: costItem.rate > 100 ? 1 : 0 }; - - console.log('累计收入数据:', this.ytdIncomeData); - console.log('累计全成本数据:', this.ytdCostData); } } } diff --git a/src/views/home/grossMarginComponents/yearRelatedMetrics.vue b/src/views/home/grossMarginComponents/yearRelatedMetrics.vue index 34d0b33d..df0961bb 100644 --- a/src/views/home/grossMarginComponents/yearRelatedMetrics.vue +++ b/src/views/home/grossMarginComponents/yearRelatedMetrics.vue @@ -123,14 +123,18 @@ export default { }, updateChart(data) { - // 数据兜底:确保是数组且长度≥2 + // 数据兜底:确保是数组且长度≥2,否则取 props 默认值 const validData = Array.isArray(data) && data.length >= 2 ? data : this.$props.ytdAnalysis; - // 提取收入(第0项)、全成本(第1项)数据 - 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 }; + // 按 title 匹配目标项(不依赖数组顺序,兼容后端数据结构顺序变化) + const list = Array.isArray(validData) ? validData : [] + // 营业收入:精确匹配 + const incomeItem = list.find(item => item && item.title === '营业收入') + || { title: "营业收入", budget: 0, real: 0, rate: 0, diff: 0 }; + const totalCostItem = list.find(item => item && item.title === '全成本') + || { title: "全成本", budget: 0, real: 0, rate: 0, diff: 0 }; // 整合flag字段到收入/全成本数据中 this.incomeData = { @@ -142,10 +146,6 @@ export default { ...totalCostItem, flag: totalCostItem.rate >= 100 ? 1 : 0 }; - - // 调试:确认数据赋值正确 - console.log('整合flag后的收入数据:', this.incomeData); - console.log('整合flag后的全成本数据:', this.totalCostData); } } } From d3ff23f764592c1646362c5280e08c0a888a40d5 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Sun, 20 Sep 2026 10:38:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/menu/index.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index b5163800..7a80aeb9 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -246,6 +246,7 @@ export default { // 查询参数 queryParams: { name: undefined, + status: undefined, visible: undefined }, // 表单参数 @@ -286,10 +287,20 @@ export default { getList() { this.loading = true; listMenu(this.queryParams).then(response => { - this.menuList = this.handleTree(response.data, "id"); + const data = response.data || []; + // 无搜索条件:后端返回全量菜单,可构建成完整树形展示 + // 有搜索条件:后端只返回匹配到的局部数据,父节点可能不在结果集中, + // 此时再走 handleTree 会因父级缺失导致大量数据不显示,故直接平铺展示 + this.menuList = this.isSearching() ? data : this.handleTree(data, "id"); this.loading = false; }); }, + /** 是否存在搜索条件 */ + isSearching() { + const { name, status } = this.queryParams; + const isEmpty = (val) => val === undefined || val === null || val === ''; + return !isEmpty(name) || !isEmpty(status); + }, /** 转换菜单数据结构 */ normalizer(node) { if (node.children && !node.children.length) {