-
-
+
+
-
-
-
+
+
-
-
+
+
-
+
-
+
-
+ v-model="sq12345Date"
+ format="yyyy-MM"
+ value-format="yyyy-MM"
+ type="month"
+ :clearable="false"
+ placeholder="选择月"
+ />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -93,8 +157,15 @@ import jdwgy from "@/views/dataBoard/overview/components/jdwgy.vue";
import rfsjtj from "@/views/dataBoard/overview/components/rfsjtj.vue";
import sqrfph from "@/views/dataBoard/overview/components/sqrfph.vue";
import sq12345 from "@/views/dataBoard/overview/components/sq12345.vue";
-import { requestPostBi } from "@/js/dai/request-bipass";
-import { requestPost } from "@/js/dai/request";
+
+import DynamicHumanRoomData from "@/views/dataBoard/overview/components/DynamicHumanRoomData.vue";
+import CommunityResult from "@/views/dataBoard/overview/components/CommunityResult.vue";
+import EventAndFollowUp from "@/views/dataBoard/overview/components/EventAndFollowUp.vue";
+import RankingGridData from "@/views/dataBoard/overview/components/RankingGridData.vue";
+
+
+import {requestPostBi} from "@/js/dai/request-bipass";
+import {requestPost} from "@/js/dai/request";
import getQueryPara from "dai-js/modules/getQueryPara";
export default {
@@ -112,22 +183,31 @@ export default {
rfsjtj,
sqrfph,
sq12345,
+ DynamicHumanRoomData,
+ CommunityResult,
+ EventAndFollowUp,
+ RankingGridData
},
data() {
return {
loading: false,
- rfphDate: "2023-03",
+ rfphDate: this.$moment().format('YYYY-MM'),
+ sq12345Date: this.$moment().format('YYYY-MM'),
+ sqzcDate: this.$moment().format('YYYY-MM'),
+ sjhfDate: this.$moment().format('YYYY-MM'),
+ sqwggxDate: this.$moment().format('YYYY-MM'),
orgData: {
children: [],
}, //当前组织对象
orgId: "",
orgLevel: "",
+ currentLevel: "",
breadList: [
{
orgId: "",
orgLevel: "",
- meta: { title: "人房总览" },
+ meta: {title: "人房总览"},
},
],
@@ -137,12 +217,21 @@ export default {
},
mounted() {
- const queryOrgId = getQueryPara("orgId");
- const queryOrgLevel = getQueryPara("orgLevel");
- this.init(queryOrgId, queryOrgLevel);
+ // const queryOrgId = getQueryPara("orgId");
+ // const queryOrgLevel = getQueryPara("orgLevel");
+ // this.init(queryOrgId, queryOrgLevel);
+ if(this.$store.state.chooseArea.chooseName.orgId) {
+ this.getMapData()
+ }
},
- watch: {},
+ watch: {
+ "$store.state.chooseArea.chooseName"(val){
+ if(val.orgId) {
+ this.getMapData()
+ }
+ }
+ },
methods: {
async init(queryOrgId, queryOrgLevel) {
@@ -157,15 +246,14 @@ export default {
//加载组织数据
this.loading = false;
await this.getMapData();
- await this.getSubMapData();
+ // await this.getSubMapData();
this.loading = true;
},
- changeDate(e){
- this.rfphDate=e;
+ changeDate(e) {
+ this.rfphDate = e;
},
handleClickDotBtn(type, info) {
- console.log("handleClickDotBtn", type, info);
if (type == "watch-resi") {
this.displayedResiId = info.user_id;
} else if (type == "watch-house") {
@@ -173,7 +261,7 @@ export default {
}
},
- clickBreadItem({ item }) {
+ clickBreadItem({item}) {
this.toBread(item);
},
@@ -181,13 +269,13 @@ export default {
this.toBread({
orgId: item.id,
orgLevel: item.level,
- meta: { title: item.name },
+ meta: {title: item.name},
});
},
toBread(item) {
- const { orgId } = item;
- const { breadList } = this;
+ const {orgId} = item;
+ const {breadList} = this;
let index = breadList.findIndex((val) => val.orgId === orgId);
// return console.log(item, breadList, index);
if (index >= 0) {
@@ -196,12 +284,11 @@ export default {
breadList.push(item);
this.breadList = breadList;
}
- this.init(item.orgId, item.orgLevel);
+ this.getMapData(item.orgId,item.orgLevel)
},
// 点击搜索结果条目，在地图上显示点和详情弹窗
handleClickSearchItem(item) {
- console.log("handleClickSearchItem", item);
if (!item.longitude) {
return this.$message.error("请先设置坐标");
}
@@ -212,60 +299,34 @@ export default {
},
//获取地图上显示的组织数据
- async getMapData() {
- console.log("=========================getMapData");
+ async getMapData(orgId=this.$store.state.chooseArea.chooseName.orgId,level=this.$store.state.chooseArea.chooseName.level) {
const url = "org_map";
-
- const { data, code, msg } = await requestPostBi(
- url,
- {
- queryParam: {
- org_id: this.orgId,
- },
- },
- {
- // mockId: 60810589,
- }
- );
-
- if (code === 0) {
- console.log("data::", data);
- let info = data[0];
- this.orgData = {
- ...info,
- id: info.org_id,
- name: info.org_name,
- latitude: parseFloat(info.latitude),
- longitude: parseFloat(info.longitude),
- coordinates: info.coordinates || "",
- children: [],
- };
+ this.$http.post(`/gov/org/agency/maporg`, {orgId, level}).then(({data: {data}}) => {
+ this.orgData = data;
this.orgId = this.orgData.org_id;
this.orgLevel = this.orgData.level;
- } else {
- this.$message.error(msg);
- }
+ this.currentLevel = this.orgData.agencyLevel;
+ })
},
//获取地图上显示的组织数据
async getSubMapData() {
- console.log("=========================getSubMapData");
const url = "sub_org_map";
- const { data, code, msg } = await requestPostBi(
- url,
- {
- queryParam: {
- org_id: this.orgId,
+ const {data, code, msg} = await requestPostBi(
+ url,
+ {
+ queryParam: {
+ org_id: this.orgId,
+ },
},
- },
- {
- // mockId: 61831860,
- }
+ {
+ // mockId: 61831860,
+ }
);
if (code === 0) {
- const { orgData } = this;
+ const {orgData} = this;
orgData.children = data.map((item) => {
return {
...item,
@@ -276,11 +337,7 @@ export default {
coordinates: item.coordinates || "",
};
});
- this.orgData = { ...orgData };
- console.log(
- "==========================getSubMapData:result",
- this.orgData
- );
+ this.orgData = {...orgData};
} else {
this.$message.error(msg);
}
@@ -294,7 +351,7 @@ export default {
level: this.orgLevel,
};
- const { data, code, msg } = await requestPost(url, params);
+ const {data, code, msg} = await requestPost(url, params);
if (code === 0) {
this.orgData = data;
this.orgId = this.orgId;
@@ -311,7 +368,7 @@ export default {
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index c4b495411..6bc85b7fc 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -583,7 +583,6 @@ export default {
const { orgId } = item;
const { breadList } = this;
let index = breadList.findIndex((val) => val.orgId === orgId);
- // return console.log(item, breadList, index);
if (index >= 0) {
this.breadList = breadList.slice(0, index + 1);
} else {
@@ -607,7 +606,6 @@ export default {
// 根据类别搜索
async handleSearch() {
this.searchModule.result = [];
- console.log(this.searchModule);
const { searchModule } = this;
const url = [
@@ -662,10 +660,6 @@ export default {
...detailJson,
};
});
- console.log(
- "==========this.searchModule.result",
- this.searchModule.result
- );
} else {
this.$message.error(msg);
}
@@ -673,7 +667,6 @@ export default {
//地图上居民分类百分比数据 ps:感觉有点重复显示
async getPerInfo() {
- console.log("=========================getPerInfo");
const url = "resident_ratio";
const { data, code, msg } = await requestPostBi(
@@ -700,7 +693,6 @@ export default {
//居民分类分析数据
async getResiCategoryData() {
- console.log("=========================getResiCategoryData");
const url = "resident_class_statics";
const { data, code, msg } = await requestPostBi(
@@ -733,7 +725,6 @@ export default {
//居民分类预测数据
async getResiCategoryForecastData() {
- console.log("=========================getResiCategoryForecastData");
const url = "resident_class_predict";
const { data, code, msg } = await requestPostBi(
@@ -766,7 +757,6 @@ export default {
//获取地图上显示的组织数据
async getMapData() {
- console.log("=========================getMapData");
const url = "org_map";
const { data, code, msg } = await requestPostBi(
@@ -801,7 +791,6 @@ export default {
//获取地图上显示的组织数据
async getSubMapData() {
- console.log("=========================getSubMapData");
const url = "sub_org_map";
const { data, code, msg } = await requestPostBi(
@@ -829,10 +818,6 @@ export default {
};
});
this.orgData = { ...orgData };
- console.log(
- "==========================getSubMapData:result",
- this.orgData
- );
} else {
this.$message.error(msg);
}
diff --git a/src/views/dataBoard/renfang/resi/analyze.vue b/src/views/dataBoard/renfang/resi/analyze.vue
index 9f5b084dc..4653a10a6 100644
--- a/src/views/dataBoard/renfang/resi/analyze.vue
+++ b/src/views/dataBoard/renfang/resi/analyze.vue
@@ -1,41 +1,37 @@
-
-
-
-
-
-
-
{{ tableTitle }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
{{ tableTitle }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue
index 6d89da5b7..2a8f4d827 100644
--- a/src/views/dataBoard/renfang/resi/class.vue
+++ b/src/views/dataBoard/renfang/resi/class.vue
@@ -223,6 +223,12 @@ export default {
title: "人房总览",
},
},
+ {
+ path: "/dataBoard/renfang/visualizing",
+ meta: {
+ title: "",
+ },
+ },
{
meta: {
title: "居民列表",
@@ -418,13 +424,22 @@ export default {
},
activated() {
- this.org_id = getQueryPara("org_id");
- this.type = getQueryPara("type");
- this.type_id = getQueryPara("type_id");
- this.pageType = getQueryPara("pageType");
- this.type_name = getQueryPara("type_name");
- const type_name = getQueryPara("type_name");
- this.breadList[1].meta.title = type_name + "居民列表";
+ const query = this.$route.query;
+ this.org_id = query.org_id;
+ this.type = query.type;
+ this.type_id = query.type_id;
+ this.pageType = query.pageType;
+ this.type_name = query.type_name;
+ const type_name = query.type_name;
+ let title = type_name;
+ if (this.type == "jineng" || this.type == "gangwei") {
+ title = "失业人员";
+ }
+ if (this.type == "wennuan" || this.type == "fuwu") {
+ title = "低保人员";
+ }
+ this.type_name1 = title;
+ this.breadList[1].meta.title = title;
this.tableTitle = type_name + "居民列表";
this.pageNo = 1;
const type = this.type;
@@ -467,7 +482,6 @@ export default {
};
}
this.getList();
- // this.getCount();
if (this.pageType != "normal") {
this.colList = [
{
@@ -555,6 +569,8 @@ export default {
type_id: this.type_id,
type_name: item.meta.title,
pageType: this.pageType,
+ type: this.type,
+ pageType: this.pageType,
},
});
},
@@ -569,13 +585,15 @@ export default {
},
jumpPage(index) {
let item = this.listData[index];
- console.log("item::", item);
this.$router.push({
- path: "/organizational/orgPersonnel",
+ path: "/dataBoard/renfang/resident",
query: {
org_id: this.org_id,
type_id: this.type_id,
user_id: item.id,
+ type: this.type,
+ pageType: this.pageType,
+ type_name: this.type_name,
},
});
},
diff --git a/src/views/dataBoard/renfang/resident/index.vue b/src/views/dataBoard/renfang/resident/index.vue
new file mode 100644
index 000000000..3838d6e25
--- /dev/null
+++ b/src/views/dataBoard/renfang/resident/index.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
diff --git a/src/views/dataBoard/renfang/visualizing/components/dataTitle.vue b/src/views/dataBoard/renfang/visualizing/components/dataTitle.vue
index 8201a13ba..a11809a02 100644
--- a/src/views/dataBoard/renfang/visualizing/components/dataTitle.vue
+++ b/src/views/dataBoard/renfang/visualizing/components/dataTitle.vue
@@ -3,6 +3,7 @@
{{ title }}
+
\ No newline at end of file
+
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
index 18658c207..6bd2b2eff 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
@@ -1,8 +1,8 @@
+ 
