|
@@ -219,18 +219,6 @@
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item
|
|
|
|
- v-show="formMarkWork.examType === 'ONLINE'"
|
|
|
|
- label="抽题模式"
|
|
|
|
- >
|
|
|
|
- <el-radio-group
|
|
|
|
- v-model="formMarkWork.callType"
|
|
|
|
- :disabled="!!markWorkId"
|
|
|
|
- >
|
|
|
|
- <el-radio label="WHOLE_SET">成套调用</el-radio>
|
|
|
|
- <el-radio label="RANDOM_PAPER">随机抽题</el-radio>
|
|
|
|
- </el-radio-group>
|
|
|
|
- </el-form-item>
|
|
|
|
<el-form-item label="考试" prop="examIds">
|
|
<el-form-item label="考试" prop="examIds">
|
|
<el-select
|
|
<el-select
|
|
v-model="formMarkWork.examIds"
|
|
v-model="formMarkWork.examIds"
|
|
@@ -289,7 +277,6 @@ export default {
|
|
name: "",
|
|
name: "",
|
|
examIds: [],
|
|
examIds: [],
|
|
remark: "",
|
|
remark: "",
|
|
- callType: "WHOLE_SET",
|
|
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
|
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
|
@@ -335,18 +322,7 @@ export default {
|
|
computed: {
|
|
computed: {
|
|
...mapState({ user: (state) => state.user }),
|
|
...mapState({ user: (state) => state.user }),
|
|
},
|
|
},
|
|
- watch: {
|
|
|
|
- "formMarkWork.examType"(val) {
|
|
|
|
- if (val !== "ONLINE") {
|
|
|
|
- this.formMarkWork.callType = "WHOLE_SET";
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- "formMarkWork.callType"() {
|
|
|
|
- if (this.formMarkWork.examType && !this.markWorkId) {
|
|
|
|
- this.examTypeChange();
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
|
|
+ watch: {},
|
|
created() {
|
|
created() {
|
|
this.initMarkWorkData();
|
|
this.initMarkWorkData();
|
|
},
|
|
},
|
|
@@ -426,9 +402,6 @@ export default {
|
|
if (this.formMarkWork.examType) {
|
|
if (this.formMarkWork.examType) {
|
|
params = params + "&examType=" + this.formMarkWork.examType;
|
|
params = params + "&examType=" + this.formMarkWork.examType;
|
|
}
|
|
}
|
|
- if (this.formMarkWork.examType === "ONLINE") {
|
|
|
|
- params = params + "&callType=" + this.formMarkWork.callType;
|
|
|
|
- }
|
|
|
|
this.$http
|
|
this.$http
|
|
.get(MARKING_LOGIC_API + "/exam/all" + params)
|
|
.get(MARKING_LOGIC_API + "/exam/all" + params)
|
|
.then((response) => {
|
|
.then((response) => {
|
|
@@ -542,7 +515,6 @@ export default {
|
|
remark: "",
|
|
remark: "",
|
|
examType: "",
|
|
examType: "",
|
|
examIds: [],
|
|
examIds: [],
|
|
- callType: "WHOLE_SET",
|
|
|
|
};
|
|
};
|
|
this.examSelect = [];
|
|
this.examSelect = [];
|
|
this.markWorkId = "";
|
|
this.markWorkId = "";
|
|
@@ -556,9 +528,7 @@ export default {
|
|
},
|
|
},
|
|
editMarkWorkModal(row) {
|
|
editMarkWorkModal(row) {
|
|
this.examTitle = "编辑评卷工作";
|
|
this.examTitle = "编辑评卷工作";
|
|
- this.formMarkWork = Object.assign({}, row, {
|
|
|
|
- callType: row.callType || "WHOLE_SET",
|
|
|
|
- });
|
|
|
|
|
|
+ this.formMarkWork = Object.assign({}, row, {});
|
|
this.oldWorkName = this.formMarkWork.name;
|
|
this.oldWorkName = this.formMarkWork.name;
|
|
this.markWorkId = row.id;
|
|
this.markWorkId = row.id;
|
|
this.getExamSelect();
|
|
this.getExamSelect();
|
|
@@ -765,11 +735,6 @@ export default {
|
|
resetForm() {
|
|
resetForm() {
|
|
if (this.markWorkId) {
|
|
if (this.markWorkId) {
|
|
//编辑
|
|
//编辑
|
|
- // this.formMarkWork = Object.assign(this.formMarkWork, {
|
|
|
|
- // remark: "",
|
|
|
|
- // name: "",
|
|
|
|
- // callType: "WHOLE_SET",
|
|
|
|
- // });
|
|
|
|
this.formMarkWork.name = "";
|
|
this.formMarkWork.name = "";
|
|
this.formMarkWork.remark = "";
|
|
this.formMarkWork.remark = "";
|
|
this.$refs["formMarkWork"].clearValidate();
|
|
this.$refs["formMarkWork"].clearValidate();
|
|
@@ -779,7 +744,6 @@ export default {
|
|
remark: "",
|
|
remark: "",
|
|
examName: "",
|
|
examName: "",
|
|
name: "",
|
|
name: "",
|
|
- callType: "WHOLE_SET",
|
|
|
|
});
|
|
});
|
|
this.$refs["formMarkWork"].clearValidate();
|
|
this.$refs["formMarkWork"].clearValidate();
|
|
}
|
|
}
|