zhangyu 5 rokov pred
rodič
commit
cca9fc7a02

+ 54 - 67
src/api/scan/request.js

@@ -671,13 +671,6 @@ export function getBillPropList(param, success) {
     http.postJson(url, data, success)
 }
 
-//台账修改资产信息
-export function updateProperty(param, success) {
-    let url = `${physics}/property/update?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
-}
-
 //台账获取设备列表
 export function getBillEquipList(param, success) {
     let url = `${business}/equip/list?projectId=${param.ProjId}&secret=${param.secret}`
@@ -802,15 +795,13 @@ export function saveRentRelateSpace(param, success) {
 export function createFmList(param, success) {
     let url = `${api}/service/fm/create`
     param.Comming = Comming
-    let data = param
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 export function createAssetsList(param, success) {
     let url = `${api}/service/fm/create_list`
     param.Comming = Comming
-    let data = param
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 export function getListForBuss(param, success) {
@@ -827,29 +818,25 @@ export function getProductList(param, success) {
 
 //完全匹配的厂商信息
 export function getBasicMatch(param) {
-    let data = param
-    return fetch({ method: 'POST', url: `${venders}/basic/autoFillId`, data })
+    return fetch({ method: 'POST', url: `${venders}/basic/autoFillId`, param })
 }
 
 //设备清单-查询设备内容
 export function getEquipTableCon(param, success) {
     let url = `${baseUrl}/equip-component/equip-query/equip-components`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单-查询当前设备下的部件分类
 export function getEquipPartsType(param, success) {
     let url = `${baseUrl}/equip-component/equip-query/components-count`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单-查询当前设备类下的部件分类
 export function getPartsAllType(param, success) {
     let url = `${baseUrl}/equip-component/equip-query/equip-compon`;
-    let data = param;
-    http.getJson(url, data, success)
+    http.getJson(url, param, success)
 }
 
 //all - 查询数据字典 --列表表头
@@ -868,15 +855,13 @@ export function setDataDictionary(param, success) {
 //设备清单 - 根据分类查询部件列表内容
 export function getEquipPartsCon(param, success) {
     let url = `${baseUrl}/equip-component/equip-query/components-property`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单 - 新增部件
 export function createPart(param, success) {
     let url = `${baseUrl}/datacenter/component/create`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单 - 删除部件
@@ -896,36 +881,31 @@ export function updateParts(param, success) {
 //设备清单 - 创建设备
 export function createEquip(param, success) {
     let url = `${baseUrl}/datacenter/equip/create`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单 - 更新设备
 export function updateEquip(param, success) {
     let url = `${baseUrl}/datacenter/equip/update`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单 - 删除设备
 export function deleteEquip(param, success) {
     let url = `${baseUrl}/datacenter/equip/delete`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单 - 查询系统关联专业
 export function queryLinkSys(param, success) {
     let url = `${baseUrl}/datacenter/general—system/query`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //设备清单 - 设备关联系统
 export function equipLinkSys(param, success) {
     let url = `${baseUrl}/datacenter/sy-in-eq/link-sy`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //创建资产所需(Family族id3位编码)-根据设备类型(4位编码)或部件类型(6位编码)查询
@@ -938,118 +918,125 @@ export function getEquipBelongs(param, success) {
 //创建资产
 export function createPropertyData(param, success) {
     let url = `${baseUrl}/datacenter/property/create`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //查询资产
 export function queryProperty(param, success) {
     let url = `${baseUrl}/datacenter/property/query`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
+}
+
+//根据id删除资产信息
+export function deleteProperty(param, success) {
+    let url = `${baseUrl}/datacenter/property/delete`;
+    http.postJson(url, param, success)
+}
+
+//更新资产信息
+export function updateProperty(param, success) {
+    let url = `${baseUrl}/datacenter/property/update`;
+    http.postJson(url, param, success)
 }
 
 //动态数据关联-冲突选择确认
 export function dynamicClashConfirm(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/clashconfirm`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //动态数据关联-查询数据源列表(P1&2)
 export function dynamicDataSource(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/datasource-list`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-查询设备类型列表(P1&2)
 export function dynamicDynEquipList(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/equipmenttype-list`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-执行对应结果
 export function dynamicExecute(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/execute`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-位置下拉列表(P2)
 export function dynamicLocationList(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/location-list`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-查询位置标签列表
 export function dynamicLocFlagList(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/locationflag-list`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
 }
 
 //动态数据关联-提示信息
 export function dynamicPromptmessage(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/promptmessage`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-提示冲突
 export function dynamicPromptobjs(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/promptobjs`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-查询对应关系(P1)
 export function dynamicQuery(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/query`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-待关联实例(P2)
 export function dynamicPendingobjs(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/query-pending-objs`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-待关联点位(P2)
 export function dynamicPendingPoint(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/query-pending-point`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-查点位
 export function dynamicQueryPoint(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/query-point`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-创建关联
 export function dynamicCreateRelation(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/relation-create`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-清除关联
 export function dynamicDeleteRelation(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/relation-delete`;
-    let data = param;
-    http.postJson(url, data, success);
+    http.postJson(url, param, success);
 }
 
 //动态数据关联-查询对象类列表(P1&2)
 export function dynamicPointTypeList(param, success) {
     let url = `${baseUrl}/pointconfig/dynamic/type-list`;
-    let data = param;
-    http.postJson(url, data, success)
+    http.postJson(url, param, success)
+}
+
+//查询楼层信息
+export function floorQuery(param, success) {
+    let url = `${baseUrl}/datacenter/floor/query`;
+    http.postJson(url, param, success)
+}
+
+//查询建筑信息
+export function buildingQuery(param, success) {
+    let url = `${baseUrl}/datacenter/building/query`;
+    http.postJson(url, param, success)
 }

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 465 - 952
src/components/ledger/handsontables/assets.vue


+ 11 - 3
src/components/ledger/lib/assets.vue

@@ -16,7 +16,7 @@
 </template>
 <script>
 import {mapGetters} from 'vuex';
-import { getEquipmentFamily } from "@/api/scan/request";
+import { getEquipBelongs } from "@/api/scan/request";
 export default {
   name: "getCode",
   props: {
@@ -66,7 +66,15 @@ export default {
       this.$emit("change", value)
     },
     async getData() {
-      await getEquipmentFamily(res => {
+      let params = {
+        data:{
+          Distinct: true,
+          PageNumber: 1,
+          PageSize: 500,
+          Projection:["Family","FamilyName"]
+        }
+      }
+      await getEquipBelongs(params, res => {
         this.options = this.changeArr(res.Content)
         if (!!this.value && this.value.length) {
           let value = {}
@@ -85,7 +93,7 @@ export default {
     changeArr(arr) {
       let data = [];
       arr.map(item => {
-        data.push({ code: item.code, facility: item.name, disabled: false })
+        data.push({ code: item.Family, facility: item.FamilyName, disabled: false })
       });
       return data;
     },

+ 45 - 56
src/components/ledger/lib/floorCascader.vue

@@ -6,7 +6,7 @@
 </template>
 <script>
     import tools from "@/utils/scan/tools"
-    import { getSpaceFloor } from '@/api/scan/request'
+    import { getSpaceFloor, floorQuery, buildingQuery } from '@/api/scan/request'
     import { mapGetters, mapActions } from "vuex"
 
     export default {
@@ -54,63 +54,52 @@
         },
         methods: {
             //获取数据
-            getData() {
-                getSpaceFloor(this.param).then(res => {
-                    if (res.data.Result == 'success') {
-                        let data = this.changeArr(res.data.Content)
-                        console.log(data)
-                        data.unshift({
-                            value: "all",
-                            label: "全部"
-                        }, {
-                            value: "noKnow",
-                            label: "未明确建筑的设备"
-                        })
-                        data.map(item => {
-                            if (!!item.children) {
-                                item.children = tools.sortArr(item.children, "FloorSequenceID", false) //对楼层排序
-                                item.children.unshift({
-                                    value: 'noKnow',
-                                    label: "未明确楼层的设备"
-                                })
-                                item.children.unshift({
-                                    value: "all",
-                                    label: "全部"
-                                })
-                            }
-                            return item
-                        })
-                        this.options = data
-                    } else {
-                        this.$message.error(res.data.ResultMsg)
-                    }
-                }).catch(() => {
-                    this.$message.error("请求出错")
-                })
-            },
-            //将数组转换成optiosn格式
-            changeArr(arr) {
-                return arr.map(item => {
-                    if (item.floors && item.floors.length && this.type == "yes") {
-                        return {
-                            value: item.id,
-                            label: item.infos.BuildLocalName,
-                            children: item.floors.map(i => {
-                                return {
-                                    value: i.id,
-                                    label: i.infos.FloorLocalName,
-                                    FloorSequenceID: i.infos.FloorSequenceID
-                                }
-                            })
-                        }
-                    } else {
+            async getData() {
+                let data, params = {
+                    PageNumber: 1,
+                    PageSize: 500
+                }
+                await buildingQuery(params, res => {
+                    let builData = res.Content
+                    data = builData.map(build => {
                         return {
-                            value: item.id,
-                            label: item.infos.BuildLocalName,
-                            children: null,
-                            isChilren: 1,
+                            value: build.BuildID,
+                            label: build.BuildLocalName
                         }
-                    }
+                    })
+                    data.unshift({
+                        value: "all",
+                        label: "全部"
+                    }, {
+                        value: "noKnow",
+                        label: "未明确建筑的设备"
+                    })
+                })
+                await floorQuery(params, res => {
+                    let floorData = tools.sortArr(res.Content, "FloorSequenceID", false) //对楼层排序
+                    data.forEach(build => {
+                        floorData.forEach(floor => {
+                            if (build.value == floor.BuildID && this.type == "yes") {
+                                if (build.children) {
+                                    build.children.push({
+                                        value: floor.FloorID,
+                                        label: floor.FloorLocalName,
+                                        FloorSequenceID: floor.FloorSequenceID
+                                    })
+                                } else {
+                                    build.children = []
+                                    build.children.push({
+                                        value: "all",
+                                        label: "全部"
+                                    },{
+                                        value: 'noKnow',
+                                        label: "未明确楼层的设备"
+                                    })
+                                }
+                            }
+                        })
+                    })
+                    this.options = data
                 })
             },
             //改变item

+ 3 - 6
src/views/ledger/property/index.vue

@@ -1,6 +1,3 @@
-<!--
-    设备清单
--->
 <template>
   <div id="deviceList">
     <saga-title :mess="mess"></saga-title>
@@ -132,7 +129,7 @@ export default {
         this.param.floorId = null
       }
       if (!!this.param.deviceId) {
-          if(this.$refs.tableMain)
+        if(this.$refs.tableMain)
         this.$refs.tableMain.getHeaderData(this.param);
       } else {
         return;
@@ -146,7 +143,7 @@ export default {
       this.param.deviceId = val.code
       this.getNumber()
       if (!!this.param.deviceId) {
-          if(this.$refs.tableMain)
+        if(this.$refs.tableMain)
         this.$refs.tableMain.getHeaderData(this.param);
       }
     },
@@ -156,7 +153,7 @@ export default {
       console.log(value)
       this.param.deviceId = value.code
       if (!!value) {
-          if(this.$refs.tableMain)
+        if(this.$refs.tableMain)
         this.$refs.tableMain.getHeaderData(this.param);
       } else {
         return;