From 336f3dd82eccb765202556de02f5510087110cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=AC=A3?= <xin.huang@ribo.com.cn>
Date: Sat, 20 Nov 2021 23:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layout/components/Topbar.vue       | 14 ++++++++------
 frontend/src/styles/topbar.scss                 |  2 ++
 frontend/src/utils/message.js                   |  2 +-
 frontend/src/views/chart/index.vue              |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue     | 10 +++++-----
 frontend/src/views/dataset/index.vue            |  2 +-
 frontend/src/views/system/datasource/DsMain.vue |  2 +-
 frontend/src/views/system/datasource/index.vue  |  2 +-
 8 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index d78706b..9e1c980 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="top-nav">
     <div v-loading="!axiosFinished" class="log">
-      <span>Ipsos VIA BIBoard</span>
+      <router-link to="/">
+        <span>Ipsos VIA BIBoard</span>
+      </router-link>
 <!--      <svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" />-->
 <!--      <img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;">-->
     </div>
@@ -37,11 +39,11 @@
 
       <el-dropdown class="top-dropdown" style="display: flex;align-items: center; width:200px;" trigger="click">
         <div class="el-dropdown-link" style="display: flex;color: #f7f7f4;font-size: 14px; width:100%;">
-          <el-avatar></el-avatar>
-        <div style="display: flex; align-items: center; margin-left: 10px">
-          <span style="max-width:80px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;">{{ name }}</span>
-          <span><i class="el-icon-arrow-down el-icon--right" /></span>
-        </div>
+          <el-avatar :src="require('../../assets/login.png')" />
+          <div style="display: flex; align-items: center; margin-left: 10px">
+            <span style="max-width:80px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;">{{ name }}</span>
+            <span><i class="el-icon-arrow-down el-icon--right" /></span>
+          </div>
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/person-info/index">
diff --git a/frontend/src/styles/topbar.scss b/frontend/src/styles/topbar.scss
index b4d8653..52b7925 100644
--- a/frontend/src/styles/topbar.scss
+++ b/frontend/src/styles/topbar.scss
@@ -11,6 +11,8 @@
   .log {
     padding: 0 16px;
     line-height: 56px;
+    width: 259px;
+    text-align: center;
     height: 56px;
     font-size: 24px;
     background-color: #02aca9 ;
diff --git a/frontend/src/utils/message.js b/frontend/src/utils/message.js
index 74f3daa..78dbc27 100644
--- a/frontend/src/utils/message.js
+++ b/frontend/src/utils/message.js
@@ -52,7 +52,7 @@ export const $error = (message, duration) => {
     message: message,
     type: 'error',
     showClose: true,
-    duration: duration || 10000
+    duration: duration || 5000
   })
 }
 
diff --git a/frontend/src/views/chart/index.vue b/frontend/src/views/chart/index.vue
index 7e5d0b4..dc2f2ac 100644
--- a/frontend/src/views/chart/index.vue
+++ b/frontend/src/views/chart/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
+  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
 
     <de-aside-container>
       <group :save-status="saveStatus" @switchComponent="switchComponent" />
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index f1cd678..3106b30 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -106,11 +106,11 @@
                       @change="save(true,'chart',true,true)"
                     >
                       <div class="chart-radio-div" style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
-<!--                        <el-radio value="table-normal" label="table-normal">-->
-<!--                          <span :title="$t('chart.chart_table_normal')">-->
-<!--                            <svg-icon icon-class="table-normal" class="chart-icon" />-->
-<!--                          </span>-->
-<!--                        </el-radio>-->
+                        <el-radio value="table-normal" label="table-normal">
+                          <span :title="$t('chart.chart_table_normal')">
+                            <svg-icon icon-class="table-normal" class="chart-icon" />
+                          </span>
+                        </el-radio>
                         <el-radio value="table-info" label="table-info">
                           <span :title="$t('chart.chart_table_info')">
                             <svg-icon icon-class="table-info" class="chart-icon" />
diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue
index 3b20bc1..c5a7c3f 100644
--- a/frontend/src/views/dataset/index.vue
+++ b/frontend/src/views/dataset/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
+  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
 
     <de-aside-container>
       <group :save-status="saveStatus" @switchComponent="switchComponent" />
diff --git a/frontend/src/views/system/datasource/DsMain.vue b/frontend/src/views/system/datasource/DsMain.vue
index c2bc149..0373912 100644
--- a/frontend/src/views/system/datasource/DsMain.vue
+++ b/frontend/src/views/system/datasource/DsMain.vue
@@ -1,5 +1,5 @@
 <template>
-  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
+  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
     <de-aside-container style="padding: 0 0;">
       <ds-tree ref="dsTree" @switch-main="switchMain" />
     </de-aside-container>
diff --git a/frontend/src/views/system/datasource/index.vue b/frontend/src/views/system/datasource/index.vue
index 713cdb2..29a0e6f 100644
--- a/frontend/src/views/system/datasource/index.vue
+++ b/frontend/src/views/system/datasource/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa"> -->
-  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
+  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
     <de-main-container>
       <ds-main ref="dsMain" />
     </de-main-container>