zdg #323

Merged
zhengdegang merged 3 commits from zdg into main 2024-10-16 12:13:03 +08:00
4 changed files with 14 additions and 4 deletions

View File

@ -55,6 +55,7 @@ import { saveByClassWorkArray } from '@/api/teaching/classwork'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import { getCurrentTime } from '@/utils/date' import { getCurrentTime } from '@/utils/date'
import { uniqBy, groupBy } from 'lodash' import { uniqBy, groupBy } from 'lodash'
import { sessionStore } from '@/utils/store'
const model = defineModel({ type: Boolean, default: false }) const model = defineModel({ type: Boolean, default: false })
const props = defineProps({ const props = defineProps({
@ -211,6 +212,8 @@ const delStudent = (index) => {
const onSubmit = (formEl) => { const onSubmit = (formEl) => {
if (!formEl) return if (!formEl) return
// id
const classRoomId = sessionStore.get('curClassRoom.id')
formEl.validate((valid) => { formEl.validate((valid) => {
if (valid) { if (valid) {
/** /**
@ -226,7 +229,8 @@ const onSubmit = (formEl) => {
id: 0, id: 0,
parentid: props.row.id, parentid: props.row.id,
classid: value, classid: value,
classcourseid: 0, classcourseid: 0, // id-ppt使
classReservId: classRoomId, // id
entpcourseid: props.entpcourseid, entpcourseid: props.entpcourseid,
studentlist: JSON.stringify(gradeObj[value]), studentlist: JSON.stringify(gradeObj[value]),
feedback: form.feedback, feedback: form.feedback,

View File

@ -18,7 +18,7 @@ export const useToolState = defineStore('tool', {
showBoardAll: false, // 全屏画板-是否显示 showBoardAll: false, // 全屏画板-是否显示
isPdfWin: false, // pdf窗口是否打开 isPdfWin: false, // pdf窗口是否打开
isToolWin: false, // 工具窗口是否打开 isToolWin: false, // 工具窗口是否打开
isTaskWin: false, // 批改窗口是否打开 isTaskWin: false, // 批改窗口是否打开
curSubjectNode: { curSubjectNode: {
querySearch: {} // 查询资源所需参数 querySearch: {} // 查询资源所需参数
}, },

View File

@ -138,6 +138,8 @@
<!-- 上课配置 --> <!-- 上课配置 -->
<class-start ref="calssRef" @close="closeChange"/> <class-start ref="calssRef" @close="closeChange"/>
<PptDialog v-model="pptDialog"/> <PptDialog v-model="pptDialog"/>
<!-- <button @click="test">test</button> -->
</template> </template>
<script setup> <script setup>
import { Check,Plus } from '@element-plus/icons-vue' import { Check,Plus } from '@element-plus/icons-vue'
@ -174,7 +176,6 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
import classStart from './container/class-start.vue' // import classStart from './container/class-start.vue' //
import MsgEnum from '@/plugins/imChat/msgEnum' // im import MsgEnum from '@/plugins/imChat/msgEnum' // im
import Chat from '@/utils/chat' // im import Chat from '@/utils/chat' // im
import msgEnum from '@/plugins/imChat/msgEnum'
if (!Chat.imChat) Chat.init() if (!Chat.imChat) Chat.init()
const toolStore = useToolState() const toolStore = useToolState()
@ -286,6 +287,10 @@ export default {
// } // }
// }, // },
methods: { methods: {
// test() {
// toolStore.resetDef() //
// ipcMsgSend('tool-sphere:close') //
// },
// //
startClass(item, classObj) { startClass(item, classObj) {
// () // ()
@ -311,7 +316,7 @@ export default {
} }
case 'close': { // case 'close': { //
const head = MsgEnum.HEADS.MSG_closed // closed const head = MsgEnum.HEADS.MSG_closed // closed
const msgT = msgEnum.TYPES.TEACHER // teacher const msgT = MsgEnum.TYPES.TEACHER // teacher
const isApt = !row.bookImg // bookImg ppt Apt const isApt = !row.bookImg // bookImg ppt Apt
row.ex3 == 'undefined' && (row.ex3 = null) row.ex3 == 'undefined' && (row.ex3 = null)
const timgroupid = isApt ? row.timgroupid : row.ex3 // ex3 ppt Apt const timgroupid = isApt ? row.timgroupid : row.ex3 // ex3 ppt Apt

View File

@ -98,6 +98,7 @@ onMounted(async() => {
const getClassInfo = async () => { const getClassInfo = async () => {
const { data } = await classManageApi.getClassInfo(classObj.id) const { data } = await classManageApi.getClassInfo(classObj.id)
classObj.data = data classObj.data = data
sessionStore.set('curClassRoom', classObj) // -
// id // id
let timGroupId = data?.ex3 || '' let timGroupId = data?.ex3 || ''
console.log('获取群ID:', timGroupId) console.log('获取群ID:', timGroupId)