From da9e5a67fbdb03561d9359379867c760f4fd8981 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 23 八月 2023 13:42:01 +0800
Subject: [PATCH] 更新检验计划
---
.env.development | 2 +-
src/views/experiment/planAssignments/plan.vue | 21 +++++++++++++++------
src/App.vue | 26 ++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/.env.development b/.env.development
index 8dd5cb9..ab9be2d 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.110.167:1234/'
+VUE_APP_BASE_API = 'http://localhost:1234/'
diff --git a/src/App.vue b/src/App.vue
index a25f956..230665e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -48,6 +48,16 @@
color: #fff;
}
+ .el-message-box{
+ border: 0;
+ border-radius: 15px;
+ }
+
+ .el-message-box__header * {
+ font-size: 16px !important;
+ color: #fff !important;
+ }
+
.el-dialog__headerbtn .el-dialog__close{
color: #fff;
top: -20px;
@@ -67,4 +77,20 @@
box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
padding: 0 14px;
}
+
+ .ins_state_success{
+ background-color: #67c23a;
+ color: #fff;
+ display: initial;
+ padding: 6px 10px;
+ border-radius: 4px;
+ }
+
+ .ins_state_error{
+ background-color: #f56c6c;
+ color: #fff;
+ display: initial;
+ padding: 6px 10px;
+ border-radius: 4px;
+ }
</style>
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index c616156..0907cbc 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -60,7 +60,7 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :key="upIndex">
<el-table-column type="index" width="50" label="搴忓彿">
</el-table-column>
- <el-table-column prop="code" label="鐢宠鍗曞彿" width="200px">
+ <el-table-column prop="code" label="鐢宠鍗曞彿" width="250px">
<template slot-scope="scope">
<div style="display: flex;">
<div v-if="scope.row.orderNum=='01'" style="color: #3caaff;background-color: #eff5ff;" class="order_num">
@@ -76,7 +76,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="name" label="鍚嶇О">
+ <el-table-column prop="name" label="鍚嶇О" width="200px">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
@@ -88,9 +88,9 @@
</el-table-column>
<el-table-column prop="checker" label="鎵ц浜�">
</el-table-column>
- <el-table-column prop="instrumentname" label="妫�楠屾棩鏈�">
+ <el-table-column prop="instrumentname" label="妫�楠岃澶�">
</el-table-column>
- <el-table-column prop="testState" label="妫�楠岀姸鎬�">
+ <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>
@@ -331,15 +331,24 @@
submitUpData2() {
var data = []
this.upData.testValue.forEach(a => {
- data.push(a.number)
+ if(a.number!=''&&a.number!=null){
+ data.push(a.number)
+ }
})
wpost(this.$url.check, {
id: this.upData.code,
value: data.toString()
}).then(res => {
- this.$message.success('鎻愪氦鎴愬姛')
this.upInsDia = false
this.selectDataList()
+ this.$confirm(`<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`, '鎻愪氦鎴愬姛', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍏抽棴',
+ dangerouslyUseHTMLString:true,
+ type: `${res.data==1?'success':'error'}`
+ }).then(() => {
+ }).catch(() => {
+ })
})
}
}
--
Gitblit v1.9.3