-
+
-
+
- {{ item.typeName }}
+ {{
+ item.typeName }}
-
-
-
-
+
+
+
- {{ item.label }}
+ {{
+ item.label }}
-
-
+
任课班级分享
全年级分享
@@ -101,52 +51,24 @@
+
@@ -274,35 +241,6 @@
- 取消
+ 取消
下一步
-
-
-
+
@@ -872,29 +492,7 @@ export default {
},
data() {
return {
- type: 1, //1-创建，2-复制答题卡
- dialogVisible: false, //测验类型设置弹窗
- addQuestionVisible: false, //添加大题弹窗
- questionForm: { ...questionForm },
- questionFormRules: {
- questionTitle: [
- { required: true, message: "请输入大题名称", trigger: "blur" },
- {
- min: 1,
- max: 30,
- message: "长度在 1 到 30 个字符",
- trigger: "blur",
- },
- ],
- },
- questionOptions: [
- { label: "单选题", value: 2 },
- { label: "多选题", value: 3 },
- { label: "判断题", value: 4 },
- { label: "主观题", value: 5 },
- ],
- rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
- addSubQuestionsType: "",
+ role: "",
step: 0, //步骤
gradeList: [], //年级
subjectList: [], //科目
@@ -904,11 +502,11 @@ export default {
//答题卡详情
title: "",
tagId: "",
- gradeName: "",
subjectName: "",
examsDuration: 90,
- sharingType: 0,
questionList: [],
+ gradeName: "",
+ sharingType: 0,
},
formRules: {
//答题卡验证
@@ -921,7 +519,6 @@ export default {
trigger: "blur",
},
],
- gradeName: [{ required: true, message: "请选择年级", trigger: "blur" }],
subjectName: [
{ required: true, message: "请选择科目", trigger: "blur" },
],
@@ -930,7 +527,8 @@ export default {
],
},
tagList: [],
- diaSetAns: false,
+ diaSetAns: false, //答案开关
+ dialogStem: false, //截图开关
formAns: {
listIndex: 0, //大题位置
endIndex: 0, //相同题目最后一位题目的questionIndex
@@ -940,11 +538,48 @@ export default {
answerOptions: [], //答案选项
answerList: "", //答案列表-字符串
},
+ stem: {
+ index: 0, //大题位置
+ indexs: 0, //小题位置
+ screenshot: "", //题干图片id
+ screenshotSrc: "", //题干图片地址显示用保存时删除
+ },
+ type: 1, //1-创建，2-复制答题卡
+ dialogVisible: false, //测验类型设置弹窗
+ addQuestionVisible: false, //添加大题弹窗
+ questionForm: { ...questionForm },
+ questionFormRules: {
+ questionTitle: [
+ { required: true, message: "请输入大题名称", trigger: "blur" },
+ {
+ min: 1,
+ max: 30,
+ message: "长度在 1 到 30 个字符",
+ trigger: "blur",
+ },
+ ],
+ },
+ questionOptions: [
+ { label: "单选题", value: 2 },
+ { label: "多选题", value: 3 },
+ { label: "判断题", value: 4 },
+ { label: "主观题", value: 5 },
+ ],
+ rightOptions: ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"],
+ addSubQuestionsType: "",
};
},
async created() {
this.type = this.$route.query.type ? this.$route.query.type : 1;
- await this._GradeList();
+ this.role =
+ this.$store.getters.info.showRole ||
+ this.$store.getters.info.permissions[0].role;
+ if (this.role != "ROLE_PERSONAL") {
+ this.formRules.gradeName = [
+ { required: true, message: "请选择年级", trigger: "blur" },
+ ];
+ await this._GradeList();
+ }
await this._QuerySubjectList(this.gradeList[0]);
await this._TypeList();
if (this.type == 2) {
@@ -952,10 +587,43 @@ export default {
}
},
methods: {
+ //上传截图
+ openStem(obj, index, indexs) {
+ this.stem.index = index;
+ this.stem.indexs = indexs;
+ if (type == 1) {
+ this.stem.screenshot = obj.screenshot || "";
+ this.stem.screenshotSrc = obj.screenshotSrc || "";
+ } else {
+ this.stem.screenshot = "";
+ this.stem.screenshotSrc = "";
+ }
+ this.dialogStem = true;
+ },
+ //图片上传成功
+ upSuccess(res, file) {
+ if (res && res.status == 0) {
+ this.stem.screenshotSrc = res.data.url;
+ this.stem.screenshot = res.data.resId;
+ this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
+ keys
+ ] = this.stem.screenshot;
+ this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
+ keys + "Src"
+ ] = this.stem.screenshotSrc;
+ this.$message.success("上传成功");
+ } else {
+ this.$message.error(res.info);
+ }
+ },
+
+ upError(res) {
+ this.$message.error("上传失败");
+ },
linkBack() {
this.$confirm(
(this.type == 2 ? "修改复制的" : "组建的") +
- "答题卡未保存，确认退出吗？",
+ "答题卡未保存，确认退出吗？",
"提示",
{
confirmButtonText: "取消",
@@ -968,7 +636,7 @@ export default {
type: "warning",
}
)
- .then(() => {})
+ .then(() => { })
.catch(() => {
this.$router.push({
path: "/examinationPaper",
@@ -1046,12 +714,12 @@ export default {
return txt;
},
+ //切换题型清空答案
setQuestionForm(val) {
- //切换题型清空答案
this.questionForm.answerList = "";
},
+ //减少题数设置答案
changeQesNum(val) {
- //减少题数设置答案
if (
this.questionForm.questionType == 2 ||
this.questionForm.questionType == 4
@@ -1061,15 +729,14 @@ export default {
val
);
} else {
- console.log(this.questionForm.answerList.split(","));
this.questionForm.answerList = this.questionForm.answerList
.split(",")
.splice(0, val)
.join(",");
}
},
+ //初始化要修改的答案
setFormAns(indexs, index) {
- //初始化要修改的答案
this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
this.formAns.listIndex = index;
let startIndex = this.formAns.index + 1 - this.formAns.subNum; //批量设置大难开始位置
@@ -1108,8 +775,8 @@ export default {
};
}
},
+ //多选答案设置
setMultiple(obj, answer, type) {
- //多选答案设置
let elements =
type == 1
? this.$refs["formAnsIpt2"].$el.children[0]
@@ -1136,8 +803,8 @@ export default {
elements.focus();
elements.selectionStart = resault.startPos;
},
+ //批量修改答案
saveFormAns() {
- //批量修改答案
let EndIndex;
let subNum = this.formAns.subNum - 1;
this.form.questionList[this.formAns.listIndex].subQuestions.some(
@@ -1160,8 +827,8 @@ export default {
this.formAns.answerList[subNum - i] == "✓"
? 1
: this.formAns.answerList[subNum - i] == "✗"
- ? 2
- : "";
+ ? 2
+ : "";
}
this.form.questionList[this.formAns.listIndex].subQuestions[
EndIndex - i
@@ -1169,31 +836,9 @@ export default {
}
this.diaSetAns = false;
},
- // keydownAnswer(event) {
- // //快速答案设置禁止输入
- // if (
- // event.key == "Meta" ||
- // event.key == "CapsLock" ||
- // event.key == "Shift" ||
- // event.key == "Enter" ||
- // event.key == "Alt" ||
- // event.key == "Backspace" ||
- // event.key == "Delete" ||
- // event.key == "ArrowUp" ||
- // event.key == "ArrowDown" ||
- // event.key == "ArrowLeft" ||
- // event.key == "v" ||
- // event.key == "V" ||
- // event.key == "ArrowRight"
- // ) {
- // return;
- // } else {
- // event.returnValue = "";
- // }
- // },
keydownAnswer(event, type, isAddBig) {
- let answerA = "ABCDEFG";
- let answer_a = "abcdefg";
+ let answerA = "ABCDEFGHIJ";
+ let answer_a = "abcdefghij";
if (isAddBig) {
answerA = answerA.substring(0, this.questionForm.selectNum);
answer_a = answer_a.substring(0, this.questionForm.selectNum);
@@ -1260,6 +905,10 @@ export default {
this.step = 1;
},
setStep1() {
+ if (this.subjectList.length == 0) {
+ this.$message.warning("暂无绑定年级信息，请先联系管理员设置。");
+ return;
+ }
this.$refs["forms"].validate((valid) => {
// 验证通过：保存
if (valid) {
@@ -1275,13 +924,6 @@ export default {
this.$message.warning("请添加题目！");
return;
}
- // let valid = "";
- // this.form.questionList.map((item, index) => {
- // if (!item.questionTitle) {
- // valid += index + 1 + "、";
- // }
- // });
- // if (!valid) {
//添加题目ID、序号
this.form.questionList.map((item, index) => {
item.questionType = 0;
@@ -1346,16 +988,11 @@ export default {
);
}
}
- console.log(types);
});
this.step = 2;
return;
- // } else {
- // this.$message.error(
- // `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！`
- // );
- // }
},
+ //删除批量操作数据
formatQuestionList() {
for (let i = 0; i < this.form.questionList.length; i++) {
for (
@@ -1373,8 +1010,8 @@ export default {
this.questionForm = { ...questionForm };
this.addQuestionVisible = true;
},
+ //添加大题
addQuestion() {
- //添加大题
let subQuestions = [];
let questionsOptions = {
...subQuesOptions,
@@ -1412,8 +1049,8 @@ export default {
this.questionForm.answerList[i] == "✓"
? 1
: this.questionForm.answerList[i] == "✗"
- ? 2
- : "";
+ ? 2
+ : "";
} else if (questionsOptions.questionType == 3) {
answer = this.questionForm.answerList.split(",")[i] || "";
} else if (questionsOptions.questionType == 2) {
@@ -1431,10 +1068,8 @@ export default {
});
this.addQuestionVisible = false;
},
+ //删除小题
delTabData(subIndex, index) {
- //删除小题
- console.log(subIndex);
- console.log(index);
this.form.questionList[index].subQuestions.splice(subIndex, 1);
},
setScore(question) {
@@ -1443,21 +1078,6 @@ export default {
}, 0);
return Number(score).toFixed(2);
},
- equalScore(question) {
- let score = 0;
- let bools = true;
- for (let i = 0; i < question.subQuestions.length; i++) {
- if (i == 0) {
- score = question.subQuestions[i].score;
- } else {
- if (score != question.subQuestions[i].score) {
- bools = false;
- break;
- }
- }
- }
- return bools;
- },
changeAddSubQuestions(val, question) {
if (val) {
let questionsOptions = {
@@ -1488,8 +1108,8 @@ export default {
this.addSubQuestionsType = "";
}
},
+ //切换多题型-小题题型
changeSubQuestions(val, subQuestions) {
- //切换多题型-小题题型
const that = this;
subQuestions.score = 1;
subQuestions.partScore = 0;
@@ -1515,17 +1135,17 @@ export default {
break;
}
},
+ //添加选项
addOptions(subQuestions) {
- //添加选项
let length = subQuestions.answerOptions.split(",").length;
- if (length > 6) return;
+ if (length > 9) return;
subQuestions.selectNum = length + 1;
subQuestions.answerOptions = this.rightOptions
.slice(0, subQuestions.selectNum)
.join(",");
},
+ //删除选项
removeOptions(subQuestions) {
- //删除选项
let length = subQuestions.answerOptions.split(",").length;
if (length < 3) return;
subQuestions.selectNum = length - 1;
@@ -1537,8 +1157,8 @@ export default {
subQuestions.selectNum
);
},
+ //设置多选答案
changAnswer(sub, option) {
- //设置多选答案
let str = new RegExp(option, "g");
if (sub.correctAnswer?.includes(option)) {
sub.correctAnswer = sub.correctAnswer.replace(str, "");
@@ -1564,7 +1184,11 @@ export default {
return;
}
//修改测验类型
- const { data, status, info } = await this.$request.editPaperType({
+ let editPaperType =
+ this.role == "ROLE_PERSONAL"
+ ? this.$request.pModifyPaperType
+ : this.$request.editPaperType;
+ const { data, status, info } = await editPaperType({
tagId: obj.id,
tag: obj.typeName,
});
@@ -1578,7 +1202,11 @@ export default {
},
async removeTypeName(obj) {
//删除测验类型
- const { data, status, info } = await this.$request.delPaperType({
+ let delPaperType =
+ this.role == "ROLE_PERSONAL"
+ ? this.$request.pDelPaperType
+ : this.$request.delPaperType;
+ const { data, status, info } = await delPaperType({
tagId: obj.id,
});
if (status == 0) {
@@ -1606,7 +1234,11 @@ export default {
return;
}
//添加测验类型
- const { data, status, info } = await this.$request.addPaperType({
+ let addPaperType =
+ this.role == "ROLE_PERSONAL"
+ ? this.$request.pAddPaperType
+ : this.$request.addPaperType;
+ const { data, status, info } = await addPaperType({
tag: this.answerTypeName,
});
if (status == 0) {
@@ -1626,8 +1258,17 @@ export default {
let formDatas = deepClone(this.form);
for (let i = 0; i < formDatas.questionList.length; i++) {
delete formDatas.questionList[i].show;
+ for (let j = 0; j < formDatas.questionList[i].subQuestions; j++) {
+ if (!!formDatas.questionList[i].subQuestions[j].screenshotSrc) {
+ delete formDatas.questionList[i].subQuestions[j].screenshotSrc;
+ }
+ }
}
- const { data, status, info } = await this.$request.addPaper({
+ let addPaper =
+ this.role == "ROLE_PERSONAL"
+ ? this.$request.pAddPaper
+ : this.$request.addPaper;
+ const { data, status, info } = await addPaper({
...formDatas,
});
this.saveLoading = false;
@@ -1645,8 +1286,11 @@ export default {
},
async _TypeList() {
//测验类型查询
- const { data, status, info } = await this.$request.fetchTypeNames({
- gradeName: this.form.gradeName,
+ let fetchTypeNames =
+ this.role == "ROLE_PERSONAL"
+ ? this.$request.pPaperTagList
+ : this.$request.fetchTypeNames;
+ const { data, status, info } = await fetchTypeNames({
type: 1,
});
if (status == 0) {
@@ -1678,38 +1322,67 @@ export default {
},
async _QuerySubjectList(grade) {
//查询科目列表
- const { data, status, info } = await this.$request.fetchSubjectList({
- gradeName: grade,
- });
+ if (!grade) {
+ return;
+ }
+ let query = {};
+ let fetchSubjectList =
+ this.role == "ROLE_PERSONAL"
+ ? this.$request.pSubjectList
+ : this.$request.fetchSubjectList;
+ if (this.role != "ROLE_PERSONAL") {
+ query.gradeName = grade;
+ }
+ const { data, status, info } = await fetchSubjectList({ ...query });
if (status === 0) {
this.subjectList =
data.subjectNames?.map((item) => {
return {
- value: item,
- label: item,
+ value: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
+ label: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
};
}) || [];
- console.log(this.subjectList);
if (this.subjectList.length) {
this.form.subjectName = this.subjectList[0].value;
}
- console.log(this.form);
} else {
this.$message.error(info);
}
},
async _QueryDetail() {
//查询答题卡详情
- const { data, status, info } = await this.$request.fetchPaperDetail({
+ let fetchPaperDetail =
+ this.role == "ROLE_PERSONAL"
+ ? this.$request.pPaperDetail
+ : this.$request.fetchPaperDetail;
+ const { data, status, info } = await fetchPaperDetail({
paperId: this.$route.query.paperId,
});
if (status == 0) {
this.form.title = data.title + "_副本";
this.form.tagId = data.tagId === 0 ? "" : data.tagId;
- this.form.subjectName = data.subjectName;
- this.form.gradeName = data.gradeName;
+ if (this.subjectList.length) {
+ this.subjectList.map((item) => {
+ if (item.label == data.subjectName) {
+ this.form.subjectName = item.value;
+ }
+ });
+ } else {
+ this.form.subjectName = "";
+ }
this.form.examsDuration = data.examsDuration;
- this.form.sharingType = data.sharingType;
+ if (this.role != "ROLE_PERSONAL") {
+ this.form.sharingType = data.sharingType;
+ if (this.gradeList.length) {
+ this.gradeList.map((item) => {
+ if (item == data.gradeName) {
+ this.form.gradeName = data.gradeName;
+ }
+ });
+ } else {
+ this.form.gradeName = "";
+ }
+ }
this.form.questionList = data.questionList?.map((item) => {
let subQuestions =
item.subQuestions?.map((items) => {
@@ -1720,6 +1393,8 @@ export default {
selectNum: items.answerOptions.split(",").length,
answerOptions: items.answerOptions || "A,B,C,D",
correctAnswer: items.correctAnswer,
+ screenshot: items.screenshot || "",
+ screenshotSrc: items.screenshot || "",
};
}) || [];
return {
@@ -1740,30 +1415,42 @@ export default {
.red {
color: #f30;
}
+
.qs-options {
flex: 1;
+
.ipt {
margin-bottom: 5px;
}
+
.answer-box {
.answer-s {
cursor: pointer;
user-select: none;
+ margin-bottom: 10px;
+
&:first-of-type {
margin-left: 0;
}
}
}
+
+ .answer-box2 {
+ margin-bottom: 10px;
+ }
+
.delButton {
text-indent: -9999999px;
border-color: #ff6868;
- background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
+ background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
background-size: 19px;
color: transparent;
}
+
.answer-s.ac {
border: none;
}
+
.ac {
border-color: #ff6868;
background: #ff6868;
@@ -1774,6 +1461,7 @@ export default {
.sel2 {
width: 480px;
}
+
.set-ans-btn {
width: 100%;
padding: 10px 0 10px 630px;
@@ -1781,23 +1469,28 @@ export default {
border-right: 1px solid #e2e2e2;
border-bottom: 1px solid #e2e2e2;
}
+
.content-box {
width: 100%;
height: 100%;
overflow-y: auto;
}
+
.content {
width: 100%;
box-sizing: border-box;
- padding: 0 50px;
+ padding: 0 24px;
+
.ml-20 {
margin-left: 20px;
}
+
.btn-box {
text-align: right;
margin-left: 140px;
}
}
+
.dia-content {
.dia-tit {
font-size: 20px;
@@ -1805,27 +1498,33 @@ export default {
font-weight: 700;
text-align: center;
}
+
.add-type {
width: 100%;
margin-bottom: 10px;
+
.js-set {
margin: 2.5px 10px 0 0;
font-size: 14px;
}
}
+
.add-btn {
margin-left: 20px;
}
}
+
.el-message-box {
:deep(.el-button--default) {
color: #fff;
}
}
+
.add-box {
display: flex;
justify-content: center;
align-items: center;
+
.add-question {
display: flex;
justify-content: center;
@@ -1834,84 +1533,103 @@ export default {
font-weight: bolder;
padding: 2px;
cursor: pointer;
+
.s1 {
margin-left: 6px;
}
+
:deep(.el-icon-plus) {
font-size: 24px;
font-weight: 900;
}
+
:deep(.el-button--mini.is-circle) {
padding: 3px;
}
}
}
+
.dialog-footer {
text-align: center;
+
:deep(.el-button) {
border-radius: 20px;
padding: 8px 20px 7px;
margin: 0 12px;
}
}
+
.question-box {
margin-bottom: 20px;
}
+
.question-title {
line-height: 40px;
display: flex;
align-items: center;
margin-bottom: 12px;
+
.m20 {
- margin-left: 20px;
+ margin: 0 20px;
}
+
.ipt {
width: 300px;
margin: 0 16px 0 10px;
+
:deep(.el-input__inner) {
border-radius: 20px;
border-color: #667ffd;
background: rgba($color: #667ffd, $alpha: 0.05);
}
}
+
.delete {
margin-right: 8px;
}
+
.title-txt {
margin-right: 20px;
font-size: 16px;
font-weight: 700;
}
+
.el-icon-caret-right {
font-size: 24px;
color: #888;
transition: all 0.4s;
margin-right: 12px;
cursor: pointer;
+
&.active {
transform: rotate(90deg);
}
}
}
+
.questions-ul {
border-left: 1px solid #e2e2e2;
border-top: 1px solid #e2e2e2;
}
+
.el-input-number {
width: 140px;
}
+
.answer-title {
text-align: center;
font-size: 20px;
color: #333;
font-weight: 700;
padding-bottom: 20px;
+
.totals {
font-size: 16px;
color: #888;
font-weight: normal;
}
}
+
.answer-box {
.answer-s {
display: inline-block;
@@ -1924,6 +1642,7 @@ export default {
color: #333;
text-align: center;
line-height: 30px;
+
&.active {
background: #5e78fa;
border-color: #5e78fa;
@@ -1931,6 +1650,7 @@ export default {
}
}
}
+
.qs-options {
.answer-s {
display: inline-block;
@@ -1944,6 +1664,7 @@ export default {
text-align: center;
line-height: 30px;
cursor: pointer;
+
&.active {
background: #5e78fa;
border-color: #5e78fa;
@@ -1951,11 +1672,13 @@ export default {
}
}
}
+
.sub-questions {
width: 100%;
display: flex;
border-bottom: 1px solid #e2e2e2;
- & > div {
+
+ &>div {
min-height: 40px;
padding: 5px;
flex-shrink: 0;
@@ -1964,30 +1687,38 @@ export default {
justify-content: center;
align-items: center;
}
+
.qs-num {
- width: 80px;
+ width: 70px;
}
+
.qs-type {
width: 160px;
}
+
.qs-score,
.qs-partScore {
width: 160px;
}
+
.qs-options {
flex: 1;
}
+
.qs-set {
- width: 80px;
+ width: 60px;
}
+
.qs-options2 {
text-align: left;
justify-content: flex-start;
padding-left: 20px;
+
.answer-s {
cursor: pointer;
}
}
+
:deep(.el-select) {
.el-input__inner {
border-radius: 20px;
@@ -1997,9 +1728,23 @@ export default {
line-height: 32px;
background: rgba($color: #667ffd, $alpha: 0.05);
}
+
.el-input__icon {
line-height: 32px;
}
}
}
+
+.upload-box {
+ .upload-demo {
+ text-align: center;
+ }
+
+ .stem-pic {
+ display: block;
+ margin: 0 auto 20px;
+ height: 200px;
+ object-fit: cover;
+ }
+}
\ No newline at end of file
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 778aa7d..0cbfe7e 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -141,39 +141,6 @@
-
-
@@ -242,18 +120,11 @@
- +
-
{{ setNum(index, indexs) }}-
+ @@ -261,121 +132,65 @@ -+ --
-+ -- + + ++ + ++ + ++ + -
添加-
+ @@ -392,216 +207,102 @@ -
+ 添加大题 --取消 +取消 上一步 -下一步 +下一步 + --+ - + - - + + - -+ - + + - -+ - + + -+ {{ form.title }}
卷面总分：{{ allScore }}分
++-{{ setBigNum(index) }}、 {{ question.questionTitle }} 共：{{ setNums(question.subQuestions) }}题 - 共：{{ setScore(question) }} 分 + 共：{{ setScore(question) }} 分
-
@@ -637,21 +334,12 @@
漏选得分
-
-
-
-
批量设置答案 + -
+
+
批量设置答案 @@ -661,158 +349,77 @@ {{ setSubPro(subQuestions.questionType) }}-+ --
-+
+ -取消 +取消 上一步 保存 + ++++
+ +{{ + stem.screenshot ? "重新上传" : "选择照片" + }} +++关闭弹窗 + -
@@ -637,21 +334,12 @@
操作
-