Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qahome-diamond
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QA
qahome-diamond
Commits
1b7fe9c3
Commit
1b7fe9c3
authored
Aug 09, 2019
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目配置增加wiki
parent
1c4aa6cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
30 deletions
+74
-30
envDetail.vue
src/views/docker/envDetail.vue
+0
-1
index.vue
src/views/proconfig/index.vue
+74
-29
No files found.
src/views/docker/envDetail.vue
View file @
1b7fe9c3
...
@@ -571,7 +571,6 @@ export default {
...
@@ -571,7 +571,6 @@ export default {
// })
// })
},
},
openRabbitmq
(
data
)
{
openRabbitmq
(
data
)
{
console
.
log
(
data
)
const
port
=
data
.
portMappings
.
filter
(
item
=>
item
.
port
===
15672
)[
0
].
nodePort
const
port
=
data
.
portMappings
.
filter
(
item
=>
item
.
port
===
15672
)[
0
].
nodePort
window
.
open
(
`http://
${
data
.
lanIp
}
:
${
port
}
/`
,
'
_blank
'
)
window
.
open
(
`http://
${
data
.
lanIp
}
:
${
port
}
/`
,
'
_blank
'
)
},
},
...
...
src/views/proconfig/index.vue
View file @
1b7fe9c3
...
@@ -14,36 +14,46 @@
...
@@ -14,36 +14,46 @@
<el-table
<el-table
:data=
"proconfigs"
:data=
"proconfigs"
border
fit
fit
highlight-current-row
highlight-current-row
style=
"width: 100%;"
style=
"width: 100%;"
@
sort-change=
"sortChange"
>
@
sort-change=
"sortChange"
>
<el-table-column
:label=
"$t('table.id')"
prop=
"id"
align=
"center"
width=
"65"
>
<!--
<el-table-column
fixed
type=
"expand"
>
<template
slot-scope=
"scope"
>
<el-form
label-position=
"left"
inline
class=
"demo-table-expand"
>
<el-form-item
label=
"服务名称"
>
<span>
{{
scope
.
row
.
project_name
}}
</span>
</el-form-item>
<el-form-item
label=
"服务描述"
>
<span>
{{
scope
.
row
.
des
}}
</span>
</el-form-item>
<el-form-item
label=
"类型"
>
<span>
{{
scope
.
row
.
type
}}
</span>
</el-form-item>
</el-form>
</
template
>
</el-table-column>
-->
<el-table-column
:label=
"$t('table.id')"
fixed
prop=
"id"
align=
"center"
width=
"55"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"服务名称"
prop=
"project_name
"
sortable=
"custom"
align=
"center"
>
<el-table-column
fixed
label=
"服务名称"
width=
"180px
"
sortable=
"custom"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span
class=
"link-type"
@
click=
"handleUpdate(scope.row)"
>
{{
scope
.
row
.
project_name
}}
</span>
<span
class=
"link-type"
@
click=
"handleUpdate(scope.row)"
>
{{
scope
.
row
.
project_name
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"服务描述"
align=
"center"
>
<el-table-column
label=
"服务描述"
width=
"180px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
des
}}
</span>
<span>
{{
scope
.
row
.
des
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"线上域名"
align=
"center"
>
<el-table-column
label=
"线上域名"
width=
"180px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
host_name
}}
</span>
<span>
{{
scope
.
row
.
host_name
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"Git地址"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
git_path
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"负责人"
width=
"80px"
align=
"center"
>
<el-table-column
label=
"负责人"
width=
"80px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
auth
}}
</span>
<span>
{{
scope
.
row
.
auth
}}
</span>
...
@@ -54,12 +64,38 @@
...
@@ -54,12 +64,38 @@
<el-tag
:type=
"scope.row.is_active | statusFilter"
>
{{
scope
.
row
.
is_active
|
activeFileter
}}
</el-tag>
<el-tag
:type=
"scope.row.is_active | statusFilter"
>
{{
scope
.
row
.
is_active
|
activeFileter
}}
</el-tag>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"部署容器"
width=
"90px"
align=
"center"
>
<el-table-column
label=
"部署容器"
width=
"90px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-tag
:type=
"scope.row.deploy_to_testenv | statusFilter"
>
{{
scope
.
row
.
deploy_to_testenv
|
deployFileter
}}
</el-tag>
<el-tag
:type=
"scope.row.deploy_to_testenv | statusFilter"
>
{{
scope
.
row
.
deploy_to_testenv
|
deployFileter
}}
</el-tag>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('table.actions')"
align=
"center"
width=
"180"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"Git地址"
width=
"310px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
git_path
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"API"
width=
"250px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<span
class=
"link-type"
@
click=
"openUrl(scope.row.api)"
>
{{
scope
.
row
.
api
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"数据库DDL"
width=
"250px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<span
class=
"link-type"
@
click=
"openUrl(scope.row.ddl)"
>
{{
scope
.
row
.
ddl
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"Wiki"
width=
"250px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
wiki
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('table.actions')"
fixed=
"right"
align=
"center"
width=
"180"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
size=
"mini"
@
click=
"handleUpdate(scope.row)"
>
{{
$t
(
'
table.edit
'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click=
"handleUpdate(scope.row)"
>
{{
$t
(
'
table.edit
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status!='deleted'"
size=
"mini"
type=
"danger"
@
click=
"handleDelete(scope.row)"
>
{{
$t
(
'
table.delete
'
)
}}
<el-button
v-if=
"scope.row.status!='deleted'"
size=
"mini"
type=
"danger"
@
click=
"handleDelete(scope.row)"
>
{{
$t
(
'
table.delete
'
)
}}
...
@@ -77,10 +113,10 @@
...
@@ -77,10 +113,10 @@
<el-option
v-for=
"item in typeOptions"
:key=
"item.key"
:label=
"item.display_name"
:value=
"item.key"
/>
<el-option
v-for=
"item in typeOptions"
:key=
"item.key"
:label=
"item.display_name"
:value=
"item.key"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"Git地址"
prop=
"git_path"
style=
"width:100%"
>
<el-form-item
label=
"Git地址"
prop=
"git_path"
>
<el-input
v-model=
"temp.git_path"
/>
<el-input
v-model=
"temp.git_path"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"是否
激活
"
>
<el-form-item
label=
"是否
服役
"
>
<el-select
v-model=
"temp.is_active"
class=
"filter-item"
placeholder=
"Please select"
>
<el-select
v-model=
"temp.is_active"
class=
"filter-item"
placeholder=
"Please select"
>
<el-option
v-for=
"item in avtiveOptions"
:key=
"item.key"
:label=
"item.display_name"
:value=
"item.key"
/>
<el-option
v-for=
"item in avtiveOptions"
:key=
"item.key"
:label=
"item.display_name"
:value=
"item.key"
/>
</el-select>
</el-select>
...
@@ -90,33 +126,42 @@
...
@@ -90,33 +126,42 @@
<el-option
v-for=
"item in deployOptions"
:key=
"item.key"
:label=
"item.display_name"
:value=
"item.key"
/>
<el-option
v-for=
"item in deployOptions"
:key=
"item.key"
:label=
"item.display_name"
:value=
"item.key"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"项目描述"
style=
"width:100%"
>
<el-form-item
label=
"项目描述"
>
<el-input
:autosize=
"{ minRows: 2, maxRows: 4}"
v-model=
"temp.des"
type=
"textarea"
placeholder=
"Please input"
/>
<el-input
:autosize=
"{ minRows: 2, maxRows: 4}"
v-model=
"temp.des"
type=
"textarea"
placeholder=
"Please input"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"线上域名"
prop=
"host_name"
style=
"width:100%"
>
<el-form-item
label=
"线上域名"
>
<el-input
v-model=
"temp.host_name"
/>
<el-input
v-model=
"temp.host_name"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"负责人"
prop=
"auth"
style=
"width:100%"
>
<el-form-item
label=
"负责人"
>
<el-input
v-model=
"temp.auth"
/>
<el-input
v-model=
"temp.auth"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"配置文件路径"
prop=
"config_path"
style=
"width:100%"
>
<el-form-item
label=
"配置文件路径"
>
<el-input
v-model=
"temp.config_path"
/>
<el-input
v-model=
"temp.config_path"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"Build文件路径"
prop=
"jar_path"
style=
"width:100%"
>
<el-form-item
label=
"Build文件路径"
>
<el-input
v-model=
"temp.jar_path"
/>
<el-input
v-model=
"temp.jar_path"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"日志路径"
prop=
"log_path"
style=
"width:100%"
>
<el-form-item
label=
"日志路径"
>
<el-input
v-model=
"temp.log_path"
/>
<el-input
v-model=
"temp.log_path"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"部署命令"
prop=
"build_command"
style=
"width:100%"
>
<el-form-item
label=
"部署命令"
>
<el-input
v-model=
"temp.build_command"
/>
<el-input
v-model=
"temp.build_command"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"启动命令"
prop=
"start_command"
style=
"width:100%"
>
<el-form-item
label=
"API"
>
<el-input
v-model=
"temp.api"
/>
</el-form-item>
<el-form-item
label=
"数据库DDL"
>
<el-input
v-model=
"temp.ddl"
/>
</el-form-item>
<el-form-item
label=
"Wiki"
>
<el-input
v-model=
"temp.wiki"
/>
</el-form-item>
<!-- <el-form-item label="启动命令" prop="start_command" style="width:100%">
<el-input :autosize="{ minRows: 2, maxRows: 4}" v-model="temp.start_command" type="textarea"/>
<el-input :autosize="{ minRows: 2, maxRows: 4}" v-model="temp.start_command" type="textarea"/>
</el-form-item>
</el-form-item>
<el-form-item label="关闭命令" prop="stop_command" style="width:100%">
<el-form-item label="关闭命令" prop="stop_command" style="width:100%">
<el-input v-model="temp.stop_command"/>
<el-input v-model="temp.stop_command"/>
</el-form-item>
</el-form-item>
-->
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"dialogFormVisible = false"
>
{{ $t('table.cancel') }}
</el-button>
<el-button
@
click=
"dialogFormVisible = false"
>
{{ $t('table.cancel') }}
</el-button>
...
@@ -245,6 +290,10 @@ export default {
...
@@ -245,6 +290,10 @@ export default {
this
.
getProjects
()
this
.
getProjects
()
},
},
openUrl
(
data
)
{
window
.
open
(
`
${
data
}
`
,
'
_blank
'
)
},
sortChange
(
data
)
{
sortChange
(
data
)
{
const
{
prop
,
order
}
=
data
const
{
prop
,
order
}
=
data
if
(
prop
===
'
project_name
'
)
{
if
(
prop
===
'
project_name
'
)
{
...
@@ -261,7 +310,6 @@ export default {
...
@@ -261,7 +310,6 @@ export default {
},
},
resetTemp
()
{
resetTemp
()
{
this
.
temp
=
{
this
.
temp
=
{
port
:
''
,
is_active
:
undefined
,
is_active
:
undefined
,
deploy_to_testenv
:
undefined
,
deploy_to_testenv
:
undefined
,
type
:
''
,
type
:
''
,
...
@@ -274,13 +322,10 @@ export default {
...
@@ -274,13 +322,10 @@ export default {
auth
:
''
,
auth
:
''
,
jar_path
:
''
,
jar_path
:
''
,
command1
:
''
,
command1
:
''
,
command2
:
''
,
command3
:
''
,
command4
:
''
,
command5
:
''
,
build_command
:
''
,
build_command
:
''
,
start_command
:
''
,
api
:
''
,
stop_command
:
''
ddl
:
''
,
wiki
:
''
}
}
},
},
handleCreate
()
{
handleCreate
()
{
...
...
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