|
|
@@ -16,6 +16,7 @@
|
|
|
<el-dropdown placement="bottom">
|
|
|
<el-button size="small" plain class="button_delete" style="padding:5px"> ··· </el-button>
|
|
|
<el-dropdown-menu slot="dropdown" style="text-align: center;">
|
|
|
+ <el-dropdown-item @click.native="openQueryDialog()">复制</el-dropdown-item>
|
|
|
<el-dropdown-item @click.native="getToDetails()">查看详情</el-dropdown-item>
|
|
|
<el-dropdown-item @click.native="openDeleteDialog()">删除</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
@@ -34,7 +35,7 @@
|
|
|
>
|
|
|
<el-header height="0" />
|
|
|
<el-container>
|
|
|
- <el-main v-loading="loading.title" class="layout_main bug_manage_title" :style="type=='page'?{'padding': '15px 30px 15px 30px'}:{'padding':'0px 30px 10px 15px'}">
|
|
|
+ <el-main v-loading="loading.title" class="layout_main bug_manage_title" :style="type=='page'?{'padding': '15px 30px 15px 30px'}:{'padding':'0px 30px 15px 15px'}">
|
|
|
<span id="spanLength">{{ bugNameForm.bugName }}</span>
|
|
|
<el-row v-if="type=='page'">
|
|
|
<el-form
|
|
|
@@ -241,7 +242,7 @@
|
|
|
<el-input v-model="bug.osType" placeholder="请输入" @change="bugUpdate(bug,'appInfo')" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="网络">
|
|
|
- <el-select v-model="bug.networkType" @change="bugUpdate(bug,'appInfo')">
|
|
|
+ <el-select v-model="bug.networkType" clearable @change="bugUpdate(bug,'appInfo')">
|
|
|
<el-option
|
|
|
v-for="item in enums.networkTypeEnumList"
|
|
|
:key="item.code"
|
|
|
@@ -285,21 +286,22 @@
|
|
|
<div class="module_title__caption">用户信息</div>
|
|
|
</div>
|
|
|
<el-divider v-if="type !== 'page'" />
|
|
|
- <el-aside :width="type=='page'?'100%':'49%'">
|
|
|
- <el-form label-width="30%" label-position="left" label-suffix=":">
|
|
|
+ <el-aside :width="type=='page'?'100%':'100%'">
|
|
|
+ <el-form :label-width="type=='page'?'30%':'16%'" label-position="left" label-suffix=":">
|
|
|
<el-form-item label="提报人">
|
|
|
<div style="padding-left: 15px" class="bug_manage_div">{{ bug.creatorList }}</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="责任人">
|
|
|
<el-select
|
|
|
v-model="bug.assigner"
|
|
|
+ class="current"
|
|
|
filterable
|
|
|
+ multiple
|
|
|
remote
|
|
|
placeholder="请输入姓名或邮箱前缀"
|
|
|
:remote-method="searchAssigner"
|
|
|
:loading="userLoading"
|
|
|
@change="bugUpdate(bug,'userInfo')"
|
|
|
- @focus="isAssignerFocusOpen?searchAssigner(bug.assigner):null;isAssignerFocusOpen = false"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item,index) in assignerOptions"
|
|
|
@@ -322,13 +324,14 @@
|
|
|
<el-form-item label="修复人">
|
|
|
<el-select
|
|
|
v-model="bug.currentHandler"
|
|
|
+ class="current"
|
|
|
+ multiple
|
|
|
filterable
|
|
|
remote
|
|
|
placeholder="请输入姓名或邮箱前缀"
|
|
|
:remote-method="searchCurrentHandler"
|
|
|
:loading="userLoading"
|
|
|
@change="bugUpdate(bug,'userInfo')"
|
|
|
- @focus="isCurrentHandlerOpen?searchCurrentHandler(bug.currentHandler):null;isCurrentHandlerOpen = false"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item,index) in currentHandlerOptions"
|
|
|
@@ -584,23 +587,28 @@
|
|
|
<el-button type="primary" @click="statusDialogConfirm">确 定</el-button>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
+ <createdBug v-if="modalShow" ref="createdBug" @father="father" />
|
|
|
<normal-dialog
|
|
|
:show-dialog="showCopyFile"
|
|
|
- :title="'复制信息'"
|
|
|
- :width="'35%'"
|
|
|
+ :title="'上传截图'"
|
|
|
+ :width="'50%'"
|
|
|
+ :submit-button="'上传'"
|
|
|
+ :top="'5vh'"
|
|
|
@confirm="confirmUpload()"
|
|
|
@cancel="showCopyFile=false"
|
|
|
>
|
|
|
<div class="file-dialog">
|
|
|
- <el-form ref="form" label-width="80px">
|
|
|
- <el-form-item label="图片名称">
|
|
|
- <el-col :span="20">
|
|
|
+ <el-form ref="form" label-width="20%">
|
|
|
+ <el-form-item label="图片命名">
|
|
|
+ <el-col style="width: 75%">
|
|
|
<el-input v-model="imageName" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">.png</el-col>
|
|
|
+ <el-col style="width: 10%">.png</el-col>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
- <img :src="imageUrl" class="image-url">
|
|
|
+ <div class="image">
|
|
|
+ <img :src="imageUrl" class="image-url">
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</normal-dialog>
|
|
|
</el-container>
|
|
|
@@ -625,6 +633,7 @@ import {
|
|
|
} from '@/api/defectManage.js'
|
|
|
import Dropdown from './dropdown.vue'
|
|
|
import normalDialog from '@/components/dialog/normalDialog'
|
|
|
+import createdBug from '@/views/projectManage/bugList/file/createdBug'
|
|
|
import axios from 'axios'
|
|
|
|
|
|
document.body.onpaste = function(event) {
|
|
|
@@ -646,6 +655,7 @@ export default {
|
|
|
name: 'BugDetails',
|
|
|
components: {
|
|
|
Dropdown,
|
|
|
+ createdBug,
|
|
|
normalDialog
|
|
|
},
|
|
|
mixins: [fackClickOutSide],
|
|
|
@@ -665,6 +675,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ modalShow: false,
|
|
|
iconName: 'float_反馈_icon_close',
|
|
|
bugNameIsFocus: false,
|
|
|
props: { multiple: true },
|
|
|
@@ -695,6 +706,7 @@ export default {
|
|
|
uploadDialogVisible: false,
|
|
|
uploadDialogImageUrl: '',
|
|
|
test: '测试',
|
|
|
+ num: 0,
|
|
|
userLoading: false,
|
|
|
statusDialogVisible: false,
|
|
|
statusDialogTitle: '',
|
|
|
@@ -703,8 +715,6 @@ export default {
|
|
|
{ name: '测试', code: 1 },
|
|
|
{ name: '测试2', code: 2 }
|
|
|
],
|
|
|
- isAssignerFocusOpen: true,
|
|
|
- isCurrentHandlerOpen: true,
|
|
|
assignerOptions: [],
|
|
|
currentHandlerOptions: [],
|
|
|
bug: {},
|
|
|
@@ -752,7 +762,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
id(newVal, oldVal) {
|
|
|
- window.scrollTo(0, 0)
|
|
|
+ // window.scrollTo(0, 0)
|
|
|
this.bug = {}
|
|
|
this.bugModel = {}
|
|
|
this.bugNameForm = { bugName: '' }
|
|
|
@@ -764,8 +774,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- this.$store.state.data.status = true
|
|
|
- this.$store.state.data.bizId = true
|
|
|
if (this.type !== 'page') {
|
|
|
var height = window.innerHeight > document.body.clientHeight ? window.innerHeight : document.body.clientHeight
|
|
|
height -= 130
|
|
|
@@ -777,25 +785,27 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.bugGetEnum()
|
|
|
- this.bugGet(this.id, false).then(res => {
|
|
|
- const assignerItem = {
|
|
|
- idapName: null,
|
|
|
- name: this.bug.assignerList,
|
|
|
- idap: this.bug.assigner
|
|
|
- }
|
|
|
- this.assignerOptions.push(assignerItem)
|
|
|
- const currentHandlerItem = {
|
|
|
- idapName: null,
|
|
|
- name: this.bug.currentHandlerList,
|
|
|
- idap: this.bug.currentHandler
|
|
|
- }
|
|
|
- this.currentHandlerOptions.push(currentHandlerItem)
|
|
|
- this.changeWidthOnBlur()
|
|
|
- releaseList().then(res => {
|
|
|
- this.appClientList = res.data.appClient // 客户端
|
|
|
- this.getVersionList(this.bug.appId)
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.bugGet(this.id, false).then(res => {
|
|
|
+ this.assignerOptions = []
|
|
|
+ for (const i in this.bug.assignerList.length) {
|
|
|
+ this.searchUser(this.bug.assigner[i]).then(res => {
|
|
|
+ this.assignerOptions = res.data
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.currentHandlerOptions = []
|
|
|
+ for (const i in this.bug.currentHandlerList.length) {
|
|
|
+ this.searchUser(this.bug.currentHandler[i]).then(res => {
|
|
|
+ this.currentHandlerOptions = res.data
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.changeWidthOnBlur()
|
|
|
+ releaseList().then(res => {
|
|
|
+ this.appClientList = res.data.appClient // 客户端
|
|
|
+ this.getVersionList(this.bug.appId)
|
|
|
+ })
|
|
|
+ this.RichText()
|
|
|
})
|
|
|
- this.RichText()
|
|
|
})
|
|
|
this.getCommentList()
|
|
|
this.getBusinessLinePlatformModule()
|
|
|
@@ -803,28 +813,24 @@ export default {
|
|
|
this.taskEnumList = res.data // 所属任务
|
|
|
})
|
|
|
},
|
|
|
- destroyed() {
|
|
|
- this.$store.state.data.status = false
|
|
|
- this.$store.state.data.bizId = false
|
|
|
- },
|
|
|
methods: {
|
|
|
closeDrawer() {
|
|
|
this.$emit('close', false)
|
|
|
},
|
|
|
init() {
|
|
|
this.bugGet(this.id, false).then(res => {
|
|
|
- const assignerItem = {
|
|
|
- idapName: null,
|
|
|
- name: this.bug.assignerList,
|
|
|
- idap: this.bug.assigner
|
|
|
+ this.assignerOptions = []
|
|
|
+ for (const i in this.bug.assignerList.length) {
|
|
|
+ this.searchUser(this.bug.assigner[i]).then(res => {
|
|
|
+ this.assignerOptions = res.data
|
|
|
+ })
|
|
|
}
|
|
|
- this.assignerOptions.push(assignerItem)
|
|
|
- const currentHandlerItem = {
|
|
|
- idapName: null,
|
|
|
- name: this.bug.currentHandlerList,
|
|
|
- idap: this.bug.currentHandler
|
|
|
+ this.currentHandlerOptions = []
|
|
|
+ for (const i in this.bug.currentHandlerList.length) {
|
|
|
+ this.searchUser(this.bug.currentHandler[i]).then(res => {
|
|
|
+ this.currentHandlerOptions = res.data
|
|
|
+ })
|
|
|
}
|
|
|
- this.currentHandlerOptions.push(currentHandlerItem)
|
|
|
this.changeWidthOnBlur()
|
|
|
this.getCommentList()
|
|
|
releaseList().then(res => {
|
|
|
@@ -856,7 +862,7 @@ export default {
|
|
|
return item.name !== file.name
|
|
|
})
|
|
|
this.bug.accessory = JSON.stringify(this.fileDbList)
|
|
|
- this.bugUpdate()
|
|
|
+ this.bugUpdate(this.bug, 'accessory')
|
|
|
},
|
|
|
handlePictureCardPreview(file) {
|
|
|
this.dialogImageUrl = file.url
|
|
|
@@ -933,6 +939,7 @@ export default {
|
|
|
},
|
|
|
changeBugName() {
|
|
|
if (this.bugNameForm.bugName.length < 1) {
|
|
|
+ this.bugNameForm.bugName = this.bug.bugName
|
|
|
return
|
|
|
}
|
|
|
this.bug.bugName = this.bugNameForm.bugName
|
|
|
@@ -940,6 +947,7 @@ export default {
|
|
|
},
|
|
|
RichText() {
|
|
|
this.editor = new E('#wage', '#wage1')
|
|
|
+ this.editor.customConfig.zIndex = 0
|
|
|
this.editor.customConfig.menus = [
|
|
|
'bold',
|
|
|
'italic',
|
|
|
@@ -986,13 +994,28 @@ export default {
|
|
|
this.loading.fullscreen = isLoading
|
|
|
return bugDetails({ id: id }).then(res => {
|
|
|
if (res.code === 200) {
|
|
|
- document.getElementsByClassName('scop')[0].scrollTop = 0
|
|
|
+ if (this.num === 0) {
|
|
|
+ document.getElementsByClassName('scop')[0].scrollTop = 0
|
|
|
+ }
|
|
|
+
|
|
|
// if (this.type !== 'page') {
|
|
|
// if (res.data.bizId !== Number(localStorage.getItem('bizId'))) {
|
|
|
// Utils.$emit('demo', res.data.bizId)
|
|
|
// }
|
|
|
// }
|
|
|
this.bug = res.data
|
|
|
+ this.bug.currentHandler = res.data.currentHandler.split(',')
|
|
|
+ this.bug.assigner = res.data.assigner.split(',')
|
|
|
+ this.bug.currentHandler.map(item => {
|
|
|
+ this.searchUser(item).then(res => {
|
|
|
+ this.currentHandlerOptions.push(res.data[0])
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.bug.assigner.map(item => {
|
|
|
+ this.searchUser(item).then(res => {
|
|
|
+ this.assignerOptions.push(res.data[0])
|
|
|
+ })
|
|
|
+ })
|
|
|
this.bugModel = JSON.parse(JSON.stringify(res.data))
|
|
|
this.bugDescribe = this.bug.bugDescribe
|
|
|
if (this.bugDescribe !== null) {
|
|
|
@@ -1022,6 +1045,16 @@ export default {
|
|
|
return res
|
|
|
})
|
|
|
},
|
|
|
+ openQueryDialog() {
|
|
|
+ this.modalShow = true
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.createdBug.init(2, this.bug)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ father() {
|
|
|
+ this.bugGet(this.bug.id, false)
|
|
|
+ this.$emit('update', false)
|
|
|
+ },
|
|
|
bugGetEnum() {
|
|
|
return bugGetEnum().then(res => {
|
|
|
this.enums = res.data
|
|
|
@@ -1047,9 +1080,6 @@ export default {
|
|
|
return bugDelete(userData, this.bug.id).then(res => {
|
|
|
return res
|
|
|
})
|
|
|
- },
|
|
|
- bugTitleUpdate() {
|
|
|
-
|
|
|
},
|
|
|
bugUpdate(form, loadingStr) {
|
|
|
loadingStr ? this.loading[loadingStr] = true : this.loading.fullscreen = true
|
|
|
@@ -1058,23 +1088,37 @@ export default {
|
|
|
ename: this.userInformation,
|
|
|
name: this.userNames
|
|
|
}
|
|
|
+ this.num = 1
|
|
|
let objData
|
|
|
if (form) {
|
|
|
- objData = { bugBaseInfo: form, user: userData }
|
|
|
+ const data = form
|
|
|
+ data.currentHandler = form.currentHandler.join(',')
|
|
|
+ data.assigner = form.assigner.join(',')
|
|
|
+ objData = { bugBaseInfo: data, user: userData }
|
|
|
} else {
|
|
|
- objData = { bugBaseInfo: this.bug, user: userData }
|
|
|
+ const data = form
|
|
|
+ data.currentHandler = form.currentHandler.join(',')
|
|
|
+ data.assigner = form.assigner.join(',')
|
|
|
+ objData = { bugBaseInfo: data, user: userData }
|
|
|
+ }
|
|
|
+ if (objData.bugBaseInfo.currentHandler !== '' && objData.bugBaseInfo.assigner !== '') {
|
|
|
+ return bugUpdate(objData).then(res => {
|
|
|
+ if (res.code === 200) {
|
|
|
+ this.changeWidthOnBlur()
|
|
|
+ this.init()
|
|
|
+ this.bugModel = JSON.parse(JSON.stringify(this.bug))
|
|
|
+ this.$emit('update', false)
|
|
|
+ } else {
|
|
|
+ this.bug = JSON.parse(JSON.stringify(this.bugModel))
|
|
|
+ }
|
|
|
+ loadingStr ? this.loading[loadingStr] = false : this.loading.fullscreen = false
|
|
|
+ return res
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$message.warning('责任人，修复人不能为空')
|
|
|
+ this.loading.userInfo = false
|
|
|
+ this.bugGet(this.bug.id, false)
|
|
|
}
|
|
|
- return bugUpdate(objData).then(res => {
|
|
|
- if (res.code === 200) {
|
|
|
- this.changeWidthOnBlur()
|
|
|
- this.bugModel = JSON.parse(JSON.stringify(this.bug))
|
|
|
- this.$emit('update', false)
|
|
|
- } else {
|
|
|
- this.bug = JSON.parse(JSON.stringify(this.bugModel))
|
|
|
- }
|
|
|
- loadingStr ? this.loading[loadingStr] = false : this.loading.fullscreen = false
|
|
|
- return res
|
|
|
- })
|
|
|
},
|
|
|
searchUser(query) {
|
|
|
this.userLoading = true
|
|
|
@@ -1103,11 +1147,13 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
searchAssigner(val) {
|
|
|
+ this.assignerOptions = []
|
|
|
this.searchUser(val).then(res => {
|
|
|
this.assignerOptions = res.data
|
|
|
})
|
|
|
},
|
|
|
searchCurrentHandler(val) {
|
|
|
+ this.currentHandlerOptions = []
|
|
|
this.searchUser(val).then(res => {
|
|
|
this.currentHandlerOptions = res.data
|
|
|
})
|
|
|
@@ -1446,6 +1492,10 @@ export default {
|
|
|
</style>
|
|
|
|
|
|
<style scoped lang="scss">
|
|
|
+.current:hover{
|
|
|
+ border-radius: 4px;
|
|
|
+ border: 1px solid #DCDFE6;
|
|
|
+}
|
|
|
.module_title{
|
|
|
display:flex;
|
|
|
align-items: center;
|
|
|
@@ -1473,7 +1523,7 @@ export default {
|
|
|
margin:10px 0 5px 0;
|
|
|
}
|
|
|
.tips {
|
|
|
- color:#F56C6C;
|
|
|
+ color:#DCDFE6;
|
|
|
position: absolute;
|
|
|
}
|
|
|
.file-dialog {
|
|
|
@@ -1481,12 +1531,21 @@ export default {
|
|
|
flex-direction: column;
|
|
|
align-items: center;
|
|
|
.el-form {
|
|
|
- width: 80%;
|
|
|
+ width: 100%;
|
|
|
+ }
|
|
|
+ .image {
|
|
|
+ position: relative;
|
|
|
+ width: 61%;
|
|
|
+ padding-top: 60%;
|
|
|
+ border:1px solid #409EFF;
|
|
|
+ .image-url {
|
|
|
+ position: absolute;
|
|
|
+ top: 50%;
|
|
|
+ left: 50%;
|
|
|
+ transform: translate(-50%,-50%);
|
|
|
+ width: 100%;
|
|
|
+ max-height: 100%;
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
-.image-url {
|
|
|
- width: 90%;
|
|
|
- max-height: 60vh;
|
|
|
- border:1px solid #EBEEF5;
|
|
|
}
|
|
|
</style>
|
PrinceLee