|
@@ -175,6 +175,7 @@ import formDialog from '@/views/home/component/form_dialog.vue'
|
|
|
import { getLazyList } from '@/api/project/index.js'
|
|
import { getLazyList } from '@/api/project/index.js'
|
|
|
import summaryDialog from '@/views/home/component/summary_dialog.vue'
|
|
import summaryDialog from '@/views/home/component/summary_dialog.vue'
|
|
|
import { useStore } from '@/store/user.js'
|
|
import { useStore } from '@/store/user.js'
|
|
|
|
|
+import { deepClone } from '@/utils/tools.js'
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
name: 'dash',
|
|
name: 'dash',
|
|
@@ -526,7 +527,7 @@ export default {
|
|
|
this.diaType = -1
|
|
this.diaType = -1
|
|
|
},
|
|
},
|
|
|
exportExcel (res) {
|
|
exportExcel (res) {
|
|
|
- const data = Object.assign(this.queryData, { columnName: res, projectIds: this.selectList.join(',') })
|
|
|
|
|
|
|
+ const data = Object.assign({ ...this.queryData }, { columnName: res, projectIds: this.selectList.join(',') })
|
|
|
this.$api.params.exportResult(data).then(res => {
|
|
this.$api.params.exportResult(data).then(res => {
|
|
|
if (res.hasOwnProperty('code')) {
|
|
if (res.hasOwnProperty('code')) {
|
|
|
this.$message.error(res.msg)
|
|
this.$message.error(res.msg)
|
|
@@ -536,8 +537,8 @@ export default {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
exportExcelTotal (item) {
|
|
exportExcelTotal (item) {
|
|
|
- const data = { ...this.queryData, projectIds: this.selectList.join(',') }
|
|
|
|
|
- this.$api.params.summaryExport(Object.assign(item, data)).then(res => {
|
|
|
|
|
|
|
+ const dataIds = { ...this.queryData, projectIds: this.selectList.join(',') }
|
|
|
|
|
+ this.$api.params.summaryExport(Object.assign(item, dataIds)).then(res => {
|
|
|
if (res.hasOwnProperty('code')) {
|
|
if (res.hasOwnProperty('code')) {
|
|
|
this.$message.error(res.msg)
|
|
this.$message.error(res.msg)
|
|
|
return
|
|
return
|