From 80c915239301b1f0e3a732a6318e7743709e9489 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 31 三月 2025 16:01:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/statisticalCharts/inspectionItemWarning/index.vue |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/views/statisticalCharts/inspectionItemWarning/index.vue b/src/views/statisticalCharts/inspectionItemWarning/index.vue
index 1840d04..448aa29 100644
--- a/src/views/statisticalCharts/inspectionItemWarning/index.vue
+++ b/src/views/statisticalCharts/inspectionItemWarning/index.vue
@@ -50,13 +50,12 @@
       tableLoading: false,
       column: [
         { label: '鏍峰搧缂栧彿', prop: 'sampleCode',width: 150 },
-        { label: '鏍峰搧鍚嶇О', prop: 'sampleName',width: 150 },
-        { label: '鍨嬪彿', prop: 'sampleModel' },
+        { label: '鏍峰搧鍚嶇О', prop: 'sampleName'},
+        { label: '鍨嬪彿', prop: 'sampleModel',width: 150  },
         { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName',width: 150 },
-        { label: '妫�楠岄」鍚嶇О', prop: 'inspectionItemName',width: 150 },
-        { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName',width: 150 },
+        { label: '妫�楠岄」鍚嶇О', prop: 'inspectionItemName'},
         {
-          label: "鍋忓樊鍊�",
+          label: "鍋忓樊鍊�%",
           prop: "deviationValue",
           width: 150,
           dataType: "tag",
@@ -89,7 +88,6 @@
       column1: [
         { label: '鏍峰搧缂栧彿', prop: 'sampleCode'},
         { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName'},
-        { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName'},
         {
           label: "妫�娴嬪��",
           prop: "testValue",
@@ -119,7 +117,7 @@
       echartsOptions: {},
       echartsSeries: [
         {
-          name: '鍋忓樊鍊�',
+          name: '妫�娴嬪��',
           type: 'line',
           smooth: true,
           tooltip: {

--
Gitblit v1.9.3