Compare commits

...

26 Commits

Author SHA1 Message Date
朱浩 bc0579fa32 排序问题处理 2024-09-12 09:47:35 +08:00
yangws 3357cf8a78 Merge pull request 'fix: 样式修改,以及第三方资源名称不对应的情况;' (#198) from yangws into main
Reviewed-on: #198
2024-09-12 09:31:57 +08:00
yangws 3fdf500366 fix: 样式修改,以及第三方资源名称不对应的情况; 2024-09-12 09:30:44 +08:00
zhengdegang e985417675 Merge pull request 'zdg' (#197) from zdg into main
Reviewed-on: #197
2024-09-11 20:06:20 +08:00
zdg 1978d1bac1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 20:05:30 +08:00
zdg b9014b950a 密码找回 2024-09-11 20:05:18 +08:00
lyc 03ecbb1d50 Merge pull request 'ai助手-拖动' (#196) from lyc-dev into main 2024-09-11 16:51:56 +08:00
lyc ec3b978185 ai助手-拖动 2024-09-11 16:50:47 +08:00
zdg 3632beebfa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 16:17:16 +08:00
zdg f0e87338fb 注册优化,修复 2024-09-11 16:17:05 +08:00
lyc 54266f8a37 Merge pull request '图片' (#195) from lyc-dev into main 2024-09-11 16:05:04 +08:00
lyc 82bed1be03 图片 2024-09-11 16:04:36 +08:00
lyc 8a74f17266 Merge pull request '头部展示学科' (#194) from lyc-dev into main 2024-09-11 15:42:39 +08:00
lyc 40c6e1303b 头部展示学科 2024-09-11 15:39:54 +08:00
yangws ee196b6eb8 Merge pull request 'fix:解决个人中心班级限制问题;' (#193) from yangws into main
Reviewed-on: #193
2024-09-11 14:43:25 +08:00
yangws 6c60cd4442 fix:解决个人中心班级限制问题; 2024-09-11 14:42:48 +08:00
baigl 471d73a224 Merge pull request '作业批阅:新增空列表展示与loading加载效果' (#192) from baigl into main
Reviewed-on: #192
2024-09-11 14:30:31 +08:00
白了个白 d7761883f2 作业批阅:新增空列表展示与loading加载效果 2024-09-11 14:22:05 +08:00
baigl d4b1e547de Merge pull request 'baigl' (#191) from baigl into main
Reviewed-on: #191
2024-09-11 11:29:52 +08:00
白了个白 b34182eb39 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-11 11:28:03 +08:00
白了个白 300093cf74 作业批改优化:新增时间筛选接口 界面调整 2024-09-11 11:25:41 +08:00
yangws aaf03eb60d Merge pull request 'fix:样式问题;' (#190) from yangws into main
Reviewed-on: #190
2024-09-11 09:49:07 +08:00
yangws 08075746c0 fix:样式问题; 2024-09-11 09:48:27 +08:00
yangws 8ec93353bc Merge pull request 'fix:修改添加的班级;' (#189) from yangws into main
Reviewed-on: #189
2024-09-10 17:56:33 +08:00
yangws 68df866db5 fix:修改添加的班级; 2024-09-10 17:55:48 +08:00
朱浩 add564c4ed Merge pull request 'zhuhao_dev' (#188) from zhuhao_dev into main
Reviewed-on: #188
2024-09-10 17:22:22 +08:00
21 changed files with 551 additions and 372 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "aix-win", "name": "aix-win",
"version": "1.2.0", "version": "1.2.2",
"description": "An Electron application with Vue", "description": "An Electron application with Vue",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "example.com", "author": "example.com",

View File

@ -53,7 +53,7 @@ function createLoginWindow() {
updateInit(loginWindow) updateInit(loginWindow)
} }
// loginWindow.webContents.openDevTools() loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => { loginWindow.once('ready-to-show', () => {
loginWindow.show() loginWindow.show()
}) })
@ -297,4 +297,4 @@ function appWatchError() {
app.on('child-process-gone', async (event, details) => { app.on('child-process-gone', async (event, details) => {
console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`) console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`)
}) })
} }

View File

@ -1,7 +1,22 @@
// 查询evaluation列表 // 查询evaluation列表
import request from '@/utils/request' 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列表 班级作业列表 // 查询classworkdata列表 班级作业列表
export function listClassworkdata(query) { export function listClassworkdata(query) {

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) { export function deptTree(data) {
return request({ return request({

View File

@ -3,21 +3,20 @@
<svg class="icon ai-icon" aria-hidden="true" @click="isOpen = true; isMax = false" v-if="!isOpen"> <svg class="icon ai-icon" aria-hidden="true" @click="isOpen = true; isMax = false" v-if="!isOpen">
<use xlink:href="#icon-aijiqiren"></use> <use xlink:href="#icon-aijiqiren"></use>
</svg> </svg>
<el-card v-else shadow="always" class="chart-card" :class="[isMax ? 'card-max' : '']"> <div v-else v-drag shadow="always" class="chart-card" :class="[isMax ? 'card-max' : '']">
<template #header> <div class="flex chart-header">
<div class="flex chart-header"> <div class="header-name flex">
<div class="header-name flex"> <svg class="icon header-icon" aria-hidden="true">
<svg class="icon header-icon" aria-hidden="true"> <use xlink:href="#icon-aijiqiren"></use>
<use xlink:href="#icon-aijiqiren"></use> </svg>
</svg> <span>教学助手</span>
<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> </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"> <div class="chart-body">
<el-scrollbar ref="chatref"> <el-scrollbar ref="chatref">
<div class="default-chart flex"> <div class="default-chart flex">
@ -55,12 +54,13 @@
</div> </div>
</div> </div>
</el-scrollbar> </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>
<div class="chart-input">
<el-input v-model="msgVal" size="large" class="chart-ipt" @keyup.enter="sendMsg" @focus="isFocus = true" @blur="isFocus = false" /> </div>
<i class="iconfont icon-tujing" :class="[isFocus ? 'icon-focus' : '']" @click="sendMsg"></i>
</div>
</el-card>
</div> </div>
</template> </template>
@ -75,7 +75,6 @@ import vDrag from '@/views/tool/directive/drag'
const { ipcRenderer } = window.electron || {} const { ipcRenderer } = window.electron || {}
const userStore = useUserStore().user const userStore = useUserStore().user
@ -115,28 +114,28 @@ const outerAi = [
id: 1, id: 1,
title: '生成图片', title: '生成图片',
secondTit: '文生图大模型', secondTit: '文生图大模型',
img: '../../../src/assets/images/ai-01.png', img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
path: '/ais/aisd3' path: '/ais/aisd3'
}, },
{ {
id: 2, id: 2,
title: '教学大模型', title: '教学大模型',
secondTit: '中小学基础教学大模型', secondTit: '中小学基础教学大模型',
img: '../../../src/assets/images/ai-02.png', img: new URL('../../../src/assets/images/ai-02.png', import.meta.url).href,
disabled: true, disabled: true,
}, },
{ {
id: 3, id: 3,
title: '育人大模型', title: '育人大模型',
secondTit: '全场域育人大模型', secondTit: '全场域育人大模型',
img: '../../../src/assets/images/ai-03.png', img: new URL('../../../src/assets/images/ai-03.png', import.meta.url).href,
path: '/ais/aimodel' path: '/ais/aimodel'
}, },
{ {
id: 4, id: 4,
title: 'ChatTTS', title: 'ChatTTS',
secondTit: '文字转语音大模型', secondTit: '文字转语音大模型',
img: '../../../src/assets/images/ai-04.png', img: new URL('../../../src/assets/images/ai-04.png', import.meta.url).href,
path: '/ais/aiChatTTS' path: '/ais/aiChatTTS'
} }
] ]
@ -218,6 +217,7 @@ onMounted(() => {
} }
.page-ai-chart { .page-ai-chart {
.ai-icon { .ai-icon {
position: fixed; position: fixed;
right: 30px; right: 30px;
@ -227,41 +227,38 @@ onMounted(() => {
} }
.chart-card { .chart-card {
background-color: #fff;
position: fixed; position: fixed;
bottom: 20px; bottom: 20px;
right: 20px; right: 20px;
width: 300px; width: 300px;
height: calc(100% - 110px); height: calc(100% - 110px);
border-radius: 10px; border-radius: 10px;
z-index: 10;
:deep(.el-card__header) { box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
padding: 10px;
}
:deep(.el-card__body) {
height: calc(100% - 50px);
padding: 10px 15px;
}
.chart-body { .chart-body {
height: calc(100% - 60px); padding: 10px 15px;
height: calc(100% - 110px);
-webkit-app-region: no-drag;
} }
} }
.card-max { .card-max {
width: 100%; width: 100%;
height: 100%; height: 100%;
left: 0; left: 0 !important;
top: 0; top: 0 !important;
} }
.chart-header { .chart-header {
justify-content: space-between; justify-content: space-between;
font-size: 14px; font-size: 14px;
padding: 10px;
border-bottom: 1px solid #e4e7ed;
-webkit-app-region: no-drag;
.header-name { .header-name {
align-items: center; align-items: center;
.header-icon { .header-icon {
font-size: 28px; font-size: 28px;
align-items: center; align-items: center;
@ -354,7 +351,10 @@ onMounted(() => {
} }
.chart-input { .chart-input {
position: relative; position: absolute;
width: 90%;
left: 5%;
bottom: 15px;
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 15px; padding-top: 15px;

View File

@ -264,7 +264,7 @@ const transData = (data) => {
// //
const getSubject = async () => { 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.filter(item => item.edustage == edustage && item.edusubject == edusubject)
subjectList.value = rows subjectList.value = rows

View File

@ -41,7 +41,9 @@ const getSubject = (value) => {
gradeName:gradeList[currentIndex].label 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}) getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName})
if(textbookVersionId.value === 0){ if(textbookVersionId.value === 0){
getTagId(subjectList.value[0]) getTagId(subjectList.value[0])

View File

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

View File

@ -2,28 +2,16 @@
<div class="title-bar flex"> <div class="title-bar flex">
<div class="left-section"> <div class="left-section">
<div class="flex title-box"> <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> <span class="title" @click="changeTab">AIX智慧课堂</span>
</div> </div>
<div class="change-tab"> <div class="change-tab">
<ul class="flex"> <ul class="flex">
<li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']" <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> <i class="iconfont" :class="menu.icon"></i>
<span class="text">{{ menu.name }}</span> <span class="text">{{ menu.name }}</span>
</li> </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> </ul>
</div> </div>
</div> </div>
@ -32,26 +20,41 @@
<WindowTools /> <WindowTools />
<div class="user flex"> <div class="user flex">
<div class="avatar-container"> <div class="avatar-container">
<el-dropdown <div class="avatar-wrapper flex">
class="right-menu-item hover-effect" <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
trigger="click"
@command="handleCommand"
>
<div class="avatar-wrapper">
<img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" /> <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> </div>
<template #dropdown> </div>
<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>
</div> </div>
@ -59,22 +62,23 @@
</template> </template>
<script setup> <script setup>
import { ref, watch } from 'vue' import { ref, watch, onMounted } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { ElMessageBox } from 'element-plus' import { ElMessageBox } from 'element-plus'
import { ArrowDown } from '@element-plus/icons-vue'
import WindowTools from '@/components/window-tools/index.vue' import WindowTools from '@/components/window-tools/index.vue'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import routerStore from '@/store/modules/route' import { updateUserInfo } from '@/api/system/user'
import outLink from '@/utils/linkConfig' import outLink from '@/utils/linkConfig'
import logoIco from '@/assets/images/logo.png' import logoIco from '@/assets/images/logo.png'
import { listEvaluation } from '@/api/classManage/index'
const routeHeader = routerStore()
const { ipcRenderer } = window.electron || {} const { ipcRenderer } = window.electron || {}
const userStore = useUserStore() const userStore = useUserStore()
const router = useRouter() const router = useRouter()
const currentRoute = ref('') const currentRoute = ref('')
const dev_api = ref(import.meta.env.VITE_APP_BASE_API) const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
const userSubjectList = ref([])
const handleOutLink = (path, type, name) => { const handleOutLink = (path, type, name) => {
if (!path) return if (!path) return
@ -86,9 +90,9 @@ const handleOutLink = (path, type, name) => {
let fullPath = configObj.fullPath + path let fullPath = configObj.fullPath + path
fullPath = fullPath.replaceAll('//', '/') fullPath = fullPath.replaceAll('//', '/')
const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId')) const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
let unitId = levelSecondId ? levelSecondId :levelFirstId let unitId = levelSecondId ? levelSecondId : levelFirstId
if(name == '教材分析' || name == '考试分析'){ if (name == '教材分析' || name == '考试分析') {
fullPath += `?unitId=${unitId}` fullPath += `?unitId=${unitId}`
} }
// //
ipcRenderer.send('openWindow', { ipcRenderer.send('openWindow', {
@ -127,34 +131,11 @@ const headerMenus = [
} }
] ]
const clickMenu = ({ id, disabled, path }) =>{ const clickMenu = ({ id, disabled, path }) => {
if(disabled) return if (disabled) return
activeId.value = id activeId.value = id
router.push(path) 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( watch(
@ -200,13 +181,42 @@ function logout() {
ipcRenderer && ipcRenderer.send('openLoginWindow') ipcRenderer && ipcRenderer.send('openLoginWindow')
}) })
}) })
.catch(() => {}) .catch(() => { })
} }
const emits = defineEmits(['setLayout']) const emits = defineEmits(['setLayout'])
function setLayout() { function setLayout() {
emits('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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -222,17 +232,20 @@ function setLayout() {
align-items: flex-start; align-items: flex-start;
flex-direction: column; flex-direction: column;
width: 50%; width: 50%;
.title-box{
.title-box {
padding-top: 8px; padding-top: 8px;
box-sizing: border-box; box-sizing: border-box;
align-items: center; align-items: center;
padding-left: 20px; padding-left: 20px;
.title { .title {
color: #4b73df; color: #4b73df;
font-size: 13px; font-size: 13px;
padding: 0 5px; padding: 0 5px;
} }
} }
.change-tab { .change-tab {
-webkit-app-region: no-drag; -webkit-app-region: no-drag;
margin-left: 20px; margin-left: 20px;
@ -273,13 +286,16 @@ function setLayout() {
color: #409eff; color: #409eff;
} }
} }
.disabled{
.disabled {
cursor: not-allowed; cursor: not-allowed;
color: #bfbfbf; color: #bfbfbf;
&:hover{
&:hover {
color: #bfbfbf; color: #bfbfbf;
} }
} }
.active-li { .active-li {
color: #409eff; color: #409eff;
} }
@ -290,7 +306,7 @@ function setLayout() {
-webkit-app-region: no-drag; -webkit-app-region: no-drag;
} }
} }
.right-section { .right-section {
@ -302,11 +318,25 @@ function setLayout() {
flex-direction: column; flex-direction: column;
.user { .user {
padding-right: 10px;
.user-info { .user-info {
padding-right: 5px; padding-right: 5px;
align-items: center; align-items: flex-start;
flex-direction: column; flex-direction: column;
font-size: 12px; 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 { .avatar-wrapper {
display: flex; display: flex;
align-items: center;
.user-avatar { .user-avatar {
width: 30px; width: 35px;
height: 30px; height: 35px;
border-radius: 10px; border-radius: 10px;
margin-top: 8px;
margin-right: 10px; margin-right: 10px;
} }

View File

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

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

View File

@ -133,4 +133,20 @@ export function getTimeDate() {
var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds 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;
}

View File

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

View File

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

View File

@ -2,8 +2,8 @@
<div class="common-layout"> <div class="common-layout">
<el-container> <el-container>
<el-aside style="width: 200px;margin-top: 20px"> <el-aside style="width: 200px;margin-top: 20px">
<el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 120) + 'px'}"> <el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 164) + 'px','max-height': (viewportHeight - 164) + 'px'}">
<div :style="{'max-height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}"> <div >
<Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside> <Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
</div> </div>
<!-- 隐藏操作按钮--> <!-- 隐藏操作按钮-->
@ -19,9 +19,9 @@
</template> </template>
</el-card> </el-card>
</el-aside> </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>--> <!-- <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> <ClassInfo v-if="currentIndex==0" :classId="classId"></ClassInfo>
<!-- 学生列表--> <!-- 学生列表-->
@ -192,13 +192,21 @@
classList.value = [] classList.value = []
listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then(response => { listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then(response => {
classList.value = [...response.rows] classList.value = [...response.rows]
//
gradeTree.value = groupByCondition(response.rows, item => item.agekey);
if(classList.value.length > 0){ if(classList.value.length > 0){
classId.value = classList.value[0].id classId.value = classList.value[0].id
currentIndex.value = 0 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) { function groupByCondition(arr, condition) {
@ -290,13 +298,15 @@
// } // }
// //
const btnSave = () => { 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) { if (res.code === 200) {
dialogVisible.value = false dialogVisible.value = false
ElMessage({ ElMessage({
message: res.msg, message: res.msg,
type: 'success', type: 'success',
}) })
//
classids.value = []
}else{ }else{
ElMessage({ ElMessage({
message: res.msg, message: res.msg,

View File

@ -5,28 +5,57 @@
--> -->
<template> <template>
<el-container class="class-reserv-wrap"> <el-container class="class-reserv-wrap">
<div class="class-reserv-tabs"> <div style="display: flex; justify-content: space-between;">
<el-segmented v-model="tabActive" block :options="tabOptions" size="large" /> <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>
<div class="class-reserv-body"> <div class="class-reserv-body">
<task-item <!-- loading <el-skeleton :rows="5" animated />-->
v-for="(item, index) in activeDataList" <el-skeleton :rows="5" :loading="loading" animated />
v-show="tabActive === '进行中'" <div v-if="classWorkList.length > 0">
:key="index" <task-item
:item="item" v-for="(item, index) in activeDataList"
:tabactive="tabActive" v-show="tabActive === '进行中'"
@click="onClickItem(item)" :key="index"
@delete-reserv="deleteReserv(item)" :item="item"
></task-item> :tabactive="tabActive"
<task-item @click="onClickItem(item)"
v-for="(item, index) in doneDataList" @delete-reserv="deleteReserv(item)"
v-show="tabActive === '已结束'" ></task-item>
:key="index" <task-item
:item="item" v-for="(item, index) in doneDataList"
:tabactive="tabActive" v-show="tabActive === '已结束'"
@click="onClickItem(item)" :key="index"
@delete-reserv="deleteReserv(item)" :item="item"
></task-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> </div>
<item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog> <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
</el-container> </el-container>
@ -34,34 +63,30 @@
<script setup> <script setup>
import { ref, onMounted, onUnmounted, computed, watch, reactive } from 'vue' import { ref, onMounted, onUnmounted, computed, watch, reactive } from 'vue'
import { getSelfReserv } from '@/api/classManage' import { listByDeadDate, listClassworkdataByDeadDate } from '@/api/classTask'
import { listClassmain } from '@/api/classManage/index'
import { listClassworkdata } from '@/api/classTask'
import { homeworklist } from '@/api/teaching/classwork'
import TaskItem from '@/views/classTask/container/task-item.vue' import TaskItem from '@/views/classTask/container/task-item.vue'
import ItemDialog from '@/views/classTask/container/item-dialog.vue' import ItemDialog from '@/views/classTask/container/item-dialog.vue'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import { sessionStore } from '@/utils/tool' import { getCurrentTime, getTomorrow } from '@/utils/date'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import useClassTaskStore from "@/store/modules/classTask";
const classTaskStore = useClassTaskStore()
const userStore = useUserStore().user const userStore = useUserStore().user
const itemDialogRef = ref(null) const itemDialogRef = ref(null)
const tabOptions = ref(['进行中', '已结束']) const tabOptions = ref(['进行中', '已结束'])
const tabActive = ref('进行中') const tabActive = ref('进行中')
const dataList = ref([]) const dataList = ref([])
const EndDate = ref(getCurrentTime('YYYY-MM-DD'))
//
const classList = ref([])
const classListIds = ref([])
// //
const classWorkList = ref([]) const classWorkList = ref([])
const total = ref(0) const total = ref(0)
const loading = ref(false) const loading = ref(false)
const activeDataList = computed(() => { const activeDataList = computed(() => {
// return classWorkList.value return classWorkList.value
// []
return classWorkList.value && classWorkList.value.filter((item) => getDateTime > item.deaddate)
}) })
const deleteReserv = (item) => { const deleteReserv = (item) => {
console.log('删除待开发', item) console.log('删除待开发', item)
@ -70,31 +95,51 @@ const deleteReserv = (item) => {
// }) // })
} }
const doneDataList = computed(() => { const doneDataList = computed(() => {
// return classWorkList.value return classWorkList.value
return classWorkList.value && classWorkList.value.filter((item) => getDateTime < item.deaddate)
}) })
//
const disabledDate = (time) => {
return time.getTime() > Date.now()
}
//
const changeEndDate = (val) => {
console.log('截止日期改变', val)
getData() //
}
// //
const getData = () => { const getData = () => {
// classWorkList.value = []
listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then((res) => { loading.value = true
var clslist = [] // 1
for (var i = 0; i < res.rows.length; i++) { getClassList()
if (res.rows[i].classstudentlist != '') { // 2
var array = JSON.parse('[' + res.rows[i].classstudentlist + ']') getClassWorkList()
res.rows[i].classstudents = array // 3
} getStudentClassWorkData()
classListIds.value.push(res.rows[i].id) }
clslist.push(res.rows[i]) /**
} * 1获取班级列表数据
classList.value = clslist * TODO 这里暂时取班级id的list后续需要在修改
*/
// const getClassList = () => {
homeworklist({ if(classTaskStore.classListIds.length==0){
classidarray: classListIds.value.join(','), // ids idlist
//entpcourseid: '', // id 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,// edustage: userStore.edustage,//
edusubject: userStore.edusubject,// edusubject: userStore.edusubject,//
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,//
orderby: 'uniquekey DESC', orderby: 'uniquekey DESC',
pageSize: 100 pageSize: 100
}).then((response) => { }).then((response) => {
@ -147,27 +192,129 @@ const getData = () => {
// (workdatacount)>0 // (workdatacount)>0
if (response.rows && response.rows.length > 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)
// classWorkList.value = response.rows && response.rows.filter((item) => item.workdatacount > 0 && item.uniquekey == '-0808-1')
//TODO total //TODO total
total.value = response.total total.value = response.total
}else{
classWorkList.value = []
total.value = 0
} }
loading.value = false 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('==================')
// /
// resultcount0
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])
}
}
// workdatacount0
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-12by 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() const toolStore = useToolState()
// //
@ -211,28 +358,17 @@ onUnmounted(() => {
clearInterval(pollingST.value) 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 () => { const getStudentVisible = async () => {
if (classListIds.value.length <= 0) { if (classTaskStore.classListIds.length <= 0) {
return return
} }
// //
const response = await homeworklist({ const response = await listByDeadDate({
classidarray: classListIds.value.join(','), classidarray: classTaskStore.classListIds.join(','),
//entpcourseid: '', // id
edustage: userStore.edustage,// edustage: userStore.edustage,//
edusubject: userStore.edusubject,// edusubject: userStore.edusubject,//
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,//
orderby: 'uniquekey DESC', orderby: 'uniquekey DESC',
pageSize: 100 pageSize: 100
}) })
@ -272,123 +408,18 @@ const getStudentVisible = async () => {
return 1 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('==================')
// /
// resultcount0
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])
}
}
// workdatacount0
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-12by 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( watch(
() => [dataList, toolStore.isToolWin], () => [dataList, toolStore.isToolWin],
() => { () => {
console.log('====', toolStore) console.log('====', toolStore)
setTimeout(() => {
getData() //
}, 300)
} }
) )
watch(tabActive, (newVal,oldVal)=>{
console.log('newVal',newVal);
getData() //
})
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

View File

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

View File

@ -1,12 +1,12 @@
<template> <template>
<el-dialog <el-dialog
v-model="dialogVisible" v-model="dialogVisible"
title="注册账号" :title="type==1?'注册账号':'找回密码'"
:fullscreen="true" :fullscreen="true"
center center
:before-close="handleClose" :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="1.基本信息" @click="activeIndex=1" />
<el-step title="2.在校信息" /> <el-step title="2.在校信息" />
</el-steps> </el-steps>
@ -18,10 +18,10 @@
status-icon status-icon
ref="ruleFormRef" 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-input v-model="ruleForm.name" />
</el-form-item> </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-input v-model="ruleForm.idNumber" />
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1"> <el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1">
@ -60,14 +60,14 @@
<el-form-item label="学科" prop="discipline" v-if="activeIndex==2"> <el-form-item label="学科" prop="discipline" v-if="activeIndex==2">
<div v-for="item in schoolSubject" style="display: flex;"> <div v-for="item in schoolSubject" style="display: flex;">
<span style="width:50px">{{ item.name }}</span> <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 style="margin-right:10px" v-for="el in item.children" :key="el.id" :label="el.itemtitle" :value="el" />
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="activeIndex==1"> <el-form-item v-if="activeIndex==1">
<div class="centerDiv"> <div class="centerDiv">
<el-button type="primary" @click="nextStep(ruleFormRef)">下一步</el-button> <el-button type="primary" @click="nextStep(ruleFormRef)">{{ ['下一步','重置密码'][type-1]||'未知异常' }}</el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="activeIndex==2"> <el-form-item v-if="activeIndex==2">
@ -109,7 +109,7 @@
<script setup> <script setup>
import { ref, defineExpose, reactive ,onMounted} from 'vue' 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 { ElMessage } from 'element-plus'
import {setToken, removeToken } from '@/utils/auth' import {setToken, removeToken } from '@/utils/auth'
import { regionData, codeToText } from 'element-china-area-data' import { regionData, codeToText } from 'element-china-area-data'
@ -225,8 +225,12 @@ const rules = reactive({
},] },]
}) })
const dialogVisible = ref(false) 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 dialogVisible.value=true
} }
// //
@ -241,33 +245,51 @@ const nextStep = (formEl) => {
if (!formEl) return if (!formEl) return
formEl.validate((valid) => { formEl.validate((valid) => {
if (valid) { if (valid) {
activeIndex.value=2 // type 1 2
// if (type.value == 2) {
deptTree({phone:ruleForm.phoneNumber}).then(res=>{ let params = {
optionsSchool.value=res.data mobile:ruleForm.phoneNumber,
optionsSchool.value.forEach(item=>{ code:ruleForm.Code,
item.value=item.id password:ruleForm.password,
if(!item.children){ confirmPassword:ruleForm.confirmPassword,
item.disabled=true }
} retrievePwd(params).then(res=>{
if(item.children){ if(res.code==200){
item.children.forEach(child=>{ ElMessage.success(res.msg)
child.value=child.id handleClose()
if(!child.children){ }else{
child.disabled=true ElMessage.error(res.msg)
}
if(child.children){
child.children.forEach(grandson=>{
grandson.value=grandson.id
})
}
})
} }
}) })
getSubject() } else {
console.log(res) activeIndex.value=2
}) //
console.log('submit!') 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 { } else {
console.log('error submit!') console.log('error submit!')
} }
@ -296,7 +318,7 @@ const submitForm = async (formEl) => {
schoolId:ruleForm.school[2], schoolId:ruleForm.school[2],
classIds:ruleForm.class.join(','), classIds:ruleForm.class.join(','),
subjectIds:ruleForm.discipline.map(o=>o.id).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(','), areaIds:ruleForm.address.join(','),
area:araname area:araname
} }
@ -333,7 +355,7 @@ const sendcaptchaImg=()=>{
if(ruleForm.phoneNumber){ if(ruleForm.phoneNumber){
const pattern = /^1[3-9]\d{9}$/; const pattern = /^1[3-9]\d{9}$/;
if( pattern.test(ruleForm.phoneNumber) ){ if( pattern.test(ruleForm.phoneNumber) ){
captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{ captchaImg({mobile:ruleForm.phoneNumber, type: type.value}).then(res=>{
ruleForm.imgCode=null ruleForm.imgCode=null
isImg.value=true isImg.value=true
isPeopleImg.value='data:image/jpg;base64,'+res.img isPeopleImg.value='data:image/jpg;base64,'+res.img
@ -354,7 +376,7 @@ const sendcaptchaImg=()=>{
} }
// //
const refreshImg=()=>{ 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 isPeopleImg.value='data:image/jpg;base64,'+res.img
if(res.token){ if(res.token){
setToken(res.token) setToken(res.token)
@ -365,7 +387,14 @@ const refreshImg=()=>{
// //
const sbmitImg=()=>{ const sbmitImg=()=>{
if(ruleForm.imgCode){ 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){ if(res.code==200){
ruleForm.Code=res.data ruleForm.Code=res.data
isImg.value=false isImg.value=false

View File

@ -32,9 +32,9 @@
> >
</el-form-item> </el-form-item>
<div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;"> <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> </div>
</el-form> </el-form>
</div> </div>
@ -98,8 +98,8 @@ ipcRenderer.on('update-app-progress', (e, prop) => {
showDownLoading.value = prop !== 100 showDownLoading.value = prop !== 100
}) })
// //
const RegisterModel = () =>{ const RegisterModel = type =>{
RegModel.value.OpenModel() RegModel.value.OpenModel(type)
} }
// //
const submitForm = async (formEl) => { const submitForm = async (formEl) => {

View File

@ -40,7 +40,7 @@
</template> </template>
<script setup> <script setup>
import { ref, getCurrentInstance } from 'vue' import { ref, getCurrentInstance,onMounted } from 'vue'
import {updateUserInfo } from '@/api/system/user' import {updateUserInfo } from '@/api/system/user'
import { listEvaluation } from '@/api/subject/index' import { listEvaluation } from '@/api/subject/index'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
@ -90,9 +90,12 @@ const rules = ref({
const subjectList = ref([]) const subjectList = ref([])
// //
listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { const getSubject = () => {
subjectList.value = res.rows 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(() => { setTimeout(() => {
if (props.user.edudegree != '') { if (props.user.edudegree != '') {
@ -150,4 +153,7 @@ const semeterChange = (item) => {
props.user.edusubject = '' props.user.edusubject = ''
} }
} }
onMounted(() => {
getSubject()
})
</script> </script>

View File

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