From 95fcc892ef1778c395842b44652f1565878df159 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Wed, 13 Dec 2023 16:32:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88-=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=A3=E5=88=86=E6=9E=90=E7=94=B1=E6=95=B0=E6=8D=AE=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=B0=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BA=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/cpts/fwgl.vue |  2 +-
 src/views/dataBoard/renfang/cpts/jmgl.vue |  4 ++--
 src/views/dataBoard/renfang/cpts/rkfx.vue | 16 +++++-----------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue
index b07715b67..599f7052c 100644
--- a/src/views/dataBoard/renfang/cpts/fwgl.vue
+++ b/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();
 
diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue
index f15d77bab..63dd8cea2 100644
--- a/src/views/dataBoard/renfang/cpts/jmgl.vue
+++ b/src/views/dataBoard/renfang/cpts/jmgl.vue
@@ -119,8 +119,8 @@ export default {
       this.barInitState = true;
     },
     async getData() {
-      await this.getInfo();
-      this.getBar();
+      // await this.getInfo();
+      // this.getBar();
       this.getPie();
     },
     getBar() {
diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue
index 010951383..5f491b578 100644
--- a/src/views/dataBoard/renfang/cpts/rkfx.vue
+++ b/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 {
-  requestPostBi
-} from "@/js/dai/request-bipass";
+import {requestPost} from "@/js/dai/request";
 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, {
-        queryParam: {
-          org_id: this.orgId,
-        },
+      } = await requestPost(url, {
+        org_id: this.orgId
       }, {
         // mockId: 60041615,
       });
       this.$refs.pieChart.hideLoading();
       if (code === 0) {
-        if (data && Array.isArray(data) && data.length > 0) {
-          let info = data[0];
+        let info = data;
           this.info = {
             ...this.info,
             ...info
           };
-        }
       } else {
         this.$message.error(msg);
       }