From 261b667016f42def26181496a614fbaf2a179433 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 9 Jun 2025 13:40:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- .env.staging | 2 +- package.json | 2 +- src/components/TopNav/index.vue | 6 ++++-- src/layout/components/Navbar.vue | 4 ++-- src/router/index.js | 2 +- src/views/index.vue | 6 +++--- src/views/index_v1.vue | 25 +++++++++---------------- src/views/login.vue | 2 +- src/views/login1.vue | 2 +- src/views/register.vue | 2 +- src/views/register1.vue | 2 +- vue.config.js | 2 +- 14 files changed, 28 insertions(+), 33 deletions(-) diff --git a/.env.development b/.env.development index 65ef7ca3..0cc44106 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 智慧食堂 +VUE_APP_TITLE = 智慧食堂系统 # 开发环境配置 ENV = 'development' diff --git a/.env.production b/.env.production index 2a211c8e..2454c0c6 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 智慧食堂 +VUE_APP_TITLE = 智慧食堂系统 # 生产环境配置 ENV = 'production' diff --git a/.env.staging b/.env.staging index 794c5f57..4a96cd65 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 智慧食堂 +VUE_APP_TITLE = 智慧食堂系统 NODE_ENV = production diff --git a/package.json b/package.json index bccf076f..ea972a0d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bonus", "version": "3.6.4", - "description": "智慧食堂", + "description": "智慧食堂系统", "author": "博诺思", "license": "MIT", "scripts": { diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index 08a4219b..d649b0e9 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -6,8 +6,10 @@ > diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 017206f0..7dd0bf1d 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -4,7 +4,7 @@
-
+

{{ title }}

@@ -121,7 +121,7 @@ export default { height: 84px; overflow: hidden; position: relative; - background: #026559; + background: #006F68; box-shadow: 0 1px 4px rgba(0,21,41,.08); .hamburger-container { diff --git a/src/router/index.js b/src/router/index.js index 3959bb81..a5cd822c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -68,7 +68,7 @@ export const constantRoutes = [ children: [ { path: 'index', - component: () => import('@/views/index_v1'), + component: () => import('@/views/index'), name: 'Index', meta: { title: '首页', icon: 'dashboard', affix: true } } diff --git a/src/views/index.vue b/src/views/index.vue index 8d472fa9..8d55858f 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -2,7 +2,7 @@
-

智慧食堂

+

智慧食堂系统

当前版本: v{{ version }}

@@ -59,7 +59,7 @@
- + diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue index f8521830..53757e3c 100644 --- a/src/views/index_v1.vue +++ b/src/views/index_v1.vue @@ -130,16 +130,18 @@ export default { this.InitEChartsTwo() this.InitEChartsThree() this.InitEChartsFour() - window.addEventListener('transitionend', this.$_sidebarResizeHandler) + window.addEventListener('transitionend', this.$_sidebarResizeHandler) }, methods: { $_sidebarResizeHandler(e) { if (e.propertyName === 'width') { console.log(e) - this.myCharts1.resize(); - this.myCharts2.resize(); - this.myCharts3.resize(); - this.myCharts4.resize(); + setTimeout(() => { + this.myCharts1.resize(); + this.myCharts2.resize(); + this.myCharts3.resize(); + this.myCharts4.resize(); + }, 500); } }, getTopData(){ @@ -268,11 +270,7 @@ export default { ], }; this.myCharts1 = echarts.init(document.querySelector('#lineChartOne')); - this.myCharts1.setOption(option) - // 根据页面大小自动响应图表大小 - // window.addEventListener("resize1", function () { - // this.myCharts1.resize(); - // }); + this.myCharts1.setOption(option) }); }, changType2(e){ @@ -396,12 +394,7 @@ export default { ], }; this.myCharts2 = echarts.init(document.querySelector('#lineChartTwo')); - this.myCharts2.setOption(option) - - // // 根据页面大小自动响应图表大小 - // window.addEventListener("resize2", function () { - // myCharts2.resize(); - // }); + this.myCharts2.setOption(option) }); }, InitEChartsThree() { diff --git a/src/views/login.vue b/src/views/login.vue index e632d00d..4f407495 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,7 +1,7 @@