From 8b24e3527fa7d6960faad85f0454d279e4d4d4b1 Mon Sep 17 00:00:00 2001
From: aiyadc <565548447@qq.com>
Date: Wed, 27 May 2020 21:16:39 +0800
Subject: [PATCH] =?UTF-8?q?[fix][V]:=E5=AE=8C=E5=96=84=E5=91=A8=E6=AC=A1?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
element-vue/src/pages/teacher/applyLab.vue | 85 ++++++++++++----------
1 file changed, 46 insertions(+), 39 deletions(-)
diff --git a/element-vue/src/pages/teacher/applyLab.vue b/element-vue/src/pages/teacher/applyLab.vue
index fe4c203..2bb9ba1 100644
--- a/element-vue/src/pages/teacher/applyLab.vue
+++ b/element-vue/src/pages/teacher/applyLab.vue
@@ -86,7 +86,7 @@
:able-list="ableList">
-
+
@@ -137,7 +137,8 @@
schedule: '',
remind: '无'
},
- courseOption: []
+ courseOption: [],
+ booked: []
}
},
@@ -148,17 +149,11 @@
return 'cursor:pointer'
}
},
- f(){},
+ f() {
+ },
//点击格子促发的函数
async cellClick(row, column, cell, event) {
- this.form.weeks = null
- this.form.day = column.index
- this.form.time = row.index
- this.form.year = this.$refs.timeSelection.year
- this.form.semester = this.$refs.timeSelection.semester
- this.ableList = await get("lb/labTime/getWeeksAbleBook", this.form)
- this.aWeekValue.push(row.index, column.index)
//(待写)检索该格子的周数申请信息，被申请的周数使其样式变为disable
// let position = this.lab.position
// let rowIndex = row.index
@@ -167,13 +162,25 @@
// var weeks=[6,7,8]
//(待写)检索该格子的周数申请信息，被申请的周数使其样式变为disablevar
if (column.label != '') {
- this.perTargetValue = event.target //用target对表格进行定位并保存致target对象
- this.aWeekValue.push(row.index, column.index)
+ this.form.weeks = null
+ this.form.day = column.index
+ this.form.time = row.index
+ this.form.year = this.$refs.timeSelection.year
+ this.form.semester = this.$refs.timeSelection.semester
+
new Promise((resolve, reject) => { //使weekDialog打开和调用按顺序执行
this.weekDialog = true
resolve('打开了weekDialog')
- }).then((res) => {
+ }).then(async (res) => {
+ this.ableList = await get("lb/labTime/getWeeksAbleBook", this.form)
+ this.$refs.weekSelection.singleVal = this.ableList.filter(elem => elem % 2 !== 0)
+ this.$refs.weekSelection.doubleVal = this.ableList.filter(elem => elem % 2 === 0)
+ this.$refs.weekSelection.allVal = this.ableList
+ this.$refs.weekSelection.checkedValue = this.booked[row.index - 1][column.index - 1]
+ this.aWeekValue.push(row.index, column.index)
+ this.perTargetValue = event.target //用target对表格进行定位并保存致target对象
+ this.aWeekValue.push(row.index, column.index)
// console.log(this.$refs.weekSelection)
// var position = this.form.position
// var rowIndex = row.index
@@ -181,9 +188,7 @@
// var selectedWeeks = get('', {position, rowIndex, columnIndex}) //发送给实验室的地址，rowIndex，columIndex返回该格子的周数信息:数组
// selectedWeeks = [1, 2, 3]
// this.$refs.weekSelection.disableList = selectedWeeks
- // this.$refs.weekSelection.singleVal = this.$refs.weekSelection.singleVal.filter(x => !selectedWeeks.includes(x))
- // this.$refs.weekSelection.doubleVal = this.$refs.weekSelection.doubleVal.filter(x => !selectedWeeks.includes(x))
- // this.$refs.weekSelection.allVal = this.$refs.weekSelection.allVal.filter(x => !selectedWeeks.includes(x))
+
// console.log('aa', this.$refs.weekSelection.singleVal)
})
}
@@ -207,7 +212,7 @@
//点击查看申请详情
async checkDetail(event) {
await this.loadSchedule(event.lab_id)
- this.$refs.schedule.lab={
+ this.$refs.schedule.lab = {
name: event.name,
position: event.position
}
@@ -335,39 +340,41 @@
}
const schedule = await get('lb/labTime/getLabScheduleAbleBook', params)
const booked = await get('lb/labrecord/getWeekBooked', params)
+ this.booked = booked
+ console.log(this.booked)
for (let i = 0; i < schedule.length; i++) {
- this.$refs.times.tableData[i].Monday = arr2shortString(schedule[i][0]) ? ''+arr2shortString(schedule[i][0]) + '周可预约' +'': ''
- this.$refs.times.tableData[i].Tuesday =arr2shortString(schedule[i][1]) ? ''+arr2shortString(schedule[i][1]) + '周可预约' +'': ''
- this.$refs.times.tableData[i].Wednesday = arr2shortString(schedule[i][2]) ? ''+arr2shortString(schedule[i][2]) + '周可预约' +'': ''
- this.$refs.times.tableData[i].Thursday = arr2shortString(schedule[i][3]) ? ''+arr2shortString(schedule[i][3]) + '周可预约' +'': ''
- this.$refs.times.tableData[i].Friday = arr2shortString(schedule[i][4]) ? ''+arr2shortString(schedule[i][4]) + '周可预约' +'': ''
- this.$refs.times.tableData[i].Saturday = arr2shortString(schedule[i][5]) ? ''+arr2shortString(schedule[i][5]) + '周可预约' +'': ''
- this.$refs.times.tableData[i].Sunday = arr2shortString(schedule[i][6]) ? ''+arr2shortString(schedule[i][6]) + '周可预约' +'': ''
+ this.$refs.times.tableData[i].Monday = arr2shortString(schedule[i][0]) ? '' + arr2shortString(schedule[i][0]) + '周可预约' + '' : ''
+ this.$refs.times.tableData[i].Tuesday = arr2shortString(schedule[i][1]) ? '' + arr2shortString(schedule[i][1]) + '周可预约' + '' : ''
+ this.$refs.times.tableData[i].Wednesday = arr2shortString(schedule[i][2]) ? '' + arr2shortString(schedule[i][2]) + '周可预约' + '' : ''
+ this.$refs.times.tableData[i].Thursday = arr2shortString(schedule[i][3]) ? '' + arr2shortString(schedule[i][3]) + '周可预约' + '' : ''
+ this.$refs.times.tableData[i].Friday = arr2shortString(schedule[i][4]) ? '' + arr2shortString(schedule[i][4]) + '周可预约' + '' : ''
+ this.$refs.times.tableData[i].Saturday = arr2shortString(schedule[i][5]) ? '' + arr2shortString(schedule[i][5]) + '周可预约' + '' : ''
+ this.$refs.times.tableData[i].Sunday = arr2shortString(schedule[i][6]) ? '' + arr2shortString(schedule[i][6]) + '周可预约' + '' : ''
}
for (let i = 0; i < booked.length; i++) {
- this.$refs.times.tableData[i].Monday = arr2shortString(booked[i][0]) ? ''+arr2shortString(booked[i][0]) + '周已预约' +'
'+this.$refs.times.tableData[i].Monday : this.$refs.times.tableData[i].Monday
- this.$refs.times.tableData[i].Tuesday =arr2shortString(booked[i][1]) ? ''+arr2shortString(booked[i][1]) + '周已预约' +'
'+this.$refs.times.tableData[i].Tuesday : this.$refs.times.tableData[i].Tuesday
- this.$refs.times.tableData[i].Wednesday = arr2shortString(booked[i][2]) ? ''+arr2shortString(booked[i][2]) + '周已预约' +'
'+this.$refs.times.tableData[i].Wednesday : this.$refs.times.tableData[i].Wednesday
- this.$refs.times.tableData[i].Thursday = arr2shortString(booked[i][3]) ? ''+arr2shortString(booked[i][3]) + '周已预约' +'
'+this.$refs.times.tableData[i].Thursday : this.$refs.times.tableData[i].Thursday
- this.$refs.times.tableData[i].Friday = arr2shortString(booked[i][4]) ? ''+arr2shortString(booked[i][4]) + '周已预约' +'
'+this.$refs.times.tableData[i].Friday : this.$refs.times.tableData[i].Friday
- this.$refs.times.tableData[i].Saturday = arr2shortString(booked[i][5]) ? ''+arr2shortString(booked[i][5]) + '周已预约' +'
'+this.$refs.times.tableData[i].Saturday : this.$refs.times.tableData[i].Saturday
- this.$refs.times.tableData[i].Sunday = arr2shortString(booked[i][6]) ? ''+arr2shortString(booked[i][6]) + '周已预约' +'
'+this.$refs.times.tableData[i].Sunday : this.$refs.times.tableData[i].Sunday
+ this.$refs.times.tableData[i].Monday = arr2shortString(booked[i][0]) ? '' + arr2shortString(booked[i][0]) + '周已预约' + '
' + this.$refs.times.tableData[i].Monday : this.$refs.times.tableData[i].Monday
+ this.$refs.times.tableData[i].Tuesday = arr2shortString(booked[i][1]) ? '' + arr2shortString(booked[i][1]) + '周已预约' + '
' + this.$refs.times.tableData[i].Tuesday : this.$refs.times.tableData[i].Tuesday
+ this.$refs.times.tableData[i].Wednesday = arr2shortString(booked[i][2]) ? '' + arr2shortString(booked[i][2]) + '周已预约' + '
' + this.$refs.times.tableData[i].Wednesday : this.$refs.times.tableData[i].Wednesday
+ this.$refs.times.tableData[i].Thursday = arr2shortString(booked[i][3]) ? '' + arr2shortString(booked[i][3]) + '周已预约' + '
' + this.$refs.times.tableData[i].Thursday : this.$refs.times.tableData[i].Thursday
+ this.$refs.times.tableData[i].Friday = arr2shortString(booked[i][4]) ? '' + arr2shortString(booked[i][4]) + '周已预约' + '
' + this.$refs.times.tableData[i].Friday : this.$refs.times.tableData[i].Friday
+ this.$refs.times.tableData[i].Saturday = arr2shortString(booked[i][5]) ? '' + arr2shortString(booked[i][5]) + '周已预约' + '
' + this.$refs.times.tableData[i].Saturday : this.$refs.times.tableData[i].Saturday
+ this.$refs.times.tableData[i].Sunday = arr2shortString(booked[i][6]) ? '' + arr2shortString(booked[i][6]) + '周已预约' + '
' + this.$refs.times.tableData[i].Sunday : this.$refs.times.tableData[i].Sunday
}
},
- async loadSchedule(labId){
- const schedule = await get('lb/labrecord/getLabSchedule',{
+ async loadSchedule(labId) {
+ const schedule = await get('lb/labrecord/getLabSchedule', {
labId,
year: this.$refs.timeSelection.year,
semester: this.$refs.timeSelection.semester
}) //发送地址，请求该实验室地址的所有课程
for (let i = 0; i < schedule.length; i++) {
this.$refs.schedule.tableData[i].Monday = item2html(schedule[i][0])
- this.$refs.schedule.tableData[i].Tuesday = item2html(schedule[i][1])
- this.$refs.schedule.tableData[i].Wednesday = item2html(schedule[i][2])
- this.$refs.schedule.tableData[i].Thursday = item2html(schedule[i][3])
- this.$refs.schedule.tableData[i].Friday = item2html(schedule[i][4])
- this.$refs.schedule.tableData[i].Saturday = item2html(schedule[i][5])
- this.$refs.schedule.tableData[i].Sunday = item2html(schedule[i][6])
+ this.$refs.schedule.tableData[i].Tuesday = item2html(schedule[i][1])
+ this.$refs.schedule.tableData[i].Wednesday = item2html(schedule[i][2])
+ this.$refs.schedule.tableData[i].Thursday = item2html(schedule[i][3])
+ this.$refs.schedule.tableData[i].Friday = item2html(schedule[i][4])
+ this.$refs.schedule.tableData[i].Saturday = item2html(schedule[i][5])
+ this.$refs.schedule.tableData[i].Sunday = item2html(schedule[i][6])
}
}
},