From aef27ebccde6e778b865de749a35b7fa13b1f816 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 19 May 2021 16:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=93=8D=E4=BD=9C=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Assessment.vue | 4 ++--
 src/utils/core.js                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/page/Assessment.vue b/src/components/page/Assessment.vue
index 2f14009..b535cc6 100644
--- a/src/components/page/Assessment.vue
+++ b/src/components/page/Assessment.vue
@@ -205,7 +205,7 @@ export default {
                 let list = this.listDataAll
                 let recordList = res.data.list
                 list.map(n => {
-                    let same = recordList.find(e => e.className == n.className)
+                    let same = recordList.find(e => e.className == n.className && e.experimentalName == n.experimentalName)
                     if(same){
                         n.reportId = same.reportId
                     }
@@ -236,7 +236,7 @@ export default {
             }else if(row.status == 3){
                 return this.$message.warning('该实验已经结束')
             }else{
-                this.core.toSubSystem(row.className,row.id)
+                this.core.toSubSystem(row.className,row.id,row.classId)
             }
         },
         show(row) {
diff --git a/src/utils/core.js b/src/utils/core.js
index 98860b6..5d270aa 100644
--- a/src/utils/core.js
+++ b/src/utils/core.js
@@ -159,8 +159,8 @@ function getCaption(obj){
   return obj;
 }
 
-function toSubSystem(className = '',id = ''){
-  let href = `${config.subSystem}?auth=${btoa(store.state.token)}&userName=${store.state.userName}&class=${className}&id=${id}`
+function toSubSystem(className = '',id = '',classId = ''){
+  let href = `${config.subSystem}?auth=${btoa(store.state.token)}&userName=${store.state.userName}&class=${className}&id=${id}&classId=${classId}`
   location.href = href
 }