Merge remote-tracking branch 'origin/jw_feature_dev' into jw_feature_zhanlibiao

src/views/dataBoard/overview/index.vue

@@ -8,13 +8,13 @@
     <div class="g-row">
       <div class="g-left">
         <div class="m-box">
-          <Title text="街道介绍" />
-          <Jdjs />
+          <title-box text="街道介绍" />
+          <jdjs />
         </div>
 
-        <div class="m-box">
-          <Title text="街道图谱画像" />
-          <Jdtphx />
+        <div class="m-box">vervie
+          <title-box text="街道图谱画像" />
+          <jdtphx />
         </div>
       </div>
 
@@ -29,49 +29,49 @@
           />
         </div>
         <div class="m-box m-rybox">
-          <Title text="XX街道网格员" />
+          <title-box text="XX街道网格员" />
           <jdwgy />
         </div>
       </div>
 
       <div class="g-right">
         <div class="m-box">
-          <Title text="人房数据统计" />
+          <title-box text="人房数据统计" />
           <rfsjtj />
         </div>
 
         <div class="m-box">
-          <Title text="各社区人房数据更新排行">
+          <title-box text="各社区人房数据更新排行">
             <span class="date-span">
               <el-date-picker
                 v-model="rfphDate"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
-                @change="change"
+                @change="changeDate"
                 type="month"
                 :clearable="false"
                 placeholder="选择月"
               >
               </el-date-picker>
             </span>
-          </Title>
+          </title-box>
           <sqrfph />
         </div>
         <div class="m-box">
-          <Title text="各社区12345投诉事件统计">
+          <title-box text="各社区12345投诉事件统计">
             <span class="date-span">
               <el-date-picker
                 v-model="rfphDate"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
-                @change="change"
+                @change="changeDate"
                 type="month"
                 :clearable="false"
                 placeholder="选择月"
               >
               </el-date-picker>
             </span>
-          </Title>
+          </title-box>
           <sq12345 />
         </div>
       </div>
@@ -85,9 +85,9 @@
 import gridMap from "@/views/dataBoard/cpts/map/index";
 import cptBread from "@/views/dataBoard/renfang/cpts/bread";
 import cptLoading from "@/views/dataBoard/cpts/loading";
-import Title from "@/views/dataBoard/satisfactionEval/components/Title";
-import Jdjs from "@/views/dataBoard/overview/components/jdjs.vue";
-import Jdtphx from "@/views/dataBoard/overview/components/jdtphx.vue";
+import titleBox from "@/views/dataBoard/satisfactionEval/components/Title";
+import jdjs from "@/views/dataBoard/overview/components/jdjs.vue";
+import jdtphx from "@/views/dataBoard/overview/components/jdtphx.vue";
 import mapTop from "@/views/dataBoard/overview/components/map-top.vue";
 import jdwgy from "@/views/dataBoard/overview/components/jdwgy.vue";
 import rfsjtj from "@/views/dataBoard/overview/components/rfsjtj.vue";
@@ -97,17 +97,6 @@ import { requestPostBi } from "@/js/dai/request-bipass";
 import { requestPost } from "@/js/dai/request";
 import getQueryPara from "dai-js/modules/getQueryPara";
 
-function iniGetPerInfo() {
-  return {
-    unemployed_ratio: "--",
-    crowd_ratio: "--",
-    volunteer_ratio: "--",
-    month_update_ratio: "--",
-    aged_ratio: "--",
-    teenagers_ratio: "--",
-  };
-}
-
 export default {
   name: "renfang",
 
@@ -115,9 +104,9 @@ export default {
     gridMap,
     cptLoading,
     cptBread,
-    Title,
-    Jdjs,
-    Jdtphx,
+    titleBox,
+    jdjs,
+    jdtphx,
     mapTop,
     jdwgy,
     rfsjtj,
@@ -167,15 +156,14 @@ export default {
 
       //加载组织数据
       this.loading = false;
-      // await this.loadOrgData();
       await this.getMapData();
       await this.getSubMapData();
-      this.getResiCategoryData();
-      this.getPerInfo();
 
       this.loading = true;
     },
-
+    changeDate(e){
+      this.rfphDate=e;
+    },
     handleClickDotBtn(type, info) {
       console.log("handleClickDotBtn", type, info);
       if (type == "watch-resi") {
@@ -190,7 +178,6 @@ export default {
     },
 
     clickAgencyItem(item) {
-      console.log('clickAgencyItem(item)::',item);
       this.toBread({
         orgId: item.id,
         orgLevel: item.level,
@@ -199,7 +186,6 @@ export default {
     },
 
     toBread(item) {
-      console.log("toBread::", item);
       const { orgId } = item;
       const { breadList } = this;
       let index = breadList.findIndex((val) => val.orgId === orgId);