From ea7e7be62fe553919bdb2786e65e85b6528546a1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 2 Feb 2023 17:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/communityYantai/community.vue        | 23 +++++++++++++++----
 .../base/communityYantai/cpts/agency-info.vue | 18 +++++++--------
 .../base/communityYantai/cpts/grid-info.vue   | 18 +++++++--------
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/base/communityYantai/community.vue b/src/views/modules/base/communityYantai/community.vue
index 5d6cfb2f1..f419fb31e 100644
--- a/src/views/modules/base/communityYantai/community.vue
+++ b/src/views/modules/base/communityYantai/community.vue
@@ -4,7 +4,11 @@
 			<!-- <el-input placeholder="输入关键字进行过滤"
                 v-model="filterText">
       </el-input> -->
-			<el-scrollbar :style="{ height: treeHeight }" class="scrollar">
+			<el-scrollbar
+				ref="leftScrollBar"
+				:style="{ height: treeHeight }"
+				class="scrollar"
+			>
 				<el-tree
 					ref="ref_tree"
 					v-loading="treeLoading"
@@ -22,7 +26,13 @@
 				>
 					<div slot-scope="{ node, data }" class="custom-tree-node">
 						<span :id="data.id">{{ data.showName }}</span>
-						<i @click.stop="(e) => handleClickAgencyIcon(data, e)"
+						<i
+							v-if="
+								data.level != 'neighborHood' &&
+								data.level != 'building' &&
+								data.level != 'unit'
+							"
+							@click.stop="(e) => handleClickAgencyIcon(data, e)"
 							>!</i
 						>
 					</div>
@@ -413,11 +423,14 @@ export default {
 			const { layerY, layerX } = event;
 			let popOrgStyle = {
 				left: layerX + 40 + "px",
-				top : layerY + 20 + "px"
+				top:
+					layerY +
+					20 -
+					this.$refs.leftScrollBar.wrap.scrollTop +
+					"px",
 			};
 			if (layerY > 300) {
-				popOrgStyle.transform ="translateY(-100%)";
-
+				popOrgStyle.transform = "translateY(-100%)";
 			}
 			this.popOrgStyle = popOrgStyle;
 		},
diff --git a/src/views/modules/base/communityYantai/cpts/agency-info.vue b/src/views/modules/base/communityYantai/cpts/agency-info.vue
index ae9fb29a9..a128b1228 100644
--- a/src/views/modules/base/communityYantai/cpts/agency-info.vue
+++ b/src/views/modules/base/communityYantai/cpts/agency-info.vue
@@ -7,26 +7,26 @@
 		</div>
 
 		<div class="info">
-			<div class="title">{{ info.agencyName }}</div>
+			<div class="title">{{ info.agencyName || '--' }}</div>
 			<div class="item">
 				<div class="field">组织区划：</div>
-				<div class="value">{{ info.areaName }}</div>
+				<div class="value">{{ info.areaName || '--' }}</div>
 			</div>
 			<div class="item">
 				<div class="field">组织编码：</div>
-				<div class="value">{{ info.areaCode }}</div>
+				<div class="value">{{ info.areaCode || '--' }}</div>
 			</div>
 			<div class="item">
 				<div class="field">负责人：</div>
-				<div class="value">{{ info.contacts }}</div>
+				<div class="value">{{ info.contacts || '--' }}</div>
 			</div>
 			<div class="item">
 				<div class="field">联系电话：</div>
-				<div class="value">{{ info.mobile }}</div>
+				<div class="value">{{ info.mobile || '--' }}</div>
 			</div>
-			<div class="item" v-if="info.intro">
-				<div class="field">社区简介：</div>
-				<div class="value">{{ info.intro }}</div>
+			<div class="item">
+				<div class="field">组织简介：</div>
+				<div class="value">{{ info.remark || '--' }}</div>
 			</div>
 			<div class="item" v-if="mapData">
 				<div class="field">管辖范围：</div>
@@ -63,7 +63,7 @@ export default {
 				areaName: "",
 				contacts: "",
 				mobile: "",
-				intro: "",
+				remark: "",
 			},
 
 			mapData: null,
diff --git a/src/views/modules/base/communityYantai/cpts/grid-info.vue b/src/views/modules/base/communityYantai/cpts/grid-info.vue
index 80c769030..3c174ec4c 100644
--- a/src/views/modules/base/communityYantai/cpts/grid-info.vue
+++ b/src/views/modules/base/communityYantai/cpts/grid-info.vue
@@ -7,26 +7,26 @@
 		</div>
 
 		<div class="info">
-			<div class="title">{{ info.gridName }}</div>
+			<div class="title">{{ info.gridName || '--' }}</div>
 			<div class="item">
 				<div class="field">组织区划：</div>
-				<div class="value">{{ info.areaName }}</div>
+				<div class="value">{{ info.areaName || '--' }}</div>
 			</div>
 			<div class="item">
 				<div class="field">组织编码：</div>
-				<div class="value">{{ info.areaCode }}</div>
+				<div class="value">{{ info.areaCode || '--' }}</div>
 			</div>
 			<div class="item">
 				<div class="field">负责人：</div>
-				<div class="value">{{ info.contacts }}</div>
+				<div class="value">{{ info.contacts || '--' }}</div>
 			</div>
 			<div class="item">
 				<div class="field">联系电话：</div>
-				<div class="value">{{ info.mobile }}</div>
+				<div class="value">{{ info.mobile || '--' }}</div>
 			</div>
-			<div class="item" v-if="info.intro">
-				<div class="field">社区简介：</div>
-				<div class="value">{{ info.intro }}</div>
+			<div class="item">
+				<div class="field">网格简介：</div>
+				<div class="value">{{ info.remark || '--' }}</div>
 			</div>
 			<div class="item" v-if="mapData">
 				<div class="field">管辖范围：</div>
@@ -63,7 +63,7 @@ export default {
 				areaName: "",
 				contacts: "",
 				mobile: "",
-				intro: "",
+				remark: "",
 			},
 
 			mapData: null,