From 5de0ed201341e0ac0bf0cfbbc2df30bb7440d4e4 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期二, 26 三月 2024 19:12:48 +0800
Subject: [PATCH] 1
---
src/style/app.scss | 2
src/layout/index.vue | 4 +-
src/views/login/components/passwordForm.vue | 67 ++++++++++++++++++++++-----------
3 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 7f8571a..7628b6c 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -145,11 +145,11 @@
</div>
<section class="aminui-wrapper">
<div v-if="!ismobile" class="aminui-side-split">
- <div class="aminui-side-split-top">
+ <!-- <div class="aminui-side-split-top">
<router-link :to="$CONFIG.DASHBOARD_URL">
<img class="logo" :title="$CONFIG.APP_NAME" src="img/logo-r.png">
</router-link>
- </div>
+ </div> -->
<div class="adminui-side-split-scroll">
<el-scrollbar>
<ul>
diff --git a/src/style/app.scss b/src/style/app.scss
index d399b08..11a0822 100644
--- a/src/style/app.scss
+++ b/src/style/app.scss
@@ -64,7 +64,7 @@
.adminui-side-top {border-bottom: 1px solid #ebeef5;height:50px;line-height: 50px;}
.adminui-side-top h2 {padding:0 20px;font-size: 17px;color: #fff;}
.adminui-side-scroll {overflow: auto;overflow-x:hidden;flex: 1;background-color: #315655;}
-.adminui-side-scrolul {background-color: #315655;}
+.adminui-side-scrolul,.el-menu {background-color: #315655;}
.adminui-side-scrolul .el-menu-item ,.adminui-side-scrolul .el-sub-menu__title{color: #fff;}
.adminui-side-scrolul .el-menu-item:hover,.adminui-side-scrolul .el-sub-menu__title:hover{background-color: #316e6e;}
.adminui-side-bottom {border-top: 1px solid #ebeef5;height:51px;cursor: pointer;display: flex;align-items: center;justify-content: center;}
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index b07c340..7cb9d1c 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -49,18 +49,6 @@
//this.$HTTP.get('/api/blade-sync/outer-app-config/appStatus')
},
methods: {
- // qsStringify(obj) {
- // return Object.keys(obj)
- // .map(key => {
- // if (Array.isArray(obj[key])) {
- // return obj[key]
- // .map(arrayValue => `${encodeURIComponent(key)}=${encodeURIComponent(arrayValue)}`)
- // .join('&');
- // }
- // return `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`;
- // })
- // .join('&');
- // },
async login(){
var validate = await this.$refs.loginForm.validate().catch(()=>{})
if(!validate){ return false }
@@ -93,23 +81,58 @@
});
}
})
- await this.$HTTP.postJ("/api/blade-system/menu/routes?" + this.$TOOL.qsStringify({"appCode": "CPS"})).then(res=> {
- console.log(res,1111)
- })
- await this.$API.system.menu.myMenus.get().then(resp=> {
- if(resp.data.menu.length==0){
- console.log(resp,2222)
+ await this.$HTTP.get("/api/blade-system/menu/routes?" + this.$TOOL.qsStringify({"appCode": "CPS"})).then(res=> {
+ if(res.data.length==0){
this.islogin = false
this.$alert("褰撳墠鐢ㄦ埛鏃犱换浣曡彍鍗曟潈闄愶紝璇疯仈绯荤郴缁熺鐞嗗憳", "鏃犳潈闄愯闂�", {
type: 'error',
center: true
})
return false
+ }
+ //寮�濮�
+ function addComponentToLastLevel(items) {
+ return items.map((item) => {
+ // 澶嶅埗褰撳墠椤癸紝閬垮厤鐩存帴淇敼鍘熷瀵硅薄
+ const clonedItem = { ...item };
+
+ // 妫�鏌ュ綋鍓嶉」鏄惁鏈� children 灞炴��
+ if (clonedItem.children) {
+ // 閫掑綊澶勭悊 children
+ clonedItem.children = addComponentToLastLevel(clonedItem.children);
+ } else {
+ // 濡傛灉娌℃湁 children 灞炴�э紝璇存槑鏄渶鍚庝竴绾э紝娣诲姞 component 瀵硅薄
+ clonedItem.component = clonedItem.path;
+ }
+ clonedItem.meta = {title: clonedItem.name,icon: "el-icon-takeaway-box", type: "menu"}
+ return clonedItem;
+ });
+ }
+ var transformedArray = addComponentToLastLevel(res.data);
+ transformedArray[0].path = "/home";
+ transformedArray[0].children = [{
+ component: "home",
+ meta: {title: "宸ヤ綔鍙�", icon: 'el-icon-menu', affix: true},
+ name: "宸ヤ綔鍙�",
+ path: "/dashboard"
+ }]
+ //缁撴潫
+ var obj = {
+ dashboardGrid: ["welcome", "ver", "time", "progress", "echarts", "about"],
+ menu: transformedArray,
+ permissions: ["list.add", "list.edit", "list.delete", "user.add", "user.edit", "user.delete"]
}
- this.$TOOL.data.set("MENU", resp.data.menu)
- this.$TOOL.data.set("PERMISSIONS", resp.data.permissions)
- this.$TOOL.data.set("DASHBOARDGRID", resp.data.dashboardGrid)
- });
+ // this.$API.system.menu.myMenus.get().then(resp=> {
+ // console.log(transformedArray,resp,1234);
+ // Object.assign({},transformedArray,resp.data.menu);
+ // this.$TOOL.data.set("MENU", obj.menu)
+ // this.$TOOL.data.set("PERMISSIONS", obj.permissions)
+ // this.$TOOL.data.set("DASHBOARDGRID", obj.dashboardGrid)
+ // });
+ this.$TOOL.data.set("MENU", obj.menu)
+ this.$TOOL.data.set("PERMISSIONS", obj.permissions)
+ this.$TOOL.data.set("DASHBOARDGRID", obj.dashboardGrid)
+ })
this.$router.replace({
path: '/'
})
--
Gitblit v1.9.3