From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before

---
 src/views/experiment/planAssignments/plan.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 05d0439..40bc4d3 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -96,8 +96,8 @@
 				</el-table-column>
 				<el-table-column prop="testState" label="妫�楠岀姸鎬�" width="100px">
 					<template slot-scope="scope">
-						<el-tag type="success" v-if="scope.row.testState==1">鍚堟牸</el-tag>
-						<el-tag type="danger" v-else-if="scope.row.testState==0">涓嶅悎鏍�</el-tag>
+						<el-tag type="success" v-if="scope.row.testState==1">宸叉姤妫�</el-tag>
+						<el-tag type="danger" v-else-if="scope.row.testState==0">鏈姤妫�</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column prop="startTime" label="妫�楠屽紑濮�" width="100px">
@@ -268,6 +268,7 @@
 					.children.length
 			},
 			openUpDia(row) {
+				console.log(row);
 				// console.log(row);
 				this.upDia = true
 				this.upData = {

--
Gitblit v1.9.3