{{ pandectData.floatingResiCount }}
diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue
index 84cec1421..34af53296 100644
--- a/src/views/dataBoard/renfang/house/list.vue
+++ b/src/views/dataBoard/renfang/house/list.vue
@@ -36,7 +36,7 @@
import cptTb from "@/views/dataBoard/cpts/tb";
import cptBread from "@/views/dataBoard/renfang/cpts/bread";
import houseDetails from "@/views/dataBoard/cpts/house-details";
-import { requestPostBi } from "@/js/dai/request-bipass";
+import { requestPost } from "@/js/dai/request";
import getQueryPara from "dai-js/modules/getQueryPara";
export default {
@@ -69,7 +69,7 @@ export default {
orgLevel: "",
org_id: "",
- houseType: "", // 流动 常驻 全部
+ houseType: 0, // 流动 常驻 全部
loading: true,
pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20,
@@ -156,7 +156,6 @@ export default {
this.tableTitle = type_name + "房屋列表";
this.pageNo = 1;
this.getList();
- this.getCount();
},
methods: {
handleRouter() {
@@ -174,7 +173,7 @@ export default {
showInfo(index) {
let item = this.srcTableData[index];
- this.displayedHouseId = item.house_id;
+ this.displayedHouseId = item.houseId;
},
handlePageNoChange(pageNo) {
@@ -193,17 +192,16 @@ export default {
const { org_id, houseType, pageNo, pageSize } = this;
this.loading = true;
- const url = "house_list";
+ const url = "/actual/base/communityHouse/listHouses";
- const { data, code, msg } = await requestPostBi(
+ const { data, code, msg } = await requestPost(
url,
{
- queryParam: {
- org_id,
- type: houseType,
+ id:org_id,
+ rentFlag: this.houseType,
+ level: "agency",
pageNo,
pageSize,
- },
},
{
// mockId: 60068051,
@@ -213,51 +211,27 @@ export default {
this.loading = false;
if (code === 0) {
- this.srcTableData = data;
- // this.total = data.total;
+ this.srcTableData = data.list;
+ this.total = data.total;
- this.list = data.map((item, index) => {
+ this.list = data.list.map((item, index) => {
return [
index + 1,
- item.village ? item.village : "--",
- item.building ? item.building : "--",
- item.unit ? item.unit : "--",
- item.door ? item.door : "--",
- item.house_type ? item.house_type : "--",
- item.house_usage ? item.house_usage : "--",
- item.house_state ? item.house_state : "--",
- item.holder_name ? item.holder_name : "--",
- item.holder_phone ? item.holder_phone : "--",
- item.holder_idcard ? item.holder_idcard : "--",
+ item.neighborHoodName ? item.neighborHoodName : "--",
+ item.buildingName ? item.buildingName : "--",
+ item.unitNum ? item.unitNum : "--",
+ item.houseName ? item.houseName : "--",
+ item.houseType ? item.houseType : "--",
+ item.purpose ? item.purpose : "--",
+ item.rentFlag ? item.rentFlag : "--",
+ item.ownerName ? item.ownerName : "--",
+ item.ownerPhone ? item.ownerPhone : "--",
+ item.ownerIdCard ? item.ownerIdCard : "--",
{ type: "operate", list: ["查看"] },
];
});
- } else {
- this.$message.error(msg);
- }
- },
- async getCount() {
- const { org_id, houseType, pageNo, pageSize } = this;
- const url = "house_list_total";
-
- const { data, code, msg } = await requestPostBi(
- url,
- {
- queryParam: {
- org_id,
- type: houseType,
- pageNo,
- pageSize,
- },
- },
- {
- // mockId: 63070189,
- }
- );
-
- if (code === 0) {
- this.total = parseInt(data[0].count);
+
} else {
this.$message.error(msg);
}
diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue
index fc22d2bc5..fa0346fd7 100644
--- a/src/views/dataBoard/renfang/resi/list.vue
+++ b/src/views/dataBoard/renfang/resi/list.vue
@@ -34,7 +34,7 @@
import cptTb from "@/views/dataBoard/cpts/tb";
import cptBread from "@/views/dataBoard/renfang/cpts/bread";
import resiDetails from "@/views/dataBoard/cpts/resi-details";
-import { requestPostBi } from "@/js/dai/request-bipass";
+import { requestPost } from "@/js/dai/request";
import getQueryPara from "dai-js/modules/getQueryPara";
export default {
@@ -140,7 +140,6 @@ export default {
this.pageNo = 1;
this.getList();
- this.getCount();
},
methods: {
@@ -169,20 +168,17 @@ export default {
},
async getList () {
- const { org_id, resiType, pageNo, pageSize } = this;
+ const { resiType, pageNo, pageSize } = this;
this.loading = true;
- const url = "resident_list";
+ const url = "/actual/base/residentBaseInfo/page";
- const { data, code, msg } = await requestPostBi(
+ const { data, code, msg } = await requestPost(
url,
{
- queryParam: {
- org_id,
- type: resiType,
+ floatType: resiType,
pageNo,
pageSize,
- },
},
{
// mockId: 60069169,
@@ -193,17 +189,17 @@ export default {
if (code === 0) {
this.srcTableData = data;
- // this.total = data.total;
+ this.total = data.total;
- this.list = data.map((item, index) => {
+ this.list = data.list.map((item, index) => {
return [
index + 1,
- item.user_name ? item.user_name : "--",
- item.grid ? item.grid : "--",
- item.house ? item.house : "--",
- item.telephone ? item.telephone : "--",
- item.idcard ? item.idcard : "--",
- item.gender ? item.gender : "--",
+ item.name ? item.name : "--",
+ item.gridName ? item.gridName : "--",
+ item.homeName ? item.homeName : "--",
+ item.mobile ? item.mobile : "--",
+ item.idNum ? item.idNum : "--",
+ item.gender === "1" ? "男" : (item.gender === "2" ? "女" : "--"),
item.birthday ? item.birthday : "--",
{ type: "operate", list: ["查看"] },
@@ -213,33 +209,6 @@ export default {
this.$message.error(msg);
}
},
-
- async getCount () {
- const { org_id, resiType, pageNo, pageSize } = this;
-
- const url = "resident_list_total";
-
- const { data, code, msg } = await requestPostBi(
- url,
- {
- queryParam: {
- org_id,
- type: resiType,
- pageNo,
- pageSize,
- },
- },
- {
- // mockId: 63070408,
- }
- );
-
- if (code === 0) {
- this.total = parseInt(data[0].count);
- } else {
- this.$message.error(msg);
- }
- },
},
destroyed () {
diff --git a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
index 218188cdd..47596faa4 100644
--- a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
@@ -2,7 +2,7 @@
-
不满意人员画像
+
已有不满意人群画像
@@ -24,6 +24,11 @@
{{ residentTag }}
+
{{ monthIncomeLevel }}
@@ -96,6 +101,7 @@ export default {
ageClassification: "",
cultureName: "",
gridName: "",
+ service: "",
monthIncomeLevel: "",
residentTagArray:[],
matchPeopleNum: 0,
@@ -117,6 +123,7 @@ export default {
this.ageClassification = "";
this.cultureName = "";
this.gridName = "";
+ this.service = "";
this.monthIncomeLevel = "";
this.residentTagArray = [];
this.matchPeopleNum = 0;
@@ -160,6 +167,7 @@ export default {
this.ageClassification = data.ageClassification;
this.cultureName = data.cultureName;
this.gridName = data.gridName;
+ this.service = data.service;
this.monthIncomeLevel = data.monthIncomeLevel;
if(data.residentTagName){
this.residentTagArray = data.residentTagName.split(",");
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
index 7b90673c9..d8c74b1aa 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
@@ -245,7 +245,7 @@ export default {
console.log(this.queryParams);
let params = {
...this.queryParams,
- countType: this.$route.query.countType,
+ // countType: this.$route.query.countType,
};
console.log(params);
this.$http