Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
851673013@qq.com 2022-06-21 17:08:06 +08:00
commit 5a021de654
3 changed files with 20 additions and 11 deletions

View File

@ -1,12 +1,12 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-04-01 10:51:45
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-21 16:58:56
* @Description: 数据资源参数配置
*/
// const newLocation = 'qingdao'
const newLocation = 'baotou'
const newLocation = 'qingdao'
// const newLocation = 'baotou'
// const newLocation = 'xihaian'
//

View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.wuhongjian
* @Date: 2022-05-06 11:12:00
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-13 17:45:49
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-06-21 16:59:46
* @Description: 告诉大家这是什么
-->
<template>
@ -26,4 +26,11 @@
</script>
<style lang="less">
@import '~@/vab/styles/vab.less';
#vue-admin-beautiful{
max-width: 1920px;
max-height: 1080px;
margin: auto;
height: 100%;
position: relative;
}
</style>

View File

@ -131,6 +131,7 @@
const select = ref(router.currentRoute.value.name)
const mynoticeFlag = ref(false)
const mynoticeData = ref([])
// eslint-disable-next-line no-undef
const navList = ref(navListManagement.navList)
const props = defineProps({
showView: { type: String, default: '' },
@ -264,21 +265,21 @@
if (mynoticeDom) {
mynoticeDom.addEventListener('mouseover', () => {
mynoticeFlag.value = true
document.documentElement.style.overflow = 'hidden'
document.documentElement.style.overflowY = 'hidden'
})
mynoticeDom.addEventListener('mouseout', () => {
mynoticeFlag.value = false
document.documentElement.style.overflow = 'scroll'
document.documentElement.style.overflowY = 'scroll'
})
}
if (mynotice) {
mynotice.addEventListener('mouseover', () => {
mynoticeFlag.value = true
document.documentElement.style.overflow = 'hidden'
document.documentElement.style.overflowY = 'hidden'
})
mynotice.addEventListener('mouseout', () => {
mynoticeFlag.value = false
document.documentElement.style.overflow = 'scroll'
document.documentElement.style.overflowY = 'scroll'
})
}
mybus.on('getSgcNum', () => {
@ -296,7 +297,7 @@
}
.home-header {
height: 0.64rem;
width: 100%;
// width: 100%;
display: flex;
justify-content: center;
align-items: center;
@ -362,6 +363,7 @@
}
.white {
background-color: #fff;
box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
.name {
color: #0058e1;
}