|
@@ -20,7 +20,7 @@
|
|
|
<el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip width="100"></el-table-column>
|
|
|
<el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip width="100"></el-table-column>
|
|
|
<el-table-column prop="EquipCategory.EquipName" label="设备类" show-overflow-tooltip width="120"></el-table-column>
|
|
|
- <el-table-column prop="BimId" label="BIM Id" show-overflow-tooltip width="80"></el-table-column>
|
|
|
+ <el-table-column prop="BIMID" label="BIM Id" show-overflow-tooltip width="80"></el-table-column>
|
|
|
<el-table-column prop="type" label="现场验证操作规定" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select style="width:100px;" v-model="scope.row.SchemeId" placeholder="请选择">
|
|
@@ -122,9 +122,11 @@
|
|
|
|
|
|
if (this.params.isVerification) {
|
|
|
// params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
|
|
|
- params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
|
|
|
+ // params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
|
|
|
+ params.Filters += `;TaskState isnull`
|
|
|
} else {
|
|
|
- params.Filters += `;(TaskState!=1)`
|
|
|
+ // params.Filters += `;(TaskState!=1)`
|
|
|
+ params.Filters += `;(TaskState isnull or TaskState !=1 )`
|
|
|
}
|
|
|
|
|
|
if (this.params.device) {
|