From 1f54c9179d1eb66f927294b8fa2205265abfe457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 23 Apr 2024 16:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/ingredientReport/day.vue          | 10 +++++-----
 src/views/report/qcReport/fullInspection/index.vue |  4 ++--
 src/views/report/qcReport/lineReport.vue           |  4 ++--
 src/views/report/qcReport/optimizeCutData.vue      |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue
index 399495e6..29c4ef0e 100644
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 16:18:27
+ * @LastEditTime: 2024-04-23 16:47:13
  * @LastEditors: zhp
  * @Description:
 -->
@@ -145,7 +145,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 250
+          width: 350
         },
         {
           type:'button',
@@ -157,7 +157,7 @@ export default {
           type:'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],
@@ -212,7 +212,7 @@ export default {
       }
       }
       if (columnIndex === 1)  {
-        if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) {
+        if (rowIndex %2 == 1) {
           return {
             rowspan: 1,
             colspan: 2
@@ -220,7 +220,7 @@ export default {
         }
       }
       if (columnIndex === 4 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13) {
-        if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) {
+        if (rowIndex % 2 == 0) {
           return {
             rowspan: 2,
             colspan: 1
diff --git a/src/views/report/qcReport/fullInspection/index.vue b/src/views/report/qcReport/fullInspection/index.vue
index b4e7d8c9..360c4163 100644
--- a/src/views/report/qcReport/fullInspection/index.vue
+++ b/src/views/report/qcReport/fullInspection/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 15:08:44
+ * @LastEditTime: 2024-04-23 16:43:18
  * @LastEditors: zhp
  * @Description:
 -->
@@ -234,7 +234,7 @@ export default {
           type: 'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],
diff --git a/src/views/report/qcReport/lineReport.vue b/src/views/report/qcReport/lineReport.vue
index ab2b32c5..01e9aa65 100644
--- a/src/views/report/qcReport/lineReport.vue
+++ b/src/views/report/qcReport/lineReport.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 15:15:45
+ * @LastEditTime: 2024-04-23 16:42:53
  * @LastEditors: zhp
  * @Description:
 -->
@@ -154,7 +154,7 @@ export default {
           type:'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],
diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue
index 77d5411d..9563e682 100644
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-23 15:15:52
+ * @LastEditTime: 2024-04-23 16:42:58
  * @LastEditors: zhp
  * @Description:
 -->
@@ -153,7 +153,7 @@ export default {
           type:'button',
           btnName: '导出',
           name: 'export',
-          color: 'success',
+          color: 'primary',
           plain: true
         },
       ],