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

Merge branch 'main' into zouyf_dev

This commit is contained in:
“zouyf” 2024-09-12 15:58:28 +08:00
parent d171117f03 0426b85d3f
commit 63ad74c77f
23 changed files with 741 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -1,6 +1,6 @@
{
"name": "aix-win",
"version": "1.1.8",
"version": "1.2.2",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "example.com",
@ -69,6 +69,5 @@
"vite-plugin-windicss": "^1.9.3",
"vue": "^3.4.30",
"windicss": "^3.5.6"
},
"packageManager": "pnpm@9.9.0+sha512.60c18acd138bff695d339be6ad13f7e936eea6745660d4cc4a776d5247c540d0edee1a563695c183a66eb917ef88f2b4feb1fc25f32a7adcadc7aaf3438e99c1"
}
}

2
src/main/index.js
View File

@ -53,7 +53,7 @@ function createLoginWindow() {
updateInit(loginWindow)
}
// loginWindow.webContents.openDevTools()
loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => {
loginWindow.show()
})

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) {

9
src/renderer/src/api/login.js
View File

@ -88,6 +88,15 @@ export function signIn(data) {
})
}
//登录模块-找回密码
export function retrievePwd(data) {
return request({
url: '/smarttalk/register/authRetrievePwd',
method: 'post',
data
})
}
//注册模块-获取学校
export function deptTree(data) {
return request({

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

@ -3,21 +3,20 @@
<svg class="icon ai-icon" aria-hidden="true" @click="isOpen = true; isMax = false" v-if="!isOpen">
<use xlink:href="#icon-aijiqiren"></use>
</svg>
<el-card v-else shadow="always" class="chart-card" :class="[isMax ? 'card-max' : '']">
<template #header>
<div class="flex chart-header">
<div class="header-name flex">
<svg class="icon header-icon" aria-hidden="true">
<use xlink:href="#icon-aijiqiren"></use>
</svg>
<span>教学助手</span>
</div>
<div class="header-tool">
<i class="iconfont icon-window-max_line icon-tool" @click="isMax = !isMax"></i>
<i class="iconfont icon-close icon-tool" @click="closeChart"></i>
</div>
<div v-else v-drag shadow="always" class="chart-card" :class="[isMax ? 'card-max' : '']">
<div class="flex chart-header">
<div class="header-name flex">
<svg class="icon header-icon" aria-hidden="true">
<use xlink:href="#icon-aijiqiren"></use>
</svg>
<span>教学助手</span>
</div>
</template>
<div class="header-tool">
<i class="iconfont icon-window-max_line icon-tool" @click="isMax = !isMax"></i>
<i class="iconfont icon-close icon-tool" @click="closeChart"></i>
</div>
</div>
<div class="chart-body">
<el-scrollbar ref="chatref">
<div class="default-chart flex">
@ -55,12 +54,13 @@
</div>
</div>
</el-scrollbar>
<div class="chart-input">
<el-input v-model="msgVal" size="large" class="chart-ipt" @keyup.enter="sendMsg" @focus="isFocus = true" @blur="isFocus = false" />
<i class="iconfont icon-tujing" :class="[isFocus ? 'icon-focus' : '']" @click="sendMsg"></i>
</div>
</div>
<div class="chart-input">
<el-input v-model="msgVal" size="large" class="chart-ipt" @keyup.enter="sendMsg" @focus="isFocus = true" @blur="isFocus = false" />
<i class="iconfont icon-tujing" :class="[isFocus ? 'icon-focus' : '']" @click="sendMsg"></i>
</div>
</el-card>
</div>
</div>
</template>
@ -75,7 +75,6 @@ import vDrag from '@/views/tool/directive/drag'
const { ipcRenderer } = window.electron || {}
const userStore = useUserStore().user
@ -115,28 +114,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'
}
]
@ -218,6 +217,7 @@ onMounted(() => {
}
.page-ai-chart {
.ai-icon {
position: fixed;
right: 30px;
@ -227,41 +227,38 @@ onMounted(() => {
}
.chart-card {
background-color: #fff;
position: fixed;
bottom: 20px;
right: 20px;
width: 300px;
height: calc(100% - 110px);
border-radius: 10px;
:deep(.el-card__header) {
padding: 10px;
}
:deep(.el-card__body) {
height: calc(100% - 50px);
padding: 10px 15px;
}
z-index: 10;
box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
.chart-body {
height: calc(100% - 60px);
padding: 10px 15px;
height: calc(100% - 110px);
-webkit-app-region: no-drag;
}
}
.card-max {
width: 100%;
height: 100%;
left: 0;
top: 0;
left: 0 !important;
top: 0 !important;
}
.chart-header {
justify-content: space-between;
font-size: 14px;
padding: 10px;
border-bottom: 1px solid #e4e7ed;
-webkit-app-region: no-drag;
.header-name {
align-items: center;
.header-icon {
font-size: 28px;
align-items: center;
@ -354,7 +351,10 @@ onMounted(() => {
}
.chart-input {
position: relative;
position: absolute;
width: 90%;
left: 5%;
bottom: 15px;
display: flex;
align-items: center;
padding-top: 15px;

3
src/renderer/src/components/choose-textbook/index.vue
View File

@ -100,6 +100,7 @@ const getSubjectContent = async () => {
edustage,
// entpcourseedituserid: userId,
itemgroup: 'textbook',
orderby: 'orderidx asc',
pageSize: 10000
}
@ -263,7 +264,7 @@ const transData = (data) => {
//获取教材
const getSubject = async () => {
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000 })
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000,orderby: 'orderidx asc', })
// subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
subjectList.value = rows

4
src/renderer/src/components/choose-textbook/third/index.vue
View File

@ -41,7 +41,9 @@ const getSubject = (value) => {
gradeName:gradeList[currentIndex].label
}
})
const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject)
//判断是否有名称或者包括名称就对应哪个学科
const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject || item.subjectName.includes(useStore.user.edusubject))
if(nameIndex === -1) return;
getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName})
if(textbookVersionId.value === 0){
getTagId(subjectList.value[0])

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 {

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

@ -2,28 +2,16 @@
<div class="title-bar flex">
<div class="left-section">
<div class="flex title-box">
<el-image style="width: 23px; height: 23px" :src="logoIco" />
<el-image style="width: 23px; height: 23px" :src="logoIco" />
<span class="title" @click="changeTab">AIX智慧课堂</span>
</div>
<div class="change-tab">
<ul class="flex">
<li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']"
v-for="menu in headerMenus" :key="menu.id" @click="clickMenu(menu)">
v-for="menu in headerMenus" :key="menu.id" @click="clickMenu(menu)">
<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,26 +20,41 @@
<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>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
<el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
<el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
<el-dropdown-item divided command="logout">
<span>退出登录</span>
</el-dropdown-item>
</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>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
<el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
<el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
<el-dropdown-item divided command="logout">
<span>退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</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,9 +90,9 @@ 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 == '考试分析'){
fullPath += `?unitId=${unitId}`
let unitId = levelSecondId ? levelSecondId : levelFirstId
if (name == '教材分析' || name == '考试分析') {
fullPath += `?unitId=${unitId}`
}
// 通知主进程
ipcRenderer.send('openWindow', {
@ -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,42 @@ 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
}
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 +232,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 +286,16 @@ function setLayout() {
color: #409eff;
}
}
.disabled{
.disabled {
cursor: not-allowed;
color: #bfbfbf;
&:hover{
&:hover {
color: #bfbfbf;
}
}
.active-li {
color: #409eff;
}
@ -302,11 +318,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 +346,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;
}

2
src/renderer/src/router/index.js
View File

@ -71,7 +71,7 @@ export const constantRoutes = [
{
path: '/classTask',
component: () => import('@/views/classTask/classTask.vue'),
name: 'class',
name: 'classCorrect',
meta: {title: '作业批改'},
},
{

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

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

@ -88,6 +88,9 @@ export const getCurrentTime = (format)=> {
const day = now.getDate().toString().padStart(2, '0');
const hours = now.getHours().toString().padStart(2, '0');
const minutes = now.getMinutes().toString().padStart(2, '0');
if(format == 'YYYY-MM-DD HH:mm'){
return `${year}-${month}-${day} ${hours}:${minutes}`;
}
if(format == 'YYYY-MM-DD'){
return `${year}-${month}-${day}`;
}
@ -134,3 +137,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;
}

2
src/renderer/src/views/classManage/aside.vue
View File

@ -4,6 +4,7 @@
class="el-menu-vertical-demo"
:default-active="activeIndex"
@select="handleSelect"
unique-opened
>
<template v-for="(item,index) in classList" :key="index">
<el-sub-menu :index="`${index}`">
@ -33,7 +34,6 @@ const emits = defineEmits(['handleSelect'])
//点击跳转路由
const handleSelect = (itemDom,pathKey) => {
console.log(itemDom,pathKey)
const parts = pathKey[1].split("-")
const result = parts.slice(0, 2).join("-")
const index = props.menuItems.findIndex(item=>item.index===result)

2
src/renderer/src/views/classManage/basicGroup.vue
View File

@ -1,5 +1,5 @@
<template>
<el-card style="width: 100%;height: 100%">
<el-card style="width: 100%;height: 100%;overflow: auto">
<!-- <template #header>-->
<!-- <div class="card-header" style="text-align: left">-->
<!-- <el-button type="primary" @click="addGroup">新建分组</el-button>-->

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

@ -2,8 +2,8 @@
<div class="common-layout">
<el-container>
<el-aside style="width: 200px;margin-top: 20px">
<el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 120) + 'px'}">
<div :style="{'max-height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}">
<el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 164) + 'px','max-height': (viewportHeight - 164) + 'px'}">
<div >
<Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
</div>
<!-- 隐藏操作按钮-->
@ -19,9 +19,9 @@
</template>
</el-card>
</el-aside>
<el-main :style="{'min-height': (viewportHeight - 160) + 'px'}">
<el-main :style="{'min-height': (viewportHeight - 204) + 'px'}">
<!-- <router-view :style="{'height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}" :key="route.path"></router-view>-->
<div :style="{'height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}">
<div :style="{'height': (viewportHeight - 164) + 'px','overflow-y': 'auto'}">
<!-- 班级概况-->
<ClassInfo v-if="currentIndex==0" :classId="classId"></ClassInfo>
<!-- 学生列表-->
@ -192,13 +192,21 @@
classList.value = []
listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then(response => {
classList.value = [...response.rows]
//这里获取组装所有班级
gradeTree.value = groupByCondition(response.rows, item => item.agekey);
if(classList.value.length > 0){
classId.value = classList.value[0].id
currentIndex.value = 0
}
});
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(arr, item => item.agekey);
})
}
//将所有班级筛选成二级的数组
function groupByCondition(arr, condition) {
@ -290,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,

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

@ -5,28 +5,57 @@
-->
<template>
<el-container class="class-reserv-wrap">
<div class="class-reserv-tabs">
<el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
<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">
<task-item
v-for="(item, index) in activeDataList"
v-show="tabActive === '进行中'"
:key="index"
:item="item"
:tabactive="tabActive"
@click="onClickItem(item)"
@delete-reserv="deleteReserv(item)"
></task-item>
<task-item
v-for="(item, index) in doneDataList"
v-show="tabActive === '已结束'"
:key="index"
:item="item"
:tabactive="tabActive"
@click="onClickItem(item)"
@delete-reserv="deleteReserv(item)"
></task-item>
<!-- 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 === '进行中'"
:key="index"
:item="item"
:tabactive="tabActive"
@click="onClickItem(item)"
@delete-reserv="deleteReserv(item)"
></task-item>
<task-item
v-for="(item, index) in doneDataList"
v-show="tabActive === '已结束'"
:key="index"
:item="item"
:tabactive="tabActive"
@click="onClickItem(item)"
@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>
@ -34,34 +63,30 @@
<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
}
classListIds.value.push(res.rows[i].id)
clslist.push(res.rows[i])
}
classList.value = clslist
// 班级作业数据，包含多个班级
homeworklist({
classidarray: classListIds.value.join(','),
//entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
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' })
}
}
/**
* 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,27 +192,129 @@ 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
// })
}
}
/**
* 3、获取多个班级学生作业数据
*/
const getStudentClassWorkData = () => {
if(classTaskStore.classListIds.length>0){
listClassworkdataByDeadDate({
classids: classTaskStore.classListIds.join(','),
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
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].classworkid == classWorkList.value[t].id && res.rows[i].resultcount > 0) {
console.log('==================')
// 有几个学生完成/正在完成学习任务
// 至少resultcount不是0
classWorkList.value[t].workdatafeedbackcount++
// 在参与学习任务的人中，汇总计算用时
classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
// 计算得分率
if (
res.rows[i].classworkevallist != '' &&
res.rows[i].classworkevallist != null &&
res.rows[i].classworkevallist != 'null'
) {
let replacedString = res.rows[i].classworkevallist.replace(/""/g, '"')
// 将标签中双引号改为转义, 测试数据: "{\"id\":172907, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358520, \"feedcontent\":\"④①⑤③②\", \"score\":4, \"rightanswer\":\"④①⑤③②\"},{\"id\":172908, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358521, \"feedcontent\":\"气壮山威，鲲鹏展翅楚云飞\", \"score\":4, \"rightanswer\":\"志远天高，春风杨柳麓山青\"},{\"id\":172909, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363096, \"feedcontent\":\"《红烛》化用“蜡矩”这一古典意象，赋予它新的含义，赞美了红烛以“蜡炬成灰”来点亮世界的奉献精神。\", \"score\":4, \"rightanswer\":\"《立在地球边上放号》中，全诗采用间接抒情的方式，描绘了太平洋的浪潮，吟唱了一曲惊心动魄的力的颂歌，意在赞美摧毁旧世界、创造新生活的“五四”精神。\"},{\"id\":172910, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363098, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist).replace(
/"(\[.*\])"/g,
'$1'
)
replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist)
var evalarray
try {
evalarray = JSON.parse('[' + res.rows[i].classworkevallist + ']')
} catch {
evalarray = JSON.parse('[' + replacedString + ']')
}
for (var e = 0; e < evalarray.length; e++) {
if (res.rows[i].worktype == '常规作业') {
evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent).replace(
/"(\[.*\])"/g,
'$1'
)
evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent)
}
if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
// 正确，得分
classWorkList.value[t].rightAnswerCount++
}
}
}
}
// 当前这个学习任务，共推送给了几个学生，workdatacount
if (res.rows[i].classworkid == classWorkList.value[t].id) {
classWorkList.value[t].workdatalist.push(res.rows[i])
}
}
// 计算完成进度 workdatacount人数要大于0
if (
classWorkList.value[t].workdataresultcount > 0 &&
classWorkList.value[t].workdatacount > 0
) {
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
)
} else {
classWorkList.value[t].finishpercent = 0
}
// 以下四个参数，都要计算
// 2024-04-12，酉阳，by jackyshen
// 计算参与学习任务的平均用时
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
}
// 计算批阅异常，需要获取每个题目的类型，找出主观题
// 暂缓
// 计算平均得分率： 正确题数/（题目总数*学生人数）*100
if (
classWorkList.value[t].entpcourseworklistarray &&
classWorkList.value[t].entpcourseworklistarray.length > 0
) {
var dd =
(classWorkList.value[t].rightAnswerCount /
(classWorkList.value[t].entpcourseworklistarray.length *
classWorkList.value[t].workdatacount)) *
100
classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
} else {
classWorkList.value[t].scoingRate = '0%'
}
// 设定典型作答，需要获取每个题目的类型，找出主观题
// 暂缓
}
})
}
}
const toolStore = useToolState()
// 将标签中的双引号增加转义
@ -211,28 +358,17 @@ 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) {
if (classTaskStore.classListIds.length <= 0) {
return
}
// 班级作业数据，多个班级
const response = await homeworklist({
classidarray: classListIds.value.join(','),
//entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
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
})
@ -272,123 +408,18 @@ const getStudentVisible = async () => {
return 1
}
// 获取多个班级学生作业数据
const getStudentClassWorkData = () => {
// 再查找多个班级里，每个学生的作业数据
listClassworkdata({
classids: classListIds.value.join(','),
//entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科
orderby: "deaddate 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('==================')
// 有几个学生完成/正在完成学习任务
// 至少resultcount不是0
classWorkList.value[t].workdatafeedbackcount++
// 在参与学习任务的人中，汇总计算用时
classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
// 计算得分率
if (
res.rows[i].classworkevallist != '' &&
res.rows[i].classworkevallist != null &&
res.rows[i].classworkevallist != 'null'
) {
let replacedString = res.rows[i].classworkevallist.replace(/""/g, '"')
// 将标签中双引号改为转义, 测试数据: "{\"id\":172907, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358520, \"feedcontent\":\"④①⑤③②\", \"score\":4, \"rightanswer\":\"④①⑤③②\"},{\"id\":172908, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358521, \"feedcontent\":\"气壮山威，鲲鹏展翅楚云飞\", \"score\":4, \"rightanswer\":\"志远天高，春风杨柳麓山青\"},{\"id\":172909, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363096, \"feedcontent\":\"《红烛》化用“蜡矩”这一古典意象，赋予它新的含义，赞美了红烛以“蜡炬成灰”来点亮世界的奉献精神。\", \"score\":4, \"rightanswer\":\"《立在地球边上放号》中，全诗采用间接抒情的方式，描绘了太平洋的浪潮，吟唱了一曲惊心动魄的力的颂歌，意在赞美摧毁旧世界、创造新生活的“五四”精神。\"},{\"id\":172910, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363098, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist).replace(
/"(\[.*\])"/g,
'$1'
)
replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist)
var evalarray
try {
evalarray = JSON.parse('[' + res.rows[i].classworkevallist + ']')
} catch {
evalarray = JSON.parse('[' + replacedString + ']')
}
for (var e = 0; e < evalarray.length; e++) {
if (res.rows[i].worktype == '常规作业') {
evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent).replace(
/"(\[.*\])"/g,
'$1'
)
evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent)
}
if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
// 正确，得分
classWorkList.value[t].rightAnswerCount++
}
}
}
}
// 当前这个学习任务，共推送给了几个学生，workdatacount
if (res.rows[i].classworkid == classWorkList.value[t].id) {
classWorkList.value[t].workdatalist.push(res.rows[i])
}
}
// 计算完成进度 workdatacount人数要大于0
if (
classWorkList.value[t].workdataresultcount > 0 &&
classWorkList.value[t].workdatacount > 0
) {
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
)
} else {
classWorkList.value[t].finishpercent = 0
}
// 以下四个参数，都要计算
// 2024-04-12，酉阳，by jackyshen
// 计算参与学习任务的平均用时
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
}
// 计算批阅异常，需要获取每个题目的类型，找出主观题
// 暂缓
// 计算平均得分率： 正确题数/（题目总数*学生人数）*100
if (
classWorkList.value[t].entpcourseworklistarray &&
classWorkList.value[t].entpcourseworklistarray.length > 0
) {
var dd =
(classWorkList.value[t].rightAnswerCount /
(classWorkList.value[t].entpcourseworklistarray.length *
classWorkList.value[t].workdatacount)) *
100
classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
} else {
classWorkList.value[t].scoingRate = '0%'
}
// 设定典型作答，需要获取每个题目的类型，找出主观题
// 暂缓
}
})
}
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">

241
src/renderer/src/views/desktop/container/work-trend.vue
View File

@ -1,92 +1,211 @@
<template>
<div class="desktop-item">
<div class="desktop-work-item">
<div class="item-title flex">
<span>工作动态</span>
<el-radio-group v-model="type">
<el-radio-group v-model="type" @change="changeTab">
<el-radio-button label="全部" :value="-1" />
<el-radio-button label="备课" :value="1" />
<el-radio-button label="上课" :value="2" />
<el-radio-button label="作业" :value="3" />
</el-radio-group>
</div>
<div class="item-content">
<ul>
<li class="flex class-item" v-for="item in classList" :key="item.id">
<div class="class-left flex">
<div class="class-name flex">
<span>{{ item.className }}</span>
</div>
<div class="class-time"> {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{ item.endTime }}</div>
<div class="class-grade">
<span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
{{ index === 0 ? tag.name : '、' + tag.name }}
</span>
</div>
</div>
<div class="class-right">
<el-button type="primary" size="small">上课</el-button>
</div>
</li>
</ul>
<div class="item-content" v-loading="loading">
<el-scrollbar height="500px">
<ul>
<!--上课-->
<template v-if="type == 2 || type == -1">
<li class="flex class-item" v-for="item in classList" :key="item.id">
<div class="class-left flex">
<div class="class-name flex">
<span class="name">{{ item.className }}</span>
</div>
<div class="class-time"> {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{
item.endTime }}</div>
<div class="class-grade">
<span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
{{ index === 0 ? tag.name : '、' + tag.name }}
</span>
</div>
</div>
<div class="class-right">
<el-button type="primary" size="small">上课</el-button>
</div>
</li>
</template>
<!--作业-->
<template v-if="type == 3 || type == -1">
<li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id">
<div class="class-left flex">
<div class="class-name flex">
<span class="name">{{ item.uniquekey }}</span>
<el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
</div>
<div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
</div>
<div class="class-right">
<div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div>
<div>已交</div>
</div>
</li>
</template>
</ul>
</el-scrollbar>
</div>
</div>
</template>
<script setup>
import { ref, onMounted } from 'vue'
import useUserStore from '@/store/modules/user'
import { getSelfReserv } from '@/api/classManage'
import { homeworklist } from '@/api/teaching/classwork'
import { getCurrentTime } from '@/utils/date'
const type = ref(-1)
const classList = ref([])
const type = ref(-1)
const user = useUserStore().user
const loading = ref(false)
const classList = ref([])
const homeworkList = ref([])
// 获取上课
const getClass = () =>{
getSelfReserv().then((res) => {
let list = res.data || []
list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
classList.value = list.filter(item => item.status !== '已结束')
})
// 获取上课
const getClass = async () => {
loading.value = true
try {
const res = await getSelfReserv()
let list = res.data || []
list.sort((a, b) => { if (a.status == '上课中') return -1; else return 0 })
classList.value = list.filter(item => item.status !== '已结束')
} finally {
loading.value = false
}
}
// 获取作业
const getHomework = async () => {
loading.value = true
const { edustage, edusubject } = user
try {
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, orderby: 'uniquekey DESC', pageSize: 500 })
homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey)
homeworkList.value.forEach((item) => {
item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
})
} finally {
loading.value = false
}
}
onMounted(()=>{
getClass()
})
const tagType = (time) => {
return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
}
// 切换
const changeTab = (val) =>{
console.log(type.value)
switch(val){
case -1:
getClass()
getHomework()
break;
case 1:
break;
case 2:
getClass()
break;
default:
getHomework()
}
}
onMounted(() => {
getClass()
getHomework()
})
</script>
<style lang="scss" scoped>
.desktop-item{
margin-bottom: 20px;
.desktop-work-item {
align-items: center;
height: 100%;
.item-title {
height: 32px;
text-align: left;
font-size: 18px;
font-weight: bold;
margin-bottom: 10px;
align-items: center;
.item-title{
height: 32px;
text-align: left;
font-size: 18px;
font-weight: bold;
margin-bottom: 10px;
align-items: center;
justify-content: space-between;
}
.item-content {
background-color: #fff;
border-radius: 5px;
padding: 10px 15px;
font-size: 13px;
height: calc(100% - 60px);
.class-item {
justify-content: space-between;
}
.item-content{
background-color: #fff;
align-items: center;
background: #eff5fa;
border-radius: 5px;
padding: 10px 15px;
font-size: 13px;
.class-item{
justify-content: space-between;
align-items: center;
background: #e2e4f4;
border-radius: 5px;
margin-bottom: 10px;
padding: 10px;
.class-left{
flex-direction: column;
align-items: flex-start;
.class-time{
font-size: 13px;
color: #bfbfbf;
margin-bottom: 10px;
padding: 10px;
.class-left {
flex-direction: column;
align-items: flex-start;
width: 90%;
.class-name {
display: flex;
align-items: center;
.name {
font-size: 14px;
font-weight: bold;
}
.tag {
margin-left: 5px;
border: none;
:deep(.el-tag__content) {
font-size: 12px;
}
}
}
.class-time {
font-size: 13px;
color: #a5a4a4;
padding-top: 3px;
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
}
}
.class-right {
font-size: 12px;
color: #a5a4a4;
flex-shrink: 0;
font-size: 13px;
.num {
font-size: 14px;
color: #409EFF;
font-weight: bold;
}
}
}
.class-grade {
padding-top: 3px
}
}
}
</style>

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

@ -1,12 +1,12 @@
<template>
<el-dialog
v-model="dialogVisible"
title="注册账号"
:title="type==1?'注册账号':'找回密码'"
:fullscreen="true"
center
:before-close="handleClose"
>
<el-steps style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
<el-steps v-if="type==1" style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
<el-step title="1.基本信息" @click="activeIndex=1" />
<el-step title="2.在校信息" />
</el-steps>
@ -18,10 +18,10 @@
status-icon
ref="ruleFormRef"
>
<el-form-item label="姓名" prop="name" v-if="activeIndex==1">
<el-form-item label="姓名" prop="name" v-if="type==1 && activeIndex==1">
<el-input v-model="ruleForm.name" />
</el-form-item>
<el-form-item label="身份证号" prop="idNumber" v-if="activeIndex==1">
<el-form-item label="身份证号" prop="idNumber" v-if="type==1 && activeIndex==1">
<el-input v-model="ruleForm.idNumber" />
</el-form-item>
<el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1">
@ -60,14 +60,14 @@
<el-form-item label="学科" prop="discipline" v-if="activeIndex==2">
<div v-for="item in schoolSubject" style="display: flex;">
<span style="width:50px">{{ item.name }}：</span>
<el-checkbox-group style="width:100%" v-model="ruleForm.discipline" >
<el-checkbox-group style="width:100%" v-model="ruleForm.discipline">
<el-checkbox style="margin-right:10px" v-for="el in item.children" :key="el.id" :label="el.itemtitle" :value="el" />
</el-checkbox-group>
</div>
</el-form-item>
<el-form-item v-if="activeIndex==1">
<div class="centerDiv">
<el-button type="primary" @click="nextStep(ruleFormRef)">下一步</el-button>
<el-button type="primary" @click="nextStep(ruleFormRef)">{{ ['下一步','重置密码'][type-1]||'未知异常' }}</el-button>
</div>
</el-form-item>
<el-form-item v-if="activeIndex==2">
@ -109,7 +109,7 @@
<script setup>
import { ref, defineExpose, reactive ,onMounted} from 'vue'
import {captchaImg,sendCode,deptTree,getDept,listClassmain,listEvaluation,signIn} from '@/api/login'
import {captchaImg,sendCode,deptTree,getDept,listClassmain,listEvaluation,signIn, retrievePwd} from '@/api/login'
import { ElMessage } from 'element-plus'
import {setToken, removeToken } from '@/utils/auth'
import { regionData, codeToText } from 'element-china-area-data'
@ -225,8 +225,12 @@ const rules = reactive({
},]
})
const dialogVisible = ref(false)
const type = ref(1) // 1注册 2找回密码
// 打开弹窗
const OpenModel = () =>{
const OpenModel = v =>{
if (!v) return ElMessage.success('操作失败')
type.value = v
dialogVisible.value=true
}
// 关闭弹窗
@ -241,33 +245,51 @@ const nextStep = (formEl) => {
if (!formEl) return
formEl.validate((valid) => {
if (valid) {
activeIndex.value=2
// 获取部门列表
deptTree({phone:ruleForm.phoneNumber}).then(res=>{
optionsSchool.value=res.data
optionsSchool.value.forEach(item=>{
item.value=item.id
if(!item.children){
item.disabled=true
}
if(item.children){
item.children.forEach(child=>{
child.value=child.id
if(!child.children){
child.disabled=true
}
if(child.children){
child.children.forEach(grandson=>{
grandson.value=grandson.id
})
}
})
// 如果 type 1 注册，2 找回密码
if (type.value == 2) {
let params = {
mobile:ruleForm.phoneNumber,
code:ruleForm.Code,
password:ruleForm.password,
confirmPassword:ruleForm.confirmPassword,
}
retrievePwd(params).then(res=>{
if(res.code==200){
ElMessage.success(res.msg)
handleClose()
}else{
ElMessage.error(res.msg)
}
})
getSubject()
console.log(res)
})
console.log('submit!')
} else {
activeIndex.value=2
// 获取部门列表
deptTree({phone:ruleForm.phoneNumber}).then(res=>{
optionsSchool.value=res.data
optionsSchool.value.forEach(item=>{
item.value=item.id
if(!item.children){
item.disabled=true
}
if(item.children){
item.children.forEach(child=>{
child.value=child.id
if(!child.children){
child.disabled=true
}
if(child.children){
child.children.forEach(grandson=>{
grandson.value=grandson.id
})
}
})
}
})
getSubject()
console.log(res)
})
console.log('submit!')
}
} else {
console.log('error submit!')
}
@ -296,7 +318,7 @@ const submitForm = async (formEl) => {
schoolId:ruleForm.school[2],
classIds:ruleForm.class.join(','),
subjectIds:ruleForm.discipline.map(o=>o.id).join(','),
subject:ruleForm.discipline.map(o=>o.itemtitle).join(','),
subject:ruleForm.discipline.map(o=>`${o.edustage}-${o.edusubject}`).join(','),
areaIds:ruleForm.address.join(','),
area:araname
}
@ -333,7 +355,7 @@ const sendcaptchaImg=()=>{
if(ruleForm.phoneNumber){
const pattern = /^1[3-9]\d{9}$/;
if( pattern.test(ruleForm.phoneNumber) ){
captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
captchaImg({mobile:ruleForm.phoneNumber, type: type.value}).then(res=>{
ruleForm.imgCode=null
isImg.value=true
isPeopleImg.value='data:image/jpg;base64,'+res.img
@ -354,7 +376,7 @@ const sendcaptchaImg=()=>{
}
// 刷新
const refreshImg=()=>{
captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
captchaImg({mobile:ruleForm.phoneNumber, type: type.value}).then(res=>{
isPeopleImg.value='data:image/jpg;base64,'+res.img
if(res.token){
setToken(res.token)
@ -365,7 +387,14 @@ const refreshImg=()=>{
// 提交人机验证
const sbmitImg=()=>{
if(ruleForm.imgCode){
sendCode({mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}).then(res=>{
// {mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}
const { phoneNumber:mobile,imgCode:code } = ruleForm
const params = {
mobile, code,
uuid: resImg.imgData.uuid,
type: type.value
}
sendCode(params).then(res=>{
if(res.code==200){
ruleForm.Code=res.data
isImg.value=false

8
src/renderer/src/views/login/index.vue
View File

@ -32,9 +32,9 @@
>
</el-form-item>
<div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
<a style="margin-right: 10px;" @click="RegisterModel">注册账号</a>
<a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
<!-- | -->
<!-- <a style="margin-left: 10px;">忘记密码</a> -->
<a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
</div>
</el-form>
</div>
@ -98,8 +98,8 @@ ipcRenderer.on('update-app-progress', (e, prop) => {
showDownLoading.value = prop !== 100
})
// 打开弹窗
const RegisterModel = () =>{
RegModel.value.OpenModel()
const RegisterModel = type =>{
RegModel.value.OpenModel(type)
}
//登录
const submitForm = async (formEl) => {

5
src/renderer/src/views/prepare/container/reserv.vue
View File

@ -270,6 +270,11 @@ const updateClassReserv = (formData) => {
}
const addClassReserv = (formData) => {
let ids = formData.resource.join(',')
// 判断是否添加教材
if(!props.bookId){
ElMessage.warning('请选择教材')
return
}
let param = {
className: formData.name,
classType: formData.type,

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>