|
@@ -477,7 +477,17 @@
|
|
|
<div>
|
|
|
<div v-for="(item,index) in changeRecord" :key="index" style="margin: 20px 0" class="animated bounceInRight Layout_space_between">
|
|
|
<span class="operatorName">{{ item.operator }}</span>
|
|
|
- <span class="remark">{{ item.remark.length > 25 ? item.remark.substring(0, 30) + '...' : '' }}</span>
|
|
|
+ <el-tooltip
|
|
|
+ v-if="item.remark.length > 25"
|
|
|
+ class="item"
|
|
|
+ effect="dark"
|
|
|
+ :content="item.remark"
|
|
|
+ placement="top-start"
|
|
|
+ popper-class="tip-style"
|
|
|
+ >
|
|
|
+ <span class="remark">{{ item.remark.length > 25 ? item.remark.substring(0, 30) + '...' : item.remark }}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ <span v-else class="remark">{{ item.remark.length > 25 ? item.remark.substring(0, 30) + '...' : item.remark }}</span>
|
|
|
<span class="createTime">{{ item.createTime }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -497,11 +507,6 @@
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
<div class="blueStripe" />
|
|
|
- <el-form label-width="110px" label-position="left" :model="statusDialogForm" :rules="rules">
|
|
|
- <el-form-item v-if="statusDialogTitle === '待测试'" label="修复方式" class="bug_manage_dialog bug_manage_dialog_fixMethod">
|
|
|
- <el-input v-model="statusDialogForm.reasonOrDesc" type="textarea" placeholder="请输入具体原因,得出结论的过程,具体修复过程或方式" maxlength="300" show-word-limit rows="4" />
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
<div style="text-align:center;line-height: 150px">是否要删除当前缺陷?</div>
|
|
|
<template v-slot:footer>
|
|
|
<el-button size="small" @click="statusDialogVisible = false">取 消</el-button>
|
|
@@ -640,7 +645,7 @@ export default {
|
|
|
formHeight: '',
|
|
|
formHeight1: '',
|
|
|
statusDialogVisible: false,
|
|
|
- statusDialogForm: {},
|
|
|
+ // statusDialogForm: {},
|
|
|
options: [
|
|
|
{ name: '测试', code: 1 },
|
|
|
{ name: '测试2', code: 2 }
|
|
@@ -682,11 +687,11 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
- statusDialogVisible(newVal, oldVal) {
|
|
|
- if (!newVal) {
|
|
|
- this.statusDialogForm = null
|
|
|
- }
|
|
|
- },
|
|
|
+ // statusDialogVisible(newVal, oldVal) {
|
|
|
+ // if (!newVal) {
|
|
|
+ // this.statusDialogForm = null
|
|
|
+ // }
|
|
|
+ // },
|
|
|
id(newVal, oldVal) {
|
|
|
this.bug = {}
|
|
|
this.bugModel = {}
|
|
@@ -1075,12 +1080,6 @@ export default {
|
|
|
return res
|
|
|
})
|
|
|
},
|
|
|
- bugDelete() {
|
|
|
- const userData = { id: '', ename: this.userInformation, name: this.userNames }
|
|
|
- return bugDelete(userData, this.bug.id).then(res => {
|
|
|
- return res
|
|
|
- })
|
|
|
- },
|
|
|
bugUpdate(form, loadingStr) {
|
|
|
console.log(form, loadingStr, 'update')
|
|
|
if (form.currentHandler.length > 0) {
|
|
@@ -1140,21 +1139,14 @@ export default {
|
|
|
}))
|
|
|
})
|
|
|
},
|
|
|
- bugNameChangeWith(val) {
|
|
|
- if (this.showWordLimit) {
|
|
|
- this.showWordLimit = false
|
|
|
- } else {
|
|
|
- this.showWordLimit = true
|
|
|
- }
|
|
|
- this.bugNameTextareaStyle.width = val
|
|
|
- },
|
|
|
openDeleteDialog() {
|
|
|
- this.statusDialogForm = JSON.parse(JSON.stringify(this.bug))
|
|
|
- this.statusDialogForm.status = null
|
|
|
+ // this.statusDialogForm = JSON.parse(JSON.stringify(this.bug))
|
|
|
+ // this.statusDialogForm.status = null
|
|
|
this.statusDialogVisible = true
|
|
|
},
|
|
|
statusDialogConfirm() {
|
|
|
- this.bugDelete().then(res => {
|
|
|
+ const userData = { id: '', ename: this.userInformation, name: this.userNames }
|
|
|
+ bugDelete(userData, this.bug.id).then(res => {
|
|
|
this.statusDialogVisible = false
|
|
|
if (res.code === 200) {
|
|
|
if (this.type === 'page') {
|
|
@@ -1165,15 +1157,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- postDialogForm() {
|
|
|
- this.statusDialogForm.id = this.id
|
|
|
- return this.bugUpdate(this.statusDialogForm).then(res => {
|
|
|
- this.statusDialogVisible = false
|
|
|
- this.statusDialogForm = {}
|
|
|
- this.bugGet(this.bug.id)
|
|
|
- return res
|
|
|
- })
|
|
|
- },
|
|
|
generateMixed(len) {
|
|
|
const chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
|
|
|
let res = ''
|
|
@@ -1625,45 +1608,3 @@ border-color: #DCDFE6;
|
|
|
white-space: nowrap;
|
|
|
}
|
|
|
</style>
|
|
|
-<style lang="scss">
|
|
|
-.item-color {
|
|
|
- /deep/ .el-button {
|
|
|
- color: rgb(106, 180, 255);
|
|
|
- border: 1px solid rgb(106, 180, 255);
|
|
|
- border-color: rgb(106, 180, 255) !important;
|
|
|
- background: #FFF;
|
|
|
- }
|
|
|
-}
|
|
|
-.item{
|
|
|
- /deep/ .el-button {
|
|
|
- color: rgb(126, 211, 33);
|
|
|
- border: 1px solid rgb(126, 211, 33);
|
|
|
- border-color: rgb(126, 211, 33) !important;
|
|
|
- background: #FFF;
|
|
|
- }
|
|
|
-}
|
|
|
-.item1 {
|
|
|
- /deep/ .el-button {
|
|
|
- color: rgb(255, 204, 102);
|
|
|
- border: 1px solid rgb(255, 204, 102);
|
|
|
- border-color: rgb(255, 204, 102) !important;
|
|
|
- background: #FFF;
|
|
|
- }
|
|
|
-}
|
|
|
-.item2 {
|
|
|
- /deep/ .el-button {
|
|
|
- color: rgb(245, 108, 108);
|
|
|
- border: 1px solid rgb(245, 108, 108);
|
|
|
- border-color: rgb(245, 108, 108) !important;
|
|
|
- background: #FFF;
|
|
|
- }
|
|
|
-}
|
|
|
-.item3 {
|
|
|
- /deep/ .el-button {
|
|
|
- color: #D675F0;
|
|
|
- border: 1px solid #D675F0;
|
|
|
- border-color: #D675F0 !important;
|
|
|
- background: #FFF;
|
|
|
- }
|
|
|
-}
|
|
|
-</style>
|