diff --git a/src/assets/img/incometotal.svg b/src/assets/img/incometotal.svg new file mode 100644 index 0000000..dc197f4 --- /dev/null +++ b/src/assets/img/incometotal.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/src/assets/img/membertotal.svg b/src/assets/img/membertotal.svg new file mode 100644 index 0000000..30b2dcf --- /dev/null +++ b/src/assets/img/membertotal.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/src/assets/img/ordertotal.svg b/src/assets/img/ordertotal.svg new file mode 100644 index 0000000..c821840 --- /dev/null +++ b/src/assets/img/ordertotal.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/src/assets/img/parkingtotal.svg b/src/assets/img/parkingtotal.svg new file mode 100644 index 0000000..df147c9 --- /dev/null +++ b/src/assets/img/parkingtotal.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/src/components/lineChart.vue b/src/components/lineChart.vue index 1cdd5c7..4cf82cb 100644 --- a/src/components/lineChart.vue +++ b/src/components/lineChart.vue @@ -41,7 +41,7 @@ export default { } }, mounted() { - console.log(this.chartData) + // console.log(this.chartData) this.initChart() if (this.autoResize) { this.__resizeHandler = debounce(() => { diff --git a/src/components/titlesection.vue b/src/components/titlesection.vue index 0c665d0..a4c7e60 100644 --- a/src/components/titlesection.vue +++ b/src/components/titlesection.vue @@ -9,7 +9,7 @@ export default { name: 'titlesection', props:['title'], created() { - console.log(this.title) + // console.log(this.title) } } diff --git a/src/filters/filters.js b/src/filters/filters.js index f03da20..7f79450 100644 --- a/src/filters/filters.js +++ b/src/filters/filters.js @@ -1,4 +1,7 @@ export function formatNum(str) { + // console.log(typeof str) + // console.log(str) + var str = (str).toString(); var newStr = ""; var count = 0; for (var i = str.length - 1; i >= 0; i--) { diff --git a/src/utils/formatNum.js b/src/utils/formatNum.js index f854ef5..95164d9 100644 --- a/src/utils/formatNum.js +++ b/src/utils/formatNum.js @@ -16,7 +16,9 @@ // } function formatNumArr(str) { - console.log(typeof str) + // console.log(typeof str) + // console.log(str) + var str = (str).toString(); var newStr = ""; var count = 0; for (var i = str.length - 1; i >= 0; i--) { diff --git a/src/views/mainContainer.vue b/src/views/mainContainer.vue index 91e86ba..8975c93 100644 --- a/src/views/mainContainer.vue +++ b/src/views/mainContainer.vue @@ -7,7 +7,7 @@
  • -
    +
    @@ -33,6 +33,7 @@ import berthsection from '../views/berthsection' import newssection from '../views/newssection' import outsection from '../views/outsection' import vehiclesection from '../views/vehiclesection' +import mapsection from '../views/mapsection' export default { name: 'mainContainer', @@ -45,7 +46,8 @@ export default { berthsection, newssection, outsection, - vehiclesection + vehiclesection, + mapsection }, data() { return { @@ -91,6 +93,9 @@ export default { .heightper-top { border: 1px solid #2391FA; flex: 1; + display: flex; + flex-direction: column; + position: relative; } .heightper-bottom { diff --git a/src/views/mapsection.vue b/src/views/mapsection.vue new file mode 100644 index 0000000..e75e804 --- /dev/null +++ b/src/views/mapsection.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/views/newssection.vue b/src/views/newssection.vue index d5e403a..3aa2a18 100644 --- a/src/views/newssection.vue +++ b/src/views/newssection.vue @@ -95,7 +95,7 @@ export default { @include newsType("../assets/img/errortype1.png"); } .text{ - width:calc(100% - 123px); + flex: 1; overflow:hidden; text-overflow:ellipsis; }