合并master

dist/static/css/chunk-5b1fcc5a.ce348967.css

@@ -0,0 +1 @@
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-7a44cd83]{margin-top:20px;display:block;text-align:right}[data-v-078f879e] .el-button+.el-button{margin-left:0}.select[data-v-078f879e]{font-size:14px}.btnList[data-v-078f879e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-078f879e]{margin-right:15px}

dist/static/css/chunk-65d5f8fc.1972779a.css

@@ -0,0 +1 @@
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-05a1935c] .description-title{margin:0!important}

src/views/main/constant.js

@@ -59,6 +59,7 @@ export const errorType = {
     always: true,
     query: {
       tabrouter: 'teamSchedule',
+      searchType:'MUSIC_PATROL_ITEM',
       conclusionStatus: '1',
       ...dates,
     },

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

@@ -52,14 +52,35 @@
           v-model.trim="searchForm.signInStatus"
           filterable
           clearable
-          placeholder="考勤状态"
+          placeholder="签到状态"
         >
-          <el-option
+          <el-option :value="1" label="正常签到"></el-option>
+          <el-option :value="0" label="异常签到"></el-option>
+          <el-option :value="3" label="未签到"></el-option>
+          <!-- <el-option
             v-for="(item, index) in attendance"
             :key="index"
             :label="item.label"
             :value="item.value"
-          ></el-option>
+          ></el-option> -->
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select
+          v-model.trim="searchForm.signOutStatus"
+          filterable
+          clearable
+          placeholder="签退状态"
+        >
+          <!-- <el-option
+            v-for="(item, index) in attendance"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option> -->
+          <el-option :value="1" label="正常签退"></el-option>
+          <el-option :value="0" label="异常签退"></el-option>
+          <el-option :value="3" label="未签退"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -165,6 +186,7 @@ export default {
         classGroupName: null,
         courseScheduleType: null,
         signInStatus: null,
+        signOutStatus: null,
         courseDate:[]
       },
       tableList: [],
@@ -226,6 +248,7 @@ export default {
         classGroupName: null,
         courseScheduleType: null,
         signInStatus: null,
+        signOutStatus: null
       };
       this.getList()
     },

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -156,8 +156,8 @@
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.offlineClassesSalary"
                         placeholder="请输入内容">
-                <template slot="append" v-if="scope.row.musicTheory"> 元/人</template>
-                <template slot="append" v-else>节/人</template>
+                <template slot="append"> 元/人</template>
+                <!-- <template slot="append" v-else>节/人</template>  v-if="scope.row.musicTheory" -->
               </el-input>
               </div>
 

src/views/teamDetail/componentCourse/infoMsg.vue

@@ -64,13 +64,17 @@ export default {
     })
   },
   methods: {
+    getRealTime(time) {
+      const parsenum = parseInt(time)
+      return ('' + time).indexOf(' ') > -1 ? time : parsenum
+    },
     filterKeys(item) {
       const teachingTeacherNames = (item.teachingTeacherNames || '').split(',').sort((a, b) => (a || '').localeCompare((b || ''), 'zh'))
       return {
         name: item.name,
         actualTeacherName: item.actualTeacherName,
         teachingTeacherNames: teachingTeacherNames.join(','),
-        startClassTime: this.$helpers.dayjs(item.startClassTime).format('YYYY-MM-DD HH:mm'),
+        startClassTime: this.$helpers.dayjs(this.getRealTime(item.startClassTime)).format('YYYY-MM-DD HH:mm'),
         // classDate: item.classDate,
         // endClassTime: item.endClassTime,
         teachMode: teachMode[item.teachMode],
@@ -82,7 +86,7 @@ export default {
       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'))
+      return diffTimerFormMinute(dayjs(item.classDate).format('YYYY-MM-DD'), dayjs(this.getRealTime(item.startClassTime)).format('HH:mm'), dayjs(this.getRealTime(item.endClassTime)).format('HH:mm'))
     }
   },
   computed: {