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 @@
{ - 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)}对比条件不能为空请检查!`