Browse Source

video修复,选科分班

shilipojs 2 years ago
parent
commit
9a4bfd44f2

+ 2 - 2
src/views/career/newGaokao/video.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="career-course-body mt10">
       <el-row v-if="total > 0" :gutter="10">
-        <el-col class="evaluation-card-wrapper" v-for="c in dataList" :key="c.id" :span="4">
+        <el-col class="evaluation-card-wrapper" v-for="c in dataList" :key="c.id" :span="6">
           <el-card>
             <course-card class="pointer" @click.native="detail(c)" :img="c.coverUrl" :title="c.title" :count="c.clicked"></course-card>
           </el-card>
@@ -50,7 +50,7 @@ export default {
       this.saveClick(item.id)
       const nextParams = {
         id: item.id,
-        aliid: item.aliId.split(',')[1],
+        aliid: item.aliId,
         aliIdType: item.aliIdType,
         name: item.title,
         count: item.clicked,

+ 2 - 1
src/views/elective/dispatch/student/components/dispatch-table.vue

@@ -137,7 +137,8 @@ export default {
               classId: item.classId,
               className: this.getClassName(item.classId)
             }
-          })
+          }),
+        topPriority:this.settings.topPriority
       }))
       console.log('displayRows computed:', rows)
       return rows

+ 20 - 2
src/views/elective/dispatch/student/components/set-classcount.vue

@@ -33,6 +33,18 @@
               <el-input-number :min="1" :max="roundGroup.number?setPubMax(scope.$index):Infinity" v-model="scope.row.actualCount" @change="countEdit(scope.row,scope.$index)" ></el-input-number>
           </template>
         </el-table-column>
+        <el-table-column
+          label="是否设为重点班"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              @change="openBtn(scope.row,scope.$index)"
+              v-model="scope.row.topPriority"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </template>
+        </el-table-column>
       </el-table>
       <el-radio-group class="mt10" v-model="mode">
         <el-popover
@@ -128,6 +140,9 @@ export default {
     countEdit(newVal,index){
       this.settingContainer[index].actualCount = newVal.actualCount
     },
+    openBtn(newVal,index){
+      this.settingContainer[index].topPriority = newVal.topPriority
+    },
     init(roundGroup,settingContainer) {
       console.log(roundGroup,settingContainer)
       this.roundGroup = roundGroup
@@ -139,11 +154,10 @@ export default {
       if( isSetting > 0) {
         // 填充后台的
         this.settingContainer = settingContainer.filter(item => item.groupId == roundGroup.groupId)
-        console.log(this.settingContainer)
         return
       }
       // 没有setting就初始化人数
-      console.log('初始化')
+      console.log('初始化',settingContainer)
       const remainder = roundGroup.number % roundGroup.classCount // 余数
       const divide = Math.floor(roundGroup.number / roundGroup.classCount) // 向下取整的除数
       this.settingContainer = settingContainer.filter(item => item.groupId == roundGroup.groupId).map((item,index)  => {
@@ -154,6 +168,7 @@ export default {
           // 余数分完
           item.actualCount = divide
         }
+        item.topPriority = false
         return item
         console.log(item)
       })
@@ -164,6 +179,8 @@ export default {
       const count =this.formatSetting.reduce((pre, cur) => {
           return pre + cur.actualCount
       }, 0)
+      console.log(this.settingContainer)
+
       if(count != this.roundGroup.number) {
         this.$message.warning('还有学生未分班')
         return
@@ -178,6 +195,7 @@ export default {
         item.expectedCount = item.actualCount
         return item
       })
+      console.log(this.settingContainer)
       applySettings({
         roundId:this.roundId,
         mode:this.mode,

+ 2 - 2
src/views/elective/dispatch/student/index.vue

@@ -9,8 +9,8 @@
       <p v-if="round.allowDispatch && !round.dispatchCompleted" class="text-right mb10"><el-button @click="lockDispatch" type="primary">发布分班</el-button></p>
       <p class="text-right mt5 mb5 f14 mr5" v-if="round.dispatchCompleted">学生分班完成,在 {{publishSettings.activeDate}} 生效</p>
     </div>
-    <dispatch-table v-if="round.allowDispatch" :loading="loading" :round="round" :settings="settings"></dispatch-table>
-    <evaluation-empty v-else shadow :title="emptyTitle"></evaluation-empty>
+    <dispatch-table  :loading="loading" :round="round" :settings="settings"></dispatch-table>
+    <evaluation-empty shadow :title="emptyTitle"></evaluation-empty>
   </div>
 </template>
 <script>