Browse Source

更新

wangqin
hui 10 months ago
parent
commit
beec1c781c
  1. 23
      ruoyi-ui/src/assets/styles/JiHeExpressway.scss
  2. 1
      ruoyi-ui/src/layout/index.vue
  3. 3
      ruoyi-ui/src/router/index.js
  4. 6
      ruoyi-ui/src/settings.js
  5. 2
      ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
  6. 2
      ruoyi-ui/src/views/JiHeExpressway/skin/blue/basic.scss
  7. 10
      ruoyi-ui/src/views/login.vue
  8. 30
      ruoyi-ui/src/views/system/user/profile/index.vue

23
ruoyi-ui/src/assets/styles/JiHeExpressway.scss

@ -3,11 +3,9 @@
$inputHeight: 26px; $inputHeight: 26px;
color: $textColor; color: $textColor;
.dialog-content {
.el-tabs__item { .el-tabs__item {
color: $textColor; color: $textColor;
} }
}
.el-form-item { .el-form-item {
margin-bottom: 14px; margin-bottom: 14px;
@ -129,6 +127,18 @@
} }
} }
//单选框
.el-radio-group{
.el-radio{
.el-radio__label{ color: #fff; }
&.is-checked{
.el-radio__label {
color: #3de8ff;
}
}
}
}
// 导航菜单 // 导航菜单
.el-menu--popup { .el-menu--popup {
border-radius: 0; border-radius: 0;
@ -226,4 +236,13 @@
} }
} }
.el-card{
background-color:#064258;
border: 1px solid #006a99;
.el-card__header{
border-color: #006a99;
color: #3de8ff;
}
}
} }

1
ruoyi-ui/src/layout/index.vue

@ -1,6 +1,5 @@
<template> <template>
<div> <div>
{{ sideTheme }}
<template v-if="sideTheme == 'theme-dark' || <template v-if="sideTheme == 'theme-dark' ||
sideTheme == 'theme-light' || sideTheme == 'theme-light' ||
sideTheme == 'theme-blue' sideTheme == 'theme-blue'

3
ruoyi-ui/src/router/index.js

@ -1,4 +1,5 @@
import Layout from "@/layout"; // import Layout from "@/layout";
import Layout from "@/views/JiHeExpressway/index";
const constantRoutes = [ const constantRoutes = [
// { // {
// path: '/redirect', // path: '/redirect',

6
ruoyi-ui/src/settings.js

@ -20,12 +20,12 @@ module.exports = {
/** /**
* 是否显示顶部导航 * 是否显示顶部导航
*/ */
topNav: true, topNav: false,
/** /**
* 是否显示 tagsView * 是否显示 tagsView
*/ */
tagsView: true, tagsView: false,
/** /**
* 是否固定头部 * 是否固定头部
@ -35,7 +35,7 @@ module.exports = {
/** /**
* 是否显示logo * 是否显示logo
*/ */
sidebarLogo: true, sidebarLogo: false,
/** /**
* 是否显示动态标题 * 是否显示动态标题

2
ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss

@ -347,7 +347,7 @@ body {
border: 0; border: 0;
min-height: fit-content; min-height: fit-content;
line-height: unset; line-height: unset;
font-size: 12px; font-size: 14px;
} }
.el-input__suffix { .el-input__suffix {

2
ruoyi-ui/src/views/JiHeExpressway/skin/blue/basic.scss

@ -0,0 +1,2 @@
$textMain : #3de8ff;
$lineC03 : #006c84;

10
ruoyi-ui/src/views/login.vue

@ -13,14 +13,14 @@
</div> </div>
<div class="title">{{ '' }}</div> <div class="title">{{ '' }}</div>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="请输入用户名"> <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="请输入用户名" class="username">
<img slot="prefix" src="../assets/images/Vector.png" class="el-input__icon input-icon" /> <img slot="prefix" src="../assets/images/Vector.png" class="el-input__icon input-icon" />
</el-input> </el-input>
<!-- <div style="border-bottom: 1px solid #cfcfcf; margin-top: 5px"></div> --> <!-- <div style="border-bottom: 1px solid #cfcfcf; margin-top: 5px"></div> -->
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="请输入密码" <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="请输入密码"
@keyup.enter.native="handleLogin"> @keyup.enter.native="handleLogin" class="password">
<img slot="prefix" src="../assets/images/locked.png" class="el-input__icon input-icon" /> <img slot="prefix" src="../assets/images/locked.png" class="el-input__icon input-icon" />
</el-input> </el-input>
<!-- <div style="border-bottom: 1px solid #cfcfcf; margin-top: 5px"></div> --> <!-- <div style="border-bottom: 1px solid #cfcfcf; margin-top: 5px"></div> -->
@ -175,7 +175,7 @@ export default {
.dispatch("Login", this.loginForm) .dispatch("Login", this.loginForm)
.then(() => { .then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => { }); this.$router.push({ path: this.redirect || "/" }).catch(() => { });
this.getManageStation(); // this.getManageStation();
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -334,7 +334,9 @@ export default {
border: 1px solid #01CFFE; border: 1px solid #01CFFE;
background-color: transparent; background-color: transparent;
margin-bottom: 12px; margin-bottom: 12px;
; ::v-deep .el-input__inner {
font-size: 20px !important;
}
input { input {

30
ruoyi-ui/src/views/system/user/profile/index.vue

@ -1,9 +1,9 @@
<template> <template>
<div class="app-container"> <div class="app-container" style="margin-top: 20px;">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header">
<span>个人信息</span> <span>个人信息</span>
</div> </div>
<div> <div>
@ -12,27 +12,27 @@
</div> </div>
<ul class="list-group list-group-striped"> <ul class="list-group list-group-striped">
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="user" />用户名称 <svg-icon class="icon" icon-class="user" />用户名称
<div class="pull-right">{{ user.userName }}</div> <div class="pull-right">{{ user.userName }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="phone" />手机号码 <svg-icon class="icon" icon-class="phone" />手机号码
<div class="pull-right">{{ user.phonenumber }}</div> <div class="pull-right">{{ user.phonenumber }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱 <svg-icon class="icon" icon-class="email" />用户邮箱
<div class="pull-right">{{ user.email }}</div> <div class="pull-right">{{ user.email }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="tree" />所属部门 <svg-icon class="icon" icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div> <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色 <svg-icon class="icon" icon-class="peoples" />所属角色
<div class="pull-right">{{ roleGroup }}</div> <div class="pull-right">{{ roleGroup }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="date" />创建日期 <svg-icon class="icon" icon-class="date" />创建日期
<div class="pull-right">{{ user.createTime }}</div> <div class="pull-right">{{ user.createTime }}</div>
</li> </li>
</ul> </ul>
@ -41,7 +41,7 @@
</el-col> </el-col>
<el-col :span="18" :xs="24" class="box-card2"> <el-col :span="18" :xs="24" class="box-card2">
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header">
<span>基本资料</span> <span>基本资料</span>
</div> </div>
<el-tabs v-model="activeTab"> <el-tabs v-model="activeTab">
@ -89,3 +89,15 @@ export default {
} }
}; };
</script> </script>
<style lang="scss">
@import "@screen/skin/blue/basic.scss";
.list-group{
.list-group-item{
color: $textMain;
border-color: $lineC03;
.icon{
margin-right: 6px;
}
}
}
</style>

Loading…
Cancel
Save