From 56b7f5dd6fda8c39f0b7038a265d507e0d22227c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 七月 2024 14:56:35 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b3-classes.vue | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 90cc096..7fb7bad 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -576,7 +576,16 @@
})
},
obtainItemParameterList() {
- this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
+ if(this.PROJECT == '妫�娴嬩腑蹇�') {
+ this.laboratory = [{
+ label: '閫氫俊浜у搧瀹為獙瀹�',
+ value: '閫氫俊浜у搧瀹為獙瀹�'
+ }, {
+ label: '鐢靛姏浜у搧瀹為獙瀹�',
+ value: '鐢靛姏浜у搧瀹為獙瀹�'
+ }]
+ } else {
+ this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
res.data.forEach(a => {
data.push({
@@ -586,6 +595,8 @@
})
this.laboratory = data
})
+ }
+
},
handleCommand(e,m){
if(e!=m.shift){
--
Gitblit v1.9.3