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 | 115 +++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 79 insertions(+), 36 deletions(-) diff --git a/src/views/chronology/floatingWindow.vue b/src/views/chronology/floatingWindow.vue index 88fd7b5..c8665c9 100644 --- a/src/views/chronology/floatingWindow.vue +++ b/src/views/chronology/floatingWindow.vue @@ -2,30 +2,27 @@ <div class="dialogBox"> <div class="journalBox" - v-if="info.type === 'journal' || info.type === 'book'" + v-if="info.cmsItemType === 'journal' || info.cmsItemType === 'books'" > - <div class="title">澶嶆柟鍓傞噺閰嶆瘮澶氱洰鏍囦紭鍖栫殑ED-NM-MO涓夎仈娉�</div> + <div :title="info.name" class="title">{{ info.name }}</div> <div class="subtitle"> - <div class="source">涓浗涓尰鍩虹鍖诲鏉傚織</div> - <div class="journalInformation">2005 3鏈� 绗�40鍗� 绗�4鏈�</div> + <div class="source">{{ info.source }}</div> + <div class="journalInformation">{{ info.IssueNumber }}</div> </div> <div class="contentBox"> - <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p> - <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p> - <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p> - <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p> - <p>鐜嬬澘 涓浗绉戝闄㈠ぇ杩炲寲瀛︾墿鐞嗙爺绌舵墍</p> + <span>{{ info.author }}</span> + <span style="margin-left: 20px"> {{ info.authorsUnits }}</span> + <span></span> </div> <div class="abstract"> 鎽樿锛� - 閽堝澶嶆柟澶氳嵂鐗�(澶氶儴浣嶅缁勫垎澶氭垚鍒�)銆佸闈剁偣澶氳嵂鏁堟寚鏍囥�侀潪绾挎�х殑鐗瑰緛,鎻愬嚭澶嶆柟鍓傞噺閰嶆瘮浼樺寲鐨凟D-NM-MO涓夎仈娉�,璇ユ柟娉曞叿鏈夎壇濂界殑闈炵嚎鎬ф嫙鍚堣兘鍔�,鍙互閫傚簲澶嶆柟鐨勯潪绾挎�х壒寰�,鍙堝彲浠ュ疄鐜板悓鏃堕拡瀵瑰涓嵂鏁堟寚鏍囩殑澶氱洰鏍囦紭鍖�,閫傚悎澶嶆柟鐨勫闈剁偣鐗瑰緛,鏄竴绉嶉�傚簲澶嶆柟鐗圭偣鐨勪紭鍖栨柟娉曘�� + <span v-html="info.abstract"></span> </div> <div class="keyword"> - 鍏抽敭璇嶏細 澶嶆柟鍓傞噺閰嶆瘮浼樺寲; 澶嶆柟鏁板鐗瑰緛; 澶氳嵂鏁堟寚鏍�; 闈炵嚎鎬�; - 璇曢獙璁捐-闈炵嚎鎬у缓妯�-澶氱洰鏍囦紭鍖栫殑涓夎仈娉� + 鍏抽敭璇嶏細 <span>{{ info.keyWords }}</span> </div> </div> - <div class="imageBox" v-if="info.type === 'image'"> + <div class="imageBox" v-if="info.cmsItemType === 'image'"> <div style="width: 350px; height: 200px; position: relative"> <img class="autoImg" @@ -45,46 +42,42 @@ <div class="ARROWS">鈫�</div> </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 class="videoBox" v-if="info.cmsItemType === 'video'"> + <video width="370" height="200" controls :src="info.fileLink"></video> <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="contentBox" style="text-align: left"> + <div class="audioContent" v-html="info.abstract"></div> + </div> </div> </div> </div> - <div class="audioBox" v-if="info.type === 'audio'"> + <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" controls></audio> + <audio + 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> @@ -98,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; @@ -115,6 +120,10 @@ font-size: 16px; line-height: 22px; font-weight: 600; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-top: 10px; } .subtitle { @@ -137,6 +146,7 @@ .contentBox { margin-top: 10px; line-height: 18px; + white-space: pre-line; } .imageBox { min-height: 300px; @@ -179,4 +189,37 @@ font-weight: 700; color: #8f7a5a; } +.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