From f3f9c12edf952aa85f3596e3193ecd088972d2ff Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Sun, 10 Apr 2022 21:13:34 +0800
Subject: [PATCH] fix: some bug

---
 mock/echarts.ts                              | 23 --------------------
 src/api/mock.ts                              |  5 -----
 src/layout/components/navbar.vue             |  4 ++--
 src/layout/components/sidebar/horizontal.vue |  4 ++--
 src/layout/components/sidebar/mixNav.vue     |  4 ++--
 src/layout/hooks/nav.ts                      |  4 ++--
 src/mockProdServer.ts                        |  4 ++--
 7 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 mock/echarts.ts

diff --git a/mock/echarts.ts b/mock/echarts.ts
deleted file mode 100644
index f07e6c3ee..000000000
--- a/mock/echarts.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { MockMethod } from "vite-plugin-mock";
-
-// http://mockjs.com/examples.html#Object
-const echartsList = () => {
-  const result = [];
-  for (let index = 0; index < 200; index++) {
-    result.push(["@date", Math.floor(Math.random() * 300)]);
-  }
-  return result;
-};
-
-export default [
-  {
-    url: "/getEchartsInfo",
-    method: "get",
-    response: () => {
-      return {
-        code: 0,
-        info: echartsList()
-      };
-    }
-  }
-] as MockMethod[];
diff --git a/src/api/mock.ts b/src/api/mock.ts
index 02a8bea25..93b437275 100644
--- a/src/api/mock.ts
+++ b/src/api/mock.ts
@@ -4,8 +4,3 @@ import { http } from "../utils/http";
 export const mapJson = (params?: object) => {
   return http.request("get", "/getMapInfo", { params });
 };
-
-// echarts数据
-export const echartsJson = (params?: object) => {
-  return http.request("get", "/getEchartsInfo", { params });
-};
diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue
index 156b9b4f9..d6e0057b8 100644
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -23,7 +23,7 @@ const {
   changeTitle,
   toggleSideBar,
   pureApp,
-  usename,
+  username,
   getDropdownItemStyle
 } = useNav();
 
@@ -94,7 +94,7 @@ function translationEn() {
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img :src="avatars" />
-          <p>{{ usename }}</p>
+          <p>{{ username }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index d2a414c7a..e38091d8d 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -29,7 +29,7 @@ const {
   changeTitle,
   handleResize,
   menuSelect,
-  usename,
+  username,
   getDropdownItemStyle
 } = useNav();
 
@@ -115,7 +115,7 @@ function translationEn() {
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img :src="avatars" />
-          <p>{{ usename }}</p>
+          <p>{{ username }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
diff --git a/src/layout/components/sidebar/mixNav.vue b/src/layout/components/sidebar/mixNav.vue
index 7308bbacf..1ffe83cac 100644
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -32,7 +32,7 @@ const {
   menuSelect,
   resolvePath,
   pureApp,
-  usename,
+  username,
   getDropdownItemStyle
 } = useNav();
 
@@ -167,7 +167,7 @@ function translationEn() {
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img :src="avatars" />
-          <p>{{ usename }}</p>
+          <p>{{ username }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
diff --git a/src/layout/hooks/nav.ts b/src/layout/hooks/nav.ts
index a162be933..1dcb48b7a 100644
--- a/src/layout/hooks/nav.ts
+++ b/src/layout/hooks/nav.ts
@@ -12,7 +12,7 @@ import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 export function useNav() {
   const pureApp = useAppStoreHook();
   // 用户名
-  const usename: string = storageSession.getItem("info")?.username;
+  const username: string = storageSession.getItem("info")?.username;
 
   // 设置国际化选中后的样式
   const getDropdownItemStyle = computed(() => {
@@ -112,7 +112,7 @@ export function useNav() {
     resolvePath,
     isCollapse,
     pureApp,
-    usename,
+    username,
     getDropdownItemStyle
   };
 }
diff --git a/src/mockProdServer.ts b/src/mockProdServer.ts
index 02cf7bcca..5a57c9bf7 100644
--- a/src/mockProdServer.ts
+++ b/src/mockProdServer.ts
@@ -1,9 +1,9 @@
 import { createProdMockServer } from "vite-plugin-mock/es/createProdMockServer";
 import mapMock from "../mock/map";
-import echartsMock from "../mock/echarts";
+import systemMock from "../mock/system";
 import asyncRoutesMock from "../mock/asyncRoutes";
 
-export const mockModules = [...mapMock, ...echartsMock, ...asyncRoutesMock];
+export const mockModules = [...mapMock, ...systemMock, ...asyncRoutesMock];
 
 export function setupProdMockServer() {
   createProdMockServer(mockModules);