diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index f0dad1cc1..d4d93f9ef 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -581,10 +581,10 @@ export default {
getRentFlag(type) {
const rentFlag = new Map([
- ["0", "出租"],
- ["1", "自住"],
+ ["0", "自住"],
+ ["1", "出租"],
["2", "闲置"],
- ["3", "未售出"],
+ ["3", "未出售"],
]);
return rentFlag.get(type);
},
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 0664e1ee3..d1704d40a 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -722,31 +722,25 @@ export default {
//居民分类分析数据
async getResiCategoryData() {
- const url = "resident_class_statics";
-
- const { data, code, msg } = await requestPostBi(
- url,
- {
- queryParam: {
- org_id: this.orgId,
- },
- },
- {
- // mockId: 60031937,
- }
- );
-
+ const url = "/actual/base/resiCategory/categoryCountList";
+ let params = {
+ // id: this.orgData.id,
+ // level: "agency",
+ };
+ const { data, code, msg } = await requestGet(url, params);
if (code === 0) {
- this.resiCategoryData = data.map((item) => {
- return {
- code: item.label_id,
- name: item.label,
- count: item.count,
- ratio: item.ratio,
- growth: item.growth,
- growthAbs: Math.abs(item.growth),
- };
- });
+ if (data) {
+ this.resiCategoryData = data.categoryList.map((item) => {
+ return {
+ code: item.categoryName,
+ name: resiCategoryMap[item.categoryName] || "",
+ count: item.categoryCount,
+ ratio: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
+ growth: 0,
+ growthAbs: Math.abs(item.growth),
+ };
+ });
+ }
} else {
this.$message.error(msg);
}
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c8ce8c334..b9bd516fe 100644
--- a/src/views/modules/base/resi.vue
+++ b/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,
diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue
index f44180e0c..240c1fdee 100644
--- a/src/views/modules/base/virtualResi.vue
+++ b/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,
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 0f0b06f59..7f76ce9ce 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/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" },
+ ]
};
},
},
diff --git a/src/views/modules/portrayal/loudong/cpts/buildingTable.vue b/src/views/modules/portrayal/loudong/cpts/buildingTable.vue
deleted file mode 100644
index af3a15433..000000000
--- a/src/views/modules/portrayal/loudong/cpts/buildingTable.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/modules/portrayal/loudong/cpts/house.vue b/src/views/modules/portrayal/loudong/cpts/house.vue
deleted file mode 100644
index af3a15433..000000000
--- a/src/views/modules/portrayal/loudong/cpts/house.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/modules/portrayal/loudong/cpts/unit.vue b/src/views/modules/portrayal/loudong/cpts/unit.vue
deleted file mode 100644
index af3a15433..000000000
--- a/src/views/modules/portrayal/loudong/cpts/unit.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-