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
---
.env.development | 2 +-
src/views/experiment/passRateStatistics/index.vue | 6 ++----
src/views/experiment/reportAuditing/index.vue | 6 +-----
src/views/experiment/planAssignments/plan.vue | 9 +++++----
4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/.env.development b/.env.development
index ab9be2d..6c8cdfe 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://192.168.218.96:1234/'
diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue
index de4e2ed..42bb334 100644
--- a/src/views/experiment/passRateStatistics/index.vue
+++ b/src/views/experiment/passRateStatistics/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :rules="rules" :model="searchData" label-position="top">
+ <el-form ref="form" :inline="true" :rules="rules" :model="searchData" label-position="left">
<el-form-item label="妫�娴嬫棩鏈�:" class="sermargin" prop="date">
<el-date-picker v-model="searchData.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -27,12 +27,10 @@
</el-option>
</el-select>
</el-form-item>
- <div class="rightBtn" style="position: absolute;top: 90px;right: 20px;">
<el-form-item>
<el-button type="primary" @click="clear" plain size="mini">娓呯┖</el-button>
<el-button type="primary" @click="search" size="mini">鏌ヨ</el-button>
</el-form-item>
- </div>
</el-form>
</div>
<div class="top-bar-copy"></div>
@@ -422,7 +420,7 @@
.top-bar-copy {
width: 100%;
- height: 12vh;
+ height: 7vh;
}
.chart-content {
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 40bc4d3..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">
@@ -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,7 +270,6 @@
.children.length
},
openUpDia(row) {
- console.log(row);
// console.log(row);
this.upDia = true
this.upData = {
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index fab1979..6d041fe 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -88,26 +88,22 @@
@click="handleClick(scope.row)"
>鏌ョ湅璇︾粏
</el-button>
- <el-button type="text" size="small" @click="shenHE(scope)">瀹℃牳</el-button>
-
+ <el-button type="text" size="small" v-if="scope.row.status === 0" @click="shenHE(scope)">瀹℃牳</el-button>
<el-dialog
title="鍘熷璁板綍瀹℃牳"
:visible.sync="checkskipvisible"
width="30%"
-
>
<el-form :model="form">
<el-form-item label="璇烽�夋嫨瀹℃牳缁撴灉:" :label-width="formLabelWidth">
</el-form-item>
</el-form>
-
<div slot="footer" class="dialog-footer">
<el-button @click="checkskipvisible = false">鍙� 娑�</el-button>
<el-button style="background-color: rgb(206, 211, 216);" @click="nocheckskip(scope.row)" >涓嶉�氳繃</el-button>
<el-button type="primary" @click="checkskip(scope.row)">閫氳繃</el-button>
</div>
</el-dialog>
-
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3