zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge branch 'main' into zouyf_dev 

# Conflicts:
#	src/renderer/src/components/set-homework/index.vue
This commit is contained in:
ekooo 2024-09-18 20:02:53 +08:00
parent 4e835cac82 c58322ca0b
commit 499e428138
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/renderer/src/hooks/useGetHomework.js
View File

@ -71,7 +71,8 @@ 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 = []

2
src/renderer/src/utils/tool.js
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', {

10
src/renderer/src/views/desktop/container/class-start.vue
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="/img/logo.png" :logoScale="0.2" :dotScale="0.7"></vue-qr> <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>
</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 } from '@/utils/tool' import { toLinkWeb, getStaticUrl } 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 () => {

12
src/renderer/src/views/desktop/index.vue
View File

@ -53,7 +53,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: [
@ -79,11 +79,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',