Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qa-platform-ui
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
qa-platform-ui
Commits
c7047ed6
Commit
c7047ed6
authored
Nov 15, 2021
by
晓彤
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试流程添加挂起/启用功能;清空同步数据库文本框
parent
0ae15c2a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
4 deletions
+61
-4
DbSync.vue
src/views/effect/DbSync.vue
+8
-3
Notify.vue
src/views/jira/Notify.vue
+53
-1
No files found.
src/views/effect/DbSync.vue
View file @
c7047ed6
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"数据库名:"
prop=
"dbName"
>
<el-form-item
label=
"数据库名:"
prop=
"dbName"
>
<el-select
v-model=
"temp.dbName"
filterable
clearable
style=
"width: 300px"
placeholder=
"要同步的数据库名称
"
<el-select
v-model=
"temp.dbName"
filterable
clearable
@
clear=
"setValueNull"
style=
"width: 300px
"
@
change=
"dbChange"
>
placeholder=
"要同步的数据库名称"
@
change=
"dbChange"
>
<el-option
v-for=
"item in dbNameList"
:value=
"item"
:label=
"item"
:key=
"item"
/>
<el-option
v-for=
"item in dbNameList"
:value=
"item"
:label=
"item"
:key=
"item"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -27,7 +27,8 @@
...
@@ -27,7 +27,8 @@
</el-form-item>
</el-form-item>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"是否仅将线上的表结构同步到测试库,且仍保留测试环境的业务数据"
placement=
"bottom-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"是否仅将线上的表结构同步到测试库,且仍保留测试环境的业务数据"
placement=
"bottom-start"
>
<el-form-item
label=
"是否保留业务数据:"
prop=
"notDeleteBusinessData"
>
<el-form-item
label=
"是否保留业务数据:"
prop=
"notDeleteBusinessData"
>
<el-switch
v-model=
"temp.notDeleteBusinessData"
style=
"margin-right:280px"
active-text=
"是"
inactive-text=
"否"
/>
<el-switch
v-model=
"temp.notDeleteBusinessData"
style=
"margin-right:280px"
active-text=
"是"
inactive-text=
"否"
/>
</el-form-item>
</el-form-item>
</el-tooltip>
</el-tooltip>
</el-form>
</el-form>
...
@@ -175,6 +176,10 @@ export default {
...
@@ -175,6 +176,10 @@ export default {
this
.
$message
.
success
(
'
数据库同步中...
'
)
this
.
$message
.
success
(
'
数据库同步中...
'
)
}
}
})
})
},
// 清空时间
setValueNull
()
{
this
.
temp
.
tableName
=
''
}
}
}
}
}
}
...
...
src/views/jira/Notify.vue
View file @
c7047ed6
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
<span>
{{
(
queryInfo
.
pageNum
-
1
)
*
queryInfo
.
pageSize
+
scope
.
$index
+
1
}}
</span>
<span>
{{
(
queryInfo
.
pageNum
-
1
)
*
queryInfo
.
pageSize
+
scope
.
$index
+
1
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<!-- <el-table-column prop="dingRobot.jiraProjectName" label="Jira项目名" width="150px"></el-table-column> -->
<el-table-column
prop=
"dingRobot.projectName"
label=
"项目名"
width=
"150px"
></el-table-column>
<el-table-column
prop=
"dingRobot.projectName"
label=
"项目名"
width=
"150px"
></el-table-column>
<el-table-column
label=
"服务->分支"
width=
"250px"
>
<el-table-column
label=
"服务->分支"
width=
"250px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -40,6 +41,7 @@
...
@@ -40,6 +41,7 @@
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<p
v-if=
"scope.row.dingRobot.status===1"
>
进行中
</p>
<p
v-if=
"scope.row.dingRobot.status===1"
>
进行中
</p>
<p
v-if=
"scope.row.dingRobot.status===2"
>
已完成
</p>
<p
v-if=
"scope.row.dingRobot.status===2"
>
已完成
</p>
<p
v-if=
"scope.row.dingRobot.status===3"
>
挂起
</p>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"dingRobot.creator"
label=
"创建人"
width=
"80px"
></el-table-column>
<el-table-column
prop=
"dingRobot.creator"
label=
"创建人"
width=
"80px"
></el-table-column>
...
@@ -53,9 +55,18 @@
...
@@ -53,9 +55,18 @@
<el-button
type=
"success"
size=
"small"
@
click=
"openSendDialog(scope.row)"
<el-button
type=
"success"
size=
"small"
@
click=
"openSendDialog(scope.row)"
v-permission=
"('qa:process:schedule')"
>
发送进度
</el-button>
v-permission=
"('qa:process:schedule')"
>
发送进度
</el-button>
<el-button
:disabled=
"scope.row.dingRobot.status===1?false:true"
type=
"success"
size=
"small"
<!-- 完成按钮 -->
<el-button
v-if=
"scope.row.dingRobot.status===1||scope.row.dingRobot.status===3"
type=
"success"
size=
"small"
@
click=
"finishDialog(scope.row)"
v-permission=
"('qa:process:finish')"
>
完成
</el-button>
@
click=
"finishDialog(scope.row)"
v-permission=
"('qa:process:finish')"
>
完成
</el-button>
<!-- 添加刮起按钮 -->
<el-button
v-if=
"scope.row.dingRobot.status===1"
type=
"info"
size=
"small"
@
click=
"HangDialog(scope.row.dingRobot.id)"
>
挂起
</el-button>
<el-button
v-if=
"scope.row.dingRobot.status===3"
type=
"info"
size=
"small"
@
click=
"EnableDialog(scope.row)"
>
启用
</el-button>
<el-button
type=
"danger"
size=
"small"
@
click=
"delProjectRobot(scope.row.dingRobot.id)"
<el-button
type=
"danger"
size=
"small"
@
click=
"delProjectRobot(scope.row.dingRobot.id)"
v-permission=
"('qa:process:del')"
>
删除
</el-button>
v-permission=
"('qa:process:del')"
>
删除
</el-button>
</slot>
</slot>
...
@@ -697,6 +708,7 @@ export default {
...
@@ -697,6 +708,7 @@ export default {
.
then
((
resp
)
=>
{
.
then
((
resp
)
=>
{
if
(
resp
.
data
.
data
===
true
)
{
if
(
resp
.
data
.
data
===
true
)
{
this
.
$message
.
success
(
'
标记完成成功!
'
)
this
.
$message
.
success
(
'
标记完成成功!
'
)
this
.
showMsg
=
false
return
this
.
getProjectRobotList
()
return
this
.
getProjectRobotList
()
}
else
{
}
else
{
this
.
$message
.
error
(
resp
.
data
.
msg
)
this
.
$message
.
error
(
resp
.
data
.
msg
)
...
@@ -785,6 +797,46 @@ export default {
...
@@ -785,6 +797,46 @@ export default {
// 查询方法
// 查询方法
queryData
()
{
queryData
()
{
this
.
getProjectRobotList
()
this
.
getProjectRobotList
()
},
// 挂起按钮
HangDialog
(
id
)
{
var
formdata
=
new
FormData
()
formdata
.
set
(
'
dingRobotId
'
,
id
)
formdata
.
set
(
'
status
'
,
3
)
this
.
openMessage
(
'
是否需要挂起?
'
,
'
确定
'
,
()
=>
{
changePipelineStatus
(
formdata
)
.
then
((
resp
)
=>
{
if
(
resp
.
data
.
data
===
true
)
{
this
.
$message
.
success
(
'
挂起成功!
'
)
return
this
.
getProjectRobotList
()
}
else
{
this
.
$message
.
error
(
resp
.
data
.
msg
)
}
})
.
catch
((
error
)
=>
{
this
.
$message
({
type
:
'
error
'
,
message
:
error
})
})
})
},
// 启用按钮
EnableDialog
(
row
)
{
var
formdata
=
new
FormData
()
formdata
.
set
(
'
dingRobotId
'
,
row
.
dingRobot
.
id
)
formdata
.
set
(
'
status
'
,
1
)
this
.
openMessage
(
'
是否需要启用?
'
,
'
确定
'
,
()
=>
{
changePipelineStatus
(
formdata
)
.
then
((
resp
)
=>
{
if
(
resp
.
data
.
data
===
true
)
{
this
.
$message
.
success
(
'
启用成功!
'
)
return
this
.
getProjectRobotList
()
}
else
{
this
.
$message
.
error
(
resp
.
data
.
msg
)
}
})
.
catch
((
error
)
=>
{
this
.
$message
({
type
:
'
error
'
,
message
:
error
})
})
})
}
}
},
},
created
()
{
created
()
{
...
...
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