1.级联单级改为select组件及逻辑修改;2.业务空间添加根据表号功能号去获取实时数据;3.添加数据导出Excel功能

package.json

@@ -12,7 +12,7 @@
     "dependencies": {
         "axios": "^0.18.0",
         "echarts": "^4.1.0",
-        "element-ui": "^2.6.1",
+        "element-ui": "^2.11.0",
         "font-awesome": "^4.7.0",
         "handsontable-pro": "^3.0.0",
         "jquery": "^3.3.1",

src/components/business_space/business/handsontable.vue

@@ -142,7 +142,10 @@ export default {
 				this.page.total = res.Total
 				this.main = res.Content
 				if (this.main && this.main.length && this.main[0].RoomID) {
-					this.copyMain = tools.deepCopy(this.main);
+          this.copyMain = tools.deepCopy(this.main);
+          if (this.onlyRead) {
+            this.getBatch(this.main)
+          }
         }
         this.isLoading = false
 				this.getMain()
@@ -391,6 +394,63 @@ export default {
       }
       return a;
     },
+    //获取动态参数
+    getBatch(data) {
+      let param = {
+        secret: this.secret,
+        ProjId: this.projectId,
+        data: {
+          criterias: []
+        }
+      };
+      this.headers.map(head => {
+        if (
+          head.InputMode == "L" ||
+          head.InputMode == "L1" ||
+          head.InputMode == "L2" ||
+          head.InputMode == "M"
+        ) {
+          data.map(item => {
+            let cur = tools.dataForKey(item, head.Path);
+            if (cur) {
+              param.data.criterias.push({
+                id: item.RoomID,
+                code: head.InfoPointCode
+              });
+            }
+          });
+        }
+      });
+      if (param.data.criterias.length) {
+        BeatchQueryParam(param, res => {
+          this.main = data.map(item => {
+            res.Content.map(child => {
+              if (item.RoomID == child.id) {
+                if (child.data || child.data == 0) {
+                  this.headers.map(head => {
+                    if (head.InfoPointCode == child.code) {
+                      tools.setDataForKey(item, head.Path, child.data);
+                    }
+                  });
+                } else {
+                  this.headers.map(head => {
+                    if (head.InfoPointCode == child.code) {
+                      tools.setDataForKey(
+                        item,
+                        head.Path,
+                        child.error ? "表号功能号格式错误" : "表号功能号不存在"
+                      );
+                    }
+                  });
+                }
+              }
+            });
+            return item;
+          });
+          this.tableExample.loadData(this.main);
+        });
+      }
+    },
     /**
      * 表头文案处理函数
      * @param list header数组数据

src/components/dialogs/list/systemType.vue

@@ -28,9 +28,7 @@
           <el-table-column label="本地编码" header-align='center'>
             <template slot-scope="scope">{{scope.row.SysLocalID || '--'}}</template>
           </el-table-column>
-          <el-table-column label="专业" header-align='center'>
-            <template slot-scope="scope">{{scope.row.MajorName}}</template>
-          </el-table-column>
+          <el-table-column label="专业" prop="MajorName" header-align='center'></el-table-column>
           <el-table-column label="详情" header-align='center' width="100" align="center">
             <template slot-scope="scope">
               <el-button @click="lookDeatils(scope.row)" type="text">详情</el-button>
@@ -228,7 +226,7 @@ export default {
   watch: {
     dialog: {
       deep: true,
-      handler: function () {
+      handler () {
         if (this.dialog.systemType) {
           this.getData()
           this.getTableData()

src/components/ledger/handsontables/assets.vue

@@ -49,7 +49,7 @@
     <!-- 新增资产 -->
     <el-dialog class="add-assets" :title="showAddByDie?'未关联资产的设备批量创建资产':'确定新增资产类型'" @close="showAddByDie = false" :visible.sync="myDialog.addDevice" width="670px">
       <el-row>
-        <my-cascader v-show="!showAddByDie" ref="cascader" @change="changeCader"></my-cascader>
+        <my-cascader v-show="!showAddByDie" ref="cascader" :all="true" @change="changeCader"></my-cascader>
         <die-cascader v-show="showAddByDie" ref="dieCascader" :Family="addData.Family" @change="changeDevice"></die-cascader>
         <floor-cascader v-show="showAddByDie" @change="changeFloor"></floor-cascader>
         <div class="die-text" v-show="showAddByDie">当前筛选条件下有<span class="die-num">{{dieNum}}</span>个设备可批量创建资产。</div>
@@ -328,7 +328,7 @@ export default {
       this.myDialog.addDevice = true
       if (this.mess.deviceId) {
         this.$nextTick(() => {
-          this.$refs.cascader.setValue([this.mess.deviceId])
+          this.$refs.cascader.setValue(this.mess.deviceId)
           this.addData.Family = this.mess.deviceId
           this.numParams.Family = this.mess.deviceId
         })
@@ -401,9 +401,11 @@ export default {
     },
     //选择设备类型-添加资产
     changeCader(val) {
-      this.addData.Family = val.code
-      this.addData.name = val.facility
-      this.numParams.Family = val.code
+      if(val.code && val.facility){
+        this.addData.Family = val.code
+        this.addData.name = val.facility
+        this.numParams.Family = val.code
+      }
     },
     //选择设备或部件
     changeDevice(val) {
@@ -600,7 +602,7 @@ export default {
     async removeDevice(param) {
       await deleteProperty(param, res => {
         this.$message.success("删除成功")
-        this.$emit('close','')
+        this.$emit('getJson','')
         this.getTableData()
       })
     },

src/components/ledger/handsontables/device.vue

@@ -348,7 +348,7 @@ export default {
       this.myDialog.addDevice = true
       if (this.mess.deviceId) {
         this.$nextTick(() => {
-          this.$refs.cascader.setValue([this.mess.deviceId])
+          this.$refs.cascader.setValue(this.mess.deviceId)
         })
       }
     },

src/components/ledger/handsontables/system.vue

@@ -90,8 +90,8 @@ export default {
     ...mapGetters("layout", ["projectId", "secret", "userId"]),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "all", label: '全部' }, { value: "Visible", label: '只看采集信息' }] :
-        [{ value: "all", label: '全部' }, { value: "Visible", label: '只看采集信息' }, { value: "partInfo", label: '隐藏信息点' }]
+        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
+        [{ value: "partInfo", label: '隐藏信息点' }, { value: "all", label: '全部' }, { value: "Visible", label: '只看采集信息' }]
     }
   },
   data() {
@@ -224,7 +224,7 @@ export default {
       this.myDialog.addDevice = true
       if (this.mess.deviceId) {
         this.$nextTick(() => {
-          this.$refs.cascader.setValue([this.mess.deviceId])
+          this.$refs.cascader.setValue(this.mess.deviceId)
         })
       }
     },

src/components/ledger/lib/assets.vue

@@ -1,7 +1,10 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="padding-right: 12px;">设备族</span>
-    <el-cascader
+    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
+      <el-option  v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
+    </el-select>
+    <!-- <el-cascader
       placeholder="请选择"
       :options="options"
       v-model="value"
@@ -11,24 +14,28 @@
       size="small"
       @change="changeVal"
       change-on-select
-    ></el-cascader>
+    ></el-cascader> -->
   </div>
 </template>
 <script>
 import {mapGetters} from 'vuex';
-import { getEquipBelongs } from "@/api/scan/request";
+import { getEquipBelongs, queryProperty } from "@/api/scan/request";
 export default {
   name: "getCode",
   props: {
     isWidth: {
       type: Boolean,
       default: true
+    },
+    all: {
+      type: Boolean,
+      default: false,
     }
   },
-      computed: {
-        ...mapGetters("layout", [
-            "projectId",
-        ])
+  computed: {
+    ...mapGetters("layout", [
+        "projectId",
+    ])
   },
   data() {
     return {
@@ -65,30 +72,63 @@ export default {
       this.value = val
       this.$emit("change", value)
     },
-    async getData() {
-      let params = {
+    getData() {
+      let param1 = {
         data:{
           Distinct: true,
           PageNumber: 1,
           PageSize: 500,
           Projection:["Family","FamilyName"]
         }
+      }, param2 = {
+        Distinct: true,
+        PageNumber: 1,
+        PageSize: 500,
+        Projection: [
+          "Family"
+        ]
       }
-      await getEquipBelongs(params, res => {
-        this.options = this.changeArr(res.Content)
-        if (!!this.value && this.value.length) {
-          let value = {}
-          this.options.map(item => {
-            if (item.code == this.value[0]) {
-              value = item
-            }
-          })
-          this.$emit("change", value)
+      let promise1 = new Promise((resolve, reject) => {
+        getEquipBelongs(param1, res => {
+          resolve(res)
+        })
+      })
+      let promise2 = new Promise((resolve, reject) => {
+        queryProperty(param2, res => {
+          resolve(res)
+        })
+      })
+      Promise.all([promise1,promise2]).then((res) => {
+        let allData = res[0], data = res[1]
+        this.options = this.changeArr(allData.Content)
+        if (this.value) {
+          this.changeVal(this.value)
         }
-        if (!this.falg) {
-          this.changeList()
+        if(!this.all) {
+          this.content = data.Content.map(item => {
+            return item.Family
+          });
+          this.changeList();
+          if (this.value) {
+            this.changeVal(this.value)
+          }
         }
       })
+      // getEquipBelongs(params, res => {
+      //   this.options = this.changeArr(res.Content)
+      //   if (!!this.value && this.value.length) {
+      //     let value = {}
+      //     this.options.map(item => {
+      //       if (item.code == this.value[0]) {
+      //         value = item
+      //       }
+      //     })
+      //     this.$emit("change", value)
+      //   }
+      //   if (!this.falg) {
+      //     this.changeList()
+      //   }
+      // })
     },
     changeArr(arr) {
       let data = [];
@@ -108,15 +148,9 @@ export default {
     },
     changeList() {
       this.options = this.options.filter(item => {
-        if (this.content.find(value => value.Family == item.code)) {
+        if (this.content.indexOf(item.code) > -1) {
           return item
         }
-        // item.disabled = true
-        // this.content.map(child => {
-        //   if (item.code == child) {
-        //     item.disabled = false
-        //   }
-        // })
       })
     }
   }

src/components/ledger/lib/cascader.vue

@@ -1,8 +1,11 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
-    <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
-      @change="changeVal" change-on-select></el-cascader>
+    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
+      <el-option  v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
+    </el-select>
+    <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
+      @change="changeVal" change-on-select></el-cascader> -->
   </div>
 </template>
 <script>
@@ -25,7 +28,7 @@ export default {
   },
   data() {
     return {
-      value: [""],
+      value: "",
       options: [],
       props: {
         value: "code",
@@ -40,7 +43,7 @@ export default {
   },
   watch: {
     projectId() {
-      this.value = [''];
+      this.value = '';
       this.getData();
     }
   },

src/components/ledger/lib/floorCascader.vue

@@ -140,6 +140,11 @@
         }
     };
 </script>
+<style lang="less">
+    .el-cascader .el-input .el-input__inner {
+        vertical-align: bottom;
+    }
+</style>
 <style lang="less" scoped>
     #buildFloor {
         margin-left: 10px;

src/components/ledger/lib/partsDieList.vue

@@ -1,8 +1,11 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类</span>
-    <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
-      @change="changeVal" change-on-select></el-cascader>
+    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
+      <el-option  v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
+    </el-select>
+    <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
+      @change="changeVal" change-on-select></el-cascader> -->
   </div>
 </template>
 <script>
@@ -25,7 +28,7 @@ export default {
   },
   data() {
     return {
-      value: [""],
+      value: "",
       options: [],
       props: {
         value: "code",
@@ -42,7 +45,7 @@ export default {
   },
   watch: {
     projectId() {
-      this.value = [''];
+      this.value = '';
       this.getAllData()
     }
     // Family: {
@@ -56,7 +59,7 @@ export default {
   },
   methods: {
     setValue(val) {
-      if (val && val.length) {
+      if (val) {
         this.value = val
       }
     },
@@ -84,7 +87,7 @@ export default {
       queryPartsDie(param, res => {
         this.content = res.Content
         this.filterForOptions()
-        let val = this.options.length?[this.options[0].code]:[""]
+        let val = this.options.length?this.options[0].code:""
         this.changeVal(val)
       })
     },

src/components/ledger/lib/system.vue

@@ -1,8 +1,11 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
-    <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
-      @change="changeVal" change-on-select></el-cascader>
+    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
+      <el-option  v-for="item in options" :key="item.Category" :label="item.CategoryName" :value="item.Category"></el-option>
+    </el-select>
+    <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
+      @change="changeVal" change-on-select></el-cascader> -->
   </div>
 </template>
 <script>
@@ -43,7 +46,7 @@ export default {
   },
   watch: {
     projectId() {
-      this.value = ['']
+      this.value = ''
     }
   },
   methods: {

src/views/ledger/facility/index.vue

@@ -79,7 +79,7 @@ export default {
     let deviceId = this.$route.params.deviceId;
     if (deviceId) {
       this.$nextTick(() => {
-        this.$refs.cascader.changeVal([deviceId])
+        this.$refs.cascader.changeVal(deviceId)
       })
     }
   },
@@ -102,7 +102,7 @@ export default {
     close(val) {
       this.getCount()
       if (val && this.$refs.cascader){
-        this.$refs.cascader.changeVal([val.code])
+        this.$refs.cascader.changeVal(val.code)
       }
         this.$refs.cascader.getData()
       //   this.$refs.tableMain.getHeaderData(this.param);
@@ -163,9 +163,9 @@ export default {
 
     //修改设备族
     changeDevice(value) {
-      this.param.deviceId = value.code
-      this.param.name = value.facility
-      if (!!value) {
+      if (value.code && value.facility) {
+        this.param.deviceId = value.code
+        this.param.name = value.facility
         if (this.$refs.tableMain)
           this.$refs.tableMain.getHeaderData(this.param);
       }

src/views/ledger/property/addpropertys.vue

@@ -78,7 +78,7 @@ export default {
   },
   mounted() {
     if (this.params.category) {
-      this.$refs.dieCascader.setValue([this.params.category])
+      this.$refs.dieCascader.setValue(this.params.category)
     }
     if (this.params.buildId && this.params.floorId) {
       this.$refs.floorCascader.setValue([this.params.buildId,this.params.floorId])

src/views/ledger/property/index.vue

@@ -17,10 +17,7 @@ import floorCascader from "@/components/ledger/lib/floorCascader";
 import myCascader from "@/components/ledger/lib/assets";
 import hansonTable from "@/components/ledger/handsontables/assets";
 import tableTransfers from "@/components/ledger/tableTransfers";
-import {
-    mapGetters,
-    mapActions
-} from "vuex";
+import { mapGetters, mapActions } from "vuex";
 import { countProperty, queryProperty } from "@/api/scan/request"
 import "./../index.scss"
 export default {
@@ -32,13 +29,8 @@ export default {
     tableTransfers
   },
   computed: {
-        ...mapGetters("layout", [
-            "projectId",
-            "projects",
-            "secret",
-            "userId"
-        ])
-    },
+    ...mapGetters("layout", [ "projectId", "projects", "secret", "userId" ])
+  },
   data() {
     return {
       mess: {
@@ -72,7 +64,7 @@ export default {
     let Family = this.$route.params.Family
     if (Family) {
       this.$nextTick(() => {
-        this.$refs.cascader.changeVal([Family])
+        this.$refs.cascader.changeVal(Family)
       })
     }
   },
@@ -91,21 +83,6 @@ export default {
         this.mess.perjectName = item.name
       })
     },
-    getFamilyList() {
-      let param = {
-        Distinct: true,
-        PageNumber: 1,
-        PageSize: 500,
-        Projection: [
-          "Family"
-        ]
-      }
-      queryProperty(param, res => {
-        if (this.$refs.cascader) {
-              this.$refs.cascader.pushData(res.Content)
-          }
-      })
-    },
     //获取header的list
     getNumber() {
       countProperty({}, res => {
@@ -113,7 +90,6 @@ export default {
       })
       countProperty({"Filters": "not EquipmentId isNull"}, res => {
         this.mess.name[1].num = res.Count
-        this.getFamilyList()
       })
     },
     //修改楼层
@@ -136,8 +112,7 @@ export default {
 
     //新建资产后进行刷新
     change(val) {
-      console.log(val)
-      this.$refs.cascader.setValue([val.code])
+      this.$refs.cascader.setValue(val.code)
       this.param.deviceId = val.code
       this.getNumber()
       if (!!this.param.deviceId) {
@@ -148,13 +123,10 @@ export default {
 
     //修改设备族
     changeDevice(value) {
-      console.log(value)
-      this.param.deviceId = value.code
-      if (!!value) {
+      if (value.code && value.facility) {
+        this.param.deviceId = value.code
         if(this.$refs.tableMain)
         this.$refs.tableMain.getHeaderData(this.param);
-      } else {
-        return;
       }
     }
   }

src/views/ledger/report/index.vue

@@ -7,6 +7,7 @@
       </el-select>
       <el-button @click="handleClickDownload" type="primary" :loading="loading" style="margin-left: 15px;">导出Excel</el-button>
     </el-row>
+    <div style="text-align:center;font-size:25px;margin-top:20%;">当前页面中的为临时功能，完整版正在设计中……</div>
   </div>
 </template>
 
@@ -54,7 +55,7 @@ export default {
         fieldName: "BIMID",
         headerName: "设备BIMID"
       }, {
-        fieldName: "Property.Family",
+        fieldName: "Property.EquipFamilyList.0.FamilyName",
         headerName: "资产设备族"
       }, {
         fieldName: "Property.EquipLocalName",
@@ -144,6 +145,12 @@ export default {
           },
           {
             Name: "property",
+            Cascade: [
+              {
+                Name: "equipFamilyList",
+                Projection: [ "Family", "FamilyName" ]
+              }
+            ],
             Projection: ["Family", "EquipLocalName", "EquipLocalID", "EquipID", "CodeType", "CreateTime"]
           },
           {
@@ -163,7 +170,7 @@ export default {
       queryEquip(params, res => {
         this.dataList = this.dataList.concat(res.Content.map((item) => {
           item.Property.CodeType = State[item.Property.CodeType]
-          item.Property.Family = Family[item.Property.Family]
+          // item.Property.Family = Family[item.Property.Family]
           return item
         }))
         if (res.Total / (res.PageSize * res.PageNumber) > 1) {

src/views/ledger/spacelist/index.vue

@@ -71,7 +71,7 @@ import facilityDialog from "@/components/business_space/dialogs/facilityDialog";
 // import spaceHandsontable from "@/components/business_space/business/spaceHandsontable";
 import graphy from "@/components/business_space/graphy/business";
 import handsontableMain from "@/components/business_space/business/handsontable";
-import { getDataDictionary, getAllbusiness, getBussTypes, getSpaceFloor } from "@/api/scan/request";
+import { getDataDictionary, getAllbusiness, getBussTypes, getSpaceFloor, buildingQuery, floorQuery } from "@/api/scan/request";
 import tools from '@/utils/scan/tools'
 import { mapGetters, mapActions } from "vuex";
 export default {
@@ -148,6 +148,63 @@ export default {
     },
     //获取楼层
     getFloor() {
+      // let data, buildParams = {
+      //   PageNumber: 1,
+      //   PageSize: 500
+      // }, floorParams = {
+      //   Orders: "FloorSequenceID desc",
+      //   PageNumber: 1,
+      //   PageSize: 500
+      // }
+      // let promise1 = new Promise((resolve, reject) => {
+      //   buildingQuery(buildParams, res => {
+      //     resolve(res)
+      //   })
+      // })
+      // let promise2 = new Promise((resolve, reject) => {
+      //   floorQuery(floorParams, res => {
+      //     resolve(res)
+      //   })
+      // })
+      // Promise.all([promise1, promise2]).then(values => {
+      //   let builData = values[0].Content, floorData = values[1].Content
+      //   data = builData.map(build => {
+      //     return {
+      //       code: build.BuildID,
+      //       name: build.BuildLocalName
+      //     }
+      //   })
+      //   data.forEach(build => {
+      //     floorData.forEach(floor => {
+      //       if (build.code == floor.BuildID && floor.FloorID && floor.FloorLocalName) {
+      //         if (build.children) {
+      //           build.children.push({
+      //             code: floor.FloorID,
+      //             name: (floor.FloorLocalName || floor.FloorName || "未知") + this.myMess(floor),
+      //             map: floor.StructureInfo?floor.StructureInfo.FloorMap?floor.StructureInfo.FloorMap:null:null,
+      //             affected: floor.affected,
+      //             buildCode: build.BuildID,
+      //             buildName: build.BuildLocalName,
+      //             FloorSequenceID: floor.FloorSequenceID
+      //           })
+      //         } else {
+      //           build.children = []
+      //           build.children.push({
+      //             code: floor.FloorID,
+      //             name: (floor.FloorLocalName || floor.FloorName || "未知") + this.myMess(floor),
+      //             map: floor.StructureInfo?floor.StructureInfo.FloorMap?floor.StructureInfo.FloorMap:null:null,
+      //             affected: floor.affected,
+      //             buildCode: build.BuildID,
+      //             buildName: build.BuildLocalName,
+      //             FloorSequenceID: floor.FloorSequenceID
+      //           })
+      //         }
+      //       }
+      //     })
+      //   })
+      //   this.options = data
+      // })
+
       let param = {
         ProjId: this.projectId,
         UserId: this.UserId,
@@ -208,6 +265,7 @@ export default {
         return "(该业务空间受元空间变化影响)"
       } else {
         if (i.infos.FloorMap) {
+        // if (i.StructureInfo && i.StructureInfo.FloorMap) {
           return ''
         } else {
           return "(请初始化平面图)"

src/views/ledger/system/index.vue

@@ -68,7 +68,7 @@ export default {
     let deviceId = this.$route.params.deviceId;
     if (deviceId) {
       this.$nextTick(() => {
-        this.$refs.cascader.changeVal([deviceId])
+        this.$refs.cascader.changeVal(deviceId)
       })
     }
   },
@@ -84,7 +84,7 @@ export default {
       this.countGeneralSys()
       if (!!val && !!val.Category) {
         if (this.$refs.cascader)
-          this.$refs.cascader.changeVal([val.Category])
+          this.$refs.cascader.changeVal(val.Category)
       }
       this.$refs.cascader.getData()
     },