diff --git a/src/assets/images/index-bg-2.png b/src/assets/images/index-bg-2.png new file mode 100644 index 00000000..abb0de6f Binary files /dev/null and b/src/assets/images/index-bg-2.png differ diff --git a/src/assets/images/index-bg11.png b/src/assets/images/index-bg11.png new file mode 100644 index 00000000..5bbd4b21 Binary files /dev/null and b/src/assets/images/index-bg11.png differ diff --git a/src/assets/img/screen/bg-gif.gif b/src/assets/img/screen/bg-gif.gif new file mode 100644 index 00000000..dd72cbd6 Binary files /dev/null and b/src/assets/img/screen/bg-gif.gif differ diff --git a/src/assets/img/screen/bg_1-2.png b/src/assets/img/screen/bg_1-2.png new file mode 100644 index 00000000..2a7d63b2 Binary files /dev/null and b/src/assets/img/screen/bg_1-2.png differ diff --git a/src/assets/img/screen/bg_1.png b/src/assets/img/screen/bg_1.png index 2a7d63b2..a3920a59 100644 Binary files a/src/assets/img/screen/bg_1.png and b/src/assets/img/screen/bg_1.png differ diff --git a/src/assets/img/screen/left-bottom-1.png b/src/assets/img/screen/left-bottom-1.png new file mode 100644 index 00000000..d6321ee6 Binary files /dev/null and b/src/assets/img/screen/left-bottom-1.png differ diff --git a/src/assets/img/screen/left-bottom.png b/src/assets/img/screen/left-bottom.png index d6321ee6..cb1139b4 100644 Binary files a/src/assets/img/screen/left-bottom.png and b/src/assets/img/screen/left-bottom.png differ diff --git a/src/assets/img/screen/ring_chart-1.png b/src/assets/img/screen/ring_chart-1.png new file mode 100644 index 00000000..a02adfb9 Binary files /dev/null and b/src/assets/img/screen/ring_chart-1.png differ diff --git a/src/assets/img/screen/ring_chart.png b/src/assets/img/screen/ring_chart.png index a02adfb9..6f74eec4 100644 Binary files a/src/assets/img/screen/ring_chart.png and b/src/assets/img/screen/ring_chart.png differ diff --git a/src/assets/img/screen/ta-1.png b/src/assets/img/screen/ta-1.png new file mode 100644 index 00000000..66b0986f Binary files /dev/null and b/src/assets/img/screen/ta-1.png differ diff --git a/src/assets/img/screen/ta.png b/src/assets/img/screen/ta.png index 66b0986f..dcedb0c1 100644 Binary files a/src/assets/img/screen/ta.png and b/src/assets/img/screen/ta.png differ diff --git a/src/assets/img/screen/tab-active.png b/src/assets/img/screen/tab-active.png new file mode 100644 index 00000000..2ba4fc9e Binary files /dev/null and b/src/assets/img/screen/tab-active.png differ diff --git a/src/assets/img/screen/tab.png b/src/assets/img/screen/tab.png new file mode 100644 index 00000000..9c995ecb Binary files /dev/null and b/src/assets/img/screen/tab.png differ diff --git a/src/assets/img/screen/title_bg-2.png b/src/assets/img/screen/title_bg-2.png new file mode 100644 index 00000000..eaa16557 Binary files /dev/null and b/src/assets/img/screen/title_bg-2.png differ diff --git a/src/assets/img/screen/title_bg.png b/src/assets/img/screen/title_bg.png index eaa16557..31a2d0a9 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 70d3adfd..8890d86d 100644 --- a/src/components/ScreenTitle/index.vue +++ b/src/components/ScreenTitle/index.vue @@ -28,9 +28,9 @@ export default { diff --git a/src/views/screen/shareScreen/components/center-model-7-3.vue b/src/views/screen/shareScreen/components/center-model-7-3.vue index 8ae1ae4f..12fc78d5 100644 --- a/src/views/screen/shareScreen/components/center-model-7-3.vue +++ b/src/views/screen/shareScreen/components/center-model-7-3.vue @@ -2,94 +2,84 @@
- +
-
上架数
- - {{ devUpNum || 0 }} - - + {{ devUpNum || 0 }} +
+
上架数
-
入驻数
-
- - {{ devNum || 0 }} - - +
+ {{ devNum || 0 }} +
-
+
入驻数
+
-
保养数
- - {{ devQcWaningNum || 0 }} - - + {{ devQcWaningNum || 0 }} +
+
保养数
- +
- - {{ rentTotalNum || 0 }} - - + {{ rentTotalNum || 0 }} +
累计数
- - {{ devLeasingNum || 0 }} - - + {{ devLeasingNum || 0 }} +
在租数
{{ devRepairingNum || 0 }} - +
退租数
@@ -98,48 +88,42 @@
- +
- - {{ leaseNum || 0 }} - - + {{ leaseNum || 0 }} +
需求总数
- - {{ demandUnitNum || 0 }} - - + {{ demandUnitNum || 0 }} +
需求单位
- - {{ maTypeCountFromLease || 0 }} - - + {{ maTypeCountFromLease || 0 }} +
需求总类
@@ -313,7 +297,7 @@ export default { .item { height: 30%; - background: url('../../../../assets/img/screen/center1_1.png') no-repeat; + /* background: url('../../../../assets/img/screen/center1_1.png') no-repeat; */ background-size: 100% 100%; .item-title { @@ -351,13 +335,21 @@ export default { } .xxxx { - font-family: DS-TITle; - font-size: 26px; + /* font-family: DS-TITle; + font-size: 36px; // font-weight: bold; - letter-spacing: 3px; + letter-spacing: 3px; */ + font-family: DIN; + font-weight: bold; + font-size: 39px; + text-shadow: 5px 11px 30px rgba(111,149,192,0.18); + text-stroke: 1px #FFFFFF; + text-align: center; + font-style: normal; + text-transform: none; } .yyyy { - padding-bottom: 10px; + /* padding-bottom: 10px; */ } .zzzz { transform: translateX(10px); @@ -380,7 +372,7 @@ export default { } } -.info-box_1 div:last-child { +/* .info-box_1 div:last-child { background: url('../../../../assets/img/screen/center1_2.png') no-repeat; background-size: 100% 100%; } @@ -393,7 +385,7 @@ export default { transform: scale(1.2); background: url('../../../../assets/img/screen/center1_4.png') no-repeat; background-size: 100% 100%; -} +} */ .info-box_2 div:first-child { transform: translateY(40px); diff --git a/src/views/screen/shareScreen/components/left-one-model-new.vue b/src/views/screen/shareScreen/components/left-one-model-new.vue index 680b9f49..52c4a5c9 100644 --- a/src/views/screen/shareScreen/components/left-one-model-new.vue +++ b/src/views/screen/shareScreen/components/left-one-model-new.vue @@ -8,7 +8,7 @@
- Icon 1 +
{{ idle80 || 0 }}
@@ -18,7 +18,7 @@
- Icon 2 +
{{ idle3080 || 0 }}
@@ -28,7 +28,7 @@
- Icon 3 +
{{ idle30 || 0 }}
@@ -86,7 +86,7 @@ export default { flex-direction: column; height: 100%; width: 100%; - background: url('../../../../assets/img/screen/bg_1.png') no-repeat; + /* background: url('../../../../assets/img/screen/bg_1.png') no-repeat; */ background-size: 100% 100%; box-sizing: border-box; @@ -133,9 +133,17 @@ export default { } .value { - font-family: DS-TITle; + /* font-family: DS-TITle; font-size: 30px; - color: #7fe4cc; + color: #7fe4cc; */ + font-family: DIN; + font-weight: bold; + font-size: 30px; + text-shadow: 5px 11px 30px rgba(111,149,192,0.18); + text-stroke: 1px #FFFFFF; + text-align: center; + font-style: normal; + text-transform: none; } .unit { diff --git a/src/views/screen/shareScreen/components/left-two-model-new.vue b/src/views/screen/shareScreen/components/left-two-model-new.vue index 1a994baa..b148e5f3 100644 --- a/src/views/screen/shareScreen/components/left-two-model-new.vue +++ b/src/views/screen/shareScreen/components/left-two-model-new.vue @@ -156,15 +156,24 @@ export default { } .value { - font-family: DS-TITle; + /* font-family: DS-TITle; font-size: 30px; - color: #7fe4cc; + color: #7fe4cc; */ + font-family: DIN; + font-weight: bold; + font-size: 30px; + text-shadow: 5px 11px 30px rgba(111,149,192,0.18); + text-stroke: 1px #FFFFFF; + text-align: center; + font-style: normal; + text-transform: none; .unit { font-size: 14px; } } .percentage { + font-family: DIN; font-size: 16px; color: #00b9c7; margin-top: 5px; diff --git a/src/views/screen/shareScreen/components/right-three-model-new.vue b/src/views/screen/shareScreen/components/right-three-model-new.vue index 0ad9f252..973fb362 100644 --- a/src/views/screen/shareScreen/components/right-three-model-new.vue +++ b/src/views/screen/shareScreen/components/right-three-model-new.vue @@ -279,16 +279,24 @@ export default { display: flex; margin-bottom: 10px; button { + width: 100px; + height: 30px; padding: 5px 10px; margin-right: 5px; - background-color: #09403f; + /* background-color: #09403f; */ + background: transparent; color: #fff; border: none; cursor: pointer; - border-radius: 20px; + /* border-radius: 20px; */ + background-image: url('../../../../assets/img/screen/tab.png'); + background-size: 100% 100%; &.active { - background-color: #00b9c7; - border-radius: 20px; + height: 30px; + /* background-color: #00b9c7; */ + /* border-radius: 20px; */ + background-image: url('../../../../assets/img/screen/tab-active.png'); + background-size: 100% 100%; } } } diff --git a/src/views/screen/shareScreen/index.vue b/src/views/screen/shareScreen/index.vue index 78049f68..dc506b84 100644 --- a/src/views/screen/shareScreen/index.vue +++ b/src/views/screen/shareScreen/index.vue @@ -1,6 +1,6 @@