Commit 0e3a270637820d6e33f3e0d9e09f963ea3d0f8d7
1 parent
753334c6
地图 title
Showing
11 changed files
with
178 additions
and
6 deletions
src/assets/img/incometotal.svg
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | ||
3 | +<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | ||
4 | + viewBox="-77 78 45 45" style="enable-background:new -77 78 45 45;" xml:space="preserve"> | ||
5 | +<style type="text/css"> | ||
6 | + .st0{fill:#FFF800;} | ||
7 | + .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFF800;} | ||
8 | +</style> | ||
9 | +<path id="XMLID_1_" class="st0" d="M-54.5,81c10.8,0,19.5,8.7,19.5,19.5S-43.7,120-54.5,120S-74,111.3-74,100.5S-65.3,81-54.5,81 | ||
10 | + M-54.5,78C-66.9,78-77,88.1-77,100.5S-66.9,123-54.5,123S-32,112.9-32,100.5S-42.1,78-54.5,78L-54.5,78z"/> | ||
11 | +<path class="st1" d="M-44.5,99.3c0,0.8-0.7,1.5-1.5,1.5h-6.6c0.1,0.2,0.1,0.3,0.1,0.5v2.5h3.5c0.8,0,1.5,0.7,1.5,1.5 | ||
12 | + s-0.7,1.5-1.5,1.5h-3.5v4.5c0,0.8-0.7,1.5-1.5,1.5c-0.8,0-1.5-0.7-1.5-1.5v-4.5H-60c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h4.5 | ||
13 | + v-2.5c0-0.2,0-0.3,0.1-0.5H-63c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h4.6l-4.9-4.9c-0.6-0.6-0.6-1.5,0-2.1c0.6-0.6,1.5-0.6,2.1,0 | ||
14 | + l6.7,6.7l6.7-6.7c0.6-0.6,1.5-0.6,2.1,0s0.6,1.5,0,2.1l-4.9,4.9h4.6C-45.2,97.8-44.5,98.4-44.5,99.3z"/> | ||
15 | +</svg> |
src/assets/img/membertotal.svg
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | ||
3 | +<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | ||
4 | + viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve"> | ||
5 | +<style type="text/css"> | ||
6 | + .st0{fill:#FFAB00;} | ||
7 | +</style> | ||
8 | +<path id="XMLID_1_" class="st0" d="M22.5,3C33.3,3,42,11.7,42,22.5S33.3,42,22.5,42S3,33.3,3,22.5S11.7,3,22.5,3 M22.5,0 | ||
9 | + C10.1,0,0,10.1,0,22.5S10.1,45,22.5,45S45,34.9,45,22.5S34.9,0,22.5,0L22.5,0z"/> | ||
10 | +<path id="XMLID_3_" class="st0" d="M22.5,14.1c2.7,0,5,2.1,5,4.9c0,2.8-2.2,5.1-5,5.1c-2.7,0-5-2.3-5-5.1 | ||
11 | + C17.5,16.1,19.7,14.1,22.5,14.1 M27.5,24.3c0.4,0,0.9,0.1,1.3,0.6c1.3,1.3,2.4,3.6,2.4,3.6l0.8,1.4c0,1-1.1,1.1-1.5,1.1 | ||
12 | + c-0.1,0-0.1,0-0.1,0H14.7c0,0,0,0-0.1,0c-0.4,0-1.6-0.1-1.6-1.1l0.7-1.4c0,0,1.2-2.2,2.5-3.5c0.4-0.4,0.9-0.6,1.4-0.6 | ||
13 | + c0.9,0,2,1.9,4.6,1.8H23C26.2,26.1,26.7,24.3,27.5,24.3 M22.5,11.1c-4.5,0-8,3.5-8,7.9c0,1.1,0.2,2.1,0.6,3c-0.3,0.2-0.7,0.4-1,0.7 | ||
14 | + c-1.6,1.6-2.9,4-3.1,4.3l-0.7,1.4L10,29.1v0.7c0,2.4,2,4.1,4.6,4.1c0.1,0,0.1,0,0.1,0h15.5c0.1,0,0.1,0,0.2,0c2.6,0,4.5-1.7,4.5-4.1 | ||
15 | + v-0.8l-0.4-0.7l-0.7-1.3c-0.3-0.5-1.4-2.8-3-4.4c-0.3-0.3-0.7-0.6-1.1-0.8c0.4-0.9,0.6-1.9,0.6-3C30.5,14.5,27,11.1,22.5,11.1 | ||
16 | + L22.5,11.1z"/> | ||
17 | +</svg> |
src/assets/img/ordertotal.svg
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | ||
3 | +<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | ||
4 | + viewBox="-77 78 45 45" style="enable-background:new -77 78 45 45;" xml:space="preserve"> | ||
5 | +<style type="text/css"> | ||
6 | + .st0{fill:#07B3F5;} | ||
7 | +</style> | ||
8 | +<path id="XMLID_1_" class="st0" d="M-54.5,81c10.8,0,19.5,8.7,19.5,19.5S-43.7,120-54.5,120S-74,111.3-74,100.5S-65.3,81-54.5,81 | ||
9 | + M-54.5,78C-66.9,78-77,88.1-77,100.5S-66.9,123-54.5,123S-32,112.9-32,100.5S-42.1,78-54.5,78L-54.5,78z"/> | ||
10 | +<g id="XMLID_2_"> | ||
11 | + <g id="XMLID_5_"> | ||
12 | + <g id="XMLID_46_"> | ||
13 | + <path id="XMLID_47_" class="st0" d="M-45,91h-19c-0.8,0-1.5,0.7-1.5,1.5S-64.8,94-64,94h19c0.8,0,1.5-0.7,1.5-1.5S-44.2,91-45,91 | ||
14 | + z M-64,102h11c0.8,0,1.5-0.7,1.5-1.5S-52.2,99-53,99h-11c-0.8,0-1.5,0.7-1.5,1.5S-64.8,102-64,102z M-48,107h-16 | ||
15 | + c-0.8,0-1.5,0.7-1.5,1.5s0.7,1.5,1.5,1.5h16c0.8,0,1.5-0.7,1.5-1.5S-47.2,107-48,107z"/> | ||
16 | + </g> | ||
17 | + </g> | ||
18 | +</g> | ||
19 | +</svg> |
src/assets/img/parkingtotal.svg
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | ||
3 | +<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | ||
4 | + viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve"> | ||
5 | +<style type="text/css"> | ||
6 | + .st0{fill:#02C202;} | ||
7 | + .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#02C202;} | ||
8 | +</style> | ||
9 | +<path id="XMLID_1_" class="st0" d="M22.5,3C33.2,3,42,11.7,42,22.5S33.2,42,22.5,42S3,33.3,3,22.5S11.7,3,22.5,3 M22.5,0 | ||
10 | + C10.1,0,0,10.1,0,22.5S10.1,45,22.5,45S45,34.9,45,22.5S34.9,0,22.5,0L22.5,0z"/> | ||
11 | +<g id="XMLID_2_"> | ||
12 | + <g id="XMLID_3_"> | ||
13 | + <path id="XMLID_5_" class="st0" d="M25,15c2.2,0,4,1.8,4,4s-1.8,4-4,4h-7v-8H25 M25,12H15v14h10c3.9,0,7-3.1,7-7S28.9,12,25,12 | ||
14 | + L25,12z"/> | ||
15 | + </g> | ||
16 | + <path id="XMLID_6_" class="st1" d="M15,12h3v23h-3V12z"/> | ||
17 | +</g> | ||
18 | +</svg> |
src/components/lineChart.vue
@@ -41,7 +41,7 @@ export default { | @@ -41,7 +41,7 @@ export default { | ||
41 | } | 41 | } |
42 | }, | 42 | }, |
43 | mounted() { | 43 | mounted() { |
44 | - console.log(this.chartData) | 44 | + // console.log(this.chartData) |
45 | this.initChart() | 45 | this.initChart() |
46 | if (this.autoResize) { | 46 | if (this.autoResize) { |
47 | this.__resizeHandler = debounce(() => { | 47 | this.__resizeHandler = debounce(() => { |
src/components/titlesection.vue
src/filters/filters.js
1 | export function formatNum(str) { | 1 | export function formatNum(str) { |
2 | + // console.log(typeof str) | ||
3 | + // console.log(str) | ||
4 | + var str = (str).toString(); | ||
2 | var newStr = ""; | 5 | var newStr = ""; |
3 | var count = 0; | 6 | var count = 0; |
4 | for (var i = str.length - 1; i >= 0; i--) { | 7 | for (var i = str.length - 1; i >= 0; i--) { |
src/utils/formatNum.js
@@ -16,7 +16,9 @@ | @@ -16,7 +16,9 @@ | ||
16 | // } | 16 | // } |
17 | 17 | ||
18 | function formatNumArr(str) { | 18 | function formatNumArr(str) { |
19 | - console.log(typeof str) | 19 | + // console.log(typeof str) |
20 | + // console.log(str) | ||
21 | + var str = (str).toString(); | ||
20 | var newStr = ""; | 22 | var newStr = ""; |
21 | var count = 0; | 23 | var count = 0; |
22 | for (var i = str.length - 1; i >= 0; i--) { | 24 | for (var i = str.length - 1; i >= 0; i--) { |
src/views/mainContainer.vue
@@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
7 | <youdaopingsection class="sectionsmall"></youdaopingsection> | 7 | <youdaopingsection class="sectionsmall"></youdaopingsection> |
8 | </li> | 8 | </li> |
9 | <li class="margin0-12"> | 9 | <li class="margin0-12"> |
10 | - <div class="heightper-top"></div> | 10 | + <mapsection class="heightper-top"></mapsection> |
11 | <div class="heightper-bottom"> | 11 | <div class="heightper-bottom"> |
12 | <outsection style="width: 50%;float: left;height: 100%;display: flex;flex-direction: column"></outsection> | 12 | <outsection style="width: 50%;float: left;height: 100%;display: flex;flex-direction: column"></outsection> |
13 | <vehiclesection style="width: 50%;float: left;height: 100%;display: flex;flex-direction: column"></vehiclesection> | 13 | <vehiclesection style="width: 50%;float: left;height: 100%;display: flex;flex-direction: column"></vehiclesection> |
@@ -33,6 +33,7 @@ import berthsection from '../views/berthsection' | @@ -33,6 +33,7 @@ import berthsection from '../views/berthsection' | ||
33 | import newssection from '../views/newssection' | 33 | import newssection from '../views/newssection' |
34 | import outsection from '../views/outsection' | 34 | import outsection from '../views/outsection' |
35 | import vehiclesection from '../views/vehiclesection' | 35 | import vehiclesection from '../views/vehiclesection' |
36 | +import mapsection from '../views/mapsection' | ||
36 | 37 | ||
37 | export default { | 38 | export default { |
38 | name: 'mainContainer', | 39 | name: 'mainContainer', |
@@ -45,7 +46,8 @@ export default { | @@ -45,7 +46,8 @@ export default { | ||
45 | berthsection, | 46 | berthsection, |
46 | newssection, | 47 | newssection, |
47 | outsection, | 48 | outsection, |
48 | - vehiclesection | 49 | + vehiclesection, |
50 | + mapsection | ||
49 | }, | 51 | }, |
50 | data() { | 52 | data() { |
51 | return { | 53 | return { |
@@ -91,6 +93,9 @@ export default { | @@ -91,6 +93,9 @@ export default { | ||
91 | .heightper-top { | 93 | .heightper-top { |
92 | border: 1px solid #2391FA; | 94 | border: 1px solid #2391FA; |
93 | flex: 1; | 95 | flex: 1; |
96 | + display: flex; | ||
97 | + flex-direction: column; | ||
98 | + position: relative; | ||
94 | } | 99 | } |
95 | 100 | ||
96 | .heightper-bottom { | 101 | .heightper-bottom { |
src/views/mapsection.vue
0 → 100644
1 | +<template> | ||
2 | + <div> | ||
3 | + <ul class="title-wrap"> | ||
4 | + <li> | ||
5 | + <img src="../assets/img/parkingtotal.svg"> | ||
6 | + <div> | ||
7 | + <p>{{parkingtotal|formatNum}}</p> | ||
8 | + <p>停车场总数</p> | ||
9 | + </div> | ||
10 | + </li> | ||
11 | + <li> | ||
12 | + <img src="../assets/img/membertotal.svg"> | ||
13 | + <div> | ||
14 | + <p>{{membertotal|formatNum}}</p> | ||
15 | + <p>会员总数</p> | ||
16 | + </div> | ||
17 | + </li> | ||
18 | + <li> | ||
19 | + <img src="../assets/img/incometotal.svg"> | ||
20 | + <div> | ||
21 | + <p>{{incometotal|formatNum}}</p> | ||
22 | + <p>今日收入总数</p> | ||
23 | + </div> | ||
24 | + </li> | ||
25 | + <li> | ||
26 | + <img src="../assets/img/ordertotal.svg"> | ||
27 | + <div> | ||
28 | + <p>{{ordertotal|formatNum}}</p> | ||
29 | + <p>今日订单数</p> | ||
30 | + </div> | ||
31 | + </li> | ||
32 | + </ul> | ||
33 | + <div class="flexfm" style="background: #f00"></div> | ||
34 | + </div> | ||
35 | +</template> | ||
36 | + | ||
37 | +<script> | ||
38 | +export default { | ||
39 | + name: 'mapsection', | ||
40 | + data() { | ||
41 | + return { | ||
42 | + parkingtotal: '7338', | ||
43 | + membertotal: '738', | ||
44 | + incometotal: '1156738', | ||
45 | + ordertotal: '6738' | ||
46 | + } | ||
47 | + } | ||
48 | +} | ||
49 | +</script> | ||
50 | + | ||
51 | +<style lang="scss" scoped> | ||
52 | + .title-wrap{ | ||
53 | + display: flex; | ||
54 | + padding-top: 17px; | ||
55 | + padding-bottom: 18px; | ||
56 | + li{ | ||
57 | + flex: 1; | ||
58 | + height: 45px; | ||
59 | + text-align: center; | ||
60 | + overflow: hidden; | ||
61 | + font-size: 0; | ||
62 | + img{ | ||
63 | + display: inline-block; | ||
64 | + width: 45px; | ||
65 | + height: 45px; | ||
66 | + margin-right: 14px; | ||
67 | + } | ||
68 | + div{ | ||
69 | + display: inline-block; | ||
70 | + vertical-align: top; | ||
71 | + text-align: left; | ||
72 | + max-width: 100px; | ||
73 | + overflow: hidden; | ||
74 | + p{ | ||
75 | + &:nth-of-type(1){ | ||
76 | + font-size:24px; | ||
77 | + font-weight:500; | ||
78 | + color:rgba(255,255,255,1); | ||
79 | + overflow: hidden; | ||
80 | + white-space: nowrap; | ||
81 | + text-overflow: ellipsis; | ||
82 | + } | ||
83 | + &:nth-of-type(2){ | ||
84 | + font-size:14px; | ||
85 | + font-weight:bold; | ||
86 | + color:rgba(0,207,254,.7); | ||
87 | + margin-top: 7px; | ||
88 | + } | ||
89 | + } | ||
90 | + } | ||
91 | + } | ||
92 | + } | ||
93 | +</style> |
src/views/newssection.vue
@@ -95,7 +95,7 @@ export default { | @@ -95,7 +95,7 @@ export default { | ||
95 | @include newsType("../assets/img/errortype1.png"); | 95 | @include newsType("../assets/img/errortype1.png"); |
96 | } | 96 | } |
97 | .text{ | 97 | .text{ |
98 | - width:calc(100% - 123px); | 98 | + flex: 1; |
99 | overflow:hidden; | 99 | overflow:hidden; |
100 | text-overflow:ellipsis; | 100 | text-overflow:ellipsis; |
101 | } | 101 | } |