Explorar el Código

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

haojianlong hace 5 años
padre
commit
152d54e9d5

+ 1 - 0
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -83,6 +83,7 @@ export default {
         this.modelFolderName = item.label
         let data = {
           FolderId: val,
+          Status: '4',
           ProjectId: this.projectId
         };
         request.queryFloorList(data, res => {

+ 10 - 29
src/views/ready/collectsetting/index.vue

@@ -107,7 +107,7 @@
         </div>
         <!--/锚点-->
         <div v-else class="center" style="margin-top:260px;">
-          <i class="icon-wushuju iconfont"></i> 请选择设备族
+          <i class="icon-wushuju iconfont"></i> 请先选择左侧分类
         </div>
       </div>
     </main>
@@ -133,7 +133,8 @@
     getDataDictionary,
     queryFamilyAll,
     queryPhysicsAllType,
-    setDataDictionary
+    setDataDictionary,
+    queryDictionaryHead
   } from "@/api/scan/request";
   import {mapGetters} from "vuex";
 
@@ -601,35 +602,15 @@
             this.familySort()
           })
         } else if (this.value == "space") {
-          getBussTypes(res => {
+          queryDictionaryHead({Filters: "parentId = 'Space';Code != 'Ispace'"}, res => {
             this.isLoading = false
-            //   this.allFamily = res.Content;
-            this.allFamily = [{
-              "code": "GeneralZone",
-              "name": "默认分区",
-              "rel_type": "99"
-            },
-              {
-                "name": "供电分区",
-                "rel_type": "1",
-                "code": "PowerSupplyZone"
-              },
-              {
-                "name": "照明分区",
-                "rel_type": "2",
-                "code": "LightingZone"
-              },
-              {
-                "name": "空调分区",
-                "rel_type": "4",
-                "code": "AirConditioningZone"
-              },
-              {
-                "code": "TenantZone",
-                "name": "租户分区",
-                "rel_type": "10"
+            this.allFamily = res.Content.map(item => {
+              return {
+                "code": item.Code,
+                "name": item.Name
               }
-            ]
+            })
+            console.log(this.allFamily)
             this.familySort();
           })
         } else if (this.value == "tenant") {