From 8243c409bed1b1b778a0b6a6063dae8cd7cc55e7 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Fri, 26 May 2023 17:44:05 +0800
Subject: [PATCH] 设备错误列表返回，设备分析对比项数量限制

---
 src/router/permission.js              |  2 +-
 src/views/standard/analysis/index.vue | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/router/permission.js b/src/router/permission.js
index eebe527..9ffa8b1 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -9,7 +9,7 @@ router.beforeEach((to, from, next) => {
     next();
   } else {
     if (store.getters.token) {
-      if (to.path == '/device' && from.path == '/deviceLog') {
+      if ((to.path == '/device' && from.path == '/deviceLog') || (to.path == '/device' && from.path == '/deviceError')) {
         to.query.back = true
       }
       next();
diff --git a/src/views/standard/analysis/index.vue b/src/views/standard/analysis/index.vue
index a1fcc5e..afa50a7 100644
--- a/src/views/standard/analysis/index.vue
+++ b/src/views/standard/analysis/index.vue
@@ -74,6 +74,7 @@
           <span class="s-txt"></span>
           <div class="disflex-b">
             <el-button
+              v-show="query.secGraClaSub.length < 10"
               class="btn"
               icon="el-icon-plus"
               size="small"
@@ -279,11 +280,12 @@ export default {
         return;
       }
       let hasSpace = null;
-      this.query.secGraClaSub.map((item, index) => {
-        if (!item.length) {
-          hasSpace = index;
+      for (let i = 0; i < this.query.secGraClaSub.length; i++) {
+        if (!this.query.secGraClaSub[i].length) {
+          hasSpace = i;
+          break;
         }
-      });
+      }
       if (hasSpace !== null) {
         this.$message.warning(
           `对比项${this.setBigNum(hasSpace)}对比条件不能为空请检查！`
--
libgit2 0.21.4