Browse Source

首页跳转 图表高度自适应

master
z_yu 3 years ago
parent
commit
14db9af5ba
  1. 18
      src/views/home.vue
  2. 3
      src/views/storeManage/warehouse3D/index.vue

18
src/views/home.vue

@ -59,7 +59,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-bottom:20px;height:276px;">
<el-row :gutter="20" style="margin-bottom:20px;height: calc(50vh - 231px);">
<el-col :xs="24" :sm="24" :lg="8"> <el-col :xs="24" :sm="24" :lg="8">
<!-- 待办事项 --> <!-- 待办事项 -->
<div class="container-wrap"> <div class="container-wrap">
@ -136,7 +136,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="height:302px;">
<el-row :gutter="20" style="height: calc(50vh - 231px);">
<el-col :xs="24" :sm="24" :lg="8"> <el-col :xs="24" :sm="24" :lg="8">
<!-- 档案借阅 --> <!-- 档案借阅 -->
<div class="container-wrap"> <div class="container-wrap">
@ -242,8 +242,13 @@ export default {
getData() { getData() {
this.tableData = data1.rows this.tableData = data1.rows
}, },
changeActiveTab() {
this.$router.push({ path: '/storeManage/warehouse3D' })
changeActiveTab(id) {
this.$router.push({
name: 'warehouse3D',
params: {
roomId: id
}
})
} }
} }
} }
@ -264,9 +269,10 @@ export default {
// } // }
.chart-wrapper { .chart-wrapper {
height: calc(100% - 40px);
// background: #fff; // background: #fff;
padding: 16px 16px 0;
margin-bottom: 32px;
// padding: 16px 16px 0;
// margin-bottom: 32px;
} }
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {

3
src/views/storeManage/warehouse3D/index.vue

@ -66,6 +66,9 @@ export default {
created() { created() {
console.log(1111) console.log(1111)
this.initWebSocket() this.initWebSocket()
if (this.$route.params.roomId) {
this.activeIndex = this.$route.params.roomId
}
}, },
methods: { methods: {
handleMessageEvent(event) { handleMessageEvent(event) {

Loading…
Cancel
Save