From f7161d5c6976827ca365e1feab63098d56cef1d7 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 16 Jul 2024 18:04:34 +0800
Subject: [PATCH] =?UTF-8?q?7.16=E6=97=A5=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/Logo.vue        |  2 +-
 src/views/course/components/addClass.vue      | 14 +++++++++-----
 src/views/course/components/changeSubject.vue | 12 +++++++-----
 src/views/course/components/changeTime.vue    |  2 +-
 src/views/course/history.vue                  |  4 ++--
 vue.config.js                                 |  2 +-
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 57e0bb3..6dcb035 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -50,7 +50,7 @@
     width: 100%;
     height: 50px;
     line-height: 50px;
-    background: #fff;
+    // background: #fff;
     text-align: center;
     overflow: hidden;
 
diff --git a/src/views/course/components/addClass.vue b/src/views/course/components/addClass.vue
index 8083b08..67e22de 100644
--- a/src/views/course/components/addClass.vue
+++ b/src/views/course/components/addClass.vue
@@ -30,7 +30,7 @@
           <el-table-column v-for="(column, index) in columns" :key="index" :prop="column.prop" :label="column.label"
             :width="column.width">
             <template slot-scope="scope">
-              <div v-if="column.type === 'time'" @click="openTime(scope.$index,scope.row[column.prop])">
+              <div v-if="column.type === 'time'"  class="subjectCell" @click="openTime(scope.$index,scope.row[column.prop])">
                 {{ formatTime(scope.row[column.prop]) }}
               </div>
               <div class="subjectCell" v-else @click="openSubject(scope.$index,column.prop,scope.row[column.prop])">
@@ -136,7 +136,8 @@
             sunday: {}
           },
           {
-            time: ['11:15', '13:00'],
+            time: ['11:15', '13:00'],
+            monday:{},
             tuesday: {},
             wednesday: {},
             thursday: {},
@@ -145,7 +146,8 @@
             sunday: {}
           },
           {
-            time: ['13:00', '14:00'],
+            time: ['13:00', '14:00'],
+            monday:{},
             tuesday: {},
             wednesday: {},
             thursday: {},
@@ -154,7 +156,8 @@
             sunday: {}
           },
           {
-            time: ['14:15', '15:15'],
+            time: ['14:15', '15:15'],
+            monday:{},
             tuesday: {},
             wednesday: {},
             thursday: {},
@@ -169,7 +172,8 @@
       // 增加一行
       addColum(index) {
         const obj = {
-          time: [],
+          time: [],
+          monday:{},
           tuesday: {},
           wednesday: {},
           thursday: {},
diff --git a/src/views/course/components/changeSubject.vue b/src/views/course/components/changeSubject.vue
index 31e8fbb..fe70fdf 100644
--- a/src/views/course/components/changeSubject.vue
+++ b/src/views/course/components/changeSubject.vue
@@ -52,7 +52,8 @@
   </div>
 </template>
 
-<script>
+<script>
+  import { deepCopy } from "@/utils";
   export default {
     components: {
 
@@ -93,12 +94,13 @@
     },
     created() {},
     methods: {
-      setIndex(index, prop, form) {
-        this.submitObj = form
+      setIndex(index, prop, form) {
+        this.submitObj = deepCopy(form)
         this.submitObj.prop = prop
         this.submitObj.index = index
         console.log("this.submitObj", this.submitObj)
-      },
+      },
+
       changeTeacher(e) {
         this.teacher_options.map(item => {
           if (item.id === e) {
@@ -139,7 +141,7 @@
           return
         }
         console.log("this.form111", this.submitObj)
-        this.$emit("@refresh", this.submitObj)
+        this.$emit("refresh", this.submitObj)
         this.isShow = false
       }
     },
diff --git a/src/views/course/components/changeTime.vue b/src/views/course/components/changeTime.vue
index 1a46400..3bf6b3c 100644
--- a/src/views/course/components/changeTime.vue
+++ b/src/views/course/components/changeTime.vue
@@ -54,7 +54,7 @@
         }
       },
       submit() {
-        if (!this.range) {
+        if (!this.range || this.range.length<1) {
           this.$message({
             type: 'warning',
             message: '请选择上课时间'
diff --git a/src/views/course/history.vue b/src/views/course/history.vue
index b835c7b..c5c9091 100644
--- a/src/views/course/history.vue
+++ b/src/views/course/history.vue
@@ -29,9 +29,9 @@
               <div>
                 <el-button type="primary" size="small">查询</el-button>
               </div>
-              <div>
+              <!-- <div>
                 <el-button type="primary" size="small" @click="editCourse('add')">新增课程</el-button>
-              </div>
+              </div> -->
             </div>
           </div>
 
diff --git a/vue.config.js b/vue.config.js
index e16b92c..cf330df 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: './dist',
+  outputDir: '/Users/mac/Documents/朗业/2024/s-苏州科技商学院/suzhoukeji/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项