Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
This commit is contained in:
白了个白
commit
124b584e38
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aix-win-ws",
|
||||
"version": "2.5.3",
|
||||
"version": "2.5.4",
|
||||
"description": "",
|
||||
"main": "./out/main/index.js",
|
||||
"author": "上海交大重庆人工智能研究院",
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ function createMainWindow() {
|
|||
|
||||
// mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
|
||||
// mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
|
||||
// mainWindow.maximize();
|
||||
mainWindow.maximize();
|
||||
// 第三步： 开启remote服务
|
||||
remote.enable(mainWindow.webContents)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,8 @@ 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",
|
||||
edituserid: userStore.userId,
|
||||
orderby: 'concat(worktype,timestamp) DESC',
|
||||
|
||||
}
|
||||
|
|
@ -424,7 +425,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:""
|
||||
|
|
@ -741,6 +740,10 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
|
|||
let titleSubjList = ''; // 主观题的题目 （这里是 背景资料+题目组合的，主观题要处理一下）
|
||||
const newSubjListparams = []; // 主观题的题目list
|
||||
|
||||
// 将菁优网的填空下划线标签转为下划线(上传时需再重新替换回来)
|
||||
item.title = item.title.replace(/<!--BA--><div class="quizPutTag" contenteditable="true">(?: )?<\/div><!--EA-->/g, '_____');
|
||||
|
||||
|
||||
if(item.worktype == '复合题') {
|
||||
// 同步更新[基础题]的初始结构
|
||||
newList = [{text:""}];
|
||||
|
|
@ -1000,6 +1003,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 +1341,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
|
||||
|
|
|
|||
|
|
@ -111,6 +111,7 @@ import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval
|
|||
import { listEvaluation } from '@/api/subject'
|
||||
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
|
||||
|
||||
import { getBindlist } from '@/api/education/knowledgePoint'
|
||||
import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
|
||||
import { processList } from '@/hooks/useProcessList'
|
||||
import { useGetHomework } from '@/hooks/useGetHomework'
|
||||
|
|
@ -155,6 +156,7 @@ const entpCourseWorkPointList = ref([
|
|||
{label: '不限', value: []},
|
||||
]); // 习题查询条件 - 知识点
|
||||
const knowledgePointProps = ref({value: 'thirdId', label: 'title'});
|
||||
//const knowledgePointProps = ref({value: 'thirdId', label: 'knowTitle'});
|
||||
const entpCourseWorkYearList =ref([
|
||||
{label: '不限', value: '-1'},
|
||||
{label: '2024', value: '2024'},
|
||||
|
|
@ -358,8 +360,18 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
|
|||
/**
|
||||
* 3、知识点
|
||||
*/
|
||||
const getEntpCourseWorkPointList = () => {
|
||||
const getEntpCourseWorkPointList = async () => {
|
||||
// 更新考点
|
||||
|
||||
// const res = await getBindlist({ eid: props.bookobj.levelSecondId });
|
||||
// if (!res.data || res.data.length < 1) {
|
||||
// ElMessage.warning('当前章节下无知识点');
|
||||
// entpCourseWorkPointList.value = [];
|
||||
// }
|
||||
// else {
|
||||
// entpCourseWorkPointList.value = res.data;
|
||||
// }
|
||||
|
||||
// 拿到当前章节下得所有知识点
|
||||
listEvaluation({ itemkey: "subject", pageSize: 10, edustage: userStore.edustage, edusubject: userStore.edusubject }).then((res) => {
|
||||
const evalId = res.rows
|
||||
|
|
|
|||
Loading…
Reference in New Issue