zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

zouyf_dev #178

Merged
zouyf merged 4 commits from zouyf_dev into main 2024-09-09 16:47:28 +08:00
Conversation 0 Commits 4 Files Changed 13 +92 -45
4 changed files with 92 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1b7101ba5 - Show all commits

12
src/renderer/src/utils/examQuestion/jyeoo.js
View File

@ -47,11 +47,8 @@ export const JYApiListCT = async (_this, name = '高中历史') => {
return [];
}
let arrCT = [{
label: '不限',
value: {
"Value": "不限",
"Key": 0
}
label: "不限",
value: 0
}]
res.data.forEach(item=> {
if (item.Value === '选择题') {
@ -59,10 +56,7 @@ export const JYApiListCT = async (_this, name = '高中历史') => {
}
const tmp = {
label: item.Value,
value: {
"Value": item.Value,
"Key": item.Key
}
value: item.Key,
}
arrCT.push(tmp);
})

0
src/renderer/src/views/examReport/container/examMocks..vue → src/renderer/src/views/examReport/container/examMocks.vue
View File

4
src/renderer/src/views/examReport/container/examReview.vue
View File

@ -61,6 +61,7 @@ const showExamAnalyseDrawer = (row) => {
.table-main {
width: 100%;
height: 100%;
text-align: left;
.main-title {
overflow: hidden;
@ -91,9 +92,10 @@ const showExamAnalyseDrawer = (row) => {
padding: 1% 2%;
border: 2px dotted;
display: flex;
text-align: left;
.drawer-main-col{
padding: 6px 0px;
padding: 10px 0px;
}
}
</style>

121
src/renderer/src/views/examReport/index.vue
View File

@ -8,7 +8,7 @@
<el-popover placement="top-start" title="真题回顾" trigger="hover" content="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习">
<template #reference>
<el-button-group>
<el-button @click="handleTaskView('真题回顾', index)" :type="curTask.viewkey=='真题回顾'?'primary':'default'" round>真题回顾</el-button>
<el-button @click="changeTaskView('真题回顾', index)" :type="curTask.viewkey=='真题回顾'?'primary':'default'" round>真题回顾</el-button>
<el-button disabled :type="'default'" plain round ></el-button>
</el-button-group>
</template>
@ -18,7 +18,7 @@
<el-popover disabled placement="top-start" title="考点分析" trigger="hover" content="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习">
<template #reference>
<el-button-group>
<el-button disabled @click="handleTaskView('考点分析', index)" :type="curTask.viewkey=='考点分析'?'primary':'default'" round>考点分析</el-button>
<el-button disabled @click="changeTaskView('考点分析', index)" :type="curTask.viewkey=='考点分析'?'primary':'default'" round>考点分析</el-button>
<el-button disabled :type="'default'" plain round ></el-button>
</el-button-group>
</template>
@ -28,7 +28,7 @@
<el-popover disabled placement="top-start" title="模拟命题" trigger="hover" content="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习">
<template #reference>
<el-button-group>
<el-button disabled @click="handleTaskView('模拟命题', index)" :type="curTask.viewkey=='模拟命题'?'primary':'default'" round>模拟命题</el-button>
<el-button disabled @click="changeTaskView('模拟命题', index)" :type="curTask.viewkey=='模拟命题'?'primary':'default'" round>模拟命题</el-button>
<el-button disabled :type="'default'" plain round ></el-button>
</el-button-group>
</template>
@ -42,12 +42,12 @@
@change="queryExamQuestionByParams"
>
<template v-for="(item, index) in listWorkType" :key="index">
<el-option :label="item.label" :value="item.label" />
<el-option :label="item.label" :value="item" />
</template>
</el-select>
</div>
<div :style="{'width': (viewportWidth - 400) + 'px','height': (viewportHeight) + 'px','overflow-y': 'auto'}">
<div :style="{'width': (viewportWidth - 400) + 'px','height': (viewportHeight-38) + 'px','overflow-y': 'auto'}">
<examReview
:loading="loading"
:listExamQuestion="listExamQuestion"
@ -74,13 +74,13 @@ import { ArrowRight } from '@element-plus/icons-vue'
import useResoureStore from '@/views/resource/store'
import ChooseTextbook from '@/components/choose-textbook/index.vue'
import {listEntpcoursework} from '@/api/education/entpcoursework'
import {listEntpcoursework, listEntpcourseworkNew} from '@/api/education/entpCourseWork'
import {processExamQuestion} from '@/utils/examQuestion/tool'
import { JYApiListCT} from "@/utils/examQuestion/jyeoo"
import examReview from './container/examReview.vue'
import pointAnalysis from './container/pointAnalysis.vue'
import examMocks from './container/examMocks..vue'
import examMocks from './container/examMocks.vue'
const {proxy} = getCurrentInstance();
const sourceStore = useResoureStore();
@ -95,14 +95,15 @@ const curTask = reactive({
viewkey: '真题回顾',
});
const queryParams = reactive({
workType: '不限'
workType: {
label: '不限',
value: 0,
},
total: 0,
});
const listWorkType = ref([{
label: '不限',
value: {
Key: 0,
Value: '不限'
}
value: 0,
}]);
/**
@ -121,22 +122,52 @@ const getData = async (data) => {
// 2.获取试题集合
curNode.value = data.node;
const queryParams = {
pageNum: 1,
pageSize: 100,
// 查询本地
// const params = {
// pageNum: 1,
// pageSize: 100,
// workgroup: '1',
// edusubject: curNode.value.edusubject,
// evalid: curNode.value.id,
// orderby: 'concat(worktype,worktag) DESC',
// }
// const res = await listEntpcoursework(params);
// listExamQuestion.value = res.rows;
// 查询本地+菁优网(后端处理)
const params = {
eid: curNode.value.id,
workgroup: '1',
worktype: '不限',
workTypeId: '0',
edusubject: curNode.value.edusubject,
evalid: curNode.value.id,
orderby: 'concat(worktype,worktag) DESC',
edustage: curNode.value.edustage,
sectionName: curNode.value.itemtitle,
}
const res = await listEntpcoursework(queryParams);
listExamQuestion.value = res.rows;
//this.queryParams.total = res.total;
const res = await listEntpcourseworkNew(params);
if(res.data == null) {
listExamQuestion.value = [];
// queryParams.total = 0
loading.value = false;
return;
}
listExamQuestion.value = res.data;
// queryParams.total = res.total;
// 格式化试题
processExamQuestion(listExamQuestion.value);
loading.value = false;
}
/**
* @desc: 切换节点
* @return: {*}
* @param {*} item
* @param {*} key
*/
const changeTaskView = (item, key) => {
curTask.viewkey = item;
}
const getWorkType = async (data) => {
const selName = `${data.edustage}${data.edusubject}`
const curName = `${curNode.value.edustage}${curNode.value.edusubject}`
@ -154,22 +185,42 @@ const getWorkType = async (data) => {
const queryExamQuestionByParams = async () => {
loading.value = true;
const params = {
pageNum: 1,
pageSize: 100,
workgroup: '1',
edusubject: curNode.value.edusubject,
evalid: curNode.value.id,
worktype: queryParams.workType,
orderby: 'concat(worktype,worktag) DESC',
}
if (queryParams.workType == '不限') {
delete params.worktype;
}
// 查询本地
// const params = {
// pageNum: 1,
// pageSize: 100,
// workgroup: '1',
// edusubject: curNode.value.edusubject,
// evalid: curNode.value.id,
// worktype: queryParams.workType.Value,
// orderby: 'concat(worktype,worktag) DESC',
// }
// if (queryParams.workType == '不限') {
// delete params.worktype;
// }
const res = await listEntpcoursework(params);
listExamQuestion.value = res.rows;
//this.queryParams.total = res.total;
// const res = await listEntpcoursework(params);
// listExamQuestion.value = res.rows;
// 查询本地+菁优网(后端处理)
const params = {
eid: curNode.value.id,
workgroup: '1',
worktype: queryParams.workType.label,
workTypeId: queryParams.workType.value,
edusubject: curNode.value.edusubject,
edustage: curNode.value.edustage,
sectionName: curNode.value.itemtitle,
}
const res = await listEntpcourseworkNew(params);
if(res.data == null) {
listExamQuestion.value = [];
// queryParams.total = 0
loading.value = false;
return;
}
listExamQuestion.value = res.data;
// queryParams.total = res.total;
// 格式化试题
processExamQuestion(listExamQuestion.value);
loading.value = false;