-
+
@@ -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(()=>{
- // router.replace('/login')
- ipcRenderer && ipcRenderer.send('openLoginWindow')
+ })
+ .then(() => {
+ userStore
+ .logOut()
+ .then(() => {
+ // router.replace('/login')
+ ipcRenderer && ipcRenderer.send('openLoginWindow')
+ })
+ .catch(() => {
+ // router.replace('/login')
+ ipcRenderer && ipcRenderer.send('openLoginWindow')
+ })
})
- }).catch(() => { });
+ .catch(() => {})
}
const emits = defineEmits(['setLayout'])
function setLayout() {
- emits('setLayout');
+ emits('setLayout')
}
@@ -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;
diff --git a/src/renderer/src/layout/index.vue b/src/renderer/src/layout/index.vue
index d8ad008..d3478db 100644
--- a/src/renderer/src/layout/index.vue
+++ b/src/renderer/src/layout/index.vue
@@ -32,6 +32,6 @@ let uploaderStore = ref(uploaderState())
height: 80px;
}
.el-main {
- --el-main-padding: 0 20px;
+ --el-main-padding: 0 20px 0 0;
}
diff --git a/src/renderer/src/store/modules/route.js b/src/renderer/src/store/modules/route.js
new file mode 100644
index 0000000..9275ddd
--- /dev/null
+++ b/src/renderer/src/store/modules/route.js
@@ -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
diff --git a/src/renderer/src/store/modules/user.js b/src/renderer/src/store/modules/user.js
index a471f2a..3878eb7 100644
--- a/src/renderer/src/store/modules/user.js
+++ b/src/renderer/src/store/modules/user.js
@@ -1,101 +1,105 @@
-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',
- {
- state: () => ({
- token: getToken(),
- id: '',
- name: '',
- avatar: '',
- roles: [],
- permissions: [],
- user: {}
- }),
- actions: {
- // 登录
- login(userInfo) {
- const username = userInfo.username.trim()
- const password = userInfo.password
- const code = userInfo.code
- const uuid = userInfo.uuid
- return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
+const useUserStore = defineStore('user', {
+ state: () => ({
+ token: getToken(),
+ id: '',
+ name: '',
+ avatar: '',
+ roles: [],
+ permissions: [],
+ user: {}
+ }),
+ actions: {
+ // 登录
+ login(userInfo) {
+ const username = userInfo.username.trim()
+ const password = userInfo.password
+ const code = userInfo.code
+ const uuid = userInfo.uuid
+ return new Promise((resolve, reject) => {
+ login(username, password, code, uuid)
+ .then((res) => {
setToken(res.token)
this.token = res.token
resolve(res)
- }).catch(error => {
+ })
+ .catch((error) => {
reject(error)
})
- })
- },
- // 获取用户信息
- getInfo() {
- return new Promise((resolve, reject) => {
- getInfo().then(res => {
+ })
+ },
+ // 获取用户信息
+ getInfo() {
+ return new Promise((resolve, reject) => {
+ 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;
+ this.user = user
+ 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)
})
- })
- },
- // 退出系统
- logOut() {
- return new Promise((resolve, reject) => {
- logout(this.token).then(() => {
+ })
+ },
+ // 退出系统
+ logOut() {
+ return new Promise((resolve, reject) => {
+ logout(this.token)
+ .then(() => {
this.token = ''
this.roles = []
this.permissions = []
localStorage.clear()
removeToken()
resolve()
- }).catch(error => {
+ })
+ .catch((error) => {
removeToken() // zdg: 网络异常时，清除前端退出进入登录页
reject(error)
})
- })
- }
- },
- persist: true
- })
+ })
+ }
+ },
+ persist: true
+})
export default useUserStore
diff --git a/src/renderer/src/utils/linkConfig.js b/src/renderer/src/utils/linkConfig.js
index 460b30e..6689322 100644
--- a/src/renderer/src/utils/linkConfig.js
+++ b/src/renderer/src/utils/linkConfig.js
@@ -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}`
+ }
+ }
+ }
}
diff --git a/src/renderer/src/views/prepare/container/file-list-item.vue b/src/renderer/src/views/prepare/container/file-list-item.vue
index 538c32f..07e3489 100644
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@@ -34,9 +34,6 @@
-
+
+
-
- ![]()
- ![]()
+
{{ userStore.user.nickName }}
+ {{ userStore.user.nickName }}
-
作业反馈
布置作业
上传资料
- 新建课件
+ 新建课件
-
-
@@ -41,23 +47,42 @@