Merge branch 'common' of https://gitlab.redhtc.com/Berlincen/DA-Platform into common

.gitignore

+.DS_Store
+node_modules/
+/dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

DAPlatform/src/assets/scss/config.scss

@@ -9,3 +9,4 @@ $theme-color:    #409EFF !default;   //element原生蓝，主题色及按钮色
 $bg-color:       #d9ecff !default;   //背景蓝
 $font-color-footer: #969595 !default;   //注脚的字体颜色
 $divider-color:     #DCDFE6 !default;  //分割线颜色
+

DAPlatform/src/components/Login.vue

@@ -45,7 +45,7 @@ export default {
     login () {
       this.$router.push('/index').catch(data => {})
     },
-    register(){
+    register () {
       this.$router.push('/index').catch(data => {})
     }
   }

DAPlatform/src/components/NavHeader.vue

@@ -36,10 +36,12 @@ export default {
 
 <!-- Add 'scoped' attribute to limit CSS to this component only -->
 <style scoped lang='scss'>
+@import '@/assets/scss/config.scss';
 .nav-header-container{
   padding-left: 10%;
   padding-right: 10%;
-  background-color: #409EFF;
+  min-width: $min-width;
+  background-color: $theme-color;
   .logout-btn{
     float: right;
   }

DAPlatform/src/router/index.js

@@ -16,6 +16,7 @@ export default new Router({
     {
       path: '/index',
       name: 'index',
+      redirect: '/taskhall',
       component: Index,
       children: [
         {