1125 14:15

1111

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -66,9 +66,15 @@
                            label="课程名称">
           </el-table-column>
           <el-table-column align='center'
-                           label="签到状态">
+                           label="签到">
             <template slot-scope="scope">
-              {{ scope.row.status | attendanceType }}
+              {{ scope.row.signInStatus | attendanceType }}
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
+                           label="签出">
+            <template slot-scope="scope">
+              {{ scope.row.signOutStatus | attendanceType }}
             </template>
           </el-table-column>
           <el-table-column align='center'

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -103,7 +103,7 @@
       </div>
       <div class="right">
         <div class="newBand"
-             style='float:right'
+             style='float:left'
              @click="multipleReset">批量修改</div>
         <el-table :data='tableList'
                   style="width: 1060px"

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -296,16 +296,23 @@ export default {
 
     },
     removeClass (row) {
-      for (let i in this.tableList) {
-        if (this.tableList[i].moid == row.moid) {
-          this.tableList.splice(i, 1);
-          return
+      console.log(row.moid)
+      if (row.moid) {
+        for (let i in this.tableList) {
+          if (this.tableList[i].moid == row.moid) {
+            this.tableList.splice(i, 1);
+            return
+          }
         }
-        if (this.tableList[i].id == row.id) {
-          this.tableList.splice(i, 1);
-          return
+      } else {
+        for (let i in this.tableList) {
+          if (this.tableList[i].id == row.id) {
+            this.tableList.splice(i, 1);
+            return
+          }
         }
       }
+
     },
     addClass () {
       if (this.isSetSalary) {

src/views/teamDetail/components/courseList.vue

@@ -175,7 +175,7 @@
                           v-model="maskForm.startTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30'
                             }">
           </el-time-select>
@@ -186,7 +186,7 @@
                           v-model="maskForm.endTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime
                           }">

src/views/teamDetail/components/resetClass.vue

@@ -318,7 +318,7 @@
                             v-model="item.startClassTime"
                             :picker-options="{
                                start: '08:30',
-                               step: '00:15',
+                               step: '00:05',
                                end: '18:30'
             }">
             </el-time-select>
@@ -327,7 +327,7 @@
                             v-model="item.endClassTime"
                             :picker-options="{
                               start: '08:30',
-                              step: '00:15',
+                              step: '00:05',
                               end: '18:30'
             }">
             </el-time-select>
@@ -743,10 +743,11 @@ export default {
             this.$message.error('新增班级至少排一节课')
             return
           }
+
           let obj = {
             classGroupName,
-            classGroupTeacherMapperList,
             mixClassGroupId,
+            classGroupTeacherMapperList,
             musicGroupId,
             startDate,
             courseType,

src/views/vipClass/vipReset.vue

@@ -91,7 +91,7 @@
                           v-model="maskForm.startTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30'
                             }">
           </el-time-select>
@@ -102,7 +102,7 @@
                           v-model="maskForm.endTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime
                           }">
@@ -142,7 +142,7 @@
               <el-time-select v-model="scope.row.startClassTimeStr"
                               :picker-options="{
                                 start: '06:30',
-                                step: '00:15',
+                                step: '00:05',
                                 end: '23:30'
                               }"
                               placeholder="选择时间">

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8080' // 乔
+// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**