From 39fc04667ff781c009b49d44a1a6b858f4908c37 Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Tue, 19 May 2020 02:24:34 +0800
Subject: [PATCH] =?UTF-8?q?[fix][V]=EF=BC=9A=E5=AF=B9=E6=8E=A5=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 element-vue/src/components/timeSelect.vue     | 80 ++++++++++---------
 .../src/pages/teacher/courseManagement.vue    | 35 ++++----
 2 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/element-vue/src/components/timeSelect.vue b/element-vue/src/components/timeSelect.vue
index df8cc08..64cc8cf 100644
--- a/element-vue/src/components/timeSelect.vue
+++ b/element-vue/src/components/timeSelect.vue
@@ -2,28 +2,30 @@
     <div>
         <el-row>
             <el-col :span="6" :offset="6">
-                学年：<el-select v-model="year" size="small" >
-                <el-option
-                        v-for="item in selectOptions1"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                        @click.native="selectYear"
-                >
-                </el-option>
-            </el-select>
+                学年：
+                <el-select v-model="year" size="small">
+                    <el-option
+                            v-for="item in selectOptions1"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                            @click.native="selectYear"
+                    >
+                    </el-option>
+                </el-select>
             </el-col>
             <el-col :span="6">
-                学期：<el-select v-model="semester" size="small" >
-                <el-option
-                        v-for="item in selectOptions2"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                        @click.native="selectSemester"
-                >
-                </el-option>
-            </el-select>
+                学期：
+                <el-select v-model="semester" size="small">
+                    <el-option
+                            v-for="item in selectOptions2"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                            @click.native="selectSemester"
+                    >
+                    </el-option>
+                </el-select>
             </el-col>
         </el-row>
         <br><br>
@@ -33,41 +35,41 @@
 <script>
     export default {
         name: "timeSelect",
-        data(){
-            return{
-                year:'1920',
-                semester:'2',
-                selectOptions1:[
+        data() {
+            return {
+                year: '2019',
+                semester: 2,
+                selectOptions1: [
                     {
-                        value:'1718',
-                        label:'2017-2018年'
+                        value: '2017',
+                        label: '2017-2018年'
                     },
                     {
-                        value:'1819',
-                        label:'2018-2019年'
+                        value: '2018',
+                        label: '2018-2019年'
                     },
                     {
-                        value:'1920',
-                        label:'2019-2020年'
+                        value: '2019',
+                        label: '2019-2020年'
                     }
                 ],
-                selectOptions2:[
+                selectOptions2: [
                     {
-                        value:'1',
-                        label:'第一学期'
+                        value: 1,
+                        label: '第一学期'
                     },
                     {
-                        value:'2',
-                        label:'第二学期'
+                        value: 2,
+                        label: '第二学期'
                     }
                 ],
             }
         },
-        methods:{
-            selectYear(){
+        methods: {
+            selectYear() {
                 console.log(this.year)
             },
-            selectSemester(){
+            selectSemester() {
                 console.log(this.semester)
             }
         },
diff --git a/element-vue/src/pages/teacher/courseManagement.vue b/element-vue/src/pages/teacher/courseManagement.vue
index 95c6bec..bb13a2e 100644
--- a/element-vue/src/pages/teacher/courseManagement.vue
+++ b/element-vue/src/pages/teacher/courseManagement.vue
@@ -17,7 +17,7 @@
         </div>
         <el-table :data="tableDataComputed" border>
             <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column label="课程编号" prop="uc_id"></el-table-column>
+            <el-table-column label="课程编号" prop="ucId"></el-table-column>
             <el-table-column label="课程名称" prop="name"></el-table-column>
             <el-table-column label="软件名称" prop="software"></el-table-column>
             <el-table-column label="授课班级" prop="classes"></el-table-column>
@@ -135,25 +135,25 @@
                 },
                 selectOptions1: [
                     {
-                        value: '1718',
+                        value: '2017',
                         label: '2017-2018年'
                     },
                     {
-                        value: '1819',
+                        value: '2018',
                         label: '2018-2019年'
                     },
                     {
-                        value: '1920',
+                        value: '2019',
                         label: '2019-2020年'
                     }
                 ],
                 selectOptions2: [
                     {
-                        value: '1',
+                        value: 1,
                         label: '第一学期'
                     },
                     {
-                        value: '2',
+                        value: 2,
                         label: '第二学期'
                     }
                 ],
@@ -162,7 +162,7 @@
         methods: {
             //加载表格数据
             async load() {
-                this.tableData = await get('lb/course/courseManagement')
+                this.tableData = await get('lb/usercourse/findbyyearandsemester/'+this.$refs.timeSelect.year+'/'+this.$refs.timeSelect.semester)
             },
             //添加课程
             addCourse() {
@@ -178,11 +178,9 @@
                 this.courseForm = rowData
             },
             //删除课程
-            deleteCourse(rowData) {
-                showDialog("确认要删除吗？", this)
-                post('lb/user/deleteCourse', {
-                    uid: rowData.uc_id
-                }).then(() => {
+            async deleteCourse(rowData) {
+                await showDialog("确认要删除吗？", this)
+                post('lb/usercourse/deleteusercourse/'+rowData.ucId).then(() => {
                     showSuccess("删除成功", this)
                     this.load()
                 }).catch(e => {
@@ -198,14 +196,14 @@
                         await showDialog("确定要" + (this.edit ? '编辑' : '新增') + '吗？', this)
                         //编辑提交
                         if (this.edit) {
-                            await post('lb/usercourse/updatecourse', {
+                            await post('lb/usercourse/updateusercourse', {
                                 year: this.courseForm.year,
                                 semester: this.courseForm.semester,
-                                uc_id: this.courseForm.uc_id,
+                                ucId: this.courseForm.ucId,
                                 name: this.courseForm.name,
                                 software: this.courseForm.software,
                                 classes: this.courseForm.classes,
-                                population: this.courseForm.population,
+                                population: parseInt(this.courseForm.population),
                                 remind: this.courseForm.remind,
                                 isHaveDocuments: this.courseForm.isHaveDocuments
                             }).catch(async e => {
@@ -224,7 +222,7 @@
                                 name: this.courseForm.name,
                                 software: this.courseForm.software,
                                 classes: this.courseForm.classes,
-                                population: this.courseForm.population,
+                                population:  parseInt(this.courseForm.population),
                                 remind: this.courseForm.remind,
                                 isHaveDocuments: this.courseForm.isHaveDocuments
                             }).catch(async e => {
@@ -249,14 +247,9 @@
         computed: {
             tableDataComputed() {
                 return this.tableData.filter(data => !this.search
-                    || data.uc_id.toLowerCase().includes(this.search.toLowerCase())
-                    || data.u_id.toLowerCase().includes(this.search.toLowerCase())
                     || data.name.toLowerCase().includes(this.search.toLowerCase())
                     || data.software.toLowerCase().includes(this.search.toLowerCase())
                     || data.classes.toLowerCase().includes(this.search.toLowerCase())
-                    || data.population.toLowerCase().includes(this.search.toLowerCase())
-                    || data.remind.toLowerCase().includes(this.search.toLowerCase())
-                    || data.isHaveDocuments.toLowerCase().includes(this.search.toLowerCase())
                 )
             }
         },