Merge branch 'dev-数据统计' into test

src/views/modules/renFangTongJi/cpts/shequtongji.vue

@@ -20,6 +20,10 @@ export default {
       type: String,
       default: "",
     },
+    orgIds: {
+      type: String,
+      default: "",
+    },
   },
 
   data() {
@@ -28,11 +32,12 @@ export default {
 
       searchParams: [
         {
-          field: "发布范围",
+          field: "选择范围",
           keyName: "org",
           type: "cascader",
           value: "",
-          optionUrl: "/gov/org/customeragency/agencygridtree",
+          //   optionUrl: "/gov/org/customeragency/agencygridtree",
+          optionUrl: "/gov/org/customeragency/my-subagency-list",
           optionUrlParams: {
             agencyId: this.$store.state.user.agencyId,
           },
@@ -88,6 +93,7 @@ export default {
   watch: {},
 
   async mounted() {
+    this.searchParams[0].value = this.orgIds;
     this.searchParams[0].supValues[0] = this.orgId;
     if (this.orgId) {
       this.searchParams[0].supValues[1] = "agency";

src/views/modules/renFangTongJi/index.vue

@@ -97,7 +97,11 @@
       top="5vh"
       @close="displayedDetail = false"
     >
-      <shequtongji ref="shequtongji" :orgId="detailOrgId" />
+      <shequtongji
+        ref="shequtongji"
+        :orgId="detailOrgId"
+        :orgIds="[orgId, detailOrgId]"
+      />
     </el-dialog>
   </el-card>
 </template>
@@ -236,6 +240,8 @@ export default {
 
       if (code === 0) {
         const { list } = this;
+        this.orgId = data.orgId;
+        this.orgType = data.orgType;
         let item1 = list.find((item) => item.name == "人口总数");
         item1.num = data.userTotal;
         item1.variation = parseInt(data.userTotalJSY);