修改二轮集测问题

src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -106,7 +106,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

src/components/business_space/newGraphy/unRelateBSP.vue

@@ -112,7 +112,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

src/components/ledger/handsontables/system.vue

@@ -246,7 +246,9 @@ export default {
     },
     //撤回
     undo() {
-      this.hot.undo();
+      if (this.tableData.length) {
+				this.hot.undo();
+			}
     },
     //刷新
     reset() {

src/components/ledger/lib/buildfloorCascader.vue

@@ -29,7 +29,7 @@ export default {
     getCascader() {
       let param = {
         cascade: [
-          { name: "floor", orders: "floorSequenceId desc" }
+          { name: "floor", orders: "floorSequenceID desc" }
         ],
         orders: "localName asc",
         pageNumber: 1,

src/components/ledger/lib/floorCascader.vue

@@ -71,7 +71,7 @@
                         "localName"
                     ]
                 }, floorParams = {
-                    orders: "floorSequenceId desc",
+                    orders: "floorSequenceID desc",
                     pageNumber: 1,
                     pageSize: 1000
                 }
@@ -107,7 +107,7 @@
                                     build.children.push({
                                         value: floor.id,
                                         label: floor.localName,
-                                        FloorSequenceID: floor.floorSequenceId,
+                                        FloorSequenceID: floor.floorSequenceID,
                                         infos: floor.infos || {},
                                         outline: floor.outline || null,
                                     })
@@ -122,7 +122,7 @@
                                     },{
                                         value: floor.id,
                                         label: floor.localName,
-                                        FloorSequenceID: floor.floorSequenceId,
+                                        FloorSequenceID: floor.floorSequenceID,
                                         infos: floor.infos || {},
                                         outline: floor.outline || null,
                                     })

src/components/ledger/lib/linkassets.vue

@@ -101,14 +101,14 @@ export default {
           "localName"
         ]
       }, floorParams = {
-        orders: "floorSequenceId desc",
+        orders: "floorSequenceID desc",
         pageNumber: 1,
         pageSize: 1000,
         projection: [
           "buildingId",
           "id",
           "localName",
-          "floorSequenceId"
+          "floorSequenceID"
         ]
       }
       let promise1 = new Promise((resolve, reject) => {
@@ -143,7 +143,7 @@ export default {
                 build.children.push({
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               } else {
                 build.children = []
@@ -156,7 +156,7 @@ export default {
                 }, {
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               }
             }

src/components/ledger/lib/noAllDataFloor.vue

@@ -74,7 +74,7 @@ export default {
           "localName"
         ]
       }, floorParams = {
-        orders: "floorSequenceId desc",
+        orders: "floorSequenceID desc",
         pageNumber: 1,
         pageSize: 1000
       }
@@ -108,7 +108,7 @@ export default {
                 build.children.push({
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               } else {
                 build.children = []
@@ -118,7 +118,7 @@ export default {
                 }, {
                   value: floor.id,
                   label: floor.localName,
-                  FloorSequenceID: floor.floorSequenceId
+                  FloorSequenceID: floor.floorSequenceID
                 })
               }
             }

src/components/ledger/lib/system.vue

@@ -84,8 +84,10 @@ export default {
       }
       queryLinkSys(param, res => {
         this.options = res.content;
-        if (this.value) {
+        if (this.value && this.options.find(item => item.classCode === this.value)) {
           this.changeVal(this.value)
+        } else {
+            this.changeVal("")
         }
       })
     },
@@ -95,8 +97,10 @@ export default {
       }
       queryPhysicsAllType(param, res => {
         this.options = this.changeArr(res.content)
-        if (this.value) {
+        if (this.value && this.options.find(item => item.classCode === this.value)) {
           this.changeVal(this.value)
+        } else {
+            this.changeVal("")
         }
       })
     },

src/components/ledger/rentList/roomCountDrawer.vue

@@ -104,7 +104,7 @@ export default {
     },
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         order: 'localName asc'
       }
       //todo 检测所有大小写

src/components/point/dynamicdata/delRelationDialog.vue

@@ -364,7 +364,7 @@ export default {
                   Data.forEach(t => {
                     if (t.id == item.FloorID) {
                       item.ObjectLocalName = t.localName;
-                      item.ObjectSequenceID = t.floorSequenceId;
+                      item.ObjectSequenceID = t.floorSequenceID;
                       item.BuildLocalName = t.building ? t.building.localName : '';
                     }
                   })

src/components/point/dynamicdata/floorRules.vue

@@ -235,7 +235,7 @@ export default {
                   } else if (t.localName || t.id) {
                     item.ObjectLocalName = t.localName || t.id;
                   }
-                  item.ObjectSequenceID = t.floorSequenceId;
+                  item.ObjectSequenceID = t.floorSequenceID;
                   item.BuildLocalName = t.building ? t.building.localName : '';
                 }
               })

src/components/ready/buildfloor/buildfloorCascader.vue

@@ -30,7 +30,7 @@ export default {
       let param = {
         cascade: [
           // { Name: "floor", Orders: "FloorSequenceID desc" }
-          {name: "floor", orders: "floorSequenceId desc"}
+          {name: "floor", orders: "floorSequenceID desc"}
         ],
         // Orders: "BuildLocalName asc",
         pageNumber: 1,

src/components/ready/buildfloor/formItems.vue

@@ -150,16 +150,6 @@ export default {
         callback();
       }
     };
-    let validateFloor = (rule, value, callback) => {
-        let floorSequenceID = this.form["infos.floorSequenceID"];
-        console.log(floorSequenceID);
-        if (!floorSequenceID) {
-        return callback(new Error("请输入楼层顺序号"));
-      } else {
-        callback();
-      }
-    };
-    // }
     return {
       form: {},
       isShowTitle: true,
@@ -170,7 +160,7 @@ export default {
         localName: [
           { required: true, message: "请输入楼层本地名称", trigger: "blur" },
         ],
-        floorSequenceId: [
+        floorSequenceID: [
           { required: true, message: "请输入楼层顺序号",  trigger: "blur" },
         ],
       },

src/utils/handsontable/buildFloorData.js

@@ -12,14 +12,14 @@ const buildFloor = {
             "localName"
         ]
     }, floorParams = {
-        orders: "floorSequenceId desc",
+        orders: "floorSequenceID desc",
         pageNumber: 1,
         pageSize: 1000,
         projection: [
             "buildingId",
             "id",
             "localName",
-            "floorSequenceId"
+            "floorSequenceID"
         ]
     }
 

src/views/business_space/dataUtil/index.vue

@@ -449,7 +449,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

src/views/data_admin/buildData/index.vue

@@ -745,7 +745,7 @@ export default {
     getFloorData() {
       let param = {
         filters: `buildingId='${this.buildId}'`,
-        orders: 'floorSequenceId desc'
+        orders: 'floorSequenceID desc'
       };
       floorQuery(param, res => {
         this.floorList = res.content

src/views/data_admin/buildGraphy/index.vue

@@ -110,7 +110,7 @@ export default {
     getList() {
       let param = {
         cascade: [
-          { name: "floor", orders: "floorSequenceId desc", }
+          { name: "floor", orders: "floorSequenceID desc", }
         ],
         pageNumber: 1,
         pageSize: 50

src/views/ledger/cenotelist/relatedSpace.vue

@@ -223,7 +223,7 @@ export default {
           cascade: [
             {
               name: "floor",
-              orders: "floorSequenceId desc, name asc",
+              orders: "floorSequenceID desc, name asc",
             }
           ]
         };

src/views/point/dynamicdata/addRelation/floorRela/index.vue

@@ -428,7 +428,7 @@ export default {
               t.ObjectID = t.id.substr(12);
               t.ObjectLocalName = t.localName;
               t.ObjectLocalCode = t.localId;
-              t.ObjectSequenceID = t.floorSequenceId;
+              t.ObjectSequenceID = t.floorSequenceID;
               t.BuildLocalName = t.building ? t.building.localName : '';
               return t;
             });

src/views/relation/overview/detail/index.vue

@@ -231,7 +231,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {