Merge pull request 'BUG修复' (#231) from zhuhao_dev into main

Reviewed-on: #231
This commit is contained in:
朱浩 2024-09-20 09:22:02 +08:00
commit a75f151b19
1 changed files with 14 additions and 16 deletions

View File

@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="知识点" label-width="70"> <el-form-item label="知识点" label-width="70">
<el-cascader <el-cascader
v-model="entpCourseWorkQueryParams.point" v-model="entpCourseWorkQueryParams.point"
clearable clearable
style="width: 100%" style="width: 100%"
@ -59,15 +59,15 @@
<el-col :span="15"> <el-col :span="15">
<el-form-item label="关键词" label-width="70"> <el-form-item label="关键词" label-width="70">
<el-input <el-input
v-model="entpCourseWorkQueryParams.keyWord" v-model="entpCourseWorkQueryParams.keyWord"
style="width: 70%" type="text" style="width: 70%" type="text"
placeholder="请输入关键词" placeholder="请输入关键词"
/> />
<el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> </el-button> <el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> </el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="workResource.entpCourseWorkList" style="width: 100%;"> <el-table :data="workResource.entpCourseWorkList" style="width: 100%;">
<el-table-column type="index" width="60" /> <el-table-column type="index" width="60" />
<el-table-column align="left" > <el-table-column align="left" >
@ -96,10 +96,10 @@
<div style="height: 55px;"> <div style="height: 55px;">
<!-- 分页 --> <!-- 分页 -->
<pagination <pagination
v-show="entpCourseWorkTotal > 0" v-show="entpCourseWorkTotal > 0"
v-model:page="paginationParams.pageNum" v-model:page="paginationParams.pageNum"
v-model:limit="paginationParams.pageSize" v-model:limit="paginationParams.pageSize"
:total="entpCourseWorkTotal" :total="entpCourseWorkTotal"
:style="{ position: 'relative', 'margin-top': '5px' }" :style="{ position: 'relative', 'margin-top': '5px' }"
@pagination="getPaginationList" /> @pagination="getPaginationList" />
</div> </div>
@ -266,7 +266,7 @@ const entpCourseWorkTypeList = ref([
{value: 5, label: "主观题"}, {value: 5, label: "主观题"},
{value: 6, label: "复合题"}, {value: 6, label: "复合题"},
]); // - ]); // -
const entpCourseWorkGroupList = ref([{ const entpCourseWorkGroupList = ref([{
Key: -1, Key: -1,
Value: '不限', Value: '不限',
@ -323,7 +323,7 @@ const workResource = reactive({
const classWorkForm = reactive({ const classWorkForm = reactive({
worktype: '习题训练', // worktype: '习题训练', //
// uniquekey: userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(this.taskList.length+1), // uniquekey: userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(this.taskList.length+1),
}) })
const entpCourseWorkList = ref([]); // const entpCourseWorkList = ref([]); //
const entpCourseWorkTotal = ref(0); // const entpCourseWorkTotal = ref(0); //
@ -344,7 +344,7 @@ const queryForm = reactive({
sectionName: props.bookobj.coursetitle, sectionName: props.bookobj.coursetitle,
edusubject: userStore.edusubject, edusubject: userStore.edusubject,
edustage: userStore.edustage, edustage: userStore.edustage,
// //
// //
worktype: entpCourseWorkQueryParams.worktype.label, worktype: entpCourseWorkQueryParams.worktype.label,
workTypeId: entpCourseWorkQueryParams.worktype.value, workTypeId: entpCourseWorkQueryParams.worktype.value,
@ -381,8 +381,8 @@ const queryForm = reactive({
// // [+][+] // // [+][+]
// queryForm.edusubject = ''; // queryForm.edusubject = '';
// } // }
console.log(queryForm) console.log(queryForm)
listEntpcourseworkNew(queryForm).then(entpcourseworkres => { listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
// if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '') { // if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '') {
@ -411,8 +411,6 @@ const queryForm = reactive({
entpCourseWorkTotal.value = entpcourseworkres.data.length; entpCourseWorkTotal.value = entpcourseworkres.data.length;
} }
if()
// //
processList(workResource.entpCourseWorkList); processList(workResource.entpCourseWorkList);
}) })
@ -447,8 +445,8 @@ onMounted(() => {
border-radius:5px; border-radius:5px;
} }
} }
} }
</style> </style>