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

zdg #197

Merged
zhengdegang merged 4 commits from zdg into main 2024-09-11 20:06:22 +08:00
Conversation 0 Commits 4 Files Changed 3 +422 -285
11 changed files with 422 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3632beebfa - Show all commits

17
src/renderer/src/api/classTask/index.js
View File

@ -1,7 +1,22 @@
// 查询evaluation列表
import request from '@/utils/request'
// 查询反馈列表
// 查询作业列表
export function listByDeadDate(query) {
return request({
url: '/education/classwork/listByDeadDate',
method: 'get',
params: query
})
}
//多个班级学生作业数据
export function listClassworkdataByDeadDate(query) {
return request({
url: '/education/classworkdata/listByDeadDate',
method: 'get',
params: query
})
}
// 查询classworkdata列表 班级作业列表
export function listClassworkdata(query) {

10
src/renderer/src/components/ai-chart/index.vue
View File

@ -115,28 +115,28 @@ const outerAi = [
id: 1,
title: '生成图片',
secondTit: '文生图大模型',
img: '../../../src/assets/images/ai-01.png',
img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
path: '/ais/aisd3'
},
{
id: 2,
title: '教学大模型',
secondTit: '中小学基础教学大模型',
img: '../../../src/assets/images/ai-02.png',
img: new URL('../../../src/assets/images/ai-02.png', import.meta.url).href,
disabled: true,
},
{
id: 3,
title: '育人大模型',
secondTit: '全场域育人大模型',
img: '../../../src/assets/images/ai-03.png',
img: new URL('../../../src/assets/images/ai-03.png', import.meta.url).href,
path: '/ais/aimodel'
},
{
id: 4,
title: 'ChatTTS',
secondTit: '文字转语音大模型',
img: '../../../src/assets/images/ai-04.png',
img: new URL('../../../src/assets/images/ai-04.png', import.meta.url).href,
path: '/ais/aiChatTTS'
}
]
@ -233,7 +233,7 @@ onMounted(() => {
width: 300px;
height: calc(100% - 110px);
border-radius: 10px;
z-index: 10;
:deep(.el-card__header) {
padding: 10px;
}

2
src/renderer/src/components/window-tools/index.vue
View File

@ -51,6 +51,8 @@ const closeWindow = () => {
<style lang="scss" scoped>
.header-tool {
width: 100%;
justify-content: flex-end;
-webkit-app-region: no-drag;
span {

149
src/renderer/src/layout/components/Header.vue
View File

@ -12,18 +12,6 @@
<i class="iconfont" :class="menu.icon"></i>
<span class="text">{{ menu.name }}</span>
</li>
<!-- <li
v-for="(item, index) in routeHeader.nowRouter"
:key="index"
class="flex"
:style="{'color' : item.color}"
:class="currentRoute === item.url ? 'active-li' : ''"
@click="handleOutLink(item.url,item.type, item.name)"
>
<i :class="item.img"></i>
<span class="text">{{ item.name }}</span>
</li> -->
</ul>
</div>
</div>
@ -32,15 +20,9 @@
<WindowTools />
<div class="user flex">
<div class="avatar-container">
<el-dropdown
class="right-menu-item hover-effect"
trigger="click"
@command="handleCommand"
>
<div class="avatar-wrapper">
<div class="avatar-wrapper flex">
<el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
<img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" />
<div style="margin-top: 18px; font-size: 0.8em">{{ userStore.user.nickName }}</div>
</div>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
@ -52,6 +34,27 @@
</el-dropdown-menu>
</template>
</el-dropdown>
<div class="user-info flex">
<span class="user-name">{{ userStore.user.nickName }}</span>
<div class="flex">
<div class="user-depname">{{ userStore.user.deptName }}</div>
<el-dropdown @command="changeSubject">
<div class="user-subject">{{ userStore.user.edusubject }}
<el-icon class="el-icon--right"><arrow-down />
</el-icon>
</div>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item v-for="item in userSubjectList" :key="item.id" :command="item">
{{ item.edustage }}-{{ item.edusubject }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
</div>
</div>
</div>
</div>
</div>
@ -59,22 +62,23 @@
</template>
<script setup>
import { ref, watch } from 'vue'
import { ref, watch, onMounted } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessageBox } from 'element-plus'
import { ArrowDown } from '@element-plus/icons-vue'
import WindowTools from '@/components/window-tools/index.vue'
import useUserStore from '@/store/modules/user'
import routerStore from '@/store/modules/route'
import { updateUserInfo } from '@/api/system/user'
import outLink from '@/utils/linkConfig'
import logoIco from '@/assets/images/logo.png'
import { listEvaluation } from '@/api/classManage/index'
const routeHeader = routerStore()
const { ipcRenderer } = window.electron || {}
const userStore = useUserStore()
const router = useRouter()
const currentRoute = ref('')
const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
const userSubjectList = ref([])
const handleOutLink = (path, type, name) => {
if (!path) return
@ -86,8 +90,8 @@ const handleOutLink = (path, type, name) => {
let fullPath = configObj.fullPath + path
fullPath = fullPath.replaceAll('//', '/')
const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
let unitId = levelSecondId ? levelSecondId :levelFirstId
if(name == '教材分析' || name == '考试分析'){
let unitId = levelSecondId ? levelSecondId : levelFirstId
if (name == '教材分析' || name == '考试分析') {
fullPath += `?unitId=${unitId}`
}
// 通知主进程
@ -127,35 +131,12 @@ const headerMenus = [
}
]
const clickMenu = ({ id, disabled, path }) =>{
if(disabled) return
const clickMenu = ({ id, disabled, path }) => {
if (disabled) return
activeId.value = id
router.push(path)
}
/*const menus = ref([
{
icon: 'icon-zhuye2 icon-homepage',
name: '主页',
path: '/homepage'
},
{
icon: 'icon-jiaoxueziyuan icon-resource',
name: '资源',
path: '/resource'
},
{
icon: 'icon-beike icon-prepare',
name: '备课',
path: '/prepare'
},
{
icon: 'icon-jiangke1 icon-teach',
name: '授课',
path: '/teach'
}
])*/
// 监听当前路由
watch(
() => router.currentRoute.value,
@ -200,13 +181,43 @@ function logout() {
ipcRenderer && ipcRenderer.send('openLoginWindow')
})
})
.catch(() => {})
.catch(() => { })
}
const emits = defineEmits(['setLayout'])
function setLayout() {
emits('setLayout')
}
// 切换学科
const changeSubject = async (command) =>{
const { userId, userName, phonenumber, plainpwd } = userStore.user
const data = {
userId,
userName,
edustage: command.edustage,
edusubject: command.edusubject
}
console.log(data,'data')
await updateUserInfo(data)
await userStore.login({username: phonenumber, password: plainpwd})
await userStore.getInfo()
router.go()
}
// 获取学科
const getAllSubject = async () => {
const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
if(!userStore.user.subject) return
const subject = userStore.user.subject.split(',')
userSubjectList.value = rows.filter(item =>
subject.some(el => item.id == el)
)
}
onMounted(() => {
getAllSubject()
})
</script>
<style lang="scss" scoped>
@ -222,17 +233,20 @@ function setLayout() {
align-items: flex-start;
flex-direction: column;
width: 50%;
.title-box{
.title-box {
padding-top: 8px;
box-sizing: border-box;
align-items: center;
padding-left: 20px;
.title {
color: #4b73df;
font-size: 13px;
padding: 0 5px;
}
}
.change-tab {
-webkit-app-region: no-drag;
margin-left: 20px;
@ -273,13 +287,16 @@ function setLayout() {
color: #409eff;
}
}
.disabled{
.disabled {
cursor: not-allowed;
color: #bfbfbf;
&:hover{
&:hover {
color: #bfbfbf;
}
}
.active-li {
color: #409eff;
}
@ -302,11 +319,25 @@ function setLayout() {
flex-direction: column;
.user {
padding-right: 10px;
.user-info {
padding-right: 5px;
align-items: center;
align-items: flex-start;
flex-direction: column;
font-size: 12px;
height: 100%;
justify-content: space-around;
.user-depname {
margin-right: 5px;
}
.user-subject {
display: flex;
align-items: center;
font-size: 12px;
}
}
}
}
@ -316,12 +347,12 @@ function setLayout() {
.avatar-wrapper {
display: flex;
align-items: center;
.user-avatar {
width: 30px;
height: 30px;
width: 35px;
height: 35px;
border-radius: 10px;
margin-top: 8px;
margin-right: 10px;
}

28
src/renderer/src/store/modules/classTask.js Normal file
View File

@ -0,0 +1,28 @@
import { defineStore } from 'pinia'
import { } from '@/api/classTask/index.js'
import { listClassmain } from '@/api/classManage/index'
const useClassTaskStore = defineStore('classTask',{
state: () => ({
classListIds: [],
}),
actions: {
listClassmain(params) {
// 获取班级列表
return new Promise((resolve, reject) => {
listClassmain(params)
.then((res) => {
this.classListIds = res.rows&&res.rows.map((item) => item.id)
resolve(res)
})
.catch((error) => {
reject(error)
})
})
},
},
persist: true
})
export default useClassTaskStore

16
src/renderer/src/utils/date.js
View File

@ -134,3 +134,19 @@ export function getTimeDate() {
var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
}
/**
* 获取明天日期
* @returns
*/
export function getTomorrow() {
let date = new Date();
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate()+1 < 10 ? '0' + date.getDate()+1 : date.getDate()+1
// 获取明天的日期 .getDate() + 1
let tomorrow = `${year}-${month}-${day}`;
return tomorrow;
}

13
src/renderer/src/views/classManage/index.vue
View File

@ -198,9 +198,14 @@
}
});
listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => {
//清除已有的班级
let arr = [...response.rows]
classList.value.forEach(item => {
const currentIndex = arr.findIndex(items => items.id === item.id)
if(currentIndex) arr.splice(currentIndex, 1)
})
//这里获取组装所有班级
gradeTree.value = groupByCondition(response.rows, item => item.agekey);
console.log(gradeTree.value,'gradeTree.value')
gradeTree.value = groupByCondition(arr, item => item.agekey);
})
}
//将所有班级筛选成二级的数组
@ -293,13 +298,15 @@
// }
//新增班级
const btnSave = () => {
addClasses({classIds:classids.value.join(','),regId:userStore.userId}).then(res => {
addClasses({classIds:classids.value.join(','),userId:userStore.userId}).then(res => {
if (res.code === 200) {
dialogVisible.value = false
ElMessage({
message: res.msg,
type: 'success',
})
//清空所选中的值
classids.value = []
}else{
ElMessage({
message: res.msg,

343
src/renderer/src/views/classTask/classTask.vue
View File

@ -5,10 +5,31 @@
-->
<template>
<el-container class="class-reserv-wrap">
<div style="display: flex; justify-content: space-between;">
<div class="class-reserv-tabs">
<el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
</div>
<div v-if="tabActive === '已结束'">
<div class="demo-date-picker">
<div class="block">
<el-date-picker
v-model="EndDate"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择截止日期"
size="large"
:disabled-date="disabledDate"
@change="changeEndDate"
/>
</div>
</div>
</div>
</div>
<div class="class-reserv-body">
<!-- loading <el-skeleton :rows="5" animated />-->
<el-skeleton :rows="5" :loading="loading" animated />
<div v-if="classWorkList.length > 0">
<task-item
v-for="(item, index) in activeDataList"
v-show="tabActive === '进行中'"
@ -28,40 +49,44 @@
@delete-reserv="deleteReserv(item)"
></task-item>
</div>
<div v-else>
<el-empty
v-show="classWorkList.length == 0 && !loading"
:description="'暂无'+tabActive+'作业数据'"
style="width: 100%; height: 400px"
></el-empty>
</div>
</div>
<item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
</el-container>
</template>
<script setup>
import { ref, onMounted, onUnmounted, computed, watch, reactive } from 'vue'
import { getSelfReserv } from '@/api/classManage'
import { listClassmain } from '@/api/classManage/index'
import { listClassworkdata } from '@/api/classTask'
import { homeworklist } from '@/api/teaching/classwork'
import { listByDeadDate, listClassworkdataByDeadDate } from '@/api/classTask'
import TaskItem from '@/views/classTask/container/task-item.vue'
import ItemDialog from '@/views/classTask/container/item-dialog.vue'
import { useToolState } from '@/store/modules/tool'
import { sessionStore } from '@/utils/tool'
import { getCurrentTime, getTomorrow } from '@/utils/date'
import useUserStore from '@/store/modules/user'
import useClassTaskStore from "@/store/modules/classTask";
const classTaskStore = useClassTaskStore()
const userStore = useUserStore().user
const itemDialogRef = ref(null)
const tabOptions = ref(['进行中', '已结束'])
const tabActive = ref('进行中')
const dataList = ref([])
const EndDate = ref(getCurrentTime('YYYY-MM-DD'))
// 班级列表
const classList = ref([])
const classListIds = ref([])
// 所有班级作业列表
const classWorkList = ref([])
const total = ref(0)
const loading = ref(false)
const activeDataList = computed(() => {
// return classWorkList.value
// 当前时间超过[作业任务]截止时间的跳过
return classWorkList.value && classWorkList.value.filter((item) => getDateTime > item.deaddate)
return classWorkList.value
})
const deleteReserv = (item) => {
console.log('删除待开发', item)
@ -70,31 +95,51 @@ const deleteReserv = (item) => {
// })
}
const doneDataList = computed(() => {
// return classWorkList.value
return classWorkList.value && classWorkList.value.filter((item) => getDateTime < item.deaddate)
return classWorkList.value
})
// 当日之后的日期禁用
const disabledDate = (time) => {
return time.getTime() > Date.now()
}
// 截止日期改变
const changeEndDate = (val) => {
console.log('截止日期改变', val)
getData() // 加载数据
}
// 获取数据
const getData = () => {
// 获取班级列表
listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then((res) => {
var clslist = []
for (var i = 0; i < res.rows.length; i++) {
if (res.rows[i].classstudentlist != '') {
var array = JSON.parse('[' + res.rows[i].classstudentlist + ']')
res.rows[i].classstudents = array
classWorkList.value = []
loading.value = true
// 1、班级列表
getClassList()
// 2、班级作业
getClassWorkList()
// 3、班级学生作业 包含多个班级
getStudentClassWorkData()
}
/**
* 1、获取班级列表数据
* TODO 这里暂时取班级id的list，后续需要在修改
*/
const getClassList = () => {
if(classTaskStore.classListIds.length==0){
// 获取 班级列表ids 这里暂时取班级id的list，后续需要在修改
classTaskStore.listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' })
}
classListIds.value.push(res.rows[i].id)
clslist.push(res.rows[i])
}
classList.value = clslist
// 班级作业数据，包含多个班级
homeworklist({
classidarray: classListIds.value.join(','),
//entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
}
/**
* 2、获取班级作业
*/
const getClassWorkList = () => {
if(classTaskStore.classListIds.length>0){
// 班级作业数据，包含多个班级 homeworklist
listByDeadDate({
classidarray: classTaskStore.classListIds.join(','),
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
orderby: 'uniquekey DESC',
pageSize: 100
}).then((response) => {
@ -147,145 +192,32 @@ const getData = () => {
// 显示分配人数(workdatacount)>0 的
if (response.rows && response.rows.length > 0) {
classWorkList.value = response.rows && response.rows.filter((item) => item.workdatacount > 0)
// classWorkList.value = response.rows && response.rows.filter((item) => item.workdatacount > 0 && item.uniquekey == '语文-0808-1')
//TODO： 这里没分页，貌似这个 total 不重要，后续看
total.value = response.total
}else{
classWorkList.value = []
total.value = 0
}
loading.value = false
// 再查找多个班级里，每个学生的作业数据
getStudentClassWorkData()
})
})
//--------------
// getSelfReserv().then((res) => {
// const list = res.data || []
// list.sort((a, b) => {
// if (a.status == '上课中') return -1
// else return 0
// })
// dataList.value = list
// })
}
const toolStore = useToolState()
// 将标签中的双引号增加转义
const escapeHtmlQuotes = (str) => {
// 后端已replace双引号, 故前端不用在处理
const regex1 = /\\+/g; // 匹配多个反斜杠
let result = str.replace(regex1, '\\');
return result;
}
const pollingST = ref(null) //轮询定时器标识
onMounted(() => {
getData() // 加载数据
// 轮询查询
getStudentClassWorkDataPolling()
})
// 轮询查询 学生作业进度
const getStudentClassWorkDataPolling = () => {
// 先查询一次后，
getStudentVisible()
// 在轮询
pollingST.value = setInterval(() => {
getStudentVisible()
}, 1000 * 10)
}
const closeDialog = () => {
console.log('关闭弹窗,开启作业进度轮询')
getStudentClassWorkDataPolling()
}
const onClickItem = (item) => {
console.log('开启弹窗,关闭作业进度轮询')
clearInterval(pollingST.value)
itemDialogRef.value.openDialog(item)
}
onUnmounted(() => {
clearInterval(pollingST.value)
})
const getDateTime = () => {
//获取当前时间
const now = new Date()
const year = now.getFullYear()
const month = String(now.getMonth() + 1).padStart(2, '0')
const day = String(now.getDate()).padStart(2, '0')
const hh = String(now.getHours()).padStart(2, '0')
const mm = String(now.getMinutes()).padStart(2, '0')
return `${year}-${month}-${day} ${hh}:${mm}`
}
// [作业反馈] - 实际查询逻辑
const getStudentVisible = async () => {
if (classListIds.value.length <= 0) {
return
}
// 班级作业数据，多个班级
const response = await homeworklist({
classidarray: classListIds.value.join(','),
//entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
orderby: 'uniquekey DESC',
pageSize: 100
})
const curWorkList = response.rows
}
/**
* warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
* 故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
/**
* 3、获取多个班级学生作业数据
*/
for (let t = 0; t < classWorkList.value.length; t++) {
// 当前时间超过[作业任务]截止时间的跳过
// if( getDateTime > classWorkList.value[t].deaddate ){
// continue;
// }
// 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
// workdataresultcount 完成人数 workdatacount人数要大于0
if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
// 桌面端貌似不需要进度条了？
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
)
// 计算参与学习任务的平均用时
if (classWorkList.value[t].workdatafeedbackcount > 0) {
classWorkList.value[t].averagetime = (classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount).toFixed(0)
} else {
classWorkList.value[t].averagetime = 0
}
// 更新批阅数
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
} else {
classWorkList.value[t].finishpercent = 0
}
}
return 1
}
// 获取多个班级学生作业数据
const getStudentClassWorkData = () => {
// 再查找多个班级里，每个学生的作业数据
listClassworkdata({
classids: classListIds.value.join(','),
//entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
if(classTaskStore.classListIds.length>0){
listClassworkdataByDeadDate({
classids: classTaskStore.classListIds.join(','),
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
orderby: "deaddate DESC",
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
orderby: "uniquekey DESC",
pageSize: 1000
}).then((res) => {
for (var t = 0; t < classWorkList.value.length; t++) {
for (var i = 0; i < res.rows.length; i++) {
//if (res.rows[i].uniquekey == classWorkList.value[t].uniquekey) {
if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].resultcount > 0) {
console.log('==================')
// 有几个学生完成/正在完成学习任务
@ -378,17 +310,116 @@ const getStudentClassWorkData = () => {
// 暂缓
}
})
}
}
const toolStore = useToolState()
// 将标签中的双引号增加转义
const escapeHtmlQuotes = (str) => {
// 后端已replace双引号, 故前端不用在处理
const regex1 = /\\+/g; // 匹配多个反斜杠
let result = str.replace(regex1, '\\');
return result;
}
const pollingST = ref(null) //轮询定时器标识
onMounted(() => {
getData() // 加载数据
// 轮询查询
getStudentClassWorkDataPolling()
})
// 轮询查询 学生作业进度
const getStudentClassWorkDataPolling = () => {
// 先查询一次后，
getStudentVisible()
// 在轮询
pollingST.value = setInterval(() => {
getStudentVisible()
}, 1000 * 10)
}
const closeDialog = () => {
console.log('关闭弹窗,开启作业进度轮询')
getStudentClassWorkDataPolling()
}
const onClickItem = (item) => {
console.log('开启弹窗,关闭作业进度轮询')
clearInterval(pollingST.value)
itemDialogRef.value.openDialog(item)
}
onUnmounted(() => {
clearInterval(pollingST.value)
})
// [作业反馈] - 实际查询逻辑
const getStudentVisible = async () => {
if (classTaskStore.classListIds.length <= 0) {
return
}
// 班级作业数据，多个班级
const response = await listByDeadDate({
classidarray: classTaskStore.classListIds.join(','),
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
orderby: 'uniquekey DESC',
pageSize: 100
})
const curWorkList = response.rows
/**
* warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
* 故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
*/
for (let t = 0; t < classWorkList.value.length; t++) {
// 当前时间超过[作业任务]截止时间的跳过
// if( getDateTime > classWorkList.value[t].deaddate ){
// continue;
// }
// 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
// workdataresultcount 完成人数 workdatacount人数要大于0
if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
// 桌面端貌似不需要进度条了？
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
)
// 计算参与学习任务的平均用时
if (classWorkList.value[t].workdatafeedbackcount > 0) {
classWorkList.value[t].averagetime = (classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount).toFixed(0)
} else {
classWorkList.value[t].averagetime = 0
}
// 更新批阅数
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
} else {
classWorkList.value[t].finishpercent = 0
}
}
return 1
}
watch(
() => [dataList, toolStore.isToolWin],
() => {
console.log('====', toolStore)
setTimeout(() => {
getData() // 加载数据
}, 300)
}
)
watch(tabActive, (newVal,oldVal)=>{
console.log('newVal',newVal);
getData() // 加载数据
})
</script>
<style scoped lang="scss">

11
src/renderer/src/views/classTask/container/item-dialog-score.vue
View File

@ -325,13 +325,14 @@
<div style="display: flex; margin: 10px auto">
<span style="display: flex; align-items: center">
<span v-if="dialogProps.studentObj.worktype == '习题训练'">
得分：<span style="margin: 0; color: red">{{
<span>得分： </span>
<span style="margin: 0; color: red">{{
classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
}}</span
>分
}}</span>
<span>分</span>
</span>
<span v-else>
得分：
<span>得分： </span>
<span v-if="classWorkFormScore.teacherRating.length > 0">
<el-input-number
v-model="classWorkFormScore.teacherRating[0].score"
@ -344,7 +345,7 @@
@change="handleChange"
></el-input-number>
</span>
分
<span>分</span>
</span>
</span>
<div class="score-container">

14
src/renderer/src/views/profile/userInfo.vue
View File

@ -40,7 +40,7 @@
</template>
<script setup>
import { ref, getCurrentInstance } from 'vue'
import { ref, getCurrentInstance,onMounted } from 'vue'
import {updateUserInfo } from '@/api/system/user'
import { listEvaluation } from '@/api/subject/index'
import useUserStore from '@/store/modules/user'
@ -90,9 +90,12 @@ const rules = ref({
const subjectList = ref([])
// 获取基础的学科
listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
subjectList.value = res.rows
})
const getSubject = () => {
listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
const arr = userStore.user.subject.split(',')
subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
})
}
setTimeout(() => {
if (props.user.edudegree != '') {
@ -150,4 +153,7 @@ const semeterChange = (item) => {
props.user.edusubject = ''
}
}
onMounted(() => {
getSubject()
})
</script>

2
src/renderer/src/views/resource/container/third-list.vue
View File

@ -1,5 +1,5 @@
<template>
<div v-loading="sourceStore.loading" class="resource-list">
<div class="resource-list">
<el-scrollbar>
<el-empty v-if="!sourceStore.thirdResult.list.length" description="暂无数据" />
<ul>