diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue
index d66160927..4b2521523 100644
--- a/src/components/GridTree/nodeWrap.vue
+++ b/src/components/GridTree/nodeWrap.vue
@@ -30,7 +30,7 @@
-
+
{{ spliceNameFun(item.name, 3) }}
@@ -74,8 +74,24 @@ export default {
return row;
},
- gotoPersonnel() {
- this.$router.push("/organizational/microgrid");
+ findParentParentId(nodeConfig, pid) {
+ let parentParentId = "";
+ if (nodeConfig.id === pid) {
+ return nodeConfig.pid;
+ } else {
+ if (nodeConfig.children && nodeConfig.children.length > 0) {
+ for (let i = 0; i < nodeConfig.children.length; i++) {
+ parentParentId = this.findParentParentId(nodeConfig.children[i], pid);
+ if (parentParentId) {
+ return parentParentId;
+ }
+ }
+ }
+ }
+ },
+ gotoPersonnel(item) {
+ const grandPid = this.findParentParentId(this.nodeConfig, item.pid);
+ this.$router.push(`/organizational/microgrid/${item.id}/${grandPid}`);
},
},
};
diff --git a/src/router/index.js b/src/router/index.js
index d13d7e55b..4270128dd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -411,7 +411,7 @@ export const dataBoardRoutes = {
},
},
{
- path: "/organizational/microgrid",
+ path: "/organizational/microgrid/:id/:pid",
props: true,
component: () => import("@/views/dataBoard/organizational/microgrid/index"),
name: "Microgrid",
diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue
index 015d83b53..ddefb2f45 100644
--- a/src/views/dataBoard/organizational/dangTree/index.vue
+++ b/src/views/dataBoard/organizational/dangTree/index.vue
@@ -70,7 +70,7 @@ export default {
getTreeData() {
this.loading = true;
this.$http
- .get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName}`)
+ .get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
.then((res) => {
const {
data: { code, data },
diff --git a/src/views/dataBoard/organizational/gridTree/index.vue b/src/views/dataBoard/organizational/gridTree/index.vue
index ab36ba443..93605bb76 100644
--- a/src/views/dataBoard/organizational/gridTree/index.vue
+++ b/src/views/dataBoard/organizational/gridTree/index.vue
@@ -73,7 +73,7 @@ export default {
getTreeData() {
this.loading = true;
this.$http
- .get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName}`)
+ .get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
.then((res) => {
const {
data: { code, data },
diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue
index dedf7e80a..538d5765d 100644
--- a/src/views/dataBoard/organizational/jwTree/index.vue
+++ b/src/views/dataBoard/organizational/jwTree/index.vue
@@ -76,7 +76,7 @@ export default {
getTreeData() {
this.loading = true;
this.$http
- .get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName}`)
+ .get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
.then((res) => {
const {
data: { code, data },
diff --git a/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue b/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue
index 707a7cae8..d6bcadc95 100644
--- a/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue
+++ b/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue
@@ -81,16 +81,15 @@
import Dialog from "@/components/Dialog/index.vue";
export default {
- name: "residentDetails",
+ name: "ReportAnEvent",
+ components: { Dialog },
props: {
- resiId: {
+ id: {
type: String,
default: "",
},
},
- components: { Dialog },
-
data() {
return {
activities: [
@@ -114,13 +113,38 @@ export default {
},
computed: {},
-
+ watch: {
+ id: {
+ handler(val) {
+ if (val) {
+ this.getDetailsData(val);
+ this.getProcessData(val);
+ }
+ },
+ immediate: true,
+ },
+ },
mounted() {},
methods: {
handleClose() {
this.$emit("close", false);
},
+
+ getDetailsData(id) {
+ this.$http.post("/governance/icEvent/detail", { icEventId: id }).then((res) => {
+ console.log(res);
+ });
+ },
+
+ getProcessData(id) {
+ this.$http.post("/governance/icEvent/process", { icEventId: id }).then((res) => {
+ console.log(res);
+ });
+ },
+
+ // /governance/icEvent/detail
+ // /governance/icEvent/process
},
};
diff --git a/src/views/dataBoard/organizational/microgrid/index.vue b/src/views/dataBoard/organizational/microgrid/index.vue
index a5d6f3615..ff789001d 100644
--- a/src/views/dataBoard/organizational/microgrid/index.vue
+++ b/src/views/dataBoard/organizational/microgrid/index.vue
@@ -13,44 +13,44 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
- 查看
+
+ 查看
@@ -59,7 +59,7 @@
-
+
@@ -115,6 +115,7 @@ export default {
name: "微网格",
},
],
+ rowId: null,
itemNav: 1,
showDialog: false,
showDialogEvent: false,
@@ -123,10 +124,47 @@ export default {
monthOptions: new Array(12).fill(0).map((_, index) => {
return { label: index - 0 + 1 + "月", value: index - 0 + 1 };
}),
- list: [{}, {}, {}],
+ paramsData: {},
+ list: [],
};
},
+ watch: {
+ otherTabel(n) {
+ if (n) {
+ this.getList();
+ }
+ },
+ },
+ created() {
+ this.paramsData = this.$route.params;
+ },
+ mounted() {
+ this.getList();
+ },
methods: {
+ getList() {
+ this.loading = true;
+ const getUrl = new Map([
+ ["sbsj", `/gov/org/organizational/neighborhood/getBuildingUnitLevelEvent?unitId=1634090229723381761`],
+ ["jmxq", `/gov/org/organizational/neighborhood/getBuildingUnitLevelUserDemand?unitId=1565599676446027778`],
+ ["tzrq", `/gov/org/organizational/neighborhood/getBuildingUnitLevelCtp?unitId=1483661223332417537`],
+ ["aqyh", `/gov/org/organizational/neighborhood/getEnterprisePatrolRecord?unitId=f896b59f3cddf1f54280546d79803652`],
+ ]);
+ const url = getUrl.get(this.otherTabel);
+ // unitId=${this.paramsData.id}
+ this.$http.get(`${url}&pageNo=${this.pageNum}&pageSize=${this.pageSize}`).then((res) => {
+ const {
+ code,
+ data: { total, list },
+ } = res.data;
+ if (code === 0) {
+ this.total = total;
+ this.list = list;
+ this.loading = false;
+ }
+ });
+ },
+
chooseNav(item) {
this.itemNav = item.key;
this.otherTabel = item.key === 1 ? "sbsj" : item.key === 2 ? "jmxq" : item.key === 3 ? "tzrq" : "aqyh";
@@ -147,8 +185,8 @@ export default {
closeSaft(flag) {
this.showDialogSaft = flag;
},
- getList() {},
- handleView() {
+ handleView(row) {
+ this.rowId = row.id;
if (this.itemNav === 1) {
this.showDialogEvent = true;
}