zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

路由冲突

This commit is contained in:
lyc 2024-11-11 17:28:49 +08:00
parent c3ef8d881e 3f81e36dd9
commit 0ec8ec7480
19 changed files with 1433 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron-builder-prod.yml
View File

@ -43,7 +43,7 @@ appImage:
npmRebuild: false
publish:
provider: generic
url: https://prev.ysaix.com:7868/src/assets/smarttalk/
url: https://prev.ysaix.com:7868/src/assets/smarttalkws/
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
# 额外依赖打包到输出目录

2
electron-builder.yml
View File

@ -42,7 +42,7 @@ appImage:
npmRebuild: false
publish:
provider: generic
url: https://file.ysaix.com:7868/src/assets/smarttalk/
url: https://file.ysaix.com:7868/src/assets/smarttalkws/
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
# 额外依赖打包到输出目录

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "aix-win",
"version": "2.5.0",
"version": "2.5.1",
"description": "",
"main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院",

15
src/renderer/src/api/apiService.js
View File

@ -36,3 +36,18 @@ export class toLink {
// 删除链接-缓存
static delLink = key => ApiService.publicHttp(`/smarttalk/toLink/${key}`, null, 'delete')
}
// v2.5加入 认证学校
export class school {
// 学校加入 认证
static schoolJoin = data => ApiService.publicHttp(`/smarttalk/register/schoolJoin`,data, 'post')
// 获取学校列表
static deptTree = data => ApiService.publicHttp(`/smarttalk/register/deptTree`)
// 获取当前用户审核详情
static registerinfo = data => ApiService.publicHttp(`/smarttalk/register/info`)
// 获取学校管理列表
static auditlist = data => ApiService.publicHttp(`/smarttalk/audit/list`,data)
// 获取学校管理审核
static checkSchool = data => ApiService.publicHttp(`/smarttalk/audit/checkSchool`,data,'post')
}

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

@ -105,6 +105,14 @@ export function deptTree(data) {
params:data
})
}
//获取学校
export function getdeptTree(data) {
return request({
url: '/system/user/deptTree',
method: 'get',
params:data
})
}
// 查询部门详细
export function getDept(query) {
return request({
@ -129,4 +137,21 @@ export function listEvaluation(query) {
method: 'get',
params: query
})
}
}
// 发送验证码
export function sendcode(data) {
return request({
url: '/code/send',
method: 'post',
data
})
}
// 教师注册
export function instructorregister(data) {
return request({
url: '/instructor/register',
method: 'post',
data
})
}

BIN
src/renderer/src/assets/images/shenhe.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

53
src/renderer/src/layout/components/Aside.vue
View File

@ -10,14 +10,16 @@
</div>
</template>
<div class="head-aside">
<ul>
<li class="auth-li">
<ul >
<li :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')" >
<i class="iconfont icon-renzheng-"></i>
<span class="mlr-5">学校认证</span>
<span class="gray">未认证</span>
<span class="mlr-5" v-if="computedregistertype!=4">学校认证</span>
<span class="mlr-5" v-else>{{ userStore.DeptInfo.register.schoolName }}</span>
<span class="gray" v-if="computedregistertype!=4">未认证</span>
</li>
<li>加入学校</li>
<li v-if="computedregistertype!=4" :class="computedregistertype==1 || computedregistertype==2 ? '':'pointer-events'" @click="onUserTo('/joinSchool')">加入学校</li>
<li @click="onUserTo('/profile')">个人中心</li>
<li @click="onUserTo('/schoolManagement')">学校管理</li>
<li @click="onUserTo('/class')">班级中心</li>
<li @click="logout">退出登录</li>
</ul>
@ -51,13 +53,14 @@
</template>
<script setup>
import { ref, watch } from 'vue'
import { ref, watch , reactive, onMounted,computed} from 'vue'
import { useRouter } from 'vue-router'
import { ElMessageBox, ElMessage } from 'element-plus'
import useUserStore from '@/store/modules/user'
import { sessionStore } from '@/utils/store'
import pkc from "../../../../../package.json"
const { ipcRenderer } = window.electron || {}
const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
const userStore = useUserStore()
@ -66,6 +69,7 @@ const currentRoute = ref('')
const activeId = ref('/home')
const version = ref(pkc.version)
const popoverRef = ref('')
@ -106,7 +110,31 @@ const sideBottomMenu = [
},
]
const computedregistertype = computed(() => {
const type =userStore.DeptInfo?.register?.type ??0
console.log(userStore.DeptInfo?.register)
if(type==0 || userStore.DeptInfo?.register?.auditStatus!=0 && userStore.DeptInfo?.register?.auditStatus!=1){
return 1
}
// 加入成功
if(type==3 && userStore.DeptInfo.register.auditStatus==1){
console.log(1111)
return 4
}
if(type==4 && userStore.DeptInfo.register.auditStatus==1){
return 4
}
// 加入学校 待审核
if(type==3 && userStore.DeptInfo.register.auditStatus==0){
return 2
}
// 创建学校 待审核
if(type==4 && userStore.DeptInfo.register.auditStatus==0){
return 3
}
})
const clickMenu = ({ id, disabled, path }) => {
if (disabled) return
activeId.value = id
@ -129,6 +157,7 @@ watch(
)
const logout = () => {
const hasClass = sessionStore.has('activeClass.id')
const hasTool = sessionStore.get('isToolWin')
@ -153,10 +182,13 @@ const logout = () => {
})
}).catch(()=>{})
}
onMounted(() => {
userStore.getDeptInfo()
// getregisterinfo()
})
</script>
<style>
<style lang="scss">
.el-popover.popoverStyle{
min-width:120px;
padding: 0;
@ -275,4 +307,7 @@ const logout = () => {
font-size: 12px;
margin-top: 5px;
}
.pointer-events{
pointer-events: none;
}
</style>

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

@ -151,6 +151,24 @@ const dynamicRoutes = [
name: 'class',
meta: { title: '班级中心' }
},
{
path: '/joinSchool',
component: () => import('@/views/joinSchool/index.vue'),
name: 'joinSchool',
meta: {title: '加入学校'}
},
{
path: '/schoolCertification',
component: () => import('@/views/schoolCertification/index.vue'),
name: 'schoolCertification',
meta: {title: '学校认证'}
},
{
path: '/schoolManagement',
component: () => import('@/views/schoolManagement/index.vue'),
name: 'schoolManagement',
meta: {title: '学校管理'}
},
]
},

12
src/renderer/src/store/modules/user.js
View File

@ -1,5 +1,6 @@
import { defineStore } from 'pinia'
import { login, logout, getInfo } from '@/api/login'
import { login, logout, getInfo, getdeptTree } from '@/api/login'
import {school} from '@/api/apiService'
import { getToken, setToken, removeToken } from '@/utils/auth'
import defAva from '@/assets/images/user.png'
@ -11,7 +12,8 @@ const useUserStore = defineStore('user', {
avatar: '',
roles: [],
permissions: [],
user: {}
user: {},
DeptInfo:{}
}),
actions: {
// 登录
@ -80,6 +82,12 @@ const useUserStore = defineStore('user', {
})
})
},
// 注册部门信息
getDeptInfo(){
school.registerinfo().then(res=>{
this.DeptInfo=res.data || {}
})
},
// 退出系统
logOut() {
return new Promise((resolve, reject) => {

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

@ -167,3 +167,64 @@ export function getTomorrow() {
return tomorrow;
}
/**
* 当前日期的 前几天
* @param {*} index 天数
* @param {*} format true 返回中国标准时间：Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式； false 返回标准时间格式 YYYY-MM-DD
* @returns
*/
export function getTheOtherDay(index, format=true) {
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()- index < 10 ? '0' + (date.getDate()- index) : date.getDate()- index
// 前 index 天的时间
if(format){
let tomorrow = `${year}-${month}-${day}`;
return new Date(tomorrow);
}else{
let tomorrow = `${year}-${month}-${day}`;
return tomorrow;
}
}
/**
* 当前日期的 后几天
* @param {*} index 天数
* @param {*} format true 返回中国标准时间：Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式； false 返回标准时间格式 YYYY-MM-DD
* @returns
*/
export function getTheOtheNextDay(index, format=true) {
const date = new Date();
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate()+ index < 10 ? '0' + (date.getDate()+ index) : date.getDate()+ index
// 前 index 天的时间
if(format){
const tomorrow = `${year}-${month}-${day}`;
return new Date(tomorrow);
}else{
const tomorrow = `${year}-${month}-${day}`;
return tomorrow;
}
}
/**
* Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 转为日期格式: YYYY-MM-DD
*
* @param {*} format
* @returns
*/
export const getDateFormatDate = (newDate)=> {
const now = newDate; // new Date();
const year = now.getFullYear();
const month = (now.getMonth() + 1).toString().padStart(2, '0');
const day = now.getDate().toString().padStart(2, '0');
return `${year}-${month}-${day}`;
}

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

@ -4,20 +4,16 @@
<div class="class-reserv-tabs">
<el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
</div>
<div v-if="tabActive === '已结束'">
<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>
<el-date-picker
v-model="startEndDate"
type="daterange"
start-placeholder="Start Date"
end-placeholder="End Date"
:default-time="defaultTime"
@change="changeStartEndDate"
/>
</div>
</div>
</div>
@ -27,7 +23,7 @@
<div v-if="classWorkList.length > 0">
<task-item
v-for="(item, index) in activeDataList"
v-show="tabActive === '进行中'"
v-show="tabActive === '待批改'"
:key="index"
:item="item"
:tabactive="tabActive"
@ -36,7 +32,7 @@
></task-item>
<task-item
v-for="(item, index) in doneDataList"
v-show="tabActive === '已结束'"
v-show="tabActive === '已批改'"
:key="index"
:item="item"
:tabactive="tabActive"
@ -63,9 +59,8 @@ import { listByDeadDate, listClassworkdata } from '@/api/classTask'
import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
// import ItemDialog from '@/views/classTask/container/item-dialog.vue'
import { useToolState } from '@/store/modules/tool'
import { getCurrentTime } from '@/utils/date'
import { getCurrentTime, getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date'
import useUserStore from '@/store/modules/user'
import useClassTaskStore from "@/store/modules/classTask";
import {createWindow} from '@/utils/tool'
import {sessionStore} from '@/utils/store'
import {debounce } from '@/utils/comm'
@ -73,13 +68,21 @@ import {debounce } from '@/utils/comm'
const toolState = useToolState();
const classTaskStore = useClassTaskStore()
const userStore = useUserStore().user
// const itemDialogRef = ref(null)
const tabOptions = ref(['进行中', '已结束'])
const tabActive = ref('进行中')
const tabOptions = ref(['待批改', '已批改'])
const tabActive = ref('待批改')
const dataList = ref([])
const EndDate = ref(getCurrentTime('YYYY-MM-DD'))
// 默认起止时间：当前日期前2天后3天；默认查询一周的数据
const startEndDate = ref([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
const defaultTime = ref<[Date, Date]>([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
// 所有班级作业列表
const classWorkList = ref([])
@ -91,23 +94,24 @@ const loading = ref(false)
const activeDataList = computed(() => {
return classWorkList.value
})
const doneDataList = computed(() => {
return classWorkList.value
})
const deleteReserv = (item) => {
console.log('删除待开发', item)
// dataList.value = dataList.value.filter((is) => {
// return is.id !== item.id
// })
}
const doneDataList = computed(() => {
return classWorkList.value
})
// 当日之后的日期禁用
const disabledDate = (time) => {
return time.getTime() > Date.now()
}
// 截止日期改变
const changeEndDate = (val) => {
console.log('截止日期改变', val)
const changeStartEndDate = (val) => {
console.log('起止日期改变', val)
getData() // 加载数据
}
@ -115,245 +119,202 @@ const changeEndDate = (val) => {
const getData = async () => {
classWorkList.value = []
loading.value = true
// 1、班级列表
// getClassList()
// 2、班级作业
// 1、班级作业
await getClassWorkList()
// 3、班级学生作业 包含多个班级
// 2、班级学生作业 包含多个班级
getStudentClassWorkData()
loading.value = false
}
/**
* 1、获取班级列表数据
* TODO 这里暂时取班级id的list，后续需要在修改
*/
const getClassList = () => {
if(classTaskStore.classListIds.length==0){
// 获取 班级列表ids 这里暂时取班级id的list，后续需要在修改
classTaskStore.listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' })
}
}
/**
* 2、获取班级作业
* 1、获取班级作业
*/
const getClassWorkList = async () => {
//if(classTaskStore.classListIds.length>0){
{
// 班级作业数据，包含多个班级 homeworklist
const response = await listByDeadDate({
edituserid: userStore.userId, // 老师的id
edustage: userStore.edustage, // 学段
edusubject: userStore.edusubject,//学科
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 弃用
deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
status: '1', // 作业状态：1-已发布
orderby: 'deaddate DESC',
pageSize: 100,
})
// 班级作业数据，包含多个班级 homeworklist
const response = await listByDeadDate({
edituserid: userStore.userId, // 老师的id
edustage: userStore.edustage, // 学段
edusubject: userStore.edusubject,//学科
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改：明天，已批改：选择的日期
status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
orderby: 'deaddate DESC',
pageSize: 100,
})
/**
* 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/
let list = [];
if(tabActive.value === '进行中'){
// 进行中 当前日期时间 小于 截止 日期时间
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中
}else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束
let list = response.rows || [];
for (var i = 0; i < list.length; i++) {
// 初始化部分新增字段值
list[i].workdatalist = [] // 当前任务中有多少个学生的数据集合
list[i].workdatalistVisible = false
list[i].feedtimelength = 0 // 已交的学生人中，汇总计算用时
list[i].rightAnswerCount = 0
list[i].scoingRate = 0 + '%' // 得分率
list[i].averagetime = 0 // 平均用时
// ----------------------------------------------
// 处理任务类型的UI
if (list[i].worktype == '学习目标定位') {
list[i].workclass = 'success'
list[i].workcodesList = JSON.parse(list[i].workcodes)
} else if (list[i].worktype == '教材研读') {
list[i].workclass = 'primary'
} else if (list[i].worktype == '框架梳理') {
list[i].workclass = 'warning'
} else if (list[i].worktype == '学科定位') {
list[i].workclass = 'info'
} else if (list[i].worktype == '习题训练') {
list[i].workclass = 'danger'
} else {
list[i].workclass = ''
}
for (var i = 0; i < list.length; i++) {
// 初始化部分新增字段值
list[i].workdatalist = []
list[i].workdatacount = 0 // 人数
list[i].workdatalistVisible = false
list[i].workdatafeedbackcount = 0 // 已交人数
list[i].feedtimelength = 0
list[i].rightAnswerCount = 0
list[i].scoingRate = 0 + '%' // 得分率
list[i].averagetime = 0 // 平均用时
// ----------------------------------------------
// 处理任务类型的UI
if (list[i].worktype == '学习目标定位') {
list[i].workclass = 'success'
list[i].workcodesList = JSON.parse(list[i].workcodes)
} else if (list[i].worktype == '教材研读') {
list[i].workclass = 'primary'
} else if (list[i].worktype == '框架梳理') {
list[i].workclass = 'warning'
} else if (list[i].worktype == '学科定位') {
list[i].workclass = 'info'
} else if (list[i].worktype == '习题训练') {
list[i].workclass = 'danger'
} else {
list[i].workclass = ''
}
// 如果是习题训练任务，则检查一共有多少道
if (list[i].entpcourseworklist != '') {
list[i].entpcourseworklistarray = JSON.parse(
'[' + list[i].entpcourseworklist + ']'
)
} else {
list[i].entpcourseworklistarray = []
}
// 根据 classworkdatastudentids 初始化判断分配的人数
if (
list[i].classworkdatastudentids != '' &&
list[i].classworkdatastudentids != null &&
list[i].classworkdatastudentids != 'null'
) {
const stuList = JSON.parse('[' + list[i].classworkdatastudentids + ']')
list[i].workdatacount = stuList.length
}
// 如果是习题训练任务，则检查一共有多少道
if (list[i].entpcourseworklist != '') {
list[i].entpcourseworklistarray = JSON.parse(
'[' + list[i].entpcourseworklist + ']'
)
} else {
list[i].entpcourseworklistarray = []
}
// 显示分配人数(workdatacount)>0 的
if (list && list.length > 0) {
classWorkList.value = list && list.filter((item) => item.workdatacount > 0)
//TODO： 这里没分页，貌似这个 total 不重要，后续看
total.value = 0
}else{
classWorkList.value = []
total.value = 0
}
loading.value = false
}
// 显示分配人数(workdataresultsum)>0 的
if (list && list.length > 0) {
classWorkList.value = list && list.filter((item) => item.workdataresultsum > 0)
//TODO： 这里没分页，貌似这个 total 不重要，后续看
total.value = 0
}else{
classWorkList.value = []
total.value = 0
}
loading.value = false
}
/**
* 3、获取多个班级学生作业数据
* 2、获取多个班级学生作业数据
* 查询已交的列表
* @param workList ：需要更新的作业list
* @param Refresh ：true 不用刷新，false 需要刷新
*/
const getStudentClassWorkData = async() => {
// const { chapterId } = await useGetHomework(props.bookobj.node)
// this.entpcourseid = chapterId
//if(classTaskStore.classListIds.length>0){
// listClassworkdataByDeadDate({
// edituserid: userStore.userId, // 老师的id
// classids: classTaskStore.classListIds.join(','),
// edusubject: userStore.edusubject,//学科
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
// deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
// //status: '1', // 作业状态：1-已发布
// orderby: "deaddate DESC",//
// pageSize: 1000,
// })
const getStudentClassWorkData = async(workList = [], Refresh = true) => {
// 获取 已交的 列表数据(workdataresultcount 已交的学生数)
let SubmitClWorkList = [];
if(Refresh){
SubmitClWorkList = classWorkList.value.filter((item) => item.workdataresultcount > 0) ;
}else{
SubmitClWorkList = workList;
}
// listClassworkdataNew({
// classworkids: ids, // 作业id
// edituserid: userStore.userId, // 老师的id
// edusubject: userStore.edusubject,//学科
// evalStatus: 1,
// pageSize: 1000,
// })
console.log('有提交的作业', SubmitClWorkList)
const ids = SubmitClWorkList&&SubmitClWorkList.map((item) => item.id).join(',');
if (ids == '') {
return;
}
listClassworkdata({
classworkids: ids,
pageSize: 1000,
}).then((res) => {
for (var t = 0; t < classWorkList.value.length; t++) {
for (var i = 0; i < res.rows.length; i++) {
// finishtimelength != '0' 已交
if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].finishtimelength != '0') {
console.log('==================')
// 有几个学生完成/正在完成学习任务
// 至少resultcount不是0
//classWorkList.value[t].workdataresultcount++
{
const ids = classWorkList.value.map((item) => item.id).join(',');
if (ids == '') {
return;
}
listClassworkdata({
classworkids: ids,
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].finishtimelength != '0') {
console.log('==================')
// 有几个学生完成/正在完成学习任务
// 至少resultcount不是0
classWorkList.value[t].workdatafeedbackcount++
// 已交的学生人中，汇总计算用时
classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
// 在参与学习任务的人中，汇总计算用时
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 + ']')
}
// 计算得分率
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)
}
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++
}
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
// 当前这个学习任务，共推送给了几个学生，workdataresultsum
if (res.rows[i].classworkid == classWorkList.value[t].id) {
classWorkList.value[t].workdatalist.push(res.rows[i])
}
// 以下四个参数，都要计算
// 2024-04-12，酉阳，by jackyshen
// 计算参与学习任务的平均用时
if (classWorkList.value[t].workdatafeedbackcount > 0) {
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).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%'
}
// 设定典型作答，需要获取每个题目的类型，找出主观题
// 暂缓
}
})
}
// 计算完成进度: workdataresultcount 学生提交了的个数; workdataresultsum 人数要大于0;
if (classWorkList.value[t].workdataresultcount > 0 && classWorkList.value[t].workdataresultsum > 0 ) {
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
)
} else {
classWorkList.value[t].finishpercent = 0
}
/** 计算 已批阅进度 */
// workdataresultsum 人数 teacherrationgcount 已批阅人数
// 已批阅百分比： (人数-已批阅数) / 人数 * 100
if (classWorkList.value[t].workdataresultsum > 0) {
classWorkList.value[t].teacherCorrectionProgress = parseInt(
((classWorkList.value[t].teacherrationgcount) / classWorkList.value[t].workdataresultsum) * 100
)
} else {
classWorkList.value[t].teacherCorrectionProgress = 0
}
// 以下四个参数，都要计算
// 2024-04-12，酉阳，by jackyshen
// 计算参与学习任务的平均用时：学生总用时/ 提交学生数
if (classWorkList.value[t].workdataresultcount > 0) {
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdataresultcount / 60).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].workdataresultsum)) *
100
classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
} else {
classWorkList.value[t].scoingRate = '0%'
}
}
})
}
@ -379,6 +340,7 @@ const getStudentClassWorkDataPolling = () => {
getStudentVisible()
// 在轮询
pollingST.value = setInterval(() => {
console.log('轮询查询学生作业进度')
getStudentVisible()
}, 1000 * 10)
}
@ -413,75 +375,56 @@ onUnmounted(() => {
// [作业反馈] - 实际查询逻辑
const getStudentVisible = async () => {
if (classTaskStore.classListIds.length <= 0) {
return
if(!classWorkList.value.length>0){
return;
}
// 班级作业数据，多个班级
const response = await listByDeadDate({
classidarray: classTaskStore.classListIds.join(','),
edituserid: userStore.userId, // 老师的id
edustage: userStore.edustage,// 学段
edustage: userStore.edustage, // 学段
edusubject: userStore.edusubject,//学科
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
status: '1', // 作业状态：1-已发布
// orderby: 'concat(deaddate,uniquekey) DESC',
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改：明天，已批改：选择的日期
status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
orderby: 'deaddate DESC',
pageSize: 100
pageSize: 100,
})
/**
* 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/
let list = [];
if(tabActive.value === '进行中'){
// 进行中 当前日期时间 小于 截止 日期时间
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中
}else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束
}
let list = response.rows || [];
const curWorkList = list
/**
* warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
* 故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
*/
for (let t = 0; t < classWorkList.value.length; t++) {
// 当前时间超过[作业任务]截止时间的跳过
// if( getDateTime > classWorkList.value[t].deaddate ){
// continue;
// }
// 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
// workdataresultcount 完成人数 workdatacount人数要大于0
if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
// 桌面端貌似不需要进度条了？
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
)
// 计算参与学习任务的平均用时
if (classWorkList.value[t].workdatafeedbackcount > 0) {
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).toFixed(0)
} else {
classWorkList.value[t].averagetime = 0
let newList = [];
for(let i = 0; i < classWorkList.value.length; i++){
// 父list的id与子list的id相等，在进行对比；若是不等？ 有可能是老师批阅完了这个list数据，变成了已批改状态中，则父list数据需要删除
const isList = list.filter((item) => item.id === classWorkList.value[i].id);
if(isList.length === 0){
// 父list的id与子list的id不相等，则删除父list数据
classWorkList.value.splice(i,1);
}
for(let j = 0; j < list.length; j++){
// workdataresultcount 学生提交了的个数;
if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].workdataresultcount != list[j].workdataresultcount){
// 学生提交数 ！= 学生提交数？
newList.push(list[j]);
}
// 更新批阅数
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
} else {
// 学生未完成，但是老师批改了？
if(curWork && curWork.workdataresultcount == 0){
// 更新批改数
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
// teacherrationgcount 已批阅人数
if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].teacherrationgcount != list[j].teacherrationgcount){
// 更新批阅进度条
if (classWorkList.value[i].workdataresultsum > 0) {
// 更新批阅数、 进度条
classWorkList.value[i].teacherrationgcount = list[j].teacherrationgcount;
classWorkList.value[i].teacherCorrectionProgress = parseInt(
((list[j].teacherrationgcount) / list[j].workdataresultsum) * 100
)
} else {
classWorkList.value[i].teacherCorrectionProgress = 0
}
}
classWorkList.value[t].finishpercent = 0
}
}
return 1
if(newList.length>0){
// 更新学生提交后的数据？ 作业进度条、平均用时、得分率
const list = newList&&newList.filter((item) => item.workdataresultcount > 0) ;
getStudentClassWorkData(list,false);
}
}
@ -489,16 +432,27 @@ const getStudentVisible = async () => {
watch(
() => [dataList, toolState.isTaskWin],
() => {
console.log('=监听到批改窗口打开了===', toolState.isTaskWin)
console.log('监听--批改窗口是否打开===', toolState.isTaskWin)
if(!toolState.isTaskWin){
closeDialog();// 开启轮询
if(tabActive.value === '待批改'){
closeDialog();// 开启轮询
}
}
}
)
watch(tabActive, (newVal,oldVal)=>{
console.log('newVal',newVal);
getData() // 加载数据
if(newVal === '待批改'){
// 轮询查询
console.log('监听---开启轮询')
closeDialog();
}else{
// 关闭轮询
console.log('监听---关闭轮询')
clearInterval(pollingST.value);
}
})
</script>

60
src/renderer/src/views/classTask/container/classTask/task-item.vue
View File

@ -14,31 +14,40 @@
&nbsp;|&nbsp; 截止时间：{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }}
</div>
</div>
<div v-if=" tabactive == '待批改' " class="class-reserv-item-progress">
<el-progress :text-inside="true" :stroke-width="26" :percentage="item.finishpercent" :color="'#000fff'" style="cursor: pointer"></el-progress>
<span>
已交(
<span>
<span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span>
<span v-if="item.workdataresultcount==0">{{ item.workdataresultcount }}</span>
/{{ item.workdataresultsum }}
</span>
)
</span>
</div>
<div v-if=" tabactive == '待批改' " class="class-reserv-item-progress">
<el-progress :text-inside="true" :stroke-width="26" :percentage="item.teacherCorrectionProgress" :color="'#ff7f00'" style="cursor: pointer"></el-progress>
<span>
已批阅(<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount}}</span>)
</span>
</div>
<!-- TODO 练习次数、引用次数 这里随便的假数据-->
<div v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
<span style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultsum }}</span>
<span>练习次数</span>
</div>
<div v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdataresultsum - item.teacherrationgcount:item.workdataresultsum }}</span>
<span>引用次数</span>
</div>
<div class="class-reserv-item-tool">
<span>
<span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span>
<span v-if="item.workdataresultcount==0">{{ item.workdataresultcount }}</span>
/{{ item.workdatacount }}</span>
<span>已交</span>
</div>
<div class="class-reserv-item-tool">
<!-- 总人数-已批阅人数 -->
<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdatacount - item.teacherrationgcount:item.workdatacount }}</span>
<span>待批阅</span>
</div>
<div class="class-reserv-item-tool">
<span>
<!-- {{ item.averagetime?item.averagetime:0 }} -->
<!-- <span v-if=" item.averagetime<60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
</span>
<span v-if=" item.averagetime==60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">1</span>小时
</span>
<span v-if=" item.averagetime>60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime / 60)}}</span>小时
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime % 60)}}</span>分钟
</span> -->
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
</span>
<span>平均用时</span>
@ -97,6 +106,11 @@ const props = defineProps({
}
}
}
.class-reserv-item-progress {
width: 200px;
padding: 0 10px;
font-size: 14px;
}
.class-reserv-item-tool {
margin-left: 10px;
display: flex;

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

@ -89,8 +89,8 @@
</el-col>
</el-row>
<!-- 习题表格 -->
<div class="middle" >
<el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
<div class="infinite-list-wrapper" >
<!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
<el-table-column type="index" width="60" />
<el-table-column align="left" >
<template #header>
@ -114,7 +114,48 @@
<el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<ul
v-infinite-scroll="pageLoad"
class="infinite-list"
infinite-scroll-immediate="false"
infinite-scroll-distance='1'
infinite-scroll-delay="1000"
:infinite-scroll-disabled="pageDisabled"
>
<li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
<div align="left" style="width: 100%;" >
<!-- <template #header>
<div style="display: flex">
<div style="align-items: center;">题目内容</div>
</div>
</template> -->
<div @click="showExamAnalyseDrawer(item)">
<div>
<span style="width: 20px;">{{ index +1 }}. </span>
<span style="overflow: hidden; text-overflow: ellipsis" v-html="item.titleFormat"></span>
</div>
<div style="overflow: hidden; text-overflow: ellipsis; font-size: 0.9em; margin-top: 6px;" v-html="item.workdescFormat"></div>
<el-col :span="24" style="display: flex">
<div style="font-size: 1em; color: silver; padding-top: 5px">{{ item.entpname }} {{ item.editusername }}</div>
<div style="margin-left: 30px; font-size: 1em; color: silver; padding-top: 5px">{{ item.worktag }}</div>
</el-col>
</div>
</div>
<div align="right" style="width: 72px;">
<el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', item.id)">添加</el-button>
</div>
</li>
</ul>
<p class="infinite-list-loading" v-if="pageParams.loading">加载中...</p>
<p class="infinite-list-noMove" v-if="pageNoMore">无更多试题...</p>
<div v-if="workResource.entpCourseWorkList.length == 0 && !pageParams.loading">
<el-empty
description="未找到相关试题"
style="width: 100%; height: 200px; margin-top: 20px;"
></el-empty>
</div>
</div>
<!-- 分页 这里不用-->
<!-- <div style="height: 55px;">
@ -231,14 +272,14 @@
</template>
<script setup>
import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance } from 'vue'
import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed } from 'vue'
import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash'
import { useRouter } from 'vue-router'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
import { addClassworkReturnId } from '@/api/teaching/classwork'
import { updateClasswork, listEvaluationclue,readFile, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask'
import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask'
import { listEvaluation } from '@/api/subject'
import { listEntpcoursefile } from '@/api/education/entpcoursefile'
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
@ -250,7 +291,9 @@ import FileUpload from "@/components/FileUpload/index.vue";
import whiteboard from '@/components/whiteboard/whiteboard.vue'
import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
import {throttle,debounce } from '@/utils/comm'
import { useToolState } from '@/store/modules/tool'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore().user
@ -364,6 +407,17 @@ const boardLoading = ref(false);
//常规作业----------
const fileLoading = ref(false); // 常规作业loading
// 下拉滚动参数
const BASE_LIMIT_COUT = 50; // 总加载额外试题数
const pageNoMore = computed( () => workResource.entpCourseWorkList.length >= pageParams.value.originCount+BASE_LIMIT_COUT );
const pageDisabled = computed(() => pageParams.value.loading || pageNoMore.value);
const pageParams = ref({
loading: false, // 是否正在加载中
originCount: 0, // 初始条目数量
isFirst: true, // 是否是第一次加载
})
/***
* 作业类型切换
*/
@ -381,9 +435,33 @@ const changeFormType = (val) => {
const handleQueryParamFromEntpCourseWork = (queryType) => {
// 确保更改了搜索参数后从第一页开始查询
// this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了
// 清空作业列表
initPageParams();
handleQueryFromEntpCourseWork(queryType);
};
let obj = {};
function Apis(key) {
obj[key] = [];
return function(task) {
return new Promise((resolve, reject) => {
obj[key].push(task);
Promise.all([...obj[key]]).then(res => {
const i = obj[key].findIndex(item => {
return item == task;
});
resolve(obj[key][i]);
//arr.splice(i, 1);
})
})
}
}
const client = new Apis('/paht');
/**
* @desc: 1、习题训练 - 新查询试题
* @return: {*}
@ -392,70 +470,86 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
* 1 - 按条件查询
* 2 - 按关键词查询
*/
const handleQueryFromEntpCourseWork= (queryType) => {
//queryForm.pageNum = this.paginationParams.pageNum;
//queryForm.pageSize = this.paginationParams.pageSize;
const t = function(name, time) {
return new Promise(resolve => {
const queryForm = {
// 分页参数
currentPage: paginationParams.pageNum,
pageSize: paginationParams.pageSize,
// 课程相关参数
eid: props.bookobj.levelSecondId,
sectionName: props.bookobj.coursetitle,
edusubject: userStore.edusubject,
edustage: userStore.edustage,
//
// 题类
worktype: entpCourseWorkQueryParams.worktype.label,
workTypeId: entpCourseWorkQueryParams.worktype.value,
// 题源
workgroup: entpCourseWorkQueryParams.workgroup,
// 年份
yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
// 知识点
thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
// 关键字
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
const queryForm = {
// 课程相关参数
eid: props.bookobj.levelSecondId,
sectionName: props.bookobj.coursetitle,
edusubject: userStore.edusubject,
edustage: userStore.edustage,
//
// 题类
worktype: entpCourseWorkQueryParams.worktype.label,
workTypeId: entpCourseWorkQueryParams.worktype.value,
// 题源
workgroup: entpCourseWorkQueryParams.workgroup,
// 年份
yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
// 知识点
thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
// 关键字
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
}
const entpcourseworkres = listEntpcourseworkNew(queryForm);
resolve(entpcourseworkres);
})
}
// 分页参数
// pageNum: paginationParams.pageNum,
// pageSize: paginationParams.pageSize,
const handleQueryFromEntpCourseWork= async (queryType) => {
pageParams.value.loading = true;
// 初中政治特殊处理( warn: 需确认是否修改 )
// if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
// // [初中+政治]需改为[初中+道德与法治]
// queryForm.edusubject = '道德与法治';
// }
listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
// if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
// // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】
// const allowedWorkTypes = ['单选题', '填空题', '多选题', '判断题', '复合题'];
// workResource.entpCourseWorkList = entpcourseworkres.rows.filter(item => {
// return !allowedWorkTypes.includes(item.worktype);
// });
// } else {
// workResource.entpCourseWorkList = entpcourseworkres.rows;
// }
if(entpcourseworkres.data&&entpcourseworkres.data.length>0){
workResource.entpCourseWorkList = entpcourseworkres.data;
workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
workResource.entpCourseWorkList.forEach(item=> {
if (item.worktype == '选择题') {
item.worktype = '单选题'
}
})
//格式化试题信息
processList(workResource.entpCourseWorkList);
}else{
client(t('任务1', 1500)).then(res => {
console.log("请求返回",res);
if(paginationParams.pageNum == 1){
workResource.entpCourseWorkList = [];
workResource.entpCourseWorkTotal = 0
workResource.entpCourseWorkTotal = 0;
// 初始化下拉滚动条参数
// pageParams.value.loading = false;
// pageParams.value.isFirst = true;
// pageParams.value.originCount = 0;
}
})
const data = res.data || [];
if(data && data.length>0){
// workResource.entpCourseWorkList = entpcourseworkres.data;
// workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
data.forEach(item=> {
if (item.worktype == '选择题') {
item.worktype = '单选题'
}
})
// 格式化试题信息
processList(data);
workResource.entpCourseWorkList.push(...data);
// 初次加载时更新当前试题数量
if (pageParams.value.isFirst) {
pageParams.value.isFirst = false;
pageParams.value.originCount = workResource.entpCourseWorkList.length;
}
}
pageParams.value.loading = false;
});
//const entpcourseworkres = await listEntpcourseworkNew(queryForm);
// const data = entpcourseworkres.data;
}
// 教学资源，从课标分析、教材分析里来
@ -876,25 +970,68 @@ const showExamAnalyseDrawer = (row) => {
}
const pageLoad = async() => {
console.log("加载中...")
paginationParams.pageNum ++ ,
//paginationParams.pageSize = 2,
await handleQueryFromEntpCourseWork(0);
}
const initPageParams = () => {
// 初始化作业习题列表
workResource.entpCourseWorkList = [];
workResource.entpCourseWorkTotal = 0
// 初始化下拉滚动条参数
pageParams.value.loading = false;
pageParams.value.isFirst = true;
pageParams.value.originCount = 0;
// 初始化分页参数
paginationParams.pageNum = 1;
paginationParams.pageSize = 10;
}
onMounted(async() => {
// 获取当前学科下的试题题型
const name = userStore.edustage + userStore.edusubject;
const jyCT = await JYApiListCT(proxy, name);
if (jyCT.length == 0) {
ElMessage.error('获取题型失败!');
return;
}
entpCourseWorkTypeList.value = jyCT;
// 获取当前学科下的试题年份
entpCourseWorkYearList.value = JYApiListOriginYear();
entpCourseWorkGroupList.value = await JYApiListSO(proxy, name);
onMounted(() => {
})
// 防抖
const debounceQueryData = debounce(() => {
console.log("防抖 加载数据中...")
// 初始化滚动加载参数
initPageParams();
// 习题资源
handleQueryFromEntpCourseWork(0);
// 框架梳理
getQueryFromEvaluationclue();
// 知识点
getEntpCourseWorkPointList();
}, 1000);
watch(() => props.propsformobj.uniquekey, (newVal) => {
console.log(props.propsformobj,'propsformobj')
if(props.propsformobj.uniquekey){
classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
}
})
watch(() => props.bookobj.levelSecondId, (newVal) => {
watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
console.log(props.bookobj,'课程选择')
// 习题资源
handleQueryFromEntpCourseWork(0);
// 框架梳理
getQueryFromEvaluationclue();
// 知识点
getEntpCourseWorkPointList();
debounceQueryData();
})
</script>
<style lang="scss" scoped>
@ -982,7 +1119,47 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
box-sizing: border-box;
background-color: rgb(231, 231, 231)
}
.infinite-list-wrapper{
height: 100%;
text-align: center;
overflow: auto;
.infinite-list {
padding: 0;
margin: 0;
list-style: none;
.infinite-list-item {
display: flex;
align-items: center;
//justify-content: center;
//height: 50px;
//background: var(--el-color-primary-light-9);
padding: 10px;
border-top: 1px solid #eee;
//color: var(--el-color-primary);
}
.infinite-list-item:hover {
background-color: #F3F5F8;
}
.infinite-list-item + .list-item {
margin-top: 10px;
}
}
.infinite-list-loading{
padding: 10px 0;
border-top: 1px solid #eee;
color: red;
}
.infinite-list-noMove{
padding: 10px 0;
border-top: 1px solid #eee;
color: #999;
}
}
}
</style>
<style src="@/assets/styles/JYStyle.css"></style>

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

@ -14,9 +14,10 @@
<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>
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
<!-- <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已批改' : '待批改' }}</el-tag> -->
<el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">待批改</el-tag>
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
</div>
<div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
</div>
@ -52,9 +53,10 @@ const getHomework = async () => {
const { edustage, edusubject } = user
try {
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
// 只展示进行中的
homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
// homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //大于今天的才算进行中 弃用
// 只展示待批改的
//homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
// homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //大于今天的才算待批改 弃用
homeworkList.value = rows || [];
homeworkList.value.forEach((item) => {
// 处理任务类型的UI
if (item.worktype == '学习目标定位') {
@ -102,7 +104,8 @@ const onClickItem = (item) => {
}
const tagType = (time) => {
return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
return 'warning';
// return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
}

195
src/renderer/src/views/joinSchool/index.vue Normal file
View File

@ -0,0 +1,195 @@
<template>
<div class="joinschool">
<div class="titletext"><span style="font-size:30px;margin-right:30px" class="iconfont icon-tianchongxing-"></span>加入学校</div>
<div v-if="userregister.value">
<div style="border-bottom:1px solid #eee;padding-bottom:10px;margin-bottom:10px" v-if="userregister.value.auditStatus==0">
<img style="margin: 0 auto;height:85px" src="@/assets/images/shenhe.png" alt="">
<p style="color:#F59A23;font-size:22px">申请审核中</p>
<p style="color:#000;font-size:16px;font-weight:600">申请信息已提交，请耐心等待审核通过即可完成申请。</p>
</div>
<div style="border:1px solid #000;margin-bottom:20px;background:#DFF0D8" v-if="userregister.value.auditStatus==1">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="success"></el-result>
<p style="font-size:30px;color:#67C23A">审核通过</p>
</div>
<p style="margin-bottom:10px;color:#439FFE; cursor: pointer" @click='chongxin'>重新认证</p>
</div>
<div style="border:1px solid #000;margin-bottom:20px;background:#F2DEDE" v-if="userregister.value.auditStatus==2">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="error"></el-result>
<p style="font-size:30px;color:#E10A07">申请驳回</p>
</div>
<p style="margin-bottom:10px;font-size:18px;font-weight:600">申请信息已驳回，请重新提交申请信息。</p>
</div>
</div>
<div class="box-item" >
<el-form ref="ruleFormRef" label-width="auto" :rules="rules" :model="ruleForm" size="large">
<!-- <el-form-item label="所属地区" prop="address">
<el-cascader
style="width:100%"
popper-class="aix-regist-address"
:options="regionData"
v-model="ruleForm.address"
/>
</el-form-item> -->
<el-form-item label="学校名称" prop="school" >
<el-cascader :options="optionsSchool" style="width:100%" v-model="ruleForm.school" :disabled="!isshwoBtn" />
</el-form-item>
<el-form-item label="申请人" >
{{ state.user.nickName }}
</el-form-item>
<el-form-item label="申请人电话" >
{{ state.user.phonenumber }}
</el-form-item>
<el-form-item >
<div style="width:100%;text-align: right;padding-right:100px">
<el-button style="width:150px" type="default" @click="closed">关闭</el-button>
<el-button style="width:150px" type="primary" @click="submitForm(ruleFormRef)" v-if="isshwoBtn">确定</el-button>
</div>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script setup >
import { ref, reactive, onMounted ,watch} from 'vue'
import { regionData, codeToText } from 'element-china-area-data'
import { getUserProfile } from '@/api/system/user'
import {getDept} from '@/api/login'
import {school} from '@/api/apiService'
import { ElMessage } from 'element-plus'
import useUserStore from '@/store/modules/user'
import { useRouter } from 'vue-router'
const router = useRouter()
const userStore = useUserStore()
const ruleFormRef = ref(null)
const isshwoBtn = ref(true)
const state = reactive({
user: {},
})
const ruleForm = reactive({
school:[],
// address:[]
})
const optionsSchool=ref([])
const rules = reactive({
address:[ {
required: true,
message: '请选择地址',
trigger: 'change',
},],
school:[{
required: true,
message: '请选择地址',
trigger: 'change',
},],
})
watch (() => userStore.DeptInfo, (newValue, oldValue) => {
getregisterinfo()
})
const userregister = reactive({
value:null
})
const chongxin=()=>{
isshwoBtn.value=true
}
async function getUser() {
getUserProfile().then((response) => {
// response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
Object.assign(state.user,response.data)
})
}
const getSchoolList = () => {
school.deptTree().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
})
}
})
}
})
})
}
// 提交
const submitForm = async (formEl) => {
if (!formEl) return
await formEl.validate((valid, fields) => {
if (valid) {
// const araname = codeToText[ruleForm.address[0]] + '-' + codeToText[ruleForm.address[1]] + '-' + codeToText[ruleForm.address[2]];
const form={
schoolId:ruleForm.school[2],
// areaIds:ruleForm.address.join(','),
// area:araname
}
school.schoolJoin(form).then(async res=>{
if(res.code==200){
ElMessage.success('提交成功')
await userStore.getDeptInfo()
}
})
console.log('submit!')
} else {
console.log('error submit!', fields)
}
})
}
const getregisterinfo=()=>{
if(!(Object.keys(userStore.DeptInfo).length === 0 && userStore.DeptInfo.constructor === Object)){
if(userStore.DeptInfo.register.type==4) return
userregister.value=userStore.DeptInfo.register
getDept({deptId:userStore.DeptInfo.register.schoolId}).then(res1=>{
const arr=(res1?.data?.ancestors || '').split(',')
arr.shift()
arr.push(userStore.DeptInfo.register.schoolId)
ruleForm.school=arr.map(Number)
})
if(userStore.DeptInfo.register.auditStatus==0 || userStore.DeptInfo.register.auditStatus==1){
isshwoBtn.value=false
}
}
}
// 关闭
const closed=()=>{
if (ruleFormRef.value) ruleFormRef.value.resetFields()
router.push("/")
}
onMounted(async () => {
getUser()
getSchoolList()
await userStore.getDeptInfo()
getregisterinfo()
})
</script>
<style scoped lang="scss">
.joinschool{
padding: 20px;
background: #fff;
.titletext{
text-align: left;
display: flex;
align-items: center;
font-size: 30px;
margin-bottom: 30px;
}
}
</style>

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

@ -6,7 +6,7 @@
</div>
<img class="welcome-img" :src="leftBg2" />
</div>
<div class="box-item login">
<div class="box-item login" v-if="isRegister">
<WindowTools :is-has-max="false" />
<div class="login-title">账号登录</div>
<el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
@ -25,9 +25,30 @@
<el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
</el-form-item>
<div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
<a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
|
<a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
<a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoreRegister">注册账号</a>
</div>
</el-form>
</div>
<div class="box-item login" v-else>
<WindowTools :is-has-max="false" />
<div class="login-title">账号注册</div>
<el-form ref="ruleFormRef" class="login-form" :model="ruleForm" label-width="auto" :rules="rules" size="large">
<el-form-item label="手机号" prop="username">
<el-input v-model="ruleForm.username" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="验证码" prop="smsCode">
<el-input style="width:185px" v-model="ruleForm.smsCode" placeholder="请输入验证码" /><el-button :disabled="codeName!='发送验证码'" type="primary" @click="sendyzm">{{ codeName }}</el-button>
</el-form-item>
<el-form-item label="密码" prop="password" >
<el-input autocomplete="on" type="password" v-model="ruleForm.password" placeholder="请输入密码" />
</el-form-item>
<el-form-item>
<el-button class="btn" type="primary" @click="RegisterForm(ruleFormRef)">立即注册</el-button>
</el-form-item>
<div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
<a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoLogin"> 《 返回登录 </a>
</div>
</el-form>
</div>
@ -52,6 +73,7 @@ import WindowTools from '@/components/window-tools/index.vue'
import SelectSubject from '@/components/select-subject/index.vue'
import Register from './components/Register.vue'
import { sessionStore } from '@/utils/store'
import {sendcode,instructorregister} from '@/api/login'
const { session } = require('@electron/remote')
const downloadProp = ref(0)
@ -62,17 +84,25 @@ const userStore = useUserStore()
const btnLoading = ref(false)
const isSubject = ref(false)
const RegModel = ref(false)
const isRegister = ref(true)
const ruleFormRef = ref(null)
const codeName=ref('发送验证码')
const timer=ref(null)
//表单
const loginForm = reactive({
username: '',
password: '',
rememberMe: false
})
// 注册表单
const ruleForm = reactive({
})
//表单规则
const rules = reactive({
username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }]
password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
smsCode: [{ required: true, trigger: 'blur', message: '请输入您的验证码' }],
})
let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
@ -81,6 +111,43 @@ ipcRenderer.on('update-app-progress', (e, prop) => {
downloadProp.value = prop
showDownLoading.value = prop !== 100
})
const gotoreRegister=()=>{
codeName.value='发送验证码'
if(timer.value){
clearInterval(timer.value);
}
isRegister.value=false
}
// 发送验证码
const sendyzm=()=>{
if(ruleForm.username){
const pattern = /^1[3-9]\d{9}$/;
if( pattern.test(ruleForm.username) ){
sendcode({username:ruleForm.username, source: '4'}).then(res=>{
if(res.code==200){
ElMessage.success('消息发送成功')
codeName.value=60
timer.value=setInterval(()=>{
codeName.value--
if(codeName.value==0){
codeName.value='发送验证码'
clearInterval(timer.value);
}
},1000)
}else{
ElMessage.error(res.msg)
}
})
}else{
ElMessage.error('请输入正确的手机号码')
}
// captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
// console.log('res->', res)
// })
}else{
ElMessage.error('请输入手机号码')
}
}
// 打开弹窗
const RegisterModel = type => {
RegModel.value.OpenModel(type)
@ -148,7 +215,31 @@ const setCookie = (name, value) => {
}
return session.defaultSession.cookies.set(cookie)
}
const gotoLogin = () => {
codeName.value='发送验证码'
if (ruleFormRef.value) ruleFormRef.value.resetFields()
isRegister.value = true
}
// 注册
const RegisterForm = async (formEl) => {
if (!formEl) return
await formEl.validate((valid, fields) => {
if (valid) {
instructorregister(ruleForm).then(res=>{
if(res.code==200){
ElMessage.success('您已注册成功')
if (ruleFormRef.value) ruleFormRef.value.resetFields()
gotoLogin()
}else{
ElMessage.error(res.msg)
}
})
console.log('submit!')
} else {
console.log('error submit!', fields)
}
})
}
onMounted(() => {
localStorage.clear()
sessionStore.set('subject', {

209
src/renderer/src/views/schoolCertification/index.vue Normal file
View File

@ -0,0 +1,209 @@
<template>
<div class="joinschool">
<div class="titletext"><span style="font-size:30px;margin-right:30px" class="iconfont icon-tianchongxing-"></span>学校认证</div>
<div v-if="userregister.value">
<div style="border-bottom:1px solid #eee;padding-bottom:10px;margin-bottom:10px" v-if="userregister.value.auditStatus==0">
<img style="margin: 0 auto;height:85px" src="@/assets/images/shenhe.png" alt="">
<p style="color:#F59A23;font-size:22px">申请审核中</p>
<p style="color:#000;font-size:16px;font-weight:600">申请信息已提交，请耐心等待审核通过即可完成申请。</p>
</div>
<div style="border:1px solid #000;margin-bottom:20px;background:#DFF0D8" v-if="userregister.value.auditStatus==1">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="success"></el-result>
<p style="font-size:30px;color:#67C23A">审核通过</p>
</div>
<p style="margin-bottom:10px;color:#439FFE; cursor: pointer" @click="chongxin">重新认证</p>
</div>
<div style="border:1px solid #000;margin-bottom:20px;background:#F2DEDE" v-if="userregister.value.auditStatus==2">
<div style="display: flex;align-items: center;justify-content: center;">
<el-result style="padding: 17px 35px;" icon="error"></el-result>
<p style="font-size:30px;color:#E10A07">申请驳回</p>
</div>
<p style="margin-bottom:10px;font-size:18px;font-weight:600">申请信息已驳回，请重新提交申请信息。</p>
</div>
</div>
<div class="box-item" :style="userregister.value?'':'margin-top:30px'" >
<el-form ref="ruleFormRef" label-width="auto" :rules="rules" :model="ruleForm" size="large" >
<el-form-item label="学校名称" prop="schoolName" >
<el-input v-model="ruleForm.schoolName" placeholder="请输入学校名称" :disabled="!isshwoBtn" />
</el-form-item>
<el-form-item label="所属地区" prop="address">
<el-cascader
:disabled="!isshwoBtn"
style="width:100%"
popper-class="aix-regist-address"
:options="regionData"
v-model="ruleForm.address"
/>
</el-form-item>
<el-form-item label="事业单位法人证书号" prop="certNum" >
<el-input v-model="ruleForm.certNum" placeholder="请输入事业单位法人证书号" :disabled="!isshwoBtn" />
</el-form-item>
<el-form-item label="经办人" >
{{ state.user.nickName }}
</el-form-item>
<el-form-item label="经办人电话" >
{{ state.user.phonenumber }}
</el-form-item>
<el-form-item >
<div style="display:flex;align-items:center;justify-content: space-between;padding-right:100px; width: 100%;">
<div style="display:flex;align-items:center;">
<el-checkbox style="margin: 0px 10px 0px 55px" v-model="ruleForm.istrue" size="large" :disabled="!isshwoBtn" /> 以上信息真实有效，勾选后提交
</div>
<div >
<el-button style="width:150px" type="default" @click="closed">关闭</el-button>
<el-button style="width:150px" type="primary" @click="submitForm(ruleFormRef)" v-if="isshwoBtn">确定</el-button>
</div>
</div>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script setup >
import { ref, reactive, onMounted,watch } from 'vue'
import { regionData, codeToText } from 'element-china-area-data'
import { getUserProfile } from '@/api/system/user'
import {getDept} from '@/api/login'
import {school} from '@/api/apiService'
import { ElMessage } from 'element-plus'
import { useRouter } from 'vue-router'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const isshwoBtn=ref(true)
const router = useRouter()
const state = reactive({
user: {},
})
const userregister = reactive({
value:null
})
const ruleFormRef=ref(null)
const ruleForm = reactive({
school:[],
address:[],
schoolName:null,
istrue:false
})
const optionsSchool=ref([])
const rules = reactive({
address:[ {
required: true,
message: '请选择地址',
trigger: 'change',
},],
certNum:[{ required: true, message: '请输入证书号', trigger: 'blur' }],
schoolName:[ { required: true, message: '请输入学校名称', trigger: 'blur' },]
})
async function getUser() {
getUserProfile().then((response) => {
// response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
Object.assign(state.user,response.data)
})
}
watch (() => userStore.DeptInfo, (newValue, oldValue) => {
getregisterinfo()
})
const getregisterinfo=()=>{
if(!(Object.keys(userStore.DeptInfo || {}).length === 0 && userStore.DeptInfo.constructor === Object)){
if(userStore.DeptInfo.register.type==3) return
userregister.value=userStore.DeptInfo.register
ruleForm.schoolName=userStore.DeptInfo.register.schoolName
ruleForm.certNum=userStore.DeptInfo.register.certNum
ruleForm.istrue=true
ruleForm.address=userStore.DeptInfo.register.areaIds.split(",")
if(userStore.DeptInfo.register.auditStatus==0 || userStore.DeptInfo.register.auditStatus==1){
isshwoBtn.value=false
}
}
}
const getSchoolList = () => {
school.deptTree().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
})
}
})
}
})
})
}
const chongxin=()=>{
isshwoBtn.value=true
}
// 提交
const submitForm = async (formEl) => {
if (!formEl) return
await formEl.validate((valid, fields) => {
if (valid) {
if(!ruleForm.istrue) {
ElMessage.error('请勾选以上信息真实有效的复选框')
return
}
const araname = codeToText[ruleForm.address[0]] + '-' + codeToText[ruleForm.address[1]] + '-' + codeToText[ruleForm.address[2]];
const form={
schoolName:ruleForm.schoolName,
certNum:ruleForm.certNum,
areaIds:ruleForm.address.join(','),
area:araname
}
school.schoolJoin(form).then(async res=>{
if(res.code==200){
ElMessage.success('提交成功')
await userStore.getDeptInfo()
}
})
console.log('submit!')
} else {
console.log('error submit!', fields)
}
})
}
// 关闭
const closed=()=>{
if (ruleFormRef.value) ruleFormRef.value.resetFields()
router.push("/")
}
onMounted(() => {
getUser()
getregisterinfo()
getSchoolList()
})
</script>
<style scoped lang="scss">
.joinschool{
padding: 20px;
background: #fff;
.titletext{
text-align: left;
display: flex;
align-items: center;
font-size: 30px;
}
}
</style>

197
src/renderer/src/views/schoolManagement/index.vue Normal file
View File

@ -0,0 +1,197 @@
<template>
<div class="schoolManagement">
<div class="titletext">学校管理</div>
<div class="searchInput">
<div class="mr10">学校名称</div>
<el-input v-model="searchValue.schoolName" class="mr10" style="width: 240px" placeholder="请输入学校名称" />
<div class="mr10">所属区域</div>
<el-cascader
style="width: 240px;margin-right:10px"
:options="regionData"
v-model="address"
:props="{ checkStrictly: true }"
clearable
/>
<div class="mr10">审核状态</div>
<el-radio-group v-model="searchValue.status" class="mr10">
<el-radio :value="-1">全部</el-radio>
<el-radio :value="0">审核中</el-radio>
<el-radio :value="1">已通过</el-radio>
<el-radio :value="2">已驳回</el-radio>
</el-radio-group>
<el-button type="primary" @click="search">搜索</el-button>
</div>
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="schoolName" label="学校名称" width="180" />
<el-table-column prop="area" label="所属地区" width="180" />
<el-table-column prop="certNum" label="事业单位法人证件号" />
<el-table-column prop="name" label="联系人" />
<el-table-column prop="mobile" label="联系电话" />
<el-table-column prop="status" label="审核状态">
<template #default="scope">
{{scope.row.status==0?'审核中':scope.row.status==1?'已通过':'已驳回' }}
</template>
</el-table-column>
<el-table-column prop="Operations" label="操作">
<template #default="scope">
<a v-if="scope.row.status==0" style="color:#04A8F0;cursor: pointer;" @click="audit(scope.row)">审核</a>
</template>
</el-table-column>
</el-table>
<el-pagination style="margin-top:10px;float: right;" background layout="prev, pager, next" @size-change="handleSizeChange"
@current-change="handleCurrentChange" :default-page-size="searchValue.pageSize" v-model:current-page="searchValue.pageNum" :total="total" />
<el-dialog
v-model="dialogVisible"
title="加入学校审核"
width="500"
style="text-align: left;"
:before-close="handleClose"
>
<div style="margin-left:20px" class="formdialog">
审核状态：
<el-radio-group v-model="form.status" class="mr10">
<el-radio :value="1">通过</el-radio>
<el-radio :value="2">拒绝</el-radio>
</el-radio-group>
</div>
<div style="margin-left:20px;margin-top:30px" class="formdialog">
审核理由：
<el-input
v-model="form.auditMsg"
style="width: 300px"
:rows="3"
type="textarea"
placeholder="请输入理由"
/>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="sbmitform">
确定
</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { school } from '@/api/apiService';
import { ref, reactive, onMounted ,computed} from 'vue'
import { regionData, codeToText } from 'element-china-area-data'
import { ElMessage } from 'element-plus'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const searchValue = reactive({
status:-1,
schoolName:null,
pageNum:1,
pageSize:10,
type:3
})
const id=ref(null)
const address=ref([])
const total=ref(0)
const tableData = ref([])
const dialogVisible=ref(false)
const form=reactive({
status:'1',
auditMsg:null,
id:null,
ex1:null
})
const sbmitform=()=>{
if(!form.auditMsg){
return ElMessage.error('请输入理由')
}
school.checkSchool(form).then(res=>{
dialogVisible.value=false
form.auditMsg=null
form.status=1
getList()
userStore.getDeptInfo()
})
}
const filterNullProperties=(obj)=> {
const newObj = {};
for (const key in obj) {
if (obj[key] !== null && obj[key] != 'null' && obj[key] !== undefined) {
newObj[key] = obj[key];
}
}
return newObj;
}
const search=()=>{
searchValue.pageNum=1
getList()
}
const handleCurrentChange=()=>{
getList()
}
const handleSizeChange=()=>{
getList()
}
const handleClose=()=>{
form.id=null
form.ex1=null
form.auditMsg=null
form.status=1
dialogVisible.value=false
}
const formattedAddress = () => {
if (typeof address.value === 'undefined' || address.value?.length === 0) {
return null; // 如果数组为空，则返回空字符串
}
return address.value.map(code => codeToText[code]).join('-'); // 使用'-'连接数组元素
}
const getList = () =>{
const area=formattedAddress()
searchValue.area=area
let obj= filterNullProperties(searchValue)
school.auditlist(obj).then(res=>{
tableData.value=res.rows
total.value=res.total
})
}
const audit=(row)=>{
form.id=row.id
form.ex1=row.ex1
form.auditMsg=null
form.status=1
dialogVisible.value=true
}
onMounted(()=>{
console.log(searchValue)
getList()
})
</script>
<style scoped scss>
.schoolManagement{
padding: 20px;
background: #fff;
padding-bottom: 50px;
}
.titletext{
text-align: left;
display: flex;
align-items: center;
font-size: 30px;
margin-bottom: 30px;
}
.searchInput{
display: flex;
align-items:center;
margin-bottom: 20px;
}
.mr10{
margin-right: 10px;
}
.formdialog{
display: flex;
align-items: center;
}
</style>

14
src/renderer/src/views/tool/createHomework.js
View File

@ -43,6 +43,16 @@ export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) => {
let classWorkList = []
// 将标签中的双引号增加转义
const escapeHtmlQuotes = (str) => {
// 后端已replace双引号, 故前端不用在处理
const regex1 = /\\+/g; // 匹配多个反斜杠
let result = str.replace(regex1, '\\');
result = str.replace(/(?<!\\)\n/g, '<br />'); //替换\n而不替换\\n 为 \\n
return result;
}
/**
* 获取班级作业
*/
@ -52,8 +62,8 @@ export const getClassWorkList = async (id) => {
/**
* 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
* 1、待批改、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已批改、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/
let list = response.rows