Merge remote-tracking branch 'origin/dev' into dev

src/views/dataBoard/renfang/cpts/fwgl.vue

@@ -124,7 +124,7 @@ export default {
       this.barInitState = true;
     },
     async getData() {
-      await this.getInfo();
+      // await this.getInfo();
       this.getPie();
       // this.getBar();
 

src/views/dataBoard/renfang/cpts/jmgl.vue

@@ -119,8 +119,8 @@ export default {
       this.barInitState = true;
     },
     async getData() {
-      await this.getInfo();
+      // await this.getInfo();
-      this.getBar();
+      // this.getBar();
       this.getPie();
     },
     getBar() {

src/views/dataBoard/renfang/cpts/rkfx.vue

@@ -34,9 +34,7 @@ import screenEchartsFrame from "@/views/dataBoard/cpts/screen-echarts-frame/inde
 import {
   pieOption
 } from "./rkfxPieOption.js";
-import {
+import {requestPost} from "@/js/dai/request";
-  requestPostBi
-} from "@/js/dai/request-bipass";
 import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue";
 
 export default {
@@ -149,28 +147,24 @@ export default {
     },
     // 获取房屋总数等
     async getInfo() {
-      const url = "resident_analyze";
+      const url = "/actual/base/peopleRoomOverview/getresidentAnalyze";
       this.$refs.pieChart.showLoading();
       const {
         data,
         code,
         msg
-      } = await requestPostBi(url, {
+      } = await requestPost(url, {
-        queryParam: {
+        org_id: this.orgId
-          org_id: this.orgId,
-        },
       }, {
         // mockId: 60041615,
       });
       this.$refs.pieChart.hideLoading();
       if (code === 0) {
-        if (data && Array.isArray(data) && data.length > 0) {
+        let info = data;
-          let info = data[0];
           this.info = {
             ...this.info,
             ...info
           };
-        }
       } else {
         this.$message.error(msg);
       }