Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit a4aaa8c8 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

parents fe0bd735 9f403102
Hide whitespace changes
Inline Side-by-side
Showing with 477 additions and 69 deletions
danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/AddQuestion.vue
View file @ a4aaa8c8
......@@ -5,6 +5,18 @@
目前录入题目是第<span>{{ questionNextNum }}</span
>道题
</div>
<div>
<el-radio-group
v-model="form.topicType"
size="mini"
@input="topicTypeChange"
>
<el-radio-button :label="1">单选</el-radio-button>
<el-radio-button :label="2">多选</el-radio-button>
<el-radio-button :label="3">判断</el-radio-button>
</el-radio-group>
</div>
<div class="right">{{ courseName }}</div>
</div>
......@@ -40,15 +52,11 @@
:label="'选项' + (index + 1)"
:key="question.key"
:prop="'questions.' + index + '.value'"
:rules="
index === 0
? {
required: true,
message: '第一项不能为空不能为空',
trigger: 'blur',
}
: {}
"
:rules="{
required: true,
message: '选项内容不能为空不能为空',
trigger: 'change',
}"
>
<div class="add-select flex">
<el-input
......@@ -62,7 +70,9 @@
<div
@click="rightAnswerClick(index)"
class="right"
:class="{ active: answerNum === index }"
:class="{
active: answerNum.indexOf(index) >= 0,
}"
>
设为正确答案
</div>
......@@ -100,7 +110,7 @@
>
设为正确答案
</div> -->
<div style="padding-left:30px">
<div style="padding-left: 30px" v-if="form.topicType != 3">
<el-button size="mini" type="primary" @click.prevent="add(addValue)"
>新增选项</el-button
>
......@@ -140,11 +150,13 @@ export default {
components: {},
data() {
return {
// topicType:1,
form: {
topicType: 1,
topicTitle: "",
questions: [{ value: "" }, { value: "" }],
},
answerNum: null,
answerNum: [],
addValue: "",
// 录入的是第几道题
questionNextNum: 1,
......@@ -159,10 +171,11 @@ export default {
console.log(res.data);
const data = res.data;
this.form = {
topicType :data.topicType,
topicTitle: data.topicTitle,
questions: JSON.parse(data.topicOption),
};
this.answerNum = data.answer;
this.answerNum = JSON.parse(data.answer);
});
}
......@@ -172,6 +185,23 @@ export default {
this.getLessonById(this.courseId);
},
methods: {
// 题目类型变化
topicTypeChange(num) {
if (num == 1) {
this.answerNum = [];
} else if (num == 2) {
this.answerNum = [];
// this.form.questions=[{ value: "" }, { value: "" }];
} else {
this.answerNum = [];
const form = {
topicType: 3,
topicTitle: this.form.topicTitle,
questions: [{ value: "对" }, { value: "错" }],
};
this.form = form;
}
},
getQuestion() {
getQuestion({ courseId: this.courseId }).then((res) => {
// 如果是修改 就是原来的值，如果不是，就是总数+1
......@@ -202,19 +232,46 @@ export default {
}
},
rightAnswerClick(index) {
this.answerNum = index;
console.log(index);
if (this.form.topicType === 2) {
const ind = this.answerNum.indexOf(index);
if (ind < 0) {
this.answerNum.push(index);
} else {
this.answerNum.splice(ind, 1);
}
this.answerNum = this.answerNum.sort((a, b) => {
return a - b;
});
console.log(this.answerNum);
} else {
// 判断跟单选模式差不多
this.answerNum = [index];
}
},
// 删除选项
removeDomain(question) {
const index = this.form.questions.indexOf(question);
console.log(index);
// 如果是正确答案,就让正确答案清空
if (this.answerNum === index) {
this.answerNum = null;
const ind = this.answerNum.indexOf(index);
if (ind >= 0) {
this.answerNum.splice(ind, 1);
}
// 如果是最后一位呗删除，那不用管，如果不是最后一位置，这一位删除之后，则这一位后面的所有数字都要-1;
if (index != this.form.questions.length - 1) {
this.answerNum = this.answerNum.map((item, i) => {
if (item >= index) {
return item - 1;
} else {
return item;
}
});
}
if (index >= 0) {
this.form.questions.splice(index, 1);
}
console.log(this.answerNum);
// console.log(this.form.questions)
},
// 新增选项
add(addValue) {
......@@ -223,7 +280,7 @@ export default {
},
save(num = 2) {
return new Promise((resove) => {
if (!this.answerNum && this.answerNum !== 0) {
if (this.answerNum.length<=0) {
this.$message({
message: "警告，请设置一个正确答案",
type: "warning",
......@@ -235,11 +292,14 @@ export default {
const data = {};
data.topicTitle = this.form.topicTitle;
data.topicOption = JSON.stringify(this.form.questions);
data.answer = this.answerNum;
data.answer = JSON.stringify(this.answerNum);
data.topicType=this.form.topicType;
console.log(data)
this.addQuestion(data).then((res) => {
if (res.code == 200) {
// 把修改的这个归位，变成正常添加
this.$emit("update:topicId", null);
console.log("updateTopicId", this.topicId);
this.$message({
message: "添加题目成功",
type: "success",
......@@ -264,11 +324,13 @@ export default {
});
},
reset() {
const topicType = this.form.topicType
this.form = {
topicType,
topicTitle: "",
questions: [{ value: "" }, { value: "" }, { value: "" }],
questions: [{ value: "" }, { value: "" }],
};
this.answerNum = null;
this.answerNum = [];
this.addValue = "";
},
},
......
danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/QuestionList.vue
View file @ a4aaa8c8
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-22 17:56:05
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-28 17:54:16
* @LastEditTime: 2023-01-10 14:19:22
* @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -14,11 +14,12 @@
>道题
<span class="warn">温馨提示：发布课程前需要进行考试设置</span>
</div>
<div class="right">{{courseName}}</div>
<div class="right">{{ courseName }}</div>
</div>
<div class="table flex" v-loading="loading">
<div class="th flex">
<div class="left">序号</div>
<!-- <div class="type">题目类型</div> -->
<div class="middle">题目名称</div>
<div class="right">操作</div>
</div>
......@@ -29,6 +30,7 @@
class="td flex"
>
<div class="left">{{ index + 1 }}</div>
<!-- <div class="type">{{item.topicType}}</div> -->
<div class="middle zzz">
{{ item.topicTitle }}
</div>
......@@ -53,17 +55,54 @@
</div>
<div class="rightNum flex">
<div class="left">考试设置</div>
<div class="middle flex">
<div class="left-text">单选一题</div>
<div>
<el-input
v-model="bottomFrom.singleChoiceScore"
style="width: 40px"
size="mini"
></el-input>
</div>
<div>分</div>
</div>
<div class="middle flex">
<div class="left-text">多选一题</div>
<div>
<el-input
v-model="bottomFrom.multipleChoiceScore"
style="width: 40px"
size="mini"
></el-input>
</div>
<div>分</div>
</div>
<div class="middle flex">
<div class="left-text">判断一题</div>
<div>
<el-input
v-model="bottomFrom.judgmentScore"
style="width: 40px"
size="mini"
></el-input>
</div>
<div>分</div>
</div>
<div class="middle flex">
<div class="left-text">答对题目大于</div>
<div class="left-text">总分大于</div>
<div>
<el-input
v-model="rightNum"
v-model="bottomFrom.qualifiedNum"
style="width: 60px"
size="mini"
></el-input>
</div>
<div>为合格</div>
</div>
<div class="right">
<el-button
@click="saveRightNum"
......@@ -97,10 +136,16 @@ export default {
// 当前课程的第几题，调一遍接口
questionNum: null,
// 答对几道题
rightNum: 0,
// rightNum: 0,
bottomFrom: {
singleChoiceScore: 0,
multipleChoiceScore: 0,
judgmentScore: 0,
qualifiedNum: 0,
},
questionList: [],
loading: false,
courseName:'',
courseName: "",
};
},
// watch: {
......@@ -145,7 +190,12 @@ export default {
getLessonById(courseId) {
getLessonById(courseId).then((res) => {
console.log(res);
this.rightNum = res.data.qualifiedNum;
this.bottomFrom ={
singleChoiceScore: res.data.qualifiedNum,
multipleChoiceScore: res.data.multipleChoiceScore,
judgmentScore: res.data.judgmentScore,
qualifiedNum: res.data.qualifiedNum,
}
this.courseName = res.data.courseName;
});
},
......@@ -179,23 +229,25 @@ export default {
});
},
saveRightNum() {
if (this.rightNum > this.questionList.length) {
this.$message({
message: "答对题目数应小于等于考试题目总数",
type: "warning",
});
return;
}
changeLesson({ courseId: this.courseId, qualifiedNum: this.rightNum }).then(
(res) => {
if (res.code == 200) {
this.$message({
message: "答题合格数修改成功",
type: "success",
});
}
// if (this.bottomFrom.rightNum > this.questionList.length) {
// this.$message({
// message: "答对题目数应小于等于考试题目总数",
// type: "warning",
// });
// return;
// }
changeLesson({
courseId: this.courseId,
// qualifiedNum: this.rightNum,
...this.bottomFrom
}).then((res) => {
if (res.code == 200) {
this.$message({
message: "答题合格数修改成功",
type: "success",
});
}
);
});
},
},
};
......@@ -255,6 +307,10 @@ export default {
width: 15%;
text-align: center;
}
// .type {
// width: 10%;
// text-align: center;
// }
.middle {
width: 60%;
padding-left: 100px;
......@@ -283,9 +339,13 @@ export default {
width: 15%;
text-align: center;
}
// .type {
// width: 10%;
// text-align: center;
// }
.middle {
width: 60%;
padding-left: 10px;
padding-left: 100px;
}
.right {
width: 25%;
......
danger-manage-web/src/views/educationPlanExam/myLessons/components/AnswerLesson.vue
View file @ a4aaa8c8
......@@ -20,14 +20,26 @@
<transition name="fade" mode="out-in">
<div class="question-wrapper" v-if="visible" :key="nowQuestion">
<div v-for="(item, index) in list" :key="item.id">
<Question
v-if="index === nowQuestion"
:questionObj="item"
:index="index"
:nowQuestion="nowQuestion"
:selectLetter="selectLetter"
@changeLetter="changeLetter"
/>
<template v-if="item.topicType === 1 || item.topicType === 3">
<Question
v-if="index === nowQuestion"
:questionObj="item"
:index="index"
:nowQuestion="nowQuestion"
:selectLetter="selectLetter"
@changeLetter="changeLetter"
/>
</template>
<template v-else>
<QuestionChoice
v-if="index === nowQuestion"
:questionObj="item"
:index="index"
:nowQuestion="nowQuestion"
:selectLetter="selectLetter"
@changeLetter="changeLetter"
/>
</template>
</div>
</div>
</transition>
......@@ -40,7 +52,11 @@
active:
answerArr.findIndex(
(item) => item.questionNum === index + 1
) >= 0,
) >= 0 && activeBool(index),
activered:
answerArr.findIndex(
(item) => item.questionNum === index + 1
) >= 0 && !activeBool(index),
now: index === nowQuestion,
}"
v-for="(item, index) in list"
......@@ -77,6 +93,7 @@
<script>
import Question from "./Question";
import QuestionChoice from "./QuestionChoice";
import GoodJob from "./GoodJob.vue";
import {
userQuestionList,
......@@ -101,8 +118,10 @@ export default {
},
components: {
Question,
QuestionChoice,
GoodJob,
},
data() {
return {
nowQuestion: 0,
......@@ -119,9 +138,10 @@ export default {
],
answerArr: [],
// 题目是否被答过，如果答过，就把值传回去，如果没有答过，就是空
selectLetter: 999,
selectLetter: [],
};
},
// watch: {
// visible(newValue) {
// if (newValue) {
......@@ -138,6 +158,7 @@ export default {
return {
id: item.topicId,
text: item.topicTitle,
topicType: item.topicType,
question: JSON.parse(item.topicOption).map((item) => item.value),
};
});
......@@ -151,7 +172,9 @@ export default {
// this.answerClear();
// this.$emit("update:visible", false);
this.saveBody();
const answers = this.answerArr.map((item) => item.answer).join(",");
const json = JSON.stringify(this.answerArr.map((item) => item.answer));
const answers = json.slice(1,json.length-1);
console.log(answers);
this.loading = true;
setAnswer({
userCourseId: this.userCourseId,
......@@ -161,13 +184,12 @@ export default {
if (res.code == 200) {
this.goodJobData = res.data;
this.goodJobShow = true;
}
})
.finally(() => {
this.loading = false;
// 是否作对
this.$emit('jj',this.goodJobData)
this.$emit("jj", this.goodJobData);
});
},
dialogCancel() {
......@@ -193,8 +215,7 @@ export default {
this.nowQuestion = index;
}
// 赋值，如果答过的，就传回去，如果没答过，就是空 变成字符串是因为0位false
this.selectLetter =
this.answerArr[this.nowQuestion]?.answer + "" || 99999;
this.selectLetter = this.answerArr[this.nowQuestion]?.answer || [];
},
nextBtnClick() {
// 到头了，打完了
......@@ -232,7 +253,10 @@ export default {
// 替换
this.answerArr.splice(index, 1, obj);
}
// console.log(this.answerArr);
console.log(this.answerArr);
},
activeBool(index) {
return this.answerArr[index]?.answer.length > 0;
},
},
};
......@@ -279,9 +303,16 @@ export default {
font-size: 14px;
text-align: center;
margin-right: 18px;
box-sizing: border-box;
cursor: pointer;
&.active {
background: #e9e9e9;
background: #afe8ab87;
border:none;
}
&.activered {
background: #b9112633;
border:none;
}
&.now {
background: #a3d3ff;
......
danger-manage-web/src/views/educationPlanExam/myLessons/components/Question.vue
View file @ a4aaa8c8
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-21 11:00:14
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-28 11:15:27
* @LastEditTime: 2023-01-10 14:36:39
* @FilePath: /danger-manage-web/src/views/myLessons/components/Question.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -38,7 +38,7 @@
<div class="change-wrapper flex">
<div
class="change"
:class="{ active: letterActive+'' === index+'' }"
:class="{ active: letterActive.indexOf(index)>=0 }"
@click="changeLetter(index)"
v-for="(item, index) in questionObj.question"
:key="item+'a'+index"
......@@ -105,8 +105,10 @@ export default {
},
// 从外面传进来的选项，选择过的才有，没选择过的没有
selectLetter: {
type: [String, Number],
default:999,
type: [String, Number,Array],
default:()=>{
return [];
},
},
},
data() {
......@@ -143,8 +145,8 @@ export default {
}
},
changeLetter(index) {
this.letterActive = index;
this.$emit("changeLetter", index);
this.letterActive = [index];
this.$emit("changeLetter", this.letterActive);
// this.$emit("changeLetter", this.letters[index]);
},
},
......
danger-manage-web/src/views/educationPlanExam/myLessons/components/QuestionChoice.vue 0 → 100644
View file @ a4aaa8c8
<!--
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-21 11:00:14
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2023-01-10 15:32:10
* @FilePath: /danger-manage-web/src/views/myLessons/components/Question.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="question flex">
<div
class="top"
:class="{ flex: alignItemsCenter }"
:style="{ alignItems: alignItemsCenter ? 'center' : '' }"
ref="top"
>
<div class="text" ref="text">
{{ questionObj.text }}
</div>
<div class="num">{{ nowQuestion + 1 }}</div>
</div>
<div class="middle">
<div
class="item flex"
v-for="(item, index) in questionObj.question"
:key="item + 'aas' + index"
>
<div class="letter">
{{ letters[index] }}
</div>
<div class="">
{{ item }}
</div>
</div>
</div>
<div class="bottom flex">
<div class="change-wrapper flex">
<div
class="change"
:class="{ active: letterActive.indexOf(index) >= 0 }"
@click="changeLetter(index)"
v-for="(item, index) in questionObj.question"
:key="item + 'a' + index"
>
{{ letters[index] }}
</div>
</div>
</div>
</div>
</template>
<script>
const letters = [
"A",
"B",
"C",
"D",
"E",
"F",
"G",
"H",
"I",
"J",
"K",
"L",
"M",
"N",
"O",
"P",
"Q",
"R",
"S",
"T",
"U",
"V",
"W",
"X",
"Y",
"Z",
];
export default {
name: "question",
props: {
questionObj: {
type: Object,
default: () => {
return {
text: "asdfasdf",
question: [
"沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师",
"沙发斯蒂芬大师",
"沙发斯蒂芬大师",
"沙发斯蒂芬大师",
"沙发斯蒂芬大师",
],
};
},
},
nowQuestion: {
type: Number,
},
index: {
type: Number,
},
// 从外面传进来的选项，选择过的才有，没选择过的没有
selectLetter: {
type: [String, Number, Array],
default: () => {
return [];
},
},
},
data() {
return {
alignItemsCenter: false,
// 如果传进来了，就是这个值，如果没有就是null，因为动画需要那个key的问题，会清空原始的盒子，所以要传一下值
letterActive: this.selectLetter,
letters,
};
},
mounted() {
// console.log('123')
// 每次都会更新，所以不需要watch 直接在这里面写 因为动画需要那个key的问题，会清空原始的盒子，所以要传一下值
this.textCenter();
},
watch: {
// 监听一下当前题目，调整一下位置
// nowQuestion(value) {
// console.log('nowQuestion变化',value)
// this.$nextTick(() => {
// this.textCenter();
// });
// },
},
methods: {
textCenter() {
let h1 = this.$refs.text?.offsetHeight;
let h2 = this.$refs.top?.offsetHeight;
// 如果text大于或者等于top，就出不居中，如果不小于top，就上下居中
if (h2 <= h1) {
this.alignItemsCenter = false;
} else {
this.alignItemsCenter = true;
}
},
changeLetter(index) {
// this.letterActive = index;
const ind = this.letterActive.indexOf(index);
if (ind < 0) {
this.letterActive.push(index);
} else {
this.letterActive.splice(ind, 1);
}
this.$emit("changeLetter", this.letterActive);
// this.$emit("changeLetter", this.letters[index]);
},
},
};
</script>
<style lang="scss" scoped>
.question {
// position: absolute;
// top: 0px;
// display: inline-block;
width: 100%;
height: 370px;
padding-bottom: 10px;
border-bottom: 1px solid #bbbbbb;
// background: red;
flex-direction: column;
.top {
background: #f9f9f9;
height: 54px;
padding: 0px 10px 0px 43px;
overflow-wrap: anywhere;
// align-items: center;
overflow-y: auto;
position: relative;
.text {
font-size: 14px;
text-indent: 2em;
}
.num {
position: absolute;
left: 0;
width: 48px;
height: 48px;
top: 4px;
background: #1d84ff;
border-radius: 50%;
text-align: center;
line-height: 48px;
font-size: 18px;
color: #ffffff;
}
}
.middle {
flex: 1;
// background: blue;
overflow-y: auto;
padding-left: 43px;
padding-right: 10px;
margin-bottom: 15px;
.item {
padding-top: 38px;
width: 100%;
overflow-wrap: anywhere;
font-size: 14px;
color: #101010;
.letter {
padding: 2px;
margin-right: 10px;
box-sizing: border-box;
}
}
}
.bottom {
max-height: 70px;
// background: black;
padding-left: 43px;
padding-right: 10px;
overflow-y: auto;
.change-wrapper {
width: 756px;
flex-wrap: wrap;
margin: 0 auto;
.change {
width: 90px;
height: 30px;
background: #e8f4ff;
color: #101010;
border: 1px solid #a3d3ff;
line-height: 30px;
text-align: center;
margin: 0 9px 5px;
border-radius: 4px;
cursor: pointer;
&.active {
background: #1d84ff;
color: #ffffff;
border: 1px solid #a3d3ff;
}
&:hover {
background: rgba(29, 132, 255, 0.5);
color: #ffffff;
}
}
}
}
}
</style>
danger-manage-web/vue.config.js
View file @ a4aaa8c8
......@@ -35,7 +35,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: process.env.VUE_APP_TARGET,
//target: `http://192.168.31.87:8908/dangerManage`,
target: `http://192.168.2.21:8908/dangerManage`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment