From d41a06bb77cca03b97eba0630d0e4dcf3557cbd4 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 04 十二月 2023 13:20:50 +0800
Subject: [PATCH] feat: 登录页图片更换 导航栏标题更换
---
admin-web/src/permission.js | 4 +++-
admin-web/src/views/systemManger/server/user/index.vue | 14 +++++++++++---
admin-web/src/assets/images/form-lf.jpg | 0
/dev/null | 0
admin-web/src/views/systemSetting/role/index.vue | 4 ++--
admin-web/src/views/systemSetting/user/profile/resetPwd.vue | 4 ++++
admin-web/src/layout/components/Navbar.vue | 7 +++++--
admin-web/src/views/login/index.vue | 4 +++-
admin-web/src/assets/images/login-name.png | 0
9 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/admin-web/src/assets/images/form-lf.jpg b/admin-web/src/assets/images/form-lf.jpg
new file mode 100644
index 0000000..6df6558
--- /dev/null
+++ b/admin-web/src/assets/images/form-lf.jpg
Binary files differ
diff --git a/admin-web/src/assets/images/form-lf.png b/admin-web/src/assets/images/form-lf.png
deleted file mode 100644
index be8bc9d..0000000
--- a/admin-web/src/assets/images/form-lf.png
+++ /dev/null
Binary files differ
diff --git a/admin-web/src/assets/images/login-name.png b/admin-web/src/assets/images/login-name.png
index befd29e..272c737 100644
--- a/admin-web/src/assets/images/login-name.png
+++ b/admin-web/src/assets/images/login-name.png
Binary files differ
diff --git a/admin-web/src/layout/components/Navbar.vue b/admin-web/src/layout/components/Navbar.vue
index be433b4..803d9cb 100644
--- a/admin-web/src/layout/components/Navbar.vue
+++ b/admin-web/src/layout/components/Navbar.vue
@@ -2,7 +2,7 @@
<div class="navbar navbar-yw">
<div style="display: flex;align-items: center">
<img class="logo" src="@/assets/images/logo.png" alt=""/>
- <img class="logo-txt" src="@/assets/images/top-title.png" alt=""/>
+ <img class="logo-txt" src="@/assets/images/login-name.png" alt=""/>
</div>
<div class="right-menu">
<!-- <div class="menu-item" @click="dataV">
@@ -101,7 +101,10 @@
margin-right: 10px;
}
.logo-txt {
- width: 352px;
+ /*width: 352px;
+ height: 43px;*/
+
+ width: 283.29px;
height: 43px;
}
.phone-call {
diff --git a/admin-web/src/permission.js b/admin-web/src/permission.js
index b6f2371..f51017e 100644
--- a/admin-web/src/permission.js
+++ b/admin-web/src/permission.js
@@ -23,7 +23,9 @@
if (hasToken) {
if (to.path === '/login') {
// if is logged in, redirect to the home page
- next({ path: '/' });
+ // next({ path: '/' });
+
+ next();
NProgress.done();
}else if( to.path === '/resetPwd'){
next();
diff --git a/admin-web/src/views/login/index.vue b/admin-web/src/views/login/index.vue
index d7fd386..f0a9ca2 100644
--- a/admin-web/src/views/login/index.vue
+++ b/admin-web/src/views/login/index.vue
@@ -11,7 +11,7 @@
<el-col>
<div class="form-main w1050">
<el-row>
- <el-col :span="12"><img src="@/assets/images/form-lf.png" alt="鐧诲綍" class="logo-lf"/></el-col>
+ <el-col :span="12"><img src="@/assets/images/form-lf.jpg" alt="鐧诲綍" class="logo-lf"/></el-col>
<el-col :span="12">
<div class="login-box">
<el-form
@@ -391,6 +391,8 @@
font-size: 16px;
}
.logo-name{
+ width: 336px;
+ height: 51px;
margin-bottom: 30px;
}
.logo-lf{
diff --git a/admin-web/src/views/systemManger/server/user/index.vue b/admin-web/src/views/systemManger/server/user/index.vue
index 2271281..04e3997 100644
--- a/admin-web/src/views/systemManger/server/user/index.vue
+++ b/admin-web/src/views/systemManger/server/user/index.vue
@@ -236,13 +236,21 @@
this.$modal
.confirm('鏄惁纭鍒濆鍖栧悕绉颁负"' + row.userName + '"鐨勫瘑鐮侊紵')
.then(function () {
- user.updPassWord(row).then((res) => {});
+ user.updPassWord(row).then((res) => {
+ });
})
.then((res) => {
- this.$message.success('鍒濆鍖栧瘑鐮佹垚鍔燂紒');
+ this.$modal
+ .confirm('鍒濆鍖栧瘑鐮佹垚鍔燂紝鏂板瘑鐮佷负锛�123456')
+ .then((res) => {
+
+ })
+ .catch(() => {
+ });
this.search();
})
- .catch(() => {});
+ .catch(() => {
+ });
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
diff --git a/admin-web/src/views/systemSetting/role/index.vue b/admin-web/src/views/systemSetting/role/index.vue
index 1abea4d..73b530d 100644
--- a/admin-web/src/views/systemSetting/role/index.vue
+++ b/admin-web/src/views/systemSetting/role/index.vue
@@ -140,13 +140,13 @@
<!-- >{{dict.label}}</el-radio>-->
</el-radio-group>
</el-form-item>
- <el-form-item label="瑙掕壊鑼冨洿">
+<!-- <el-form-item label="瑙掕壊鑼冨洿">
<el-radio-group v-model="form.data_scope">
<el-radio :label="1" checked>鐪�</el-radio>
<el-radio :label="2">甯�</el-radio>
<el-radio :label="3">鍘�</el-radio>
</el-radio-group>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="鑿滃崟鏉冮檺">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">灞曞紑/鎶樺彔</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
diff --git a/admin-web/src/views/systemSetting/user/profile/resetPwd.vue b/admin-web/src/views/systemSetting/user/profile/resetPwd.vue
index 4365831..5a81581 100644
--- a/admin-web/src/views/systemSetting/user/profile/resetPwd.vue
+++ b/admin-web/src/views/systemSetting/user/profile/resetPwd.vue
@@ -68,6 +68,10 @@
btnMixPd: undefined
}
this.$modal.msgSuccess("淇敼鎴愬姛");
+ // 淇敼鎴愬姛锛岄��鍑虹郴缁�
+ this.$store.dispatch('user/logout').then(() => {
+ location.reload()
+ })
});
}
});
--
Gitblit v1.9.1