Merge branch 'fax' into dev

# Conflicts:
#	src/views/modules/home/index.vue

src/views/modules/base/community/community.vue

@@ -367,20 +367,20 @@ export default {
       });
     }
     this.treeLoading = false;
-
     if (this.$route.query.param1 === 'zizhuM') {
         this.rentFlag = '0';
+        this.handleSearch()
       } else if (this.$route.query.param1 === 'chuzuM') {
         this.rentFlag = '1';
+        this.handleSearch()
       } else if (this.$route.query.param1 === 'xianzhiM') {
         this.rentFlag = '2';
-    }
-    if (this.rentFlag !== '') {
         this.handleSearch()
-      // console.log("this.rentFlag", this.rentFlag)
+      } else if (this.$route.query.param1 === 'zongshu') {
+        this.rentFlag = '';
+        this.handleSearch()
       }
 
-
   },
   computed: {
     rowHeight() {
@@ -412,6 +412,22 @@ export default {
     // filterText (val) {
     //   this.$refs.ref_tree.filter(val);
     // },
+    '$route.query.param1': function (newVal, oldVal) {
+      if (this.$route.query.param1 === 'zizhuM') {
+        this.rentFlag = '0';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'chuzuM') {
+        this.rentFlag = '1';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'xianzhiM') {
+        this.rentFlag = '2';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'zongshu') {
+        this.rentFlag = '';
+        this.handleSearch()
+        // this.getValiheList()
+      }
+    },
     updateStartDate() { }
   },
   methods: {
@@ -419,7 +435,6 @@ export default {
       var target = event.target;
       let textLength = target.clientWidth;
       let containerLength = target.scrollWidth;
-
       if (textLength < containerLength) {
         this.tooltipTitle = event.target.innerText;
         this.isShowTooltip = false;
@@ -476,7 +491,6 @@ export default {
         isPage: false,
       };
       const { data, code, msg } = await requestPost(url, params);
-
       if (code === 0) {
         this.optionsV = data;
         this.neighborHoodId = "";
@@ -693,6 +707,7 @@ export default {
         }, 200);
         return false
       }
+    
       this.treeIsOk = false
       this.ownerName = "";
       this.ownerPhone = "";
@@ -708,7 +723,6 @@ export default {
       this.vDisabled = false;
       this.bDisabled = false;
       console.log(obj);
-
       if (obj.level === "building") {
         //点击楼栋 
 

src/views/modules/home/index.vue

@@ -30,7 +30,10 @@
           <div class="mewq">
             <div class="boxss">
               <div style="margin-top: 10px;" @click="handelClickToResi">
-                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.totalResidents }}</span>
+                <span style="color: #2683DB; font-size: 25px;">
+                  {{ pandectData.totalResidents }}
+                </span>
+
                 <br>
                 <span style="color: #858585; font-size: 12px;">居民总数</span>
               </div>
@@ -50,7 +53,7 @@
               </div>
             </div>
             <div class="boxss">
-              <div style="margin-top: 10px;" @click="jumpToHouse()">
+              <div style="margin-top: 10px;" @click="jumpToHouse('zongshu')">
                 <span style="color: #2683DB; font-size: 25px;">{{ pandectData.homeCount }}</span>
                 <br>
                 <span style="color: #858585; font-size: 12px;">房屋总数</span>
@@ -76,7 +79,6 @@
                 <br>
                 <span style="color: #858585; font-size: 12px;">闲置房屋</span>
               </div>
-
             </div>
           </div>
         </div>
@@ -153,7 +155,8 @@
               style="margin-top: 10px;" v-show="showAll" @click="jumpToJuMin()"><img referrerpolicy="no-referrer"
                 src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</span>
           </div>
-          <el-table :data="tableList" style="width: 100%;margin-top:26px;overflow-y: scroll;"  :height="maxTableHeight" border :cell-style="columnbackgroundStyle" class="m-table-item">
+          <el-table :data="tableList" style="width: 100%;margin-top:26px;overflow-y: scroll;" :height="maxTableHeight"
+            border :cell-style="columnbackgroundStyle" class="m-table-item">
             <el-table-column label="居民类别" align="center" width="105">
               <template slot-scope="scope">
                 <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
@@ -176,7 +179,9 @@
             </el-table-column>
             <el-table-column label="更新周期" align="center" width="105">
               <template slot-scope="scope">
-                  <span style="color:#989898;">{{scope.row.updatePeriod?scope.row.updatePeriod =='month'?'每自然月':scope.row.updatePeriod =='halfMonth'?'每半自然月':scope.row.updatePeriod =='week'?'每周':'':''}}</span>
+                <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
+                == 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' : scope.row.updatePeriod
+                  == 'week' ? '每周' : '' : '' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="更新人数" align="center" width="105">
@@ -223,16 +228,6 @@ export default {
         list: [],
       },
       tableList: [
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '保障房人员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
-        // { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
       ],
       znycCategory: {
         loading: false,
@@ -311,6 +306,7 @@ export default {
       deep: true,
       immediate: true,
     },
+
   },
   created() {
   },
@@ -332,6 +328,13 @@ export default {
     );
   },
   methods: {
+    formatNumber(number) {
+      if (typeof number === 'string') {
+        // 如果是字符串，去除非数字字符并转为数字类型
+        number = parseInt(number.replace(/\D/g, ''), 10);
+      }
+      return number.toLocaleString();
+    },
     initChart() {
       this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => {
         this.myChart = echarts.init(document.getElementById("my_chart"));
@@ -527,6 +530,7 @@ export default {
     },
     //
     jumpToHouse(e) {
+
       this.$router.push({
         path: "/main/base-community-community",
         query: {
@@ -720,6 +724,7 @@ export default {
               type: 'shadow'
             }
           },
+
           legend: {
             x: 'center',
             bottom: '8%',
@@ -779,6 +784,7 @@ export default {
               resiCategory: e.data.extraProperty,
             }
           });
+          // 
 
         });
       });