diff --git a/package.json b/package.json index c32d48d..63abd20 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "vue-cropperjs": "^2.2.0", "vue-quill-editor": "3.0.6", "vue-router": "^3.0.1", - "vue-schart": "^0.1.4", + "vue-schart": "^1.0.0", "vuedraggable": "^2.16.0" }, "devDependencies": { diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index ca14f82..03bbcee 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -100,6 +100,11 @@ } this.fullscreen = !this.fullscreen; } + }, + mounted(){ + if(document.body.clientWidth < 1500){ + this.collapseChage(); + } } } diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 9dec980..0289fcf 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -112,6 +112,10 @@ left: 0; top: 70px; bottom:0; + overflow-y: scroll; + } + .sidebar::-webkit-scrollbar{ + width: 0; } .sidebar-el-menu:not(.el-menu--collapse){ width: 250px; diff --git a/src/components/common/Tags.vue b/src/components/common/Tags.vue index fe7e3ee..38fa17e 100644 --- a/src/components/common/Tags.vue +++ b/src/components/common/Tags.vue @@ -58,11 +58,11 @@ // 设置标签 setTags(route){ const isExist = this.tagsList.some(item => { - return item.path === route.path; + return item.path === route.fullpath; }) !isExist && this.tagsList.push({ title: route.meta.title, - path: route.path + path: route.fullpath }) }, handleTags(command){ diff --git a/src/components/page/BaseCharts.vue b/src/components/page/BaseCharts.vue index 43bc138..5a18f23 100644 --- a/src/components/page/BaseCharts.vue +++ b/src/components/page/BaseCharts.vue @@ -11,21 +11,21 @@ vue-schart:vue.js封装sChart.js的图表组件。 访问地址:vue-schart -