From cffcaba763e95841a4b58c65fbfb90661c263ecd Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 12 六月 2024 16:35:37 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 362dfa8..5485113 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -148,7 +148,12 @@
绫嶈疮: {{ currentMark.nativePlace ? currentMark.nativePlace : "-" }}
</li>
<li>鍖诲鍒嗙: {{ currentMark.barnch ? currentMark.barnch : "-" }}</li>
- <li>灏忎紶: {{ currentMark.medical ? currentMark.medical : "-" }}</li>
+ <li
+ class="medicalLi"
+ :title="currentMark.medical ? currentMark.medical : '-'"
+ >
+ 灏忎紶: {{ currentMark.medical ? currentMark.medical : "-" }}
+ </li>
</ul>
<el-button
class="flex"
@@ -429,21 +434,22 @@
},
showCard(info) {
const item = this.markerList.find((f) => f.id == info.id);
+ console.log(item, "item");
var latlng = L.latLng(item.yCoord, item.xCoord);
this.map.setView(latlng, 10);
setTimeout(() => {
this.isEchTrue = true;
this.currentMark = {
- name: item?.WEAK_NAME[0]?.content1,
+ name: item?.NAME[0]?.content1,
nikeName: item?.ALIAS[0]?.content2,
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
- medical: item?.MEDICAL_EXPERTISE[0]?.content1,
+ medical: item?.BIOGRAPHY,
id: item.id,
};
this.$nextTick(() => {
this.isTop =
- document.getElementById("mapBox").offsetHeight / 2 - 275 + "px";
+ document.getElementById("mapBox").offsetHeight / 2 - 295 + "px";
this.isLeft =
document.getElementById("mapBox").offsetWidth / 2 - 171 + "px";
});
@@ -523,14 +529,14 @@
setTimeout(() => {
this.isEchTrue = true;
this.currentMark = {
- name: ele?.WEAK_NAME[0]?.content1,
+ name: ele?.NAME[0]?.content1,
nikeName: ele?.ALIAS[0]?.content2,
nativePlace: ele?.content1,
barnch: ele?.MEDICAL_BRANCH[0]?.content1,
- medical: ele?.MEDICAL_EXPERTISE[0]?.content1,
+ medical: ele?.BIOGRAPHY,
id: ele.id,
};
- this.isTop = e.containerPoint.y - 275 + "px";
+ this.isTop = e.containerPoint.y - 295 + "px";
this.isLeft = e.containerPoint.x - 171 + "px";
}, 300);
});
@@ -733,10 +739,10 @@
nikeName: item?.ALIAS[0]?.content2,
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
- medical: item?.MEDICAL_EXPERTISE[0]?.content1,
+ medical: item?.BIOGRAPHY,
id: item.id,
};
- this.isTop = e.containerPoint.y - 275 + "px";
+ this.isTop = e.containerPoint.y - 295 + "px";
this.isLeft = e.containerPoint.x - 171 + "px";
}, 300);
});
@@ -984,11 +990,20 @@
}
} */
-::v-deep .cleanupBtn{
+::v-deep .cleanupBtn {
right: 60px !important;
}
-::v-deep .widget_input{
+::v-deep .widget_input {
min-width: 240px !important;
}
+
+.medicalLi {
+ height: 50px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+}
</style>
--
Gitblit v1.9.1