更新

build/webpack.prod.conf.js

@@ -10,7 +10,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-const BuildElectronPlugin = require('./build-electron-plugin')
+// const BuildElectronPlugin = require('./build-electron-plugin')
 
 const env = require('../config/prod.env')
 
@@ -29,7 +29,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
   },
   plugins: [
-    new BuildElectronPlugin(),
+    // new BuildElectronPlugin(),
     // http://vuejs.github.io/vue-loader/en/workflow/production.html
     new webpack.DefinePlugin({
       'process.env': env

src/App.vue

@@ -11,7 +11,7 @@ export default {
   name: 'App',
   data() {
     return {
-      routes: ['industry', 'production', 'trade', 'fish', 'disease', 'enterprise'],
+      routes: ['industry', 'special', 'production', 'trade', 'fish', 'disease', 'enterprise'],
       cur: 0,
       timer: null,
       timeOuter: null,
@@ -19,11 +19,11 @@ export default {
     }
   },
   mounted() {
-    this.$router.push({
-      name: this.routes[this.cur]
-    })
-    this.setTimer()
-    document.body.addEventListener('mousemove', this.removeTimer)
+    // this.$router.push({
+    //   name: this.routes[this.cur]
+    // })
+    // this.setTimer()
+    // document.body.addEventListener('mousemove', this.removeTimer)
   },
   beforeDestroy() {
     clearInterval(this.timer)
@@ -43,9 +43,22 @@ export default {
     removeTimer() {
       clearTimeout(this.timeOuter)
       clearInterval(this.timer)
+      this.timer = null
       this.timeOuter = setTimeout(this.setTimer, this.seconds / 10)
     },
   },
+  watch: {
+    $route(to, from) {
+      if (to.name === 'home') {
+        clearInterval(this.timer)
+        clearTimeout(this.timeOuter)
+        this.timer = null
+        this.cur = 0
+      } else {
+        this.cur = this.routes.indexOf(to.name)
+      }
+    }
+  }
 }
 </script>
 

src/router/index.js

@@ -4,13 +4,14 @@ import Router from 'vue-router'
 // const Main = () => import('@/views/project-management/main')
 // const ChinaMap = () => import('@/views/china')
 // const MapTest = () => import('@/views/map-test')
+const GDHome = () => import('@/views/guangdong/gd-home') // 广东 - 首页
 const GDEnterprise = () => import('@/views/guangdong/gd-enterprise') // 广东 - 企业专题
 const GDProduction = () => import('@/views/guangdong/gd-production') // 广东 - 生产专题
 const GDTrade = () => import('@/views/guangdong/gd-trade') // 广东 - 交易专题
 const GDDisease = () => import('@/views/guangdong/gd-disease') // 广东 - 疫病专题
 const GDFish = () => import('@/views/guangdong/gd-fish') // 广发 - 罗非鱼专题
 const GDIndustry = () => import('@/views/guangdong/gd-industry') // 广东 - 产业分析专题
-// const Map3D = () => import('@/views/3d-map') // 浦东 - 街镇电梯地图
+const GDSpecial = () => import('@/views/guangdong/gd-special') // 广东 - 特色种苗专题
 
 Vue.use(Router)
 
@@ -20,6 +21,11 @@ export default new Router({
       path: '/',
       redirect: '/industry'
     },
+    {
+      path: '/home',
+      name: 'home',
+      component: GDHome
+    },
     {
       path: '/production',
       name: 'production',
@@ -45,17 +51,17 @@ export default new Router({
       name: 'industry',
       component: GDIndustry
     },
+    {
+      path: '/special',
+      name: 'special',
+      component: GDSpecial
+    },
     {
       path: '/enterprise',
       name: 'enterprise',
       component: GDEnterprise
     },
     // {
-    //   path: '/map3d',
-    //   name: 'map3d',
-    //   component: Map3D
-    // },
-    // {
     //   path: '/main',
     //   name: 'main',
     //   component: Main

src/views/3d-map.vue

-<template>
-  <div id="container"/>
-</template>
-
-<script>
-const {AMap} = window
-export default {
-  name: 'Map3D',
-  data() {
-    return {
-      map: null,
-      buildingOptions: {
-        hideWithoutStyle:false,//是否隐藏设定区域外的楼块
-        areas:[
-          { //围栏1
-            //visible:false,//是否可见
-            rejectTexture:true,//是否屏蔽自定义地图的纹理
-            color1: 'ff99ff00',//楼顶颜色
-            color2: 'ff999900',//楼面颜色
-            path: [
-              [121.498447,31.217582],
-              [121.498466,31.218851],
-              [121.497402,31.218943],
-              [121.497423,31.217595],
-            ]
-          },
-          {
-            rejectTexture:true,//是否屏蔽自定义地图的纹理
-            color1: 'ffcc0000',//楼顶颜色
-            color2: 'ffaa0000',//楼面颜色
-            path: [
-              [121.497898,31.217932],
-              [121.498456,31.217945],
-              [121.498445,31.218445],
-              [121.49791,31.218376],
-            ]
-          },
-          {
-            rejectTexture:true,//是否屏蔽自定义地图的纹理
-            color1: 'ffffff00',//楼顶颜色
-            color2: 'ffffcc00',//楼面颜色
-            path: [
-              [121.498696,31.218295],
-              [121.498679,31.217744],
-              [121.499197,31.217747],
-              [121.499243,31.218324],
-            ]
-          },
-        ]
-      },
-      buildingOptions2: {
-        hideWithoutStyle:false,//是否隐藏设定区域外的楼块
-        areas:[
-          { //围栏1
-            // visible:false,//是否可见
-            rejectTexture:false,//是否屏蔽自定义地图的纹理
-            color1: 'ffffff00',//楼顶颜色
-            color2: 'ffffcc00',//楼面颜色
-            path: [
-              [121.666232,31.28054],
-              [121.667163,31.279096],
-              [121.66531,31.278672],
-              [121.6651,31.279373],
-              [121.665428,31.279536],
-              [121.665146,31.280012],
-            ]
-          },
-        ]
-      },
-
-    }
-  },
-  mounted() {
-    this.$nextTick(this.initMap)
-  },
-  methods: {
-    initMap() {
-      const buildingLayer = new AMap.Buildings({zIndex:130,merge:false,sort:false,zooms:[17,20]})
-      buildingLayer.setStyle(this.buildingOptions)
-
-      this.map = new AMap.Map('container', {
-        resizeEnable: true,
-        rotateEnable:true,
-        pitchEnable:true,
-        showLabel: true,
-        zoom: 17,
-        pitch:50,
-        rotation:45,
-        viewMode:'3D',//开启3D视图,默认为关闭
-        buildingAnimation:true,//楼块出现是否带动画
-        expandZoomRange:true,
-        // zooms:[17,20],
-        zooms: [10,20],
-        // center:[121.497915,31.218138], // 黄浦
-        // center: [121.558,31.0727], //航头镇
-        // center: [121.502, 31.1956], //南码头
-        // center: [121.656, 31.2937], // 曹路
-        center: [121.666008,31.279523], // 曹路 - 民风小区
-
-        showIndoorMap:false,
-        // mapStyle:'amap://styles/light',
-        features:['bg','point','road'],
-        layers:[
-          new AMap.TileLayer({}),
-          buildingLayer
-        ]
-      })
-
-
-      this.map.addControl(new AMap.ControlBar({
-        showZoomBar:false,
-        showControlButton:true,
-        position:{
-          right:'10px',
-          top:'10px'
-        }
-      }))
-
-      new AMap.Polygon({
-        bubble:false,
-        fillColor: 'green',
-        fillOpacity:0.2,
-        strokeWeight:1,
-        path:this.buildingOptions.areas[0].path,
-        map:this.map
-      })
-      // new AMap.Polygon({
-      //   bubble:true,
-      //   fillOpacity:0.2,
-      //   strokeWeight:1,
-      //   path:this.buildingOptions.areas[1].path,
-      //   map:this.map
-      // })
-      this.map.on('click', e => {
-        const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-        this.map.setZoomAndCenter(18.8, location)
-        console.log(e, e.lnglat.getLng() + ',' + e.lnglat.getLat())
-      })
-      const marker = new AMap.Marker({
-        map: this.map,
-        position: [121.498973,31.218018],
-        extData: {
-          title: '测试点击',
-          content: '测试额外附加数据',
-        },
-        icon: new AMap.Icon({
-          size: new AMap.Size(30, 30),  //图标大小
-          image: require('@/assets/images/attorney.png'),
-          // imageOffset: new AMap.Pixel(0, -60)
-        })
-      })
-      marker.on('click', e => {
-        const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-        this.showDetail(e, location, marker.getExtData())
-      })
-
-      const searcher = new AMap.DistrictSearch({
-        level: 'district',
-        subdistric: 1,
-      })
-      searcher.search('浦东新区', (status, result) => {
-        console.log('---浦东新区街镇---', result.districtList[0].districtList)
-      })
-
-      // new AMap.DistrictSearch({
-      //   level: 'district',
-      //   extensions: 'all',
-      //   subdistric: 1,
-      // }).search('浦东新区', (staus, result) => {
-      //   var bounds = result.districtList[0].boundaries
-      //   var polygon = new AMap.Polygon({
-      //     strokeWeight: 1,
-      //     path: bounds[0],
-      //     fillOpacity: 0.4,
-      //     fillColor: '#80d8ff',
-      //     strokeColor: '#0091ea'
-      //   })
-      //   this.map.add([polygon])
-      // })
-
-      // 只显示浦东新区，其他置灰
-      // new AMap.DistrictSearch({
-      //   extensions:'all',
-      //   subdistrict:0
-      // }).search('浦东新区',(status,result) => {
-      //   // 外多边形坐标数组和内多边形坐标数组
-      //   const outer = [
-      //     new AMap.LngLat(-360,90,true),
-      //     new AMap.LngLat(-360,-90,true),
-      //     new AMap.LngLat(360,-90,true),
-      //     new AMap.LngLat(360,90,true),
-      //   ]
-      //   const holes = result.districtList[0].boundaries
-
-      //   const pathArray = [
-      //     outer
-      //   ]
-      //   pathArray.push.apply(pathArray,holes)
-      //   const polygon = new AMap.Polygon( {
-      //     pathL:pathArray,
-      //     //线条颜色，使用16进制颜色代码赋值。默认值为#006600
-      //     strokeColor: 'rgb(20,164,173)',
-      //     strokeWeight: 4,
-      //     //轮廓线透明度，取值范围[0,1]，0表示完全透明，1表示不透明。默认为0.9
-      //     strokeOpacity:0.5,
-      //     //多边形填充颜色，使用16进制颜色代码赋值，如：#FFAA00
-      //     fillColor: 'rgba(255,255,255,0.3)',
-      //     //多边形填充透明度，取值范围[0,1]，0表示完全透明，1表示不透明。默认为0.9
-      //     fillOpacity: 1,
-      //     //轮廓线样式，实线:solid，虚线:dashed
-      //     strokeStyle:'dashed',
-      //     /*勾勒形状轮廓的虚线和间隙的样式，此属性在strokeStyle 为dashed 时有效， 此属性在
-      //         ie9+浏览器有效 取值：
-      //         实线：[0,0,0]
-      //         虚线：[10,10] ，[10,10] 表示10个像素的实线和10个像素的空白（如此反复）组成的虚线
-      //         点画线：[10,2,10]， [10,2,10] 表示10个像素的实线和2个像素的空白 + 10个像素的实
-      //         线和10个像素的空白 （如此反复）组成的虚线*/
-      //     strokeDasharray:[10,2,10]
-      //   })
-      //   polygon.setPath(pathArray)
-      //   this.map.add(polygon)
-      // })
-    },
-    showDetail(e, location, data) {
-      // TODO
-      const infoWindow = new AMap.InfoWindow({
-        content: `
-            <div>
-              <b>${data.title}</b>
-              <p>${data.content}</p>
-            </div>
-          `
-      })
-      infoWindow.open(this.map, location)
-    },
-  },
-}
-</script>
-
-<style lang="stylus" scoped>
-#container
-  width 100%
-  height 100%
-  resize both
-</style>
-<style lang="stylus">
-.amap-logo
-.amap-copyright
-  display none !important
-.amap-icon
-  img
-    width 100%
-    height 100%
-</style>

src/views/guangdong/components/enterprise-card.vue

@@ -79,6 +79,7 @@ export default {
   color #ccc
   height 100%
   overflow hidden
+  line-height 1.6
   >div
     height 100%
   .img-wrapper

src/views/guangdong/components/enterprise-productions.vue

@@ -108,6 +108,7 @@ export default {
     text-align left
     width 20%
     padding 0 0.5rem
+    line-height 1.6
     img
       width 100%
     &:nth-child(2)

src/views/guangdong/components/map.vue

@@ -28,7 +28,7 @@ export default {
     },
     visualFormatter: {
       type: String,
-      default: '{b}<br/>疫病发生面积：{c}亩'
+      default: '{b}<br/>病害发生面积：{c}亩'
     },
     visualConfig: {
       type: Object,

src/views/guangdong/components/title.vue

 <template>
-  <div id="title" ref="title">
+  <div id="title" ref="title" @dblclick="handleClick">
     <img :src="bgImg"/>
     <p><slot /></p>
   </div>
@@ -21,6 +21,11 @@ export default {
       this.bgImg = titleBg2
     }
   },
+  methods: {
+    handleClick() {
+      this.$router.push({name: 'home'})
+    }
+  },
 }
 </script>
 

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: 400%;">广东省病害数据分析专题</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>亩</p>

src/views/guangdong/gd-fish.vue

@@ -74,7 +74,7 @@ export default {
         legend: {
           // top: '2%',
           top: '15%',
-          left: '40%',
+          left: '35%',
         },
         grid: {
           right: '5%',

src/views/guangdong/gd-home.vue

+<template>
+  <div id="container" :style="`background-image: url(${require('@/assets/images/stars-bg.png')})`">
+    <ThemeTitle class="theme">广东省渔业专题</ThemeTitle>
+    <div @click="click">test</div>
+  </div>
+</template>
+
+<script>
+import ThemeTitle from './components/title'
+export default {
+  name: 'GDHome',
+  components: {
+    ThemeTitle,
+  },
+  methods: {
+    click() {
+      this.$router.push({name: 'fish'})
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+#container
+  $gd-layout()
+  grid-template-areas \
+    '. theme .'\
+    '. . .'\
+    '. . .'\
+    '. . .'
+  grid-template-rows 4rem 1fr 1fr 1fr
+  grid-template-columns 1fr 2fr 1fr
+  .theme
+    grid-area theme
+    width 80%
+</style>

src/views/guangdong/gd-industry.vue

 <template>
   <div id="container" :style="`background-image: url(${require('@/assets/images/stars-bg.png')})`">
-    <ThemeTitle class="theme">广东省产业布局分析专题</ThemeTitle>
+    <ThemeTitle class="theme">广东省渔业产业布局分析专题</ThemeTitle>
     <div class="box1">
       <m-card mode="2" title="渔业经济产值">
         <m-chart :options="options1" :data="data1"/>
@@ -16,9 +16,19 @@
         <m-chart :options="options3" :data="data3"/>
       </m-card>
     </div>
-    <div v-for="(item, index) in fishChartData.value" :key="item.name" :class="`box${4 + index}`">
-      <m-card mode="2" :title="`特色品种鱼苗数量 - ${item.name}`">
-        <m-chart :options="getOptions(item)" :data="[item]" :showLegend="false"/>
+    <div class="box4">
+      <m-card mode="2" title="各市2018年渔业经济产值">
+        <m-chart :showLegend="false" :options="options4" :data="data4"/>
+      </m-card>
+    </div>
+    <div class="box5">
+      <m-card mode="2" title="各市2018年渔业经济产量">
+        <m-chart :showLegend="false" :options="options5" :data="data5"/>
+      </m-card>
+    </div>
+    <div class="box6">
+      <m-card mode="2" title="各市2018年渔业加工产量">
+        <m-chart :showLegend="false" :options="options6" :data="data6"/>
       </m-card>
     </div>
   </div>
@@ -103,10 +113,78 @@ export default {
         }
       },
       data3: [],
-      fishChartData: {
-        name: [],
-        value: [],
+      options4: {
+        colors: [['#1FECFF', '#0076FF']],
+        grid: {
+          bottom: 0,
+        },
+        xAxis: {
+          data: [],
+          axisLabel: {
+            rotate: 45,
+            textStyle: {
+              color: '#ccc',
+            },
+            fontSize: this.fontSize,
+          },
+        },
+        yAxis: {
+          name: '(万元)',
+        },
+        series: {
+          type: 'bar',
+          barWidth: '40%',
+        }
+      },
+      options5: {
+        colors: [['#1FECFF', '#0076FF']],
+        grid: {
+          bottom: 0,
+        },
+        xAxis: {
+          data: [],
+          axisLabel: {
+            rotate: 45,
+            textStyle: {
+              color: '#ccc',
+            },
+            fontSize: this.fontSize,
+          },
+        },
+        yAxis: {
+          name: '(吨)',
+        },
+        series: {
+          type: 'bar',
+          barWidth: '40%',
+        }
+      },
+      options6: {
+        colors: [['#1FECFF', '#0076FF']],
+        grid: {
+          bottom: 0,
+        },
+        xAxis: {
+          data: [],
+          axisLabel: {
+            rotate: 45,
+            textStyle: {
+              color: '#ccc',
+            },
+            fontSize: this.fontSize,
+          },
+        },
+        yAxis: {
+          name: '(吨)',
+        },
+        series: {
+          type: 'bar',
+          barWidth: '40%',
         }
+      },
+      data4: [],
+      data5: [],
+      data6: [],
     }
   },
   mounted() {
@@ -115,7 +193,7 @@ export default {
   methods: {
     getData() {
       axios.get(this.$api.FILE_URL + 'gd-industry.json').then(res => {
-        const {output, production, processProduction, fishProduction} = res.data
+        const {output, production, processProduction, cityOutput, cityProduction, cityProcessProduction} = res.data
         const textStyle = {
           color: '#ccc',
           fontSize: this.fontSize,
@@ -129,7 +207,22 @@ export default {
         this.options3.xAxis.data = processProduction.name
         this.options3.legend.textStyle = textStyle
         this.data3 = processProduction.value
-        this.fishChartData = fishProduction
+        const data4 = [], data5 = [], data6 = []
+        cityOutput.forEach((item, index) => {
+          this.options4.xAxis.data.push(item.name)
+          data4.push(item.value)
+        })
+        cityProduction.forEach((item, index) => {
+          this.options5.xAxis.data.push(item.name)
+          data5.push(item.value)
+        })
+        cityProcessProduction.forEach((item, index) => {
+          this.options6.xAxis.data.push(item.name)
+          data6.push(item.value)
+        })
+        this.data4 = [{data: data4}]
+        this.data5 = [{data: data5}]
+        this.data6 = [{data: data6}]
       })
     },
     getOptions(data) {
@@ -161,15 +254,15 @@ export default {
   $gd-layout()
   grid-template-areas \
     '. theme .'\
-    'box1 box2 box3'\
-    'box4 box5 box6'\
-    'box7 box8 box9'
+    'box1 box4 box4'\
+    'box2 box5 box5'\
+    'box3 box6 box6'
   grid-template-rows 4rem 1fr 1fr 1fr
   grid-template-columns 1fr 1fr 1fr
   .theme
     grid-area theme
-    width 120%
-    margin-left -10%
+    width 150%
+    margin-left -25%
   .box1
     grid-area box1
   .box2
@@ -182,10 +275,4 @@ export default {
     grid-area box5
   .box6
     grid-area box6
-  .box7
-    grid-area box7
-  .box8
-    grid-area box8
-  .box9
-    grid-area box9
 </style>

src/views/guangdong/gd-production.vue

 <template>
   <div id="container" :style="`background-image: url(${require('@/assets/images/stars-bg.png')})`">
     <GuangdongMap key="production" :data="mapData" :visualConfig="visualConfig" visualFormatter="{b}<br/>养殖面积：{c}公顷"/>
-    <ThemeTitle style="width: 150%;margin-left:20%;">广东省生产专题</ThemeTitle>
+    <ThemeTitle style="width: 150%;margin-left:20%;">广东省渔业生产专题</ThemeTitle>
     <div class="area">
       <p>当前广东省养殖面积</p>
       <b v-if="area"><m-flip :value="area"/></b>

src/views/guangdong/gd-special.vue

+<template>
+  <div id="container" :style="`background-image: url(${require('@/assets/images/stars-bg.png')})`">
+    <ThemeTitle class="theme">广东省渔业特色种苗专题</ThemeTitle>
+    <div v-for="(item, index) in fishChartData.value" :key="item.name" :class="`box${1 + index}`">
+      <m-card mode="2" :title="`特色品种种苗数量 - ${item.name}`">
+        <m-chart :options="getOptions(item)" :data="[item]" :showLegend="false"/>
+      </m-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import ThemeTitle from './components/title'
+import axios from 'axios'
+export default {
+  name: 'GDSpecial',
+  components: {
+    ThemeTitle,
+  },
+  data() {
+    return {
+      fishChartData: {
+        name: [],
+        value: [],
+      }
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      axios.get(this.$api.FILE_URL + 'gd-industry.json').then(res => {
+        const {fishProduction} = res.data
+        this.fishChartData = fishProduction
+      })
+    },
+    getOptions(data) {
+      return {
+        colors: [['#1FECFF', '#0076FF']],
+        xAxis: {
+          data: this.fishChartData.name,
+        },
+        yAxis: {
+          name: `(${data.unit})`,
+        },
+        series: {
+          type: 'bar',
+          barWidth: '40%',
+        }
+      }
+    },
+  },
+}
+</script>
+
+<style lang="stylus" scoped>
+#container
+  $gd-layout()
+  grid-template-areas \
+    '. theme .'\
+    'box1 box2 box3'\
+    'box4 box5 box6'
+  grid-template-rows 4rem 1fr 1fr
+  grid-template-columns 1fr 1fr 1fr
+  .theme
+    grid-area theme
+    width 120%
+    margin-left -10%
+  .box1
+    grid-area box1
+  .box2
+    grid-area box2
+  .box3
+    grid-area box3
+  .box4
+    grid-area box4
+  .box5
+    grid-area box5
+  .box6
+    grid-area box6
+</style>

static/gd-enterprise.json

@@ -90,7 +90,7 @@
       "name":"湛江国联水产开发股份有限公司",
       "logoPath":"enterpriseLogo/en-logo-guolian.png",
       "address":"吴川市覃巴镇",
-      "contact":"",
+      "contact":"0759-3153888",
       "productions": [
         {
           "name": "国联日本囊对虾新品系",

static/gd-fish.json

@@ -18,8 +18,8 @@
     "name": ["2015年","2016年","2017年","2018年"],
     "value": [
       {"name": "塘头价格", "unit": "元/斤", "data": [4.1,4,4.1,3.8]},
-      {"name": "国内价格", "unit": "元/斤", "data": [5.2,5.1,5.2,5]},
-      {"name": "国外价格(加工品)", "unit": "元/斤", "data": [11.5,12,12,11]}
+      {"name": "国内市场批发价格", "unit": "元/斤", "data": [5.2,5.1,5.2,5]},
+      {"name": "进出口价格", "unit": "元/斤", "data": [11.5,12,12,11]}
     ]
   },
   "comparison1": {

static/gd-industry.json

@@ -9,6 +9,29 @@
       {"name": "水产苗种", "unit": "万元", "data": [301193.20,278161.81,305328.22,315658.72]}
     ]
   },
+  "cityOutput": [
+    {"name":"广州市", "unit": "万元","value": 338068.21 },
+    {"name":"深圳市", "unit": "万元","value": 211927.73 },
+    {"name":"珠海市", "unit": "万元","value": 786416.73 },
+    {"name":"汕头市", "unit": "万元","value": 603102.55 },
+    {"name":"韶关市", "unit": "万元","value": 101234.31 },
+    {"name":"河源市", "unit": "万元","value": 46794.79 },
+    {"name":"梅州市", "unit": "万元","value": 122771.94 },
+    {"name":"惠州市", "unit": "万元","value": 277631.05 },
+    {"name":"汕尾市", "unit": "万元","value": 706701.83 },
+    {"name":"东莞市", "unit": "万元","value": 70267.57 },
+    {"name":"中山市", "unit": "万元","value": 623650.28 },
+    {"name":"江门市", "unit": "万元","value": 1783605.54 },
+    {"name":"佛山市", "unit": "万元","value": 1704450.88 },
+    {"name":"阳江市", "unit": "万元","value": 2101692.31 },
+    {"name":"湛江市", "unit": "万元","value": 2472339.80 },
+    {"name":"茂名市", "unit": "万元","value": 852607.10 },
+    {"name":"肇庆市", "unit": "万元","value": 549176.00 },
+    {"name":"清远市", "unit": "万元","value": 187195.46 },
+    {"name":"潮州市", "unit": "万元","value": 246433.16 },
+    {"name":"揭阳市", "unit": "万元","value": 245622.10 },
+    {"name":"云浮市", "unit": "万元","value": 122186.43 }
+  ],
   "production": {
     "name": ["2015年","2016年","2017年","2018年"],
     "value": [
@@ -18,6 +41,29 @@
       {"name": "淡水捕捞", "unit": "吨", "data": [124282, 122883, 120370, 115295]}
     ]
   },
+  "cityProduction": [
+    {"name": "广州市","unit":"吨", "value":454214},
+    {"name": "深圳市","unit":"吨", "value":78453},
+    {"name": "珠海市","unit":"吨", "value":313635},
+    {"name": "汕头市","unit":"吨", "value":465237},
+    {"name": "韶关市","unit":"吨", "value":81037},
+    {"name": "河源市","unit":"吨", "value":42612},
+    {"name": "梅州市","unit":"吨", "value":107078},
+    {"name": "惠州市","unit":"吨", "value":158055},
+    {"name": "汕尾市","unit":"吨", "value":567008},
+    {"name": "东莞市","unit":"吨", "value":45991},
+    {"name": "中山市","unit":"吨", "value":329656},
+    {"name": "江门市","unit":"吨", "value":765695},
+    {"name": "佛山市","unit":"吨", "value":675086},
+    {"name": "阳江市","unit":"吨", "value":1182625},
+    {"name": "湛江市","unit":"吨", "value":1234025},
+    {"name": "茂名市","unit":"吨", "value":900108},
+    {"name": "肇庆市","unit":"吨", "value":462347},
+    {"name": "清远市","unit":"吨", "value":131113},
+    {"name": "潮州市","unit":"吨", "value":196665},
+    {"name": "揭阳市","unit":"吨", "value":144416},
+    {"name": "云浮市","unit":"吨", "value":99915}
+  ],
   "processProduction": {
     "name": ["2015年","2016年","2017年","2018年"],
     "value": [
@@ -26,15 +72,38 @@
       {"name": "海水加工品总量", "unit": "吨", "data": [1039543, 1135362, 1148701, 1093976]}
     ]
   },
+  "cityProcessProduction": [
+    {"name": "广州市", "unit": "吨", "value": 14746},
+    {"name": "深圳市", "unit": "吨", "value": 3000},
+    {"name": "珠海市", "unit": "吨", "value": 33826},
+    {"name": "汕头市", "unit": "吨", "value": 157412},
+    {"name": "韶关市", "unit": "吨", "value": null},
+    {"name": "河源市", "unit": "吨", "value": null},
+    {"name": "梅州市", "unit": "吨", "value": 2788},
+    {"name": "惠州市", "unit": "吨", "value": 9463},
+    {"name": "汕尾市", "unit": "吨", "value": 189649},
+    {"name": "东莞市", "unit": "吨", "value": 534},
+    {"name": "中山市", "unit": "吨", "value": 22860},
+    {"name": "江门市", "unit": "吨", "value": 82967},
+    {"name": "佛山市", "unit": "吨", "value": 36079},
+    {"name": "阳江市", "unit": "吨", "value": 181329},
+    {"name": "湛江市", "unit": "吨", "value": 349061},
+    {"name": "茂名市", "unit": "吨", "value": 294894},
+    {"name": "肇庆市", "unit": "吨", "value": 42282},
+    {"name": "清远市", "unit": "吨", "value": null},
+    {"name": "潮州市", "unit": "吨", "value": null},
+    {"name": "揭阳市", "unit": "吨", "value": 18143},
+    {"name": "云浮市", "unit": "吨", "value": 7317}
+  ],
   "fishProduction": {
     "name": ["2015年","2016年","2017年","2018年"],
     "value": [
       {"name": "罗非鱼", "unit": "亿尾", "data": [116.65, 113, 104.54, 102.24]},
-      {"name": "鳗苗", "unit": "千克", "data": [835, 801, 800, 843]},
-      {"name": "虾类", "unit": "亿尾", "data": [4000, 4000, 4100, 5455]},
-      {"name": "稚鳖", "unit": "万只", "data": [6260, 6661, 6791, 6549]},
-      {"name": "稚龟", "unit": "万只", "data": [546, 547, 564, 665]},
-      {"name": "贝类", "unit": "万颗", "data": [605659, 245210, 255032, 293678]}
+      {"name": "鳗鱼", "unit": "千克", "data": [835, 801, 800, 843]},
+      {"name": "虾", "unit": "亿尾", "data": [4000, 4000, 4100, 5455]},
+      {"name": "鳖", "unit": "万只", "data": [6260, 6661, 6791, 6549]},
+      {"name": "龟", "unit": "万只", "data": [546, 547, 564, 665]},
+      {"name": "贝", "unit": "万颗", "data": [605659, 245210, 255032, 293678]}
     ]
   }
 }