Browse Source

建筑 设备 楼层相关接口添加

duxiangyu 3 years ago
parent
commit
746c5168fa

+ 0 - 1
src/components/old-adm/ledger/components/lib/equipCascader.vue

@@ -19,7 +19,6 @@
 </template>
 </template>
 <script>
 <script>
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
-// import { getEquipLkSys } from "@/api/dict";
 import Dic from "@/controller/old-adm/dicController";
 import Dic from "@/controller/old-adm/dicController";
 
 
 export default {
 export default {

+ 42 - 53
src/components/old-adm/ledger/components/lib/floorCascader.vue

@@ -63,7 +63,7 @@
                 }
                 }
             },
             },
             //获取数据
             //获取数据
-            getData() {
+            async getData() {
                 let data, buildParams = {
                 let data, buildParams = {
                     pageNumber: 1,
                     pageNumber: 1,
                     pageSize: 1000,
                     pageSize: 1000,
@@ -77,63 +77,52 @@
                     pageNumber: 1,
                     pageNumber: 1,
                     pageSize: 1000
                     pageSize: 1000
                 }
                 }
-                let promise1 = new Promise((resolve, reject) => {
-                    Builder.buildingQuery(buildParams, res => {
-                        resolve(res)
-                    })
+                const values = await Promise.all([Builder.buildingQuery(buildParams), Floor.floorQuery(floorParams)])
+                let builData = values[0].content, floorData = values[1].content
+                data = builData.map(build => {
+                    return {
+                        value: build.id,
+                        label: build.localName
+                    }
                 })
                 })
-                let promise2 = new Promise((resolve, reject) => {
-                    Floor.floorQuery(floorParams, res => {
-                        resolve(res)
-                    })
+                data.unshift({
+                    value: "all",
+                    label: "全部"
+                }, {
+                    value: "noKnow",
+                    label: "未明确建筑"
                 })
                 })
-                Promise.all([promise1, promise2]).then(values => {
-                    let builData = values[0].content, floorData = values[1].content
-                    data = builData.map(build => {
-                        return {
-                            value: build.id,
-                            label: build.localName
-                        }
-                    })
-                    data.unshift({
-                        value: "all",
-                        label: "全部"
-                    }, {
-                        value: "noKnow",
-                        label: "未明确建筑"
-                    })
-                    data.forEach(build => {
-                        floorData.forEach(floor => {
-                            if (build.value == floor.buildingId && floor.id && floor.localName && this.type == "yes") {
-                                if (build.children) {
-                                    build.children.push({
-                                        value: floor.id,
-                                        label: floor.localName,
-                                        FloorSequenceID: floor.floorSequenceID,
-                                        infos: floor.infos || {},
-                                        outline: floor.outline || null,
-                                    })
-                                } else {
-                                    build.children = []
-                                    build.children.push({
-                                        value: "all",
-                                        label: "全部"
-                                    },{
-                                        value: 'noKnow',
-                                        label: "未明确楼层"
-                                    },{
-                                        value: floor.id,
-                                        label: floor.localName,
-                                        FloorSequenceID: floor.floorSequenceID,
-                                        infos: floor.infos || {},
-                                        outline: floor.outline || null,
-                                    })
-                                }
+                data.forEach(build => {
+                    floorData.forEach(floor => {
+                        if (build.value == floor.buildingId && floor.id && floor.localName && this.type == "yes") {
+                            if (build.children) {
+                                build.children.push({
+                                    value: floor.id,
+                                    label: floor.localName,
+                                    FloorSequenceID: floor.floorSequenceID,
+                                    infos: floor.infos || {},
+                                    outline: floor.outline || null,
+                                })
+                            } else {
+                                build.children = []
+                                build.children.push({
+                                    value: "all",
+                                    label: "全部"
+                                },{
+                                    value: 'noKnow',
+                                    label: "未明确楼层"
+                                },{
+                                    value: floor.id,
+                                    label: floor.localName,
+                                    FloorSequenceID: floor.floorSequenceID,
+                                    infos: floor.infos || {},
+                                    outline: floor.outline || null,
+                                })
                             }
                             }
-                        })
+                        }
                     })
                     })
-                    this.options = data
                 })
                 })
+                this.options = data
             },
             },
             //改变item
             //改变item
             changeCascader(value) {
             changeCascader(value) {

+ 2 - 1
src/components/old-adm/ledger/facility/index.vue

@@ -178,7 +178,8 @@ export default {
                 filters: "not propertyId isnull",
                 filters: "not propertyId isnull",
             };
             };
             let [res1, res2] = await Promise.all([Equip.countEquip({filters: ''}), Equip.countEquip(param)])
             let [res1, res2] = await Promise.all([Equip.countEquip({filters: ''}), Equip.countEquip(param)])
-            console.log(res1, res2)
+            this.mess.name[0].num = res1.count
+            this.mess.name[1].num = res2.count;
             // await Equip.countEquip({}, (res) => {
             // await Equip.countEquip({}, (res) => {
             //     console.log(res)
             //     console.log(res)
             //     this.mess.name[0].num = res.count;
             //     this.mess.name[0].num = res.count;

+ 13 - 1
src/controller/old-adm/buildController.ts

@@ -1,9 +1,21 @@
 import FloorController from "./floorController";
 import FloorController from "./floorController";
 import { baseHttpUtils } from "@/utils/http/baseHttpUtils";
 import { baseHttpUtils } from "@/utils/http/baseHttpUtils";
+
+export interface BuildReq {
+  pageNumber: number;
+  pageSize: number;
+  orders: string;
+  projection: string[];
+}
 class BuildController {
 class BuildController {
   static http = new baseHttpUtils();
   static http = new baseHttpUtils();
   static pre = "/datacenter/object";
   static pre = "/datacenter/object";
-  static async buildingQuery(params) {
+  /**
+   * 获取建筑信息
+   * @param {BuildReq} params
+   * @returns
+   */
+  static async buildingQuery(params: BuildReq) {
     return await this.http.postRequest(this.pre + "/building/query", params);
     return await this.http.postRequest(this.pre + "/building/query", params);
   }
   }
   static async getData(buildFloorData) {
   static async getData(buildFloorData) {

+ 0 - 1
src/controller/old-adm/equipController.ts

@@ -16,7 +16,6 @@ class Equip {
    */
    */
   static async countEquip(params: Count) {
   static async countEquip(params: Count) {
     return await this.http.postRequest(this.pre + "/equip/count", params);
     return await this.http.postRequest(this.pre + "/equip/count", params);
-    // return {};
   }
   }
 }
 }
 
 

+ 16 - 1
src/controller/old-adm/floorController.ts

@@ -1,4 +1,19 @@
+import { baseHttpUtils } from "@/utils/http/baseHttpUtils";
+export interface QueryReq {
+  orders: string;
+  pageNumber: number;
+  pageSize: number;
+}
 class FloorController {
 class FloorController {
-  static async floorQuery(params?: any) {}
+  static http = new baseHttpUtils();
+  static pre = "/datacenter/object";
+  /**
+   * 获取建筑楼层
+   * @param {QueryReq} params
+   * @returns
+   */
+  static async floorQuery(params: QueryReq) {
+    return this.http.postRequest(this.pre + "/floor/query", params);
+  }
 }
 }
 export default FloorController;
 export default FloorController;

+ 1 - 1
src/utils/authUtils.ts

@@ -59,7 +59,7 @@ export class authUtils {
     var projects = [];
     var projects = [];
     _userInfo.projects.forEach((_c) => {
     _userInfo.projects.forEach((_c) => {
       projects.push({
       projects.push({
-        id: _c.projectLocalID,
+        id: _c.projectId,
         name: _c.projectLocalName,
         name: _c.projectLocalName,
         groupCode: _c.groupCode,
         groupCode: _c.groupCode,
       });
       });

+ 84 - 79
src/utils/http/axiosUtils.ts

@@ -3,96 +3,101 @@
  * nh 2021.12.23
  * nh 2021.12.23
  */
  */
 
 
+import axios from "axios";
+import vueStore from "@/store";
 
 
-import axios from 'axios'
-import vueStore from '@/store'
-
-var CancelToken = axios.CancelToken
-var cancel
+var CancelToken = axios.CancelToken;
+var cancel;
 
 
 // 创建axios实例
 // 创建axios实例
 const axiosservice = axios.create({
 const axiosservice = axios.create({
-    timeout: 3000000, // 请求超时时间
-    cancelToken: new CancelToken(function executor(c) {
-        // executor 函数接收一个 cancel 函数作为参数
-        cancel = c
-    })
-})
+  timeout: 3000000, // 请求超时时间
+  cancelToken: new CancelToken(function executor(c) {
+    // executor 函数接收一个 cancel 函数作为参数
+    cancel = c;
+  }),
+});
 
 
 axiosservice.interceptors.request.use(
 axiosservice.interceptors.request.use(
-    config => {
-        return config
-    },
-    error => {
-        return Promise.reject(error)
-    }
-)
+  (config) => {
+    return config;
+  },
+  (error) => {
+    return Promise.reject(error);
+  }
+);
 
 
 axiosservice.interceptors.response.use(
 axiosservice.interceptors.response.use(
-    function (res) {
-        //在这里对返回的数据进行处理
-        let resp = res.data
-        return res
-    },
-    function (err) {
-        console.log('axios interceptors err = ', err)
-        return Promise.reject(err)
-    }
-)
+  function (res) {
+    //在这里对返回的数据进行处理
+    let resp = res.data;
+    return res;
+  },
+  function (err) {
+    console.log("axios interceptors err = ", err);
+    return Promise.reject(err);
+  }
+);
 
 
 export class axiosUtils {
 export class axiosUtils {
-    /**
-     * get请求
-     * @param url 
-     * @param data 
-     * @returns 
-     */
-    protected async getRequest(url: string, data: any) {
-        try {
-            let response = await this.customRequest(url, {}, data, 'get');
-            return response.data;
-        } catch (err) {
-            throw err
-        }
-    };
+  /**
+   * get请求
+   * @param url
+   * @param data
+   * @returns
+   */
+  protected async getRequest(url: string, data: any) {
+    try {
+      let response = await this.customRequest(url, {}, data, "get");
+      return response.data;
+    } catch (err) {
+      throw err;
+    }
+  }
 
 
-    /**
-     * post请求
-     * @param url 
-     * @param data 
-     * @returns 
-     */
-    protected async postRequest(url: string, data: any) {
-        try {
-            let response = await this.customRequest(url, {}, data, 'post');
-            return response.data;
-        } catch (err) {
-            throw err
-        }
-    };
+  /**
+   * post请求
+   * @param url
+   * @param data
+   * @returns
+   */
+  protected async postRequest(url: string, data: any) {
+    try {
+      let response = await this.customRequest(url, {}, data, "post");
+      return response;
+    } catch (err) {
+      throw err;
+    }
+  }
 
 
-    /**
-     * 自定义请求
-     * @param url 
-     * @param headers 
-     * @param data 
-     * @param method get | post  默认post
-     * @returns 
-     */
-    protected async customRequest(url: string, headers: any, data: any, method: string = 'post') {
-        try {
-            headers = headers || {};
-            headers.groupCode = headers.groupCode || vueStore.state.selectProject.groupCode;
-            headers.projectId= headers.projectId || vueStore.state.selectProject.id;
-            let response = await axiosservice({
-                url,
-                headers: headers || {},
-                data,
-                method: method == 'post' ? 'post' : 'get'
-            })
-            return response.data
-        } catch (err) {
-            throw err
-        }
+  /**
+   * 自定义请求
+   * @param url
+   * @param headers
+   * @param data
+   * @param method get | post  默认post
+   * @returns
+   */
+  protected async customRequest(
+    url: string,
+    headers: any,
+    data: any,
+    method: string = "post"
+  ) {
+    try {
+      headers = headers || {};
+      headers.groupCode =
+        headers.groupCode || vueStore.state.selectProject.groupCode;
+      headers.projectId = headers.projectId || vueStore.state.selectProject.id;
+      let response = await axiosservice({
+        url,
+        headers: headers || {},
+        data,
+        method: method == "post" ? "post" : "get",
+      });
+      return response.data;
+    } catch (err) {
+      throw err;
     }
     }
+  }
 }
 }