From dfc4898827d73df7152d6458689324fd3485b75d Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@126.com>
Date: 星期日, 12 十二月 2021 22:12:40 +0800
Subject: [PATCH] 修改登陆页面/系统logo/版权信息等
---
src/views/index.vue | 14 +++
src/views/system/config/index.vue | 2
src/views/system/role/index.vue | 2
src/views/device/peripheralUnit/index.vue | 2
src/assets/images/profile.jpg | 0
src/views/system/dept/index.vue | 4
src/views/system/post/index.vue | 2
src/views/monitor/online/index.vue | 4
src/assets/logo/logo.png | 0
src/views/monitor/logininfor/index.vue | 2
src/views/monitor/operlog/index.vue | 2
src/views/system/oss/index.vue | 2
src/views/register.vue | 2
src/views/basics/school/index.vue | 2
src/views/device/equipment/index.vue | 2
src/views/system/menu/index.vue | 4
src/views/system/user/index.vue | 1
src/views/login.vue | 136 ++++++++++++++++++---------------
src/layout/components/Sidebar/Logo.vue | 2
src/views/system/notice/index.vue | 4
public/favicon.ico | 0
src/views/device/batch/index.vue | 2
src/assets/images/login-background.jpg | 0
src/views/system/dict/index.vue | 2
24 files changed, 109 insertions(+), 84 deletions(-)
diff --git a/public/favicon.ico b/public/favicon.ico
index e263760..df2c8dc 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg
index 8a89eb8..fffb70f 100644
--- a/src/assets/images/login-background.jpg
+++ b/src/assets/images/login-background.jpg
Binary files differ
diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg
index b3a940b..3e110bf 100644
--- a/src/assets/images/profile.jpg
+++ b/src/assets/images/profile.jpg
Binary files differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e263760..f8d11c3 100644
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png
Binary files differ
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index b8d9d6b..63b3a3b 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -35,7 +35,7 @@
},
data() {
return {
- title: 'RuoYi-Vue-Plus',
+ title: '浜戦�歄A鍔炲叕绯荤粺',
logo: logoImg
}
}
diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue
index bfab7b4..a65241b 100644
--- a/src/views/basics/school/index.vue
+++ b/src/views/basics/school/index.vue
@@ -138,7 +138,7 @@
</template>
</el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remarks"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/device/batch/index.vue b/src/views/device/batch/index.vue
index 0bde533..886eb50 100644
--- a/src/views/device/batch/index.vue
+++ b/src/views/device/batch/index.vue
@@ -87,7 +87,7 @@
</template>
</el-table-column>
<el-table-column label="鎵规璇存槑" align="center" prop="illustrate" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 051ade7..b57e13d 100644
--- a/src/views/device/equipment/index.vue
+++ b/src/views/device/equipment/index.vue
@@ -160,7 +160,7 @@
<dict-tag :options="dict.type.DICT104" :value="scope.row.useStatus"/>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index 9e4c41b..006987b 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -131,7 +131,7 @@
<el-table-column label="璇绘暟鎸囦护" align="center" prop="readInstruction"/>
<el-table-column label="鍥炴暟闀垮害" align="center" prop="loopLength"/>
<el-table-column label="鍔熻兘鎻忚堪" align="center" prop="description"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/index.vue b/src/views/index.vue
index 5ff5e4d..c8fb00c 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,5 +1,7 @@
<template>
- <div class="app-container home">
+ <div class="app-container home index-bg">
+ <!--<img src="@/assets/logo/login-logo.png">-->
+ <!--浜戦�歄A鍔炲叕绯荤粺,娆㈣繋鎮紒-->
</div>
</template>
@@ -18,6 +20,14 @@
</script>
<style scoped lang="scss">
-
+.index-bg {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ /*background-image: url('../assets/images/login-background.jpg');*/
+ background-repeat: no-repeat;
+ background-size: cover;
+ height: calc(100vh - 84px);
+}
</style>
diff --git a/src/views/login.vue b/src/views/login.vue
index ea2a0c4..3ac5840 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,62 +1,68 @@
<template>
<div class="login">
- <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
- <h3 class="title">浜戦�歄A鍔炲叕绯荤粺</h3>
- <el-form-item prop="username">
- <el-input
- v-model="loginForm.username"
- type="text"
- auto-complete="off"
- placeholder="璐﹀彿"
- >
- <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
- </el-input>
- </el-form-item>
- <el-form-item prop="password">
- <el-input
- v-model="loginForm.password"
- type="password"
- auto-complete="off"
- placeholder="瀵嗙爜"
- @keyup.enter.native="handleLogin"
- >
- <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
- </el-input>
- </el-form-item>
- <el-form-item prop="code" v-if="captchaOnOff">
- <el-input
- v-model="loginForm.code"
- auto-complete="off"
- placeholder="楠岃瘉鐮�"
- style="width: 63%"
- @keyup.enter.native="handleLogin"
- >
- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
- </el-input>
- <div class="login-code">
- <img :src="codeUrl" @click="getCode" class="login-code-img"/>
- </div>
- </el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
- <el-form-item style="width:100%;">
- <el-button
- :loading="loading"
- size="medium"
- type="primary"
- style="width:100%;"
- @click.native.prevent="handleLogin"
- >
- <span v-if="!loading">鐧� 褰�</span>
- <span v-else>鐧� 褰� 涓�...</span>
- </el-button>
- <div style="float: right;" v-if="register">
- <router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
- </div>
- </el-form-item>
- </el-form>
+ <div class="login-main">
+ <div class="login-title">
+ <img src="../assets/logo/login-logo.png" style="display: block; width: 400px;">
+ </div>
+ <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+ <h3 class="title"></h3>
+ <el-form-item prop="username">
+ <el-input
+ v-model="loginForm.username"
+ type="text"
+ auto-complete="off"
+ placeholder="璐﹀彿"
+ >
+ <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="password">
+ <el-input
+ v-model="loginForm.password"
+ type="password"
+ auto-complete="off"
+ placeholder="瀵嗙爜"
+ @keyup.enter.native="handleLogin"
+ >
+ <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="code" v-if="captchaOnOff">
+ <el-input
+ v-model="loginForm.code"
+ auto-complete="off"
+ placeholder="楠岃瘉鐮�"
+ style="width: 320px"
+ @keyup.enter.native="handleLogin"
+ >
+ <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+ </el-input>
+ <div class="login-code">
+ <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+ </div>
+ </el-form-item>
+ <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
+ <el-form-item style="width:100%;">
+ <el-button
+ :loading="loading"
+ size="medium"
+ type="primary"
+ style="width:100%; height: 44px; font-size: 16px;"
+ @click.native.prevent="handleLogin"
+ >
+ <span v-if="!loading">鐧� 褰�</span>
+ <span v-else>鐧� 褰� 涓�...</span>
+ </el-button>
+ <div style="float: right;" v-if="register">
+ <router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
+
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2021 鍚夋灄浜戦�氭暟閾剧鎶�鏈夐檺鍏徃 鐗堟潈鎵�鏈�</span>
</div>
</div>
</template>
@@ -169,12 +175,20 @@
text-align: center;
color: #707070;
}
-
+.login-main {
+ display: flex;
+ flex-direction: column;
+ .login-title {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 25px;
+ }
+}
.login-form {
- border-radius: 6px;
- background: #ffffff;
- width: 400px;
- padding: 25px 25px 5px 25px;
+ background: rgba(255, 255, 255, 0.5);
+ width: 510px;
+ padding: 25px 40px 5px 40px;
+ box-sizing: border-box;
.el-input {
height: 38px;
input {
@@ -193,7 +207,7 @@
color: #bfbfbf;
}
.login-code {
- width: 33%;
+ width: 103px;
height: 38px;
float: right;
img {
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 98bd743..4759aa0 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -97,7 +97,7 @@
<el-table-column label="鐧诲綍鍦板潃" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="娴忚鍣�" align="center" prop="browser" :show-overflow-tooltip="true" />
- <el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" />
+ <el-table-column label="鎿嶄綔绯荤粺" width="180" align="center" prop="os" />
<el-table-column label="鐧诲綍鐘舵��" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 509fbe5..bd1afad 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -41,13 +41,13 @@
<el-table-column label="涓绘満" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="娴忚鍣�" align="center" prop="browser" />
- <el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" />
+ <el-table-column label="鎿嶄綔绯荤粺" align="center" width="150" prop="os" />
<el-table-column label="鐧诲綍鏃堕棿" align="center" prop="loginTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 9b8b785..5fd7d9b 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -129,7 +129,7 @@
<span>{{ parseTime(scope.row.operTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="80" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/register.vue b/src/views/register.vue
index 3867db5..41d228e 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -61,7 +61,7 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-register-footer">
- <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2021 鍚夋灄浜戦�氭暟閾剧鎶�鏈夐檺鍏徃 鐗堟潈鎵�鏈�</span>
</div>
</div>
</template>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 9fde370..862bc63 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -122,7 +122,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 1cd40ea..ca4e365 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -75,12 +75,12 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
- icon="el-icon-edit"
+ icon="el-icon-user"
@click="handleUser(scope.row)"
>鎴愬憳
</el-button>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 92b78c9..fed26e3 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -133,7 +133,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index d65773a..f26fc7a 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -76,9 +76,9 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" width="180" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
+ <el-button
size="mini"
type="text"
icon="el-icon-edit"
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 9c793f5..23c0eb0 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -96,7 +96,7 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -311,4 +311,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index fdfed16..bb67db6 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -142,7 +142,7 @@
</el-table-column>
<el-table-column label="涓婁紶浜�" align="center" prop="createBy" />
<el-table-column label="鏈嶅姟鍟�" align="center" prop="service" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 02698da..9a8f3d5 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -97,7 +97,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 779f556..8d4f5d7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -122,7 +122,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" width="180" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ae03d32..5beeeae 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -164,6 +164,7 @@
label="鎿嶄綔"
align="center"
width="160"
+ fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
--
Gitblit v1.9.1