From b5196ecfbda5236f3fd3f0213a5e6911d291bda4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 26 七月 2024 17:12:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b3-classes.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 206bcff..45d37c3 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -44,7 +44,7 @@
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
<div class="search_thing btns" style="padding-left: 30px;">
- <el-button size="small" type="primary" v-if="downPower" @click="configTime" :loading="downLoading">鏃堕棿閰嶇疆</el-button>
+ <el-button size="small" type="primary" v-if="listPower" @click="configTime" :loading="downLoading">鏃堕棿閰嶇疆</el-button>
<el-button size="small" type="primary" v-if="downPower" @click="handleDown" :loading="downLoading">瀵� 鍑�</el-button>
<el-button size="small" type="primary" @click="schedulingVisible = true" v-if="addPower">鎺� 鐝�</el-button>
</div>
@@ -148,8 +148,7 @@
<span style="color:#909399;font-size:14px;position: absolute;left:50%;top: 50%;transform: translate(-59%,-50%);" v-if="(query.month&&list.length==0)||(!query.month&&yearList.length==0)">鏆傛棤鏁版嵁</span>
</div>
<el-dialog title="鏃堕棿閰嶇疆" :visible.sync="configTimeVisible" width="620px">
- <div v-loading="configTimeVisibleLoading" ></div>
- <div v-if="!configTimeVisibleLoading">
+ <div v-loading="configTimeVisibleLoading" style="min-height: 200px;">
<div v-for="(item, index) in timeQuery">
<div class="form" style="display: flex;justify-content: space-between">
<div style="margin-bottom: 12px;width: 200px;">
@@ -338,6 +337,7 @@
configTimeVisibleLoading: false, // 鏃堕棿閰嶇疆寮规loading
timeTypeList: [],
timeQuery: [],
+ listPower:false
}
},
watch: {
@@ -376,7 +376,7 @@
this.monthList.push(i)
}
this.monthList.reverse()
- // this.getPower()
+ this.getPower()
},
methods: {
refresh(){
@@ -548,20 +548,25 @@
let add = false
let up = false
let down = false
+ let listPower = false
for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'update') {
+ if (power[i].menuMethod == 'performanceShiftUpdate') {
up = true
}
if (power[i].menuMethod == 'delDeviceParameter') {
down = true
}
- if (power[i].menuMethod == 'add') {
+ if (power[i].menuMethod == 'performanceShiftAdd') {
add = true
+ }
+ if (power[i].menuMethod == 'shiftTimeList') {
+ listPower = true
}
}
this.addPower = add
this.upPower = up
this.downPower = down
+ this.listPower = listPower
},
onMouseEnter(index){
this.currentUserIndex = index
--
Gitblit v1.9.3