liu_li
/
yxk-storeroom-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

样式修改

master
xuhuajiao 3 years ago
parent
d67505a527
commit
ebbe5bcd72
12 changed files with 98 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/assets/styles/index.scss
  2. 115
      src/assets/styles/yxk-admin.scss
  3. 1
      src/components/Crud/CRUD.operation.vue
  4. 20
      src/views/archivesConfig/dict/index.vue
  5. 3
      src/views/login.vue
  6. 2
      src/views/monitor/log/search.vue
  7. 2
      src/views/system/dept/index.vue
  8. 1
      src/views/system/job/module/header.vue
  9. 2
      src/views/system/menu/index.vue
  10. 2
      src/views/system/role/index.vue
  11. 11
      src/views/system/user/center/updateEmail.vue
  12. 2
      src/views/system/user/index.vue

2
src/assets/styles/index.scss
View File

@ -127,7 +127,7 @@ aside {
}
.app-container {
margin: 30px;
margin: 20px;
}

115
src/assets/styles/yxk-admin.scss
View File

@ -3,7 +3,7 @@
.filter-item {
display: inline-block;
vertical-align: middle;
margin: 0 3px 10px 0;
margin-right: 20px;
input {
border: 1px solid $inputBorder;
background-color: $mainContainerBg;
@ -19,39 +19,18 @@
vertical-align: middle;
font-size: 14px;
color: #606266;
line-height: 30.5px;
padding: 0 7px 0 7px;
}
// xu
.el-button {
font-size: 14px;
color: #fff;
border-color: #339CFF;
background-color: transparent;
// margin-left: 0 !important;
}
.el-button.is-disabled,
.el-button.is-disabled:hover,
.el-button.is-disabled:focus{
border-color: #339CFF;
background-color: transparent;
color: #339CFF;
}
.el-button:hover,
.el-button:focus{
background-color: #02255F;
line-height: 32px;
padding: 0 7px;
}
.el-select__caret.el-input__icon.el-icon-arrow-up{
line-height: 30.5px;
line-height: 32px;
}
.date-item {
display: inline-block;
vertical-align: middle;
border: 1px solid $inputBorder;
background-color: $mainContainerBg;
margin-bottom: 10px;
margin-right: 20px;
height: 32px !important;
width: 230px !important;
}
@ -149,7 +128,7 @@
margin-right: 0 !important;
}
.container-left{
margin-right: 30px;
margin-right: 20px;
}
.container-left,
.container-right,
@ -161,7 +140,7 @@
padding: 0 !important;
background-color: $mainContainerBg;
border: $mainContainerBorder;
min-height: calc(100vh - 210px);
min-height: calc(100vh - 190px);
&::before,
&::after{
content: "";
@ -184,7 +163,8 @@
}
}
.el-card{
.el-card,
.container-left{
background-color: transparent;
min-height: auto;
border-radius: 0;
@ -201,30 +181,62 @@
.head-container{
padding: 0;
}
}
.crud-opts{
padding: 20px;
justify-content: center;
padding: 20px 0 !important;
border-bottom: 1px solid #113D72;
}
.el-tree{
margin: 20px 0;
}
.el-button {
}
// xu el-button
.head-search{
margin-bottom: 20px;
.el-button{
margin-left: 0;
background-color: #3A99FD;
}
}
.el-button,
.el-button--info.is-plain{
font-size: 14px;
color: #fff;
border-color: #339CFF;
background-color: transparent;
// margin-left: 0 !important;
}
.el-button--mini{
padding: 7px 10px;
}
.el-button.is-disabled,
.el-button.is-disabled:hover,
.el-button.is-disabled:focus{
border-color: #339CFF;
}
.el-button.is-disabled,
.el-button.is-disabled:hover,
.el-button.is-disabled:focus{
color: #13439E;
background-color: transparent;
color: #339CFF;
border-color: #13439E;
}
.el-button:hover,
.el-button:focus,
.el-button--info.is-plain:hover,
.el-button--info.is-plain:focus{
color: #fff;
background-color: #02255F;
border-color: #339CFF;
}
.el-button--mini{
padding: 7px 10px;
}
.el-message-box{
.el-button{
border-color: #dcdfe6;
color: #606266;
}
.el-tree{
margin: 20px 0;
.el-button--primary:focus, .el-button--primary:hover {
background: #46a6ff;
border-color: #46a6ff;
}
}
@ -364,6 +376,17 @@
border-color: #fff;
}
}
.el-button{
padding: 7px 15px;
}
.el-button--primary {
background-color: #1890ff;
border-color: #1890ff;
}
.el-button--danger {
background-color: #ff4949;
border-color: #ff4949;
}
}
.el-table__body tr.el-table__row:hover>td.el-table__cell,
.el-table__body tr.el-table__row:focus>td.el-table__cell,
@ -390,7 +413,6 @@
color: #fff;
}
// 分页
.el-pagination{
padding: 2px 10px;
@ -414,7 +436,7 @@
}
}
//
// 弹框
.el-dialog{
position: relative;
width: 620px;
@ -577,5 +599,8 @@
font-size: 16px;
padding: 8px 28px;
}
.el-button--primary{
background-color: #3A99FD;
}
}
}

1
src/components/Crud/CRUD.operation.vue
View File

@ -251,7 +251,6 @@ export default {
<style>
.crud-opts {
padding: 4px 0;
display: -webkit-flex;
display: flex;
align-items: center;

20
src/views/archivesConfig/dict/index.vue
View File

@ -23,23 +23,19 @@
</div>
</el-dialog>
<!-- 字典列表 -->
<el-row class="container-main" :gutter="10">
<el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6">
<el-card class="box-card">
<el-row class="container-main" :gutter="20">
<el-col class="container-left" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
<span class="right-top-line" />
<span class="left-bottom-line" />
<crudOperation :permission="permission" />
<!--字典树状结构-->
<el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :default-expand-all="true" highlight-current @node-click="handleNodeClick" />
</el-card>
</el-col>
<!-- 字典详情列表 -->
<el-col :xs="24" :sm="24" :md="18" :lg="18" :xl="19">
<el-card class="box-card">
<el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
<span class="right-top-line" />
<span class="left-bottom-line" />
<dictDetail ref="dictDetail" :permission="permission" :active-add-btn="activeAddBtn" @treeRefresh="treeRefresh" />
</el-card>
</el-col>
</el-row>
</div>
@ -133,14 +129,4 @@ export default {
</script>
<style lang="scss" scoped>
.el-card{
min-height: calc(100vh - 210px);
.crud-opts{
padding: 20px 0;
}
}
.el-card__body .crud-opts {
justify-content: space-around;
}
</style>

3
src/views/login.vue
View File

@ -271,6 +271,9 @@ export default {
.el-input{
width: 60%;
}
.code-img{
flex: 1;
}
}
}
.input-icon {

2
src/views/monitor/log/search.vue
View File

@ -1,5 +1,5 @@
<template>
<div v-if="crud.props.searchToggle">
<div v-if="crud.props.searchToggle" class="head-search">
<el-input
v-model="query.blurry"
clearable

2
src/views/system/dept/index.vue
View File

@ -4,7 +4,7 @@
<span class="left-bottom-line" />
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<div v-if="crud.props.searchToggle" class="head-search">
<!-- 搜索 -->
<el-input v-model="query.name" clearable size="small" placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<date-range-picker v-model="query.createTime" class="date-item" />

1
src/views/system/job/module/header.vue
View File

@ -1,6 +1,7 @@
<template>
<div
v-if="crud.props.searchToggle"
class="head-search"
>
<el-input v-model="query.name" clearable size="small" placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<date-range-picker v-model="query.createTime" class="date-item" />

2
src/views/system/menu/index.vue
View File

@ -4,7 +4,7 @@
<span class="left-bottom-line" />
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<div v-if="crud.props.searchToggle" class="head-search">
<!-- 搜索 -->
<el-input v-model="query.blurry" clearable size="small" placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<date-range-picker v-model="query.createTime" class="date-item" />

2
src/views/system/role/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<div v-if="crud.props.searchToggle" class="head-search">
<!-- 搜索 -->
<el-input v-model="query.blurry" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<date-range-picker v-model="query.createTime" class="date-item" />

11
src/views/system/user/center/updateEmail.vue
View File

@ -137,14 +137,5 @@ export default {
</script>
<style scoped>
input:-webkit-autofill,
textarea:-webkit-autofill,
select:-webkit-autofill {
-webkit-text-fill-color: red !important;
background-color: red;
transition: background-color 50000s ease-in-out 0s;
}
input {
background-color: transparent;
}
</style>

2
src/views/system/user/index.vue
View File

@ -31,7 +31,7 @@
<span class="left-bottom-line" />
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<div v-if="crud.props.searchToggle" class="head-search">
<!-- 搜索 -->
<el-input
v-model="query.blurry"

Write Preview
Loading…
Cancel
Save