From 2ec833417303c2e3d15831e3e60e63b2b209308d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 29 Nov 2023 14:22:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=98=E6=9B=B4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/LineChart.vue              | 18 ++++++++++++++++++
 .../checkTypeProject/MaterialGroupAdd.vue      |  2 +-
 src/views/quality/checkTypeProject/index.vue   |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue
index 129f9e1..410572b 100644
--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -117,6 +117,24 @@
               restore: {},
               saveAsImage: {}
             }
+          },
+          tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                  type: 'shadow'
+              },
+              formatter: function (params) {
+                  let result="";
+                  for (let i = 0; i < params.length; i++) {
+                          if(params[i].data!=0){
+                              result+=params[i].marker + params[i].seriesName + '：' + params[i].data + '<br>'
+                          }
+                  }
+                  return params[0].name + '<br/>'
+                      + result
+
+              }
+
           }
         })
       }
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 241869d..de43968 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -7,7 +7,7 @@
       <div class="head-container">
         <el-input
           v-model="groupName"
-          placeholder="请输入部门名称"
+          placeholder="请输入物料名称"
           clearable
           size="small"
           prefix-icon="el-icon-search"
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
index 396713c..af52877 100644
--- a/src/views/quality/checkTypeProject/index.vue
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -109,10 +109,11 @@
           <el-table-column label="标准值" align="center" prop="standardValue" />
           <el-table-column label="上差值" align="center" prop="upperDiff" />
           <el-table-column label="下差值" align="center" prop="downDiff" />
+          <el-table-column label="单位" align="center" prop="unit" />
           <el-table-column label="抽样比例" align="center" prop="sample" />
           <el-table-column label="抽样数量" align="center" prop="sampleNum" />
           <el-table-column
-            label="是否启用,0是1否"
+            label="是否启用"
             align="center"
             prop="status"
           />