diff --git a/src/styles/utils.scss b/src/styles/utils.scss new file mode 100644 index 0000000000000000000000000000000000000000..3e9750d48433e14149c4ef33b97d13c262c1c857 --- /dev/null +++ b/src/styles/utils.scss @@ -0,0 +1,19 @@ +//使用scss的math函数,https://sass-lang.com/documentation/breaking-changes/slash-div +@use "sass:math"; + + +//默认设计稿的宽度 +$designWidth:1920; +//默认设计稿的高度 +$designHeight:1080; + + +//px转为vw的函数 +@function vw($px) { + @return math.div($px , $designWidth) * 100vw; +} + +//px转为vh的函数 +@function vh($px) { + @return math.div($px , $designHeight) * 100vh; +} diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue index 5a0287d2cf8c1ded9a5485c0c520a936efae217f..18d396fb6ae572a542db460604fc5f7bb5092c59 100644 --- a/src/views/NewMainPage.vue +++ b/src/views/NewMainPage.vue @@ -1,17 +1,188 @@ diff --git a/src/views/NewMainPageComponents/LeftCenter.vue b/src/views/NewMainPageComponents/LeftCenter.vue new file mode 100644 index 0000000000000000000000000000000000000000..b95a5f2c76425b535d8707497ba5ecbf13157863 --- /dev/null +++ b/src/views/NewMainPageComponents/LeftCenter.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/views/NewMainPageComponents/LeftMiddle.vue b/src/views/NewMainPageComponents/LeftMiddle.vue deleted file mode 100644 index 0cc6ae77b5a106518ef2765335506e14dd05745b..0000000000000000000000000000000000000000 --- a/src/views/NewMainPageComponents/LeftMiddle.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/src/views/NewMainPageComponents/LowerLeft.vue b/src/views/NewMainPageComponents/LowerLeft.vue index faa97beaa0ad815c2a95799a31f83887e728ae23..6ba9bd0ba7537dc9d8d23956c9c158f500615510 100644 --- a/src/views/NewMainPageComponents/LowerLeft.vue +++ b/src/views/NewMainPageComponents/LowerLeft.vue @@ -1,7 +1,7 @@ @@ -34,27 +34,36 @@ export default { }, legend: {}, grid: { + top: '12%', left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { + // show: false, + splitLine: { + show: false // 不显示网格线 + }, type: 'value', boundaryGap: [0, 0.01] + }, yAxis: { + // show: false, type: 'category', data: ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10'] }, series: [ { name: '当前通过人数', + color: '#55a0a1', type: 'bar', data: [18203, 23489, 29034, 104970, 131744, 630230, 29034, 104970, 131744, 630230] }, { name: '当前报警人数', + color: '#cfc844', type: 'bar', data: [19325, 23438, 31000, 121594, 134141, 681807, 31000, 121594, 134141, 681807] } diff --git a/src/views/NewMainPageComponents/RightBottom.vue b/src/views/NewMainPageComponents/RightBottom.vue new file mode 100644 index 0000000000000000000000000000000000000000..a85c4b211beb7653dbb2f404da7ba5ee63ee3e7c --- /dev/null +++ b/src/views/NewMainPageComponents/RightBottom.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/NewMainPageComponents/RightMiddle.vue b/src/views/NewMainPageComponents/RightMiddle.vue index 1e652a8e89d40c0d08650a48730a4633a16bd475..3bab75f89ae5f8570893e52ebb8874f55911ac29 100644 --- a/src/views/NewMainPageComponents/RightMiddle.vue +++ b/src/views/NewMainPageComponents/RightMiddle.vue @@ -1,19 +1,15 @@