Authored by 王涛

Merge branch 'master-v32-lushangqing' into 'master'

大屏及电子税务局页面样式修改,访问量监控改为近30天访问量,



See merge request !67
... ... @@ -235,3 +235,6 @@ body{font-size: 15px;}
position: relative;
top: 14px;
}
.flex-chart .container-title{
}
... ...
... ... @@ -29,7 +29,7 @@ export default {
},
comtitleImgStyle () {
return {
height: this.titleFontSize * 1.8 + 'px'
// height: this.titleFontSize * 1.8 + 'px'
}
}
},
... ...
... ... @@ -34,7 +34,7 @@ export default {
},
comtitleImgStyle () {
return {
height: this.titleFontSize * 2.1 + 'px'
// height: this.titleFontSize * 2.1 + 'px'
}
},
comcircletextStyle () {
... ...
... ... @@ -37,7 +37,7 @@ export default {
},
comtitlesizeStyle () {
return {
height: this.titleFontSize * 7 + 'px',
// height: this.titleFontSize * 7 + 'px',
// width: this.titleFontSize * 6 + 'px'
}
},
... ...
<div class="monitoring-bar" id="mon-bar">
<img :style="comtitleImgStyle" src="/vue3/src/assets/images/digitalDp/title-monitoring.png" alt="">
<div class="container-title">
<img :style="comtitleImgStyle" src="/vue3/src/assets/images/digitalDp/title-monitoring.png" alt="">
</div>
<BarChart :optionData="optionData" v-if="optionData"></BarChart>
</div>
... ...
... ... @@ -22,7 +22,7 @@ export default {
computed: {
comtitleImgStyle () {
return {
height: this.titleFontSize * 2.1 + 'px'
// height: this.titleFontSize * 2.1 + 'px'
}
}
... ...
... ... @@ -34,8 +34,8 @@ export default {
},
comtitleImgStyle () {
return {
height: this.titleFontSize * 2 + 'px',
width: this.titleFontSize * 14 + 'px'
// height: this.titleFontSize * 2 + 'px',
// width: this.titleFontSize * 14 + 'px'
}
}
},
... ...
... ... @@ -27,7 +27,7 @@ export default {
() => myImport('views/zjdaping/components/declareLine/index')
),
'MonitoringMonth': Vue.defineAsyncComponent(
() => myImport('views/zjdaping/components/monitoringMonth/index')
() => myImport('views/dp/components/monitoring/index')
),
'Performance': Vue.defineAsyncComponent(
() => myImport('views/zjdaping/components/performance/index')
... ...