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
53bb0c6f
Commit
53bb0c6f
authored
Aug 12, 2020
by
kangzhenfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
saas--服务网关更换
parent
87f823a1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
143 additions
and
94 deletions
+143
-94
api.js
pages/system/account/api.js
+6
-6
api.js
pages/system/dic/api.js
+1
-1
api.js
pages/system/host/api.js
+6
-6
api.js
pages/system/tanant/api.js
+11
-11
search.vue
pages/system/tanant/search.vue
+117
-69
config.js
static/config.js
+2
-1
No files found.
pages/system/account/api.js
View file @
53bb0c6f
import
Api
from
'@/plugins/request'
export
default
{
index
:
`
${
system
}
/account/paged`
,
index
:
`
${
system
New
}
/account/paged`
,
paged
(
params
){
return
Api
.
post
(
`
${
system
}
/account/paged`
,
params
);
return
Api
.
post
(
`
${
system
New
}
/account/paged`
,
params
);
},
get
(
params
){
return
Api
.
get
(
`
${
system
}
/account/get`
,
params
);
return
Api
.
get
(
`
${
system
New
}
/account/get`
,
params
);
},
create
(
params
){
return
Api
.
post
(
`
${
system
}
/account/create`
,
params
);
return
Api
.
post
(
`
${
system
New
}
/account/create`
,
params
);
},
update
(
params
){
return
Api
.
post
(
`
${
system
}
/account/update`
,
params
);
return
Api
.
post
(
`
${
system
New
}
/account/update`
,
params
);
},
//删除:
delete
(
params
)
{
return
Api
.
delete
(
`
${
system
}
/account/delete`
,{
params
:
params
});
return
Api
.
delete
(
`
${
system
New
}
/account/delete`
,{
params
:
params
});
},
}
\ No newline at end of file
pages/system/dic/api.js
View file @
53bb0c6f
import
api
from
'@/plugins/request'
// const u=(path)=>`${systemUrl}/Dictionary/${path}`
const
u
=
(
path
)
=>
`
${
systemNew
}
/
api/services/app/
dictionary/
${
path
}
`
//49.232.68.61:10130/api/services/app/dictionary/getall
const
u
=
(
path
)
=>
`
${
systemNew
}
/dictionary/
${
path
}
`
//49.232.68.61:10130/api/services/app/dictionary/getall
export
default
{
getChildren
(
id
)
{
return
api
.
get
(
u
(
"getchildren"
),
{
id
})
...
...
pages/system/host/api.js
View file @
53bb0c6f
import
Api
from
'@/plugins/request'
export
default
{
// index:`${authUrl}/api/services/app/host/paged`,
index
:
`
${
systemNew
}
/
api/services/app/
host/paged`
,
//new
index
:
`
${
systemNew
}
/host/paged`
,
//new
paged
(
params
){
// return Api.post(`${authUrl}/api/services/app/host/paged`,params); systemNew
return
Api
.
post
(
`
${
systemNew
}
/
api/services/app/
host/paged`
,
params
);
return
Api
.
post
(
`
${
systemNew
}
/host/paged`
,
params
);
},
get
(
params
){
return
Api
.
get
(
`
${
systemNew
}
/
api/services/app/
host/get`
,
params
);
return
Api
.
get
(
`
${
systemNew
}
/host/get`
,
params
);
},
create
(
params
){
return
Api
.
post
(
`
${
systemNew
}
/
api/services/app/
host/create`
,
params
);
return
Api
.
post
(
`
${
systemNew
}
/host/create`
,
params
);
},
update
(
params
){
return
Api
.
post
(
`
${
systemNew
}
/
api/services/app/
host/update`
,
params
);
return
Api
.
post
(
`
${
systemNew
}
/host/update`
,
params
);
},
//删除:
delete
(
params
)
{
return
Api
.
delete
(
`
${
systemNew
}
/
api/services/app/
host/delete`
,{
params
:
params
});
return
Api
.
delete
(
`
${
systemNew
}
/host/delete`
,{
params
:
params
});
},
}
\ No newline at end of file
pages/system/tanant/api.js
View file @
53bb0c6f
import
Api
from
'@/plugins/request'
export
default
{
index
:
`
${
authUrl
}
/api/services/app/ta
nant/paged`
,
index
:
`
${
systemNew
}
/te
nant/paged`
,
paged
(
params
)
{
return
Api
.
post
(
`
${
authUrl
}
/api/services/app/ta
nant/paged`
,
params
);
return
Api
.
post
(
`
${
systemNew
}
/te
nant/paged`
,
params
);
},
get
(
params
)
{
return
Api
.
get
(
`
${
authUrl
}
/api/services/app/ta
nant/get`
,
params
);
return
Api
.
get
(
`
${
systemNew
}
/te
nant/get`
,
params
);
},
create
(
params
)
{
return
Api
.
post
(
`
${
authUrl
}
/api/services/app/ta
nant/create`
,
params
);
return
Api
.
post
(
`
${
systemNew
}
/te
nant/create`
,
params
);
},
update
(
params
)
{
return
Api
.
post
(
`
${
authUrl
}
/api/services/app/ta
nant/update`
,
params
);
return
Api
.
post
(
`
${
systemNew
}
/te
nant/update`
,
params
);
},
//删除:
delete
(
params
)
{
return
Api
.
delete
(
`
${
authUrl
}
/api/services/app/ta
nant/delete`
,
{
params
:
params
});
return
Api
.
delete
(
`
${
systemNew
}
/te
nant/delete`
,
{
params
:
params
});
},
bindhostlist
()
{
return
Api
.
post
(
`
${
authUrl
}
/api/services/app/host/list`
,
{});
return
Api
.
post
(
`
${
systemNew
}
/host/list`
,
{});
///tanant
},
tanantinit
(
params
)
{
return
Api
.
post
(
`
${
authUrl
}
/api/services/app/tanant/ta
nantinit`
,
params
);
return
Api
.
post
(
`
${
systemNew
}
/tenant/te
nantinit`
,
params
);
},
setMenu
(
params
)
{
return
Api
.
post
(
`
${
system
}
/setmenucompany/create`
,
params
);
return
Api
.
post
(
`
${
system
New
}
/setmenucompany/create`
,
params
);
},
setAps
(
params
){
return
Api
.
post
(
`
${
system
}
/setschedulecompany/create`
,
params
);
return
Api
.
post
(
`
${
system
New
}
/setschedulecompany/create`
,
params
);
},
apsList
(
params
){
return
Api
.
post
(
`
${
system
}
/setschedulecompany/list`
,
params
);
return
Api
.
post
(
`
${
system
New
}
/setschedulecompany/list`
,
params
);
}
}
\ No newline at end of file
pages/system/tanant/search.vue
View file @
53bb0c6f
<
template
>
<Form
ref=
"form"
:model=
"condition"
:label-width=
"90"
>
<Row>
<Col
:span=
"12"
:v-if=
"condition.id.show"
><FormItem
:label=
"l('id')"
prop=
"id"
>
<Input
v-model=
"condition.id.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.name.show"
><FormItem
:label=
"l('name')"
prop=
"name"
>
<Input
v-model=
"condition.name.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.code.show"
><FormItem
:label=
"l('code')"
prop=
"code"
>
<Input
v-model=
"condition.code.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.typeId.show"
><FormItem
:label=
"l('typeId')"
prop=
"typeId"
>
<Input
v-model=
"condition.typeId.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.startTime.show"
><FormItem
:label=
"l('startTime')"
prop=
"startTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.startTime.value"
></DatePicker>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.endTime.show"
><FormItem
:label=
"l('endTime')"
prop=
"endTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.endTime.value"
></DatePicker>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.initialized.show"
><FormItem
:label=
"l('initialized')"
prop=
"initialized"
>
<Dictionary
code=
"system.tanant.initialized"
v-model=
"condition.initialized.value"
></Dictionary>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.dataSourceId.show"
><FormItem
:label=
"l('dataSourceId')"
prop=
"dataSourceId"
>
<Input
v-model=
"condition.dataSourceId.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.creationTime.show"
><FormItem
:label=
"l('creationTime')"
prop=
"creationTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.creationTime.value"
></DatePicker>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.creatorUserId.show"
><FormItem
:label=
"l('creatorUserId')"
prop=
"creatorUserId"
>
<Input
v-model=
"condition.creatorUserId.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.lastModificationTime.show"
><FormItem
:label=
"l('lastModificationTime')"
prop=
"lastModificationTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.lastModificationTime.value"
></DatePicker>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.lastModifierUserId.show"
><FormItem
:label=
"l('lastModifierUserId')"
prop=
"lastModifierUserId"
>
<Input
v-model=
"condition.lastModifierUserId.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.isDeleted.show"
><FormItem
:label=
"l('isDeleted')"
prop=
"isDeleted"
>
<Input
v-model=
"condition.isDeleted.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.deletionTime.show"
><FormItem
:label=
"l('deletionTime')"
prop=
"deletionTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.deletionTime.value"
></DatePicker>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.deleterUserId.show"
><FormItem
:label=
"l('deleterUserId')"
prop=
"deleterUserId"
>
<Input
v-model=
"condition.deleterUserId.value"
>
</Input>
</FormItem></Col>
<Col
:span=
"12"
:v-if=
"condition.hostId.show"
><FormItem
:label=
"l('hostId')"
prop=
"hostId"
>
<Input
v-model=
"condition.hostId.value"
>
</Input>
</FormItem></Col>
</Row>
</Form>
<Form
ref=
"form"
:model=
"condition"
:label-width=
"90"
>
<Row>
<Col
:span=
"12"
:v-if=
"condition.id.show"
>
<FormItem
:label=
"l('id')"
prop=
"id"
>
<Input
v-model=
"condition.id.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.name.show"
>
<FormItem
:label=
"l('name')"
prop=
"name"
>
<Input
v-model=
"condition.name.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.code.show"
>
<FormItem
:label=
"l('code')"
prop=
"code"
>
<Input
v-model=
"condition.code.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.typeId.show"
>
<FormItem
:label=
"l('typeId')"
prop=
"typeId"
>
<Input
v-model=
"condition.typeId.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.startTime.show"
>
<FormItem
:label=
"l('startTime')"
prop=
"startTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.startTime.value"
></DatePicker>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.endTime.show"
>
<FormItem
:label=
"l('endTime')"
prop=
"endTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.endTime.value"
></DatePicker>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.initialized.show"
>
<FormItem
:label=
"l('initialized')"
prop=
"initialized"
>
<Dictionary
code=
"system.tanant.initialized"
v-model=
"condition.initialized.value"
></Dictionary>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.dataSourceId.show"
>
<FormItem
:label=
"l('dataSourceId')"
prop=
"dataSourceId"
>
<Input
v-model=
"condition.dataSourceId.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.creationTime.show"
>
<FormItem
:label=
"l('creationTime')"
prop=
"creationTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.creationTime.value"
></DatePicker>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.creatorUserId.show"
>
<FormItem
:label=
"l('creatorUserId')"
prop=
"creatorUserId"
>
<Input
v-model=
"condition.creatorUserId.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.lastModificationTime.show"
>
<FormItem
:label=
"l('lastModificationTime')"
prop=
"lastModificationTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.lastModificationTime.value"
></DatePicker>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.lastModifierUserId.show"
>
<FormItem
:label=
"l('lastModifierUserId')"
prop=
"lastModifierUserId"
>
<Input
v-model=
"condition.lastModifierUserId.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.isDeleted.show"
>
<FormItem
:label=
"l('isDeleted')"
prop=
"isDeleted"
>
<Input
v-model=
"condition.isDeleted.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.deletionTime.show"
>
<FormItem
:label=
"l('deletionTime')"
prop=
"deletionTime"
>
<DatePicker
type=
"daterange"
v-model=
"condition.deletionTime.value"
></DatePicker>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.deleterUserId.show"
>
<FormItem
:label=
"l('deleterUserId')"
prop=
"deleterUserId"
>
<Input
v-model=
"condition.deleterUserId.value"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
:v-if=
"condition.hostId.show"
>
<FormItem
:label=
"l('hostId')"
prop=
"hostId"
>
<Input
v-model=
"condition.hostId.value"
></Input>
</FormItem>
</Col>
</Row>
</Form>
</
template
>
<
script
>
import
Api
from
'./api'
export
default
{
name
:
'Add'
,
data
()
{
return
{
condition
:
{
id
:{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
name
:{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
code
:{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
typeId
:{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
startTime
:{
op
:
"Range"
,
value
:
null
,
show
:
true
},
endTime
:{
op
:
"Range"
,
value
:
null
,
show
:
true
},
initialized
:{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
dataSourceId
:{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
creationTime
:{
op
:
"Range"
,
value
:
null
,
show
:
false
},
creatorUserId
:{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
lastModificationTime
:{
op
:
"Range"
,
value
:
null
,
show
:
false
},
lastModifierUserId
:{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
isDeleted
:{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
deletionTime
:{
op
:
"Range"
,
value
:
null
,
show
:
false
},
deleterUserId
:{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
hostId
:{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
},
}
},
methods
:
{
handleClose
()
{
this
.
$emit
(
'on-close'
)
},
l
(
key
)
{
key
=
"tanant"
+
"."
+
key
;
return
this
.
$t
(
key
)
import
Api
from
"./api"
;
export
default
{
name
:
"Add"
,
data
()
{
return
{
condition
:
{
id
:
{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
name
:
{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
code
:
{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
typeId
:
{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
startTime
:
{
op
:
"Range"
,
value
:
null
,
show
:
true
},
endTime
:
{
op
:
"Range"
,
value
:
null
,
show
:
true
},
initialized
:
{
op
:
"Equal"
,
value
:
null
,
show
:
true
},
dataSourceId
:
{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
creationTime
:
{
op
:
"Range"
,
value
:
null
,
show
:
false
},
creatorUserId
:
{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
lastModificationTime
:
{
op
:
"Range"
,
value
:
null
,
show
:
false
},
lastModifierUserId
:
{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
isDeleted
:
{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
deletionTime
:
{
op
:
"Range"
,
value
:
null
,
show
:
false
},
deleterUserId
:
{
op
:
"Equal"
,
value
:
null
,
show
:
false
},
hostId
:
{
op
:
"Equal"
,
value
:
null
,
show
:
true
}
}
}
};
},
methods
:
{
handleClose
()
{
this
.
$emit
(
"on-close"
);
},
l
(
key
)
{
key
=
"tanant"
+
"."
+
key
;
return
this
.
$t
(
key
);
}
}
};
</
script
>
\ No newline at end of file
static/config.js
View file @
53bb0c6f
...
...
@@ -11,7 +11,8 @@ let address=systemApi.dev;
window
.
systemUrl
=
`http://
${
address
}
:10000/system`
;
//System-api 系统管理(基础数据)
window
.
system
=
`http://
${
address
}
:10000/auth`
;
//多租户后台系统
window
.
systemNew
=
`http://
${
address
}
:10130`
;
//多租户后台系统-new 10130/platform/host/paged
// window.system =`http://${address}:10000/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`
;
// 工艺规程
window
.
PlanUrl
=
`http://
${
address
}
:10000/plan`
;
//订单
...
...
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