Merge pull request 'lyc-dev' (#256) from lyc-dev into main

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

@@ -47,13 +47,10 @@ import outLink from '@/utils/linkConfig'
 import * as echarts from 'echarts'
 import { useGetClassWork } from '@/hooks/useGetClassWork'
 
-
 const router = useRouter()
 const { ipcRenderer } = window.electron || {}
-const type = ref(-1)
 const chartDom = ref(null);
 let chartInstance = null
-
 const menuList = [{
     name: '课程教学',
     span: 24,
@@ -70,7 +67,7 @@ const menuList = [{
         name: '教材分析',
         icon: 'icon-jiaocaixuanze',
         isOuter: true,
-        path: '/teaching/chatwithtextbook?',
+        path: '/teaching/chatwithtextbook',
         id: '1-2'
       },
       {
@@ -85,11 +82,6 @@ const menuList = [{
         disabled: true,
         id: '1-4'
       },
-      // {
-      //   name: '教学设计',
-      //   icon: 'icon-jiaoxuesheji',
-      //   path: '/prepare'
-      // },
       {
         name: '教学实践',
         icon: 'icon-jiaoxuefenxi',
@@ -115,16 +107,12 @@ const menuList = [{
         isOuter: true,
         path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask',
         id: '2-1'
-        //path: '/newClassTask'
-        //path: '/classTaskAssign'
-        //isOuter: true,
-        //path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'
       },
       {
         name: '作业布置',
         icon: 'icon-xiezuo1',
         isOuter: true,
-        path: '/teaching/classtaskassign?titleName=作业布置?',
+        path: '/teaching/classtaskassign?titleName=作业布置',
         id: '2-2'
       },
       {
@@ -184,10 +172,14 @@ const clickMenu = ({isOuter, path, disabled, id}) =>{
       // 头部 教材分析打开外部链接需要当前章节ID
       const { levelFirstId, levelSecondId, bookeId } = JSON.parse(localStorage.getItem('unitId'))
       let unitId = levelSecondId ? levelSecondId : levelFirstId
-      fullPath = fullPath + `&unitId=${unitId}&bookeId=${bookeId}`
+      if(fullPath.indexOf('?') == -1){
+        fullPath += `?unitId=${unitId}&bookeId=${bookeId}`
+      }
+      else{
+         fullPath += `&unitId=${unitId}&bookeId=${bookeId}`
+      }
     }
     fullPath = fullPath.replaceAll('//', '/')
-    console.log(fullPath)
      // 通知主进程
      ipcRenderer.send('openWindow', {
       key: path,