From aeff7f33ed7d29756a545fc2d374716c1deec769 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 九月 2023 13:22:40 +0800
Subject: [PATCH] modified: .env.development modified: src/views/experiment/passRateStatistics/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/experiment/reportAuditing/index.vue
---
src/views/experiment/planAssignments/plan.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 8d55e13..8742464 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -96,8 +96,10 @@
</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" effect="dark" v-if="scope.row.children!=undefined&&scope.row.testState!=null">宸蹭笂鎶�</el-tag>
+ <el-tag type="danger" effect="dark" v-else-if="scope.row.children!=undefined&&scope.row.testState==null">鏈笂鎶�</el-tag>
+ <el-tag type="success" v-else-if="scope.row.children==undefined&&scope.row.testState!=null">宸叉楠�</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.children==undefined&&scope.row.testState==null">鏈楠�</el-tag>
</template>
</el-table-column>
<el-table-column prop="startTime" label="妫�楠屽紑濮�" width="100px">
@@ -121,7 +123,7 @@
<el-row style="line-height: 50px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">浜哄憳:</el-col>
<el-col :span="16" :offset="1">
- <el-select v-model="upData.checker" size="medium" clearable style="width: 100%;">
+ <el-select @change="selectChecker" v-model="upData.checker" size="medium" clearable style="width: 100%;">
<el-option v-for="(a, ai) in users" :key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
</el-col>
@@ -160,7 +162,7 @@
<el-col :span="7">{{upData.internal}}</el-col>
</el-row>
<el-row style="line-height: 46px;">
- <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀姸鎬侊細</el-col>
+ <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀粨鏋滐細</el-col>
<el-col :span="7">
<el-tag type="success" v-if="upData.testState==1">鍚堟牸</el-tag>
<el-tag type="danger" v-else-if="upData.testState==0">涓嶅悎鏍�</el-tag>
@@ -268,14 +270,20 @@
.children.length
},
openUpDia(row) {
+ // console.log(row);
this.upDia = true
this.upData = {
id: row.code,
checker: null,
device: null
}
+ this.upData.checker=row.uId
+ this.upData.device=row.isuId
},
submitUpData() {
+ // console.log(this.upData.device);
+ // console.log(this.devices);
+ // return;
if (this.upData.checker == null || this.upData.checker == '') {
this.$message.error('浜哄憳鏈垎閰�')
return
@@ -293,6 +301,9 @@
this.selectDataList()
})
},
+ selectChecker(){
+ // console.log(this.upData.checker);
+ },
openUpInsDia(row) {
this.upInsDia = true
this.upData = this.HaveJson(row)
--
Gitblit v1.9.3