Merge branch 'master' of ssh://94.191.59.107:10222/wukai/dayun-ui

src/views/dashboard/twinChart.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
      <!-- ${wheight} -->
-    <div ref="chart" :style="`width: 100%; height:680px; margin: 20px`"></div>
+    <div ref="chart" :style="`width: 100%; height:660px; margin: 20px`"></div>
   </div>
 </template>
 

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target:`http://8.142.173.95:19527`,
-        target:`http://192.168.2.215:8080`,
+        target:`http://8.142.173.95:19527`,
+        // target:`http://192.168.2.215:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''