zhuhao_dev #5

Merged
zhuhao merged 4 commits from zhuhao_dev into main 2024-07-09 17:50:19 +08:00
2 changed files with 5 additions and 5 deletions
Showing only changes of commit f5d94a710c - Show all commits

View File

@ -52,7 +52,7 @@ import useUserStore from '@/store/modules/user'
const userStore = useUserStore() const userStore = useUserStore()
const userInfo = userStore.user const userInfo = userStore.user
// const { ipcRenderer } = window.electron const { ipcRenderer } = window.electron||{}
const radio1 = ref('resource') const radio1 = ref('resource')
@ -65,7 +65,7 @@ const minimizeWindow = () => {
} }
// //
const maximizeWindow = () => { const maximizeWindow = () => {
ipcRenderer.send('maximize-window') ipcRenderer?.send('maximize-window')
isMaxSize.value = !isMaxSize.value isMaxSize.value = !isMaxSize.value
} }
// //

View File

@ -87,7 +87,7 @@ service.interceptors.response.use(res => {
ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false; isRelogin.show = false;
useUserStore().logOut().then(() => { useUserStore().logOut().then(() => {
location.href = '/index'; location.href = '/index#/login';
}) })
}).catch(() => { }).catch(() => {
isRelogin.show = false; isRelogin.show = false;