Kaynağa Gözat

fix: 显示问题

zhangjie 11 ay önce
ebeveyn
işleme
6c3d08ef80

+ 1 - 1
src/components/base/TrainingPlanCourseSelect.vue

@@ -65,7 +65,7 @@ export default {
   methods: {
     async search() {
       this.optionList = [];
-      if (!this.professionalId || !this.cultureProgramId) return;
+      // if (!this.professionalId || !this.cultureProgramId) return;
       const res = await conditionTrainingPlanCourseList({
         professionalId: this.professionalId,
         cultureProgramId: this.cultureProgramId,

+ 1 - 1
src/modules/mark/components/ScoreCheckDetail.vue

@@ -266,7 +266,7 @@
           width="120"
         ></el-table-column>
         <el-table-column
-          prop="statusDisplay"
+          prop="studentStatusDisplay"
           label="状态"
           width="80"
         ></el-table-column>

+ 0 - 5
src/modules/mark/views/MarkManage.vue

@@ -83,11 +83,6 @@
         <el-table-column prop="percent" label="阅卷进度" width="120">
           <span slot-scope="scope">{{ scope.row.percent || 0 }}%</span>
         </el-table-column>
-        <el-table-column
-          prop="omrAbsentCount"
-          label="识别缺考"
-          width="100"
-        ></el-table-column>
         <el-table-column
           prop="statusDisplay"
           label="评卷状态"

+ 1 - 4
src/modules/statistics/views/PrintTaskStat.vue

@@ -79,10 +79,7 @@
         </el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号" width="200">
         </el-table-column>
-        <el-table-column prop="type" label="题卡类型" width="100">
-          <span slot-scope="scope">{{
-            scope.row.cardType | cardTypeFilter
-          }}</span>
+        <el-table-column prop="cardTypeStr" label="题卡类型" width="100">
         </el-table-column>
         <el-table-column prop="college" label="开课学院" min-width="160">
         </el-table-column>

+ 1 - 4
src/modules/statistics/views/ScanTaskStat.vue

@@ -69,10 +69,7 @@
         </el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号" width="200">
         </el-table-column>
-        <el-table-column prop="cardType" label="题卡类型" width="100">
-          <span slot-scope="scope">{{
-            scope.row.cardType | cardTypeFilter
-          }}</span>
+        <el-table-column prop="cardTypeStr" label="题卡类型" width="100">
         </el-table-column>
         <el-table-column prop="studentCount" label="考生数" width="100">
         </el-table-column>

+ 50 - 41
src/modules/target/components/requirement-statistics/RequirementStatisticsStatement.vue

@@ -60,55 +60,64 @@
                 </template>
               </template>
               <template slot-scope="scope">
-                <el-popover
-                  v-if="
-                    scope.row.obeRequirements[cindex].obeSubRequirements[sindex]
-                      .matrixDegree
-                  "
-                  placement="right"
-                  trigger="click"
-                >
-                  <div class="matrix-content" slot="reference">
-                    {{
+                <template v-if="scope.$index < rowCount - 2">
+                  <el-popover
+                    v-if="
                       scope.row.obeRequirements[cindex].obeSubRequirements[
                         sindex
                       ].matrixDegree
-                    }}
-                  </div>
-                  <div class="matrix-tips">
-                    <h3>
-                      <span>
-                        {{ scope.row.courseName }}
-                      </span>
-                      <span v-if="scope.row.courseCode">
-                        ({{ scope.row.courseCode }})
-                      </span>
-                    </h3>
-                    <p>课程目标达成值:{{ scope.row.courseMatrixDegree }}</p>
-                    <p>
-                      在该指标点下支撑权重:{{
-                        scope.row.obeRequirements[cindex].obeSubRequirements[
-                          sindex
-                        ].scale
-                      }}
-                    </p>
-                    <p>
-                      该指标点达成值:{{ scope.row.courseMatrixDegree }} ×
-                      {{
-                        scope.row.obeRequirements[cindex].obeSubRequirements[
-                          sindex
-                        ].scale
-                      }}
-                      =
+                    "
+                    placement="right"
+                    trigger="click"
+                  >
+                    <div class="matrix-content" slot="reference">
                       {{
                         scope.row.obeRequirements[cindex].obeSubRequirements[
                           sindex
                         ].matrixDegree
                       }}
-                    </p>
-                  </div>
-                </el-popover>
-                <span v-else>--</span>
+                    </div>
+                    <div class="matrix-tips">
+                      <h3>
+                        <span>
+                          {{ scope.row.courseName }}
+                        </span>
+                        <span v-if="scope.row.courseCode">
+                          ({{ scope.row.courseCode }})
+                        </span>
+                      </h3>
+                      <p>课程目标达成值:{{ scope.row.courseMatrixDegree }}</p>
+                      <p>
+                        在该指标点下支撑权重:{{
+                          scope.row.obeRequirements[cindex].obeSubRequirements[
+                            sindex
+                          ].scale
+                        }}
+                      </p>
+                      <p>
+                        该指标点达成值:{{ scope.row.courseMatrixDegree }} ×
+                        {{
+                          scope.row.obeRequirements[cindex].obeSubRequirements[
+                            sindex
+                          ].scale
+                        }}
+                        =
+                        {{
+                          scope.row.obeRequirements[cindex].obeSubRequirements[
+                            sindex
+                          ].matrixDegree
+                        }}
+                      </p>
+                    </div>
+                  </el-popover>
+                  <span v-else>--</span>
+                </template>
+                <span v-else>
+                  {{
+                    scope.row.obeRequirements[cindex].obeSubRequirements[sindex]
+                      .matrixDegree | defaultFieldFilter
+                  }}
+                </span>
               </template>
             </el-table-column>
           </el-table-column>

+ 0 - 2
src/modules/target/views/TargetScoreManage.vue

@@ -7,7 +7,6 @@
             <training-plan-select
               v-model="filter.cultureProgramId"
               placeholder="培养方案"
-              :clearable="false"
               @change="trainingPlanChange"
             ></training-plan-select>
           </el-form-item>
@@ -15,7 +14,6 @@
             <semester-select
               v-model="filter.semesterId"
               placeholder="学期"
-              :clearable="false"
               style="width: 220px"
             ></semester-select>
           </el-form-item>

+ 0 - 2
src/modules/target/views/TargetStatistics.vue

@@ -7,7 +7,6 @@
             <training-plan-select
               v-model="filter.cultureProgramId"
               placeholder="培养方案"
-              :clearable="false"
               @change="trainingPlanChange"
             ></training-plan-select>
           </el-form-item>
@@ -17,7 +16,6 @@
               placeholder="课程"
               :professional-id="filter.professionalId"
               :culture-program-id="filter.cultureProgramId"
-              :clearable="false"
             ></training-plan-course-select>
           </el-form-item>
         </template>