diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue new file mode 100644 index 000000000..0ac72f611 --- /dev/null +++ b/nezha-fronted/src/components/common/leftMenu.vue @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index eaa3c9050..028597814 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -5,7 +5,8 @@ - + + {{$t('alert.alert')}} @@ -14,7 +15,7 @@ {{$t('alert.alertConfig')}} - + @@ -94,6 +95,7 @@ + diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 0297d01a3..583b51588 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -5,7 +5,8 @@ - + + {{$t('alert.alert')}} {{$t('alert.alertList')}} @@ -14,7 +15,7 @@ - + @@ -128,6 +129,7 @@ + diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 967c65935..399715131 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -1,7 +1,7 @@ - - + + {{$t('asset.asset')}} @@ -89,8 +89,7 @@ - - + @@ -254,6 +253,7 @@ @exitFullScreen="exitFullScreen" @listResize="listResize" > + @@ -400,7 +400,7 @@ }, { label: this.$t("asset.tableTitle.procurementDate"), prop: 'purchaseDate', - show: true, + show: false, }, { label: this.$t("asset.tableTitle.principal"), prop: 'principal', diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index 8d10c1c67..14a53f7cb 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -5,7 +5,8 @@ - + + {{$t('overall.config')}} {{$t('config.account.account')}} @@ -32,7 +33,7 @@ - + @@ -112,7 +113,7 @@ - + @@ -571,7 +572,7 @@ } } this.getTableData(); - } + }, }, computed: { isCurrentUser() { diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 2b06ec23a..4938208fd 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -33,7 +33,8 @@ - + + {{$t('overall.config')}} @@ -63,7 +64,7 @@ - + @@ -81,6 +82,7 @@ class="nz-table" :data="tableData" border + tooltip-effect="light" v-show="mainResizeShow" v-scrollBar:el-table :height="mainTableHeight" @@ -88,6 +90,7 @@ style="width: 100%;"> + - + + {{$t('overall.config')}} @@ -32,7 +33,7 @@ - + @@ -113,7 +114,7 @@ - + - + + {{$t('overall.config')}} @@ -32,7 +33,7 @@ - + @@ -82,7 +83,7 @@ - + - + + {{$t('overall.config')}} @@ -34,7 +35,7 @@ - + @@ -79,6 +80,7 @@ + - + + {{$t('overall.config')}} @@ -32,7 +33,7 @@ - + @@ -101,7 +102,7 @@ - + diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index f095ec9f8..fd78162e0 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -1,6 +1,7 @@ - + + {{$t('overall.config')}} @@ -27,7 +28,7 @@ - + @@ -190,6 +191,7 @@ + diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index 9af032390..e329e6529 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -5,7 +5,8 @@ - + + {{$t('overall.config')}} @@ -34,7 +35,7 @@ - + @@ -88,6 +89,7 @@ + - + + {{$t('dashboard.title')}} {{$t('dashboard.overview.title')}} @@ -10,7 +11,7 @@ - + {{systemName&&systemName != 'undefined'&&systemName != null?systemName: $t('dashboard.overview.contentTitle')}} @@ -86,6 +87,7 @@ + @@ -1175,6 +1177,16 @@ } }); }, + resizeChart:function() { + this.$nextTick(() => { + let width = this.$refs.chartbox.$el.clientWidth; + let height = this.$refs.chartbox.$el.clientHeight * .95; + this.$refs.chartbox.resizeChart(width, height); + let mapWidth = this.$refs.dataCenterMap.$el.clientWidth; + let mapHeight = this.$refs.dataCenterMap.$el.clientHeight * .95; + this.$refs.dataCenterMap.resizeChart(mapWidth, mapHeight); + }) + } }, computed:{ @@ -1207,12 +1219,7 @@ watch:{ isFullScreen:function(n,o){ this.$nextTick(()=>{ - let width=this.$refs.chartbox.$el.clientWidth; - let height=this.$refs.chartbox.$el.clientHeight * .95; - this.$refs.chartbox.resizeChart(width,height); - let mapWidth=this.$refs.dataCenterMap.$el.clientWidth; - let mapHeight=this.$refs.dataCenterMap.$el.clientHeight * .95; - this.$refs.dataCenterMap.resizeChart(mapWidth,mapHeight); + this.resizeChart(); }); } } diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index 30162ea42..a15255e49 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -40,6 +40,7 @@ import bottomBox from "./components/common/bottomBox/bottomBox"; //上滑框 import "perfect-scrollbar/css/perfect-scrollbar.css"; import loading from "./components/common/loading"; import mibBox from "./components/common/rightBox/mibBox"; +import leftMenu from "./components/common/leftMenu"; Vue.component("Pagination", Pagination); Vue.component("searchInput", searchInput); @@ -62,6 +63,7 @@ Vue.component("select-area", selectArea); Vue.component('loading',loading); Vue.component('bottom-box', bottomBox); Vue.component('mib-box',mibBox); +Vue.component('left-menu',leftMenu); Vue.prototype.$axios = axios; Vue.prototype.$post = post; diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js index 14a2490c0..7d50be962 100644 --- a/nezha-fronted/src/store/index.js +++ b/nezha-fronted/src/store/index.js @@ -39,6 +39,7 @@ const store = new Vuex.Store({ consoleCount:0,//当前console窗口数 isAddConsole:false,//是否增加窗口 consoleParam:{},//新开console窗口参数 + leftMenuStat:false, //0展开状态,1隐藏状态 }, getters: { }, @@ -111,6 +112,9 @@ const store = new Vuex.Store({ minConsole(state){//最小化窗口 state.consoleShow=false; }, + setLeftMenuStat:function(state,data){ + state.leftMenuStat=data + } }, actions: { }