diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index cb8b984b2..8aba854e7 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -66,11 +66,13 @@ @@ -82,12 +84,14 @@ @@ -527,6 +531,16 @@ }, route() { return this.$route.path; + }, + overViewProject(){ + return this.$store.getters.getOverViewProject; + } + }, + watch:{ + overViewProject(n){ + if(n){ + this.jumpToProject(n) + } } }, destroyed() { diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 61db523e4..628afe0ef 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -916,7 +916,10 @@ const cn = { straight:'直线', curve:'曲线', upload:'上传文件', - requiredName:'名称不能为空' + requiredName:'名称不能为空', + imgFormat:'上传图片只能是 JPG/png 格式!', + imgSize:'上传图片大小不能超过 2MB!', + imgMeasure:'上传的图片宽高必须都大于100!', }, }, date:{ diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 7f91f7c28..647da4823 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -922,7 +922,10 @@ const en = { straight:'straight', curve:'curve', upload:'upload', - requiredName:'The name of the required' + requiredName:'The name of the required', + imgFormat:'Upload picture can only be JPG/ PNG format!', + imgSize:'Upload image size should not exceed 2MB!', + imgMeasure:'The width and height of uploaded pictures must be greater than 100!', }, }, date:{ diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index 222911144..c7c107879 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -60,9 +60,11 @@ if(this.chartType==='ruleBar'){ this.option.yAxis.axisLabel.formatter=function(value) { if (value.length > 12) { - return "..."+ value.substring(value.length-12, value.length); + return value.substring(0, 12) + "..."; + }else{ + return value } - return value; + } } if(this.showToolbox == false){ diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js index d01c317fd..8e73e6f15 100644 --- a/nezha-fronted/src/store/index.js +++ b/nezha-fronted/src/store/index.js @@ -26,6 +26,7 @@ const store = new Vuex.Store({ searchName: '' }, idcArr:[], + overViewProject:{}, }, getters: { getLinkData(state){ @@ -40,6 +41,9 @@ const store = new Vuex.Store({ getIdcArr(state){ return state.idcArr }, + getOverViewProject(state){ + return state.overViewProject + }, }, mutations: { /* 监听对象变化,用于顶部菜单与底部内容的同步 */ @@ -104,7 +108,10 @@ const store = new Vuex.Store({ }, setCurrentDc(state,data){ state.currentDc = data - } + }, + setOverViewProject(state,data){ + state.overViewProject=data; + }, }, actions: { }