修改判断

src/views/main/abnormal/index.vue

@@ -42,9 +42,14 @@
         :type="item[0].isError ? 'error' : 'warning'"
         :data="item.map(title => ({name: title.desc, num: title.num, num2: title.num2, errorType:title.errorType}))"
       >
-        <span
-          style="color: #14928A;"
-        >立即处理<i class="el-icon-d-arrow-right"/></span>
+        <span style="color: #14928A;" v-if='errorType == "NO_CLASS_MUSIC_GROUP_STUDENT_INFO"'>
+          <template v-if="permission('/notClassStudent')">
+            立即处理<i class="el-icon-d-arrow-right"/>
+          </template>
+        </span>
+        <span style="color: #14928A;" v-else>
+          立即处理<i class="el-icon-d-arrow-right"/>
+        </span>
       </title-item>
     </el-button>
     <!-- <title-item
@@ -151,6 +156,9 @@ export default {
     permission,
     handle(item) {
       console.log(item)
+      if(item[0].errorType == "NO_CLASS_MUSIC_GROUP_STUDENT_INFO" && !this.permission('/notClassStudent')) {
+        return
+      }
       new Searchs().removeByKey(item[0].url)
       this.$router.push({
         path: item[0].url,

src/views/main/notClassStudent.vue

@@ -79,9 +79,13 @@
                         <copy-text>{{ scope.row.studentName }}</copy-text>
                     </template>
                 </el-table-column>
+                <el-table-column align="center" label="学员声部" prop="subjectName">
+                </el-table-column>
                 <el-table-column align="center" label="操作">
                     <template slot-scope="scope">
-                        <el-button type="text" @click="showDetail(scope.row)">立即处理</el-button>
+                        <auth :auths="['notClassStudent/nowLook', '/resetTeaming', '/resetTeaming/resetClass']" mulit>
+                            <el-button type="text" @click="showDetail(scope.row)">立即处理</el-button>
+                        </auth>
                     </template>
                 </el-table-column>
                 </el-table>
@@ -156,7 +160,7 @@ export default {
                 query: {
                     type: 'resetTeam',
                     id: item.groupId,
-                    tabrouter: 5
+                    tabrouter: 'resetClass'
                 }
             })
         }

src/views/resetTeaming/index.vue

@@ -13,8 +13,8 @@
         <el-tab-pane label="基本信息"
         lazy
                      v-if="permission('/resetTeaming/teamBaseInfo')"
-                     name="1">
-          <teamBaseInfo v-if="activeIndex == 1"
+                     name="teamBaseInfo">
+          <teamBaseInfo v-if="activeIndex == 'teamBaseInfo'"
                         @getBaseInfo="getBaseInfo"
                         :baseInfo="baseInfo"
                         @getName='getName' />
@@ -22,8 +22,8 @@
         <el-tab-pane label="声部设置"
         lazy
                      v-if="permission('/resetTeaming/resetSound')"
-                     name="2">
-          <resetSound v-if="activeIndex == 2" />
+                     name="resetSound">
+          <resetSound v-if="activeIndex == 'resetSound'" />
         </el-tab-pane>
         <!-- <el-tab-pane label="学员缴费设置"
                      v-if="permission('/resetTeaming/studentPayBase')"
@@ -33,25 +33,25 @@
         <el-tab-pane label="学员缴费设置"
         lazy
                      v-if="permission('/resetTeaming/resetPayList')"
-                     name="3">
+                     name="resetPayList">
           <resetPayList :baseInfo="baseInfo"
-                        v-if="activeIndex == 3&&baseInfo"
+                        v-if="activeIndex == 'resetPayList'&&baseInfo"
                         @changeActive="handleClick" />
         </el-tab-pane>
         <el-tab-pane label="学校缴费设置"
         lazy
                      v-if="permission('/resetTeaming/resetPayList')"
-                     name="6">
+                     name="resetPayListSchool">
           <resetPayListSchool :baseInfo="baseInfo"
-                              v-if="activeIndex == 6&&baseInfo"
+                              v-if="activeIndex == 'resetPayListSchool'&&baseInfo"
                               @changeActive="handleClick" />
         </el-tab-pane>
 
         <el-tab-pane label="班级调整"
         lazy
                      v-if="permission('/resetTeaming/resetClass')"
-                     name="5">
-          <resetClass v-if="activeIndex == 5&&musicGroupInfo"  :musicGroupInfo='musicGroupInfo'/>
+                     name="resetClass">
+          <resetClass v-if="activeIndex == 'resetClass'&&musicGroupInfo"  :musicGroupInfo='musicGroupInfo'/>
         </el-tab-pane>
         <!-- <el-tab-pane label="新增排课"
                      v-if="permission('/resetTeaming/coursePlan')"
@@ -126,7 +126,7 @@ export default {
     __init () {
       // this.activeIndex = sessionStorage.getItem('resetCode') || '1';
       this.teamid = this.$route.query.id;
-      if(this.$route.query.tabrouter !=1){
+      if(this.$route.query.tabrouter != 'teamBaseInfo'){
         getTeamBaseInfo({ musicGroupId: this.teamid }).then(res=>{
           if(res.code == 200){
            this.getBaseInfo(res.data)

src/views/teamDetail/teamCourseList.vue

@@ -525,6 +525,12 @@
             </el-tooltip>
           </div>
         </el-form-item>
+        <el-form-item label="学员考勤" v-if="maskForm.status != 'NOT_START'">
+          <div class="inputStyle" :class="maskForm.isCallNames != 1 ? 'red' : null">{{ maskForm.isCallNames == 1 ? '正常' : '异常' }}</div>
+        </el-form-item>
+        <el-form-item label="老师考勤" v-if="maskForm.status != 'NOT_START'">
+          <div class="inputStyle" :class="maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1? null : 'red'">{{ maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1 ? '正常' : '异常' }}</div>
+        </el-form-item>
         <el-form-item v-if="maskForm.school" label="教学点">
           {{ maskForm.school.name }}
           <el-tooltip content="查看教学点" :open-delay="0.5">

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 测试服
-let target = 'https://test.dayaedu.com' //开发环境
+let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'https://test.dayaedu.com' //开发环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -55,7 +55,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: true,
+    https: false,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
@@ -64,7 +64,7 @@ module.exports = {
       // http://192.168.3.134
       // http://47.114.176.40:8000
       '/api-auth': {
-        target: 'https://test.dayaedu.com',
+        target: 'http://dev.dayaedu.com',
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''