成绩配置条件

src/views/education/add-manager.vue

@@ -586,7 +586,7 @@
               <el-radio :label="2">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-show="formComponent.configure == 1" label="选择证书：">
+          <!-- <el-form-item v-show="formComponent.configure == 1" label="选择证书：">
             <el-col :span="20">
               <el-select
                 v-model="formComponent.certificate"
@@ -602,12 +602,14 @@
                 ></el-option>
               </el-select>
             </el-col>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <el-form
           ref="formExam"
           label-width="150px"
           :model="formExam"
+          class="achievement"
+          v-show="formComponent.configure == 1"
         >
           <el-form-item label="项目成绩评定条件">
             <el-select
@@ -623,23 +625,11 @@
                 ></el-option>
               </el-select>
           </el-form-item>
-          <div class="" v-for="(item , index) in formExam.exam" :key="index">
-            <el-form-item label="项目所有考试中，">
-              <el-col :span="3">
-                <el-input v-model="item.num"></el-input>
-              </el-col>
-              <el-col class="line" :span="4"> 门考试成绩等级为</el-col>
-              <el-col :span="3">
-                <el-input v-model="item.level"></el-input>
-              </el-col>
-              <el-col class="line" :span="2"> 评价为</el-col>
-              <el-col :span="3">
-                <el-input v-model="item.level"></el-input>
-              </el-col>
-            </el-form-item>
+          <div v-show="formExam.condition == 1" v-for="(item , index) in formExam.exam" :key="index">
             <el-form-item label="发放证书">
+              <el-col :span="8">
               <el-select
-                v-model="formExam.certificate"
+                v-model="index.certificate"
                 placeholder="请选择证书"
                 style="width: 350px"
               >
@@ -650,8 +640,41 @@
                   :value="item.value"
                 ></el-option>
               </el-select>
+              </el-col>
+              <el-col :span="3">
+                <el-button @click="addCertificate" icon="el-icon-plus" circle></el-button>
+                <el-button @click="reduceCertificate(index)" icon="el-icon-minus" circle></el-button>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="项目中最高">
+              <el-col :span="3">
+                <el-input v-model="item.num"></el-input>
+              </el-col>
+              <el-col class="line" :span="3.5"> &nbsp 门考试平均分：</el-col>
+              <el-col :span="3">
+                <el-input v-model="item.minGrade"></el-input>
+              </el-col>
+              <el-col class="line" :span="1.5"> &nbsp 分~ &nbsp</el-col>
+              <el-col :span="3">
+                <el-input-number v-model="item.maxGrade" :step="2" step-strictly controls-position="right" :min="0" :max="100"></el-input-number>
+              </el-col>
             </el-form-item>
           </div>
+          <el-form-item v-show="formExam.condition == 2" label="发放证书">
+            <el-select
+              v-model="formExam.certificate"
+              placeholder="请选择证书"
+              style="width: 350px"
+              :disabled="projectStatus == 3 || projectStatus == 4 || projectStatus == 5  || projectStatus == 6"
+            >
+              <el-option
+                v-for="item in optionsCertificate"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </div>
@@ -856,15 +879,19 @@ export default {
         condition: '',
         exam: [{
           num: 8,
-          level: "通过",
-          evaluate: "合格",
+          minGrade: 60,
+          maxGrade: 80,
           certificate: '',
         }]
       },
       conditionList: [
         {
-          label: '按考试数量及成绩等级划分',
+          label: '根据平均分发证书',
           value: 1,
+        },
+        {
+          label: '所有组件通过即发放',
+          value: 2,
         }
       ],
       //校验工具 数据
@@ -3010,7 +3037,20 @@ export default {
           this.formComponent.component[j] = this.tagsComponent[j].value;
         }
       }
-    }
+    },
+    addCertificate() {
+      let obj = {
+        num: 10,
+        minGrade: 0,
+        maxGrade: 100,
+        certificate: '',
+      };
+      vm.formExam.exam.push(obj);
+    },
+    reduceCertificate(index) {
+      console.log(index);
+      vm.formExam.exam.splice(index,1);
+    },
   }
 };
 </script>
@@ -3227,6 +3267,9 @@ export default {
   .third-step {
     margin: 30px 0 0px 30px;
     padding-bottom: 30px;
+    .achievement {
+      margin-top: 60px;
+    }
   }
 }
 </style>
\ No newline at end of file

src/views/learning/item-list.vue

@@ -128,7 +128,7 @@ export default {
         pageNo: 1,
         pageSize: 10
       },
-      activeName: "second"
+      activeName: "first"
     };
   },
   computed: {