From 17e098aa3cbde6934121c95247816dfa58c44e7d Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 17:47:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b3-classes.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 8514f63..7fb7bad 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -68,7 +68,7 @@
</div>
</div>
</div>
- <div class="scroll-right" id="nav" style="cursor: move;">
+ <div class="scroll-right">
<div class="content">
<div class="content-title content-title-right" style="border-bottom: 0;">
<div class="content-title-item" v-for="(item,index) in weeks" :key="'b'+index">
@@ -324,7 +324,6 @@
}
this.monthList.reverse()
// this.getPower()
- this.scrollInit()
},
methods: {
refresh(){
@@ -577,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({
@@ -587,6 +595,8 @@
})
this.laboratory = data
})
+ }
+
},
handleCommand(e,m){
if(e!=m.shift){
@@ -729,7 +739,6 @@
margin-left: 220px;
overflow-x: scroll;
/* overflow-x: hidden; */
- cursor: move;
}
.content {
--
Gitblit v1.9.3