zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity

Merge pull request 'baigl' (#77) from baigl into main 

Reviewed-on: #77
This commit is contained in:
baigl 2024-12-02 15:36:13 +08:00
parent 1a267e5696 7c304650ad
commit e64311e8a4
4 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/renderer/src/api/education/entpCourseWork.js
View File

@ -9,6 +9,16 @@ export function listEntpcoursework(query) {
})
}
// 查询entpcoursework列表
export function listEntpcourseworkLocal(query) {
return request({
url: '/education/entpcoursework/local/list',
method: 'get',
params: query
})
}
// 查询entpcoursework详细
export function getEntpcoursework(id) {
return request({

5
src/renderer/src/store/modules/classTask.js
View File

@ -16,14 +16,11 @@ const useClassTaskStore = defineStore('classTask',{
{value: 6, label: "复合题"},
], // 习题查询条件 - 题型
entpCourseWorkGroupList: [{
Key: -1,
Key: 0,
Value: '不限',
}, {
Key: 1,
Value: '真题',
}, {
Key: 0,
Value: '非真题',
}
], // 习题查询条件 - 题源
entpCourseWorkYearList: [

29
src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
View File

@ -118,7 +118,7 @@ import { Search } from '@element-plus/icons-vue'
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { listEntpcoursework } from '@/api/education/entpCourseWork'
import { listEntpcoursework, listEntpcourseworkLocal } from '@/api/education/entpCourseWork'
import { listEvaluationclue } from '@/api/classTask'
import { delEntpcoursework, updateEntpcoursework } from "@/api/education/entpCourseWork";
@ -249,27 +249,28 @@ const t = function(name, time) {
return new Promise(resolve => {
const queryForm = {
// 题类
worktype: entpCourseWorkQueryParams.worktype.label == '不限' ? '' : entpCourseWorkQueryParams.worktype.label,
worktype: entpCourseWorkQueryParams.worktype.label,
// 题源 TODO 估计后端没做相应的查询处理 web端也没有返回
// workgroup: entpCourseWorkQueryParams.workgroup,
workgroup: entpCourseWorkQueryParams.workgroup,
// 年份 TODO 估计后端没做相应的查询处理 web端也没有返回
// yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
// 关键字
title: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
// 课程相关参数
edustage: userStore.edustage, // this.userStore.edustage,
edusubject: userStore.edusubject, // this.userStore.edusubject,
eid: props.bookobj.levelSecondId, // this.activeParams.lession.id,
status: "1",
editUserId: userStore.userId,
//orderby: 'concat(worktype,timestamp) DESC',
// 分页参数
pageNum: paginationParams.pageNum,
pageSize: paginationParams.pageSize,
// 课程相关参数
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',
}
const entpcourseworkres = listEntpcoursework(queryForm);
//const entpcourseworkres = listEntpcoursework(queryForm);
const entpcourseworkres = listEntpcourseworkLocal(queryForm);
resolve(entpcourseworkres);
})

5
src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
View File

@ -152,7 +152,7 @@
</el-form-item>
</div>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"><el-icon><Search /></el-icon></el-button>
</div>
</div>
@ -252,8 +252,7 @@
<el-tag v-else type="danger" style=" margin-left: 10px ">温馨提示：这里 - 号删除的是最后一道题目哟！</el-tag>
</el-form-item>
<div class="item-cropper-btn-multi">
<!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"><el-icon><Search /></el-icon></el-button>
</div>