BUG修改

This commit is contained in:
a0049873 2022-12-23 16:58:27 +08:00
parent 84b0f2eba8
commit f368998a6d
1 changed files with 132 additions and 141 deletions

View File

@ -180,7 +180,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="yyzy" label="应用资源" min-width="100%"> <el-table-column prop="yyzy" label="应用资源" min-width="100%">
</el-table-column> </el-table-column>
<el-table-column prop="zj" label="总计" min-width="100%"> <el-table-column prop="count" label="总计" min-width="100%">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table :data="tableData" :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }" <el-table :data="tableData" :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
@ -205,7 +205,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="ysp" label="云视频" min-width="100%" > <el-table-column prop="ysp" label="云视频" min-width="100%" >
</el-table-column> </el-table-column>
<el-table-column prop="zj" label="总计" min-width="100%"> <el-table-column prop="count" label="总计" min-width="100%">
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--明细表--> <!--明细表-->
@ -277,7 +277,7 @@ export default {
provideSelects: [], provideSelects: [],
departmentSelects: [], departmentSelects: [],
departmentSelects1: [], departmentSelects1: [],
provideSelects1:[], provideSelects1: [],
exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export', exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
exportExcelCondition: '', exportExcelCondition: '',
exportExcelType: '', exportExcelType: '',
@ -468,7 +468,6 @@ export default {
this.detailsVisible = false this.detailsVisible = false
}, },
handleCurrentChange (val) { handleCurrentChange (val) {
this.currentPage = val this.currentPage = val
// todo // todo
if (this.departmentId === 3) { if (this.departmentId === 3) {
@ -477,10 +476,8 @@ export default {
if (this.departmentId === 4) { if (this.departmentId === 4) {
this.getTwoDetail(val) this.getTwoDetail(val)
} }
}, },
// -- // --
getFirstTree (page) { getFirstTree (page) {
if (this.examineStatus == '-1') { if (this.examineStatus == '-1') {
@ -508,55 +505,52 @@ export default {
} }
}) })
.then((res) => { .then((res) => {
if (res.data.code !== 0) { if (res.data.code !== 0) {
this.tableData =[] this.tableData = []
this.tableDataClone = [] this.tableDataClone = []
this.total = 0 this.total = 0
return this.$message.error("服务器内部异常") return this.$message.error('服务器内部异常')
} else {
}else{ const result = res.data.data
const result = res.data.data for (let i = 0; i < result.length; i++) {
for (let i = 0; i < result.length; i++) { if (!result[i].hasOwnProperty('yyzy')) {
if (!result[i].hasOwnProperty('yyzy')) { result[i].yyzy = 0
result[i].yyzy = 0 }
if (!result[i].hasOwnProperty('kfzj')) {
result[i].kfzj = 0
}
if (!result[i].hasOwnProperty('znsf')) {
result[i].znsf = 0
}
if (!result[i].hasOwnProperty('tcfw')) {
result[i].tcfw = 0
}
if (!result[i].hasOwnProperty('ywzj')) {
result[i].ywzj = 0
}
if (!result[i].hasOwnProperty('hys')) {
result[i].hys = 0
}
// result[i].zj =
// parseInt(result[i].yyzy) +
// parseInt(result[i].kfzj) +
// parseInt(result[i].znsf) +
// parseInt(result[i].ywzj) +
// parseInt(result[i].tcfw) +
// parseInt(result[i].hys)
} }
if (!result[i].hasOwnProperty('kfzj')) { this.tableData = res.data.data
result[i].kfzj = 0 this.tableDataClone = res.data.data
} this.total = res.data.data.total
if (!result[i].hasOwnProperty('znsf')) { this.exportExcelCondition = qs.stringify({
result[i].znsf = 0 approveStatus: this.status,
} deptId: this.abilityDepartment,
if (!result[i].hasOwnProperty('tcfw')) { startDate: this.startDate,
result[i].tcfw = 0 endDate: this.endDate,
} resourceName: this.resourceName
if (!result[i].hasOwnProperty('ywzj')) { })
result[i].ywzj = 0
}
if (!result[i].hasOwnProperty('hys')) {
result[i].hys = 0
}
result[i].zj =
parseInt(result[i].yyzy) +
parseInt(result[i].kfzj) +
parseInt(result[i].znsf) +
parseInt(result[i].ywzj) +
parseInt(result[i].tcfw) +
parseInt(result[i].hys)
} }
this.tableData = res.data.data
this.tableDataClone = res.data.data
this.total = res.data.data.total
this.exportExcelCondition = qs.stringify({
approveStatus: this.status,
deptId: this.abilityDepartment,
startDate: this.startDate,
endDate: this.endDate,
resourceName: this.resourceName
})
}
}) })
}, },
// 使-使 // 使-使
getSecondTree (page) { getSecondTree (page) {
@ -586,52 +580,57 @@ export default {
}) })
.then((res) => { .then((res) => {
if (res.data.code !== 0) { if (res.data.code !== 0) {
this.tableData =[] this.tableData = []
this.tableDataClone = [] this.tableDataClone = []
this.total = 0 this.total = 0
return this.$message.error("服务器内部异常") return this.$message.error('服务器内部异常')
} else {
}else{ const result = res.data.data
const result = res.data.data for (let i = 0; i < result.length; i++) {
for (let i = 0; i < result.length; i++) { if (!result[i].hasOwnProperty('yyzy')) {
if (!result[i].hasOwnProperty('yyzy')) { result[i].yyzy = 0
result[i].yyzy = 0 }
if (!result[i].hasOwnProperty('kfzj')) {
result[i].kfzj = 0
}
if (!result[i].hasOwnProperty('znsf')) {
result[i].znsf = 0
}
if (!result[i].hasOwnProperty('tcfw')) {
result[i].tcfw = 0
}
if (!result[i].hasOwnProperty('ywzj')) {
result[i].ywzj = 0
}
if (!result[i].hasOwnProperty('hys')) {
result[i].hys = 0
}
if (!result[i].hasOwnProperty('yzy')) {
result[i].yzy = 0
}
if (!result[i].hasOwnProperty('ysp')) {
result[i].ysp = 0
}
// result[i].zj =
// parseInt(result[i].yyzy) +
// parseInt(result[i].kfzj) +
// parseInt(result[i].znsf) +
// parseInt(result[i].ywzj) +
// parseInt(result[i].tcfw) +
// parseInt(result[i].hys)
} }
if (!result[i].hasOwnProperty('kfzj')) { this.tableData = res.data.data
result[i].kfzj = 0 this.tableDataClone = res.data.data
} this.total = res.data.data.total
if (!result[i].hasOwnProperty('znsf')) { this.exportExcelCondition = qs.stringify({
result[i].znsf = 0 approveStatus: this.status,
} deptId: this.abilityDepartment,
if (!result[i].hasOwnProperty('tcfw')) { startDate: this.startDate,
result[i].tcfw = 0 endDate: this.endDate,
} resourceName: this.resourceName
if (!result[i].hasOwnProperty('ywzj')) {
result[i].ywzj = 0
}
if (!result[i].hasOwnProperty('hys')) {
result[i].hys = 0
}
result[i].zj =
parseInt(result[i].yyzy) +
parseInt(result[i].kfzj) +
parseInt(result[i].znsf) +
parseInt(result[i].ywzj) +
parseInt(result[i].tcfw) +
parseInt(result[i].hys)
}
this.tableData = res.data.data
this.tableDataClone = res.data.data
this.total = res.data.data.total
this.exportExcelCondition = qs.stringify({
approveStatus: this.status,
deptId: this.abilityDepartment,
startDate: this.startDate,
endDate: this.endDate,
resourceName: this.resourceName
}) })
} }
}) })
}, },
// //
@ -705,28 +704,26 @@ export default {
}) })
.then((res) => { .then((res) => {
if (res.data.code !== 0) { if (res.data.code !== 0) {
this.tableData =[] this.tableData = []
this.tableDataClone = [] this.tableDataClone = []
this.total = 0 this.total = 0
return this.$message.error("服务器内部异常") return this.$message.error('服务器内部异常')
} else {
}else{ this.tableData = res.data.data.list
this.tableData = res.data.data.list this.tableDataClone = res.data.data.list
this.tableDataClone = res.data.data.list this.total = res.data.data.total
this.total = res.data.data.total this.exportExcelCondition = qs.stringify({
this.exportExcelCondition = qs.stringify({ approveStatus: this.status,
approveStatus: this.status, deptId: this.abilityDepartment,
deptId: this.abilityDepartment, startDate: this.startDate,
startDate: this.startDate, endDate: this.endDate,
endDate: this.endDate, resourceName: this.resourceName
resourceName: this.resourceName })
}) }
}
}) })
}, },
// 使 // 使
getTwoDetail (page) { getTwoDetail (page) {
var passAndReview = '' // "" var passAndReview = '' // ""
if (this.examineStatus == '-1') { if (this.examineStatus == '-1') {
this.status = '' this.status = ''
@ -756,31 +753,27 @@ export default {
} }
}) })
.then((res) => { .then((res) => {
if (res.data.code !== 0) { if (res.data.code !== 0) {
this.tableData =[] this.tableData = []
this.tableDataClone = [] this.tableDataClone = []
this.total = 0 this.total = 0
return this.$message.error("服务器内部异常") return this.$message.error('服务器内部异常')
} else {
}else{ this.tableData = res.data.data.list
this.tableData = res.data.data.list this.tableDataClone = res.data.data.list
this.tableDataClone = res.data.data.list this.total = res.data.data.total
this.total = res.data.data.total this.exportExcelCondition = qs.stringify({
this.exportExcelCondition = qs.stringify({ approveStatus: this.status,
approveStatus: this.status, deptId: this.abilityDepartment,
deptId: this.abilityDepartment, startDate: this.startDate,
startDate: this.startDate, endDate: this.endDate,
endDate: this.endDate, resourceName: this.resourceName,
resourceName: this.resourceName, provideDept: this.provideDepartment
provideDept: this.provideDepartment })
}) }
}
}) })
}, },
handleClick (row) { handleClick (row) {
if (this.choseId === 0) { if (this.choseId === 0) {
if (this.departmentId === 1) { if (this.departmentId === 1) {
@ -809,8 +802,6 @@ export default {
// type // type
handleChose (index) { handleChose (index) {
this.checked = false this.checked = false
this.departmentId = index this.departmentId = index
this.currentPage = 1 this.currentPage = 1
@ -878,8 +869,8 @@ export default {
}, },
// ////////// // //////////
goToDetail () { goToDetail () {
this.abilityDepartment='' this.abilityDepartment = ''
this.provideDepartment='' this.provideDepartment = ''
this.currentPage = 1 this.currentPage = 1
this.pageSize = 10 this.pageSize = 10
@ -895,8 +886,8 @@ export default {
}, },
// //
goToBack () { goToBack () {
this.abilityDepartment='' this.abilityDepartment = ''
this.provideDepartment='' this.provideDepartment = ''
this.checked = false this.checked = false
this.currentPage = 1, this.currentPage = 1,