Parcourir la source

'添加设备类别筛选接口'

zhangyu il y a 4 ans
Parent
commit
525c52cd13
2 fichiers modifiés avec 10 ajouts et 11 suppressions
  1. 5 5
      src/api/scan/request.js
  2. 5 6
      src/components/ledger/lib/cascader.vue

+ 5 - 5
src/api/scan/request.js

@@ -1226,7 +1226,7 @@ export function sysUnlinkEquip(param, success) {
 
 //设备清单 - 统计项目下所有设备数量
 export function countEquip(param, success) {
-  let url = `${baseUrl}/datacenter/object/equip/count`;
+  let url = `${baseUrl}/datacenter/equip/count`;
   http.postJson(url, param, success)
 }
 
@@ -1413,7 +1413,7 @@ export function countGeneralSys(param, success) {
 //头部信息查询(查询所有设备类型-所有部件类型-所有系统类型-所有专业类型)
 export function queryPhysicsAllType(param, success) {
   let url = `${baseUrl}/datacenter/class-def/category?type=${param}`;
-  http.postJson(url, {type:param }, success)
+  http.postJson(url, {}, success)
 }
 
 //查询所有设备族信息
@@ -1574,7 +1574,7 @@ export function projectQuery(param, success) {
 
 //查询楼层信息
 export function floorQuery(param, success) {
-  let url = `${baseUrl}/datacenter/object/floor/query`;
+  let url = `${baseUrl}/datacenter/floor/query`;
   http.postJson(url, param, success)
 }
 
@@ -1586,7 +1586,7 @@ export function floorQueryAndSign(param, success) {
 
 //查询建筑信息
 export function buildingQuery(param, success) {
-  let url = `${baseUrl}/datacenter/object/building/query`;
+  let url = `${baseUrl}/datacenter/building/query`;
   http.postJson(url, param, success)
 }
 
@@ -2278,4 +2278,4 @@ export function objectDeleteBuild(param, success) {
 export function problemQuery(param, success) {
   let url = `${baseUrl}/datacenter/problems/query`
   http.postJson(url, param, success)
-}
+}

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

@@ -95,11 +95,10 @@ export default {
       })
       Promise.all([promise1, promise2]).then((res) => {
         let allData = res[0], data = res[1]
-        debugger
-        this.options = this.formatOptions(allData.Content)
+        this.options = this.formatOptions(allData.content)
         if (!this.all) {
-          this.content = data.Content.map(t => {
-            return t.Category
+          this.content = data.content.map(t => {
+            return t.classCode
           });
           this.filterForOptions();
         }
@@ -113,8 +112,8 @@ export default {
       let data = [];
       arr.map(t => {
         let temp = {};
-        temp.code = t.EquipCode;
-        temp.facility = t.EquipName;
+        temp.code = t.code;
+        temp.facility = t.name === t.aliasName?t.name:`${t.name}(${t.aliasName})`;
         data.push(temp)
       })
       return data;