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 | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 deletions(-)
diff --git a/src/views/chronology/floatingWindow.vue b/src/views/chronology/floatingWindow.vue
index 1d79eec..c8665c9 100644
--- a/src/views/chronology/floatingWindow.vue
+++ b/src/views/chronology/floatingWindow.vue
@@ -4,15 +4,15 @@
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>
</div>
<div class="contentBox">
- <span>{{ info.author }}</span>
- <span style="margin-left: 20px"> {{ info.authorsUnits }}</span>
- <span></span>
+ <span>{{ info.author }}</span>
+ <span style="margin-left: 20px"> {{ info.authorsUnits }}</span>
+ <span></span>
</div>
<div class="abstract">
鎽樿锛�
@@ -43,44 +43,41 @@
</div>
</div>
<div class="videoBox" v-if="info.cmsItemType === 'video'">
- <video
- width="370"
- height="240"
- controls
- :src="info.requestCtx"
- ></video>
+ <video width="370" height="200" controls :src="info.fileLink"></video>
<div>
<div class="subtitle">
- <div class="source">{{ info.name }}</div>
+ <div class="source">{{ info.source }}</div>
<div class="journalInformation">2005 3鏈� 绗�40鍗� 绗�4鏈�</div>
</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>
</div>
<div class="audioBox" v-if="info.cmsItemType === 'audio'">
<div style="text-align: center">
<audio
- style="width: 100%"
- src="https://www.w3schools.com/html/horse.ogg"
+ style="width: 90%"
+ :src="info.fileLink"
controls
></audio>
</div>
<div>
<div class="subtitle">
- <div class="source">涓浗涓尰鍩虹鍖诲鏉傚織</div>
+ <div class="source">{{ info.source }}</div>
<div class="journalInformation">2005 3鏈� 绗�40鍗� 绗�4鏈�</div>
</div>
<div class="contentBox" style="text-align: left">
- <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p>
- <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p>
- <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p>
- <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p>
- <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p>
+ <div class="audioContent" v-html="info.abstract"></div>
</div>
</div>
+ </div>
+
+ <div class="btnBox">
+ <div @click="toDetail" class="detailBtn">鏌ョ湅璇︽儏</div>
</div>
</div>
</template>
@@ -94,12 +91,24 @@
default: () => {},
},
},
+
+ data() {
+ return {};
+ },
+ mounted() {
+ console.log(this.info);
+ },
+ methods: {
+ toDetail() {
+ this.$router.push({ name: "details", query: { id: this.info.id } });
+ },
+ },
};
</script>
<style scoped>
.dialogBox {
- width: 400px;
+ width: 524px;
height: 100%;
background-color: #fdf8f0;
position: relative;
@@ -111,6 +120,10 @@
font-size: 16px;
line-height: 22px;
font-weight: 600;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-top: 10px;
}
.subtitle {
@@ -133,6 +146,7 @@
.contentBox {
margin-top: 10px;
line-height: 18px;
+ white-space: pre-line;
}
.imageBox {
min-height: 300px;
@@ -175,9 +189,37 @@
font-weight: 700;
color: #8f7a5a;
}
-.source{
+.source {
max-width: 300px;
overflow: hidden;
white-space: normal;
}
+.btnBox {
+ text-align: center;
+ margin-top: 20px;
+ display: flex;
+ justify-content: center;
+}
+.detailBtn {
+ width: 100px;
+ height: 30px;
+ border-radius: 30px;
+ color: #8f7a5a;
+ line-height: 30px;
+ cursor: pointer;
+ border: 1px solid #8f7a5a;
+}
+.audioContent {
+ white-space: pre-line;
+ line-height: 18px;
+ margin-top: 10px;
+ max-height: 100px;
+ 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