Compare commits

..

No commits in common. "129f87546923242e567290db0fefc1eb29800574" and "2c6da76cf77367efa86fbb7ecc841b08166973bf" have entirely different histories.

8 changed files with 39 additions and 37 deletions

View File

@ -115,8 +115,7 @@ const getSubjectContent = async () => {
edustage, edustage,
// entpcourseedituserid: userId, // entpcourseedituserid: userId,
itemgroup: 'textbook', itemgroup: 'textbook',
orderby: 'orderidx asc', pageSize: 500
pageSize: 10000
} }
let data; let data;
const { rows } = await listEvaluation(params) const { rows } = await listEvaluation(params)
@ -143,7 +142,7 @@ const getSubject = async () => {
subjectList.value = JSON.parse(localStorage.getItem('subjectList')) subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
} }
else { else {
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000, orderby: 'orderidx asc', }) const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 500 })
subjectList.value = rows subjectList.value = rows
localStorage.setItem('subjectList', JSON.stringify(subjectList.value)) localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
} }

View File

@ -10,13 +10,13 @@
<div v-loading="setLoading"> <div v-loading="setLoading">
<el-form :model="form" label-width="80px" ref="ruleFormRef" :rules="rules"> <el-form :model="form" label-width="80px" ref="ruleFormRef" :rules="rules">
<el-form-item label="班级" prop="grade"> <el-form-item label="班级" prop="grade">
<el-scrollbar max-height="150px" style="width: 100%"> <el-scrollbar max-height="200px" style="width: 100%">
<el-tree :props="defaultProps" :load="getLoad" node-key="id" highlight-current @check="handleCheckChange" <el-tree :props="defaultProps" :load="getLoad" node-key="id" highlight-current @check="handleCheckChange"
lazy show-checkbox /> lazy show-checkbox />
</el-scrollbar> </el-scrollbar>
</el-form-item> </el-form-item>
<el-form-item label="选中学生" prop="student"> <el-form-item label="选中学生" prop="student">
<el-scrollbar max-height="130px"> <el-scrollbar max-height="200px">
<el-tag v-for="(tag, index) in studentList" :key="tag.studentid" closable type="primary" <el-tag v-for="(tag, index) in studentList" :key="tag.studentid" closable type="primary"
@close="delStudent(index)"> @close="delStudent(index)">
{{ tag.name }} {{ tag.name }}
@ -53,7 +53,6 @@ import { ElMessage } from 'element-plus'
import { listClassmain, listClassgroup } from '@/api/classManage/index' import { listClassmain, listClassgroup } from '@/api/classManage/index'
import { saveByClassWorkArray } from '@/api/teaching/classwork' import { saveByClassWorkArray } from '@/api/teaching/classwork'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import { getCurrentTime } from '@/utils/date'
import { uniqBy, groupBy } from 'lodash' import { uniqBy, groupBy } from 'lodash'
const model = defineModel({ type: Boolean, default: false }) const model = defineModel({ type: Boolean, default: false })
@ -234,7 +233,7 @@ const onSubmit = (formEl) => {
timelength: form.timelength, timelength: form.timelength,
weights: 1, weights: 1,
deaddate: form.deaddate, deaddate: form.deaddate,
workdate: getCurrentTime('YYYY-MM-DD'), workdate: getCurrentDate(),
uniquekey: props.row.uniquekey, uniquekey: props.row.uniquekey,
entpcourseworklist: '[' + props.row.entpcourseworklist + ']', entpcourseworklist: '[' + props.row.entpcourseworklist + ']',
needMsgNotifine: 'false', needMsgNotifine: 'false',
@ -244,7 +243,7 @@ const onSubmit = (formEl) => {
teachername: userInfo.nickName, teachername: userInfo.nickName,
unixstamp: new Date().getTime(), unixstamp: new Date().getTime(),
worktype: props.row.worktype, worktype: props.row.worktype,
status: '1' status: '1', //1
} }
ary.push(obj) ary.push(obj)
} }
@ -277,10 +276,24 @@ const cloneDialog = (formEl) => {
formEl.resetFields() formEl.resetFields()
model.value = false model.value = false
} }
//
const getCurrentDate = () => {
const now = new Date()
const year = now.getFullYear()
let month = now.getMonth() + 1 // 0+1
let day = now.getDate()
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
return `${year}-${month}-${day}`
}
onMounted(() => { onMounted(() => {
// //
form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm') form.deaddate = getCurrentDate() + ' ' + '10:00:00'
}) })
</script> </script>

View File

@ -71,8 +71,7 @@ const getHomeWorkList = async () => {
return await homeworklist({ return await homeworklist({
entpcourseid: chapterId, entpcourseid: chapterId,
edituserid: userStore.user.userId, edituserid: userStore.user.userId,
pageSize: 100, pageSize: 100
status: '10'
}).then((res) => { }).then((res) => {
//以下代码 参照AIx web端 作业布置 //以下代码 参照AIx web端 作业布置
let list = [] let list = []

View File

@ -304,7 +304,7 @@ const eventHandles = (type, win) => {
*/ */
export const toLinkWeb = (path) => { export const toLinkWeb = (path) => {
const config = baseConfig() const config = baseConfig()
// console.log(config) console.log(config)
const fullPath = config.url + path const fullPath = config.url + path
// 通知主进程 // 通知主进程
ipcRenderer.send('openWindow', { ipcRenderer.send('openWindow', {

View File

@ -42,7 +42,7 @@
<!-- 老师扫码 --> <!-- 老师扫码 -->
<template #item_qrUrl="{value}"> <template #item_qrUrl="{value}">
<div :title="value" v-if="!!value"> <div :title="value" v-if="!!value">
<vue-qr :text="value" :size="200" :margin="10" colorDark="green" colorLight="white" :logoSrc="getStaticUrl('/img/logo.png')" :logoScale="0.2" :dotScale="0.7"></vue-qr> <vue-qr :text="value" :size="200" :margin="10" colorDark="green" colorLight="white" logoSrc="/img/logo.png" :logoScale="0.2" :dotScale="0.7"></vue-qr>
</div> </div>
<el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button> <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>
</template> </template>
@ -77,7 +77,7 @@ import vueQr from 'vue-qr/src/packages/vue-qr.vue' // 插件: 二维码
import imChat from '@/views/tool/components/imChat.vue' // im-chat- import imChat from '@/views/tool/components/imChat.vue' // im-chat-
import MsgEnum from '@/plugins/imChat/msgEnum' // -(nuem) import MsgEnum from '@/plugins/imChat/msgEnum' // -(nuem)
import * as commUtil from '@/utils/comm' // - import * as commUtil from '@/utils/comm' // -
import { toLinkWeb, getStaticUrl } from '@/utils/tool' import { toLinkWeb } from '@/utils/tool'
import * as Http_ClassManage from '@/api/classManage' // api import * as Http_ClassManage from '@/api/classManage' // api
import * as Http_Classcourse from '@/api/teaching/classcourse' // api import * as Http_Classcourse from '@/api/teaching/classcourse' // api
@ -178,9 +178,9 @@ const open = async (id) => {
getClassList() getClassList()
// im-chat // im-chat
// nextTick(async() => { nextTick(async() => {
// chat = await imChatRef.value?.initImChat() chat = await imChatRef.value?.initImChat()
// }) })
} }
// //
const handleClose = async () => { const handleClose = async () => {

View File

@ -55,7 +55,7 @@ const chartDom = ref(null);
let chartInstance = null let chartInstance = null
const menuList = [{ const menuList = [{
name: '课程教学', name: '教学分析',
span: 24, span: 24,
id: 1, id: 1,
list: [ list: [
@ -81,11 +81,11 @@ const menuList = [{
icon: 'icon-xueqingfenxi', icon: 'icon-xueqingfenxi',
disabled: true disabled: true
}, },
// { {
// name: '', name: '教学设计',
// icon: 'icon-jiaoxuesheji', icon: 'icon-jiaoxuesheji',
// path: '/prepare' path: '/prepare'
// }, },
{ {
name: '教学实施', name: '教学实施',
icon: 'icon-jiaoxuefenxi', icon: 'icon-jiaoxuefenxi',

View File

@ -172,23 +172,16 @@ const disabledHours = ()=>{
} }
// - // -
const disabledMinute = (hour,role) => { const disabledMinute = (hour,role) => {
if(form.time == null) return
if(getCurrentTime('YYYY-MM-DD') == form.day){ if(getCurrentTime('YYYY-MM-DD') == form.day){
const arrs = [] const arrs = []
if(role == 'start'){ if(role == 'start'){
let nowHour = new Date().getHours().toString().padStart(2, '0'); for (let i = 0; i < 60; i++) {
if(nowHour < hour){ if (new Date().getMinutes() <= i) continue;
return [] arrs.push(i)
}
else{
for (let i = 0; i < 60; i++) {
if (new Date().getMinutes() <= i) continue;
arrs.push(i)
}
return arrs;
} }
return arrs;
} }
if(role == 'end'){ else{
if(form.time[0]) return [] if(form.time[0]) return []
} }
} }

View File

@ -91,8 +91,6 @@ const subjectList = ref([])
// //
const getSubject = () => { const getSubject = () => {
//
if(!userStore.user.subject) return
listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
const arr = userStore.user.subject.split(',') const arr = userStore.user.subject.split(',')
subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items) subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)