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

合并版本v0.8.3.1

This commit is contained in:
wuhongjian 2022-07-26 18:08:52 +08:00
parent e8dc08504c a0361b2eba
commit 13622255f8
5 changed files with 159 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

32
back/src/views/modules/ability/bsabilityai.vue
View File

@ -50,7 +50,7 @@
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
:height="qp ? '650px' : '650px'"
height="650px"
>
<el-table-column
type="selection"
@ -126,7 +126,7 @@
fixed="right"
header-align="center"
align="center"
width="300"
width="150"
>
<template slot-scope="scope">
<!-- <el-button
@ -284,7 +284,7 @@ export default {
selectType: 0,
type: '组件服务'
},
qp: false,
// qp: false,
// 关联应用弹窗
relateApplicationVisible: false,
relateInfo: {
@ -306,8 +306,8 @@ export default {
this.dataForm.type = '组件服务'
},
mounted () {
window.addEventListener('resize', this.a)
this.fullScreen()
// window.addEventListener('resize', this.a)
// this.fullScreen()
},
methods: {
reset () {
@ -448,17 +448,17 @@ export default {
this.$message.error('查询信息不能为空')
}
},
fullScreen () {
if (window.outerHeight === screen.availHeight) {
if (window.outerWidth === screen.availWidth) {
this.qp = false
} else {
this.qp = true
}
} else {
this.qp = true
}
},
// fullScreen () {
// if (window.outerHeight === screen.availHeight) {
// if (window.outerWidth === screen.availWidth) {
// this.qp = false
// } else {
// this.qp = true
// }
// } else {
// this.qp = true
// }
// },
// 点击关联应用按钮
showRelateApplication (row) {
this.$http

70
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -52,7 +52,7 @@
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
:height="qp ? '810px' : '650px'"
height="650px"
>
<el-table-column
type="selection"
@ -287,8 +287,8 @@ export default {
this.dataForm.type = '应用资源'
},
mounted () {
window.addEventListener('resize', this.a)
this.fullScreen()
// window.addEventListener('resize', this.a)
// this.fullScreen()
},
methods: {
reset () {
@ -425,38 +425,38 @@ export default {
this.$message.error('查询不能输入为空')
}
},
fullScreen () {
if (window.outerHeight === screen.availHeight) {
if (window.outerWidth === screen.availWidth) {
console.log(
'全屏1',
window.outerHeight,
screen.availHeight,
window.outerWidth,
screen.availWidth
)
this.qp = false
} else {
console.log(
'不是全屏2',
window.outerHeight,
screen.availHeight,
window.outerWidth,
screen.availWidth
)
this.qp = true
}
} else {
console.log(
'不是全屏3',
window.outerHeight,
screen.availHeight,
window.outerWidth,
screen.availWidth
)
this.qp = true
}
},
// fullScreen () {
// if (window.outerHeight === screen.availHeight) {
// if (window.outerWidth === screen.availWidth) {
// console.log(
// '全屏1',
// window.outerHeight,
// screen.availHeight,
// window.outerWidth,
// screen.availWidth
// )
// this.qp = false
// } else {
// console.log(
// '不是全屏2',
// window.outerHeight,
// screen.availHeight,
// window.outerWidth,
// screen.availWidth
// )
// this.qp = true
// }
// } else {
// console.log(
// '不是全屏3',
// window.outerHeight,
// screen.availHeight,
// window.outerWidth,
// screen.availWidth
// )
// this.qp = true
// }
// },
// 应用与组件
applyAndAssembly (val) {
console.log('vvvv', val)

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

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