From 16035381446123402f86334f88613fb62fcd35f8 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期日, 07 四月 2024 12:15:10 +0800
Subject: [PATCH] 1
---
src/style/app.scss | 1 +
src/config/index.js | 8 ++++++++
src/layout/index.vue | 9 +++++----
src/views/login/components/passwordForm.vue | 13 ++++++++++---
src/views/console/system/menu.vue | 5 ++---
5 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/config/index.js b/src/config/index.js
index 1146f23..c3d0747 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,3 +1,11 @@
+/*
+ * @Author: lzhe lzhe@example.com
+ * @Date: 2024-03-26 10:28:33
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-04-07 12:06:03
+ * @FilePath: /smart-web/src/config/index.js
+ * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
const DEFAULT_CONFIG = {
//鏍囬
APP_NAME: process.env.VUE_APP_TITLE,
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 7628b6c..c776846 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -96,9 +96,10 @@
<template v-else-if="layout=='dock'">
<header class="adminui-header">
<div class="adminui-header-left">
- <div class="logo-bar">
- <img class="logo" src="img/logo.png">
- <span>{{ $CONFIG.APP_NAME }}</span>
+ <div class="logo-bar personalized-logo">
+ <!-- <img class="logo" src="img/logo.png">
+ <span>{{ $CONFIG.APP_NAME }}</span> -->
+ <img src="/img/initiallong.b9495273.png" class="img" style="width: 100%; height: 100%;">
</div>
</div>
<div class="adminui-header-right">
@@ -193,7 +194,7 @@
<div class="main-maximize-exit" @click="exitMaximize"><el-icon><el-icon-close /></el-icon></div>
- <div class="layout-setting" @click="openSetting"><el-icon><el-icon-brush-filled /></el-icon></div>
+ <!-- <div class="layout-setting" @click="openSetting"><el-icon><el-icon-brush-filled /></el-icon></div> -->
<el-drawer title="甯冨眬瀹炴椂婕旂ず" v-model="settingDialog" :size="400" append-to-body destroy-on-close>
<setting></setting>
diff --git a/src/style/app.scss b/src/style/app.scss
index a145a5e..4740d92 100644
--- a/src/style/app.scss
+++ b/src/style/app.scss
@@ -35,6 +35,7 @@
.adminui-header-right {display: flex;align-items: center;}
.adminui-header .logo-bar {font-size: 20px;font-weight: bold;display: flex;align-items: center;}
.adminui-header .logo-bar .logo {margin-right: 10px;width: 35px;height: 35px;}
+.personalized-logo {width: 422px;height: 58px;}
.adminui-header .nav {display: flex;height: 100%;margin-left: 40px;}
.adminui-header .nav li {padding:0 10px;margin: 0 10px 0 0;font-size: 14px;color: rgba(255, 255, 255, 0.6);list-style: none;height: 100%;display: flex;align-items: center;cursor: pointer;}
.adminui-header .nav li i {margin-right: 5px;}
diff --git a/src/views/console/system/menu.vue b/src/views/console/system/menu.vue
index 5745c15..be597c7 100644
--- a/src/views/console/system/menu.vue
+++ b/src/views/console/system/menu.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-02 11:56:39
+ * @LastEditTime: 2024-04-07 11:54:15
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -124,7 +124,7 @@
methods: {
handleSuccess(formAddMenu) {
this.searchData.parentId = formAddMenu.parentId;
- this.searchClearBtn();
+ this.clearSearch();
},
tableLoad(row,treeNode,resolve) {
this.searchData.parentId= row.id;
@@ -133,7 +133,6 @@
resolve(res.data);
}
})
-
},
clearSearch() {
this.searchData= {
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index a8e1c88..96aeeb0 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -103,10 +103,17 @@
} else {
// 濡傛灉娌℃湁 children 灞炴�э紝璇存槑鏄渶鍚庝竴绾э紝娣诲姞 component 瀵硅薄
var len = clonedItem.path.length;
- clonedItem.component = clonedItem.path.substring(1,len);
+ if(item.name == "浠诲姟璋冨害") {
+ //clonedItem.component = clonedItem.path; //鏈塩omponent涓嶅彲浠ヤ娇鐢╥frame
+ }else {
+ clonedItem.component = clonedItem.path.substring(1,len);
+ }
}
- //console.log(clonedItem.source)
- clonedItem.meta = {title: clonedItem.name,icon: "el-icon-takeaway-box", type: "menu"}
+ if(item.name == "浠诲姟璋冨害") {
+ clonedItem.meta = {title: clonedItem.name,icon: "el-icon-takeaway-box", type: "iframe"}
+ }else {
+ clonedItem.meta = {title: clonedItem.name,icon: "el-icon-takeaway-box", type: "menu"}
+ }
return clonedItem;
});
}
--
Gitblit v1.9.3