|
@@ -39,7 +39,11 @@
|
|
|
|
|
|
|
|
<div class="chart" ref="chartContainerRef">
|
|
<div class="chart" ref="chartContainerRef">
|
|
|
<!-- 架构图 -->
|
|
<!-- 架构图 -->
|
|
|
- <OrgChart :treeData="treeData" @node-click="handleNodeClick" />
|
|
|
|
|
|
|
+ <OrgChart
|
|
|
|
|
+ :treeData="treeData"
|
|
|
|
|
+ :highlight-org-id="selectedOrgId"
|
|
|
|
|
+ @node-click="handleNodeClick"
|
|
|
|
|
+ />
|
|
|
<div class="chart-actions">
|
|
<div class="chart-actions">
|
|
|
<el-button v-if="!isChartFullscreen" size="small" @click="toggleChartZoom">
|
|
<el-button v-if="!isChartFullscreen" size="small" @click="toggleChartZoom">
|
|
|
{{ isChartZoomed ? '恢复布局' : '放大模式' }}
|
|
{{ isChartZoomed ? '恢复布局' : '放大模式' }}
|
|
@@ -223,7 +227,9 @@ const position = ref('left')
|
|
|
const id = nodeData?.id?.replace('org-', '')
|
|
const id = nodeData?.id?.replace('org-', '')
|
|
|
console.log(nodeData, 'canshu')
|
|
console.log(nodeData, 'canshu')
|
|
|
selectedTeamId.value = Number(id);
|
|
selectedTeamId.value = Number(id);
|
|
|
-
|
|
|
|
|
|
|
+ if (id !== undefined && id !== null && String(id) !== '') {
|
|
|
|
|
+ selectedOrgId.value = String(id);
|
|
|
|
|
+ }
|
|
|
teamDetailDrawerRef.value?.drawerShow();
|
|
teamDetailDrawerRef.value?.drawerShow();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -401,7 +407,7 @@ const formatTreeData = (tree)=> {
|
|
|
// 默认选择第一个组织
|
|
// 默认选择第一个组织
|
|
|
if(res[0].orgId){
|
|
if(res[0].orgId){
|
|
|
treeNodePreview(res[0])
|
|
treeNodePreview(res[0])
|
|
|
- activeName.value = String(res[0].orgId)
|
|
|
|
|
|
|
+ //activeName.value = String(res[0].orgId)
|
|
|
selectedOrgId.value = String(res[0].orgId)
|
|
selectedOrgId.value = String(res[0].orgId)
|
|
|
tableQuery.queryParam.classifyName = res[0].orgId
|
|
tableQuery.queryParam.classifyName = res[0].orgId
|
|
|
}
|
|
}
|
|
@@ -454,7 +460,7 @@ const formatTreeData = (tree)=> {
|
|
|
const querySafetyTeamData = (value) => {
|
|
const querySafetyTeamData = (value) => {
|
|
|
// console.log('查询', value);
|
|
// console.log('查询', value);
|
|
|
tableQuery.queryParam.classifyName = value.orgId;
|
|
tableQuery.queryParam.classifyName = value.orgId;
|
|
|
- activeName.value = String(value.orgId)
|
|
|
|
|
|
|
+ //activeName.value = String(value.orgId)
|
|
|
selectedOrgId.value = String(value.orgId)
|
|
selectedOrgId.value = String(value.orgId)
|
|
|
treeNodePreview(value)
|
|
treeNodePreview(value)
|
|
|
safetyOrgDetail(value.orgId)
|
|
safetyOrgDetail(value.orgId)
|