Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
周远喜
mes-ui
Commits
a76de6d8
Commit
a76de6d8
authored
Aug 13, 2020
by
kangzhenfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更换 platform
parent
4670659f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
12 deletions
+23
-12
sysUser.js
api/sysUser.js
+4
-2
dataGrid.vue
components/page/dataGrid.vue
+6
-3
gridNew.vue
components/page/gridNew.vue
+6
-3
userSelect.vue
components/page/userSelect.vue
+4
-2
config.js
static/config.js
+2
-2
index.js
store/index.js
+1
-0
No files found.
api/sysUser.js
View file @
a76de6d8
...
...
@@ -2,7 +2,8 @@ import Api from '@/plugins/request';
export
default
{
getTable
(
data
)
{
Api
.
get
(
`
${
systemUrl
}
/SysUser/GetAllSysUsers`
)
// Api.get(`${systemUrl}/SysUser/GetAllSysUsers`)
Api
.
get
(
`
${
system
}
/SysUser/GetAllSysUsers`
)
.
then
(
res
=>
{
// {id:1,name:'张三',gender:'男',birthday:'1995-1-4',degree:'本科',title:'高级技工',jobNumber:'A0001',workLicense:'B0001',equipment:'E01',email:'abc@123.com',phone:'18000000222',department:'测试数控车1',jobName:'班组长',role:'班组长',account:'aaaaa',employeeNo:'C0001',modifyTime:'2019-8-8 10:10:10',status:1,remark:''}
let
arrs
=
res
.
result
.
items
;
...
...
@@ -43,7 +44,8 @@ export default {
let
model
=
{
Terms
:
terms
};
Api
.
get
(
`
${
systemUrl
}
/SysUser/GetSysUsers`
,
model
)
// Api.get(`${systemUrl}/SysUser/GetSysUsers`, model)
Api
.
get
(
`
${
system
}
/SysUser/GetSysUsers`
,
model
)
.
then
(
res
=>
{
console
.
log
(
res
);
let
arrs
=
res
.
result
.
items
;
...
...
components/page/dataGrid.vue
View file @
a76de6d8
...
...
@@ -320,7 +320,8 @@ export default {
],
pageSize
:
1
}
this
.
$api
.
post
(
`
${
window
.
systemUrl
}
/config/list`
,
query
).
then
((
r
)
=>
{
// this.$api.post(`${window.systemUrl}/config/list`, query).then((r) => {
this
.
$api
.
post
(
`
${
window
.
system
}
/config/list`
,
query
).
then
((
r
)
=>
{
if
(
r
.
success
)
{
if
(
r
.
result
.
length
==
1
)
{
this
.
userConfig
=
r
.
result
[
0
]
...
...
@@ -335,7 +336,8 @@ export default {
})
},
saveUserconfig
()
{
let
url
=
`
${
window
.
systemUrl
}
/config/update`
// let url = `${window.systemUrl}/config/update`
let
url
=
`
${
window
.
system
}
/config/update`
var
content
=
[]
this
.
columnsCur
.
map
((
u
)
=>
{
content
.
push
({
...
...
@@ -344,7 +346,8 @@ export default {
})
})
if
(
!
this
.
userConfig
)
{
url
=
`
${
window
.
systemUrl
}
/config/create`
// url = `${window.systemUrl}/config/create`
url
=
`
${
window
.
system
}
/config/create`
var
data
=
{
page
:
window
.
location
.
pathname
,
component
:
'Grid'
,
...
...
components/page/gridNew.vue
View file @
a76de6d8
...
...
@@ -294,7 +294,8 @@ export default {
],
pageSize
:
1
}
this
.
$api
.
post
(
`
${
window
.
systemUrl
}
/config/list`
,
query
).
then
((
r
)
=>
{
// this.$api.post(`${window.systemUrl}/config/list`, query).then((r) => {
this
.
$api
.
post
(
`
${
window
.
system
}
/config/list`
,
query
).
then
((
r
)
=>
{
if
(
r
.
success
)
{
if
(
r
.
result
.
length
==
1
)
{
this
.
userConfig
=
r
.
result
[
0
]
...
...
@@ -309,7 +310,8 @@ export default {
})
},
saveUserconfig
()
{
let
url
=
`
${
window
.
systemUrl
}
/config/update`
// let url = `${window.systemUrl}/config/update`
let
url
=
`
${
window
.
system
}
/config/update`
var
content
=
[]
this
.
columnsCur
.
map
((
u
)
=>
{
content
.
push
({
...
...
@@ -318,7 +320,8 @@ export default {
})
})
if
(
!
this
.
userConfig
)
{
url
=
`
${
window
.
systemUrl
}
/config/create`
// url = `${window.systemUrl}/config/create`
url
=
`
${
window
.
system
}
/config/create`
var
data
=
{
page
:
window
.
location
.
pathname
,
component
:
'Grid'
,
...
...
components/page/userSelect.vue
View file @
a76de6d8
...
...
@@ -72,9 +72,11 @@ export default {
},
// 加载人员
getselectuser
(
id
)
{
let
url
=
`
${
systemUrl
}
/user/getselectuser`
// let url = `${systemUrl}/user/getselectuser`
let
url
=
`
${
system
}
/account/getalluser`
this
.
$api
.
post
(
url
,
{
// .post(url, {
.
get
(
url
,
{
// pageIndex: 1,
departmentId
:
id
,
type
:
this
.
type
,
...
...
static/config.js
View file @
a76de6d8
...
...
@@ -10,8 +10,8 @@ let address=systemApi.dev;
//let address=systemApi.local;
window
.
systemUrl
=
`http://
${
address
}
:10000/system`
;
//System-api 系统管理(基础数据)
window
.
system
=
`http://
${
address
}
:10000/auth`
;
//多租户后台系统
// window.system =`http://${address}:10000/platform`;//多租户后台系统
//
window.system =`http://${address}:10000/auth`;//多租户后台系统
window
.
system
=
`http://
${
address
}
:10000/platform`
;
//多租户后台系统 更换网关 platform
window
.
systemNew
=
`http://
${
address
}
:10000/platform`
;
//多租户后台系统-new 10130/platform/host/paged
window
.
authUrl
=
`http://
${
address
}
:10010`
;
//Authentication-api //统一登陆认证
window
.
designUrl
=
`http://
${
address
}
:10000/process`
;
// 工艺规程
...
...
store/index.js
View file @
a76de6d8
...
...
@@ -61,6 +61,7 @@ export const actions={
},
async
loadDictionary
({
commit
})
{
let
url
=
`
${
systemUrl
}
/Dictionary/GetAll`
// let url = `${system}/Dictionary/GetAll`
let
{
result
}
=
await
Api
.
get
(
url
);
var
map
=
new
Map
();
...
...
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