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

This commit is contained in:
lyc 2024-09-23 17:24:35 +08:00
commit fa6f61e3b3
1 changed files with 8 additions and 16 deletions

View File

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