|
@@ -299,7 +299,7 @@ import buildTime from "@/components/data_admin/selectTime";
|
|
|
import drag from "@/components/data_admin/drag";
|
|
|
import Swiper from "swiper";
|
|
|
import tools from "@/utils/scan/tools"
|
|
|
-import recommend from "@/components/data_admin/buildData/recommend";
|
|
|
+import recommend from "@/components/data_admin/buildData/recommend-2";
|
|
|
import showTools from "@/utils/handsontable/notShow"
|
|
|
import text from "@/utils/handsontable/mainText"
|
|
|
// import DragResize from '@/assets/js/resize'
|
|
@@ -841,7 +841,7 @@ export default {
|
|
|
let pa = {
|
|
|
PageNumber: this.currentPage[this.tabChecked],
|
|
|
PageSize: this.pageSizeArr[this.tabChecked],
|
|
|
- Filters: `CreateTime>='${this.checkTimeArr[0]}';CreateTime<='${this.checkTimeArr[1]}';BuildingId='${this.buildId}';Family='${this.code}'`
|
|
|
+ Filters: `CreateTime>='${this.checkTimeArr[0]}';CreateTime<='${this.checkTimeArr[1]}';BuildingId='${this.buildId}';Family='${this.code}';code_type IN (-1,-2,-3,0,2)`
|
|
|
}
|
|
|
// 添加建筑条件
|
|
|
if (this.floorId == 'noKnow') {
|