Browse Source

修改楼层bug,资产表号功能号报错问题

zhangyu 5 năm trước cách đây
mục cha
commit
93e7bd7bfa

+ 1 - 1
src/components/ledger/handsontables/assets.vue

@@ -65,7 +65,7 @@
   </div>
 </template>
 <script>
-import { getDataDictionary, queryProperty, propertyLinkEq, updateProperty, deleteProperty, countPartsDie, createPropertys } from "@/api/scan/request";
+import { getDataDictionary, queryProperty, propertyLinkEq, updateProperty, deleteProperty, countPartsDie, createPropertys, BeatchQueryParam } from "@/api/scan/request";
 
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/scan/hasontableUtils"

+ 4 - 0
src/components/ledger/lib/floorCascader.vue

@@ -121,6 +121,10 @@
                                     },{
                                         value: 'noKnow',
                                         label: "未明确楼层的设备"
+                                    },{
+                                        value: floor.FloorID,
+                                        label: floor.FloorLocalName,
+                                        FloorSequenceID: floor.FloorSequenceID
                                     })
                                 }
                             }

+ 16 - 13
src/utils/handsontable/buildFloorData.js

@@ -46,20 +46,23 @@ const buildFloor = {
       })
       data.forEach(build => {
         floorData.forEach(floor => {
-            if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName) {
-                if (build.children) {
-                    build.children.push({
-                        value: floor.FloorID,
-                        label: floor.FloorLocalName
-                    })
-                } else {
-                    build.children = []
-                    build.children.push({
-                        value: "",
-                        label: "未明确楼层的设备"
-                    })
-                }
+          if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName) {
+            if (build.children) {
+              build.children.push({
+                value: floor.FloorID,
+                label: floor.FloorLocalName
+              })
+            } else {
+              build.children = []
+              build.children.push({
+                value: "",
+                label: "未明确楼层的设备"
+              },{
+                value: floor.FloorID,
+                label: floor.FloorLocalName 
+              })
             }
+          }
         })
       })
       data.forEach(item => {