Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

src/views/dataBoard/cpts/homeDetails/index.vue

@@ -581,10 +581,10 @@ export default {
 
     getRentFlag(type) {
       const rentFlag = new Map([
-        ["0", "出租"],
+        ["0", "自住"],
-        ["1", "自住"],
+        ["1", "出租"],
         ["2", "闲置"],
-        ["3", "未售出"],
+        ["3", "未出售"],
       ]);
       return rentFlag.get(type);
     },

src/views/dataBoard/renfang/index.vue

@@ -722,31 +722,25 @@ export default {
 
     //居民分类分析数据
     async getResiCategoryData() {
-      const url = "resident_class_statics";
+      const url = "/actual/base/resiCategory/categoryCountList";
-
+      let params = {
-      const { data, code, msg } = await requestPostBi(
+        // id: this.orgData.id,
-        url,
+        // level: "agency",
-        {
+      };
-          queryParam: {
+      const { data, code, msg } = await requestGet(url, params);
-            org_id: this.orgId,
-          },
-        },
-        {
-          // mockId: 60031937,
-        }
-      );
-
       if (code === 0) {
-        this.resiCategoryData = data.map((item) => {
+        if (data) {
+          this.resiCategoryData = data.categoryList.map((item) => {
             return {
-            code: item.label_id,
+              code: item.categoryName,
-            name: item.label,
+              name: resiCategoryMap[item.categoryName] || "",
-            count: item.count,
+              count: item.categoryCount,
-            ratio: item.ratio,
+              ratio: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
-            growth: item.growth,
+              growth: 0,
               growthAbs: Math.abs(item.growth),
             };
           });
+        }
       } else {
         this.$message.error(msg);
       }

src/views/modules/base/resi.vue

@@ -1107,7 +1107,6 @@ export default {
         },
 
         async getTableData(obj) {
-            console.log(this.currentPage);
             let params = {
                 pageNo: this.currentPage,
                 pageSize: this.pageSize,

src/views/modules/base/virtualResi.vue

@@ -1083,7 +1083,6 @@ export default {
         },
 
         async getTableData(obj) {
-            console.log(this.currentPage);
             let params = {
                 pageNo: this.currentPage,
                 pageSize: this.pageSize,

src/views/modules/communityParty/regionalParty/unitsForm.vue

@@ -480,6 +480,9 @@ export default {
         longitude: [
           { required: true, message: "坐标不能为空", trigger: "blur" },
         ],
+        serviceMatterList:[
+          { required: true, message: "服务事项不能为空", trigger: "blur" },
+        ]
       };
     },
   },

src/views/modules/portrayal/loudong/cpts/buildingTable.vue

@@ -1,28 +0,0 @@
-<template>
-    <div class=''>
-        
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {};
-    },
-    //创建前
-    created() { },
-    //方法
-    methods: {},
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-
-<style lang="scss" scoped>
-    
-</style>

src/views/modules/portrayal/loudong/cpts/house.vue

@@ -1,28 +0,0 @@
-<template>
-    <div class=''>
-        
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {};
-    },
-    //创建前
-    created() { },
-    //方法
-    methods: {},
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-
-<style lang="scss" scoped>
-    
-</style>

src/views/modules/portrayal/loudong/cpts/unit.vue

@@ -1,28 +0,0 @@
-<template>
-    <div class=''>
-        
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {};
-    },
-    //创建前
-    created() { },
-    //方法
-    methods: {},
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-
-<style lang="scss" scoped>
-    
-</style>