Merge branch 'main' into zhuhao_dev

src/renderer/src/components/set-homework/index.vue

@@ -243,7 +243,8 @@ const onSubmit = (formEl) => {
           msgcontent: '',
           teachername: userInfo.nickName,
           unixstamp: new Date().getTime(),
-          worktype: props.row.worktype
+          worktype: props.row.worktype,
+          status: '1'
         }
         ary.push(obj)
       }

src/renderer/src/hooks/useGetHomework.js

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

src/renderer/src/utils/tool.js

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

src/renderer/src/views/desktop/container/class-start.vue

@@ -42,7 +42,7 @@
             <!-- 老师扫码 -->
              <template #item_qrUrl="{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>
               <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>
              </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 MsgEnum from '@/plugins/imChat/msgEnum'          // 消息头-相关定义(nuem)
 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_Classcourse from '@/api/teaching/classcourse' // api接口
@@ -178,9 +178,9 @@ const open = async (id) => {
   getClassList()
 
   // 初始化im-chat
-  nextTick(async() => {
+  // nextTick(async() => {
-    chat = await imChatRef.value?.initImChat()
+  //   chat = await imChatRef.value?.initImChat()
-  })
+  // })
 }
 // 关闭弹窗
 const handleClose = async () => {

src/renderer/src/views/desktop/index.vue

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