Merge branch 'pre' of http://8.140.26.4:10003/caijian/risk-monitor into yp-dev

src/views/decree/decreeLayout/deepdig/index.vue

@@ -2,7 +2,7 @@
 	<div class="wrap">
 		<div class="box1">
 			<AnalysisBox title="相关政令" :showAllBtn="false">
-				<div class="box1-main">
+				<div class="box1-main" v-loading="isLoading">
 					<el-empty v-if="!siderList?.length" style="padding: 60px 0;" description="暂无数据" :image-size="100" />
 					<el-scrollbar height="100%" always>
 						<div class="left-item" :class="{ 'item-active': false }" v-for="(item, index) in siderList" :key="index" @click="handleClickDecree(item)">
@@ -18,17 +18,19 @@
 		</div>
 		<div class="box2">
 			<AnalysisBox title="政令关系挖掘" :showAllBtn="false">
+				<div style="height: 100%; width: 100%;" v-loading="isLoading">
 					<el-empty v-if="!siderList?.length" style="padding: 60px 0;" description="暂无数据" :image-size="100" />
 					<div class="box2-main" v-if="graphData.nodes?.length">
 						<GraphChart :nodes="graphData.nodes" :links="graphData.links" layoutType="force" @handleClickNode="handleClickNode" />
 					</div>
+				</div>
 			</AnalysisBox>
 		</div>
 
 		<el-dialog v-model="dialogVisible" width="1000px" class="viewpoint-dialog">
 			<template #header>
 				<div class="viewpoint-header">
-					<div class="viewpoint-title">冲突关系</div>
+					<div class="viewpoint-title">关联关系</div>
 				</div>
 			</template>
 			<div class="viewpoint-body">
@@ -61,7 +63,7 @@ import icon1629 from "./assets/icons/icon1629.png";
 
 const route = useRoute();
 
-// 冲突关系
+// 关联关系
 const dialogVisible = ref(false);
 
 // 基本信息
@@ -123,13 +125,16 @@ const handleClickNode = ({data}) => {
 		if (node) handleClickDecree(node)
 	}
 }
+const isLoading = ref(false);
 const initGraphChart = () => {
+	isLoading.value = true;
 	Promise.all([onDecreeSummaryData(), handleGetRelateOrder()]).then(() => {
 		if (mainInfo.value.id && siderList.value.length) {
 			graphData.links = siderList.value.map(onFormatLink)
 			graphData.nodes = siderList.value.map(onFormatNode)
 			graphData.nodes.unshift(onFormatNode(mainInfo.value))
 		}
+		isLoading.value = false;
 	})
 }
 const onFormatLink = (item, index) => {
@@ -185,7 +190,7 @@ const handleClickDecree = decree => {
 	// })
 };
 
-// 冲突关系
+// 关联关系
 const graphContainer = ref(null);
 let graph = null;
 const onRelationChart = () => {

src/views/decree/decreeLayout/influence/index.vue

@@ -183,7 +183,7 @@ const headerChartData = (row) => {
 
 	switch (contentType.value) {
 		case 1:
-			onDecreeRelatedChain(row.id)
+			onDecreeRelatedChain(row.orgId)
 		break;
 		case 2:
 			onDecreeRelatedEntitie(row.orgId)