Merge branch 'LAO_MO' into online

src/api/buildTeam.js

@@ -861,4 +861,13 @@ export function findStudentCourseHomeworks (data) {
     method: 'get',
     params: data
   })
-}
+}
+
+// 老师布置的作业
+export function getCourseScheduleHomework (data) {
+  return request({
+    url: api + '/teacher/getCourseScheduleHomework',
+    method: 'get',
+    params: data
+  })
+}

src/store/modules/tagsView.js

@@ -93,4 +93,4 @@ const tagsView = {
   }
 }
 
-export default tagsView
+export default tagsView

src/views/login/index.vue

@@ -140,7 +140,11 @@ export default {
             .dispatch("user/login", this.loginForm)
             .then(() => {
               this.$nextTick(res => {
+                //  这里清空 tab
+                this.$store
+                  .dispatch("delAllViews")
                 this.$router.push({ path: "/main/main" });
+
               })
             })
             .catch(() => {

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -1,17 +1,25 @@
 <template>
   <div>
     <el-form :inline="true">
-      <el-form-item label="学生总数">
-        <el-input disabled
-                  :value="studentNum"></el-input>
+      <el-form-item label="应到学生数">
+        <!-- <el-input disabled
+                  :value="studentNum"></el-input> -->
+        <div class="inputStyle">{{studentNum}}</div>
       </el-form-item>
-      <el-form-item label="学生到课数">
-        <el-input disabled
-                  :value="signInNum"></el-input>
+      <el-form-item label="到课学生数">
+        <!-- <el-input disabled
+                  :value="signInNum"></el-input> -->
+        <div class="inputStyle">{{signInNum}}</div>
       </el-form-item>
-      <el-form-item label="学生请假总数">
-        <el-input disabled
-                  :value="leaveNum"></el-input>
+      <el-form-item label="请假学生数">
+        <!-- <el-input disabled
+                  :value="leaveNum"></el-input> -->
+        <div class="inputStyle">{{leaveNum}}</div>
+      </el-form-item>
+      <el-form-item label="旷课学生数">
+        <!-- <el-input disabled
+                  :value="leaveNum"></el-input> -->
+        <div class="inputStyle">{{truantNum}}</div>
       </el-form-item>
     </el-form>
     <div class="tableWrap">
@@ -60,7 +68,8 @@ export default {
       },
       studentNum: null,
       signInNum: null,
-      leaveNum: null
+      leaveNum: null,
+      truantNum: null
     }
   },
   mounted () {
@@ -88,6 +97,7 @@ export default {
           this.studentNum = res.data.studentNum;
           this.signInNum = res.data.signInNum;
           this.leaveNum = res.data.leaveNum
+          this.truantNum = res.data.truantNum
         }
       })
     }
@@ -95,4 +105,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.inputStyle {
+  width: 100px;
+  text-align: center;
+}
 </style>

src/views/teamDetail/componentCourse/studentWork.vue

@@ -1,19 +1,23 @@
 <template>
   <div>
     <el-form :inline="true">
-      <el-form-item label="学生总数">
-        <el-input disabled
-                  :value="studentNum"></el-input>
+      <el-form-item label="应到学生数">
+        <!-- <el-input disabled
+                  :value="studentNum"></el-input> -->
+        <div class="inputStyle">{{  studentNum}}</div>
       </el-form-item>
-      <el-form-item label="已交作业">
-        <el-input disabled
-                  :value="homeworkNum"></el-input>
+      <el-form-item label="已交学生数">
+        <!-- <el-input disabled
+                  :value="homeworkNum"></el-input> -->
+        <div class="inputStyle">{{ homeworkNum}}</div>
       </el-form-item>
-      <el-form-item label="已评论">
-        <el-input disabled
-                  :value="repliedNum"></el-input>
+      <el-form-item label="已回复数">
+        <!-- <el-input disabled
+                  :value="repliedNum"></el-input> -->
+        <div class="inputStyle">{{ repliedNum}}</div>
       </el-form-item>
     </el-form>
+    <p class="work">老师布置的作业:{{content}}</p>
     <div class="tableWrap">
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -26,6 +30,10 @@
                          label="手机号">
         </el-table-column>
         <el-table-column align='center'
+                         prop="subjectName"
+                         label="声部名称">
+        </el-table-column>
+        <el-table-column align='center'
                          prop="createTime"
                          label="交作业时间">
         </el-table-column>
@@ -48,10 +56,10 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         label="查看">
+                         label="操作">
           <template slot-scope="scope">
             <div>
-              <!--  -->
+              <!--   -->
               <el-button type="text"
                          v-if="scope.row.url"
                          @click="lookWork(scope.row.url)">查看</el-button>
@@ -82,7 +90,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { findStudentCourseHomeworks, sumStudentAttendance } from '@/api/buildTeam'
+import { findStudentCourseHomeworks, sumStudentAttendance, getCourseScheduleHomework } from '@/api/buildTeam'
 export default {
   props: ['courseScheduleId'],
   components: { pagination },
@@ -99,7 +107,8 @@ export default {
       studentNum: null,
       homeworkNum: null,
       repliedNum: null,
-      activeUrl: null
+      activeUrl: null,
+      content: null
     }
   },
   mounted () {
@@ -117,6 +126,17 @@ export default {
           this.repliedNum = res.data.repliedNum
         }
       })
+      //this.courseScheduleId 
+      // 
+
+      getCourseScheduleHomework({ courseScheduleId: this.courseScheduleId }).then(res => {
+        if (res.code == 200) {
+          if (res.data) {
+            this.content = res.data.content
+          }
+          this.content ? this.content : this.content = '还未布置作业'
+        }
+      })
       this.getList()
     },
     getList () {
@@ -136,4 +156,14 @@ export default {
     }
   }
 }
-</script>
+</script>
+<style lang="scss" scoped>
+.inputStyle {
+  width: 100px;
+  text-align: center;
+}
+.work {
+  margin-bottom: 30px;
+  font-size: 16px;
+}
+</style>

src/views/teamDetail/teamCourseList.vue

@@ -194,38 +194,52 @@
       <el-form :model="maskForm"
                :inline="true">
         <el-form-item label="老师姓名">
-          <el-input v-model="maskForm.teacherName"
-                    disabled></el-input>
+          <!-- <el-input v-model="maskForm.teacherName"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{maskForm.teacherName}}</div>
         </el-form-item>
         <el-form-item label="课程模式">
-          <el-input :value="maskForm.teachMode | teachMode"
-                    disabled></el-input>
+          <!-- <el-input :value="maskForm.teachMode | teachMode"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{maskForm.teachMode| teachMode}}</div>
           <!-- <span>{{maskForm.teachMode }}</span> -->
         </el-form-item>
         <el-form-item label="课程类型">
-          <el-input :value="maskForm.type |classType"
-                    disabled></el-input>
-
+          <!-- <el-input :value="maskForm.type |classType"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{maskForm.type |classType}}</div>
         </el-form-item>
         <el-form-item label="签到时间">
-          <el-input v-model=" maskForm.signInTime"
-                    disabled></el-input>
+          <!-- <el-input v-model=" maskForm.signInTime"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{maskForm.signInTime}}</div>
         </el-form-item>
         <el-form-item label="签退时间">
-          <el-input v-model="maskForm.signOutTime"
-                    disabled></el-input>
+          <!-- <el-input v-model="maskForm.signOutTime"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{maskForm.signOutTime}}</div>
         </el-form-item>
         <el-form-item label="是否点名">
-          <el-input :value="maskForm.isCallNames | isCall"
-                    disabled></el-input>
+          <!-- <el-input :value="maskForm.isCallNames | isCall"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{maskForm.isCallNames | isCall}}</div>
         </el-form-item>
         <el-form-item label="签到状态">
-          <el-input :value=" maskForm.isSignIn | attendanceType"
-                    disabled></el-input>
+          <!-- <el-input :value=" maskForm.isSignIn | attendanceType"
+                    disabled></el-input> -->
+          <div class="inputStyle"
+               :class="maskForm.isSignIn==1?'':'red'">{{ maskForm.isSignIn | attendanceType}}</div>
         </el-form-item>
         <el-form-item label="签退状态">
-          <el-input :value=" maskForm.isSignOut | attendanceOutType"
-                    disabled></el-input>
+          <!-- <el-input :value=" maskForm.isSignOut | attendanceOutType"
+                    disabled></el-input> -->
+          <div class="inputStyle"
+               :class="maskForm.isSignIn==1?'':'red'">{{ maskForm.isSignOut | attendanceOutType}}</div>
+        </el-form-item>
+        <el-form-item label="备注">
+          <!-- <el-input :value=" maskForm.isSignOut | attendanceOutType"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{  maskForm.remark}}</div>
         </el-form-item>
       </el-form>
       <el-tabs v-model="activeName"
@@ -455,4 +469,10 @@ export default {
     margin-right: 20px;
   }
 }
+.inputStyle {
+  width: 180px;
+}
+.red {
+  color: red;
+}
 </style>

src/views/vipClass/vipReset.vue

@@ -124,7 +124,7 @@
                       prop="startTime">
           <el-time-select placeholder="起始时间"
                           style="width:200px!important;"
-                          v-model="maskForm.startTime"
+                          v-model="startTime"
                           :picker-options="{
                             start: '04:30',
                             step: '00:05',
@@ -413,7 +413,7 @@ export default {
       },
       maskRules: {
         date: [{ required: true, message: '请选择上课时间', trigger: 'blur' },],
-        startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
+        // startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
         endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
 
       },
@@ -453,6 +453,7 @@ export default {
       // 改版加课
       isaddCourse: false,
       adjustmentName: '',
+      startTime: ''
 
     }
   },
@@ -462,12 +463,12 @@ export default {
   mounted () {
     this.getList();
   },
-  activated() {
+  activated () {
     this.__init()
     this.getList()
   },
   methods: {
-    __init() {
+    __init () {
       this.vipid = this.$route.query.id;
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules
@@ -483,7 +484,7 @@ export default {
             this.tableList = res.data.pageInfo.rows;
             this.rules.total = res.data.pageInfo.total;
             this.courseTime = res.data.singleClassMinutes;
-            if(this.tableList.length > 0) {
+            if (this.tableList.length > 0) {
               getTeachSchool({ userId: res.data.pageInfo.rows[0].teacherId }).then(res => {
                 if (res.code == 200) {
                   this.schoolList = res.data;
@@ -498,8 +499,13 @@ export default {
       this.$router.push({ path: '/business/vipList', query: { rules: this.Frules, searchForm: this.FsearchForm } })
     },
     resetClass (row) {
+
+      /**
+       * maskForm.startTime
+       * 
+       */
       this.maskForm.date = row.classDate;
-      this.maskForm.startTime = row.startClassTimeStr;
+      this.startTime = row.startClassTimeStr;
       // this.maskForm.endTime = row.endClassTimeStr;
       this.maskForm.id = row.id;
       this.maskForm.address = row.schoolId
@@ -509,12 +515,25 @@ export default {
     },
     handleClose () {
       this.courseVisible = false;
+      this.startTime = ''
+      this.maskForm = {
+        date: '',
+        startTime: '',
+        endTime: '',
+        id: '',
+        address: '',
+        teachMode: ''
+      }
       this.$refs['maskForm'].resetFields()
     },
     submitResetClass () {
       //   endClassTimeStr: this.maskForm.endTime,
+      if (!this.startTime) {
+        this.$message.error('请填写修改时间')
+        return
+      }
       let obj = {
-        startClassTimeStr: this.maskForm.startTime,
+        startClassTimeStr: this.startTime,
         id: this.maskForm.id,
         classDate: this.maskForm.date,
         schoolId: this.maskForm.address || null,