wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

冲突解决

This commit is contained in:
wuhongjian 2022-12-29 17:32:44 +08:00
parent 2f4933ad11
commit 1af058fc79
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
back/src/views/modules/ability/bsabilityai.vue
View File

@ -330,7 +330,6 @@ export default {
this.dataForm.type = '组件服务' this.dataForm.type = '组件服务'
this.$http.get('/sys/user/info').then(res => { this.$http.get('/sys/user/info').then(res => {
this.superAdmin = res.data.data.superAdmin this.superAdmin = res.data.data.superAdmin
}) })
}, },
mounted () { mounted () {
@ -441,12 +440,8 @@ export default {
} }
}, },
showDetail (val) { showDetail (val) {
<<<<<<< HEAD
window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
=======
console.log(val) console.log(val)
window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true') window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
>>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
// this.addOrUpdateHandle(id) // this.addOrUpdateHandle(id)
// this.addOrUpdateVisible = true // this.addOrUpdateVisible = true
// this.disabled = false // this.disabled = false
@ -631,12 +626,8 @@ export default {
}, },
// 新上架 // 新上架
clear () { clear () {
<<<<<<< HEAD
this.$router.push(this.routePath)
=======
// this.$router.push(this.routePath) // this.$router.push(this.routePath)
console.log('清空----------------------------------------') console.log('清空----------------------------------------')
>>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
this.notFilled = [] this.notFilled = []
this.showPutOnTheShelfFlag = false this.showPutOnTheShelfFlag = false
this.showPutOnTheShelfFlag2 = false this.showPutOnTheShelfFlag2 = false
@ -729,7 +720,6 @@ export default {
child.name === '应用场景' || child.name === '应用场景' ||
child.name === '功能介绍' child.name === '功能介绍'
) { ) {
arr.push(child.name) arr.push(child.name)
if ( if (
this.submitFrom.infoList.filter( this.submitFrom.infoList.filter(