From a5abb70a428f59894fc9ee4330f0033d6fe93a8b Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 24 四月 2025 18:38:13 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/chronology/index.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/views/chronology/index.vue b/src/views/chronology/index.vue
index 7efd5f0..61ca221 100644
--- a/src/views/chronology/index.vue
+++ b/src/views/chronology/index.vue
@@ -50,6 +50,7 @@
v-for="(citem, cindex) in item.list"
:style="{ background: citem.color }"
@mouseover="showDetail(index, cindex, 1)"
+ @mouseleave="closeDetail(index, cindex, 0)"
:key="cindex"
>
<div class="detailDialog" v-if="citem.showDetail">
@@ -66,7 +67,6 @@
</div>
</div>
<div class="item-circle" @click="showYearWindow(index, 1)"></div>
-
<div class="item-text">
<div class="">
{{ item.name.split("锛�")[0] }}
@@ -195,6 +195,7 @@
const filterList = yearDataList.datas.filter((item) => {
return item.cmsItemType != "chronology" && item.cmsItemType != "AWARD";
});
+
if (filterList && filterList.length > 0) {
for (let i = 0; i < filterList.length; i++) {
const item = filterList[i];
@@ -202,16 +203,18 @@
const requestCtx =
this.config.requestCtx + `/file/api/ApiDownload?md5=${item.file}`;
this.$set(item, "fileLink", requestCtx);
- console.log(item.fileLink, "item.fileLink");
}
this.$set(item, "showDetail", false);
this.$set(item, "color", this.colorList[item.cmsItemType]);
}
}
+
+ if (filterList.length > 0) {
+ console.log(filterList, "filterList");
+ }
return filterList;
},
closeDetail(index, cindex, type) {
- console.log(index, cindex, type);
for (let i = 0; i < this.contentList.length; i++) {
const item = this.contentList[i];
if (item && item.length > 0) {
@@ -230,6 +233,7 @@
for (let j = 0; j < item.list.length; j++) {
const citem = item.list[j];
this.$set(citem, "showDetail", false);
+ item.showDetail = false;
}
}
}
@@ -287,7 +291,6 @@
color: #937950;
}
-
.chartsBox {
white-space: nowrap;
padding: 0 80px;
@@ -404,10 +407,8 @@
}
.detailDialog {
position: absolute;
- // left: -54px;
- // bottom: 50px;
- top: -550%;
- width: 400px;
+ top: -700%;
+ width: 524px;
z-index: 9999;
cursor: pointer;
background: #fff;
@@ -444,6 +445,6 @@
z-index: 999;
}
::v-deep .el-loading-spinner {
- color: #937950 !important;
- }
+ color: #937950 !important;
+}
</style>
--
Gitblit v1.9.1