Merge branch 'develop'

.all-contributorsrc

@@ -0,0 +1,51 @@
+{
+  "projectName": "GTD-Visualization",
+  "projectOwner": "CS-Tao",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "LaZzyMan",
+      "name": "zz",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/23273105?v=4",
+      "profile": "https://github.com/LaZzyMan",
+      "contributions": [
+        "code",
+        "design"
+      ]
+    },
+    {
+      "login": "tang-xy",
+      "name": "tang-xy",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/22520131?v=4",
+      "profile": "https://github.com/tang-xy",
+      "contributions": [
+        "code",
+        "plugin"
+      ]
+    },
+    {
+      "login": "Cong-Zou",
+      "name": "Cong-Zou",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/28620426?v=4",
+      "profile": "https://github.com/Cong-Zou",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lsq210",
+      "name": "lsq210",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/34806806?v=4",
+      "profile": "https://github.com/lsq210",
+      "contributions": [
+        "code"
+      ]
+    }
+  ]
+}

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -12,8 +12,13 @@
   ![](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/blog/image/others/17.png)
 - `feature`
 
-  活动分支，用于新功能开发，该分支从 `develop` 为拉取，用完即删，也就是在 PR 合并(merge)的时候选择删除原分支。而且如果在本分支的开发过程中，发现 `develop` 分支有更新，只能
-  使用 `rebase` 将 `develop` 的提交合并到当前 `feature` 分支。尽量在每次发送 PR 前都从 `develop` 分支 `rebase` 一下，使当前分支的`基`和 `develop` 分支的最新提交一致
+  活动分支，用于新功能开发，该分支从 `develop` 拉取，开发完成后合并(merge)到 `develop`，应当采用策略合并，并且用完即删，即：
+  ```bash
+  git checkout develop
+  git merge --no-ff feature-1
+  git branch -D feature-1
+  git push origin develop
+  ```
 - `release`
 
   正式发布前的测试分支，从 `develop` 拉出，测试完成并修复 Bug 后，合并(merge)到 `master` 分支和 `develop` 分支
@@ -23,7 +28,13 @@
 
   从 `master` 拉出，用于必须立即解决的 Bug，解决完 Bug 合并(merge)到 `master`
 
-### 关于从远程代码拉取
+### 发送 PR
+
+应该在不同仓库的 `develop` 分支上进行，非中央仓库的 `develop` 分支应当使用 rebase 和中央仓库的 `develop` 分支合并之后再向中央仓库发送 PR
+
+### 关于从远程拉取代码
+
+应当避免合并提交的产生：
 ```bash
 git pull origin develop --rebase
 ```

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,12 @@
+---
+name: Bug report
+about: 漏洞报告
+
+---
+
+**操作系统和Node版本**
+- 操作系统：
+- Node：
+
+**Bug 描述**
+// TODO:

.github/ISSUE_TEMPLATE/new_feature.md

@@ -0,0 +1,11 @@
+---
+name: New feature
+about: 添加一个新功能
+
+---
+
+**功能描述**
+// TODO:
+
+**具体任务**
+// TODO:

README.md

@@ -1,4 +1,5 @@
 
+[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors)
 [![Build Status](https://travis-ci.org/CS-Tao/GTD-Visualization.svg?branch=master)](https://travis-ci.org/CS-Tao/GTD-Visualization)
 [![Build status](https://ci.appveyor.com/api/projects/status/2fv7nefk6ojj509y?svg=true)](https://ci.appveyor.com/project/CS-Tao/gtd-visualization)
 [![Coverage Status](https://coveralls.io/repos/github/CS-Tao/GTD-Visualization/badge.svg?branch=master)](https://coveralls.io/github/CS-Tao/GTD-Visualization?branch=master)
@@ -13,12 +14,12 @@
 ![Overview](https://github.com/CS-Tao/github-content/raw/master/contents/github/GTD/1.webp)
 <p align="right"><a href="https://home.cs-tao.cc/GTD-Visualization/docs/preview/">更多预览 >></a></p>
 
-### 网站
+## 网站
 
 - [网页端](https://home.cs-tao.cc/GTD-Visualization/web)
 - [文档](https://home.cs-tao.cc/GTD-Visualization/docs)
 
-### 生成步骤
+## 生成步骤
 
 ``` bash
 # 安装依赖
@@ -38,3 +39,15 @@ yarn test
 yarn lint
 
 ```
+
+## Contributors
+
+Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore -->
+| [<img src="https://avatars1.githubusercontent.com/u/23273105?v=4" width="100px;"/><br /><sub><b>zz</b></sub>](https://github.com/LaZzyMan)<br />[💻](https://github.com/CS-Tao/GTD-Visualization/commits?author=LaZzyMan "Code") [🎨](#design-LaZzyMan "Design") | [<img src="https://avatars2.githubusercontent.com/u/22520131?v=4" width="100px;"/><br /><sub><b>tang-xy</b></sub>](https://github.com/tang-xy)<br />[💻](https://github.com/CS-Tao/GTD-Visualization/commits?author=tang-xy "Code") [🔌](#plugin-tang-xy "Plugin/utility libraries") | [<img src="https://avatars3.githubusercontent.com/u/28620426?v=4" width="100px;"/><br /><sub><b>Cong-Zou</b></sub>](https://github.com/Cong-Zou)<br />[💻](https://github.com/CS-Tao/GTD-Visualization/commits?author=Cong-Zou "Code") | [<img src="https://avatars2.githubusercontent.com/u/34806806?v=4" width="100px;"/><br /><sub><b>lsq210</b></sub>](https://github.com/lsq210)<br />[💻](https://github.com/CS-Tao/GTD-Visualization/commits?author=lsq210 "Code") |
+| :---: | :---: | :---: | :---: |
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

package.json

@@ -20,7 +20,9 @@
     "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
     "test": "npm run unit && npm run e2e",
     "unit": "karma start test/unit/karma.conf.js",
-    "postinstall": "npm run lint:fix"
+    "postinstall": "npm run lint:fix",
+    "contrib:add": "all-contributors add",
+    "contrib:build": "all-contributors generate"
   },
   "build": {
     "productName": "gtd-visualization",
@@ -75,6 +77,7 @@
     "vuex": "^2.3.1"
   },
   "devDependencies": {
+    "all-contributors-cli": "^5.2.0",
     "autoprefixer": "7.2.3",
     "babel-core": "^6.25.0",
     "babel-eslint": "^7.2.3",

src/renderer/components/Breadcrumb/index.vue

@@ -1,10 +1,16 @@
 <template>
-  <el-breadcrumb class="app-breadcrumb" separator="">
+  <el-breadcrumb class="app-breadcrumb" separator=">">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index)  in levelList" :key="item.path" v-if='item.meta.title'>
         <span v-if='item.redirect==="noredirect"||index==levelList.length-1' class="no-redirect">{{item.meta.title}}</span>
         <router-link v-else :to="item.redirect||item.path">{{item.meta.title}}</router-link>
       </el-breadcrumb-item>
+      <el-breadcrumb-item 
+      v-for="(text,index) in timeAnalysisMode.display" 
+      :key="index" 
+      v-if="timeAnalysisMode.enable">
+        <span class="redirect" v-bind:id="modeList[index+1]" v-on:click="clickListener">{{text}}</span>
+      </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
 </template>
@@ -16,7 +22,13 @@ export default {
   },
   data () {
     return {
-      levelList: null
+      levelList: null,
+      modeList: ['gloabl', 'region', 'country', 'detail']
+    }
+  },
+  computed: {
+    timeAnalysisMode () {
+      return this.$store.state.app.timeAnalysisMode
     }
   },
   watch: {
@@ -27,11 +39,22 @@ export default {
   methods: {
     getBreadcrumb () {
       let matched = this.$route.matched.filter(item => item.name)
+      console.log(matched)
       // const first = matched[0]
       // if (first && first.name !== 'dashboard') {
       //   matched = [{ path: '/dashboard', meta: { title: 'dashboard' }}].concat(matched) // eslint-disable-line
       // }
       this.levelList = matched
+    },
+    clickListener (e) {
+      const newMode = e.target.id
+      let display = []
+      if (newMode === 'region') {
+        display = [this.timeAnalysisMode.display[0]]
+      } else if (newMode === 'country') {
+        display = [this.timeAnalysisMode.display[0], this.timeAnalysisMode.display[1]]
+      }
+      this.$store.dispatch('changeTimeAnalysisMode', {mode: e.target.id, display: display, enable: true})
     }
   }
 }
@@ -49,6 +72,14 @@ export default {
       cursor: text;
       font-family: Arial, Helvetica, sans-serif;
       font-size: 1.5rem;
+      line-height: 7vh;
+    }
+    .redirect {
+      color: $yo-2;
+      cursor: pointer;
+      font-size: 18px;
+      font-family: Arial, Helvetica, sans-serif;
+      line-height: 7.5vh!important;
     }
   }
 </style>

src/renderer/components/Charts/radar.vue

@@ -72,14 +72,14 @@ export default {
       // 文本颜色：字符串或一个RGB数组
       type: [String, Array],
       default: function () {
-        return 'rgb(253, 227, 80)'
+        return 'rgb(112, 205, 255)'
       }
     },
     areaColor: {
       // 雷达图区域颜色：从中心到四周透明度逐渐增大
       type: [String, Array],
       default: function () {
-        return 'rgba(114, 172, 209,0.3)'
+        return 'rgba(112, 205, 255, 0.3)'
       }
     },
     backgroundColor: {
@@ -134,7 +134,7 @@ export default {
         title: {
           text: this.title,
           textStyle: {
-            color: 'Orange'
+            color: 'rgb(112, 205, 255)'
           },
           x: 'left',
           y: 'top',
@@ -187,19 +187,19 @@ export default {
             },
             splitArea: {
               areaStyle: {
-                color: ['rgba(253, 227, 80,0.3)', 'rgba(253, 227, 80,0.3)'],
+                color: ['rgba(112, 205, 255, 0.3)', 'rgba(148, 242, 212, 0.3)'],
                 shadowColor: 'rgba(0, 0, 0, 0.3)',
                 shadowBlur: 10
               }
             },
             axisLine: {
               lineStyle: {
-                color: 'rgba(253, 227, 80,0.5)'
+                color: 'rgba(112, 205, 255, 0.5)'
               }
             },
             splitLine: {
               lineStyle: {
-                color: 'rgba(253, 227, 80,0.5)'
+                color: 'rgba(112, 205, 255, 0.5)'
               }
             }
           }
@@ -216,9 +216,9 @@ export default {
                 }
               },
               normal: {
-                lineStyle: {color: 'Orange'},
-                areaStyle: {color: 'Orange'},
-                itemStyle: {color: 'Orange'}
+                lineStyle: {color: 'rgba(5, 131, 242, 0.5)'},
+                areaStyle: {color: 'rgba(5, 131, 242, 0.5)'},
+                itemStyle: {color: 'rgba(5, 131, 242, 0.3)'}
               }
             },
             data: [

src/renderer/components/Dashboard/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="map-view" v-loading="loading" element-loading-text="Loading data...">
+  <div class="map-view" v-loading="loading" element-loading-text="Loading Data...">
     <leaflet-view mapId="dashboard-leaflet-map" :currentDailyData="dailyDataForMapView"></leaflet-view>
     <date-display class="date-display" :date="currentDate" :freshInterval="freshInterval" :hidden="routerViewMode === 2"></date-display>
   </div>

src/renderer/components/Layout/Header.vue

@@ -49,6 +49,7 @@ export default {
   box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
   opacity: $Opacity;
   background-color: $gb-3;
+  box-shadow: 0 0 10px $gb-1;
   // background: linear-gradient(top left, $gb-3, $gb-2);
   // background: -webkit-linear-gradient(top left, $gb-3, $gb-2);
   // background: -moz-linear-gradient(top left, $gb-3, $gb-2);

src/renderer/components/Layout/SidebarComponents/ScrollBar.vue

@@ -51,6 +51,7 @@ export default {
   background: -webkit-linear-gradient(top left, $gb-4, $gb-3);
   background: -moz-linear-gradient(top left, $gb-4, $gb-3);
   background: -o-linear-gradient(top left, $gb-4, $gb-3);
+  box-shadow: 0 0 10px $gb-3;
   .scroll-wrapper {
     position: absolute;
      width: 100%!important;