Bläddra i källkod

修改课表列表问题

1
mo 2 år sedan
förälder
incheckning
2fccc19934

+ 2 - 1
src/views/teamDetail/componentCourse/gpsLocation.vue

@@ -40,9 +40,10 @@ import VueAMap from 'vue-amap'
   try {
     let opts = Object.defineProperty({}, 'passive', {
       get: function () {
-        supportsPassive = true;
+        supportsPassive = false;
       }
     })
+
     document.addEventListener("testPassive", null, opts);
     document.removeEventListener('testPassive', null, opts);
   } catch (e) { }

+ 16 - 162
src/views/teamDetail/teamCourseList.vue

@@ -246,22 +246,7 @@
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center" width="150px" label="课程类型">
-            <template slot-scope="scope">
-              <div>{{ scope.row.type | coursesType }}</div>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column align="center" label="教学模式">
-            <template slot-scope="scope">
-              <div>{{ scope.row.teachMode | teachMode }}</div>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column
-            align="center"
-            prop="teacherName"
-            width="110"
-            label="主教老师"
-          ></el-table-column> -->
+
           <el-table-column
             align="center"
             prop="schoolName"
@@ -278,69 +263,6 @@
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column
-            align="center"
-            prop="courseScheduleStatus"
-            label="课程状态"
-          >
-            <template slot-scope="scope">
-              <div>{{ scope.row.status | coursesStatus }}</div>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column align="center" label="考勤申诉">
-            <template slot-scope="scope">
-              <div>{{ scope.row.isComplaints == 1 ? "是" : "否" }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column align="center" prop="isLock" label="是否冻结">
-            <template slot-scope="scope">{{
-              scope.row.isLock ? "是" : "否"
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="newCourseId"
-            label="合并类型"
-            width="130px"
-          >
-            <template slot-scope="scope">
-              <div>
-                <span
-                  v-if="
-                    scope.row.newCourseId > 0 &&
-                    scope.row.newCourseId == scope.row.id
-                  "
-                  >合并课
-                </span>
-                <el-button
-                  type="text"
-                  @click="common(scope.row)"
-                  v-if="
-                    scope.row.newCourseId > 0 &&
-                    scope.row.newCourseId != scope.row.id
-                  "
-                >
-                  被合并课
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="isCallNames" label="云教练课程">
-            <template slot-scope="scope">{{
-              scope.row.memberFlag ? "是" : "否"
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="isCallNames"
-            label="是否点名"
-            fixed="right"
-          >
-            <template slot-scope="scope">{{
-              scope.row.isCallNames ? "是" : "否"
-            }}</template>
-          </el-table-column> -->
           <el-table-column
             align="center"
             label="详情"
@@ -349,26 +271,12 @@
           >
             <template slot-scope="scope">
               <div>
-                <!-- <el-button
-                  type="text"
-                  @click="removeCourse(scope.row)"
-                  v-permission="
-                    'courseSchedule/batchDelete?page=teamCourseList'
-                  "
-                  >删除</el-button
-                > -->
-                <!-- <auth auths="/teamCourseListDetail"> -->
-                <!--    v-if="permission('teamCourseList/details')" -->
                 <el-button
                   v-if="'/teamCourseListDetail'"
                   type="text"
                   @click="lookDetail(scope.row)"
                   >详情</el-button
                 >
-                <!-- </auth>  v-if="
-                              props.row.newCourseId > 0 &&
-                              props.row.newCourseId != props.row.id
-                            "-->
                 <el-button
                   type="text"
                   v-if="
@@ -445,46 +353,29 @@
     <el-dialog title="课表详情" :visible.sync="classVisible" width="1000px">
       <el-form :model="maskForm" :inline="true">
         <el-form-item label="老师姓名">
-          <!-- <el-input v-model.trim="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>-->
+
           <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>-->
+
           <div class="inputStyle">{{ maskForm.type | coursesType }}</div>
         </el-form-item>
-        <!-- courseScheduleStatus -->
+
         <el-form-item label="课程状态">
-          <!-- <el-input :value="maskForm.type |classType"
-          disabled></el-input>-->
+
           <div class="inputStyle">{{ maskForm.status | coursesStatus }}</div>
         </el-form-item>
-        <!-- <el-form-item label="签到时间">
-          <div class="inputStyle">{{maskForm.signInTime | dateForMinFormat}}</div>
-        </el-form-item>
-        <el-form-item label="签退时间">
-          <div class="inputStyle">{{maskForm.signOutTime | dateForMinFormat}}</div>
-        </el-form-item> -->
+
         <el-form-item label="是否点名">
-          <!-- <el-input :value="maskForm.isCallNames | isCall"
-          disabled></el-input>-->
+
           <div class="inputStyle">{{ maskForm.isCallNames | isCall }}</div>
         </el-form-item>
-        <!-- <el-form-item label="签到状态">
-          <div class="inputStyle"
-               :class="maskForm.isSignIn==1?'':'red'">{{ maskForm.isSignIn | attendanceType}}</div>
-        </el-form-item>
-        <el-form-item label="签退状态">
-          <div class="inputStyle"
-               :class="maskForm.isSignIn==1?'':'red'">{{ maskForm.isSignOut | attendanceOutType}}</div>
-        </el-form-item> -->
+
 
         <el-form-item label="上课时间">
           {{
@@ -505,7 +396,7 @@
             }}分钟
             <el-tooltip placement="top" popper-class="mTooltip">
               <div slot="content">学员和老师同时在教室里的时长。</div>
-              <!-- <img :src="imageIcon" class="micon el-tooltip" style="width:8px height:8px" alt /> -->
+
               <i
                 class="el-icon-question micon el-tooltip"
                 style="font-size: 18px; color: #f56c6c"
@@ -549,7 +440,7 @@
           </el-tooltip>
         </el-form-item>
       </el-form>
-      <!--  v-if="maskForm.status != 'NOT_START'" -->
+
       <el-tabs v-model.trim="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane
           label="学员列表"
@@ -557,20 +448,14 @@
           v-if="permission('/teamCourseListDetailStudnetList')"
         >
           <div v-if="activeName == 'first'">
-            <!-- studentRollCall  -->
+
             <studentRollCall
               :courseScheduleId="maskForm.id"
               :isMainGo="isMainGo"
             ></studentRollCall>
           </div>
         </el-tab-pane>
-        <!-- <el-tab-pane label="GPS定位"
-                     v-if="maskForm.teachMode == 'OFFLINE'"
-                     name="second">
-          <div v-if="activeName == 'second'">
-            <gpsLoction :courseScheduleId="maskForm.id"></gpsLoction>
-          </div>
-        </el-tab-pane> -->
+
         <el-tab-pane
           label="老师列表"
           name="second"
@@ -585,7 +470,7 @@
             ></teacherList>
           </div>
         </el-tab-pane>
-        <!--      v-if="maskForm.teachMode != 'OFFLINE'" -->
+
         <el-tab-pane
           label="训练"
           name="third"
@@ -598,7 +483,6 @@
             <studentWork :courseScheduleId="maskForm.id"></studentWork>
           </div>
         </el-tab-pane>
-        <!--    v-if="maskForm.type == 'VIP' || maskForm.type == 'PRACTICE'" -->
         <el-tab-pane
           label="评论"
           name="four"
@@ -617,7 +501,6 @@
             <infoMsg :courseScheduleId="maskForm.id"></infoMsg>
           </div>
         </el-tab-pane>
-        <!-- infoMsg -->
       </el-tabs>
     </el-dialog>
     <el-dialog :visible.sync="show" width="400px" title="课程调整">
@@ -826,7 +709,7 @@
         <el-button type="primary" @click="okMore">确 定</el-button>
       </span>
     </el-dialog>
-    <!-- showMove -->
+
 
     <addCompound
       ref="addCompound"
@@ -969,7 +852,6 @@ export default {
     },
   },
   mounted() {
-    return
     const { query, params } = this.$route;
     if (params.courseIdSearch) {
       this.searchForm.courseIdSearch = params.courseIdSearch;
@@ -1004,8 +886,6 @@ export default {
     if (query.organId) {
       this.searchForm.organIdList = Number(query.organId);
     }
-
-    console.log(this.searchForm);
     this.$store.dispatch("setBranchs");
     this.$store.dispatch("setTeachers");
     this.$store.dispatch("setSchools");
@@ -1125,11 +1005,6 @@ export default {
           count++;
         }
       }
-      //  课程时间段异常,不需要时间搜索,则课表列表搜索可以不要条件搜索
-      // if (count <= 0) {
-      //   this.$message.error("请至少选择一个搜索条件");
-      //   return false;
-      // }
       if (searchForm.courseTime?.length > 0) {
         searchForm.startClassTimeStr = searchForm.courseTime[0];
         searchForm.endClassTimeStr = searchForm.courseTime[1];
@@ -1189,27 +1064,6 @@ export default {
               } else {
                 this.$message.error(res.data.msg);
               }
-              // let blob = new Blob([res.data], {
-              // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-              // type: "application/vnd.ms-excel;charset=utf-8",
-              //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-              // });
-              // let text = new Response(blob).text();
-              // text.then((res) => {
-              //   // 判断是否报错
-              //   if (res.indexOf("code") != -1) {
-              //     let json = JSON.parse(res);
-              //     this.$message.error(json.msg);
-              //   } else {
-              //     let objectUrl = URL.createObjectURL(blob);
-              //     let link = document.createElement("a");
-              //     let fname = "课表列表" + new Date().getTime() + ".xls"; //下载文件的名字
-              //     link.href = objectUrl;
-              //     link.setAttribute("download", fname);
-              //     document.body.appendChild(link);
-              //     link.click();
-              //   }
-              // });
               load.endLoading();
             })
             .catch((error) => {