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 | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index f68711f..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,23 +148,14 @@
<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_title">
- <span>{{`鐝${transFromNumber(index + 1)}`}}</span>
- <span style="margin-right: 10px">
- <i class="el-icon-circle-check" v-if="item.isEdit" style="margin-left: 10px; color: #4b79f2" @click="saveEdit(item, index)"></i>
- <i class="el-icon-edit" v-if="!item.isEdit" style="margin-left: 10px; color: #4b79f2" @click="item.isEdit = true"></i>
- <i class="el-icon-delete" v-if="!item.isEdit && timeQuery.length > 1" style="margin-left: 10px; color: #FF4902" @click="deleteTime(item, index)"></i>
- </span>
- </div>
- <div class="form">
- <div style="margin-bottom: 12px">
+ <div class="form" style="display: flex;justify-content: space-between">
+ <div style="margin-bottom: 12px;width: 200px;">
<span class="form_label">鐝锛�</span>
<span v-if="!item.isEdit"> {{item.type}} </span>
<span class="form_input" v-if="item.isEdit">
- <el-select v-model="item.shift" placeholder="璇烽�夋嫨" style="width: 70%;" clearable size="small">
+ <el-select v-model="item.shift" placeholder="璇烽�夋嫨" style="width: 70%;margin-right: 8px;" clearable size="small">
<el-option v-for="obj in timeTypeList"
:key="obj.value"
:label="obj.label"
@@ -173,12 +164,12 @@
</el-select>
</span>
</div>
- <div>
+ <div style="width: calc(100% - 260px);">
<span class="form_label">鏃堕棿锛�</span>
<span v-if="!item.isEdit"> {{item.time === null ? '' : item.time[0] + '~' + item.time[1]}} </span>
<span class="form_input" v-if="item.isEdit">
<el-time-picker
- style="width: 70%;"
+ style="width: 200px;"
is-range
size="small"
v-model="item.time"
@@ -191,9 +182,14 @@
</el-time-picker>
</span>
</div>
- <el-divider></el-divider>
+ <span>
+ <i class="el-icon-circle-check" v-if="item.isEdit" style="margin-left: 10px; color: #4b79f2;cursor: pointer;" @click="saveEdit(item, index)"></i>
+ <i class="el-icon-edit" v-if="!item.isEdit" style="margin-left: 10px; color: #4b79f2;cursor: pointer;" @click="item.isEdit = true"></i>
+ <i class="el-icon-delete" v-if=" timeQuery.length > 1" style="margin-left: 10px; color: #FF4902;cursor: pointer;" @click="deleteTime(item, index)"></i>
+ </span>
</div>
- <div @click="addTimeForm" style="color: #4b79f2" v-if="index === timeQuery.length - 1">娣诲姞鏃堕棿閰嶇疆</div>
+ <el-divider></el-divider>
+ <div @click="addTimeForm" style="color: #4b79f2;cursor: pointer;" v-if="index === timeQuery.length - 1">娣诲姞鏃堕棿閰嶇疆</div>
</div>
<div @click="addTimeForm" style="color: #4b79f2" v-if="timeQuery.length === 0">娣诲姞鏃堕棿閰嶇疆</div>
</div>
@@ -341,6 +337,7 @@
configTimeVisibleLoading: false, // 鏃堕棿閰嶇疆寮规loading
timeTypeList: [],
timeQuery: [],
+ listPower:false
}
},
watch: {
@@ -379,7 +376,7 @@
this.monthList.push(i)
}
this.monthList.reverse()
- // this.getPower()
+ this.getPower()
},
methods: {
refresh(){
@@ -551,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
@@ -619,12 +621,20 @@
},
getTimeList () {
this.configTimeVisibleLoading = true
- this.$axios.get(this.$api.performanceShift.getList).then(res => {
- if (res.code === 200) {
- this.timeQuery = res.data
- this.timeQuery.forEach(item => {
+ this.$axios.post(this.$api.performanceShift.getList).then(res => {
+ if (res.code == 201) return
+ if (res.data.length > 0) {
+ res.data.forEach(item => {
item.isEdit = false
+ item.time = []
+ item.time.push(item.startTime)
+ item.time.push(item.endTime)
+ const index = this.timeTypeList.findIndex(val => val.value === item.shift)
+ if (index > -1) {
+ item.type = this.timeTypeList[index].label
+ }
})
+ this.timeQuery = res.data
}
this.configTimeVisibleLoading = false
}).catch(e => {
@@ -647,6 +657,7 @@
item.type = this.timeTypeList[index].label
}
}
+ delete item.orderBy
const isEmpty = this.isObjectEmpty(item)
if (isEmpty) {
this.$message.error('璇峰～鍐欏畬鏁�')
@@ -670,40 +681,24 @@
}).then(res => {
if (res.code == 201) return
this.$message.success('鎿嶄綔鎴愬姛')
+ this.getTimeList()
})
- this.getTimeList()
},
deleteTime (item, index) {
- this.$axios.post(this.$api.performanceShift.shiftRemove, {
- id: item.id
- },{
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if (res.code == 201) return
- this.$message.success('鎿嶄綔鎴愬姛')
- })
- this.getTimeList()
+ if(item.id){
+ this.$axios.post(this.$api.performanceShift.shiftRemove, {
+ id: item.id
+ }).then(res => {
+ if (res.code == 201) return
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.getTimeList()
+ })
+ }else{
+ this.timeQuery.splice(index, 1)
+ }
},
isObjectEmpty(obj) {
return Object.keys(obj).some(key => !obj[key]);
- },
- saveTimeQuery () {
- this.timeQuery.forEach(item => {
- if (this.isObjectEmpty(item)) {
- return this.$message.error('璇峰～鍐欏畬鏁�')
- }
- })
- console.log('???')
- },
- closeConfigTimeVisible () {
- this.configTimeVisible = false
- this.timeQuery = [{
- type: '',
- time: null,
- isEdit: false
- }]
},
handleDown(){
let year = this.query.year.getFullYear()
--
Gitblit v1.9.3