From 264286510b340282f4a2ba03489000602495e148 Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Wed, 27 May 2020 15:35:44 +0800
Subject: [PATCH] =?UTF-8?q?[fix][v]:=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9co?=
 =?UTF-8?q?nfig.year?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 element-vue/src/components/applyDialog.vue    |  2 +-
 .../src/components/supManager/labManage.vue   |  3 +-
 .../src/components/supManager/setLabTime.vue  | 20 ++-----------
 .../src/components/supManager/userManage.vue  |  9 +++---
 element-vue/src/components/test.vue           | 30 -------------------
 element-vue/src/components/timeSelect.vue     | 19 +++---------
 element-vue/src/config.js                     | 21 ++++++++++++-
 .../src/pages/teacher/courseManagement.vue    | 16 ++--------
 element-vue/src/pages/test.vue                |  2 +-
 9 files changed, 37 insertions(+), 85 deletions(-)
 delete mode 100644 element-vue/src/components/test.vue

diff --git a/element-vue/src/components/applyDialog.vue b/element-vue/src/components/applyDialog.vue
index 2df013f..8c0a495 100644
--- a/element-vue/src/components/applyDialog.vue
+++ b/element-vue/src/components/applyDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="请填写以下申请信息" :visible="dialogVisable">
+        <el-dialog title="请确认以下申请信息" :visible="dialogVisable">
             <el-form :model="form">
                 <el-form-item label="申请时间" prop="date"><el-input type="date" v-model="form.date"></el-input></el-form-item>
             </el-form>
diff --git a/element-vue/src/components/supManager/labManage.vue b/element-vue/src/components/supManager/labManage.vue
index 489857a..64eefdc 100644
--- a/element-vue/src/components/supManager/labManage.vue
+++ b/element-vue/src/components/supManager/labManage.vue
@@ -129,6 +129,7 @@
     import {closeLoading, showDialog, showDialogWithReject, showFail, showLoading, showSuccess} from "~/utils/dialog";
     import setLabTime from "~/components/supManager/setLabTime";
     import {item2html} from "~/utils/converter";
+    import config from "~/config";
 
     export default {
         components: {addLab, setLabTime, tb_courseDialog},
@@ -138,7 +139,7 @@
                 setLabTimeDialog: false,
                 form: {},
                 time: {
-                    year: '2019',
+                    year: config.defyear,
                     semester: 2
                 },
                 search: '',
diff --git a/element-vue/src/components/supManager/setLabTime.vue b/element-vue/src/components/supManager/setLabTime.vue
index 02f1db4..332cae2 100644
--- a/element-vue/src/components/supManager/setLabTime.vue
+++ b/element-vue/src/components/supManager/setLabTime.vue
@@ -49,6 +49,7 @@
     import {get, post} from "~/utils";
     import {showDialog, showSuccess} from "~/utils/dialog";
     import {arr2shortString} from "~/utils/converter";
+    import config from "~/config";
 
     export default {
         components: {weekSelection, tb_course},
@@ -70,24 +71,7 @@
                 courseDialog: false,
                 tableAlive: false,     //用于重载表格
                 weekDialog: false,
-                selectOptions1: [
-                    {
-                        value: '2017',
-                        label: '2017-2018年'
-                    },
-                    {
-                        value: '2018',
-                        label: '2018-2019年'
-                    },
-                    {
-                        value: '2019',
-                        label: '2019-2020年'
-                    },
-                    {
-                        value: '2020',
-                        label: '2020-2021年'
-                    }
-                ],
+                selectOptions1: config.year,
                 selectOptions2: [
                     {
                         value: 1,
diff --git a/element-vue/src/components/supManager/userManage.vue b/element-vue/src/components/supManager/userManage.vue
index 9725639..019903a 100644
--- a/element-vue/src/components/supManager/userManage.vue
+++ b/element-vue/src/components/supManager/userManage.vue
@@ -3,10 +3,9 @@
         <el-form :model="time" :inline="true" style="width: 100%">
             <el-form-item label="学年" style="width: 20% ;">
                 <el-select v-model="time.year" style="">
-                    <el-option label="2017-2018" value="2017"></el-option>
-                    <el-option label="2018-2019" value="2018"></el-option>
-                    <el-option label="2019-2020" value="2019"></el-option>
-                    <el-option label="2020-2021" value="2020"></el-option>
+                    <div v-for="item in year">
+                        <el-option :label="item.label" :value="item.value"></el-option>
+                    </div>
                 </el-select>
             </el-form-item>
             <el-form-item label="学期" style="width: 20%">
@@ -83,12 +82,14 @@
     import userEditForm from "~/components/supManager/userEditForm";
     import tb_courseDialog from "~/components/tb_courseDialog";
     import {item2html} from "~/utils/converter";
+    import config from "~/config";
 
     export default {
         components: {userEditForm, tb_courseDialog},
         data() {
             return {
                 search: '',
+                year: config.year,
                 items: [],
                 tableData: [],
                 dialogFormVisible: false,
diff --git a/element-vue/src/components/test.vue b/element-vue/src/components/test.vue
deleted file mode 100644
index fc16921..0000000
--- a/element-vue/src/components/test.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-  <div id="app">
-    <img src="./assets/logo.png">
-    <div>
-      <el-button @click="startHacking">Start</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  methods: {
-    startHacking () {
-      this.$notify({
-        title: 'It works!',
-        type: 'success',
-        message: 'We\'ve laid the ground work for you. It\'s time for you to build something epic!',
-        duration: 5000
-      })
-    }
-  }
-}
-</script>
-
-<style>
-#app {
-  font-family: Helvetica, sans-serif;
-  text-align: center;
-}
-</style>
diff --git a/element-vue/src/components/timeSelect.vue b/element-vue/src/components/timeSelect.vue
index 9a4fd05..e12aaf8 100644
--- a/element-vue/src/components/timeSelect.vue
+++ b/element-vue/src/components/timeSelect.vue
@@ -33,26 +33,15 @@
 </template>
 
 <script>
+    import config from "~/config";
+
     export default {
         name: "timeSelect",
         data() {
             return {
                 year: '2019',
                 semester: 2,
-                selectOptions1: [
-                    {
-                        value: '2017',
-                        label: '2017-2018年'
-                    },
-                    {
-                        value: '2018',
-                        label: '2018-2019年'
-                    },
-                    {
-                        value: '2019',
-                        label: '2019-2020年'
-                    }
-                ],
+                selectOptions1: config.year,
                 selectOptions2: [
                     {
                         value: 1,
@@ -73,7 +62,7 @@
                 this.$emit('selectSemester')
             },
         }
-        }
+    }
 </script>
 
 <style scoped>
diff --git a/element-vue/src/config.js b/element-vue/src/config.js
index 15be9bc..f6cc236 100644
--- a/element-vue/src/config.js
+++ b/element-vue/src/config.js
@@ -3,7 +3,26 @@
 const host = 'http://127.0.0.1:8080/'
 
 const config = {
-    host
+    host,
+    defyear: '2019',
+    year:[
+        {
+            value: '2017',
+            label: '2017-2018年'
+        },
+        {
+            value: '2018',
+            label: '2018-2019年'
+        },
+        {
+            value: '2019',
+            label: '2019-2020年'
+        },
+        {
+            value: '2020',
+            label: '2020-2021年'
+        }
+    ]
 }
 
 export default config
diff --git a/element-vue/src/pages/teacher/courseManagement.vue b/element-vue/src/pages/teacher/courseManagement.vue
index 907c8d0..91c4c84 100644
--- a/element-vue/src/pages/teacher/courseManagement.vue
+++ b/element-vue/src/pages/teacher/courseManagement.vue
@@ -117,6 +117,7 @@
     import timeSelect from "~/components/timeSelect";
     import {get, post} from "~/utils";
     import {showDialog, showFail, showSuccess} from "~/utils/dialog";
+    import config from "~/config";
 
     export default {
         name: "courseManagement",
@@ -149,20 +150,7 @@
                     ishavedocuments: 0,
                     remind: '',
                 },
-                selectOptions1: [
-                    {
-                        value: '2017',
-                        label: '2017-2018年'
-                    },
-                    {
-                        value: '2018',
-                        label: '2018-2019年'
-                    },
-                    {
-                        value: '2019',
-                        label: '2019-2020年'
-                    }
-                ],
+                selectOptions1: config.year,
                 selectOptions2: [
                     {
                         value: 1,
diff --git a/element-vue/src/pages/test.vue b/element-vue/src/pages/test.vue
index e4beb22..913797c 100644
--- a/element-vue/src/pages/test.vue
+++ b/element-vue/src/pages/test.vue
@@ -1,4 +1,4 @@
-<template>
+template>
     <div id="app">
         <img src="../assets/logo.png">
         <div>