huoran
/
FE_huoran_data
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'ui1' of ssh://git.czcyedu.com:222/huoran/FE_huoran_data into ui1

Browse Source
ui1
Joel 3 years ago
parent 5e99bfb0fc a478c891e8
commit d0fff19355
7 changed files with 30 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/layouts/header/index.vue
  2. 2
      src/layouts/navbar/index.vue
  3. 20
      src/pages/data/list/index.vue
  4. 6
      src/pages/index/list/index.vue
  5. 2
      src/pages/role/list/index.vue
  6. 2
      src/pages/user/list/index.vue
  7. 17
      src/styles/common.scss

5
src/layouts/header/index.vue
Unescape View File

@ -1,7 +1,8 @@
<template> <template>
<div class="header"> <div class="header">
<a class="logo" @click="toIndex"> <a class="logo" @click="toIndex">
<span v-if="token && isManager && !showSetting">{{schoolName}}</span> <!-- <span v-if="token && isManager && !showSetting">{{schoolName}}</span> -->
<img src="@/assets/img/logo.png" alt="">
</a> </a>
<div class="inner"> <div class="inner">
<div style="height: 64px;"></div> <div style="height: 64px;"></div>
@ -239,7 +240,7 @@ export default {
.logo{ .logo{
position: absolute; position: absolute;
top: 0; top: 0;
left: 30px; left: 80px;
font-size: 28px; font-size: 28px;
color: #568DF2; color: #568DF2;
line-height: $height; line-height: $height;

2
src/layouts/navbar/index.vue
Unescape View File

@ -112,7 +112,7 @@ export default {
.nav{ .nav{
position: absolute; position: absolute;
top: 0; top: 0;
left: 250px; left: 280px;
display: flex; display: flex;
li{ li{
padding: 0 15px; padding: 0 15px;

20
src/pages/data/list/index.vue
Unescape View File

@ -106,18 +106,18 @@
<el-table-column type="index" width="100" label="序号" align="center"></el-table-column> <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
<el-table-column prop="showName" label="数据表名称" align="center"></el-table-column> <el-table-column prop="showName" label="数据表名称" align="center"></el-table-column>
<el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column> <el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column>
<el-table-column label="起止时间" width="190" align="center"> <el-table-column label="起止时间" width="220" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.startTime}}-{{scope.row.endTime}} {{scope.row.startTime.slice(0, 10)}} ~ {{scope.row.endTime.slice(0, 10)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dataSize" label="数据大小" width="110" align="center"> <el-table-column prop="dataSize" label="数据大小" width="90" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.dataSize}}M {{scope.row.dataSize}}M
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="updateTime" label="更新时间" width="170" align="center"></el-table-column> <el-table-column prop="updateTime" label="更新时间" width="170" align="center"></el-table-column>
<el-table-column label="操作" width="120" align="center"> <el-table-column label="操作" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="preview(scope.row)">预览</el-button> <el-button type="text" @click="preview(scope.row)">预览</el-button>
<el-button type="text" @click="download(scope.row)">下载</el-button> <el-button type="text" @click="download(scope.row)">下载</el-button>
@ -570,10 +570,6 @@ export default {
max-width: calc(100% - 220px); max-width: calc(100% - 220px);
.page{ .page{
margin-bottom: 20px; margin-bottom: 20px;
.desc{
margin-bottom: 20px;
color: #333;
}
.source { .source {
margin-bottom: 12px; margin-bottom: 12px;
color: #7EB1F3; color: #7EB1F3;
@ -582,7 +578,7 @@ export default {
} }
.desc{ .desc{
padding: 9px 12px; padding: 9px 12px;
margin: 30px 0 10px; margin: 20px 0 10px;
font-size: 12px; font-size: 12px;
color: #333; color: #333;
background-color: #FAFAFA; background-color: #FAFAFA;
@ -596,8 +592,8 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
width: 300px; width: 345px;
height: 50px; height: 34px;
padding: 7px 10px; padding: 7px 10px;
margin: 0 auto; margin: 0 auto;
background-color: #fff; background-color: #fff;
@ -605,7 +601,7 @@ export default {
border-radius: 5px; border-radius: 5px;
input{ input{
width: 195px; width: 260px;
margin-left: 10px; margin-left: 10px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;

6
src/pages/index/list/index.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div class="wrap" :class="{index: !keyword}"> <div class="wrap" :class="{index: !keyword, result: keyword}">
<div class="banner"> <div class="banner">
<div class="title" v-if="!keyword">准确，多元，海量数据</div> <div class="title" v-if="!keyword">准确，多元，海量数据</div>
<div class="search-wrap"> <div class="search-wrap">
@ -36,7 +36,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="更新时间" align="center"></el-table-column> <el-table-column prop="createTime" label="更新时间" align="center"></el-table-column>
<el-table-column label="操作" width="180" align="center"> <el-table-column label="操作" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="preview(scope.row)">预览</el-button> <el-button type="text" @click="preview(scope.row)">预览</el-button>
<el-button type="text" @click="download(scope.row)">下载</el-button> <el-button type="text" @click="download(scope.row)">下载</el-button>
@ -350,7 +350,7 @@ export default {
} }
} }
} }
&.pd{ &.result{
.banner{ .banner{
padding: 46px 0; padding: 46px 0;
} }

2
src/pages/role/list/index.vue
Unescape View File

@ -27,7 +27,7 @@
<el-input disabled placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark "></el-input> <el-input disabled placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180" align="center"> <el-table-column label="操作" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="showRole(scope.row)" v-auth>查看</el-button> <el-button type="text" @click="showRole(scope.row)" v-auth>查看</el-button>
<template v-if="scope.row.roleName != '超级管理员'"> <template v-if="scope.row.roleName != '超级管理员'">

2
src/pages/user/list/index.vue
Unescape View File

@ -66,7 +66,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lastLoginTime" label="上次登录时间" width="160" align="center"></el-table-column> <el-table-column prop="lastLoginTime" label="上次登录时间" width="160" align="center"></el-table-column>
<el-table-column label="操作" align="center" width="260"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="show(scope.row)" v-auth>查看</el-button> <el-button type="text" @click="show(scope.row)" v-auth>查看</el-button>
<el-button type="text" @click="edit(scope.row)" v-auth>编辑</el-button> <el-button type="text" @click="edit(scope.row)" v-auth>编辑</el-button>

17
src/styles/common.scss
Unescape View File

@ -177,13 +177,13 @@
.el-table{ .el-table{
border-radius: 4px; border-radius: 4px;
.cell{ .cell{
font-size: 14px; font-size: 12px;
.el-checkbox{ .el-checkbox{
&:before{ &:before{
content: '全选'; content: '全选';
margin-right: 5px; margin-right: 5px;
color: #222326; color: #222326;
font-size: 14px; font-size: 12px;
opacity: 0; opacity: 0;
} }
} }
@ -192,7 +192,7 @@
background: #E8F0FF !important; background: #E8F0FF !important;
.cell{ .cell{
color: #222326; color: #222326;
font-size: 14px; font-size: 12px;
font-weight: normal; font-weight: normal;
.el-checkbox{ .el-checkbox{
&:before{ &:before{
@ -201,7 +201,13 @@
} }
} }
} }
th, td{
padding: 10px 0;
border-bottom-color: #E1E6F2;
}
&.el-table--striped .el-table__body tr.el-table__row--striped td{
background-color: #FAFBFF;
}
.el-checkbox__inner{ .el-checkbox__inner{
border-radius: 4px; border-radius: 4px;
transition: none !important; transition: none !important;
@ -227,6 +233,9 @@
.el-switch__label--right span{ .el-switch__label--right span{
font-size: 12px; font-size: 12px;
} }
.el-button--text{
padding: 0;
}
} }
.tabs{ .tabs{

Write Preview
Loading…
Cancel
Save