1119 21:47

1111

dist/static/css/chunk-5e6d1668.8ba0b65e.css → dist/static/css/chunk-7c41c6c4.a73a287c.css

@@ -1 +1 @@
-.setBtn[data-v-39d98ac4]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-ce732e74]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-ce732e74]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}
+.setBtn[data-v-39d98ac4]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-21330cd2]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-21330cd2]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

src/views/studentManager/components/studentRecord.vue

@@ -76,6 +76,11 @@
         <el-table-column align='center'
                          prop="currentCLassTimes"
                          label="当前课次">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.currentCLassTimes + '/'+scope.row.totalClassTimes }}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="teacherName"

src/views/studentManager/components/studentVip.vue

@@ -39,10 +39,12 @@
 
     <div class="tableWrap">
       <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-         :data='tableList'>
-        <el-table-column label="时间" prop='courseDate'>
+                :data='tableList'>
+        <el-table-column label="时间"
+                         prop='courseDate'>
         </el-table-column>
-        <el-table-column label="课程名称" prop="classGroupName">
+        <el-table-column label="课程名称"
+                         prop="classGroupName">
         </el-table-column>
         <el-table-column label="课程类型">
           <template slot-scope="scope">
@@ -51,15 +53,17 @@
         </el-table-column>
         <!-- <el-table-column label="当前课次">
         </el-table-column> -->
-        <el-table-column label="指导老师" prop="realName">
+        <el-table-column label="指导老师"
+                         prop="realName">
         </el-table-column>
-        <el-table-column label="学员数量" prop="studentNum">
+        <el-table-column label="学员数量"
+                         prop="studentNum">
         </el-table-column>
-        <el-table-column label="剩余课时">
+        <!-- <el-table-column label="剩余课时">
           <template slot-scope="scope">
-            {{ scope.row.totalClassTimes - scope.row.currentClassTimes }}
+            {{ scope.row.totalClassTimes +'/'+ scope.row.currentClassTimes }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination :total="pageInfo.total"
                   :page.sync="pageInfo.page"
@@ -95,7 +99,7 @@ export default {
 
     }
   },
-  mounted() {
+  mounted () {
     this.getCourseList()
   },
   methods: {
@@ -108,13 +112,13 @@ export default {
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
       findStudentVipGroups(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    onSearch() {
+    onSearch () {
       this.pageInfo.page = 1
       this.getCourseList()
     }

src/views/teamBuild/signupList.vue

@@ -460,7 +460,7 @@ export default {
       this.$router.push('/business/teamDetail')
     },
     payStart () {
-      paymentStatus = true;
+      this.paymentStatus = true;
       this.getList();
     },
     getList () {

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -1,6 +1,7 @@
 <template>
   <div class='father-Wrap'>
-    <div class="topWrap" v-if="type != 'resetTeam'">
+    <div class="topWrap"
+         v-if="type != 'resetTeam'">
       <el-page-header @back="goback"
                       style='padding-bottom:30px;'
                       content="批量排课">
@@ -104,7 +105,7 @@
              style='float:right'
              @click="multipleReset">批量修改</div>
         <el-table :data='tableList'
-                  style="width: 1160px"
+                  style="width: 1060px"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                   @selection-change="handleSelectionChange">
           <el-table-column type="selection"
@@ -940,7 +941,7 @@ export default {
     }
   }
   .right {
-    width: 1160px;
+    width: 1060px;
 
     .is-selected {
       color: #1989fa;

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -246,10 +246,10 @@ export default {
     highClassGroups({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
         this.tableList = res.data;
-        for (let i in this.tableList) {
-          this.tableList[i].endClassTime = this.tableList[i].endClassTime.substring(0, this.tableList[i].endClassTime.length - 3);
-          this.tableList[i].startClassTime = this.tableList[i].startClassTime.substring(0, this.tableList[i].startClassTime.length - 3);
-        }
+        // for (let i in this.tableList) {
+        //   this.tableList[i].endClassTime = this.tableList[i].endClassTime.substring(0, this.tableList[i].endClassTime.length - 3);
+        //   this.tableList[i].startClassTime = this.tableList[i].startClassTime.substring(0, this.tableList[i].startClassTime.length - 3);
+        // }
       }
     })
   },

src/views/teamBuild/teamSeting/components/salarySet.vue

@@ -1,7 +1,7 @@
 <template>
   <div class='salary-container'>
+    <!--   v-if="!hasDate" -->
     <el-form :inline="true"
-             v-if="hasDate"
              :model="searchForm">
       <el-form-item label="课酬结算标准">
         <el-select v-model="searchForm.salary"

src/views/teamDetail/components/classList.vue

@@ -41,6 +41,11 @@
         <el-table-column align='center'
                          prop="currentClassTimes"
                          label="当前课次">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.currentClassTimes+'/'+scope.row.totalClassTimes}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="studyNum"

src/views/teamDetail/components/salaryList.vue

@@ -246,7 +246,12 @@ export default {
       }).then(res => {
         if (res.code == 200) {
           this.$message.success('修改成功')
-          this.dialogTableVisible = false;
+          this.teacherMask = {
+            salary: '',
+            subsidy: '',
+            radio: ''
+          },
+            this.dialogTableVisible = false;
           this.innerVisible = false;
         }
       })

vue.config.js

@@ -16,11 +16,11 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000 
 // 
-// let target = 'http://192.168.3.8:18000' //勇哥迁库
+// let target = 'http://testadm.dayaedu.com/' //勇哥迁库
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {