Commit e4c8b68a authored by Zhang Xiaojie's avatar Zhang Xiaojie

fix:layout

parent d93794c1
...@@ -86,8 +86,7 @@ ...@@ -86,8 +86,7 @@
<a-icon <a-icon
type="picture" type="picture"
@click="preview(record.file_name)" @click="preview(record.file_name)"
theme="twoTone" style="fontsize: 20px; color:#3E4FAF"
style="fontsize: 20px;"
/> />
<el-image-viewer <el-image-viewer
v-if="showViewer" v-if="showViewer"
......
...@@ -15,11 +15,10 @@ ...@@ -15,11 +15,10 @@
<p class="text-2xl font-bold my-5">日活折线图</p> <p class="text-2xl font-bold my-5">日活折线图</p>
<!-- 数据源 --> <!-- 数据源 -->
<span>数据:</span> <span>数据:</span>
<a-radio-group <a-radio-group @change="handleChangeSource" v-model="chartType">
@change="handleChangeSource" <a-radio-button :value="eBarChart.not_login_dau">
v-model="chartType" 全局日活
> </a-radio-button>
<a-radio-button :value="eBarChart.not_login_dau"> 全局日活 </a-radio-button>
<a-radio-button :value="eBarChart.login_dau"> 注册日活 </a-radio-button> <a-radio-button :value="eBarChart.login_dau"> 注册日活 </a-radio-button>
</a-radio-group> </a-radio-group>
<!-- 日期范围 --> <!-- 日期范围 -->
...@@ -29,7 +28,12 @@ ...@@ -29,7 +28,12 @@
<a-radio-button value="15"> 15天 </a-radio-button> <a-radio-button value="15"> 15天 </a-radio-button>
<a-radio-button value="30"> 30天 </a-radio-button> <a-radio-button value="30"> 30天 </a-radio-button>
</a-radio-group> </a-radio-group>
<div id="barchart" ref="barchart" class="h-96 w-5/6 ml-20"></div> <div
id="barchart"
ref="barchart"
style="width:1200px"
class="h-96 mx-auto text-center"
></div>
</div> </div>
</template> </template>
...@@ -65,6 +69,14 @@ export default Vue.extend({ ...@@ -65,6 +69,14 @@ export default Vue.extend({
yAxis: { yAxis: {
type: "value", type: "value",
}, },
grid:[
{
left: 20,
top: 30,
right: 0,
bottom: 70,
}
],
series: [ series: [
{ {
// data: [] as Array<number>, // data: [] as Array<number>,
......
<template> <template>
<div> <div>
<a-layout id="components-layout-demo-fixed-sider" style="max-height: 100vh" > <a-layout >
<a-layout-header :style="{ position: 'fixed', zIndex: 1, width: '100%' }" > <a-layout-header>
<div class="flex justify-between items-center h-full"> <div class="flex justify-between items-center h-full">
<div class="text-center text-lg my-3 flex font-semibold"> <div class="text-center text-lg my-3 flex font-semibold">
<img src="../../assets/org_logo.png" class=" w-7 h-7 mr-2"> <img src="../../assets/org_logo.png" class=" w-7 h-7 mr-2">
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
</div> </div>
</div> </div>
</a-layout-header> </a-layout-header>
<a-layout id="components-layout-demo-fixed-sider" > <a-layout >
<a-layout-sider width="256" style="background: white;" :style="{ overflow: 'auto', height: '100vh', position: 'fixed', left: 0 ,top:'64px'}"> <a-layout-sider width="240" style="background: white; min-height:100vh">
<a-menu <a-menu
style="width: 256px" style="width: 240px"
:open-keys.sync="openKeys" :open-keys.sync="openKeys"
mode="inline" mode="inline"
:selectedKeys="selectedKeys" :selectedKeys="selectedKeys"
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
</component> </component>
</a-menu> </a-menu>
</a-layout-sider> </a-layout-sider>
<a-layout :style="{ marginLeft: '250px' }"> <a-layout>
<a-layout-content <a-layout-content
:style="{ margin: '80px 16px 0', overflow: 'initial' }" :style="{ margin: '16px 16px 0', overflow: 'initial' }"
> >
<div <div
:style="{ :style="{
......
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