Browse Source

02/20 16:56

111
261568008@qq.com 5 years ago
parent
commit
b08aabee39

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.7a666bba.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-11ede39e.c846583a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1ff94131.cb4fac0f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4fd1b812.f6394551.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-62047b5f.8a20430e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-69b6fec1.722a7997.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6bc4d4bd.793541fe.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6c0b301c.b48f9149.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6cd7306c.abe7e386.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-765128ed.28434749.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-79c3d32e.4a89b277.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-839e6186.4803c652.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-aaf3d68a.3076bec8.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-d7e2d178.c6edcf81.js


+ 5 - 5
src/api/buildTeam.js

@@ -915,7 +915,7 @@ export function updateStudentAttendances (data) {
   })
 }
 
-// 获取陪练课列表
+// 获取网管课列表
 export function practiceGroupManage (data) {
   return request({
     url: api + '/practiceGroupManage/queryAll',
@@ -924,7 +924,7 @@ export function practiceGroupManage (data) {
   })
 }
 
-// 获取陪练课程组
+// 获取网管课程组
 export function findPracticeGroupCourseSchedules(data) {
   return request({
     url: api + '/practiceGroupManage/findPracticeGroupCourseSchedules',
@@ -933,7 +933,7 @@ export function findPracticeGroupCourseSchedules(data) {
   })
 }
 
-// 陪练课调整
+// 网管课调整
 // courseSchedule/practiceCourseAdjus
 export function practiceCourseAdjus(data) {
   return request({
@@ -943,7 +943,7 @@ export function practiceCourseAdjus(data) {
   })
 }
 
-// 陪练课程组老师修改
+// 网管课程组老师修改
 export function practiceGroupTeacherAdjust(data) {
   return request({
     url: api + '/courseSchedule/practiceGroupTeacherAdjust',
@@ -951,7 +951,7 @@ export function practiceGroupTeacherAdjust(data) {
     data: qs.stringify(data)
   })
 }
-// 陪练课老师修改
+// 网管课老师修改
 export function practiceCourseTeacherAdjust(data) {
   return request({
     url: api + '/courseSchedule/practiceCourseTeacherAdjust',

+ 2 - 2
src/api/teacherManager.js

@@ -162,7 +162,7 @@ export function getTeacherBySubject (data) {
     params: data
   })
 }
-// 获取老师陪练课信息 
+// 获取老师网管课信息 
 export function teacherFreeTime (data) {
   return request({
     url: api + '/teacherFreeTime/query',
@@ -171,7 +171,7 @@ export function teacherFreeTime (data) {
   })
 }
 
-// 修改陪练课信息 /teacherFreeTime/updateSet
+// 修改网管课信息 /teacherFreeTime/updateSet
 export function resetTeacherFreeTime (data) {
   return request({
     url: api + '/teacherFreeTime/updateSet',

+ 2 - 2
src/router/index.js

@@ -238,9 +238,9 @@ export const asyncRoutes = {
   teamCourseList: () => import('@/views/teamDetail/teamCourseList'),
   // 运营预警
   operationalList: () => import('@/views/operationalEarly/operationalList'),
-  // 陪练课列表
+  // 网管课列表
   accompanyList:()=> import('@/views/accompanyManager/accompanyList'),
-  // 陪练课详情
+  // 网管课详情
   accompanys:()=> import('@/views/accompanyManager/accompanys')
 }
 export default router

+ 1 - 1
src/utils/searchArray.js

@@ -12,7 +12,7 @@ const courseType = [
   { label: '启蒙课', value: 'ENLIGHTENMENT' },
   { label: '集训课', value: 'TRAINING' },
   { label: '课堂课', value: 'CLASSROOM' },
-  { label: '陪练课', value: 'PRACTICE' }
+  { label: '网管课', value: 'PRACTICE' }
 ]
 
 // 考勤状态

+ 1 - 1
src/utils/vueFilter.js

@@ -86,7 +86,7 @@ Vue.filter('coursesType', (value) => {
     TRAINING_SINGLE: '集训单技课',
     TRAINING_MIX: '集训合奏课',
     CLASSROOM: '课堂课',
-    PRACTICE:'陪练课'
+    PRACTICE:'网管课'
   }
   return template[value]
 })

+ 1 - 1
src/views/accompanyManager/accompanyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>陪练课列表
+      <div class="squrt"></div>网管课列表
     </h2>
   
     <div class="m-core">

+ 1 - 1
src/views/accompanyManager/accompanys.vue

@@ -193,7 +193,7 @@ export default {
   data() {
     return {
       isMultiple: true,
-      name: "陪练课程组",
+      name: "网管课程组",
       courseVisible: false,
       teacherVisible: false,
       Frules: null,

+ 4 - 4
src/views/studentManager/studentList.vue

@@ -56,7 +56,7 @@
           <el-select class='multiple'
                      v-model.trim="searchForm.isMake"
                      clearable
-                     placeholder="预约陪练课">
+                     placeholder="预约网管课">
             <el-option label="是"
                        value="true"></el-option>
             <el-option label="否"
@@ -67,7 +67,7 @@
           <el-select class='multiple'
                      v-model.trim="searchForm.hasPracticeCourse"
                      clearable
-                     placeholder="是否有陪练课">
+                     placeholder="是否有网管课">
             <el-option label="是"
                        value="true"></el-option>
             <el-option label="否"
@@ -128,13 +128,13 @@
             </template>
           </el-table-column>
             <el-table-column align='center'
-                           label="预约陪练课">
+                           label="预约网管课">
             <template slot-scope="scope">
               {{ scope.row.isMake ? '是' : '否' }}
             </template>
           </el-table-column>
               <el-table-column align='center'
-                           label="是否有陪练课">
+                           label="是否有网管课">
             <template slot-scope="scope">
               {{ scope.row.hasPracticeCourse ? '是' : '否' }}
             </template>

+ 1 - 1
src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -78,7 +78,7 @@
               </el-form-item>
             </el-col>
                <el-col :span="12">
-              <el-form-item label="开放陪练"
+              <el-form-item label="开放网管课"
                             :label-width="formLabelWidth">
                 <el-input disabled
                           v-model.trim="isSupportExtraPracticeLesson"></el-input>

+ 2 - 2
src/views/teacherManager/teacherList.vue

@@ -73,7 +73,7 @@
             v-model.trim="searchForm.isSupportExtraPracticeLesson"
             clearable
             filterable
-            placeholder="开放陪练课"
+            placeholder="开放网管课"
           >
             <el-option label="是" value="true"></el-option>
             <el-option label="否" value="false"></el-option>
@@ -112,7 +112,7 @@
           <el-table-column align="center" label="试听课安排">
             <template slot-scope="scope">{{ scope.row.demoNum > 0 ? '是' : '否' }}</template>
           </el-table-column>
-          <el-table-column align="center" label="开放陪练课">
+          <el-table-column align="center" label="开放网管课">
             <template slot-scope="scope">{{ scope.row.isSupportExtraPracticeLesson ? '是' : '否' }}</template>
           </el-table-column>
           <el-table-column align="center" fixed="right" width="200" label="操作">

+ 2 - 2
src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -125,12 +125,12 @@
                 <img :src="imageIcon" class="micon el-tooltip" style="width:8px height:8px" alt />
               </el-tooltip>
 
-              <el-form-item label="开放陪练" label-width="90px" class="course">
+              <el-form-item label="开放网管课" label-width="90px" class="course">
                 <el-select
                   v-model.trim="topForm.isSupportExtraPracticeLesson"
                   clearable
                   filterable
-                  placeholder="开放陪练"
+                  placeholder="开放网管课"
                 >
                   <el-option label="是" :value="true"></el-option>
                   <el-option label="否" :value="false"></el-option>

+ 2 - 2
src/views/teacherManager/teacherOperation/index.vue

@@ -22,7 +22,7 @@
                      v-if="activeName=='1'" />
         </el-tab-pane>
         <!--   'teacherFreeTime/query'  v-if="permission('/teacherFreeTime/query')"-->
-         <el-tab-pane label="陪练课设置"
+         <el-tab-pane label="网管课设置"
                      v-if="accompanyStatus"
                      name="2"
                      :disabled="isTeacher">
@@ -47,7 +47,7 @@ export default {
       pageType: this.$route.query.type,
       baseInfoStatus: true, // 权限显示,基本信息
       salaryStatus: true, // 权限显示 课酬设置
-      accompanyStatus: true, // 权限显示 陪练课设置
+      accompanyStatus: true, // 权限显示 网管课设置
       teacherId: this.$route.query.teacherId,
       activeName: '0',
       activeStatus: [true, false],

+ 7 - 0
src/views/teamDetail/components/courseList.vue

@@ -154,6 +154,13 @@
             {{ scope.row.settlementTime ? '已结算' : '未结算' }}
           </template>
         </el-table-column>
+           <el-table-column align='center'
+                         prop="remark"
+                         label="是否点名">
+                         <template slot-scope="scope">
+            {{ scope.row.isCallNames ? '已点名' : '未点名' }}
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          prop="remark"
                          label="备注">

Some files were not shown because too many files changed in this diff