From 4fa99b7c6a2c4024bfcf848bf570c641a93a1e0c Mon Sep 17 00:00:00 2001
From: PLUTO <>
Date: Wed, 1 Nov 2023 10:41:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/cpts/homeDetails/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index c2d877e6c..85e29f78e 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -578,10 +578,10 @@ export default {
getRentFlag(type) {
const rentFlag = new Map([
- ["0", "出租"],
- ["1", "自住"],
+ ["0", "自住"],
+ ["1", "出租"],
["2", "闲置"],
- ["3", "未售出"],
+ ["3", "未出售"],
]);
return rentFlag.get(type);
},
From 6859e6c626a101c71eb33cfb52d707b7e057fe16 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 1 Nov 2023 14:02:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?=
=?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9=E6=AD=A3=E5=88=99=E9=AA=8C?=
=?UTF-8?q?=E8=AF=81=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF=E5=B1=85?=
=?UTF-8?q?=E6=B0=91=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/renfang/index.vue | 42 ++++++++-----------
src/views/modules/base/resi.vue | 1 -
src/views/modules/base/virtualResi.vue | 1 -
.../regionalParty/unitsForm.vue | 3 ++
.../portrayal/loudong/cpts/buildingTable.vue | 28 -------------
.../modules/portrayal/loudong/cpts/house.vue | 28 -------------
.../modules/portrayal/loudong/cpts/unit.vue | 28 -------------
7 files changed, 21 insertions(+), 110 deletions(-)
delete mode 100644 src/views/modules/portrayal/loudong/cpts/buildingTable.vue
delete mode 100644 src/views/modules/portrayal/loudong/cpts/house.vue
delete mode 100644 src/views/modules/portrayal/loudong/cpts/unit.vue
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 7d2b4a14c..d7c7b756e 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1092,7 +1092,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 @@
-
-
-
-
-
-
-
-
-