11

11

src/layout/components/TagsView.vue

@@ -44,6 +44,7 @@ export default {
   inject: ['reloads'],
   computed: {
     visitedViews () {
+      // console.log(this.$store.state.tagsView.visitedViews)
       return this.$store.state.tagsView.visitedViews
     }
   },
@@ -62,12 +63,12 @@ export default {
   },
   mounted () {
     this.addViewTags()
+
   },
   methods: {
     // generateTitle by vue-i18n  
     generateTitle,
     generateRoute () {
-
       if (this.$route.path && this.$route.path != '/') {
         return this.$route
       }
@@ -131,7 +132,7 @@ export default {
       this.visible = false
     },
     async refresh (view) {
-      this.reloads()
+      await this.reloads()
     }
   }
 }

src/store/modules/permission.js

@@ -63,9 +63,9 @@ function recursionRouter (arr) {
       // }
       arr[i].hid == 0 ? obj.hidden = false : obj.hidden = true
       // console.log('高亮标签'+arr[i].parentPermission,'普通路径'+arr[i].path)
-      
+
       obj.path = arr[i].path;
-      obj.meta = { 'title': arr[i].name, 'icon': arr[i].icon, 'noCache': arr[i].keepAlive,'activeMenu': arr[i].parentPermission}
+      obj.meta = { 'title': arr[i].name, 'icon': arr[i].icon, 'noCache': arr[i].keepAlive, 'activeMenu': arr[i].parentPermission }
       if (arr[i].sysMenus && arr[i].sysMenus.length > 0) {
         obj.children = recursionRouter(arr[i].sysMenus);
       }
@@ -123,10 +123,10 @@ const actions = {
       })
     })
   },
-  removePermission({ commit }){
+  removePermission ({ commit }) {
     window.localStorage.removeItem('permission')
     commit('SET_PERMISSION', [])
-    
+
   }
 }
 

src/views/accompanyManager/accompanys.vue

@@ -465,7 +465,6 @@ import {
   batchUpdateCourseSchedule,
   findEducationUsers,
   updateTeacherAttendance,
-  superFindCourseSchedules,
   updateCoursesExpireDate,
   findAttendanceStudentByCourseWithPage,
   updateStudentAttendances

src/views/studentManager/components/studentNetwork.vue

@@ -3,51 +3,63 @@
   <div class>
     <div class="m-core">
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="id" label="课程编号"></el-table-column>
-          <el-table-column align="center" prop="name" label="课程名称"></el-table-column>
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="id"
+                           label="课程编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="name"
+                           label="课程名称"></el-table-column>
           <!-- <el-table-column align="center" prop="subjectName" label="声部"></el-table-column> -->
-          <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
-          <el-table-column align="center" prop="type" label="课程组类型" width="100">
+          <el-table-column align="center"
+                           prop="teacherName"
+                           label="指导老师"></el-table-column>
+          <el-table-column align="center"
+                           prop="educationalTeacherName"
+                           label="教务老师"></el-table-column>
+          <el-table-column align="center"
+                           prop="type"
+                           label="课程组类型"
+                           width="100">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.type | comType}}</p>
               </div>
             </template>
           </el-table-column>
-             <el-table-column align="center" prop="groupStatus" label="课程组状态">
-                   <template slot-scope="scope">
+          <el-table-column align="center"
+                           prop="groupStatus"
+                           label="课程组状态">
+            <template slot-scope="scope">
               <div>
                 <p>{{scope.row.groupStatus | comCourseGroup}}</p>
               </div>
             </template>
-             </el-table-column>
-             <el-table-column align="center" label="开始时间">
-                 <template slot-scope="scope">
-                     <div>
-                          <div>{{scope.row.coursesStartDate|dateForMinFormat}}</div>
-                     </div>
-                 </template>
-             </el-table-column>
-             <el-table-column align="center" label="结束时间">
-                  <template slot-scope="scope">
-                     <div>
-                          <div>{{scope.row.coursesExpireDate|dateForMinFormat}}</div>
-                     </div>
-                 </template>
-             </el-table-column>
+          </el-table-column>
+          <el-table-column align="center"
+                           label="开始时间">
+            <template slot-scope="scope">
+              <div>
+                <div>{{scope.row.coursesStartDate|dateForMinFormat}}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           label="结束时间">
+            <template slot-scope="scope">
+              <div>
+                <div>{{scope.row.coursesExpireDate|dateForMinFormat}}</div>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -59,7 +71,7 @@ import load from "@/utils/loading";
 import { practiceGroupManage } from "@/api/buildTeam";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         search: null
@@ -77,21 +89,21 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created () { },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  mounted () {
     // 获取分部
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       this.studentId = this.$route.query.userId;
       this.getList();
     },
-    getList() {
+    getList () {
       practiceGroupManage({
         studentId: this.studentId,
         page: this.rules.page,