Merge pull request 'zouyf_dev' (#361) from zouyf_dev into main

Reviewed-on: #361
This commit is contained in:
zouyf 2024-10-24 14:49:33 +08:00
commit 812e799e2a
2 changed files with 70 additions and 33 deletions

View File

@ -157,6 +157,7 @@ import ItemDialogScore from '@/views/classTask/container/classTask/item-dialog-s
import quizStats from '@/views/classTask/container/quizStats.vue' import quizStats from '@/views/classTask/container/quizStats.vue'
import ClassOverview from '@/views/classTask/container/classOverview.vue' import ClassOverview from '@/views/classTask/container/classOverview.vue'
import {sessionStore} from '@/utils/store' import {sessionStore} from '@/utils/store'
import Chat from '@/utils/chat' // im
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
@ -204,9 +205,10 @@ const classWorkAnalysisScore = reactive({
// form.name = newValue.label // form.name = newValue.label
// } // }
// ) // )
const openDialog = (data) => { const openDialog = (data, isInit=true) => {
console.log(data, '点击的item完成情况') console.log(data, '点击的item完成情况')
if (isInit) {
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : '' classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
classWorkAnalysis.worktype = data.worktype classWorkAnalysis.worktype = data.worktype
classWorkAnalysis.workclass = data.workclass classWorkAnalysis.workclass = data.workclass
@ -233,6 +235,8 @@ const openDialog = (data) => {
? JSON.parse(`[${data.classworkdatastudentids}]`) ? JSON.parse(`[${data.classworkdatastudentids}]`)
: [] : []
classWorkActiveData.studentList = studentArr classWorkActiveData.studentList = studentArr
}
/** 学生完成情况分析--获取作业学生list数据 */ /** 学生完成情况分析--获取作业学生list数据 */
getClassWorkStudentList(data.id) getClassWorkStudentList(data.id)
@ -638,6 +642,32 @@ const closeDialog = () => {
emit('cle-click') emit('cle-click')
} }
// im
const msgHandle = (msg) => {
const { type, data } = msg
switch(type) {
case 'TIMAddRecvNewMsgCallback': // data=[]
{
(data||[]).forEach(o => {
const msgArr = o?.message_elem_array||[]
msgArr.forEach(info => {
const msgType = info?.elem_type // TIMElemType
const msgData = !!info.text_elem_content ? JSON.parse(info.text_elem_content)||'' : ''
//
//console.log('msgData->', msgData);
if (msgData.msgKey == "finishHomework"){
//
const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
//console.log('data->', data);
openDialog(data, false);
}
})
})
}
break
}
}
const reloadTimer = ref(0); // id const reloadTimer = ref(0); // id
const cutid = ref(0); // id const cutid = ref(0); // id
onMounted(() => { onMounted(() => {
@ -649,6 +679,13 @@ onMounted(() => {
// //
cutid.value = data.id; cutid.value = data.id;
isReloadTimer(); isReloadTimer();
// im
if (!Chat.imChat) {
Chat.init(true, true, msgHandle);
} else {
Chat.listenMsg(msgHandle);
}
}) })
const isReloadTimer = () =>{ const isReloadTimer = () =>{
clearInterval(reloadTimer.value) // clearInterval(reloadTimer.value) //