Selaa lähdekoodia

adm:feat > 根据建筑楼层筛选设备类型

shaun-sheep 4 vuotta sitten
vanhempi
commit
0652bfb383
2 muutettua tiedostoa jossa 21 lisäystä ja 12 poistoa
  1. 18 5
      src/components/ledger/lib/cascader.vue
  2. 3 7
      src/views/ledger/facility/index.vue

+ 18 - 5
src/components/ledger/lib/cascader.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
+    <slot></slot>
     <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable
                :style="isWidth ? '' : 'width:160px;'" size="small"
                @change="changeVal">
@@ -44,6 +45,7 @@ export default {
   },
   created() {
     this.getData();
+
   },
   watch: {
     projectId() {
@@ -73,11 +75,7 @@ export default {
       this.$emit("change", value)
     },
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
-    getData() {
-      // params.filters += `;buildingId isNull`;
-
-
-      // params.filters += `;buildingId isNull`;
+    getData(val) {
       let param2 = {
         distinct: true,
         pageNumber: 1,
@@ -86,9 +84,24 @@ export default {
           "classCode"
         ]
       }
+      if (val && val[0] != 'all') {
+        param2.filters = ''
+        if (val[0] == "noKnow") {
+          param2.filters += `;buildingId isNull`;
+        } else if (val[0] && val[0] != "all") {
+          param2.filters += `;buildingId='${val[0]}'`;
+        }
+        if (val[1] == "noKnow") {
+          param2.filters += `;floorId isNull`;
+        } else if (val[1] && val[1] != "all") {
+          param2.filters += `;floorId='${val[1]}'`;
+        }
+        param2.filters = param2.filters.slice(1)
+      }
       let param1 = {
         type: "equipment"
       }
+
       let promise2 = new Promise((resolve, reject) => {
         queryEquip(param2, res => {
           resolve(res)

+ 3 - 7
src/views/ledger/facility/index.vue

@@ -6,7 +6,7 @@
     <div class="table-main">
       <div class="search-header">
         <floor-cascader @change="changeFloor"></floor-cascader>
-        <my-cascader ref="cascader" @change="changeDevice"></my-cascader>
+        <my-cascader ref="cascader" @change="changeDevice" ></my-cascader>
         <el-button size="small" @click="handleLinkAssets" class="iconfont icon-batchassociation">批量关联资产</el-button>
       </div>
       <hanson-table @close="close" :graphyId="graphyId" ref="tableMain"></hanson-table>
@@ -22,12 +22,8 @@ import myCascader from "@/components/ledger/lib/cascader";
 import hansonTable from "@/components/ledger/handsontables/device";
 import tableTransfers from "@/components/ledger/tableTransfers";
 import linkassetsDialog from "@/components/ledger/lib/linkassets";
-import { getSpaceName, getGraphyId, getEquipmentFamily } from "@/api/scan/request";
 import { countEquip } from "@/api/object/equip";
-import {
-  mapGetters,
-  mapActions
-} from "vuex";
+import { mapGetters } from "vuex";
 
 export default {
   components: {
@@ -158,7 +154,7 @@ export default {
         if (this.$refs.tableMain)
           this.$refs.tableMain.getHeaderData(this.param);
       }
-      // this.$refs.cascader.getData(value)
+      this.$refs.cascader.getData(value)
     },
 
     //修改设备族