调整

package-lock.json

@@ -314,6 +314,11 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
+    "animate.css": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npm.taobao.org/animate.css/download/animate.css-3.7.2.tgz",
+      "integrity": "sha1-5z4NUOkssc/vFZfZs4qUgQIOCOo="
+    },
     "ansi-escapes": {
       "version": "3.2.0",
       "resolved": "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.2.0.tgz",

package.json

@@ -14,6 +14,7 @@
     "build:win": "node build/build.js && electron-packager ./dist dashboard --platform=win32 --electron-version=6.1.0 --overwrite"
   },
   "dependencies": {
+    "animate.css": "^3.7.2",
     "axios": "^0.19.0",
     "babel-polyfill": "^6.26.0",
     "countup.js": "^2.0.4",

src/App.vue

 <template>
   <div id="app">
-    <router-view/>
+    <router-view :key="$route.name"/>
   </div>
 </template>
 

src/main.js

@@ -6,6 +6,7 @@ import App from './App'
 import router from './router'
 import echarts from 'echarts'
 import {Button, Divider, Progress, Select, Option} from 'view-design'
+import animate from 'animate.css'
 import ajax from '@/server/ajax'
 import api from '@/server/api'
 import MonitorCard from '@/components/MonitorCard'
@@ -20,6 +21,7 @@ Vue.config.productionTip = false
 Vue.prototype.$echarts = echarts
 Vue.prototype.$ajax = ajax
 Vue.prototype.$api = api
+Vue.use(animate)
 Vue.use(MonitorCard)
 Vue.use(MonitorCount)
 Vue.use(MonitorFlip)

src/router/index.js

@@ -17,13 +17,7 @@ export default new Router({
   routes: [
     {
       path: '/',
-      name: 'main',
-      component: Main
-    },
-    {
-      path: '/map',
-      name: 'map',
-      component: ChinaMap
+      redirect: '/industry'
     },
     {
       path: '/production',
@@ -50,11 +44,21 @@ export default new Router({
       name: 'industry',
       component: GDIndustry
     },
-    {
-      path: '/map2',
-      name: 'map2',
-      component: MapTest
-    },
+    // {
+    //   path: '/main',
+    //   name: 'main',
+    //   component: Main
+    // },
+    // {
+    //   path: '/map',
+    //   name: 'map',
+    //   component: ChinaMap
+    // },
+    // {
+    //   path: '/map2',
+    //   name: 'map2',
+    //   component: MapTest
+    // },
     {
       path: '/map3d',
       name: 'map3d',

src/views/guangdong/gd-disease.vue

 <template>
   <div id="container" :style="`background-image: url(${require('@/assets/images/stars-bg.png')})`">
     <GuangdongMap :data="cityDiseaseArea"/>
-    <ThemeTitle style="width: 300%;">全省疫病灾害数据分析专题</ThemeTitle>
+    <ThemeTitle style="width: 400%;">全省疫病灾害数据分析专题</ThemeTitle>
     <div class="sum">
       <p>全省水产疫病爆发<b><m-count :value="sum.total" :decimal="0"/></b>次</p>
       <p>面积<b><m-count :value="sum.area"/></b>k㎡</p>
@@ -59,15 +59,15 @@ export default {
           type: 'line',
           areaStyle: {},
         },
-        colors: ['rgba(0, 118, 255, 1)'],
+        colors: [['rgb(255, 158, 68)', 'rgb(255, 70, 131)']],
       },
       data: [],
       options2: {
         legend: {
           orient: 'vertical',
           y: 'center',
-          left: '60%',
-          top: '10%',
+          left: '65%',
+          top: '25%',
           data: [],
           formatter: name => {
             const item = this.data2.find(el => el.name === name)
@@ -77,13 +77,14 @@ export default {
         tooltip: {
           trigger: 'item',
         },
-        color: ['#3391FF','#71C012','#F47C1F','#CC4D4D','#C15CFF','#8400FF'],
+        color: ['#3391FF', '#71C012', '#F47C1F','#CC4D4D','#C15CFF','#8400FF'],
         series: {
           type: 'pie',
+          radius: ['45%', '70%'],
           label: {
             show: false,
           },
-          center: ['30%', '50%'],
+          center: ['35%', '50%'],
           data: [],
         }
       },
@@ -129,11 +130,11 @@ export default {
 #container
   $gd-layout()
   grid-template-areas \
-    'box1 . . . box2'\
-    'box1 . . . box2'\
-    'box3 box3 box4 box4 box2'
+    'box1 . . . . box2'\
+    'box1 . . . . box2'\
+    'box3 box3 box3 box4 box4 box2'
   grid-template-rows 1fr 1fr 1fr
-  grid-template-columns 1.2fr 1fr 1fr 1fr 1.2fr
+  grid-template-columns 1.5fr 1fr 1fr 1fr 1fr 1.5fr
   .sum
     display flex
     justify-content space-around