Compare commits

..

4 Commits

Author SHA1 Message Date
朱浩 43d75f94dd Merge pull request 'zhuhao_dev' (#91) from zhuhao_dev into main
Reviewed-on: #91
2024-08-01 17:47:51 +08:00
朱浩 62a5339d04 二期:首页样式修改 2024-08-01 17:46:56 +08:00
朱浩 191ead45cb Merge branch 'main' into zhuhao_dev 2024-08-01 14:33:52 +08:00
朱浩 cac9490256 二期:首页样式修改 2024-08-01 14:33:40 +08:00
9 changed files with 461 additions and 213 deletions

View File

@ -31,7 +31,7 @@ function createLoginWindow() {
preload: join(__dirname, '../preload/index.js'),
sandbox: false,
nodeIntegration: true,
contextIsolation: false, // 沙箱取消
contextIsolation: false // 沙箱取消
}
})
loginWindow.type = 'login' // 唯一标识
@ -41,7 +41,7 @@ function createLoginWindow() {
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
loginWindow.loadURL('http://localhost:5173/#/login')
} else {
loginWindow.loadFile(join(__dirname, '../renderer/index.html'), {hash: 'login'})
loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' })
updateInit(loginWindow)
}
@ -71,7 +71,7 @@ function createMainWindow() {
sandbox: false,
// nodeIntegration: true,
nodeIntegration: true, // nodeApi调用
contextIsolation: false, // 沙箱取消
contextIsolation: false // 沙箱取消
// webSecurity: false // 跨域关闭
}
})
@ -80,7 +80,8 @@ function createMainWindow() {
mainWindow.show()
})
mainWindow.on('closed', () => {
setTimeout(() => { // 延迟销毁
setTimeout(() => {
// 延迟销毁
mainWindow = null
}, 1000)
// app.quit() // 主窗口关闭-结束所有进程
@ -92,7 +93,7 @@ function createMainWindow() {
mainWindow.webContents.openDevTools()
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] )
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
} else {
mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
}
@ -102,7 +103,6 @@ function createMainWindow() {
remote.enable(mainWindow.webContents)
}
// 作业窗口相关-开发中
let linkWindow
async function createLinkWin(data) {
@ -122,12 +122,15 @@ async function createLinkWin(data) {
})
linkWindow.type = 'link' // 唯一标识
let cookieDetails = { ...data.cookieData }
await linkWindow.webContents.session.cookies.set(cookieDetails).then(()=>{
console.log('Cookie is successful');
}).catch( error =>{
console.error('Cookie is error', error);
await linkWindow.webContents.session.cookies
.set(cookieDetails)
.then(() => {
console.log('Cookie is successful')
})
.catch((error) => {
console.error('Cookie is error', error)
})
data.fullPath = data.fullPath.replaceAll('//', '/')
linkWindow.loadURL(data.fullPath)
linkWindow.once('ready-to-show', () => {
@ -169,9 +172,10 @@ app.on('ready', () => {
}
if (mainWindow) {
mainWindow.close() // 先发出这个关闭指令
setTimeout(() => { //
setTimeout(() => {
//
mainWindow.destroy()
}, 200);
}, 200)
}
})
@ -199,21 +203,19 @@ app.on('ready', () => {
createLinkWin(data)
})
// 新窗口创建-监听
ipcMain.on('new-window', (e,data) => {
ipcMain.on('new-window', (e, data) => {
const { id, type } = data
const win = BrowserWindow.fromId(id)
win.type = type // 绑定独立标识
remote.enable(win.webContents) // 开启远程服务
})
// 打开-登录窗口
createLoginWindow()
app.on('activate', function () {
if (BrowserWindow.getAllWindows().length === 0) createLoginWindow()
})
})
// Quit when all windows are closed, except on macOS. There, it's common

View File

@ -1,7 +1,15 @@
<template>
<section class="app-main">
<div class="app-main-left no-select">
<div v-for="(item, index) in title" :key="index" :class="item.active?'active':''" class="app-main-left-item" @click="active(index)">
<div class="app-main-left-item-icon">
<i :class="item.img"></i>
</div>
<div class="app-main-left-item-text">{{item.name}}</div>
</div>
</div>
<transition mode="out-in" name="fade-transform">
<div v-show="$route != null" style="height: 100%">
<div v-show="$route != null" style="height: 100%; flex: 1">
<router-view v-slot="{ Component, route }">
<keep-alive>
<component :is="Component" v-if="route.meta.keepAlive" :key="route.name" />
@ -13,10 +21,170 @@
</section>
</template>
<script setup></script>
<script setup>
import { reactive, onMounted } from 'vue'
import { useRouter } from 'vue-router'
import routerStore from '@/store/modules/route'
const router = useRouter()
const title = reactive([
{
name: '教学工作台',
img: 'iconfont icon-gongzuotai',
id: 1,
child: [
{
name: '课程教学',
img: 'iconfont icon-PPT',
type: 'hash',
url: '/prepare',
child1: []
},
{
name: '作业管理',
img: 'iconfont icon-36zuoyepingtai',
url: '/teaching/classtaskassign?titleName=作业布置',
child1: []
}
]
},
{
name: '教学研究室',
img: 'iconfont icon-yanjiushi',
id: 2,
child: [
{
name: '资源研究',
url: '/resource',
type: 'hash',
img: 'iconfont icon-business-report',
child1: []
},
{
name: '课标分析',
url: '/teaching/chatwithstandard',
img: 'iconfont icon-kecheng',
child1: []
},
{
name: '教材分析',
url: '/teaching/chatwithtextbook',
img: 'iconfont icon-yanjiushi',
child1: []
},
{
name: '高考研究',
url: '/education/colentrance',
img: 'iconfont icon-icon_kaoshifenxi',
child1: []
}
]
},
{
name: '教学资源库',
img: 'iconfont icon-zhuanyeziyuanku',
id: 3,
child: [
{
name: '教学素材',
img: 'iconfont icon-sucai',
url: '/teaching/materialbank',
child1: []
},
{
name: '课程资源',
img: 'iconfont icon-kechengziyuan',
url: '/teaching/coursewareresource',
child1: []
},
{
name: '习题资源',
img: 'iconfont icon-iconku-zhuanqu-',
url: '/teaching/quesbank',
child1: []
}
]
}
])
const active = (index) => {
const route = routerStore()
title.forEach((item, i) => {
if (i === index) {
item.active = true
route.setNowRouter(item.child)
if (item.id !== 3) {
router.push(item.child[0].url)
}
} else {
item.active = false
}
})
}
onMounted(()=>{
active(0)
})
</script>
<style lang="scss" scoped>
.no-select {
-webkit-user-select: none; /* Safari */
-moz-user-select: none; /* Firefox */
-ms-user-select: none; /* IE10+ */
user-select: none; /* Standard syntax */
}
.app-main {
height: 100%;
display: flex;
flex-direction: row;
.app-main-left {
width: 80px;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
.app-main-left-item {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
width: 65px;
height: 65px;
padding-top: 10px;
margin: 10px 0;
cursor: pointer;
&:hover {
background: #839ce0;
border-radius: 10px;
.app-main-left-item-icon {
background: #fff;
color: #758fd3;
}
}
&.active {
background: #839ce0;
border-radius: 10px;
.app-main-left-item-icon {
background: #fff;
color: #758fd3;
}
}
.app-main-left-item-text {
font-size: 12px;
}
.app-main-left-item-icon {
width: 40px;
height: 40px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 10px;
background: #7c97e1;
color: #fff;
i {
font-size: 24px;
}
}
}
}
}
</style>

View File

@ -4,9 +4,15 @@
<h3 class="title" @click="changeTab">AIX智慧课堂</h3>
<div class="change-tab">
<ul class="flex">
<li v-for="item in menus" :key="item.path" class="flex"
:class="currentRoute == item.path ? 'active-li' : ''" @click="changePage(item.path)">
<i class="iconfont" :class="item.icon"></i>
<li
v-for="(item, index) in routeHeader.nowRouter"
:key="index"
class="flex"
:style="{'color' : item.color}"
:class="currentRoute === item.url ? 'active-li' : ''"
@click="handleOutLink(item.url,item.type)"
>
<i :class="item.img"></i>
<span class="text">{{ item.name }}</span>
</li>
</ul>
@ -14,13 +20,17 @@
</div>
<div class="right-section flex">
<WindowTools/>
<WindowTools />
<div class="user flex">
<div class="avatar-container">
<el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
<el-dropdown
class="right-menu-item hover-effect"
trigger="click"
@command="handleCommand"
>
<div class="avatar-wrapper">
<img :src="userStore.user.avatar" class="user-avatar" style="float: left;" />
<div style="margin-top: 18px; font-size: 0.8em;"> {{ userStore.user.nickName }}</div>
<img :src="userStore.user.avatar" class="user-avatar" style="float: left" />
<div style="margin-top: 18px; font-size: 0.8em">{{ userStore.user.nickName }}</div>
</div>
<template #dropdown>
<el-dropdown-menu>
@ -44,13 +54,31 @@ import { useRouter } from 'vue-router'
import { ElMessageBox } from 'element-plus'
import WindowTools from '@/components/window-tools/index.vue'
import useUserStore from '@/store/modules/user'
import routerStore from '@/store/modules/route'
import outLink from '@/utils/linkConfig'
const routeHeader = routerStore()
const { ipcRenderer } = window.electron || {}
const userStore = useUserStore()
const router = useRouter()
const currentRoute = ref('')
const menus = ref([
const handleOutLink = (path, type) => {
if (!path) return
if (type === 'hash') {
router.push(path)
} else {
// key linkConfig.js
let configObj = outLink().getBaseData()
let fullPath = configObj.fullPath + path
fullPath = fullPath.replaceAll('//', '/')
//
ipcRenderer.send('openWindow', {
fullPath: fullPath,
cookieData: { ...configObj.data }
})
}
}
/*const menus = ref([
{
icon: 'icon-zhuye2 icon-homepage',
name: '主页',
@ -66,12 +94,12 @@ const menus = ref([
name: '备课',
path: '/prepare'
},
/*{
{
icon: 'icon-jiangke1 icon-teach',
name: '授课',
path: '/teach'
}*/
])
}
])*/
//
watch(
@ -82,20 +110,19 @@ watch(
{ immediate: true }
)
const changePage = (url) => {
router.push(url)
}
function handleCommand(command) {
switch (command) {
case "setLayout":
setLayout();
break;
case "logout":
logout();
break;
case 'setLayout':
setLayout()
break
case 'logout':
logout()
break
default:
break;
break
}
}
@ -104,20 +131,25 @@ function logout() {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
userStore.logOut().then(() => {
// router.replace('/login')
ipcRenderer && ipcRenderer.send('openLoginWindow')
}).catch(()=>{
})
.then(() => {
userStore
.logOut()
.then(() => {
// router.replace('/login')
ipcRenderer && ipcRenderer.send('openLoginWindow')
})
}).catch(() => { });
.catch(() => {
// router.replace('/login')
ipcRenderer && ipcRenderer.send('openLoginWindow')
})
})
.catch(() => {})
}
const emits = defineEmits(['setLayout'])
function setLayout() {
emits('setLayout');
emits('setLayout')
}
</script>
@ -160,7 +192,7 @@ function setLayout() {
color: #f99b53;
}
.icon-homepage{
.icon-homepage {
color: #0a84ff;
}
@ -179,7 +211,7 @@ function setLayout() {
.active-li {
background: #d3e3fb;
color: #409EFF;
color: #409eff;
}
}
}
@ -203,7 +235,6 @@ function setLayout() {
padding-bottom: 5px;
flex-direction: column;
.user {
.user-info {
padding-right: 5px;

View File

@ -32,6 +32,6 @@ let uploaderStore = ref(uploaderState())
height: 80px;
}
.el-main {
--el-main-padding: 0 20px;
--el-main-padding: 0 20px 0 0;
}
</style>

View File

@ -0,0 +1,15 @@
import { defineStore } from 'pinia'
const routerStore = defineStore('router', {
state: () => ({
nowRouter: []
}),
actions: {
setNowRouter(payload) {
this.nowRouter = payload
}
},
mutations: {},
persist: true
})
export default routerStore

View File

@ -1,11 +1,9 @@
import { defineStore } from "pinia"
import { defineStore } from 'pinia'
import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import defAva from '@/assets/images/user.png'
const useUserStore = defineStore(
'user',
{
const useUserStore = defineStore('user', {
state: () => ({
token: getToken(),
id: '',
@ -23,11 +21,13 @@ const useUserStore = defineStore(
const code = userInfo.code
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
login(username, password, code, uuid)
.then((res) => {
setToken(res.token)
this.token = res.token
resolve(res)
}).catch(error => {
})
.catch((error) => {
reject(error)
})
})
@ -35,45 +35,47 @@ const useUserStore = defineStore(
// 获取用户信息
getInfo() {
return new Promise((resolve, reject) => {
getInfo().then(res => {
getInfo()
.then((res) => {
res.user.avatar = import.meta.env.VITE_APP_BASE_API + res.user.avatar
const user = res.user
this.user = user
const avatar = (user.avatar == "" || user.avatar == null) ? defAva : user.avatar;
const avatar = user.avatar == '' || user.avatar == null ? defAva : user.avatar
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
if (res.roles && res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组
this.roles = res.roles
this.permissions = res.permissions
} else {
this.roles = ['ROLE_DEFAULT']
}
this.id = user.userId
this.userName = user.userName
this.nickName = user.nickName;
this.avatar = avatar;
this.userType = user.userType;
this.deptId = user.deptId;
this.deptName = user.deptName;
this.deptLogo = user.deptLogo;
this.deptSlogan = user.deptSlogan;
this.activeDeptId = user.activeDeptId;
this.activeDeptName = user.activeDeptName;
this.parentDeptId = user.parentDeptId;
this.parentDeptName = user.parentDeptName;
this.edusubject = user.edusubject;
this.edudegree = user.edudegree;
this.edustage = user.edustage;
this.userType = user.userType;
this.studentId = user.studentId;
this.timUserId = user.timuserid;
this.plainpwd = user.plainpwd;
this.nickName = user.nickName
this.avatar = avatar
this.userType = user.userType
this.deptId = user.deptId
this.deptName = user.deptName
this.deptLogo = user.deptLogo
this.deptSlogan = user.deptSlogan
this.activeDeptId = user.activeDeptId
this.activeDeptName = user.activeDeptName
this.parentDeptId = user.parentDeptId
this.parentDeptName = user.parentDeptName
this.edusubject = user.edusubject
this.edudegree = user.edudegree
this.edustage = user.edustage
this.userType = user.userType
this.studentId = user.studentId
this.timUserId = user.timuserid
this.plainpwd = user.plainpwd
this.roles = res.roles;
this.roles = res.roles
resolve(res)
}).catch(error => {
})
.catch((error) => {
reject(error)
})
})
@ -81,14 +83,16 @@ const useUserStore = defineStore(
// 退出系统
logOut() {
return new Promise((resolve, reject) => {
logout(this.token).then(() => {
logout(this.token)
.then(() => {
this.token = ''
this.roles = []
this.permissions = []
localStorage.clear()
removeToken()
resolve()
}).catch(error => {
})
.catch((error) => {
removeToken() // zdg: 网络异常时,清除前端退出进入登录页
reject(error)
})
@ -96,6 +100,6 @@ const useUserStore = defineStore(
}
},
persist: true
})
})
export default useUserStore

View File

@ -1,8 +1,7 @@
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const baseConfig = {
const baseConfig = () => {
const userStore = useUserStore()
return {
// Electron 设置cookie
url: import.meta.env.VITE_APP_BUILD_BASE_PATH,
// url: 'https://file.ysaix.com:7868',
@ -12,52 +11,48 @@ const baseConfig = {
value: userStore.token,
// 域名
domain: import.meta.env.VITE_APP_DOMAIN
}
// 作业布置
const homeWork = {
data: { ...baseConfig},
// 完整路径
fullPath: `${baseConfig.url}/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE`
}
// 作业反馈
const feedback = {
data: { ...baseConfig},
// 完整路径
fullPath: `${baseConfig.url}/teaching/classtaskassign?titleName=作业反馈`
}
// 高考研读
const gk = {
data: { ...baseConfig},
fullPath: `${baseConfig.url}/education/colentrance`
}
// 课标研读
const standard = {
data: { ...baseConfig},
fullPath: `${baseConfig.url}/teaching/chatwithstandard`
}
// 教学大模型
const aiModel = {
data: { ...baseConfig},
fullPath: `${baseConfig.url}/platofai`
}
const getBaseData = () => {
return {
data: { ...baseConfig},
fullPath: `${baseConfig.url}`
}
}
export default {
homeWork,
feedback,
gk,
standard,
aiModel,
getBaseData
export default () => {
return {
// 作业布置
homeWork: {
data: { ...baseConfig() },
// 完整路径
fullPath: `${baseConfig().url}/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE`
},
// 作业反馈
feedback: {
data: { ...baseConfig() },
// 完整路径
fullPath: `${baseConfig().url}/teaching/classtaskassign?titleName=作业反馈`
},
// 高考研读
gk: {
data: { ...baseConfig() },
fullPath: `${baseConfig().url}/education/colentrance`
},
// 课标研读
standard: {
data: { ...baseConfig() },
fullPath: `${baseConfig().url}/teaching/chatwithstandard`
},
// 教学大模型
aiModel: {
data: { ...baseConfig() },
fullPath: `${baseConfig().url}/platofai`
},
getBaseData: () => {
return {
data: { ...baseConfig() },
fullPath: `${baseConfig().url}`
}
}
}
}

View File

@ -34,9 +34,6 @@
<div
v-if="item.levelFirstName"
style="
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
flex: 1;
text-align: left;
"

View File

@ -13,17 +13,23 @@
<el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button>
</div>
<el-button type="primary" class="to-class-btn" @click="openLesson">
<i class="iconfont icon-lingdang"></i>上课</el-button>
<i class="iconfont icon-lingdang"></i>上课</el-button
>
<div class="top-zoom-style"></div>
</div>
<div class="prepare-body-header">
<div>
<label style="font-size: 15px">{{ currentFileList.length }}个文件</label>&nbsp;
<el-popover placement="top-start" :width="250" trigger="hover">
<template #default>
<div>
<el-button v-if="lastAsyncAllTime" type="success" size="small" :icon="Check" circle />
<el-button
v-if="lastAsyncAllTime"
type="success"
size="small"
:icon="Check"
circle
/>
{{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
</div>
</template>
@ -41,20 +47,38 @@
<el-button @click="handleOutLink('feedback')">作业反馈</el-button>
<el-button @click="handleOutLink('homeWork')">布置作业</el-button>
<el-button @click="isDialogOpen = true">上传资料</el-button>
<el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button>
<el-button type="primary" style="margin-left: 10px" @click="createFile"
>新建课件</el-button
>
</div>
</div>
<el-checkbox-group v-model="checkFileList" class="prepare-body-main"
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }">
<file-list-item v-for="(item, index) in currentFileList" :key="index" :item="item" :index="index"
@on-move="onMoveSingleFile" @on-delete="deleteTalk" @on-set="openSet">
<el-checkbox-group
v-model="checkFileList"
class="prepare-body-main"
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
>
<file-list-item
v-for="(item, index) in currentFileList"
:key="index"
:item="item"
:index="index"
@on-move="onMoveSingleFile"
@on-delete="deleteTalk"
@on-set="openSet"
>
<el-checkbox label="" :value="item" />
</file-list-item>
</el-checkbox-group>
<file-oper-batch v-show="checkFileList.length > 0"
<file-oper-batch
v-show="checkFileList.length > 0"
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
:choose="checkFileList" :check-all="isCheckAll" @click-delete="clickDelete" @click-move="clickMove"
@cancel="checkFileList = []" @click-choose="clickChoose"></file-oper-batch>
:choose="checkFileList"
:check-all="isCheckAll"
@click-delete="clickDelete"
@click-move="clickMove"
@cancel="checkFileList = []"
@click-choose="clickChoose"
></file-oper-batch>
</div>
<MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
@ -87,7 +111,15 @@ const { ipcRenderer } = window.electron || {}
export default {
name: 'Prepare',
components: { ChooseTextbook, Refresh, uploadDialog, FileListItem, FileOperBatch, MoveFile, SetHomework },
components: {
ChooseTextbook,
Refresh,
uploadDialog,
FileListItem,
FileOperBatch,
MoveFile,
SetHomework
},
data() {
return {
moveFile: [],
@ -125,6 +157,13 @@ export default {
)
}
},
watch: {
$route(to) {
if (to.path != '/prepare' && this.timerId) {
clearInterval(this.timerId)
}
}
},
created() {
this.userStore = useUserStore().user
ipcRenderer.removeAllListeners('copy-file-default-reply')
@ -132,10 +171,8 @@ export default {
this.callback(param)
})
this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
},
mounted() {
},
mounted() {},
activated() {
if (this.uploadData.textbookId !== null) {
this.asyncAllFile()
@ -287,16 +324,20 @@ export default {
this.createTimer()
}
// key linkConfig.js
let configObj = outLink[key]
let configObj = outLink()[key]
//
ipcRenderer.send('openWindow', {
fullPath: configObj.fullPath,
cookieData: { ...(configObj.data) }
cookieData: { ...configObj.data }
})
},
// ID ID
getChapterId() {
return listEntpcourse({ evalid: this.uploadData.levelSecondId, edituserid: this.userStore.userId, pageSize: 500 })
return listEntpcourse({
evalid: this.uploadData.levelSecondId,
edituserid: this.userStore.userId,
pageSize: 500
})
},
//
createTimer() {
@ -306,20 +347,22 @@ export default {
},
//
getHomeWorkList() {
homeworklist({ entpcourseid: this.entpcourseid, edituserid: this.userStore.userId, pageSize: 100 }).then(res => {
homeworklist({
entpcourseid: this.entpcourseid,
edituserid: this.userStore.userId,
pageSize: 100
}).then((res) => {
// AIx web
let list = []
for (var i = 0; i < res.rows.length; i++) {
res.rows[i].taskconfig = [];
res.rows[i].taskconfig = []
// child
for (var j = 0; j < res.rows.length; j++) {
if (res.rows[j].parentid == res.rows[i].id) {
var ss = [];
var ss = []
if (res.rows[j].classworkdatastudentids != null) {
ss = JSON.parse('[' + res.rows[j].classworkdatastudentids + ']');
ss = JSON.parse('[' + res.rows[j].classworkdatastudentids + ']')
}
var js = {
id: res.rows[j].id,
@ -342,7 +385,7 @@ export default {
weights: res.rows[j].weights,
feedtype: res.rows[j].feedtype
}
res.rows[i].taskconfig.push(js);
res.rows[i].taskconfig.push(js)
}
}
res.rows[i].fileShowName = res.rows[i].uniquekey
@ -350,15 +393,16 @@ export default {
// slideid>0PPT
// 2024-05-15jackyshen
if (res.rows[i].classid == 0 && res.rows[i].slideid == 0) {
list.push(res.rows[i]);
list.push(res.rows[i])
}
//
if (res.rows[i].entpcourseworklist != '') {
res.rows[i].entpcourseworklistarray = JSON.parse('[' + res.rows[i].entpcourseworklist + ']');
res.rows[i].entpcourseworklistarray = JSON.parse(
'[' + res.rows[i].entpcourseworklist + ']'
)
} else {
res.rows[i].entpcourseworklistarray = [];
res.rows[i].entpcourseworklistarray = []
}
}
//
@ -368,10 +412,10 @@ export default {
})
},
//
openSet(){
openSet() {
this.setDialog = true
},
closeHomework(){
closeHomework() {
this.setDialog = false
},
// PDF-
@ -382,13 +426,6 @@ export default {
openLesson() {
createWindow('tool-sphere', { url: '/tool/sphere' })
}
},
watch: {
$route(to) {
if (to.path != '/prepare' && this.timerId) {
clearInterval(this.timerId)
}
}
}
}
</script>
@ -478,7 +515,7 @@ export default {
border-color: #ffffff;
&:hover {
background: rgba(255, 255, 255, 0.3)
background: rgba(255, 255, 255, 0.3);
}
&:first-child {
@ -515,7 +552,6 @@ export default {
flex-wrap: wrap;
justify-content: space-between;
padding: 0 20px;
}
.prepare-body-main {