From 2ac8c477dd0ea06c84c3b24cc8986a823d66c807 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 19 Aug 2025 16:56:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=A6=85=E9=81=9372=E3=80=8174=E3=80=8175?= =?UTF-8?q?=E3=80=8176=E3=80=8177=E3=80=8178?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/widgets/index_photon.vue | 36 +++--- src/views/statistics/product_check.vue | 10 ++ src/views/statistics/product_check2.vue | 24 +++- src/views/statistics/statistics_bang.vue | 133 ++++++++++++----------- src/views/statistics/statistics_guan.vue | 52 ++++----- 5 files changed, 141 insertions(+), 114 deletions(-) diff --git a/src/views/home/widgets/index_photon.vue b/src/views/home/widgets/index_photon.vue index 303550d9..d8ee4e5b 100644 --- a/src/views/home/widgets/index_photon.vue +++ b/src/views/home/widgets/index_photon.vue @@ -25,7 +25,7 @@
-
预制棒合格数
+
昨日预制棒合格数

{{ dayPassNum7 }}

同比前天 @@ -37,7 +37,7 @@

-
预制管合格数
+
昨日预制管合格数

{{ dayPassNum10 }}

同比前天 @@ -49,7 +49,7 @@

-
预制棒管交付数
+
昨日预制棒管交付数

{{ dayPayNum6 }}

同比前天 @@ -72,7 +72,7 @@

-
预制棒管
+
本月预制棒管

{{ monthPayNum6 }}

本月累积交付数
@@ -84,7 +84,7 @@ :percentage="monthPassRate7" />
-
预制棒合格率
+
本月预制棒合格率

{{ monthPassRate7 }}%

@@ -98,7 +98,7 @@ :percentage="monthPassRate10" />
-
预制管合格率
+
本月预制管合格率

{{ monthPassRate10 }}%

@@ -148,8 +148,8 @@
-
库存情况
-
+
成品库存统计
+
{ if (res.data2.ds0) { - console.log("getHalfProductList", res); + console.log("getProductList", res); that.productList = res.data2.ds0; that.tableData = res.data2.ds0; } }); }, - materialTypeChange() { - let that = this; - if(that.materialType==10){ - this.getProductList(); - }else{ - this.getHalfProductList(); - } - }, + // materialTypeChange() { + // let that = this; + // if(that.materialType==10){ + // this.getProductList(); + // }else{ + // this.getHalfProductList(); + // } + // }, //获取库存 getMaterialList() { let that = this; diff --git a/src/views/statistics/product_check.vue b/src/views/statistics/product_check.vue index e233ab6e..8d2ec62a 100644 --- a/src/views/statistics/product_check.vue +++ b/src/views/statistics/product_check.vue @@ -231,8 +231,12 @@ + + + + @@ -359,6 +363,8 @@ export default { { value: 0, name: "结石" }, { value: 0, name: "气线" }, { value: 0, name: "箱中破" }, + { value: 0, name: "退火后碎" }, + { value: 0, name: "划伤" }, ], }, }, @@ -468,6 +474,8 @@ export default { that.option3.series.data[6].value=0; that.option3.series.data[7].value=0; that.option3.series.data[8].value=0; + that.option3.series.data[9].value=0; + that.option3.series.data[10].value=0; let data = res2.data2.ds0; if (data.length > 0) { data.forEach((item) => { @@ -480,6 +488,8 @@ export default { that.option3.series.data[6].value += item.结石; that.option3.series.data[7].value += item.气线; that.option3.series.data[8].value += item.箱中破; + that.option3.series.data[9].value += item.退火后碎; + that.option3.series.data[10].value += item.划伤; }); } } diff --git a/src/views/statistics/product_check2.vue b/src/views/statistics/product_check2.vue index 875bd9c2..f4f330b0 100644 --- a/src/views/statistics/product_check2.vue +++ b/src/views/statistics/product_check2.vue @@ -211,9 +211,21 @@ ]; if (data.length > 0) { data.forEach((item) => { - seriesData.forEach((item2) => { - item2.value += item[item2.name]; - }) + let other_count = item.不合格数 - item.条纹 - item.气泡 - item.断裂 - item.气线 - item.炸纹 - item.结石 - item.弯曲 - item.偏壁 - item.大小头; + seriesData[0].value += item.合格数; + seriesData[1].value += item.条纹; + seriesData[2].value += item.气泡; + seriesData[3].value += item.断裂; + seriesData[4].value += item.气线; + seriesData[5].value += item.炸纹; + seriesData[6].value += item.结石; + seriesData[7].value += item.弯曲; + seriesData[8].value += item.偏壁; + seriesData[9].value += item.大小头; + seriesData[10].value += other_count; + // seriesData.forEach((item2) => { + // item2.value += item[item2.name]; + // }) }) } that.option1.series[0].data = seriesData; @@ -229,8 +241,12 @@ }; //获取table数据 that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => { - that.tableData = res2.data2.ds0; let data = res2.data2.ds0; + data.forEach((item) => { + let other_count = item.不合格数 - item.条纹 - item.气泡 - item.断裂 - item.气线 - item.炸纹 - item.结石 - item.弯曲 - item.偏壁 - item.大小头; + item.其他 = other_count; + }) + that.tableData = res2.data2.ds0; data.forEach((item) => { let date =item.年; if(that.queryType=='月'){ diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue index faca775f..f89f86a6 100644 --- a/src/views/statistics/statistics_bang.vue +++ b/src/views/statistics/statistics_bang.vue @@ -55,10 +55,6 @@ {{ scope.row.data.产品规格 }} - - - + + - + - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -327,7 +323,7 @@ @@ -362,96 +358,101 @@ - - + + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + + + + @@ -461,7 +462,7 @@ @@ -505,29 +506,29 @@ - + + + + - + - - - - + diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue index 4487772c..367b09d4 100644 --- a/src/views/statistics/statistics_guan.vue +++ b/src/views/statistics/statistics_guan.vue @@ -67,7 +67,7 @@ @@ -134,7 +134,7 @@ @@ -281,7 +281,7 @@ @@ -375,85 +375,85 @@ - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + @@ -469,7 +469,7 @@ @@ -541,7 +541,7 @@ @@ -577,7 +577,7 @@