Merge branch 'master' into feature/v1.5.6

.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
 VUE_APP_BASE_API='/bigmember'
-VUE_APP_BASE_URL='/swordfish/page_big_pc'
+VUE_APP_BASE_URL='/page_big_pc'
 VUE_APP_BASE_PUBLIC='/page_big_pc/'

src/components/chart/BarLineChart.vue

@@ -13,7 +13,7 @@
   </ve-histogram>
 </template>
 <script>
-import VeHistogram from 'v-charts/lib/histogram'
+import { VeHistogram } from 'v-charts'
 export default {
   name: 'chart',
   props: {

src/components/chart/ColumnBarChart.vue

@@ -12,7 +12,7 @@
   </ve-histogram>
 </template>
 <script>
-import VeHistogram from 'v-charts/lib/histogram'
+import { VeHistogram } from 'v-charts'
 export default {
   name: 'chart',
   props: {

src/components/chart/LineChart.vue

@@ -2,7 +2,7 @@
   <ve-line :data="datas" :height="options.height" :after-config="options.config" :extend="defaultOption"></ve-line>
 </template>
 <script>
-import VeLine from 'v-charts/lib/line'
+import { VeLine } from 'v-charts'
 import _ from 'lodash'
 
 export default {

src/components/chart/MapChart.vue

@@ -8,7 +8,7 @@
 </ve-map>
 </template>
 <script>
-import VeMap from 'v-charts/lib/map'
+import { VeMap } from 'v-charts'
 const mapJson = require('../../assets/js/china.json')
 export default {
   name: 'chart',

src/components/chart/SimpleHistogramChart.vue

@@ -13,7 +13,7 @@
   </ve-histogram>
 </template>
 <script>
-import VeHistogram from 'v-charts/lib/histogram'
+import { VeHistogram } from 'v-charts'
 export default {
   name: 'simple-histogram-chart',
   components: {

src/components/report-data/EchartsDetail.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import VeHistogram from 'v-charts/lib/histogram'
+import { VeHistogram } from 'v-charts'
 export default {
   props: ['title', 'projectData', 'Config'],
   name: 'report-echarts',