调整图片

7ed00889 · 郭铭瑶 · f046fea7 · 7ed00889 · 7ed00889 · 7ed00889
Commit 7ed00889 authored Dec 20, 2019 by 郭铭瑶 🤘
42 changed files
--- a/index.html
+++ b/index.html
@@ -10,7 +10,6 @@
        font-size: 1.6vh;
      }
    </style>
-    <!-- <script language="javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=ee2b5d5c0c44c768f1d2593eb4a7dfa6&plugin=Map3D,AMap.DistrictSearch,AMap.ControlBar"></script> -->
  </head>
  <body>
    <div id="app"></div>

--- a/static/enterpriseLogo/1-1.png
+++ b/static/enterpriseLogo/1-1.png
--- a/static/enterpriseLogo/1-2.png
+++ b/static/enterpriseLogo/1-2.png
--- a/static/enterpriseLogo/1-3.png
+++ b/static/enterpriseLogo/1-3.png
--- a/static/enterpriseLogo/1-4.png
+++ b/static/enterpriseLogo/1-4.png
--- a/static/enterpriseLogo/1-5.png
+++ b/static/enterpriseLogo/1-5.png
--- a/static/enterpriseLogo/1-6.png
+++ b/static/enterpriseLogo/1-6.png
--- a/static/enterpriseLogo/1-7.png
+++ b/static/enterpriseLogo/1-7.png
--- a/static/enterpriseLogo/1-8.png
+++ b/static/enterpriseLogo/1-8.png
--- a/static/enterpriseLogo/2-1.png
+++ b/static/enterpriseLogo/2-1.png
--- a/static/enterpriseLogo/3-1.png
+++ b/static/enterpriseLogo/3-1.png
--- a/static/enterpriseLogo/4-1.png
+++ b/static/enterpriseLogo/4-1.png
--- a/static/enterpriseLogo/4-2.png
+++ b/static/enterpriseLogo/4-2.png
--- a/static/enterpriseLogo/4-3.png
+++ b/static/enterpriseLogo/4-3.png
--- a/static/enterpriseLogo/5-1.png
+++ b/static/enterpriseLogo/5-1.png
--- a/static/enterpriseLogo/6-1.png
+++ b/static/enterpriseLogo/6-1.png
--- a/static/enterpriseLogo/6-2.png
+++ b/static/enterpriseLogo/6-2.png
--- a/static/enterpriseLogo/6-3.png
+++ b/static/enterpriseLogo/6-3.png
--- a/static/enterpriseLogo/en-logo-MFD.png
+++ b/static/enterpriseLogo/en-logo-MFD.png
--- a/static/enterpriseLogo/en-logo-cx.png
+++ b/static/enterpriseLogo/en-logo-cx.png
--- a/static/enterpriseLogo/en-logo-guolian.png
+++ b/static/enterpriseLogo/en-logo-guolian.png
--- a/static/enterpriseLogo/en-logo-hm.png
+++ b/static/enterpriseLogo/en-logo-hm.png
--- a/static/enterpriseLogo/en-logo-holdor.png
+++ b/static/enterpriseLogo/en-logo-holdor.png
--- a/static/enterpriseLogo/en-logo-hx.png
+++ b/static/enterpriseLogo/en-logo-hx.png
--- a/static/enterpriseLogo/en-logo-lszy.png
+++ b/static/enterpriseLogo/en-logo-lszy.png
--- a/static/enterpriseLogo/en-logo-sy.png
+++ b/static/enterpriseLogo/en-logo-sy.png
--- a/src/assets/images/screenshots/1-2.png
+++ b/src/assets/images/screenshots/1-2.png
--- a/src/assets/images/screenshots/10-1.png
+++ b/src/assets/images/screenshots/10-1.png
--- a/src/assets/images/screenshots/11-1.png
+++ b/src/assets/images/screenshots/11-1.png
--- a/src/assets/images/screenshots/2-2.png
+++ b/src/assets/images/screenshots/2-2.png
--- a/src/assets/images/screenshots/4-1.png
+++ b/src/assets/images/screenshots/4-1.png
--- a/src/assets/images/screenshots/4-2.png
+++ b/src/assets/images/screenshots/4-2.png
--- a/src/assets/images/screenshots/4-3.png
+++ b/src/assets/images/screenshots/4-3.png
--- a/src/assets/images/screenshots/6-1.png
+++ b/src/assets/images/screenshots/6-1.png
--- a/src/assets/images/screenshots/7-1.png
+++ b/src/assets/images/screenshots/7-1.png
--- a/src/assets/images/screenshots/8-1.png
+++ b/src/assets/images/screenshots/8-1.png
--- a/src/assets/images/screenshots/9-1.png
+++ b/src/assets/images/screenshots/9-1.png
--- a/src/router/index.js
+++ b/src/router/index.js
 import Vue from 'vue'
 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') // 广东 - 生产专题
@@ -67,20 +64,5 @@ export default new Router({
      name: 'flow',
      component: GDFlow
    },
-    // {
-    //   path: '/main',
-    //   name: 'main',
-    //   component: Main
-    // },
-    // {
-    //   path: '/map',
-    //   name: 'map',
-    //   component: ChinaMap
-    // },
-    // {
-    //   path: '/map2',
-    //   name: 'map2',
-    //   component: MapTest
-    // },
  ]
 })
--- a/src/views/guangdong/components/enterprise-card.vue
+++ b/src/views/guangdong/components/enterprise-card.vue
@@ -4,7 +4,7 @@
      <div class="enterprise-card-simple">
        <div class="simple-logo">
          <div class="img-wrapper">
-            <img width="60%" :src="$api.FILE_URL+enterprise.logoPath" />
+            <img width="60%" :src="require(`@/assets/images/${enterprise.logoPath}`)" />
            <div class="edge top-left"/>
            <div class="edge top-right"/>
            <div class="edge bottom-left"/>
@@ -31,7 +31,7 @@
          </div>
          <div class="complete-logo">
            <div class="img-wrapper">
-              <img :src="$api.FILE_URL+enterprise.logoPath" />
+              <img :src="require(`@/assets/images/${enterprise.logoPath}`)" />
              <div class="edge top-left"/>
              <div class="edge top-right"/>
              <div class="edge bottom-left"/>

--- a/src/views/guangdong/components/enterprise-productions.vue
+++ b/src/views/guangdong/components/enterprise-productions.vue
@@ -12,7 +12,7 @@
      <li class="row" v-for="(item, i) in list" :key="item.name + i">
        <p>
          {{item.name}}
-          <img :src="$api.FILE_URL+ item.img" />
+          <img :src="require(`@/assets/images/${item.img}`)" />
        </p>
        <p class="over">{{item.advantage}}</p>
        <p>
@@ -40,7 +40,7 @@
          <p>{{item.advantage}}</p>
        </section>
        <section>
-          <img :src="$api.FILE_URL+ item.img" />
+          <img :src="require(`@/assets/images/${item.img}`)" />
        </section>
      </li>
    </VueSeamlessScroll>

--- a/src/views/guangdong/gd-disease.vue
+++ b/src/views/guangdong/gd-disease.vue
@@ -3,27 +3,27 @@
    <GuangdongMap :data="cityDiseaseArea"/>
    <ThemeTitle style="width: 400%;">广东省水生动物病害数据分析专题</ThemeTitle>
    <div class="sum">
-      <p>全省水产病害爆发<b><m-count :value="sum.total" :decimal="0"/></b>次</p>
+      <p>2019年全省水产病害爆发<b><m-count :value="sum.total" :decimal="0"/></b>次</p>
      <p>面积<b><m-count :value="sum.area"/></b>亩</p>
      <p>损失<b><m-count :value="sum.loss"/></b>万元</p>
    </div>
    <div class="box1">
-      <m-card mode="2" title="各市病害情况">
+      <m-card mode="2" title="2019年各市病害情况">
        <DiseaseList :list="citySituation"/>
      </m-card>
    </div>
    <div class="box2">
-      <m-card mode="2" title="各病害的发病次数(次)">
+      <m-card mode="2" title="2019年各病害的发病次数(次)">
        <DataList :list="disease" :decimal="0"/>
      </m-card>
    </div>
    <div class="box3">
-      <m-card mode="2" title="病害情况趋势">
+      <m-card mode="2" title="2019年病害情况趋势">
        <m-chart :showLegend="false" :options="options" :data="data"/>
      </m-card>
    </div>
    <div class="box4">
-      <m-card mode="2" title="各类病害次数占比">
+      <m-card mode="2" title="2019年各类病害次数占比">
        <m-chart :options="options2" :data="data2"/>
      </m-card>
    </div>

--- a/static/gd-industry.json
+++ b/static/gd-industry.json
@@ -100,10 +100,10 @@
    "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": [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": [605659, 245210, 255032, 293678]}
    ]
  }
 }