wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

bug修复

This commit is contained in:
wuhongjian 2022-07-26 18:08:24 +08:00
parent efa51429f9
commit c2b323b14c
3 changed files with 108 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
back/src/views/main-navbar.vue
View File

@ -100,25 +100,25 @@
</nav> </nav>
</template> </template>
<script> <script>
import { messages } from "@/i18n"; import { messages } from '@/i18n'
import screenfull from "screenfull"; import screenfull from 'screenfull'
import UpdatePassword from "./main-navbar-update-password"; import UpdatePassword from './main-navbar-update-password'
import { clearLoginInfo } from "@/utils"; import { clearLoginInfo } from '@/utils'
// import Cookies from 'js-cookie' // import Cookies from 'js-cookie'
// var socket = null // var socket = null
export default { export default {
inject: ["refresh"], inject: ['refresh'],
data() { data () {
return { return {
i18nMessages: messages, i18nMessages: messages,
updatePasswordVisible: false, updatePasswordVisible: false,
messageTip: false, messageTip: false
}; }
}, },
components: { components: {
UpdatePassword, UpdatePassword
}, },
created() { created () {
// var vue = this // var vue = this
// socket = new WebSocket(`${window.SITE_CONFIG['socketURL']}?token=${Cookies.get('token')}`) // socket = new WebSocket(`${window.SITE_CONFIG['socketURL']}?token=${Cookies.get('token')}`)
// socket.onopen = function () {} // socket.onopen = function () {}
@ -144,70 +144,70 @@ export default {
// } // }
// 未读通知数 // 未读通知数
this.getUnReadCount(); this.getUnReadCount()
}, },
methods: { methods: {
myNoticeRouter() { myNoticeRouter () {
this.$router.replace("notice-notice-user"); this.$router.replace('notice-notice-user')
}, },
getUnReadCount() { getUnReadCount () {
this.$http this.$http
.get("/sys/notice/mynotice/unread") .get('/sys/notice/mynotice/unread')
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg)
} }
if (res.data > 0) { if (res.data > 0) {
this.messageTip = true; this.messageTip = true
} }
}) })
.catch(() => {}); .catch(() => {})
}, },
// 全屏 // 全屏
fullscreenHandle() { fullscreenHandle () {
if (!screenfull.enabled) { if (!screenfull.enabled) {
return this.$message({ return this.$message({
message: this.$t("fullscreen.prompt"), message: this.$t('fullscreen.prompt'),
type: "warning", type: 'warning',
duration: 500, duration: 500
}); })
} }
screenfull.toggle(); screenfull.toggle()
}, },
// 修改密码 // 修改密码
updatePasswordHandle() { updatePasswordHandle () {
this.updatePasswordVisible = true; this.updatePasswordVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.updatePassword.init(); this.$refs.updatePassword.init()
}); })
}, },
// 退出 // 退出
logoutHandle() { logoutHandle () {
this.$confirm( this.$confirm(
this.$t("prompt.info", { handle: this.$t("logout") }), this.$t('prompt.info', { handle: this.$t('logout') }),
this.$t("prompt.title"), this.$t('prompt.title'),
{ {
confirmButtonText: this.$t("confirm"), confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t("cancel"), cancelButtonText: this.$t('cancel'),
type: "warning", type: 'warning'
} }
) )
.then(() => { .then(() => {
this.$http this.$http
.post("/logout") .post('/logout')
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg)
} }
clearLoginInfo(); clearLoginInfo()
this.$router.push({ name: "login" }); this.$router.push({ name: 'login' })
}) })
.catch(() => {}); .catch(() => {})
}) })
.catch(() => {}); .catch(() => {})
}, }
}, }
}; }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@font-face { @font-face {

128
back/src/views/main.vue
View File

@ -16,122 +16,122 @@
</template> </template>
<script> <script>
import MainNavbar from "./main-navbar"; import MainNavbar from './main-navbar'
import MainSidebar from "./main-sidebar"; import MainSidebar from './main-sidebar'
import MainContent from "./main-content"; import MainContent from './main-content'
import MainThemeTools from "./main-theme-tools"; import MainThemeTools from './main-theme-tools'
import debounce from "lodash/debounce"; import debounce from 'lodash/debounce'
import { isURL } from "@/utils/validate"; import { isURL } from '@/utils/validate'
export default { export default {
provide() { provide () {
return { return {
// 刷新 // 刷新
refresh() { refresh () {
this.$store.state.contentIsNeedRefresh = true; this.$store.state.contentIsNeedRefresh = true
this.$nextTick(() => { this.$nextTick(() => {
this.$store.state.contentIsNeedRefresh = false; this.$store.state.contentIsNeedRefresh = false
}); })
}
}
}, },
}; data () {
},
data() {
return { return {
loading: true, loading: true
}; }
}, },
components: { components: {
MainNavbar, MainNavbar,
MainSidebar, MainSidebar,
MainContent, MainContent,
MainThemeTools, MainThemeTools
}, },
watch: { watch: {
$route: "routeHandle", $route: 'routeHandle'
}, },
created() { created () {
this.windowResizeHandle(); this.windowResizeHandle()
this.routeHandle(this.$route); this.routeHandle(this.$route)
Promise.all([this.getUserInfo(), this.getPermissions()]).then(() => { Promise.all([this.getUserInfo(), this.getPermissions()]).then(() => {
this.loading = false; this.loading = false
}); })
}, },
methods: { methods: {
// 窗口改变大小 // 窗口改变大小
windowResizeHandle() { windowResizeHandle () {
this.$store.state.sidebarFold = this.$store.state.sidebarFold =
document.documentElement["clientWidth"] <= 992 || false; document.documentElement.clientWidth <= 992 || false
window.addEventListener( window.addEventListener(
"resize", 'resize',
debounce(() => { debounce(() => {
this.$store.state.sidebarFold = this.$store.state.sidebarFold =
document.documentElement["clientWidth"] <= 992 || false; document.documentElement.clientWidth <= 992 || false
}, 150) }, 150)
); )
}, },
// 路由, 监听 // 路由, 监听
routeHandle(route) { routeHandle (route) {
if (!route.meta.isTab) { if (!route.meta.isTab) {
return false; return false
} }
let tab = {}; let tab = {}
let routeName = route.name; let routeName = route.name
let routeMeta = route.meta; const routeMeta = route.meta
if (route.name === "iframe") { if (route.name === 'iframe') {
let url = route.query.url || ""; const url = route.query.url || ''
if (!isURL(url)) { if (!isURL(url)) {
return false; return false
} }
let key = route.query.key || new Date().getTime(); const key = route.query.key || new Date().getTime()
routeName = `${routeName}_${key}`; routeName = `${routeName}_${key}`
routeMeta.title = key.toString(); routeMeta.title = key.toString()
routeMeta.menuId = route.query.menuId || ""; routeMeta.menuId = route.query.menuId || ''
routeMeta.iframeURL = url; routeMeta.iframeURL = url
} }
tab = this.$store.state.contentTabs.filter( tab = this.$store.state.contentTabs.filter(
(item) => item.name === routeName (item) => item.name === routeName
)[0]; )[0]
if (!tab) { if (!tab) {
tab = { tab = {
...window.SITE_CONFIG["contentTabDefault"], ...window.SITE_CONFIG.contentTabDefault,
...routeMeta, ...routeMeta,
name: routeName, name: routeName,
params: { ...route.params }, params: { ...route.params },
query: { ...route.query }, query: { ...route.query }
};
this.$store.state.contentTabs =
this.$store.state.contentTabs.concat(tab);
} }
this.$store.state.sidebarMenuActiveName = tab.menuId; this.$store.state.contentTabs =
this.$store.state.contentTabsActiveName = tab.name; this.$store.state.contentTabs.concat(tab)
}
this.$store.state.sidebarMenuActiveName = tab.menuId
this.$store.state.contentTabsActiveName = tab.name
}, },
// 获取当前管理员信息 // 获取当前管理员信息
getUserInfo() { getUserInfo () {
return this.$http return this.$http
.get("/sys/user/info") .get('/sys/user/info')
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg)
} }
this.$store.state.user.id = res.data.id; this.$store.state.user.id = res.data.id
this.$store.state.user.name = res.data.username; this.$store.state.user.name = res.data.realName
this.$store.state.user.superAdmin = res.data.superAdmin; this.$store.state.user.superAdmin = res.data.superAdmin
}) })
.catch(() => {}); .catch(() => {})
}, },
// 获取权限 // 获取权限
getPermissions() { getPermissions () {
return this.$http return this.$http
.get("/sys/menu/permissions") .get('/sys/menu/permissions')
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg)
} }
window.SITE_CONFIG["permissions"] = res.data; window.SITE_CONFIG.permissions = res.data
}) })
.catch(() => {}); .catch(() => {})
}, }
}, }
}; }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.aui-content__wrapper { .aui-content__wrapper {

2
front/src/views/home/components/header.vue
View File

@ -122,6 +122,7 @@
import { mynotice } from '@/api/home' import { mynotice } from '@/api/home'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home' import { getSgcTotal } from '@/api/home'
import Cookies from 'js-cookie'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
@ -222,6 +223,7 @@
}) })
break break
case '后台管理': case '后台管理':
Cookies.remove('JESSIONID')
window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench') window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
// window.reload('http://15.2.21.238:9797') // window.reload('http://15.2.21.238:9797')
break break