From 7a5910ac61a372a865995d2a71caef3ea87c2050 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/index.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue
index 4e8cf80..477c690 100644
--- a/src/views/screen/index.vue
+++ b/src/views/screen/index.vue
@@ -1,8 +1,9 @@
<template>
<div class="screen-container">
- <screen-title></screen-title>
+ <!-- <screen-title></screen-title> -->
<v-scale-screen width="1920" height="1080" :autoScale="true" :delay="0" class="screen">
- <screen-wrapper></screen-wrapper>
+ <!-- <screen-wrapper></screen-wrapper> -->
+ <NewPage></NewPage>
</v-scale-screen>
</div>
@@ -11,13 +12,14 @@
<script>
import ScreenTitle from './components/screen-title/index.vue';
import ScreenWrapper from './components/screen-wrapper/index.vue';
-
+import NewPage from './newPage/index.vue'
export default {
name: 'App',
components: {
ScreenTitle,
ScreenWrapper,
+ NewPage,
},
data() {
return {
@@ -30,11 +32,16 @@
</script>
<style lang="scss" scoped>
+.screen-container {
+ user-select: none;
+ -webkit-user-select: none;
+}
.screen {
- background: url('../../assets/images/screen/pageBg1.jpg') !important;
- background-size: cover !important;
- background-repeat: no-repeat !important;
- background-position: center center !important;
+ background-color: #033c76 !important;
+ //background: url('../../assets/images/screen/pageBg1.jpg') !important;
+ //background-size: cover !important;
+ //background-repeat: no-repeat !important;
+ //background-position: center center !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0