|
@@ -93,6 +93,7 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
getTableData() {
|
|
|
+ this.loading = true
|
|
|
let params = {
|
|
|
Cascade: [
|
|
|
{
|
|
@@ -119,11 +120,11 @@ export default {
|
|
|
}
|
|
|
|
|
|
if (this.params.isVerification) {
|
|
|
- params.Filters += `;TaskState isNull`
|
|
|
+ params.Filters += `;(TaskState isNull || TaskState=0)`
|
|
|
}
|
|
|
|
|
|
if (this.params.device) {
|
|
|
- params.Filters += `;Category='${this.params.category}'`
|
|
|
+ params.Filters += `;Category='${this.params.device}'`
|
|
|
}
|
|
|
|
|
|
if (this.params.spaceList && this.params.spaceList.length) {
|
|
@@ -135,6 +136,7 @@ export default {
|
|
|
} else {
|
|
|
params.Filters += `;ModelId='${this.params.CurrentModelId}'`
|
|
|
queryEquip(params, res => {
|
|
|
+ this.loading = false
|
|
|
this.dataFormatter(res)
|
|
|
})
|
|
|
}
|