From 57b5881b7a7c5603002cb79f729a2d9c490d9b10 Mon Sep 17 00:00:00 2001
From: xhong <xhong_17@outlook.com>
Date: Sat, 20 Aug 2022 00:32:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0elementplus=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E9=BB=98=E8=AE=A4=E4=B8=AD=E6=96=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/headers/components/breadCrumb.vue | 2 +-
 src/layout/layoutIndex.vue                   | 9 ++++-----
 src/layout/menu/menuIndex.vue                | 7 ++++---
 src/main.js                                  | 5 +++++
 src/styles/variables.scss                    | 2 +-
 src/views/users/zdUsers.vue                  | 5 ++---
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/layout/headers/components/breadCrumb.vue b/src/layout/headers/components/breadCrumb.vue
index 65b07f0..dde24a5 100644
--- a/src/layout/headers/components/breadCrumb.vue
+++ b/src/layout/headers/components/breadCrumb.vue
@@ -27,7 +27,7 @@ const breadcrumbList = ref([])
 // 更新并赋值路由表信息
 const initBreadcrumbList = () => {
   breadcrumbList.value = route.matched
-  console.log(route.matched)
+  // console.log(route.matched)
 }
 
 // 路由跳转方法
diff --git a/src/layout/layoutIndex.vue b/src/layout/layoutIndex.vue
index 95f307f..6f81c4f 100644
--- a/src/layout/layoutIndex.vue
+++ b/src/layout/layoutIndex.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container class="app-wrapper">
     <el-aside :width="asideWidth" class="sidebar-container">
-      <Menu />
+      <menuIndex />
     </el-aside>
     <el-container
       class="container"
@@ -18,7 +18,7 @@
 </template>
 
 <script setup>
-import Menu from './menu/menuIndex'
+import menuIndex from './menu/menuIndex'
 import Headers from './headers/hearderIndex.vue'
 import { computed } from 'vue'
 import { useStore } from 'vuex'
@@ -29,7 +29,7 @@ const asideWidth = computed(() => {
 </script>
 
 <style lang="scss" scoped>
-.app-container {
+.app-wrapper {
   position: relative;
   width: 100%;
   height: 100%;
@@ -37,12 +37,11 @@ const asideWidth = computed(() => {
 .container {
   width: calc(100% - $sideBarWidth);
   height: 100%;
-
   position: fixed;
   top: 0;
   right: 0;
   z-index: 9;
-  transition: all 0.28s;
+  transition: all 0.1s;
   &.hidderContainer {
     width: calc(100% - $hideSideBarWidth);
   }
diff --git a/src/layout/menu/menuIndex.vue b/src/layout/menu/menuIndex.vue
index 23f5f76..9dbdaf4 100644
--- a/src/layout/menu/menuIndex.vue
+++ b/src/layout/menu/menuIndex.vue
@@ -1,7 +1,7 @@
 <template>
   <el-menu
     active-text-color="#ffd04b"
-    background-color="variables.menuBg"
+    background-color="$menuBg"
     class="el-menu-vertical-demo"
     text-color="#fff"
     router
@@ -10,8 +10,8 @@
     :collapse="!$store.getters.siderType"
   >
     <el-sub-menu
-      :index="item.id"
       v-for="(item, index) in menusList"
+      :index="item.id"
       :key="item.id"
     >
       <template #title>
@@ -21,9 +21,9 @@
         <span>{{ item.authName }}</span>
       </template>
       <el-menu-item
-        :index="'/' + it.path"
         v-for="it in item.children"
         :key="it.id"
+        :index="'/' + it.path"
         @click="savePath(it.path)"
       >
         <template #title>
@@ -51,6 +51,7 @@ const menusList = ref([])
 // 发起菜单数据获取请求并调用
 const initMenusList = async () => {
   menusList.value = await menuList()
+  console.log('测试', menusList.value)
 }
 initMenusList()
 
diff --git a/src/main.js b/src/main.js
index 64f77d8..bccbecb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,8 +11,13 @@ import i18n from './i18n/i18nIndex'
 import * as Cesium from '../node_modules/cesium/Source/Cesium'
 import '../node_modules/cesium/Source/Widgets/widgets.css'
 import filters from '@/utils/filters'
+import ElementPlus from 'element-plus'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 
 const app = createApp(App)
+app.use(ElementPlus, {
+  locale: zhCn
+})
 SvgIcon(app)
 app.use(store).use(router).use(i18n).mount('#app')
 
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 0b65992..db02f18 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -9,7 +9,7 @@ $menuHover: #263445;
 $subMenuBg: #1f2d3d;
 $subMenuHover: #001528;
 
-$sideBarWidth: 210px;
+$sideBarWidth: 200px;
 $hideSideBarWidth: 67px;
 $sideBarDuration: 0.28s;
 
diff --git a/src/views/users/zdUsers.vue b/src/views/users/zdUsers.vue
index 7d8f263..4870cbf 100644
--- a/src/views/users/zdUsers.vue
+++ b/src/views/users/zdUsers.vue
@@ -49,13 +49,13 @@
       </el-table-column>
     </el-table>
     <el-pagination
-      v-model:currentPage="queryFrom.pagenum"
+      v-model:current-page="queryFrom.pagenum"
       v-model:page-size="queryFrom.pagesize"
       :page-sizes="[2, 5, 10, 15]"
       :small="small"
       :disabled="disabled"
       :background="background"
-      layout="total, sizes, prev, pager, next, jumper"
+      layout="->, total, sizes, prev, pager, next, jumper"
       :total="total"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -174,6 +174,5 @@ const delUser = (row) => {
 .footer {
   padding-top: 16px;
   box-sizing: border-box;
-  text-align: right;
 }
 </style>