diff --git a/src/views/report/boxTraceabilityReport/index.vue b/src/views/report/boxTraceabilityReport/index.vue
index 43ce0d7..f43ff0b 100644
--- a/src/views/report/boxTraceabilityReport/index.vue
+++ b/src/views/report/boxTraceabilityReport/index.vue
@@ -139,11 +139,41 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -23,11 +29,13 @@
:data="tableData"
style="width: 100%">
@@ -37,6 +45,17 @@
}}%
+
+
+ {{
+ ((tableData.find(v => v.productLineName === scope.row.productLineName).children.find(r => r.WEEK_NUMBER === i) || {}).REPAIR_RATE) || '0'
+ }}%
+
+
{
+ weldLeakRateList({year: this.form.year,month:this.form.month},
+ ).then(response => {
this.total = response?.total || 0
+ var length = response.data.length;
+ var yname = "";
+ if (length == 12){
+ yname = "月"
+ this.month111=true;
+ this.week111 = false;
+ }else {
+ this.week111 = true;
+ this.month111 = false;
+ yname="周"
+ }
//分页查询
let productLineArr = [...new Set(response.data.map(v => v.PRODUCT_LINE_NAME))]
let data = productLineArr.map(v => {
@@ -112,7 +146,7 @@ export default {
tooltip: {
trigger: "axis",
formatter: (v)=>{
- console.log(v)
+ // console.log(v)
return v[0].axisValueLabel+'
'+v.map(e=>{
return `
${e.marker}${e.seriesName} : ${e.data}%\n
@@ -131,7 +165,7 @@ export default {
},
xAxis: {
type: "category",
- data: Array(52).fill('').map((v, k) => '第' + (k + 1) + '周'),
+ data: Array(length).fill('').map((v, k) => '第' + (k + 1) + yname),
axisLine: {
lineStyle: {
color: "#999",
@@ -175,6 +209,7 @@ export default {
},
itemStyle: {
normal: {
+ label:{show:true},
// color: "#F58080",
borderWidth: 10,
// borderColor: "#F58080",