Skip to content

Commit 9e290d7

Browse files
vanoneanggongjs
vanoneang
authored and
gongjs
committed
optimize(ui): lots of repairs (#128)
1 parent a2e1750 commit 9e290d7

11 files changed

Lines changed: 76 additions & 56 deletions

File tree

‎src/components/base/date-picker/lin-date-picker.vue‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,14 @@ export default {
6666
margin-top: 10px;
6767
}
6868
.el-input__inner{
69-
height: 36px;
70-
line-height: 36px;
69+
height: 32px;
70+
line-height: 32px;
71+
}
72+
.el-date-editor .el-range__icon {
73+
height: 32px;
74+
}
75+
.el-date-editor .el-range-separator{
76+
height: 32px;
7177
}
7278
.el-date-table td.start-date span, .el-date-table td.end-date span{
7379
background-color: #3963BC;

‎src/components/base/source-code/source-code.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default {
2929
position: fixed;
3030
z-index: 9999;
3131
right: -11.5px;
32-
bottom: 20px;
32+
bottom: 145px;
3333
font-size: 12px;
3434
line-height: 12px;
3535
font-weight: 700;

‎src/components/layout/SideBar.vue‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ export default {
142142
</script>
143143

144144
<style lang="scss">
145+
::-webkit-scrollbar {
146+
width: 0px;
147+
height: 0px;
148+
}
145149
.app-sidebar {
146150
background: #192a5e;
147151

‎src/config/stage/book.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const bookRouter = {
33
name: null,
44
title: '图书管理',
55
type: 'folder', // 类型: folder, tab, view
6-
icon: 'iconfont icon-kecheng',
6+
icon: 'iconfont icon-tushuguanli',
77
filePath: 'views/book/', // 文件路径
88
order: null,
99
inNav: true,
@@ -15,7 +15,7 @@ const bookRouter = {
1515
route: '/book/add',
1616
filePath: 'views/book/BookAdd.vue',
1717
inNav: true,
18-
icon: 'iconfont icon-kecheng',
18+
icon: 'iconfont icon-tushuguanli',
1919
},
2020
{
2121
title: '图书列表',
@@ -24,7 +24,7 @@ const bookRouter = {
2424
route: '/book/list',
2525
filePath: 'views/book/BookList.vue',
2626
inNav: true,
27-
icon: 'iconfont icon-kecheng',
27+
icon: 'iconfont icon-tushuguanli',
2828
},
2929
],
3030
}

‎src/lin/utils/exception.js‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ export async function handleException(res) {
2626
}
2727
// 如果令牌无效或者是refreshToken相关异常
2828
if (error_code === 10000 || error_code === 10100) {
29-
Vue.prototype.$message({
30-
message: '令牌无效,请重新登录',
31-
type: 'error',
32-
})
33-
store.dispatch('loginOut')
34-
const { origin } = window.location
35-
window.location.href = origin
29+
setTimeout(() => {
30+
store.dispatch('loginOut')
31+
const { origin } = window.location
32+
window.location.href = origin
33+
}, 1500)
3634
}
3735
// 令牌相关，刷新令牌
3836
if (error_code === 10040 || error_code === 10050) {
@@ -51,8 +49,7 @@ export async function handleException(res) {
5149
message: msg || '未知的error_code',
5250
type: 'error',
5351
})
54-
// throw new Error(res)
55-
return false
52+
throw new Error(res)
5653
}
5754

5855
export function handleError(error) {

‎src/plugins/LinCmsUi/stage-config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const LinCmsUiRouter = {
22
route: null,
33
name: null,
4-
title: 'lin-cms-ui',
4+
title: 'UI',
55
type: 'folder',
66
icon: 'iconfont icon-jiemiansheji',
77
filePath: 'views/LinCmsUi/',

‎src/plugins/LinCmsUi/views/table/Table.vue‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<el-table-column prop="province" label="省份" width="120"></el-table-column>
1717
<el-table-column prop="city" label="市区" width="120"></el-table-column>
1818
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
19-
<el-table-column prop="address" label="地址"></el-table-column>
19+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
2020
</el-table>
2121
</el-row>
2222
<el-collapse>
@@ -37,7 +37,7 @@
3737
<el-table-column prop="province" label="省份" width="120"></el-table-column>
3838
<el-table-column prop="city" label="市区" width="120"></el-table-column>
3939
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
40-
<el-table-column prop="address" label="地址"></el-table-column>
40+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
4141
</el-table>
4242
</el-row>
4343
<el-collapse>
@@ -58,7 +58,7 @@
5858
<el-table-column prop="province" label="省份" width="120"></el-table-column>
5959
<el-table-column prop="city" label="市区" width="120"></el-table-column>
6060
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
61-
<el-table-column prop="address" label="地址"></el-table-column>
61+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
6262
</el-table>
6363
</el-row>
6464
<el-collapse>
@@ -81,7 +81,7 @@
8181
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
8282
<el-table-column prop="province" label="省份" width="120"></el-table-column>
8383
<el-table-column prop="city" label="市区" width="120"></el-table-column>
84-
<el-table-column prop="address" label="地址" width="300"></el-table-column>
84+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
8585
<el-table-column prop="zip" label="邮编" width="120" fixed="right"></el-table-column>
8686
</el-table>
8787
</el-row>
@@ -102,7 +102,7 @@
102102
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
103103
<el-table-column prop="province" label="省份" width="120"></el-table-column>
104104
<el-table-column prop="city" label="市区" width="120"></el-table-column>
105-
<el-table-column prop="address" label="地址" width="300"></el-table-column>
105+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
106106
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
107107
<el-table-column label="操作" width="140" fixed="right">
108108
<template slot-scope="scope">
@@ -175,7 +175,7 @@ export default {
175175
<el-table-column prop="province" label="省份" width="120"></el-table-column>
176176
<el-table-column prop="city" label="市区" width="120"></el-table-column>
177177
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
178-
<el-table-column prop="address" label="地址"></el-table-column>
178+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
179179
</el-table>`,
180180
border: `
181181
<el-table :data="tableData" stripe border>
@@ -184,7 +184,7 @@ export default {
184184
<el-table-column prop="province" label="省份" width="120"></el-table-column>
185185
<el-table-column prop="city" label="市区" width="120"></el-table-column>
186186
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
187-
<el-table-column prop="address" label="地址"></el-table-column>
187+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
188188
</el-table>`,
189189
header: `
190190
<el-table :data="tableData" height="200" stripe>
@@ -193,15 +193,15 @@ export default {
193193
<el-table-column prop="province" label="省份" width="120"></el-table-column>
194194
<el-table-column prop="city" label="市区" width="120"></el-table-column>
195195
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
196-
<el-table-column prop="address" label="地址"></el-table-column>
196+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true"></el-table-column>
197197
</el-table>`,
198198
column: `
199199
<el-table :data="tableData" border style="width:800px;margin-left:auto;margin-right:auto;">
200200
<el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
201201
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
202202
<el-table-column prop="province" label="省份" width="120"></el-table-column>
203203
<el-table-column prop="city" label="市区" width="120"></el-table-column>
204-
<el-table-column prop="address" label="地址" width="300"></el-table-column>
204+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
205205
<el-table-column prop="zip" label="邮编" width="120" fixed="right"></el-table-column>
206206
</el-table>`,
207207
operate: `
@@ -210,7 +210,7 @@ export default {
210210
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
211211
<el-table-column prop="province" label="省份" width="120"></el-table-column>
212212
<el-table-column prop="city" label="市区" width="120"></el-table-column>
213-
<el-table-column prop="address" label="地址" width="300"></el-table-column>
213+
<el-table-column prop="address" label="地址" :show-overflow-tooltip="true" width="300"></el-table-column>
214214
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
215215
<el-table-column label="操作" width="150">
216216
<template slot-scope="scope">

‎src/plugins/LinCmsUi/views/table/TableCombo.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,9 @@ export default {
611611
justify-content: flex-end;
612612
margin: 20px;
613613
}
614+
.pagination /deep/ .el-pagination__editor.el-input .el-input__inner{
615+
border-radius: 4px;
616+
}
614617
}
615618
</style>
616619
<style>

‎src/views/admin/user/UserInfo.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ export default {
257257
&.user-info {
258258
display: flex;
259259
flex-wrap: wrap;
260-
width: 120%;
260+
justify-content: space-between;
261261
> .el-radio {
262-
width: 30%;
262+
width: 150px;
263263
margin-left: 0px !important;
264264
margin-right: 10px;
265265
margin-bottom: 20px;

‎src/views/home/Home.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export default {
181181
overflow-y: auto;
182182
position: relative;
183183
padding: 0;
184-
&::-webkit-scrollbar {
184+
&::-webkit-scrollbar {
185185
width: 2px;
186186
height: 0px;
187187
}

0 commit comments

Comments
 (0)