|
@@ -191,8 +191,9 @@ |
|
|
<personnel-list |
|
|
<personnel-list |
|
|
:listDept="[...listDept]" |
|
|
:listDept="[...listDept]" |
|
|
:handleCheckItemAll="handleCheckItemAll" |
|
|
:handleCheckItemAll="handleCheckItemAll" |
|
|
:handleCheckedOne="handleCheckedOne"/> |
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
:handleCheckedOne="handleCheckedOne" |
|
|
|
|
|
/> |
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
@@ -312,37 +313,25 @@ import NestTemp from '../project/nestTemp.vue'; |
|
|
FileUploader, |
|
|
FileUploader, |
|
|
NestTemp, |
|
|
NestTemp, |
|
|
}, |
|
|
}, |
|
|
watch: { |
|
|
|
|
|
isShowDistWorkPage(val) { |
|
|
|
|
|
if(val) { |
|
|
|
|
|
setTimeout(()=> { |
|
|
|
|
|
this.distWorkPartEl = this.$refs.distworkpart; |
|
|
|
|
|
if(this.distWorkPartEl) { |
|
|
|
|
|
this.distWorkPartEl.addEventListener('scroll', this.watchDistWorkPartScroll); |
|
|
|
|
|
} |
|
|
|
|
|
}, 50) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
isProjDescScroll(val) { |
|
|
|
|
|
if(val) { |
|
|
|
|
|
setTimeout(()=> { |
|
|
|
|
|
this.projDescEl = this.$refs.projdesc; |
|
|
|
|
|
if(this.projDescEl) { |
|
|
|
|
|
this.projDescEl.addEventListener('scroll', this.watchProjDescScroll); |
|
|
|
|
|
} |
|
|
|
|
|
}, 50) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
isTemplateDescScroll(val) { |
|
|
|
|
|
if(val) { |
|
|
|
|
|
setTimeout(()=> { |
|
|
|
|
|
this.templateDescEl = this.$refs.templatedesc; |
|
|
|
|
|
if(this.templateDescEl) { |
|
|
|
|
|
this.templateDescEl.addEventListener('scroll', this.watchTemplateDescScroll); |
|
|
|
|
|
} |
|
|
|
|
|
}, 50) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
updated() { |
|
|
|
|
|
if(this.$refs.projdesc) { |
|
|
|
|
|
this.projDescEl = this.$refs.projdesc; |
|
|
|
|
|
this.projDescEl.removeEventListener('scroll', this.watchProjDescScroll); |
|
|
|
|
|
this.projDescEl.addEventListener('scroll', this.watchProjDescScroll); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(this.$refs.distworkpart) { |
|
|
|
|
|
this.distWorkPartEl = this.$refs.distworkpart; |
|
|
|
|
|
this.distWorkPartEl.removeEventListener('scroll', this.watchDistWorkPartScroll); |
|
|
|
|
|
this.distWorkPartEl.addEventListener('scroll', this.watchDistWorkPartScroll); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(this.$refs.templateDescEl) { |
|
|
|
|
|
this.templateDescEl = this.$refs.templatedesc; |
|
|
|
|
|
this.templateDescEl.removeEventListener('scroll', this.watchTemplateDescScroll); |
|
|
|
|
|
this.templateDescEl.addEventListener('scroll', this.watchTemplateDescScroll); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
mounted() { |
|
|
mounted() { |
|
|
|
|
|
|
|
@@ -356,18 +345,18 @@ import NestTemp from '../project/nestTemp.vue'; |
|
|
// 加载项目详情 |
|
|
// 加载项目详情 |
|
|
this.fetchProjectDetail(); |
|
|
this.fetchProjectDetail(); |
|
|
this.getNestNode(sessionStorage.templateID); |
|
|
this.getNestNode(sessionStorage.templateID); |
|
|
// this.projDescEl = this.$refs.projdesc; |
|
|
|
|
|
this.distWorkPartEl = document.querySelector('#distwork-part'); |
|
|
|
|
|
|
|
|
this.projDescEl = this.$refs.projdesc; |
|
|
|
|
|
// this.distWorkPartEl = document.querySelector('#distwork-part'); |
|
|
if(this.projDescEl) { |
|
|
if(this.projDescEl) { |
|
|
this.projDescEl.addEventListener('scroll', this.watchProjDescScroll); |
|
|
this.projDescEl.addEventListener('scroll', this.watchProjDescScroll); |
|
|
} |
|
|
} |
|
|
// this.distWorkPartEl = this.$refs.distworkpart; |
|
|
|
|
|
this.projDescEl = document.querySelector('#proj-desc'); |
|
|
|
|
|
|
|
|
this.distWorkPartEl = this.$refs.distworkpart; |
|
|
|
|
|
// this.projDescEl = document.querySelector('#proj-desc'); |
|
|
if(this.distWorkPartEl) { |
|
|
if(this.distWorkPartEl) { |
|
|
this.distWorkPartEl.addEventListener('scroll', this.watchDistWorkPartScroll); |
|
|
this.distWorkPartEl.addEventListener('scroll', this.watchDistWorkPartScroll); |
|
|
} |
|
|
} |
|
|
// this.templateDescEl = this.$refs.templatedesc; |
|
|
|
|
|
this.templateDescEl = document.querySelector('#template-desc'); |
|
|
|
|
|
|
|
|
this.templateDescEl = this.$refs.templatedesc; |
|
|
|
|
|
// this.templateDescEl = document.querySelector('#template-desc'); |
|
|
if(this.templateDescEl) { |
|
|
if(this.templateDescEl) { |
|
|
this.templateDescEl.addEventListener('scroll', this.watchTemplateDescScroll); |
|
|
this.templateDescEl.addEventListener('scroll', this.watchTemplateDescScroll); |
|
|
} |
|
|
} |
|
@@ -606,7 +595,7 @@ import NestTemp from '../project/nestTemp.vue'; |
|
|
this.selectedUser.forEach(user => { |
|
|
this.selectedUser.forEach(user => { |
|
|
user.folderPerm = (user.id === clickUser.id) ? 2 : 1; |
|
|
user.folderPerm = (user.id === clickUser.id) ? 2 : 1; |
|
|
if(user.folderPerm === 2) { |
|
|
if(user.folderPerm === 2) { |
|
|
this.InitData.manageUser.splice(0,1,user); |
|
|
|
|
|
|
|
|
this.InitData && this.InitData.manageUser && this.InitData.manageUser.splice(0,1,user); |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
@@ -864,7 +853,7 @@ import NestTemp from '../project/nestTemp.vue'; |
|
|
// 删除的是具有项目管理权限的 且能运行到这里是可以删除的 |
|
|
// 删除的是具有项目管理权限的 且能运行到这里是可以删除的 |
|
|
const index = this.listManagerUser.findIndex(people => people.id === user.id); |
|
|
const index = this.listManagerUser.findIndex(people => people.id === user.id); |
|
|
if(index > -1) { |
|
|
if(index > -1) { |
|
|
this.listManageUser.splice(index, 1); |
|
|
|
|
|
|
|
|
this.listManagerUser.splice(index, 1); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
@@ -1186,7 +1175,7 @@ import NestTemp from '../project/nestTemp.vue'; |
|
|
workNode.GeneralId = folder.listUser.length > 0 ? tempListUser.map(user => { return user.id }).join(',') : ''; |
|
|
workNode.GeneralId = folder.listUser.length > 0 ? tempListUser.map(user => { return user.id }).join(',') : ''; |
|
|
|
|
|
|
|
|
const originFolder = oldPlainFolderList.find(oldFolder => oldFolder.id == folder.id); |
|
|
const originFolder = oldPlainFolderList.find(oldFolder => oldFolder.id == folder.id); |
|
|
console.log(originFolder); |
|
|
|
|
|
|
|
|
// console.log(originFolder); |
|
|
const oldManagerId = originFolder.manageUser.length > 0 ? originFolder.manageUser[0].id : ''; |
|
|
const oldManagerId = originFolder.manageUser.length > 0 ? originFolder.manageUser[0].id : ''; |
|
|
workNode.OldManager = oldManagerId; |
|
|
workNode.OldManager = oldManagerId; |
|
|
workNode.OldGeneralId = originFolder.listUser.length > 0 ? originFolder.listUser.filter(oldUser => oldUser.id !== oldManagerId).map(user => { return user.id }).join(',') : ''; |
|
|
workNode.OldGeneralId = originFolder.listUser.length > 0 ? originFolder.listUser.filter(oldUser => oldUser.id !== oldManagerId).map(user => { return user.id }).join(',') : ''; |
|
@@ -1376,21 +1365,20 @@ import NestTemp from '../project/nestTemp.vue'; |
|
|
|
|
|
|
|
|
.content-wrap { |
|
|
.content-wrap { |
|
|
display:flex; |
|
|
display:flex; |
|
|
padding: 0 64px; |
|
|
|
|
|
align-items: flex-start; |
|
|
align-items: flex-start; |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
justify-content: center; |
|
|
|
|
|
padding: 0 64px; |
|
|
|
|
|
|
|
|
.set-content-wrap { |
|
|
|
|
|
padding: 0 198px; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.content-wrap .graph-left-part, .content-wrap .right-part { |
|
|
.content-wrap .graph-left-part, .content-wrap .right-part { |
|
|
width: 50%; |
|
|
width: 50%; |
|
|
|
|
|
min-width: 480px; |
|
|
|
|
|
max-width: 660px; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.right-part { |
|
|
.right-part { |
|
|
min-width: 400px; |
|
|
|
|
|
|
|
|
// min-width: 400px; |
|
|
box-sizing: border-box; |
|
|
box-sizing: border-box; |
|
|
border-top-left-radius: 8px; |
|
|
border-top-left-radius: 8px; |
|
|
border-top-right-radius: 8px; |
|
|
border-top-right-radius: 8px; |
|
@@ -1576,7 +1564,8 @@ import NestTemp from '../project/nestTemp.vue'; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.set-personnel-list-width { |
|
|
.set-personnel-list-width { |
|
|
min-width: 180px; |
|
|
|
|
|
|
|
|
min-width: 375px; |
|
|
|
|
|
max-width: 375px; |
|
|
width: 36.231% !important; |
|
|
width: 36.231% !important; |
|
|
transition: width 2.5s ease; |
|
|
transition: width 2.5s ease; |
|
|
} |
|
|
} |
|
|