Merge branch 'dev' of https://gitlab.33.cn/CassiniatSaturn/fns_backend into dev

src/views/Root/Banner/index.vue

@@ -86,8 +86,7 @@
         <a-icon
           type="picture"
           @click="preview(record.file_name)"
-          theme="twoTone"
-          style="fontsize: 20px;"
+          style="fontsize: 20px; color:#3E4FAF"
         />
         <el-image-viewer
           v-if="showViewer"

src/views/Root/Home/index.vue

 <template>
-  <div class="">
+  <div class=" overflow-x-auto">
     <p class="text-2xl font-bold mb-5">实时数据</p>
     <a-row type="flex" justify="center" align="middle" :gutter="[50, 100]">
       <a-col>
@@ -15,11 +15,10 @@
     <p class="text-2xl font-bold my-5">日活折线图</p>
     <!-- 数据源 -->
     <span>数据：</span>
-    <a-radio-group
-      @change="handleChangeSource"
-      v-model="chartType"
-    >
-      <a-radio-button :value="eBarChart.not_login_dau"> 全局日活 </a-radio-button>
+    <a-radio-group @change="handleChangeSource" v-model="chartType">
+      <a-radio-button :value="eBarChart.not_login_dau">
+        全局日活
+      </a-radio-button>
       <a-radio-button :value="eBarChart.login_dau"> 注册日活 </a-radio-button>
     </a-radio-group>
     <!-- 日期范围 -->
@@ -29,7 +28,12 @@
       <a-radio-button value="15"> 15天 </a-radio-button>
       <a-radio-button value="30"> 30天 </a-radio-button>
     </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>
 </template>
 
@@ -65,6 +69,14 @@ export default Vue.extend({
         yAxis: {
           type: "value",
         },
+        grid:[
+          {
+            left: 20,
+            top: 30,
+            right: 0,
+            bottom: 70,
+          }
+        ],
         series: [
           {
             // data: [] as Array<number>,

src/views/Root/index.vue

 <template>
   <div>
-    <a-layout id="components-layout-demo-fixed-sider" style="max-height: 100vh" >
-      <a-layout-header :style="{ position: 'fixed', zIndex: 1, width: '100%' }" >
+    <a-layout >
+      <a-layout-header>
         <div class="flex justify-between items-center h-full">
           <div class="text-center text-lg my-3 flex font-semibold">
             <img src="../../assets/org_logo.png" class=" w-7 h-7 mr-2">
@@ -20,10 +20,10 @@
           </div>
         </div>
       </a-layout-header>
-      <a-layout id="components-layout-demo-fixed-sider" >
-        <a-layout-sider width="256" style="background: white;" :style="{ overflow: 'auto', height: '100vh', position: 'fixed', left: 0 ,top:'64px'}">
+      <a-layout >
+        <a-layout-sider width="240" style="background: white; min-height:100vh">
           <a-menu
-            style="width: 256px"
+            style="width: 240px"
             :open-keys.sync="openKeys"
             mode="inline"
             :selectedKeys="selectedKeys"
@@ -48,9 +48,9 @@
             </component>
           </a-menu>
         </a-layout-sider>
-        <a-layout :style="{ marginLeft: '250px' }">
+        <a-layout>
         <a-layout-content
-          :style="{ margin: '80px 16px 0', overflow: 'initial' }"
+          :style="{ margin: '16px 16px 0', overflow: 'initial' }"
         >
           <div
             :style="{