Merge branch 'Nov16thResetMusic' into online

package.json

@@ -33,6 +33,7 @@
     "npm": "^6.13.0",
     "nprogress": "0.2.0",
     "numeral": "^2.0.6",
+    "object-diff": "0.0.4",
     "path-to-regexp": "2.4.0",
     "qrcodejs2": "0.0.2",
     "qs": "^6.8.0",

src/App.vue

@@ -86,6 +86,7 @@ body {
 }
 </style>
 <style lang="scss">
+$--color-primary: teal;
 .el-table {
   width: 99.9% !important;
 }
@@ -105,6 +106,9 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
   -moz-appearance: textfield;
 }
+.el-dialog{
+  margin-bottom: 10vh;
+}
 .el-tabs__item.is-active {
   color: #14928a !important;
   // font-size: 14px;

src/layout/components/TagsView.vue

@@ -80,7 +80,6 @@ export default {
       return route.path === this.$route.path
     },
     syncTagViewAndSaveForm() {
-      console.log(this.$store.state.tagsView.visitedViews)
       const keys = this.$store.state.tagsView.visitedViews.map(item => item.fullPath)
       const searchs = new Searchs()
       const sks = Object.keys(searchs.getSearchs())

src/main.js

@@ -3,9 +3,11 @@ import ElementUI from 'element-ui'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import 'default-passive-events'
 import 'babel-polyfill'
+import './theme/index.css'
+
 // import './global.scss'
 
-import 'element-ui/lib/theme-chalk/index.css'
+// import 'element-ui/lib/theme-chalk/index.css'
 import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
 
 import '@/styles/index.scss' // global css
@@ -64,7 +66,7 @@ export const $message = new DonMessage()
 Vue.prototype.$message = $message
 
 // 全局移除数字滚动
-document.addEventListener('mousewheel', function (event) {
+document.addEventListener('mousewheel', function () {
   if (document.activeElement.type === 'number') {
     document.activeElement.blur()
   }

src/store/modules/selects.js

@@ -27,20 +27,20 @@ export default {
     },
   },
   actions: {
-    async setBranchs({ commit, state }, force) {
+    async setBranchs ({ commit, state }, force) {
       if (!state.branchs.length || force === true) {
         try {
-          const res = await branchQueryPage({rows: 9999})
+          const res = await branchQueryPage({ rows: 9999 })
           commit('commit_branchs', res.data.rows)
-        } catch (error) {}
+        } catch (error) { }
       }
     },
-    async setSubject({ commit, state }, force) {
+    async setSubject ({ commit, state }, force) {
       if (!state.subjects.length || force === true) {
         try {
-          const res = await getSubject({rows: 9999})
+          const res = await getSubject({ rows: 9999 })
           commit('commit_subjects', res.data)
-        } catch (error) {}
+        } catch (error) { }
       }
     }
   }

src/views/teamDetail/componentCourse/addCompound.vue

@@ -4,7 +4,14 @@
       <div class="boxWrap">
         <p>临时合课列表<span style="color:red;"> {{compoundList.length}} </span></p>
         <el-popover placement="top"
+                    v-model='isLook'
                     trigger="click">
+          <div>
+            <p class="title">临时合课列表 <i class="el-icon-minus minus"
+                 @click="isLook=false"></i></p>
+
+            <el-divider></el-divider>
+          </div>
           <el-button type="text"
                      style="float:right"
                      @click="clearCom">清空课表</el-button>
@@ -14,7 +21,8 @@
                         height='300px'
                         :header-cell-style="{background:'#EDEEF0',color:'#444'}">
                 <el-table-column align='center'
-                                 label="主课">
+                                 label="主课"
+                                 width="110">
                   <template slot-scope="scope">
 
                     <el-radio :label="scope.row.id"></el-radio>
@@ -66,16 +74,31 @@
 
       </div>
     </el-card>
-  </div>
+    <el-dialog :visible.sync="show"
+               title="临时合课信息"
+               append-to-body
+               width="800px">
+      <compoundClass :show="show"
+                     v-if="show"
+                     @closeReset='closeReset'
+                     :isDisabled='true'
+                     @getList='getList'
+                     :id='radio' />
+    </el-dialog>
   </div>
 </template>
 <script>
+import compoundClass from './compoundClass'
 export default {
   props: ['compoundList'],
+  components: { compoundClass },
   data () {
     return {
       radio: '',
-      dataList: this.compoundList
+      dataList: this.compoundList,
+      isLook: false,
+      show: false,
+
     }
   },
   methods: {
@@ -100,7 +123,17 @@ export default {
         this.$message.error('请选择相同的课程类型')
         return
       }
-    }
+      if (this.dataList.length <= 1) {
+        this.$message.error('请至少选择2节课程')
+        return
+      }
+      // 做判断 
+      this.show = true;
+      this.isLook = false
+
+    },
+    getList () { },
+    closeReset () { }
   },
   watch: {
     compoundList (val) {
@@ -112,6 +145,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.title {
+  line-height: 44px;
+}
 .fixedBox {
   position: fixed;
   bottom: 20px;
@@ -120,6 +156,7 @@ export default {
   width: 200px;
   background-color: #fff;
   font-size: 14px;
+
   .boxWrap {
     display: flex;
     flex-direction: row;
@@ -130,4 +167,14 @@ export default {
     }
   }
 }
+/deep/.el-divider--horizontal {
+  margin: 0 !important;
+}
+.minus {
+  float: right;
+  line-height: 44px;
+  padding-right: 20px;
+  font-size: 20px;
+  cursor: pointer;
+}
 </style>

src/views/teamDetail/componentCourse/compoundClass.vue

@@ -0,0 +1,351 @@
+<template>
+  <div>
+    <el-form :model="maskForm"
+             class="maskForm"
+             ref="maskForm"
+             :rules="maskRules"
+             label-position="right"
+             label-width="120px"
+             :inline="true">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="课程名称"
+                        prop="teacher">
+            <el-input v-model.trim="maskForm.name"
+                      style="width:220px!important"
+                      placeholder="请输入课程名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item>
+            <div style="width:220px!important">
+              <a href="#"
+                 class="studentTitle"
+                 @click="studentListModalVisible=true"> 学生列表>></a>
+            </div>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="主教老师"
+                        prop="teacher">
+            <el-select v-model.trim="maskForm.teacher"
+                       style="width:220px!important"
+                       @change="changeTeacher"
+                       clearable
+                       filterable>
+              <el-option v-for="(item,index) in teacherList"
+                         :key="index"
+                         :value="item.id"
+                         :label="item.realName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="助教老师"
+                        v-if="maskForm.type != 'MUSIC_NETWORK'&&maskForm.type != 'HIGH_ONLINE'&&maskForm.groupType == 'MUSIC'"
+                        prop="assistant">
+            <el-select v-model.trim="maskForm.assistant"
+                       style="width:220px!important"
+                       clearable
+                       filterable
+                       multiple
+                       collapse-tags>
+              <el-option v-for="(item,index) in teacherList"
+                         :key="index"
+                         :value="item.id"
+                         :label="item.realName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span='12'>
+          <el-form-item label="上课日期"
+                        prop="date">
+            <el-date-picker v-model.trim="maskForm.date"
+                            type="date"
+                            :picker-options="{
+                            firstDayOfWeek:1
+                          }"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="课程时长(分钟)"
+                        prop="timer">
+            <el-input type='number'
+                      :disabled='isDisabled'
+                      style="width:220px!important"
+                      v-model="maskForm.timer"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="开始时间"
+                        prop="startTime">
+            <el-time-picker placeholder="起始时间"
+                            v-model.trim="maskForm.startTime"
+                            @change="changeStartTime"
+                            format='HH:mm'
+                            value-format='HH:mm'
+                            :picker-options="{
+                            selectableRange: '04:30:00 - 23:30:00'
+                            }"></el-time-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间"
+                        prop="endTime">
+            <el-time-picker placeholder="结束时间"
+                            v-model.trim="maskForm.endTime"
+                            disabled
+                            format='HH:mm'
+                            value-format='HH:mm'
+                            :picker-options="{
+                            start: '04:30',
+                            step: '00:05',
+                            end: '23:30',
+                            minTime: maskForm.startTime
+                          }"></el-time-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="课程类型"
+                        v-if="maskForm.type == 'VIP'"
+                        prop="courseType">
+            <el-select clearable
+                       style="width:220px!important"
+                       v-model.trim="maskForm.teachMode">
+              <el-option label="线上课"
+                         value="ONLINE"></el-option>
+              <el-option label="线下课"
+                         value="OFFLINE"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="教学地点"
+                        v-if="maskForm.teachMode == 'OFFLINE'&&  maskForm.type == 'VIP'">
+            <el-select v-model.trim="maskForm.address"
+                       style="width:220px!important"
+                       filterable
+                       clearable>
+              <el-option v-for="(item,index) in schoolList"
+                         :key="index"
+                         :value="item.id"
+                         :label="item.name"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+    <div slot="footer"
+         class="dialog-footer">
+      <el-button @click="$listeners.closeReset">取 消</el-button>
+      <el-button type="primary"
+                 @click="submitResetClass">确 定</el-button>
+    </div>
+    <el-dialog title="学员列表"
+               width="650px"
+               append-to-body
+               :visible.sync="studentListModalVisible"
+               destroy-on-close>
+      <viewStudentList :list="studentListModal"
+                       @close="studentListModalVisible = false" />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
+import { getTeacher, resetCourse, getCourseScheduleDetail } from "@/api/buildTeam";
+import viewStudentList from '../components/modals/view-student-list'
+import { getTeachSchool } from "@/api/teacherManager";
+import cleanDeep from 'clean-deep'
+import dayjs from 'dayjs';
+export default {
+  props: ["show", "id", "isDisabled"],
+  components: { viewStudentList },
+  data () {
+    return {
+      courseVisible: false,
+      studentListModalVisible: false,
+      maskForm: {
+        teacher: null,
+        assistant: null,
+        date: null,
+        timer: null,
+        startTime: null,
+        endTime: null,
+        name: null
+      },
+      maskRules: {
+        name: [{ required: true, message: "请输入课程名称", trigger: "blur" }],
+        teacher: [
+          { required: true, message: "请选择主教老师名称", trigger: "blur" }
+        ],
+        date: [{ required: true, message: "请选择上课时间", trigger: "blur" }],
+        startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
+        endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
+      },
+      teacherList: [],
+      schoolList: [],
+      studentListModal: []
+    }
+  },
+  mounted () {
+    getTeacher().then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    });
+
+    this.getDetail(this.id)
+
+  },
+  methods: {
+    submitResetClass () {
+      let maskForm = this.maskForm;
+      if (!maskForm.startTime || !maskForm.endTime) {
+        this.$message.error("请填写开始时间或结束时间");
+        return;
+      }
+      this.$confirm("是否确定?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          let teachingTeacherIdList = maskForm.assistant.join(",");
+          if (teachingTeacherIdList.length <= 0) {
+            let teachingTeacherIdList = null;
+          }
+          let obj = {
+            actualTeacherId: maskForm.teacher,
+            startClassTimeStr: maskForm.startTime,
+            endClassTimeStr: maskForm.endTime,
+            id: maskForm.id,
+            teachingTeacherIdList,
+            classDate: maskForm.date,
+            type: maskForm.type,
+            groupType: maskForm.groupType,
+            schoolId: this.maskForm.address,
+            teachMode: this.maskForm.teachMode,
+          };
+          resetCourse(cleanDeep(obj)).then(res => {
+            if (res.code == 200) {
+              this.$message.success("修改成功");
+              this.$emit('getList')
+              this.$emit('closeReset')
+              // this.getList();
+              // this.courseVisible = false;
+            }
+          });
+        })
+        .catch(() => { });
+    },
+    changeStartTime (val) {
+
+      this.$nextTick(res => {
+        console.log(addTimerFormMinute(this.maskForm.date, val, this.maskForm.timer))
+        if (val) {
+          this.$set(this.maskForm, 'endTime', addTimerFormMinute(this.maskForm.date, val, this.maskForm.timer))
+        } else {
+          this.$set(this.maskForm, 'endTime', '')
+        }
+
+      })
+    },
+    changeTeacher (val) {
+      if (val) {
+        getTeachSchool({
+          userId: val
+        }).then(res => {
+          if (res.code == 200) {
+            this.schoolList = res.data;
+          }
+        })
+        this.maskForm.address = ''
+      }
+    },
+    getDetail (id) {
+      getCourseScheduleDetail({ courseScheduleId: id }).then(res => {
+        if (res.code == 200) {
+          console.log(res.data.groupType)
+          this.maskForm = {
+            id: res.data.id,
+            teacher: res.data.actualTeacherId,
+            assistant: [],
+            date: dayjs(res.data.classDate).format('YYYY-MM-DD'),
+            startTime: dayjs(res.data.startClassTime).format('HH:mm'),
+            endTime: dayjs(res.data.endClassTime).format('HH:mm'),
+            timer: null,
+            type: res.data.type,
+            groupType: res.data.groupType,
+            schoolId: res.data.schoolId,
+            teachMode: res.data.teachMode,
+            name: res.data.name
+          }
+          this.maskForm.assistant = [];
+          for (let i in res.data.teachingTeachers) {
+            if (res.data.teachingTeachers[i].teacherRole == "TEACHING") {
+              this.maskForm.assistant.push(res.data.teachingTeachers[i].userId);
+            }
+          }
+          let time = diffTimerFormMinute(dayjs(res.data.classDate).format('YYYY-MM-DD'), dayjs(res.data.startClassTime).format('HH:mm'), dayjs(res.data.endClassTime).format('HH:mm'))
+          console.log(dayjs(res.data.startClassTime).format('HH:mm'))
+          this.maskForm.timer = time;
+          if (this.maskForm.teacher) {
+            getTeachSchool({
+              userId: this.maskForm.teacher
+            }).then(res => {
+              if (res.code == 200) {
+                this.schoolList = res.data;
+              }
+            })
+          }
+        }
+      })
+    }
+  },
+
+  watch: {
+    id (val) {
+      if (val) {
+        this.getDetail(val)
+      }
+    },
+    'maskForm.timer' (val) {
+      this.$nextTick(res => {
+        if (val) {
+          this.$set(this.maskForm, 'endTime', addTimerFormMinute(this.maskForm.date, this.maskForm.startTime, val))
+        } else {
+          this.$set(this.maskForm, 'endTime', '')
+        }
+
+      })
+    }
+  }
+
+}
+</script>
+<style lang="scss" scoped>
+/deep/.dialog-footer {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
+.studentTitle {
+  width: 120px !important;
+  text-align: right;
+  display: inline-block;
+  color: #409eff;
+}
+</style>

src/views/teamDetail/componentCourse/infoMsg.vue

@@ -10,34 +10,15 @@
                         :key="index"
                         :title="getTitle(item)"
                         :name="index">
-        <el-form :inline='true'>
-          <el-form-item label="课程名称"
-                        style="width:300px">
-            <div>{{item.name}}</div>
-          </el-form-item>
-          <el-form-item label="主教老师"
-                        style="width:300px">
-            <div>{{item.actualTeacherName}}</div>
-          </el-form-item>
-          <br>
-          <el-form-item label="助教老师"
-                        style="width:300px">
-            <div>{{item.teacherName}}</div>
-          </el-form-item>
-          <el-form-item label="上课时间"
-                        style="width:300px">
-            <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div>
-          </el-form-item>
-          <br>
-          <el-form-item label="课程时长"
-                        style="width:300px">
-            <div>{{getTimers(item)}}分钟</div>
-          </el-form-item>
-          <el-form-item label="课程类型"
-                        style="width:300px">
-            <div>{{item.teachMode| teachMode}}</div>
-          </el-form-item>
-        </el-form>
+                        <template slot="title">
+                          <header class="header">
+                            {{item.operatorName}} <span>在</span> {{item.createTime}} <span>修改了</span>
+                          </header>
+                        </template>
+                        <infoMsgContent
+                          :before="item.previousCourseSchedule"
+                          :after="item.currentCourseSchedule"
+                        />
       </el-collapse-item>
     </el-collapse>
     <div v-if="dataList.length <= 0"
@@ -52,27 +33,50 @@ import dayjs from 'dayjs';
 import {
   queryCourseAdjustDetail,
 } from "@/api/buildTeam";
+import infoMsgContent from './infoMsgContent'
 export default {
   props: ['courseScheduleId'],
   data () {
     return {
-      activeName: '',
-      dataList: []
+      activeName: 0,
+      dataList: [],
     }
   },
+  components: { infoMsgContent },
   mounted () {
     queryCourseAdjustDetail({ courseScheduleId: this.courseScheduleId }).then(res => {
       if (res.code == 200) {
         if (res.data) {
-          this.dataList = res.data
+          this.dataList = res.data.map(item => {
+            const parsecurrent = JSON.parse(item.currentCourseSchedule)
+            const currentCourseSchedule = this.filterKeys(parsecurrent)
+            const previousCourseSchedule = this.filterKeys(JSON.parse(item.previousCourseSchedule))
+            return {
+              ...item,
+              operatorName: parsecurrent.operatorName,
+              currentCourseSchedule,
+              previousCourseSchedule,
+            }
+          })
         }
       }
     })
-    console.log(this.courseScheduleId)
   },
   methods: {
+    filterKeys(item) {
+      return {
+        name: item.name,
+        actualTeacherName: item.actualTeacherName,
+        teacherName: item.teacherName,
+        startClassTime: item.startClassTime,
+        classDate: item.classDate,
+        endClassTime: item.endClassTime,
+        teachMode: item.teachMode,
+        timers: this.getTimers(item)
+      }
+    },
     getTitle (item) {
-      return item.operatorName + '在' + item.auditTime + '修改了'
+      return item.operatorName + ' 在 ' + item.createTime + ' 修改了'
     },
     getTimers (item) {
       return diffTimerFormMinute(dayjs(item.classDate).format('YYYY-MM-DD'), dayjs(item.startClassTime).format('HH:mm'), dayjs(item.endClassTime).format('HH:mm'))
@@ -91,4 +95,11 @@ export default {
     margin-top: 120px;
   }
 }
+.header{
+  >span{
+    color: rgba($color: #000000, $alpha: .6);
+    display: inline-block;
+    margin: 0 6px;
+  }
+}
 </style>

src/views/teamDetail/componentCourse/infoMsgContent.vue

@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <el-form :inline='true'>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="主教老师">
+            <!-- <div>{{item.actualTeacherName}}</div> -->
+            <div v-if="diff.hasOwnProperty('actualTeacherName')">
+              <el-tag type="danger"><s>{{before.actualTeacherName}}</s></el-tag>
+              <el-tag type="success">{{after.actualTeacherName}}</el-tag>
+            </div>
+            <div v-else>{{after.actualTeacherName}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="助教老师">
+            <!-- <div>{{item.teacherName}}</div> -->
+            <div v-if="diff.hasOwnProperty('teacherName')">
+              <el-tag v-if="before.teacherName" type="danger"><s>{{before.teacherName}}</s></el-tag>
+              <el-tag v-if="after.teacherName" type="success">{{after.teacherName}}</el-tag>
+            </div>
+            <div v-else>{{after.teacherName}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上课时间">
+            <!-- <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div> -->
+            <div v-if="diff.hasOwnProperty('startClassTime')">
+              <el-tag type="danger"><s>{{ before.startClassTime ? before.startClassTime.substr(0, 16) : '' }}-{{ before.endClassTime ? before.endClassTime.substr(11,5) : ''}}</s></el-tag>
+              <el-tag type="success">{{ after.startClassTime ? after.startClassTime.substr(0, 16) : '' }}-{{ after.endClassTime ? after.endClassTime.substr(11,5) : ''}}</el-tag>
+            </div>
+            <div v-else>{{ after.startClassTime ? after.startClassTime.substr(0, 16) : '' }}-{{ after.endClassTime ? after.endClassTime.substr(11,5) : ''}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="课程时长">
+            <!-- <div>{{getTimers(item)}}分钟</div> -->
+            <div v-if="diff.hasOwnProperty('timers')">
+              <el-tag type="danger"><s>{{before.timers}} 分钟</s></el-tag>
+              <el-tag type="success">{{after.timers}} 分钟</el-tag>
+            </div>
+            <div v-else>{{after.timers}} 分钟</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="课程类型">
+            <!-- <div>{{item.teachMode| teachMode}}</div> -->
+            <div v-if="diff.hasOwnProperty('teachMode')">
+              <el-tag type="danger"><s>{{before.teachMode | teachMode}}</s></el-tag>
+              <el-tag type="success">{{after.teachMode | teachMode}}</el-tag>
+            </div>
+            <div v-else>{{after.teachMode | teachMode}}</div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script>
+import ObjectDiff from 'object-diff'
+export default {
+  props: ['before', 'after'],
+  computed: {
+    diff() {
+      return ObjectDiff(this.before, this.after)
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+
+</style>

src/views/teamDetail/componentCourse/resetClass.vue

@@ -262,48 +262,6 @@ export default {
         this.getDetail(val)
       }
     },
-    // show (val) {
-    //   console.log(val)
-    //   this.courseVisible = val;
-    // },
-    // courseVisible (val) {
-    //   if (!val) {
-    //     this.$emit("closeReset");
-    //   }
-    // },
-    // item: {
-    //   immediate: true,
-    //   deep: true,
-    //   handler (row, oldValue) {
-    //     if (row) {
-    //       console.log(row)
-
-    //       this.maskForm.assistant = [];
-    //       for (let i in row.teachingTeachers) {
-    //         if (row.teachingTeachers[i].teacherRole == "TEACHING") {
-    //           this.maskForm.assistant.push(row.teachingTeachers[i].userId);
-    //         }
-    //       }
-    //       let time = diffTimerFormMinute(dayjs(row.classDate).format('YYYY-MM-DD'), dayjs(row.startClassTime).format('HH:mm'), dayjs(row.endClassTime).format('HH:mm'))
-    //       console.log(dayjs(row.startClassTime).format('HH:mm'))
-    //       this.maskForm.timer = time;
-    //     } else {
-    //       this.maskForm = {
-    //         id: null,
-    //         teacher: null,
-    //         assistant: null,
-    //         date: null,
-    //         startTime: null,
-    //         endTime: null,
-    //         timer: null,
-    //         type: null,
-    //         groupType: null,
-    //         schoolId: null,
-    //         teachMode: null,
-    //       }
-    //     }
-    //   }
-    // },
     'maskForm.timer' (val) {
       this.$nextTick(res => {
         if (val) {

src/views/teamDetail/componentCourse/studentWork.vue

@@ -1,9 +1,12 @@
 <template>
   <div>
-    <!-- <el-alert :title="msg"
-              type="warning">
-    </el-alert> -->
-    <div class="workTitle">作业内容:  <span>{{content}}</span> </div>
+  <el-alert
+    title="作业内容"
+    type="info"
+    :closable="false"
+    :description="content">
+  </el-alert>
+    <!-- <div class="workTitle">作业内容:  <span>{{content}}</span> </div> -->
     <el-form :inline="true"
              class="workForm"
              style="padding: 0 25px">
@@ -132,7 +135,7 @@
         <div>
             <p class="workContainer">作业回复内容:</p>
         <div class="msgWrap">
-        
+
           <div :class="activeCommit.length>0?'':'flex'">
             <div v-if="activeCommit.length>0"
                  class="msgLi"
@@ -373,7 +376,7 @@ export default {
     }
 
   }
- 
+
 }
  .workTitle {
     padding-left: 25px;
@@ -384,4 +387,4 @@ export default {
   .workContainer {
     margin-bottom:20px ;
   }
-</style>
+</style>

src/views/teamDetail/teamCourseList.vue

@@ -238,8 +238,7 @@
                 <el-button type="text"
                            @click="addCompound(scope.row)"
                            v-if="(scope.row.groupType=='MUSIC'&&scope.row.type!='MUSIC_NETWORK'&&scope.row.type!='HIGH_ONLINE'&&scope.row.status=='NOT_START'&&!isAddCom(scope.row))">添加合班</el-button>
-                <el-button type="
-                           text"
+                <el-button type="text"
                            v-if="isAddCom(scope.row)"
                            @click="cancleCompound(scope.row)">取消合班</el-button>
                 <el-button type="text"