diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index 2ed2c70..ea364a2 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -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"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index 24b7b1a..a4efe1b 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,v,t,i,z,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,i=l.document,z=!1,o(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function o(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file +window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,v,t,i,z,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,i=l.document,z=!1,o(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function o(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.json b/src/renderer/src/assets/iconfont/iconfont.json index 127b376..fc6689f 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -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", diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index 1c84d13..04dd21f 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.ttf and b/src/renderer/src/assets/iconfont/iconfont.ttf differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index ebaaadf..0771012 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff and b/src/renderer/src/assets/iconfont/iconfont.woff differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff2 b/src/renderer/src/assets/iconfont/iconfont.woff2 index 6637ccb..dd21fa9 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff2 and b/src/renderer/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue index 1c0434e..b338d76 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue @@ -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) => { diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue index 33ce1e6..e915dfa 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue @@ -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(); } diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue index cbcb771..3e90189 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue @@ -145,8 +145,7 @@ - + + + - @@ -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(/
(?: )?<\/div>/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, "
"); + console.log(questForm,'???????????????????????'); let param = { id: questForm.id, // id thirdid: 0, // 第三方题库id SID