浏览代码

generation step - hidden feature configurable

hare8999@163.com 2 年之前
父节点
当前提交
d6b749a4f5

+ 6 - 2
src/views/elective/generation/components/elective-generation-steps.vue

@@ -9,8 +9,8 @@
           <div class="rel"
                :class="{'bold':activeStep==idx+1, 'f-333':activeStep==idx+1&&step.value>generation.current}">
             <i v-if="activeStep==idx+1" class="el-icon-thumb current-pointer current-animation abs"></i>
-            <el-popover v-else-if="step.value<generation.current&&step.value<activeStep" trigger="hover"
-                        class="abs current-view">
+            <el-popover v-else-if="!disableHiddenFeature&&step.value<generation.current&&step.value<activeStep"
+                        trigger="hover" class="abs current-view">
               <el-checkbox :value="generation.hiddenGenerations.includes(step.value)"
                            @input="toggleGenerationTableData($event,step)">
                 隐藏{{ step.title }}表格数据
@@ -45,6 +45,10 @@ export default {
     modelValue: {
       type: String,
       default: '' // active step key.
+    },
+    disableHiddenFeature: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

+ 6 - 5
src/views/system/user/profile/round-select.vue

@@ -10,10 +10,10 @@
             <el-form-item label="选科时间" class="form-item-readonly">{{ selectObj.beginTime }} 至 {{ selectObj.endTime }}
             </el-form-item>
             <!--<el-form-item label="选科状态" class="form-item-readonly">-->
-              <!--未选择/已选择<span class="f-red">缺字段</span>-->
+            <!--未选择/已选择<span class="f-red">缺字段</span>-->
             <!--</el-form-item>-->
             <!--<el-form-item label="AI选科" class="form-item-readonly">-->
-              <!--进入/查看<span class="f-red">缺字段</span>-->
+            <!--进入/查看<span class="f-red">缺字段</span>-->
             <!--</el-form-item>-->
           </el-form>
         </el-col>
@@ -32,7 +32,7 @@
     <el-card class="box-card mt20">
       <template #header>
         <elective-generation-steps v-if="allowSelect" v-model="activeStep" :generation="generation"
-        ></elective-generation-steps>
+                                   disable-hidden-feature></elective-generation-steps>
       </template>
       <report-table ref="reportRef" :generation="generation"></report-table>
     </el-card>
@@ -105,7 +105,7 @@
 </template>
 
 <script>
-import {  saveStudentSelected } from '@/api/webApi/selection'
+import { saveStudentSelected } from '@/api/webApi/selection'
 import TestEntry from '@/views/elective/test/components/test-entry'
 import TestResult from '@/views/elective/test/components/test-result'
 import SelectSubject from '@/views/system/user/profile/components/select-subject'
@@ -118,6 +118,7 @@ import {
   getStudentSelected,
   getRecommendMajor
 } from '@/api/webApi/elective/selected-subject'
+
 export default {
   provide() {
     return {
@@ -218,7 +219,7 @@ export default {
   methods: {
     getStudentElectiveModels() {
       getStudentElectiveModels().then(res => {
-        this.generationModels =res.data
+        this.generationModels = res.data
         this.mode = res.data
       })
     },