From c50154a35f60d6963dd6ec8dd29b4e0e698850cc Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Mon, 6 Jun 2022 14:47:45 +0800
Subject: [PATCH 1/5] el-radio__inner

---
 .../stats/factagencyuserhousedaily.vue        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 917751d6..ab707517 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -17,12 +17,12 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" popper-class="cascader-block">
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.objectId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
                 <!-- <span class="block"></span> -->
-                <span>{{ data.agencyName }}</span>
-                <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
+                <span>{{ data.objectName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
               </div>
             </template>
           </el-cascader>
@@ -114,9 +114,9 @@ export default {
   },
   methods: {
     cascaderClick (nodeData) {
-      this.dataForm.agencyId = nodeData.agencyId;
-      this.dataForm.level = nodeData.level
-      this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
+      this.dataForm.objectId = nodeData.objectId;
+      this.dataForm.objectType = nodeData.objectType
+      this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
       this.$refs.cascaderUnit.computePresentText();
       this.$refs.cascaderUnit.toggleDropDownVisible(false);
       
@@ -124,16 +124,17 @@ export default {
     getGridList() {
       const { user } = this.$store.state
       this.$http
-              .post('/gov/org/customeragency/agencygridtree')
+              .post('/gov/org/icServiceProject/service/serviceScopeTree')
               .then(({ data: res }) => {
                 if (res.code !== 0) {
                   return this.$message.error(res.msg)
                 } else {
                   console.log('获取查询详情成功', res.data)
                   // this.optionsA = res.data
+                  // console.log(this.optionsA);
                   this.optionsA.push(res.data)
-                  this.dataForm.agencyId = res.data.agencyId
-                  this.dataForm.level = res.data.level
+                  this.dataForm.objectId = res.data.objectId
+                  this.dataForm.objectType = res.data.objectType
                 }
               })
               .catch(() => {

From 577630fc396fe3a8dc7d5eca28e88bfcc953e55f Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Tue, 7 Jun 2022 11:05:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/stats/factagencyuserhousedaily.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 858c9eaf..cdb0e4ff 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -18,7 +18,7 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.objectId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
                 <!-- <span class="block"></span> -->
@@ -198,8 +198,8 @@ export default {
       })
     },
     cascaderClick (nodeData) {
-      this.dataForm.objectId = nodeData.objectId;
-      this.dataForm.objectType = nodeData.objectType
+      this.dataForm.agencyId = nodeData.objectId;
+      this.dataForm.level = nodeData.objectType
       this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
       this.$refs.cascaderUnit.computePresentText();
       this.$refs.cascaderUnit.toggleDropDownVisible(false);
@@ -217,8 +217,8 @@ export default {
                   // this.optionsA = res.data
                   // console.log(this.optionsA);
                   this.optionsA.push(res.data)
-                  this.dataForm.objectId = res.data.objectId
-                  this.dataForm.objectType = res.data.objectType
+                  this.dataForm.agencyId = res.data.objectId
+                  this.dataForm.level = res.data.objectType
                 }
               })
               .catch(() => {

From d6753be5de235f34ed1298bdebda53168faecdc2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 7 Jun 2022 13:24:04 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index cdb0e4ff..dc4f4688 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -56,19 +56,19 @@
         </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
-        <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="100" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="110" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"

From 6983d224a7a7d0acaa86631e599edcd696a556ec Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 8 Jun 2022 13:40:12 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/stats/factagencyuserhousedaily.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index dc4f4688..1ad955e1 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -3,7 +3,7 @@
     <div class="mode-block resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="组织机构" label-width="100px"
+        <el-form-item label="所属组织" label-width="100px"
                       prop="agencyId">
           <!-- <el-select
                   v-model.trim="dataForm.agencyId"

From b647bcd4aeb521e516811b1ff29e63f51aa15816 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 8 Jun 2022 16:27:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=8D=A2=E5=80=9F=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/stats/factagencyuserhousedaily.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 1ad955e1..5cabb481 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -208,7 +208,7 @@ export default {
     getGridList() {
       const { user } = this.$store.state
       this.$http
-              .post('/gov/org/icServiceProject/service/serviceScopeTree')
+              .post('/gov/org/userhouse/service/serviceScopeTree')
               .then(({ data: res }) => {
                 if (res.code !== 0) {
                   return this.$message.error(res.msg)