Skip to content

Commit 98a257b

Browse files
author
奇淼(piexlmax
authored
Merge pull request #724 from flipped-aurora/gva-vue3
调整不同屏幕下的兼容性
2 parents c5daed4 + 2f402fe commit 98a257b

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

web/src/view/dashboard/dashbordCharts/echartsLine.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default {
6767
this.chart.setOption({
6868
grid: {
6969
left: '40',
70-
right: '40',
70+
right: '20',
7171
top: '40',
7272
bottom: '20',
7373
},
@@ -102,7 +102,7 @@ export default {
102102
series: [
103103
{
104104
type: 'bar',
105-
barWidth: 40,
105+
barWidth: '40%',
106106
itemStyle: {
107107
borderRadius: [5, 5, 0, 0],
108108
color: '#188df0',

web/src/view/dashboard/dashbordTable/dashbordTable.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</div>
66
<div class="log">
77
<div v-for="(item,key) in dataTimeline" :key="key" class="log-item">
8-
<div class="flex-1 flex"><span class="key" :class="key<3&&'top'">{{ key+1 }}</span></div>
8+
<div class="flex-1 flex key-box"><span class="key" :class="key<3&&'top'">{{ key+1 }}</span></div>
99
<div class="flex-5 flex message">{{ item.message }}</div>
1010
<div class="flex-3 flex form">{{ item.from }}</div>
1111
</div>
@@ -58,8 +58,10 @@ export default {
5858
display: flex;
5959
justify-content: space-between;
6060
margin-top: 14px;
61+
.key-box{
62+
justify-content: center;
63+
}
6164
.key{
62-
margin-left: 12px;
6365
&.top{
6466
background: #314659;
6567
color: #FFFFFF;;

web/src/view/layout/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export default {
160160
return this.$route.matched
161161
}
162162
},
163-
mounted() {
163+
created() {
164164
const screenWidth = document.body.clientWidth
165165
if (screenWidth < 1000) {
166166
this.isMobile = true
@@ -175,6 +175,8 @@ export default {
175175
this.isSider = true
176176
this.isCollapse = false
177177
}
178+
},
179+
mounted() {
178180
emitter.emit('collapse', this.isCollapse)
179181
emitter.emit('mobile', this.isMobile)
180182
emitter.on('reload', this.reload)

0 commit comments

Comments
 (0)