From 58a4c57bbe8b465013d0adfd51aab09d17c64273 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 9 Apr 2024 15:37:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=BB=9A=E5=8A=A8=E5=AD=97?= =?UTF-8?q?=E5=B9=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tzipc-ui/src/views/zf/bigscreen/index.vue | 48 ++++++++++++++++++++--- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/tzipc-ui/src/views/zf/bigscreen/index.vue b/tzipc-ui/src/views/zf/bigscreen/index.vue index a4910ad..39050ae 100644 --- a/tzipc-ui/src/views/zf/bigscreen/index.vue +++ b/tzipc-ui/src/views/zf/bigscreen/index.vue @@ -5,7 +5,10 @@
{{ title1 }}数据监控
油膜轴承振动监测
-
+
+
+
+
@@ -20,19 +23,28 @@
{{ title2 }}数据监控
油膜轴承振动监测
-
+
+
+
+
油液颗粒度特性
-
+
+
+
+
油液颗粒度特性
-
+
+
+
+
@@ -192,7 +204,6 @@ export default { this.initBottomR2(ov) this.initBottomR3(owc) - console.log('ssat', ssat); this.r1 = ssat this.r2 = rot } @@ -250,6 +261,9 @@ export default { data: vz, }, ], + grid: { + bottom: "20%", + } }), true, true); window.addEventListener("resize", () => { chartIns && chartIns.resize(); @@ -291,6 +305,9 @@ export default { data: vz, }, ], + grid: { + bottom: "20%", + } }), true, true); window.addEventListener("resize", () => { chartIns && chartIns.resize(); @@ -852,4 +869,25 @@ export default { flex-direction: column-reverse; } } + +.scroll-text-wrapper { + border: 1px solid #ff0000b5; + background-color: #eb16161a; + display: flex; + justify-content: center; + align-items: center; + font-size: .8rem; + position: relative; + overflow: hidden; + .scroll-inner { + position: absolute; + width: 100%; + animation: scrollAnimation 10s linear infinite; + } +} + +@keyframes scrollAnimation { + 0% { left: 100%; } + 100% { left: -100%; } +} \ No newline at end of file From 9b6df9e701b917507753a983ebf94e3310bc62bc Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 9 Apr 2024 15:39:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E4=BD=8D=E7=BD=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tzipc-ui/src/views/zf/bigscreen/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzipc-ui/src/views/zf/bigscreen/index.vue b/tzipc-ui/src/views/zf/bigscreen/index.vue index 39050ae..deda2f5 100644 --- a/tzipc-ui/src/views/zf/bigscreen/index.vue +++ b/tzipc-ui/src/views/zf/bigscreen/index.vue @@ -14,8 +14,8 @@
-
+
From 7c15d60c5e763ac7942f9aa60febdd96bc269ff3 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 9 Apr 2024 15:44:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?style:=20=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tzipc-ui/src/views/login.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tzipc-ui/src/views/login.vue b/tzipc-ui/src/views/login.vue index cc9b4bb..32b9122 100644 --- a/tzipc-ui/src/views/login.vue +++ b/tzipc-ui/src/views/login.vue @@ -146,11 +146,12 @@ export default { created() { this.getCode(); this.getCookie(); - }, methods: { getTitleBg() { - const theme = localStorage.getItem("data-theme") || 'redTheme' + const theme = localStorage.getItem("data-theme") || 'default' + window.document.documentElement.setAttribute('data-theme', theme) + window.document.documentElement.setAttribute('class', 'light') if (theme === 'default') return '/theme/default/loginTitle.png' if (theme === 'redTheme') return '/theme/redTheme/loginTitle.png' return '/theme/default/loginTitle.png' From 1fe35fe9aa654ac0bf17ae12028eec68e65c5322 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 9 Apr 2024 15:51:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=A4=A7=E5=B1=8F=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tzipc-ui/src/views/zf/bigscreen/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tzipc-ui/src/views/zf/bigscreen/index.vue b/tzipc-ui/src/views/zf/bigscreen/index.vue index deda2f5..6c94081 100644 --- a/tzipc-ui/src/views/zf/bigscreen/index.vue +++ b/tzipc-ui/src/views/zf/bigscreen/index.vue @@ -1,6 +1,6 @@