From 64e91dffbe4c2f8705d51492bd8038bd6002d28f Mon Sep 17 00:00:00 2001 From: zouyf <80906036@qq.com> Date: Sun, 20 Oct 2024 15:03:30 +0800 Subject: [PATCH 001/115] 1 --- .../classTask/container/classTask/item-dialog-score.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index f8ca287..8db0a6e 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -834,8 +834,10 @@ const formatFeedContent = (stuItem, quItem) => { const list = quizStrToList(quItem.workdesc); format = list.map((item,index) =>{ if (quItem.worktype == '单选题') { - const workdesc = item.replace(/<[^>]*>/g,''); - const feedcontent = stuItem.feedcontent.replace(/<[^>]*>/g,''); + // const workdesc = item.replace(/<[^>]*>/g,''); + // const feedcontent = stuItem.feedcontent.replace(/<[^>]*>/g,''); + const workdesc = item; + const feedcontent = stuItem.feedcontent; if(workdesc == feedcontent){ return (String.fromCharCode(65+Number(index))) } From 3042e874e4694a5c583935cadd09b67e89691116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666> Date: Sun, 20 Oct 2024 15:23:48 +0800 Subject: [PATCH 002/115] =?UTF-8?q?fix=EF=BC=9A=E5=88=A4=E6=96=AD=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AD=A6=E7=94=9F=E5=9B=9E=E7=AD=94=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/classTask/container/classOverview.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/src/views/classTask/container/classOverview.vue b/src/renderer/src/views/classTask/container/classOverview.vue index fbe48ce..4a89f6e 100644 --- a/src/renderer/src/views/classTask/container/classOverview.vue +++ b/src/renderer/src/views/classTask/container/classOverview.vue @@ -218,6 +218,7 @@ const initData = () => { return { def: o, id: o.id, type: o.worktype, active: [], points, accSum, rightSum, children,hasAnswers } }) console.log('获取数据: ', data) + if (data.length === 0) return stuHasAnswers.value = [...data[0].hasAnswers] provide('hasAnswer', stuHasAnswers.value) } From b7425da4dad95b1a96685d9455bb6568e16618b3 Mon Sep 17 00:00:00 2001 From: lyc Date: Sun, 20 Oct 2024 17:08:57 +0800 Subject: [PATCH 003/115] edit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 75da1f6..9e2f9f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.1.12", + "version": "2.1.14", "description": "", "main": "./out/main/index.js", "author": "example.com", From ea861dd2ea1a0c65f5d10db58b5552b0dd8359e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666> Date: Sun, 20 Oct 2024 17:45:42 +0800 Subject: [PATCH 004/115] =?UTF-8?q?fix=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=AD=A6?= =?UTF-8?q?=E7=94=9Fid=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/classTask/container/classOverview.vue | 4 ++-- .../container/classOverview/distribution.vue | 15 +++++++++++---- .../classOverview/distribution/echarts.vue | 16 ++++++++-------- .../classOverview/distribution/stuList.vue | 17 +++++++++-------- .../src/views/classTask/teachClassTask.vue | 4 ++++ 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/renderer/src/views/classTask/container/classOverview.vue b/src/renderer/src/views/classTask/container/classOverview.vue index 4a89f6e..b6c6d7e 100644 --- a/src/renderer/src/views/classTask/container/classOverview.vue +++ b/src/renderer/src/views/classTask/container/classOverview.vue @@ -10,7 +10,7 @@ 等级分布 - + @@ -219,8 +219,8 @@ const initData = () => { }) console.log('获取数据: ', data) if (data.length === 0) return + if (!data[0].hasAnswers[0]) return stuHasAnswers.value = [...data[0].hasAnswers] - provide('hasAnswer', stuHasAnswers.value) } // 百分比现在 0-100 const percent = v => v > 1 ? 1 : v < 0 ? 0 : Math.round(v * 100) diff --git a/src/renderer/src/views/classTask/container/classOverview/distribution.vue b/src/renderer/src/views/classTask/container/classOverview/distribution.vue index 5ff15c1..bf55cd5 100644 --- a/src/renderer/src/views/classTask/container/classOverview/distribution.vue +++ b/src/renderer/src/views/classTask/container/classOverview/distribution.vue @@ -3,19 +3,26 @@ - + - + \ No newline at end of file diff --git a/src/renderer/src/views/classTask/teachClassTask.vue b/src/renderer/src/views/classTask/teachClassTask.vue index 5f9e3e1..da28321 100644 --- a/src/renderer/src/views/classTask/teachClassTask.vue +++ b/src/renderer/src/views/classTask/teachClassTask.vue @@ -697,7 +697,7 @@ onUnmounted(() => { overflow: hidden; .classwork-score{ - // overflow-y: auto; + /* overflow-y: auto; */ height: 100%; } } diff --git a/src/renderer/src/views/examReport/container/examReview.vue b/src/renderer/src/views/examReport/container/examReview.vue index 181acbe..6503399 100644 --- a/src/renderer/src/views/examReport/container/examReview.vue +++ b/src/renderer/src/views/examReport/container/examReview.vue @@ -17,10 +17,12 @@ - - + + + + \ No newline at end of file From 7e71af0cb73fcbf358c3596bdc6645eeaeb9f837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666> Date: Fri, 25 Oct 2024 10:52:42 +0800 Subject: [PATCH 025/115] =?UTF-8?q?add=EF=BC=9A=E8=A1=A8=E6=A0=BC=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=89=B9=E9=98=85;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/classTask/item-dialog-score.vue | 8 ++-- .../views/classTask/container/item-dialog.vue | 37 ++++++++++++++++++- .../src/views/classTask/teachClassTask.vue | 35 ++++++++++++++++++ 3 files changed, 75 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index 2d21c0e..a3d3909 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -619,13 +619,13 @@ const checkWorkType = (params) => { // 获取学生答题列表 const score = extractedNumber(params.studentObj.scoingRate) - if(0<=score<=59){ + if(0<=score && score<=59){ classWorkFormScore.rating = 5 - }else if(60<=score<=69){ + }else if(60<=score && score<=69){ classWorkFormScore.rating = 4 - }else if(70<=score<=79){ + }else if(70<=score && score<=79){ classWorkFormScore.rating = 3 - }else if(80<=score<=99){ + }else if(80<=score && score<=99){ classWorkFormScore.rating = 2 }else{ classWorkFormScore.rating = 1 diff --git a/src/renderer/src/views/classTask/container/item-dialog.vue b/src/renderer/src/views/classTask/container/item-dialog.vue index 7f7423d..a37a4c5 100644 --- a/src/renderer/src/views/classTask/container/item-dialog.vue +++ b/src/renderer/src/views/classTask/container/item-dialog.vue @@ -149,7 +149,7 @@
- +
- - + @@ -82,10 +74,9 @@ import { ref } from 'vue' // import { ElMessage, ElMessageBox } from 'element-plus' import { Clock,View,Folder,Search } from '@element-plus/icons-vue' import FileImage from '@/components/file-image/index.vue' -import { getFileSuffix } from '@/utils/ruoyi' +import FilePreview from '@/components/thirdFile-preview/index.vue' import useUserStore from '@/store/modules/user' import useResoureStore from '../store' -import {getImgPath} from "@/api/file/third"; const userstore = useUserStore() const sourceStore = useResoureStore() @@ -93,8 +84,7 @@ const sourceStore = useResoureStore() // const userInfo = userstore.user //判断是否预览图片 const isViewImg = ref(false) -//显示图片的路径 -const srcList = ref([]) +const thirdPreview = ref() // 分页change const handleSizeChange = (limit) => { @@ -120,20 +110,9 @@ function timestampToDate(timestamp) { return `${year}-${month}-${day}`; } //获取图片的路径 -const clickImg = (id) => { - srcList.value = [] - getImgPath({itemId:id}).then(res => { - if(res.code === 200){ - isViewImg.value = true - res.data.forEach(item => { - item.subsets.forEach(previewItem => { - previewItem.previewFiles.forEach(fileItem => { - srcList.value.push(fileItem.fileUrl) - }) - }) - }) - } - }) +const handleRow = (item) => { + isViewImg.value = true + thirdPreview.value.init(item.itemId) } From ed3559f34fadd2f7f3a8071b383cacffe3411ebc Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Fri, 25 Oct 2024 14:34:53 +0800 Subject: [PATCH 027/115] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b92a4d..cdd0190 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.1.18", + "version": "2.1.19", "description": "", "main": "./out/main/index.js", "author": "上海交大重庆人工智能研究院", From 9674c68d11d80eb0d8abbcec7a80481928b28f56 Mon Sep 17 00:00:00 2001 From: zdg Date: Fri, 25 Oct 2024 15:05:25 +0800 Subject: [PATCH 028/115] =?UTF-8?q?=E4=BF=AE=E5=A4=8D-=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/tool/components/side.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/views/tool/components/side.vue b/src/renderer/src/views/tool/components/side.vue index 29083db..957f430 100644 --- a/src/renderer/src/views/tool/components/side.vue +++ b/src/renderer/src/views/tool/components/side.vue @@ -73,9 +73,8 @@ const list = computed(() => props.data.map((o,i) => { })) onMounted(() => { posBtnAll = btnRef.value.getBoundingClientRect() - hPost.value = posBtnAll.height - - curNode = sessionStore.get('subject.curNode') + hPost.value = Math.round(posBtnAll.height) + curNode = sessionStore?.get?.('subject.curNode') }) // === 方法 === // 获取颜色索引 @@ -97,7 +96,7 @@ const clickHandel = (o, e) => { isVisible.value = !isColse // 相同的按钮且打开状态，点击关闭 activeObj.value = o const nodeH = parseInt(node.height / 2) // 高度的一半 - topPos.value = parseInt(node.top) - posBtnAll.top + nodeH + topPos.value = Math.round(parseInt(node.top) - posBtnAll.top + nodeH) } emit('change', o) } @@ -149,8 +148,8 @@ const closeActive = () =>{ --top: 30px; --height: 40vh; position: fixed; - inset: 50% 75px auto auto; - transform: translateY(-50%); + inset: 0 75px auto auto; + // transform: translateY(-50%); background-color: #121212; padding: 10px; border-radius: 4px; From 8b55ebffa55ce0be14fe649c350e1d66d63f50b4 Mon Sep 17 00:00:00 2001 From: zdg Date: Fri, 25 Oct 2024 15:28:54 +0800 Subject: [PATCH 029/115] =?UTF-8?q?ppt=E7=82=B9=E8=B5=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/tool/components/upvote.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/views/tool/components/upvote.vue b/src/renderer/src/views/tool/components/upvote.vue index 91c1fcc..317e270 100644 --- a/src/renderer/src/views/tool/components/upvote.vue +++ b/src/renderer/src/views/tool/components/upvote.vue @@ -1,6 +1,6 @@ @@ -57,19 +56,16 @@ import { ref, onMounted, onUnmounted, computed, watch } from 'vue' import { listByDeadDate, listClassworkdata } from '@/api/classTask' import TaskItem from '@/views/classTask/container/classTask/task-item.vue' -// import ItemDialog from '@/views/classTask/container/item-dialog.vue' import { useToolState } from '@/store/modules/tool' -import { getCurrentTime, getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date' +import { getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date' import useUserStore from '@/store/modules/user' import {createWindow} from '@/utils/tool' -import {sessionStore} from '@/utils/store' import {debounce } from '@/utils/comm' const toolState = useToolState(); - const userStore = useUserStore().user -// const itemDialogRef = ref(null) + const tabOptions = ref(['待批改', '已批改']) const tabActive = ref('待批改') const dataList = ref([]) @@ -104,12 +100,6 @@ const deleteReserv = (item) => { // }) } - -// 当日之后的日期禁用 -const disabledDate = (time) => { - return time.getTime() > Date.now() -} - const changeStartEndDate = (val) => { console.log('起止日期改变', val) getData() // 加载数据 diff --git a/src/renderer/src/views/classTask/container/item-dialog.vue b/src/renderer/src/views/classTask/container/item-dialog.vue deleted file mode 100644 index 717cb0d..0000000 --- a/src/renderer/src/views/classTask/container/item-dialog.vue +++ /dev/null @@ -1,821 +0,0 @@ - - - - - - - diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 3252c0f..833a403 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -238,7 +238,7 @@ import { useRouter } from 'vue-router' import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork' import { addClassworkReturnId } from '@/api/teaching/classwork' -import { updateClasswork, listEvaluationclue,readFile, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask' +import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask' import { listEvaluation } from '@/api/subject' import { listEntpcoursefile } from '@/api/education/entpcoursefile' import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint"; @@ -250,6 +250,7 @@ import FileUpload from "@/components/FileUpload/index.vue"; import whiteboard from '@/components/whiteboard/whiteboard.vue' import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue' import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue' +import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo" import { useToolState } from '@/store/modules/tool' import useUserStore from '@/store/modules/user' @@ -877,7 +878,19 @@ const showExamAnalyseDrawer = (row) => { -onMounted(() => { +onMounted(async() => { + // 获取当前学科下的试题题型 + const name = userStore.edustage + userStore.edusubject; + const jyCT = await JYApiListCT(proxy, name); + if (jyCT.length == 0) { + ElMessage.error('获取题型失败!'); + return; + } + entpCourseWorkTypeList.value = jyCT; + // 获取当前学科下的试题年份 + entpCourseWorkYearList.value = JYApiListOriginYear(); + entpCourseWorkGroupList.value = await JYApiListSO(proxy, name); + }) watch(() => props.propsformobj.uniquekey, (newVal) => { From dd64e4e0855a07612ab5e0675a21b21dc39e1513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Fri, 8 Nov 2024 15:39:05 +0800 Subject: [PATCH 063/115] =?UTF-8?q?=E4=B9=A0=E9=A2=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E5=8A=A0=E4=B8=8A=E5=88=86=E9=A1=B5=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/classTask/container/newTask/taskTypeView.vue | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 833a403..458cb7d 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -394,10 +394,12 @@ const handleQueryParamFromEntpCourseWork = (queryType) => { * 2 - 按关键词查询 */ const handleQueryFromEntpCourseWork= (queryType) => { - //queryForm.pageNum = this.paginationParams.pageNum; - //queryForm.pageSize = this.paginationParams.pageSize; + const queryForm = { + // 分页参数 + currentPage: paginationParams.pageNum, + pageSize: paginationParams.pageSize, // 课程相关参数 eid: props.bookobj.levelSecondId, sectionName: props.bookobj.coursetitle, @@ -418,10 +420,6 @@ const handleQueryFromEntpCourseWork= (queryType) => { } - // 分页参数 - // pageNum: paginationParams.pageNum, - // pageSize: paginationParams.pageSize, - // 初中政治特殊处理( warn: 需确认是否修改 ) // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') { // // [初中+政治]需改为[初中+道德与法治] From 3b8e36454af119f05cbf8378b477d735098a9b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Fri, 8 Nov 2024 17:22:42 +0800 Subject: [PATCH 064/115] 1 --- .../container/newTask/taskTypeView.vue | 70 ++++++++++++++++--- 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 458cb7d..e49c33c 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -90,7 +90,7 @@
- + +
    +
  • + +
    {{ index +1 }}
    +
    + +
    +
    +
    + +
    {{ item.entpname }} {{ item.editusername }}
    +
    {{ item.worktag }}
    +     +
    +
    +
    + 添加 +
    + +
    • +
-