From 5e73d562bae941a7658c3c13fdb585461f1a24e4 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 21:21:07 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/chronology/floatingWindow.vue | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/views/chronology/floatingWindow.vue b/src/views/chronology/floatingWindow.vue
index 0a45b56..c8665c9 100644
--- a/src/views/chronology/floatingWindow.vue
+++ b/src/views/chronology/floatingWindow.vue
@@ -4,7 +4,7 @@
class="journalBox"
v-if="info.cmsItemType === 'journal' || info.cmsItemType === 'books'"
>
- <div class="title">{{ info.name }}</div>
+ <div :title="info.name" class="title">{{ info.name }}</div>
<div class="subtitle">
<div class="source">{{ info.source }}</div>
<div class="journalInformation">{{ info.IssueNumber }}</div>
@@ -43,7 +43,7 @@
</div>
</div>
<div class="videoBox" v-if="info.cmsItemType === 'video'">
- <video width="370" height="200" controls :src="info.requestCtx"></video>
+ <video width="370" height="200" controls :src="info.fileLink"></video>
<div>
<div class="subtitle">
@@ -52,15 +52,16 @@
</div>
<div class="contentBox" style="text-align: left">
<div class="contentBox" style="text-align: left">
- <div class="audioContent" v-html="info.abstract"></div>
- </div></div>
+ <div class="audioContent" v-html="info.abstract"></div>
+ </div>
+ </div>
</div>
</div>
<div class="audioBox" v-if="info.cmsItemType === 'audio'">
<div style="text-align: center">
<audio
style="width: 90%"
- src="https://www.w3schools.com/html/horse.ogg"
+ :src="info.fileLink"
controls
></audio>
</div>
@@ -76,7 +77,7 @@
</div>
<div class="btnBox">
- <div class="detailBtn">鏌ョ湅璇︽儏</div>
+ <div @click="toDetail" class="detailBtn">鏌ョ湅璇︽儏</div>
</div>
</div>
</template>
@@ -94,7 +95,14 @@
data() {
return {};
},
-
+ mounted() {
+ console.log(this.info);
+ },
+ methods: {
+ toDetail() {
+ this.$router.push({ name: "details", query: { id: this.info.id } });
+ },
+ },
};
</script>
@@ -112,6 +120,10 @@
font-size: 16px;
line-height: 22px;
font-weight: 600;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-top: 10px;
}
.subtitle {
@@ -197,7 +209,7 @@
cursor: pointer;
border: 1px solid #8f7a5a;
}
-.audioContent{
+.audioContent {
white-space: pre-line;
line-height: 18px;
margin-top: 10px;
@@ -205,4 +217,9 @@
overflow-y: auto;
margin-top: 20px;
}
+video {
+ border-radius: 10px;
+ border: 1px solid #dcdcdc;
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+ }
</style>
--
Gitblit v1.9.1