From f4cb7f8475d8db96fcfab65a584dc98231d9d918 Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Tue, 26 May 2020 16:30:11 +0800
Subject: [PATCH] =?UTF-8?q?[fix][V]:=E5=AE=8C=E5=96=84=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=A4=E8=AF=BE=E8=A1=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8Erouter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 element-vue/src/pages/teacher/applyLab.vue | 82 +++++++++++++++-------
 element-vue/src/router.js                  |  5 --
 2 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/element-vue/src/pages/teacher/applyLab.vue b/element-vue/src/pages/teacher/applyLab.vue
index 791a5ac..c5f5edc 100644
--- a/element-vue/src/pages/teacher/applyLab.vue
+++ b/element-vue/src/pages/teacher/applyLab.vue
@@ -77,14 +77,12 @@
                 </div>
             </el-dialog>
             <!--            表格：节数选择-->
-            <el-dialog :title="form.position+'  '+form.name" :visible.sync="courseDialog" append-to-body
-                       :close-on-click-modal="false" v-if="tableAlive">
-                <tb_course :cClick="cellClick" :cStyle="cellStyle" table-label="点击相应的位置选取时间段" ref="times"></tb_course>
-            </el-dialog>
+            <tb_course :cClick="cellClick" :cStyle="cellStyle" table-label="点击相应的位置选取时间段" ref="times"
+                       :custom="true"></tb_course>
             <!--            checkbox:周次选择-->
             <el-dialog :visible.sync="weekDialog" title="请选择周数" width="400px" :close-on-click-modal="false"
                        :before-close="beforeClose" :destroy-on-close="true">
-                <week-selection @add="addWeek" @cancel="cancelSelection" ref="weekSelection"
+                <week-selection @add="addWeek" @cancel="weekDialog=false" ref="weekSelection"
                                 :able-list="ableList"></week-selection>
             </el-dialog>
         </el-container>
@@ -94,12 +92,13 @@
 </template>
 
 <script>
-    import tb_course from "~/components/tb_course";
+    import tb_course from "~/components/tb_courseDialog";
     import navBar from "~/components/teacher/navBar";
     import weekSelection from "~/components/weekSelection";
     import timeSelect from "~/components/timeSelect";
     import {get, post, stop} from "~/utils";
     import {showDialog, showFail, showSuccess} from "~/utils/dialog";
+    import {arr2shortString} from "~/utils/converter";
 
     export default {
         name: "applyLab",
@@ -220,24 +219,25 @@
                 //提交
                 await showDialog("确认预约此时间段吗？", this)
                 await post('lb/labrecord/updateWeeks', this.form)
-                await showSuccess("预约成功，管理员正在审核",this)
+                await this.getScheduleAble()
+                await showSuccess("预约成功，管理员正在审核", this)
                 this.form.weeks = []
 
-                if (targetValue.length !== 0) {
-                    this.perTargetValue.textContent = '【' + targetValue + '】周'
-                    this.aWeekValue.push(targetValue)    //单个节数时间段添加完成，包括[rowIndex,column,targetValue]
-                    this.allWeeksValue.push(this.aWeekValue)   //把单个格子选择的时间段添加到allWeeksValue中
-                    this.perTargetValue.style.backgroundColor = 'lightyellow'
-                    for (let i = 0; i < this.allWeeksValue.length; i++) {
-                        for (let j = i + 1; j < this.allWeeksValue.length; j++) {
-                            if (this.allWeeksValue[i][0] === this.allWeeksValue[j][0] && this.allWeeksValue[i][1] === this.allWeeksValue[j][1]) {
-                                this.allWeeksValue.splice(i, 1)
-                            }
-                        }
-                    }
-                }
-                this.aWeekValue = []
-                this.$refs.weekSelection.checkedValue = []   //将周数选择器已选择选项置空
+                // if (targetValue.length !== 0) {
+                //     this.perTargetValue.textContent = '【' + targetValue + '】周'
+                //     this.aWeekValue.push(targetValue)    //单个节数时间段添加完成，包括[rowIndex,column,targetValue]
+                //     this.allWeeksValue.push(this.aWeekValue)   //把单个格子选择的时间段添加到allWeeksValue中
+                //     this.perTargetValue.style.backgroundColor = 'lightyellow'
+                //     for (let i = 0; i < this.allWeeksValue.length; i++) {
+                //         for (let j = i + 1; j < this.allWeeksValue.length; j++) {
+                //             if (this.allWeeksValue[i][0] === this.allWeeksValue[j][0] && this.allWeeksValue[i][1] === this.allWeeksValue[j][1]) {
+                //                 this.allWeeksValue.splice(i, 1)
+                //             }
+                //         }
+                //     }
+                // }
+                // this.aWeekValue = []
+                // this.$refs.weekSelection.checkedValue = []   //将周数选择器已选择选项置空
                 // console.log(this.allWeeksValue)
             },
             //取消一个格子已选择这些周数
@@ -290,12 +290,14 @@
             //     this.tableAlive = false   //表格失活
             // },
             setTime: function () {
-                this.tableAlive = true
                 // alert('这里本来要验证的，为了方便查看表格，暂无设置，需要验证请把代码行注释解除掉')
                 // this.courseDialog = true
-                this.$refs.courseForm.validate((valid)=>{
-                    if (valid){
-                        this.courseDialog=true
+                this.$refs.courseForm.validate(async (valid) => {
+                    if (valid) {
+                        console.log(this)
+                        await this.getScheduleAble()
+                        this.$refs.times.lab = this.lab
+                        this.$refs.times.courseDialog = true
                         this.formDialog = false
                     }
                 })
@@ -314,6 +316,34 @@
             },
             async loadCourse() {
                 this.courseOption = await get("lb/usercourse/findbyyearandsemester/" + this.$refs.timeSelection.year + "/" + this.$refs.timeSelection.semester)
+            },
+            async getScheduleAble() {
+                const params = {
+                    labId: this.form.labId,
+                    year: this.$refs.timeSelection.year,
+                    semester: this.$refs.timeSelection.semester,
+                    uc_id: this.form.uc_id
+                }
+                const schedule = await get('lb/labTime/getLabScheduleAbleBook', params)
+                const booked = await get('lb/labrecord/getWeekBooked', params)
+                for (let i = 0; i < schedule.length; i++) {
+                    this.$refs.times.tableData[i].Monday = arr2shortString(schedule[i][0]) ? '<span style="color:#1989fa">'+arr2shortString(schedule[i][0]) + '周可预约' +'</span>': ''
+                    this.$refs.times.tableData[i].Tuesday =arr2shortString(schedule[i][1]) ? '<span style="color:#1989fa">'+arr2shortString(schedule[i][1]) + '周可预约' +'</span>': ''
+                    this.$refs.times.tableData[i].Wednesday = arr2shortString(schedule[i][2]) ? '<span style="color:#1989fa">'+arr2shortString(schedule[i][2]) + '周可预约' +'</span>': ''
+                    this.$refs.times.tableData[i].Thursday = arr2shortString(schedule[i][3]) ? '<span style="color:#1989fa">'+arr2shortString(schedule[i][3]) + '周可预约' +'</span>': ''
+                    this.$refs.times.tableData[i].Friday = arr2shortString(schedule[i][4]) ? '<span style="color:#1989fa">'+arr2shortString(schedule[i][4]) + '周可预约' +'</span>': ''
+                    this.$refs.times.tableData[i].Saturday = arr2shortString(schedule[i][5]) ? '<span style="color:#1989fa">'+arr2shortString(schedule[i][5]) + '周可预约' +'</span>': ''
+                    this.$refs.times.tableData[i].Sunday = arr2shortString(schedule[i][6]) ? '<span style="color:#1989fa">'+arr2shortString(schedule[i][6]) + '周可预约' +'</span>': ''
+                }
+                for (let i = 0; i < booked.length; i++) {
+                    this.$refs.times.tableData[i].Monday = arr2shortString(booked[i][0]) ? '<span style="color:red">'+arr2shortString(booked[i][0]) + '周已预约' +'</span><br>'+this.$refs.times.tableData[i].Monday : this.$refs.times.tableData[i].Monday
+                    this.$refs.times.tableData[i].Tuesday =arr2shortString(booked[i][1]) ? '<span style="color:red">'+arr2shortString(booked[i][1]) + '周已预约' +'</span><br>'+this.$refs.times.tableData[i].Tuesday : this.$refs.times.tableData[i].Tuesday
+                    this.$refs.times.tableData[i].Wednesday = arr2shortString(booked[i][2]) ? '<span style="color:red">'+arr2shortString(booked[i][2]) + '周已预约' +'</span><br>'+this.$refs.times.tableData[i].Wednesday : this.$refs.times.tableData[i].Wednesday
+                    this.$refs.times.tableData[i].Thursday = arr2shortString(booked[i][3]) ? '<span style="color:red">'+arr2shortString(booked[i][3]) + '周已预约' +'</span><br>'+this.$refs.times.tableData[i].Thursday : this.$refs.times.tableData[i].Thursday
+                    this.$refs.times.tableData[i].Friday = arr2shortString(booked[i][4]) ? '<span style="color:red">'+arr2shortString(booked[i][4]) + '周已预约' +'</span><br>'+this.$refs.times.tableData[i].Friday : this.$refs.times.tableData[i].Friday
+                    this.$refs.times.tableData[i].Saturday = arr2shortString(booked[i][5]) ? '<span style="color:red">'+arr2shortString(booked[i][5]) + '周已预约' +'</span><br>'+this.$refs.times.tableData[i].Saturday : this.$refs.times.tableData[i].Saturday
+                    this.$refs.times.tableData[i].Sunday = arr2shortString(booked[i][6]) ? '<span style="color:red">'+arr2shortString(booked[i][6]) + '周已预约' +'</span><br>'+this.$refs.times.tableData[i].Sunday : this.$refs.times.tableData[i].Sunday
+                }
             }
         },
         //钩子函数，生命周期mouted
diff --git a/element-vue/src/router.js b/element-vue/src/router.js
index 37fae8a..a333504 100644
--- a/element-vue/src/router.js
+++ b/element-vue/src/router.js
@@ -19,7 +19,6 @@ import supIndex from "~/components/supManager/index";
 import globalPersonal from "~/components/personal";
 import userManage from "~/components/supManager/userManage";
 import labManager from "~/components/supManager/labManage";
-import tool from "~/components/tool";
 
 //manager
 import check from "~/components/supManager/check";
@@ -139,10 +138,6 @@ const routes = [
         path: '/labApplyDetail/:id',
         component: labApplyDetail,
         props: true
-    },
-    {
-        path: '/tool',
-        component: tool
     }
 ]