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

Merge branch 'main' into zhuhao_dev

This commit is contained in:
朱浩 2024-11-19 15:25:39 +08:00
parent 966a64faa3 bd485409e3
commit eba83889b0
4 changed files with 92 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
View File

@ -55,6 +55,7 @@
<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
disabled
v-model="entpCourseWorkQueryParams.point" v-model="entpCourseWorkQueryParams.point"
clearable clearable
style="width: 100%" style="width: 100%"
@ -90,7 +91,12 @@
</el-row> </el-row>
<!-- 习题表格 --> <!-- 习题表格 -->
<div class="infinite-list-wrapper" > <div class="infinite-list-wrapper" >
<!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;"> <el-table
:data="workResource.entpCourseWorkList"
style="width: 100%; height: 100%;"
v-loading="pageParams.loading"
ref="tableRef"
>
<el-table-column type="index" width="60" /> <el-table-column type="index" width="60" />
<el-table-column align="left" > <el-table-column align="left" >
<template #header> <template #header>
@ -114,22 +120,18 @@
<el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button> <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table>
<ul
<!-- <ul
v-infinite-scroll="pageLoad" v-infinite-scroll="pageLoad"
class="infinite-list" class="infinite-list"
infinite-scroll-immediate="false" infinite-scroll-immediate="false"
infinite-scroll-distance='1' infinite-scroll-distance='100'
infinite-scroll-delay="1000" infinite-scroll-delay="1000"
:infinite-scroll-disabled="pageDisabled" :infinite-scroll-disabled="pageDisabled"
> >
<li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item"> <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
<div align="left" style="width: 100%;" > <div align="left" style="width: 100%;" >
<!-- <template #header>
<div style="display: flex">
<div style="align-items: center;">题目内容</div>
</div>
</template> -->
<div @click="showExamAnalyseDrawer(item)"> <div @click="showExamAnalyseDrawer(item)">
<div> <div>
<span style="width: 20px;">{{ index +1 }}. </span> <span style="width: 20px;">{{ index +1 }}. </span>
@ -155,18 +157,18 @@
description="未找到相关试题" description="未找到相关试题"
style="width: 100%; height: 200px; margin-top: 20px;" style="width: 100%; height: 200px; margin-top: 20px;"
></el-empty> ></el-empty>
</div> </div> -->
</div> </div>
<!-- 分页 这里不用--> <!-- 分页 这里不用-->
<!-- <div style="height: 55px;"> <div style="height: 55px;">
<pagination <el-pagination
v-show="entpCourseWorkTotal > 0" v-show="pageParams.total > 0"
v-model:page="paginationParams.pageNum" v-model:page="paginationParams.pageNum"
v-model:limit="paginationParams.pageSize" v-model:limit="paginationParams.pageSize"
:total="entpCourseWorkTotal" :total="pageParams.total"
:style="{ position: 'relative', 'margin-top': '5px' }" :style="{ position: 'relative', 'margin-top': '5px' }"
@pagination="getPaginationList" /> @change="getPaginationList" />
</div> --> </div>
</div> </div>
<!-- 非习题训练：常规作业、 --> <!-- 非习题训练：常规作业、 -->
<div v-if="classWorkForm.worktype!='习题训练'"> <div v-if="classWorkForm.worktype!='习题训练'">
@ -276,6 +278,7 @@ import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { Search } from '@element-plus/icons-vue'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork' import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
import { addClassworkReturnId } from '@/api/teaching/classwork' import { addClassworkReturnId } from '@/api/teaching/classwork'
@ -284,6 +287,7 @@ import { listEvaluation } from '@/api/subject'
import { listEntpcoursefile } from '@/api/education/entpcoursefile' import { listEntpcoursefile } from '@/api/education/entpcoursefile'
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint"; import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
import { useGetHomework } from '@/hooks/useGetHomework' import { useGetHomework } from '@/hooks/useGetHomework'
import { processList } from '@/hooks/useProcessList' import { processList } from '@/hooks/useProcessList'
import { getCurrentTime } from '@/utils/date' import { getCurrentTime } from '@/utils/date'
@ -409,15 +413,15 @@ const fileLoading = ref(false); // 常规作业loading
// 下拉滚动参数 // 下拉滚动参数
const BASE_LIMIT_COUT = 50; // 总加载额外试题数 // const BASE_LIMIT_COUT = 50; // 总加载额外试题数
const pageNoMore = computed( () => { // const pageNoMore = computed( () => {
if (pageParams.value.total < 1) { // if (pageParams.value.total < 1) {
return false; // return false;
} // }
let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT; // let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
return workResource.entpCourseWorkList.length >= count; // return workResource.entpCourseWorkList.length >= count;
}); // });
const pageDisabled = computed(() => pageParams.value.loading || pageNoMore.value); // const pageDisabled = computed(() => pageParams.value.loading || pageNoMore.value);
const pageParams = ref({ const pageParams = ref({
loading: false, // 是否正在加载中 loading: false, // 是否正在加载中
originCount: 0, // 初始条目数量 originCount: 0, // 初始条目数量
@ -497,7 +501,7 @@ function Apis(key) {
// 年份 // 年份
yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'', yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
// 知识点 // 知识点
thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'', thirdId: entpCourseWorkQueryParams.point && entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
// 关键字 // 关键字
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'', keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
@ -508,10 +512,8 @@ function Apis(key) {
}) })
} }
const handleQueryFromEntpCourseWork= async (queryType) => { const handleQueryFromEntpCourseWork= async (queryType) => {
pageParams.value.loading = true; pageParams.value.loading = true;
// 初中政治特殊处理( warn: 需确认是否修改 ) // 初中政治特殊处理( warn: 需确认是否修改 )
// if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') { // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
// // [初中+政治]需改为[初中+道德与法治] // // [初中+政治]需改为[初中+道德与法治]
@ -519,45 +521,44 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
// } // }
client(t('任务1', 1500)).then(res => { client(t('任务1', 1500)).then(res => {
console.log("请求返回",res); //console.log("请求返回",res);
if(paginationParams.pageNum == 1){ // if(paginationParams.pageNum == 1){
workResource.entpCourseWorkList = []; // workResource.entpCourseWorkList = [];
workResource.entpCourseWorkTotal = 0; // workResource.entpCourseWorkTotal = 0;
// 初始化下拉滚动条参数 // // 初始化下拉滚动条参数
// pageParams.value.loading = false; // // pageParams.value.loading = false;
// pageParams.value.isFirst = true; // // pageParams.value.isFirst = true;
// pageParams.value.originCount = 0; // // pageParams.value.originCount = 0;
} // }
const data = res.data || []; const data = res.data || [];
if(data && data.length>0){ if(data && data.length>0){
// workResource.entpCourseWorkList = entpcourseworkres.data; // workResource.entpCourseWorkList = entpcourseworkres.data;
// workResource.entpCourseWorkTotal = entpcourseworkres.data.length; // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
data.forEach(item=> { data.forEach(item=> {
if (item.worktype == '选择题') { if (item.worktype == '选择题') {
item.worktype = '单选题' item.worktype = '单选题'
}
})
// 格式化试题信息
processList(data);
//workResource.entpCourseWorkList.push(...data);
workResource.entpCourseWorkList = data;
// 初次加载时更新当前试题数量
if (pageParams.value.isFirst) {
pageParams.value.isFirst = false;
pageParams.value.originCount = workResource.entpCourseWorkList.length;
pageParams.value.total = parseInt(res.msg);
paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize);
//console.log('first->', pageParams.value, paginationParams);
} }
})
// 格式化试题信息
processList(data);
workResource.entpCourseWorkList.push(...data);
// 初次加载时更新当前试题数量
if (pageParams.value.isFirst) {
pageParams.value.isFirst = false;
pageParams.value.originCount = workResource.entpCourseWorkList.length;
pageParams.value.total = parseInt(res.msg);
} }
} pageParams.value.loading = false;
pageParams.value.loading = false;
}); });
//const entpcourseworkres = await listEntpcourseworkNew(queryForm);
// const data = entpcourseworkres.data;
} }
// 教学资源，从课标分析、教材分析里来 // 教学资源，从课标分析、教材分析里来
@ -977,6 +978,15 @@ const showExamAnalyseDrawer = (row) => {
}) })
} }
const tableRef = ref();
const getPaginationList = ( page, limit ) => {
paginationParams.pageNum = page;
paginationParams.pageSize = limit;
//console.log(page, limit)
handleQueryFromEntpCourseWork(0);
// 重置滚动条至顶部
tableRef.value.setScrollTop(0);
}
const pageLoad = async() => { const pageLoad = async() => {
console.log("加载中...") console.log("加载中...")

20
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -57,8 +57,8 @@
style="margin-bottom: 1px" style="margin-bottom: 1px"
@change="tableRadioChange" @change="tableRadioChange"
> >
<el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'" /> <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'"/>
<el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'" /> <el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'"/>
</el-radio-group> </el-radio-group>
<!-- 学生列表：classWorkAnalysis.classworkdata; 已交未交：tableRadio.list --> <!-- 学生列表：classWorkAnalysis.classworkdata; 已交未交：tableRadio.list -->
<el-table <el-table
@ -179,7 +179,7 @@ const classWorkAnalysis = reactive({
entpcourseworklistarray: [], // 当前学习任务所包含的试题ID entpcourseworklistarray: [], // 当前学习任务所包含的试题ID
}) })
const tableRadio = reactive({ const tableRadio = reactive({
value: '1', // 已交 value: 1, // 已交
list: [], // 已交list list: [], // 已交list
num1: 0, // 已交人数 num1: 0, // 已交人数
num0: 0 // 未交人数 num0: 0 // 未交人数
@ -219,7 +219,7 @@ const openDialog = (data, isInit=true) => {
classWorkAnalysis.workclass = data.workclass classWorkAnalysis.workclass = data.workclass
// 重置学生列表 // 重置学生列表
tableRadio.list = [] tableRadio.list = []
tableRadio.value = '1' tableRadio.value = 1
tableRadio.num0 = 0 tableRadio.num0 = 0
tableRadio.num1 = 0 tableRadio.num1 = 0
@ -401,7 +401,7 @@ const getClassWorkStudentList = (rowId) => {
tableRadio.list = tableRadio.list =
classWorkAnalysis.classworkdata && classWorkAnalysis.classworkdata &&
classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0') classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
tableRadio.value = '1' tableRadio.value = 1
tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
tableRadio.num1 = tableRadio.list.length tableRadio.num1 = tableRadio.list.length
// 自动批阅判断 // 自动批阅判断
@ -417,7 +417,7 @@ const getClassWorkStudentList = (rowId) => {
*/ */
const teacherCriticism = ()=>{ const teacherCriticism = ()=>{
// 已交的list才自动批阅判断 // 已交的list才自动批阅判断
if(tableRadio.value == '1'&& classWorkAnalysis.worktype == '习题训练'){ if(tableRadio.value == 1 && classWorkAnalysis.worktype == '习题训练'){
// 只有习题训练才会自动批阅 // 只有习题训练才会自动批阅
tableRadio.list = tableRadio.list.map((item) => { tableRadio.list = tableRadio.list.map((item) => {
return { return {
@ -572,16 +572,16 @@ const tableRadioChange = (e) => {
isopen_dtwk_table.value = false; isopen_dtwk_table.value = false;
console.log(e,'??????') console.log(e,'??????')
console.log("学生列表：", classWorkAnalysis.classworkdata) console.log("学生列表：", classWorkAnalysis.classworkdata)
if(e=='1'){ if(e==1){
tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0') tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
tableRadio.value = '1'; tableRadio.value = 1;
tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length; tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
tableRadio.num1 = tableRadio.list.length; tableRadio.num1 = tableRadio.list.length;
// 自动批阅判断 // 自动批阅判断
teacherCriticism(); teacherCriticism();
}else if(e=='0'){ }else if(e==0){
tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0') tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
tableRadio.value = '0'; tableRadio.value = 0;
tableRadio.num0 = tableRadio.list.length; tableRadio.num0 = tableRadio.list.length;
tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length; tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
} }

10
src/renderer/src/views/login/components/Register.vue
View File

@ -28,7 +28,7 @@
<el-input v-model="ruleForm.phoneNumber" placeholder="请输入手机号" /> <el-input v-model="ruleForm.phoneNumber" placeholder="请输入手机号" />
</el-form-item> </el-form-item>
<el-form-item label="验证码" prop="Code" v-if="activeIndex==1"> <el-form-item label="验证码" prop="Code" v-if="activeIndex==1">
<el-input style="width:60%" v-model="ruleForm.Code" :disabled="true" placeholder="请输入验证码" /> <el-input style="width:60%" v-model="ruleForm.Code" :disabled="false" placeholder="请输入验证码" />
<el-button type="primary" style="margin-left:10px" @click="sendcaptchaImg">发送验证码</el-button> <el-button type="primary" style="margin-left:10px" @click="sendcaptchaImg">发送验证码</el-button>
</el-form-item> </el-form-item>
<el-form-item label="设置密码" prop="password" v-if="activeIndex==1"> <el-form-item label="设置密码" prop="password" v-if="activeIndex==1">
@ -409,11 +409,13 @@ const sbmitImg=()=>{
type: type.value type: type.value
} }
sendCode(params).then(res=>{ sendCode(params).then(res=>{
isImg.value=false
if(res.code==200){ if(res.code==200){
ruleForm.Code=res.data // ruleForm.Code=res.data
isImg.value=false ElMessage.success(res.msg||'验证码-已发送')
} }
}).catch(err=>{
isImg.value=false
}) })
}else{ }else{
ElMessage.error('请根据图片输入验证码') ElMessage.error('请根据图片输入验证码')

22
src/renderer/src/views/resource/container/resoure-search.vue
View File

@ -18,21 +18,17 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 第三方资源筛选-->
<!-- <el-row class="resoure-btns" v-if="isThird">
<el-col :span="24" class="query-row flex">
<div class="flex row-left">
<el-button v-for="item in coursewareTypeList" :key="item.id"
:type="sourceStore.thirdQuery.type == item.value ? 'primary' : ''" round
@click="sourceStore.thirdChangeType(item.value)">
{{item.label }}
</el-button>
</div>
</el-col>
</el-row> -->
<el-row class="resoure-btns"> <el-row class="resoure-btns">
<el-col :span="24" class="query-row flex"> <el-col :span="24" class="query-row flex">
<div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix" <div class="flex row-left">
<!-- 第三方资源筛选-->
<el-select v-if="isThird" v-model="sourceStore.thirdQuery.type" @change="sourceStore.thirdChangeType"
style="width: 110px">
<el-option v-for="item in coursewareTypeList" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
<el-select v-else v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
style="width: 110px"> style="width: 110px">
<el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label" <el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label"
:value="item.value" /> :value="item.value" />