From bb57fd7513da33bea41be25bc8f2d28a8d8242fd Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Wed, 29 Nov 2023 16:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF=E5=B0=86?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E9=A2=84=E8=AD=A6=E7=9A=84=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BAPC=E7=AE=A1=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=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/rkyj.vue | 21 ++++++++++-----------
 src/views/dataBoard/renfang/index.vue     | 12 ++++++------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/views/dataBoard/renfang/cpts/rkyj.vue b/src/views/dataBoard/renfang/cpts/rkyj.vue
index e8d375d5a..f15a48db9 100644
--- a/src/views/dataBoard/renfang/cpts/rkyj.vue
+++ b/src/views/dataBoard/renfang/cpts/rkyj.vue
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-import { requestPostBi } from "@/js/dai/request-bipass";
+import { requestPost } from "@/js/dai/request";
 
 export default {
 	props: {
@@ -126,18 +126,17 @@ export default {
 		},
 
 		async getList() {
-			const url = "resident_class_warn";
 
-			const { data, code, msg } = await requestPostBi(
+			const url = "/actual/base/peopleRoomOverview/getResidentClassWarnAnalyzed";
+
+			let params = {
+				org_id: this.orgId,
+				level:"agency",
+				};
+
+			const { data, code, msg } = await requestPost(
 				url,
-				{
-					queryParam: {
-						org_id: this.orgId,
-					},
-				},
-				{
-					// mockId: 60040087,
-				}
+				params
 			);
 
 			if (code === 0) {
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 6d02a9281..a3db2e175 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -17,7 +17,7 @@
           </div>
 
           <div class="m-subbox">
-            <fwgl ref="fwgl" :orgId="orgData.org_id"></fwgl>
+            <fwgl ref="fwgl" :orgId="orgId"></fwgl>
           </div>
         </div>
 
@@ -31,7 +31,7 @@
           </div>
 
           <div class="m-subbox">
-            <jmgl :orgId="orgData.org_id" ref="jmgl"></jmgl>
+            <jmgl :orgId="orgId" ref="jmgl"></jmgl>
           </div>
         </div>
       </div>
@@ -364,7 +364,7 @@
           </div>
 
           <div class="m-subbox m-szsq">
-            <szsq :orgId="orgData.org_id"></szsq>
+            <szsq :orgId="orgId"></szsq>
           </div>
         </div>
 
@@ -386,7 +386,7 @@
                 orgLevel == 'city',
             }"
           >
-            <rkyj :orgId="orgData.org_id"></rkyj>
+            <rkyj :orgId="orgId"></rkyj>
           </div>
         </div>
         <div class="m-box">
@@ -400,7 +400,7 @@
 
           <div class="m-subbox">
             <rkfx
-              :orgId="orgData.org_id"
+              :orgId="orgId"
               @handelClickRkfxPei="handelClickRkfxPei"
             ></rkfx>
           </div>
@@ -746,7 +746,7 @@ export default {
     async getResiCategoryData() {
       const url = "/actual/base/resiCategory/categoryCountList";
       let params = {
-        // id: this.orgData.id,
+        // id: this.orgId,
         // level: "agency",
       };
       const { data, code, msg } = await requestGet(url, params);