Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xichonght
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangdishen
xichonght
Commits
363effc3
Commit
363effc3
authored
Aug 13, 2019
by
lc@weface.com.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
''
parent
933edc6d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
17 deletions
+17
-17
global.js
xichongSys/src/utils/global.js
+4
-4
User.vue
xichongSys/src/views/Sys/User.vue
+13
-13
No files found.
xichongSys/src/utils/global.js
View file @
363effc3
...
@@ -7,15 +7,15 @@
...
@@ -7,15 +7,15 @@
// 后台管理系统服务器地址
// 后台管理系统服务器地址
//export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl = 'http://172.16.10.25:9009'
//export const baseUrl = 'http://172.16.10.25:9009'
//
export const baseUrl ="http://faceauth.weface.com.cn:98"
export
const
baseUrl
=
"http://faceauth.weface.com.cn:98"
//
export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
export
const
baseUrl2
=
'http://faceauth.weface.com.cn:97'
//export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl = 'http://172.16.10.33:9002'
export
const
baseUrl
=
'http://172.16.10.25:9002'
//
export const baseUrl = 'http://172.16.10.25:9002'
//export const baseUrl ="http://172.16.10.33:9002"
//export const baseUrl ="http://172.16.10.33:9002"
//export const baseUrl2 = 'http://172.16.10.25:9999'
//export const baseUrl2 = 'http://172.16.10.25:9999'
//export const baseUrl = 'http://172.16.10.25:9002'
//export const baseUrl = 'http://172.16.10.25:9002'
//export const baseUrl ="http://172.16.10.33:9002"
//export const baseUrl ="http://172.16.10.33:9002"
export
const
baseUrl2
=
'http://172.16.10.25:9007'
//
export const baseUrl2 = 'http://172.16.10.25:9007'
// 系统数据备份还原服务器地址
// 系统数据备份还原服务器地址
//export const backupBaseUrl = 'http://localhost:8002'
//export const backupBaseUrl = 'http://localhost:8002'
//export const baseUrl = 'http://faceauth.weface.com.cn:98'
//export const baseUrl = 'http://faceauth.weface.com.cn:98'
...
...
xichongSys/src/views/Sys/User.vue
View file @
363effc3
...
@@ -31,8 +31,8 @@
...
@@ -31,8 +31,8 @@
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<!--表格显示列界面-->
<!--表格显示列界面-->
<table-column-filter-dialog
ref=
"tableColumnFilterDialog"
:columns=
"columns"
<table-column-filter-dialog
ref=
"tableColumnFilterDialog"
:columns=
"columns"
@
handleFilterColumns=
"handleFilterColumns"
>
@
handleFilterColumns=
"handleFilterColumns"
>
</table-column-filter-dialog>
</table-column-filter-dialog>
</div>
</div>
<!--表格内容栏-->
<!--表格内容栏-->
...
@@ -64,11 +64,11 @@
...
@@ -64,11 +64,11 @@
:props=
"
{ checkStrictly: true }"
:props=
"
{ checkStrictly: true }"
style="width:100%"
style="width:100%"
clearable>
</el-cascader>
clearable>
</el-cascader>
<!--
<popup-tree-input
<!--
<popup-tree-input
:data=
"deptData"
:data=
"deptData"
:props=
"deptTreeProps"
:props=
"deptTreeProps"
:prop=
"dataForm.deptName"
:prop=
"dataForm.deptName"
:nodeKey=
"''+dataForm.deptId"
:nodeKey=
"''+dataForm.deptId"
:currentChangeHandle=
"deptTreeCurrentChangeHandle"
>
:currentChangeHandle=
"deptTreeCurrentChangeHandle"
>
</popup-tree-input>
-->
</popup-tree-input>
-->
</el-form-item>
</el-form-item>
...
@@ -167,7 +167,7 @@ export default {
...
@@ -167,7 +167,7 @@ export default {
findUserRoles
:
function
()
{
findUserRoles
:
function
()
{
this
.
$api
.
role
.
findAll
().
then
((
res
)
=>
{
this
.
$api
.
role
.
findAll
().
then
((
res
)
=>
{
// 加载角色集合
// 加载角色集合
this
.
roles
=
res
.
data
this
.
roles
=
res
.
data
})
})
},
},
// 批量删除
// 批量删除
...
@@ -248,9 +248,9 @@ export default {
...
@@ -248,9 +248,9 @@ export default {
}
}
}
}
}
}
this
.
list
=
res
.
data
this
.
list
=
res
.
data
//this.deptData = res.data
//this.deptData = res.data
})
})
},
},
...
@@ -281,10 +281,10 @@ export default {
...
@@ -281,10 +281,10 @@ export default {
{
prop
:
"truename"
,
label
:
"真实姓名"
,
minWidth
:
100
},
{
prop
:
"truename"
,
label
:
"真实姓名"
,
minWidth
:
100
},
{
prop
:
"deptName"
,
label
:
"机构"
,
minWidth
:
120
},
{
prop
:
"deptName"
,
label
:
"机构"
,
minWidth
:
120
},
{
prop
:
"roleNames"
,
label
:
"角色"
,
minWidth
:
100
},
{
prop
:
"roleNames"
,
label
:
"角色"
,
minWidth
:
100
},
{
prop
:
"mobile"
,
label
:
"手机"
,
minWidth
:
100
},
{
prop
:
"mobile"
,
label
:
"手机"
,
minWidth
:
100
},
{
prop
:
"status"
,
label
:
"状态"
,
minWidth
:
70
},
{
prop
:
"status"
,
label
:
"状态"
,
minWidth
:
70
},
// {prop:"createBy", label:"创建人", minWidth:120},
// {prop:"createBy", label:"创建人", minWidth:120},
// {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
// {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
// {prop:"lastUpdateBy", label:"更新人", minWidth:100},
// {prop:"lastUpdateBy", label:"更新人", minWidth:100},
...
@@ -304,4 +304,4 @@ export default {
...
@@ -304,4 +304,4 @@ export default {
.el-tree-node__children
{
.el-tree-node__children
{
overflow
:
scroll
overflow
:
scroll
}
}
</
style
>
</
style
>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment