Merge branch 'dev' into xiaoyang

wanshenmean

3 天以前 ef57389fd66aca85d6fb4a73c0f7c1c1f7d607b2

 Code/WMS/WIDESEA_WMSClient/src/views/charts/formChart.vue

@@ -55,7 +55,7 @@
<script>
import VolHeader from '@/components/basic/VolHeader.vue';
import VolForm from '@/components/basic/VolForm.vue';
let echarts = require('echarts');
import * as echarts from 'echarts';
import options from './chartOptions';
import {
  formFields1,