Commit c05ecc8f authored by 郭铭瑶's avatar 郭铭瑶 🤘

修改

parent 2d3c4148
No preview for this file type
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
<title>新江湾城街道智联平台</title> <title>新江湾城街道城市运行平台</title>
<style> <style>
html { html {
font-size: 16vh; font-size: 16vh;
......
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
justify-content space-between justify-content space-between
align-items center align-items center
.img .img
width .3rem width .4rem
height @width height @width
>div >div
width 40% width 40%
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
background #1E4063 background #1E4063
$flex-center() $flex-center()
>img >img
width 80% width 70%
&:last-child &:last-child
flex 1.2 flex 1.2
background $cardBg background $cardBg
......
...@@ -42,7 +42,7 @@ export default { ...@@ -42,7 +42,7 @@ export default {
}, },
options: { options: {
legend: { legend: {
top: '10%', top: '15%',
formatter: (name) => { formatter: (name) => {
const data = this.$store.state.repairRate const data = this.$store.state.repairRate
return `${name} ${(data.find(e => e.name === name)).value}件` return `${name} ${(data.find(e => e.name === name)).value}件`
......
...@@ -37,6 +37,7 @@ export default { ...@@ -37,6 +37,7 @@ export default {
<style lang="stylus" scoped> <style lang="stylus" scoped>
.grid-management .grid-management
display flex display flex
padding-top .05rem
>div >div
display flex display flex
flex 1 flex 1
......
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
display flex display flex
flex 1 flex 1
.chart .chart
width 60% width 55%
height 100% height 100%
.total .total
display flex display flex
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<m-count v-else class="count" :value="child.value" :decimal="child.dec || 0"/> <m-count v-else class="count" :value="child.value" :decimal="child.dec || 0"/>
<span class="unit">{{child.unit}}</span> <span class="unit">{{child.unit}}</span>
<img v-if="child.up" src="@/assets/images/up.png"/> <img v-if="child.up" src="@/assets/images/up.png"/>
<img v-else-if="child.down" src="@/assets/images/down.png"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -44,10 +45,10 @@ export default { ...@@ -44,10 +45,10 @@ export default {
{ {
label: label2 + '年末', label: label2 + '年末',
data: [ data: [
{value: +area2 || 0, unit: 'k㎡', dec: 2, up: area2 > area1}, {value: +area2 || 0, unit: 'k㎡', dec: 2, up: area2 > area1, down: area2 < area1},
{value: +population2 || 0, unit: '人', up: population2 > population1}, {value: +population2 || 0, unit: '人', up: population2 > population1, down: population2 < population1},
{value: +density2 || 0, unit: '人/k㎡', up: density2 > density1}, {value: +density2 || 0, unit: '人/k㎡', up: density2 > density1, down: density2 < density1},
{value: rate, unit: '%', dec: 2}, {value: rate, unit: '%', dec: 2, down: true, },
] ]
}, },
] ]
...@@ -63,7 +64,7 @@ export default { ...@@ -63,7 +64,7 @@ export default {
.labels .labels
color $fontColor color $fontColor
background $cardBg background $cardBg
padding .03rem padding .03rem .05rem
border .01rem dotted $fontColor border .01rem dotted $fontColor
margin-top 0.22rem margin-top 0.22rem
display flex display flex
...@@ -73,7 +74,7 @@ export default { ...@@ -73,7 +74,7 @@ export default {
line-height .2rem line-height .2rem
margin-bottom .01rem margin-bottom .01rem
.content .content
width 38% width 36%
height 100% height 100%
display flex display flex
flex-direction column flex-direction column
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
:complete="complete" :complete="complete"
> >
<m-map ref="map" @complete="mapComplete" @event="handleMapClick"/> <m-map ref="map" @complete="mapComplete" @event="handleMapClick"/>
<m-title area="title" :bgImg="require('@/assets/images/title-bg.png')">新江湾城街道智联平台</m-title> <m-title area="title" :bgImg="require('@/assets/images/title-bg.png')">新江湾城街道城市运行平台</m-title>
<m-animate enter="fadeInLeft" leave="fadeOutLeft"> <m-animate enter="fadeInLeft" leave="fadeOutLeft">
<LeftComponent v-show="!fullView" area="left"/> <LeftComponent v-show="!fullView" area="left"/>
</m-animate> </m-animate>
...@@ -55,6 +55,7 @@ export default { ...@@ -55,6 +55,7 @@ export default {
}, },
data() { data() {
return { return {
timer: null,
complete: false, complete: false,
fullView: false, fullView: false,
videoModal: false, videoModal: false,
...@@ -179,18 +180,30 @@ export default { ...@@ -179,18 +180,30 @@ export default {
'handleList', 'handleList',
]) ])
}, },
beforeDestroy() {
clearInterval(this.timer)
this.timer = null
},
methods: { methods: {
...mapActions([ ...mapActions([
'initData', // 初始化获取首次加载所需的所有数据 'initData', // 初始化获取首次加载所需的所有数据
'getDiscoverTrend',
'getRepairRate',
'getDiscoverInfo',
'getRepairInfo',
'getHandleList',
]), ]),
mapComplete() { mapComplete() {
this.init() this.init()
this.initData() this.initData()
this.complete = true this.complete = true
// setTimeout(() => { this.timer = setInterval(() => {
// this.complete = true this.getDiscoverTrend()
// this.init() this.getRepairRate()
// }, 1000) this.getDiscoverInfo()
this.getRepairInfo()
this.getHandleList()
}, 1000 * 60 * 5)
}, },
init() { init() {
const {map} = this.$refs const {map} = this.$refs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment