Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

vue.config.js

@@ -1,6 +1,6 @@
-// const webpack = require('webpack')
-// const CompressionWebpackPlugin = require('compression-webpack-plugin')
-// const productionGzipExtensions = ['js', 'css']
+const webpack = require('webpack')
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+const productionGzipExtensions = ['js', 'css']
 
 module.exports = {
   configureWebpack: {
@@ -8,20 +8,19 @@ module.exports = {
       'AMap': 'AMap' // 高德地图JS API
     },
     // 启用gzip
-    // plugins: [
-    //   new CompressionWebpackPlugin({
-    //     algorithm: 'gzip',
-    //     test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-    //     threshold: 10240,
-    //     minRatio: 0.8,
-    //     deleteOriginalAssets: false // 是否删除源文件
-    //   }),
-    //   new webpack.optimize.LimitChunkCountPlugin({
-    //     maxChunks: 5, 
-    //     minChunkSize: 100
-    //   })
-    // ]
-    // 启用gzip
+    plugins: [
+      new CompressionWebpackPlugin({
+        algorithm: 'gzip',
+        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+        threshold: 10240,
+        minRatio: 0.8,
+        deleteOriginalAssets: false // 是否删除源文件
+      }),
+      new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 5,
+        minChunkSize: 100
+      })
+    ]
   },
   //路径前缀
   publicPath: "/",
@@ -54,8 +53,8 @@ module.exports = {
         // target: 'http://192.168.8.105:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
-        // target: 'http://192.168.161.11:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
+        target: 'http://192.168.161.11:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {