-
-
+
+
-
-
-
+
+
-
-
+
+
-
+
-
+
-
+ 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,19 @@ 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){
+ this.getMapData()
+ }
+ },
methods: {
async init(queryOrgId, queryOrgLevel) {
@@ -157,12 +244,12 @@ 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);
@@ -173,21 +260,23 @@ export default {
}
},
- clickBreadItem({ item }) {
+ clickBreadItem({item}) {
this.toBread(item);
},
clickAgencyItem(item) {
+ console.log(item, 'item')
this.toBread({
orgId: item.id,
orgLevel: item.level,
- meta: { title: item.name },
+ meta: {title: item.name},
});
+ this.getMapData(item.id,item.level)
},
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) {
@@ -212,39 +301,17 @@ export default {
},
//获取地图上显示的组织数据
- async getMapData() {
+ async getMapData(orgId=this.$store.state.chooseArea.chooseName.orgId,level=this.$store.state.chooseArea.chooseName.level) {
console.log("=========================getMapData");
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}}) => {
+ console.log(data,'datadatadata')
+ this.orgData = data;
this.orgId = this.orgData.org_id;
this.orgLevel = this.orgData.level;
- } else {
- this.$message.error(msg);
- }
+ this.currentLevel = this.orgData.agencyLevel;
+ console.log(this.orgData, 'orgData')
+ })
},
//获取地图上显示的组织数据
@@ -252,20 +319,20 @@ export default {
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,10 +343,10 @@ export default {
coordinates: item.coordinates || "",
};
});
- this.orgData = { ...orgData };
+ this.orgData = {...orgData};
console.log(
- "==========================getSubMapData:result",
- this.orgData
+ "==========================getSubMapData:result",
+ this.orgData
);
} else {
this.$message.error(msg);
@@ -294,7 +361,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 +378,7 @@ export default {
diff --git a/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue b/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue
index 70597d2a8..93d9bfb22 100644
--- a/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue
+++ b/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue
@@ -1,6 +1,7 @@
-
@@ -30,7 +31,7 @@ export default {
methods: {
tabClick(index) {
this.value2 = this.list[index].value
- this.$emit('changeVal',this.value)
+ this.$emit('changeVal',this.value2)
this.$emit('changeLabel',this.list[index].label)
}
}
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 @@
