Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
cb3485f10f
|
@ -1,8 +1,8 @@
|
|||
@font-face {
|
||||
font-family: "iconfont"; /* Project id 4723712 */
|
||||
src: url('iconfont.woff2?t=1732173266977') format('woff2'),
|
||||
url('iconfont.woff?t=1732173266977') format('woff'),
|
||||
url('iconfont.ttf?t=1732173266977') format('truetype');
|
||||
src: url('iconfont.woff2?t=1732240267757') format('woff2'),
|
||||
url('iconfont.woff?t=1732240267757') format('woff'),
|
||||
url('iconfont.ttf?t=1732240267757') format('truetype');
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
|
@ -13,6 +13,10 @@
|
|||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.icon-shangchuan:before {
|
||||
content: "\e61b";
|
||||
}
|
||||
|
||||
.icon-jiqiren_o:before {
|
||||
content: "\eb62";
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -5,6 +5,13 @@
|
|||
"css_prefix_text": "icon-",
|
||||
"description": "",
|
||||
"glyphs": [
|
||||
{
|
||||
"icon_id": "4942656",
|
||||
"name": "上传",
|
||||
"font_class": "shangchuan",
|
||||
"unicode": "e61b",
|
||||
"unicode_decimal": 58907
|
||||
},
|
||||
{
|
||||
"icon_id": "5387814",
|
||||
"name": "机器人_o",
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -29,14 +29,14 @@ import { ElMessage } from 'element-plus'
|
|||
|
||||
const emit = defineEmits(['itemClick'])
|
||||
const items = shallowRef([
|
||||
{ title: '自主搜题', description: '上千万高质量习题资源,历届考试真题,每道题均有习题解析', icon: '#icon-soutibao-',type:'primary' },
|
||||
{ title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'success' },
|
||||
{ title: '自主搜题', description: '上千万高质量习题资源,历届考试真题,每道题均有习题解析', icon: '#icon-soutibao-',type:'default' },
|
||||
{ title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'default' },
|
||||
{ title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'default' },
|
||||
{ title: '智能推荐', description: '通过对学生的薄弱知识点分析,推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'default' },
|
||||
{ title: '课堂展示', description: '通过课堂白板绘制作业,提升学生的创作思维能力。', icon: '#icon-huaban',type:'primary' },
|
||||
{ title: '常规作业', description: '推送pdf、视频、音频、图片,学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'primary' },
|
||||
{ title: '常规作业', description: '推送pdf、视频、音频、图片,学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'danger' },
|
||||
{ title: 'AI设计作业', description: '通过AI助手,根据课标、教材、考试等分析结果,智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
|
||||
{ title: '习题上传', description: '自己上传个人题库。', icon: '#icon-jiqiren_o',type:'danger' },
|
||||
{ title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
|
||||
]);
|
||||
|
||||
const handleClick = (item) => {
|
||||
|
|
|
@ -120,7 +120,7 @@ import { useRouter, useRoute } from 'vue-router'
|
|||
|
||||
import { listEntpcoursework } from '@/api/education/entpCourseWork'
|
||||
import { listEvaluationclue } from '@/api/classTask'
|
||||
import { delEntpcoursework } from "@/api/education/entpCourseWork";
|
||||
import { delEntpcoursework, updateEntpcoursework } from "@/api/education/entpCourseWork";
|
||||
|
||||
import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
|
||||
import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
|
||||
|
@ -284,7 +284,7 @@ const t = function(name, time) {
|
|||
edustage: userStore.edustage, // this.userStore.edustage,
|
||||
edusubject: userStore.edusubject, // this.userStore.edusubject,
|
||||
evalid: props.bookobj.levelSecondId, // this.activeParams.lession.id,
|
||||
|
||||
status: "1",
|
||||
orderby: 'concat(worktype,timestamp) DESC',
|
||||
|
||||
}
|
||||
|
@ -424,7 +424,8 @@ const onSubmitExamSingleCallback=(callback) =>{
|
|||
|
||||
/** 删除题目按钮操作 */
|
||||
const handleDelete = async(item, index) => {
|
||||
await useHandleData(delEntpcoursework, item.id, `确认删除编号为【${index+1}】的题目?` );
|
||||
//await useHandleData(delEntpcoursework, item.id, `确认删除编号为【${index+1}】的题目?` );
|
||||
await useHandleData(updateEntpcoursework, {id:item.id, status:'0'}, `确认删除编号为【${index+1}】的题目?` );
|
||||
debounceQueryData();
|
||||
}
|
||||
|
||||
|
|
|
@ -145,8 +145,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item :prop="checkAnswer">
|
||||
<el-checkbox-group v-model="questForm.checkAnswer" style="display:flex; width: 100%">
|
||||
<el-button @click="addItem" type="primary" style="margin-left: auto;"
|
||||
:disabled="questForm.list.length>=7">+</el-button>
|
||||
<el-button @click="addItem" type="primary" style="margin-left: auto;">+</el-button>
|
||||
<el-button :disabled="questForm.list.length==1" @click="deleteItem(item,index)" type="primary"
|
||||
style="margin-left: 10px;">-</el-button>
|
||||
</el-checkbox-group>
|
||||
|
@ -491,7 +490,7 @@ const questForm = reactive({
|
|||
method: '',
|
||||
submitIndex: 0, // 该题对应原试题集合中的序号([单题上传]时为0, [扫描上传]为集合中的序号)
|
||||
submitType: 0, // 该题的上传方法
|
||||
status: 1, // 该题的状态
|
||||
status: '1', // 该题的状态
|
||||
list:[
|
||||
{
|
||||
text:""
|
||||
|
@ -952,6 +951,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
|
|||
workAnswerArr.forEach(it => selList.push(it));
|
||||
}
|
||||
else if( item.worktype == '填空题' || item.worktype == '判断题'){
|
||||
item.title = item.title.replace(/<!--BA--><div class="quizPutTag" contenteditable="true">(?: )?<\/div><!--EA-->/g, '_____');
|
||||
// 处理选项 ()
|
||||
workAnswerArr.forEach((it,id)=>{
|
||||
const s = {
|
||||
|
@ -1000,6 +1000,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
|
|||
const pointArr = item.evalnodeid.split(',');
|
||||
if (curKnowledgePointList.value.length > 0 && pointArr.length > 0) {
|
||||
pointArr.forEach(element => {
|
||||
element = element.trim();
|
||||
let point = [];
|
||||
if (getCurKnowledgePointToForm(point, element, curKnowledgePointList.value)) {
|
||||
point = point.reverse();
|
||||
|
@ -1337,8 +1338,10 @@ const submitForm=(formName) =>{
|
|||
const workType = questForm.worktype.replace('(主观题)', '');
|
||||
|
||||
// 需要对题目的单引号(设置字体)进行转义(因查询语句中模糊查询title_like单引号会报错)
|
||||
const title = questForm.title.replace(/'/g, "\\'");
|
||||
console.log(questForm,'???????????????????????')
|
||||
const title = questForm.title
|
||||
.replace(/'/g, "\\'")
|
||||
.replace(/_{3,}/g, "<!--BA--><div class=\"quizPutTag\" contenteditable=\"true\"></div><!--EA-->");
|
||||
console.log(questForm,'???????????????????????');
|
||||
let param = {
|
||||
id: questForm.id, // id
|
||||
thirdid: 0, // 第三方题库id SID
|
||||
|
|
Loading…
Reference in New Issue