修改UAT提出的问题
This commit is contained in:
@@ -318,7 +318,8 @@
|
|||||||
startTime: undefined,
|
startTime: undefined,
|
||||||
endTime: undefined,
|
endTime: undefined,
|
||||||
handlingTime: '',
|
handlingTime: '',
|
||||||
num:0,
|
num: 0,
|
||||||
|
queryAllProject: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@@ -330,7 +331,8 @@
|
|||||||
if (boxContentTextText && boxContentTextText.length > 0) {
|
if (boxContentTextText && boxContentTextText.length > 0) {
|
||||||
boxContentTextText[0].classList.add('box-header-text-color')
|
boxContentTextText[0].classList.add('box-header-text-color')
|
||||||
}
|
}
|
||||||
this.getList()
|
this.queryAllProject = true
|
||||||
|
// this.getList()
|
||||||
this.getTimeline()
|
this.getTimeline()
|
||||||
this.handlingTime = moment(new Date()).format('YYYY-MM-DD')
|
this.handlingTime = moment(new Date()).format('YYYY-MM-DD')
|
||||||
// this.handlingTime = '2023-04-30'
|
// this.handlingTime = '2023-04-30'
|
||||||
@@ -403,7 +405,8 @@
|
|||||||
let query = {
|
let query = {
|
||||||
startTime: this.startTime || this.getNewDate('before', 6),
|
startTime: this.startTime || this.getNewDate('before', 6),
|
||||||
endTime: this.endTime || this.getNewDate('after', 5),
|
endTime: this.endTime || this.getNewDate('after', 5),
|
||||||
...this.queryParam
|
...this.queryParam,
|
||||||
|
queryAllProject: this.queryAllProject
|
||||||
}
|
}
|
||||||
this.loadingMain = true
|
this.loadingMain = true
|
||||||
getAction(this.url.timeline, query).then((res) => {
|
getAction(this.url.timeline, query).then((res) => {
|
||||||
@@ -436,7 +439,8 @@
|
|||||||
let query = {
|
let query = {
|
||||||
startTime: this.startTime || this.getNewDate('before', 6),
|
startTime: this.startTime || this.getNewDate('before', 6),
|
||||||
endTime: this.endTime || this.getNewDate('after', 5),
|
endTime: this.endTime || this.getNewDate('after', 5),
|
||||||
...this.queryParam
|
...this.queryParam,
|
||||||
|
queryAllProject: this.queryAllProject
|
||||||
}
|
}
|
||||||
getAction(this.url.timelineList, query).then((res) => {
|
getAction(this.url.timelineList, query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
@@ -550,7 +554,7 @@
|
|||||||
},
|
},
|
||||||
searchQuery() {
|
searchQuery() {
|
||||||
this.getTimeline()
|
this.getTimeline()
|
||||||
this.getList()
|
// this.getList()
|
||||||
},
|
},
|
||||||
searchReset() {
|
searchReset() {
|
||||||
this.queryParam = {}
|
this.queryParam = {}
|
||||||
@@ -558,20 +562,20 @@
|
|||||||
this.startTime = undefined
|
this.startTime = undefined
|
||||||
this.endTime = undefined
|
this.endTime = undefined
|
||||||
this.getTimeline()
|
this.getTimeline()
|
||||||
this.getList()
|
// this.getList()
|
||||||
},
|
|
||||||
getList() {
|
|
||||||
this.loading = true
|
|
||||||
getAction(this.url.list, this.queryParam).then((res) => {
|
|
||||||
if (res.success) {
|
|
||||||
this.loading = false
|
|
||||||
this.dataSource = res.result || []
|
|
||||||
} else {
|
|
||||||
this.loading = false
|
|
||||||
this.dataSource = []
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
|
// getList() {
|
||||||
|
// this.loading = true
|
||||||
|
// getAction(this.url.list, this.queryParam).then((res) => {
|
||||||
|
// if (res.success) {
|
||||||
|
// this.loading = false
|
||||||
|
// this.dataSource = res.result || []
|
||||||
|
// } else {
|
||||||
|
// this.loading = false
|
||||||
|
// this.dataSource = []
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// },
|
||||||
projectNameClick() {
|
projectNameClick() {
|
||||||
let newUrl = this.$router.resolve({
|
let newUrl = this.$router.resolve({
|
||||||
path: '/projectStatusAndProgress'
|
path: '/projectStatusAndProgress'
|
||||||
@@ -591,7 +595,8 @@
|
|||||||
let query = {
|
let query = {
|
||||||
...this.queryParam,
|
...this.queryParam,
|
||||||
startTime: this.startTime || this.getNewDate('before', 6),
|
startTime: this.startTime || this.getNewDate('before', 6),
|
||||||
endTime: this.endTime || this.getNewDate('after', 5)
|
endTime: this.endTime || this.getNewDate('after', 5),
|
||||||
|
queryAllProject: this.queryAllProject
|
||||||
}
|
}
|
||||||
downloadFile('/project/ProjectStatusBoardController/exportXls',
|
downloadFile('/project/ProjectStatusBoardController/exportXls',
|
||||||
this.$t('GRPSystemProjectProgressStatistics') + '.xls', query, this.Deselect)
|
this.$t('GRPSystemProjectProgressStatistics') + '.xls', query, this.Deselect)
|
||||||
@@ -609,6 +614,12 @@
|
|||||||
boxContentTextText[num].classList.add('box-header-text-color')
|
boxContentTextText[num].classList.add('box-header-text-color')
|
||||||
}
|
}
|
||||||
this.num = num
|
this.num = num
|
||||||
|
if (num == 0) {
|
||||||
|
this.queryAllProject = true
|
||||||
|
} else if (num == 1) {
|
||||||
|
this.queryAllProject = false
|
||||||
|
}
|
||||||
|
this.getTimeline()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user