diff --git a/src/assets/img/screen/bg.png b/src/assets/img/screen/bg.png index 50952c3..282c12f 100644 Binary files a/src/assets/img/screen/bg.png and b/src/assets/img/screen/bg.png differ diff --git a/src/assets/img/screen/left-bottom.png b/src/assets/img/screen/left-bottom.png new file mode 100644 index 0000000..d6321ee Binary files /dev/null and b/src/assets/img/screen/left-bottom.png differ diff --git a/src/assets/img/screen/left-top.png b/src/assets/img/screen/left-top.png new file mode 100644 index 0000000..34f25fc Binary files /dev/null and b/src/assets/img/screen/left-top.png differ diff --git a/src/assets/img/screen/ring_chart.png b/src/assets/img/screen/ring_chart.png new file mode 100644 index 0000000..a02adfb Binary files /dev/null and b/src/assets/img/screen/ring_chart.png differ diff --git a/src/assets/img/screen/ta.png b/src/assets/img/screen/ta.png new file mode 100644 index 0000000..66b0986 Binary files /dev/null and b/src/assets/img/screen/ta.png differ diff --git a/src/assets/img/screen/title_bg-9.png b/src/assets/img/screen/title_bg-9.png new file mode 100644 index 0000000..6286b77 Binary files /dev/null and b/src/assets/img/screen/title_bg-9.png differ diff --git a/src/assets/img/screen/title_bg.png b/src/assets/img/screen/title_bg.png index 6286b77..eaa1655 100644 Binary files a/src/assets/img/screen/title_bg.png and b/src/assets/img/screen/title_bg.png differ diff --git a/src/components/ScreenTitle/index.vue b/src/components/ScreenTitle/index.vue index 4aa75c3..19dfa75 100644 --- a/src/components/ScreenTitle/index.vue +++ b/src/components/ScreenTitle/index.vue @@ -1,7 +1,7 @@ @@ -26,9 +26,9 @@ const reset = () => { .title { /* padding: 12px 6px; */ height: 36px; - padding-left: 30px; - line-height: 25px; - color: #ccc; + padding-left: 55px; + line-height: 37px; + color: #fff; /* background: linear-gradient(to right, #086c94, #0e557f, #06112c); */ background: url('@/assets/img/screen/title_bg.png') no-repeat; @@ -36,5 +36,6 @@ const reset = () => { letter-spacing: 4px; font-size: 16px; display: flex; + font-weight: 600; } diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue index e5bdba9..900abd2 100644 --- a/src/views/big-screen/index.vue +++ b/src/views/big-screen/index.vue @@ -20,12 +20,12 @@
-
- -
-
+ + + +
@@ -34,12 +34,12 @@ + + diff --git a/src/views/big-screen/model-components/left-two-model-new.vue b/src/views/big-screen/model-components/left-two-model-new.vue new file mode 100644 index 0000000..ed64f6a --- /dev/null +++ b/src/views/big-screen/model-components/left-two-model-new.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/views/big-screen/model-components/right-one-model-new.vue b/src/views/big-screen/model-components/right-one-model-new.vue new file mode 100644 index 0000000..b9ea80f --- /dev/null +++ b/src/views/big-screen/model-components/right-one-model-new.vue @@ -0,0 +1,282 @@ + + + + + diff --git a/src/views/big-screen/model-components/right-three-model-new.vue b/src/views/big-screen/model-components/right-three-model-new.vue new file mode 100644 index 0000000..0d6b2b8 --- /dev/null +++ b/src/views/big-screen/model-components/right-three-model-new.vue @@ -0,0 +1,281 @@ + + + + +