fix:将展开收起按钮 抽至header组件内 ,解决 termail 拖动蒙层显示不全的问题

This commit is contained in:
zhangyu
2021-05-14 10:14:02 +08:00
parent 46d9c8f98f
commit 135c6bbfbb
20 changed files with 47 additions and 57 deletions

View File

@@ -473,7 +473,6 @@ export default {
this.panelIdInner = panelId this.panelIdInner = panelId
this.data = chartItem this.data = chartItem
this.detail = detail this.detail = detail
console.log(detail);
if (this.detail[0] && this.detail[0].type && this.detail[0].type == 'endpointInfo') { // endpointInfo的小图表 if (this.detail[0] && this.detail[0].type && this.detail[0].type == 'endpointInfo') { // endpointInfo的小图表
this.$nextTick(() => { this.$nextTick(() => {
this.initChart(this.detail[0].data.stateSeries) this.initChart(this.detail[0].data.stateSeries)

View File

@@ -1490,7 +1490,6 @@ export default {
// } // }
// }) // })
Promise.all(arr).then(res => { Promise.all(arr).then(res => {
console.log(res)
if (res) { if (res) {
const basic = res[0].data const basic = res[0].data
// basic.cabinet = basic.cabinet ? basic.cabinet.name : '-' // basic.cabinet = basic.cabinet ? basic.cabinet.name : '-'
@@ -1516,7 +1515,6 @@ export default {
// principal: basic.dc ? basic.dc.principal : '-', // principal: basic.dc ? basic.dc.principal : '-',
// tel: basic.tel, // tel: basic.tel,
} }
console.log(obj)
basic && detail.push({ basic && detail.push({
title: vm.$t('project.chart.basicTitle'), title: vm.$t('project.chart.basicTitle'),
type: 'basic', type: 'basic',

View File

@@ -158,8 +158,8 @@
width:100%; width:100%;
} }
/* 上滑resize工具条 */ /* 上滑resize工具条 */
.resize-modal{ .cli .resize-modal{
width: 100vw !important;
} }
.sub-list-resize, .sub-list-resize-copy { .sub-list-resize, .sub-list-resize-copy {
display: flex; display: flex;

View File

@@ -7,7 +7,7 @@
<div class="sub-list-resize-copy"></div> <div class="sub-list-resize-copy"></div>
</div> </div>
<div id="shell-split" class="shell-split shell-iconfont" @mousedown="dragEagle" v-show="!isFullScreen"></div>--> <div id="shell-split" class="shell-split shell-iconfont" @mousedown="dragEagle" v-show="!isFullScreen"></div>-->
<div :class="{'shell-service-max': isFullScreen,'shell-service':true}" class="sub-box ani-webSHH-height" data-yunlog-scope="popup" id="shell-service" ref="webSShBox" style="height: 0;background: #000"> <div :class="{'shell-service-max': isFullScreen,'shell-service':true}" class="sub-box ani-webSHH-height cli" data-yunlog-scope="popup" id="shell-service" ref="webSShBox" style="height: 0;background: #000">
<div class="resize-modal"> <div class="resize-modal">
<div class="sub-list-resize-copy" style="width: 100%"></div> <div class="sub-list-resize-copy" style="width: 100%"></div>
</div> </div>

View File

@@ -96,7 +96,6 @@ export default {
} }
}, },
created () { created () {
console.log(this.$route);
}, },
methods: { methods: {
// 切换tab // 切换tab

View File

@@ -148,10 +148,8 @@ export default {
this.object.type = this.object.module.type this.object.type = this.object.module.type
this.rightBox.editShow = true this.rightBox.editShow = true
}) })
console.log(1)
}, },
closeRightEditBox (refresh) { closeRightEditBox (refresh) {
console.log(2)
this.rightBox.editShow = false this.rightBox.editShow = false
if (refresh) { if (refresh) {
this.delFlag = true this.delFlag = true

View File

@@ -243,7 +243,6 @@ export default {
if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) { if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
const arr = localStorageTableTitle.splice(this.$refs.dataTable.tableTitle.length,localStorageTableTitle.length) const arr = localStorageTableTitle.splice(this.$refs.dataTable.tableTitle.length,localStorageTableTitle.length)
this.tools.customTableTitle = this.tools.customTableTitle.concat(arr) this.tools.customTableTitle = this.tools.customTableTitle.concat(arr)
console.log(this.tools.customTableTitle)
} }
if (!this.fromBottom) { if (!this.fromBottom) {
this.getTableData() this.getTableData()

View File

@@ -35,7 +35,6 @@ export default {
break break
} }
case 'recordTab': { case 'recordTab': {
console.log(command, row)
this.$emit('showBottomBox', 'recordTab', row) this.$emit('showBottomBox', 'recordTab', row)
break break
} }

View File

@@ -289,7 +289,6 @@ export default {
}, },
watch: { watch: {
showDialog (n) { showDialog (n) {
console.log(n)
this.visible = n this.visible = n
}, },
activeIndex (n) { activeIndex (n) {

View File

@@ -345,7 +345,6 @@ export default {
} }
}, },
handleSelect (item) { handleSelect (item) {
console.log(item)
} }
} }
} }

View File

@@ -541,7 +541,6 @@ export default {
selectEndpointList: { selectEndpointList: {
immediate: true, immediate: true,
handler (n) { handler (n) {
console.log(n)
this.endpointTableData = JSON.parse(JSON.stringify(n)) this.endpointTableData = JSON.parse(JSON.stringify(n))
this.endpointTableData.forEach(item => { this.endpointTableData.forEach(item => {
item.configs = JSON.parse(item.configs) item.configs = JSON.parse(item.configs)

View File

@@ -231,7 +231,6 @@ export default {
this.editMib = JSON.parse(JSON.stringify(n)) this.editMib = JSON.parse(JSON.stringify(n))
if (this.editMib.models) { if (this.editMib.models) {
this.selectedModels = this.editMib.models.split(',') this.selectedModels = this.editMib.models.split(',')
console.log(this.selectedModels)
} else { } else {
this.selectedModels = [] this.selectedModels = []
} }

View File

@@ -453,7 +453,6 @@ export default {
} else { } else {
this.authType = 0 this.authType = 0
} }
console.log(params)
this.$refs.moduleForm.validate((valid) => { this.$refs.moduleForm.validate((valid) => {
if (valid) { if (valid) {
this.prevent_opt.save = true this.prevent_opt.save = true

View File

@@ -131,7 +131,6 @@ export default {
bottomBoxWindow.listResize(vm, e) bottomBoxWindow.listResize(vm, e)
}, },
showBottomBox (targetTab, row) { showBottomBox (targetTab, row) {
console.log(targetTab, row)
this.bottomBox.targetTab = targetTab this.bottomBox.targetTab = targetTab
this.bottomBox.object = JSON.parse(JSON.stringify(row)) this.bottomBox.object = JSON.parse(JSON.stringify(row))
this.bottomBox.showSubList = true this.bottomBox.showSubList = true

View File

@@ -1,5 +1,6 @@
<template> <template>
<div class="header"> <div class="header">
<div class="left-menu--pin" :class="!isShrink?'left-menu--pin-normal':'left-menu--pin-reverse'" @click="shrink"><i :class="{'icon-reverse': isShrink,}" class="el-icon-s-fold"></i></div>
<el-breadcrumb class="nz-breakcrumb" separator="/"> <el-breadcrumb class="nz-breakcrumb" separator="/">
<el-breadcrumb-item v-for="crumb in breadcrumb" :key="crumb.code">{{$t(crumb.i18n)}}</el-breadcrumb-item> <el-breadcrumb-item v-for="crumb in breadcrumb" :key="crumb.code">{{$t(crumb.i18n)}}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
@@ -177,7 +178,10 @@ export default {
history.pushState(null, null, document.URL) history.pushState(null, null, document.URL)
window.addEventListener('popstate', this.cancel, false) window.addEventListener('popstate', this.cancel, false)
} }
} },
shrink () {
this.$store.commit('isShrink')
},
}, },
mounted () { mounted () {
this.$i18n.locale = this.language this.$i18n.locale = this.language
@@ -212,6 +216,9 @@ export default {
} }
} }
return breadcrumb return breadcrumb
},
isShrink () {
return this.$store.getters.getIsShrink
} }
}, },
beforeDestroy () { beforeDestroy () {
@@ -296,13 +303,34 @@ export default {
color: white; color: white;
font-size: 6px; font-size: 6px;
} }
.left-menu--pin {
width: 20px;
font-size: 20px;
font-weight: 100;
color: #999999;
transition: all .4s;
height: 100%;
line-height: 50px;
margin-left: 10px;
i {
transform: rotateY(0);
transition: transform .4s;
}
i.icon-reverse {
transform: rotateY(180deg);
}
}
.left-menu--pin-normal{
}
.left-menu--pin-reverse{
}
} }
.link-title a { .link-title a {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
.nz-breakcrumb { .nz-breakcrumb {
padding-left: 34px; padding-left: 15px;
line-height: 50px; line-height: 50px;
.el-breadcrumb__item .el-breadcrumb__inner { .el-breadcrumb__item .el-breadcrumb__inner {

View File

@@ -29,7 +29,6 @@
</el-menu-item> </el-menu-item>
</template> </template>
</el-menu> </el-menu>
<div class="left-menu--pin" :class="!isShrink?'left-menu--pin-normal':'left-menu--pin-reverse'" @click="shrink"><i :class="{'icon-reverse': isShrink,}" class="el-icon-s-fold"></i></div>
</div> </div>
</template> </template>
@@ -40,7 +39,6 @@ export default {
}, },
data () { data () {
return { return {
isShrink: localStorage.getItem('nz-left-menu-shrink') == 'true',
systemName: localStorage.getItem('nz-sys-name'), systemName: localStorage.getItem('nz-sys-name'),
logo: '' logo: ''
} }
@@ -76,13 +74,12 @@ export default {
}, },
route () { route () {
return this.$route.path return this.$route.path
},
isShrink () {
return this.$store.getters.getIsShrink
} }
}, },
methods: { methods: {
shrink () {
this.isShrink = !this.isShrink
localStorage.setItem('nz-left-menu-shrink', this.isShrink)
},
jump (route) { jump (route) {
if (route === this.route) { if (route === this.route) {
this.refresh() this.refresh()
@@ -186,32 +183,6 @@ export default {
width: 6px; width: 6px;
height: 14px; height: 14px;
} }
.left-menu--pin {
position: fixed;
height: 20px;
width: 20px;
line-height: 20px;
font-size: 20px;
font-weight: 100;
color: #999999;
transition: all .4s;
i {
transform: rotateY(0);
transition: transform .4s;
}
i.icon-reverse {
transform: rotateY(180deg);
}
}
.left-menu--pin-normal{
top: 15px;
left: 250px;
}
.left-menu--pin-reverse{
top: 15px;
left: 74px;
}
>.el-menu.header-logo { >.el-menu.header-logo {
border-right: none; border-right: none;
>.el-menu-item { >.el-menu-item {

View File

@@ -768,7 +768,6 @@ export default {
}, },
handleLogoChange (file, fileList) { handleLogoChange (file, fileList) {
const imageTypes = ['image/jpeg', 'image/jpg', 'image/png'] const imageTypes = ['image/jpeg', 'image/jpg', 'image/png']
console.log(file.raw.type)
const isImage = imageTypes.some(t => file.raw.type === t) const isImage = imageTypes.some(t => file.raw.type === t)
const isLt2M = file.raw.size / 1024 / 1024 < 2 const isLt2M = file.raw.size / 1024 / 1024 < 2

View File

@@ -122,7 +122,6 @@ export default {
pin: '', pin: '',
pinChange: '' pinChange: ''
} }
console.log(this.object);
this.rightBox.show = true this.rightBox.show = true
} }
}) })

View File

@@ -127,7 +127,6 @@ export default {
computed: { computed: {
}, },
created () { created () {
console.log(this.$store.state.currentProject)
}, },
mounted () { mounted () {
}, },

View File

@@ -33,7 +33,8 @@ const store = new Vuex.Store({
overViewProject: {}, overViewProject: {},
dcDataRefresh: false, dcDataRefresh: false,
showTopoScreen: false, showTopoScreen: false,
logo: '' logo: '',
isShrink: localStorage.getItem('nz-left-menu-shrink') == 'true'
}, },
getters: { getters: {
getLinkData (state) { getLinkData (state) {
@@ -63,7 +64,10 @@ const store = new Vuex.Store({
getLogo (state) { getLogo (state) {
console.log('get logo', state) console.log('get logo', state)
return state.logo return state.logo
} },
getIsShrink (state) {
return state.isShrink
},
}, },
mutations: { mutations: {
/* 监听对象变化,用于顶部菜单与底部内容的同步 */ /* 监听对象变化,用于顶部菜单与底部内容的同步 */
@@ -138,6 +142,10 @@ const store = new Vuex.Store({
setLogo (state, logo) { setLogo (state, logo) {
console.log('set log', logo) console.log('set log', logo)
state.logo = logo state.logo = logo
},
isShrink (state) {
state.isShrink = !state.isShrink
localStorage.setItem('nz-left-menu-shrink', state.isShrink)
} }
}, },
actions: { actions: {