baigl #69

Merged
baigl merged 14 commits from baigl into main 2024-11-27 10:44:13 +08:00
5 changed files with 31 additions and 11 deletions
Showing only changes of commit 124b584e38 - Show all commits

View File

@ -1,6 +1,6 @@
{
"name": "aix-win-ws",
"version": "2.5.3",
"version": "2.5.4",
"description": "",
"main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院",

View File

@ -137,7 +137,7 @@ function createMainWindow() {
// mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
// mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
// mainWindow.maximize();
mainWindow.maximize();
// 第三步: 开启remote服务
remote.enable(mainWindow.webContents)
}

View File

@ -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();
}

View File

@ -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">(?:&nbsp;)?<\/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

View File

@ -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