Просмотр исходного кода

Merge remote-tracking branch 'origin/dev' into dev

shaun-sheep 4 лет назад
Родитель
Сommit
216ca25007

+ 2 - 2
src/components/business_space/newGraphy/graphy.vue

@@ -615,8 +615,8 @@ export default {
       if (arr.length) {
         let tempArr = [];
         arr.map(t => {
-          if (this.BIMIDToSIName[t.data.sourceId]) {
-            tempArr.push(this.BIMIDToSIName[t.data.sourceId]);
+          if (this.BIMIDToSIName[t.data.SourceId]) {
+            tempArr.push(this.BIMIDToSIName[t.data.SourceId]);
           }
         })
         this.$refs.createBSP.showDialog(tempArr.toString());

+ 2 - 2
src/views/data_admin/buildGraphy/index.vue

@@ -52,8 +52,8 @@ export default {
   data() {
     return {
       props: {
-        value: 'BuildID',
-        label: 'BuildLocalName',
+        value: 'id',
+        label: 'localName',
         children: 'floor'
       },
       param: {

+ 1 - 1
src/views/ready/buildfloor/index.vue

@@ -388,7 +388,7 @@ export default {
     handleBuildQuery() {
       let param = {
         projectId: this.projectId,
-        Orders: "localName asc",
+        orders: "localName asc",
         pageNumber: 1,
         pageSize: 500
       };

+ 8 - 6
src/views/ready/collectsetting/index.vue

@@ -640,12 +640,14 @@ export default {
 
       let param = { "type": this.value, projectId: 'Pj1101050029' }
       queryPhysicsAllType(param, res => {
-        this.allFamily = res.content.map((item) => ({
-          code: item.code,
-          name: item.name,
-          aliasName: item.aliasName,
-          aliasCode: item.aliasCode
-        }))
+        if (res.content) {
+          this.allFamily = res.content.map((item) => ({
+            code: item.code,
+            name: item.name,
+            aliasName: item.aliasName,
+            aliasCode: item.aliasCode
+          }))
+        }
         this.isLoading = false
         this.familySort()
       })