From 96de5562aa8245de24582623951fed016cf90a00 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期二, 08 四月 2025 11:02:45 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/chronology/floatingWindow.vue | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/src/views/chronology/floatingWindow.vue b/src/views/chronology/floatingWindow.vue
index 96c9609..b556ec3 100644
--- a/src/views/chronology/floatingWindow.vue
+++ b/src/views/chronology/floatingWindow.vue
@@ -1,6 +1,9 @@
<template>
<div class="dialogBox">
- <div class="journalBox">
+ <div
+ class="journalBox"
+ v-if="info.type === 'journal' || info.type === 'book'"
+ >
<div class="title">澶嶆柟鍓傞噺閰嶆瘮澶氱洰鏍囦紭鍖栫殑ED-NM-MO涓夎仈娉�</div>
<div class="subtitle">
<div class="source">涓浗涓尰鍩虹鍖诲鏉傚織</div>
@@ -22,10 +25,55 @@
璇曢獙璁捐-闈炵嚎鎬у缓妯�-澶氱洰鏍囦紭鍖栫殑涓夎仈娉�
</div>
</div>
- <div class="imageBox"></div>
- <div class="BookBox"></div>
- <div class="videoBox"></div>
- <div class="audioBox"></div>
+ <div class="imageBox" v-if="info.type === 'image'">
+ <div style="width: 500px; height: 300px">
+ <img
+ class="autoImg"
+ src="@/assets/images/chronology/photoTest.png"
+ alt=""
+ />
+ </div>
+ </div>
+ <div class="BookBox" v-if="info.type === 'book'">book</div>
+ <div class="videoBox" v-if="info.type === 'video'">
+ <video
+ width="370"
+ height="240"
+ controls
+ src="https://www.w3schools.com/html/mov_bbb.mp4"
+ ></video>
+
+ <div>
+ <div class="subtitle">
+ <div class="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>
+ </div>
+ </div>
+ <div class="audioBox" v-if="info.type === 'audio'">
+ <audio src="https://www.w3schools.com/html/horse.ogg" controls></audio>
+
+ <div>
+ <div class="subtitle">
+ <div class="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>
+ </div>
+ </div>
</div>
</template>
@@ -78,4 +126,31 @@
margin-top: 10px;
line-height: 18px;
}
+.imageBox {
+ min-height: 300px;
+ padding: 10px;
+}
+
+.videoBox {
+ min-height: 240;
+ text-align: center;
+}
+.videoTitle {
+ background: #ffffff;
+ box-sizing: border-box;
+ border: 1px solid #dcdcdc;
+ box-shadow: 0px 0px 10px 0px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 5px;
+ padding: 10px;
+ width: 100%;
+ height: 100%;
+}
+.autoImg {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
</style>
--
Gitblit v1.9.1