Skip to content

Commit 548cab6

Browse files
wenjianzhangwenjianzhang
committed
Merge branch 'dev'
2 parents 7f12fbe + b1a51cd commit 548cab6

File tree

8 files changed

+61
-87
lines changed

8 files changed

+61
-87
lines changed

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "go-admin",
3-
"version": "2.0.0-bate.3",
3+
"version": "2.0.0-beta.5",
44
"description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
55
"author": "https://github.com/wenjianzhang",
66
"license": "MIT",

Diff for: ‎src/api/syschinaareadata.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import request from '@/utils/request'
33
// 查询SysChinaAreaData列表
44
export function listSysChinaAreaData(query) {
55
return request({
6-
url: '/api/v1/sys_china_area_data',
6+
url: '/api/v1/sys-area-data',
77
method: 'get',
88
params: query
99
})
@@ -12,15 +12,15 @@ export function listSysChinaAreaData(query) {
1212
// 查询SysChinaAreaData详细
1313
export function getSysChinaAreaData(id) {
1414
return request({
15-
url: '/api/v1/sys_china_area_data/' + id,
15+
url: '/api/v1/sys-area-data/' + id,
1616
method: 'get'
1717
})
1818
}
1919

2020
// 新增SysChinaAreaData
2121
export function addSysChinaAreaData(data) {
2222
return request({
23-
url: '/api/v1/sys_china_area_data',
23+
url: '/api/v1/sys-area-data',
2424
method: 'post',
2525
data: data
2626
})
@@ -29,7 +29,7 @@ export function addSysChinaAreaData(data) {
2929
// 修改SysChinaAreaData
3030
export function updateSysChinaAreaData(data) {
3131
return request({
32-
url: '/api/v1/sys_china_area_data/' + data.id,
32+
url: '/api/v1/sys-area-data/' + data.id,
3333
method: 'put',
3434
data: data
3535
})
@@ -38,7 +38,7 @@ export function updateSysChinaAreaData(data) {
3838
// 删除SysChinaAreaData
3939
export function delSysChinaAreaData(data) {
4040
return request({
41-
url: '/api/v1/sys_china_area_data',
41+
url: '/api/v1/sys-area-data',
4242
method: 'delete',
4343
data: data
4444
})

Diff for: ‎src/utils/request.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,12 @@ service.interceptors.response.use(
8383
duration: 5 * 1000
8484
})
8585
} else if (code !== 200) {
86-
Notification.error({
87-
title: response.data.msg
86+
// Notification.error({
87+
// title: response.data.msg
88+
// })
89+
Message({
90+
message: response.data.msg,
91+
type: 'error'
8892
})
8993
return Promise.reject('error')
9094
} else {

Diff for: ‎src/views/admin/dict/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
9494
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
9595
<template slot-scope="scope">
96-
<router-link :to="{name:'DictData', params: {dictId:scope.row.id}}" class="link-type">
96+
<router-link :to="{name:'SysDictDataManage', params: {dictId:scope.row.id}}" class="link-type">
9797
<span>{{ scope.row.dictType }}</span>
9898
</router-link>
9999
</template>

Diff for: ‎src/views/admin/sys-login-log/index.vue

+17-27
Original file line numberDiff line numberDiff line change
@@ -84,32 +84,21 @@
8484
label="ip地址"
8585
align="center"
8686
prop="ipaddr"
87-
:show-overflow-tooltip="true"
88-
/>
89-
<el-table-column
90-
label="归属地"
91-
align="center"
92-
prop="loginLocation"
93-
:show-overflow-tooltip="true"
94-
/>
95-
<el-table-column
96-
label="浏览器"
97-
align="center"
98-
prop="browser"
99-
:show-overflow-tooltip="true"
100-
/>
101-
<el-table-column
102-
label="系统"
103-
align="center"
104-
prop="os"
105-
:show-overflow-tooltip="true"
106-
/>
107-
<el-table-column
108-
label="固件"
109-
align="center"
110-
prop="platform"
111-
:show-overflow-tooltip="true"
112-
/>
87+
>
88+
<template slot-scope="scope">
89+
<el-popover trigger="hover" placement="top">
90+
<p>IP: {{ scope.row.ipaddr }}</p>
91+
<p>归属地: {{ scope.row.loginLocation }}</p>
92+
<p>浏览器: {{ scope.row.browser }}</p>
93+
<p>系统: {{ scope.row.os }}</p>
94+
<p>固件: {{ scope.row.platform }}</p>
95+
<div slot="reference" class="name-wrapper">
96+
{{ scope.row.ipaddr }}
97+
</div>
98+
</el-popover>
99+
</template>
100+
</el-table-column>
101+
113102
<el-table-column
114103
label="登录时间"
115104
align="center"
@@ -185,7 +174,8 @@ export default {
185174
username: undefined,
186175
status: undefined,
187176
ipaddr: undefined,
188-
loginLocation: undefined
177+
loginLocation: undefined,
178+
createdAtOrder: 'desc'
189179
},
190180
// 表单参数
191181
form: {

Diff for: ‎src/views/admin/sys-menu/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ export default {
616616
margin-left:0;
617617
}
618618
.panel .el-transfer-panel{
619-
width: 310px;
619+
width: 300px;
620620
}
621621
622622
.el-col {

Diff for: ‎src/views/admin/sys-oper-log/index.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<el-table-column
6767
label="Request info"
6868
prop="operUrl"
69-
:show-overflow-tooltip="true"
7069
>
7170
<template slot-scope="scope">
7271
<el-popover trigger="hover" placement="top">
@@ -219,7 +218,8 @@ export default {
219218
title: undefined,
220219
operName: undefined,
221220
businessType: undefined,
222-
status: undefined
221+
status: undefined,
222+
createdAtOrder: 'desc'
223223
}
224224
}
225225
},

Diff for: ‎src/views/sys-tools/sys-china-area-data/index.vue

+28-48
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
<template #wrapper>
55
<el-card class="box-card">
66
<el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
7-
<el-form-item label="上级编码" prop="pId"><el-input
8-
v-model="queryParams.pId"
9-
placeholder="请输入上级编码"
10-
clearable
11-
size="small"
12-
@keyup.enter.native="handleQuery"
13-
/>
7+
<el-form-item label="上级编码" prop="pId">
8+
<el-cascader
9+
v-model="queryParams.pId"
10+
:options="syschinaareadataList"
11+
:props="defaultProps"
12+
style="width:260px;"
13+
size="small"
14+
@change="handleChange"
15+
/>
1416
</el-form-item>
1517
<el-form-item label="名称" prop="name"><el-input
1618
v-model="queryParams.name"
@@ -62,18 +64,20 @@
6264
</el-col>
6365
</el-row>
6466

65-
<el-table v-loading="loading" :data="syschinaareadataList" @selection-change="handleSelectionChange">
66-
<el-table-column type="selection" width="55" align="center" /><el-table-column
67+
<el-table
68+
v-loading="loading"
69+
:data="syschinaareadataList"
70+
border
71+
row-key="id"
72+
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
73+
>
74+
<el-table-column
6775
label="编码"
6876
align="center"
6977
prop="id"
7078
:show-overflow-tooltip="true"
71-
/><el-table-column
72-
label="上级编码"
73-
align="center"
74-
prop="pId"
75-
:show-overflow-tooltip="true"
76-
/><el-table-column
79+
/>
80+
<el-table-column
7781
label="名称"
7882
align="center"
7983
prop="name"
@@ -101,14 +105,6 @@
101105
</el-table-column>
102106
</el-table>
103107

104-
<pagination
105-
v-show="total>0"
106-
:total="total"
107-
:page.sync="queryParams.pageIndex"
108-
:limit.sync="queryParams.pageSize"
109-
@pagination="getList"
110-
/>
111-
112108
<!-- 添加或修改对话框 -->
113109
<el-dialog :title="title" :visible.sync="open" width="500px">
114110
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -164,20 +160,17 @@
164160
<el-button @click="cancel">取 消</el-button>
165161
</div>
166162
</el-dialog>
167-
<FileChoose ref="fileChoose" :dialog-form-visible="fileOpen" @confirm="getImgList" @close="fileClose" />
168163
</el-card>
169164
</template>
170165
</BasicLayout>
171166
</template>
172167

173168
<script>
174169
import { addSysChinaAreaData, delSysChinaAreaData, getSysChinaAreaData, listSysChinaAreaData, updateSysChinaAreaData } from '@/api/syschinaareadata'
175-
import FileChoose from '@/components/FileChoose'
176170
177171
export default {
178172
name: 'SysChinaAreaData',
179173
components: {
180-
FileChoose
181174
},
182175
data() {
183176
return {
@@ -189,41 +182,35 @@ export default {
189182
single: true,
190183
// 非多个禁用
191184
multiple: true,
192-
// 总条数
193-
total: 0,
194185
// 弹出层标题
195186
title: '',
196187
// 是否显示弹出层
197188
open: false,
198189
isEdit: false,
199190
fileOpen: false,
200191
fileIndex: undefined,
192+
defaultProps: {
193+
children: 'children',
194+
label: 'name',
195+
value: 'id'
196+
},
201197
// 类型数据字典
202198
typeOptions: [],
203199
syschinaareadataList: [],
204-
205-
// 关系表类型
206-
207200
// 查询参数
208201
queryParams: {
209202
pageIndex: 1,
210203
pageSize: 10,
211204
pId: undefined,
212205
name: undefined
213-
214206
},
215207
// 表单参数
216208
form: {
217209
},
218210
// 表单校验
219-
rules: { pId:
220-
[
221-
{ required: true, message: '上级编码不能为空', trigger: 'blur' }
222-
],
223-
name:
224-
[
225-
{ required: true, message: '名称不能为空', trigger: 'blur' }
226-
]
211+
rules: {
212+
pId: [{ required: true, message: '上级编码不能为空', trigger: 'blur' }],
213+
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
227214
}
228215
}
229216
},
@@ -235,8 +222,7 @@ export default {
235222
getList() {
236223
this.loading = true
237224
listSysChinaAreaData(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
238-
this.syschinaareadataList = response.data.list
239-
this.total = response.data.count
225+
this.syschinaareadataList = response.data
240226
this.loading = false
241227
}
242228
)
@@ -259,12 +245,6 @@ export default {
259245
}
260246
this.resetForm('form')
261247
},
262-
getImgList: function() {
263-
this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
264-
},
265-
fileClose: function() {
266-
this.fileOpen = false
267-
},
268248
// 关系
269249
// 文件
270250
/** 搜索按钮操作 */

0 commit comments

Comments
 (0)