diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 335bb9119..e6adc84e2 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -5,7 +5,7 @@
{{ spliceNameFun(nodeConfig.organizationName, 8) }}
-
{{ spliceNameFun(nodeConfig.name, 12) }}
+
{{ spliceNameFun(nodeConfig.name, 12) }}
@@ -20,17 +20,17 @@
{{ spliceNameFun(item.organizationName, 8) }}
-
{{ spliceNameFun(item.name, 12) }}
+
{{ spliceNameFun(item.name, 12) }}
{{ spliceNameFun(item.organizationName, 8) }}
-
{{ spliceNameFun(item.name, 12) }}
+
{{ spliceNameFun(item.name, 12) }}
-
+
{{ spliceNameFun(item.name, 3) }}
@@ -79,8 +79,15 @@ export default { return this.sixLevelArr.includes(item.level); }, - gotoPersonnel() { - this.$router.push("/organizational/orgPersonnel"); + gotoPersonnel(id) { + if (id) { + this.$router.push("/organizational/orgPersonnel"); + } else { + this.$message({ + message: "无法跳转", + type: "error", + }); + } }, }, }; diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue index 680c93c18..cf20c7ace 100644 --- a/src/components/Tree/nodeWrap.vue +++ b/src/components/Tree/nodeWrap.vue @@ -6,7 +6,7 @@
{{ spliceNameFun(nodeConfig.partyOrgName, 8) }}
-
{{ spliceNameFun(nodeConfig.principalName, 12) }}
+
{{ spliceNameFun(nodeConfig.principalName, 12) }}
@@ -21,19 +21,19 @@
{{ spliceNameFun(item.partyOrgName, 8) }}
-
{{ spliceNameFun(item.principalName, 12) }}
+
{{ spliceNameFun(item.principalName, 12) }}
{{ spliceNameFun(item.partyOrgName, 8) }}
-
{{ spliceNameFun(item.principalName, 12) }}
+
{{ spliceNameFun(item.principalName, 12) }}
-
{{ spliceNameFun(item.principalName, 3) }}
+
{{ spliceNameFun(item.principalName, 3) }}
@@ -53,7 +53,7 @@ 空巢老人
--> -
+
{{ spliceNameFun(item.principalName, 3) }}
@@ -145,8 +145,12 @@ export default { }); }, - gotoPersonnel() { - this.$router.push("/organizational/orgPersonnel"); + gotoPersonnel(id) { + if (id) { + this.$router.push({ path: "/organizational/orgPersonnel", query: { user_id: id } }); + } else { + this.$message.error("无法跳转!"); + } }, }, }; diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue index 43bd9a2c2..ff6b5273c 100644 --- a/src/views/dataBoard/organizational/dangTree/index.vue +++ b/src/views/dataBoard/organizational/dangTree/index.vue @@ -46,7 +46,6 @@ export default { if (orgId) { this.getTreeData(); } - this.getTextMap(); }, methods: { getLevelArrNum(myArray) { diff --git a/src/views/dataBoard/organizational/personalPage/index.vue b/src/views/dataBoard/organizational/personalPage/index.vue index e4bc7fb58..89a6630cb 100644 --- a/src/views/dataBoard/organizational/personalPage/index.vue +++ b/src/views/dataBoard/organizational/personalPage/index.vue @@ -1,7 +1,7 @@