合并冲突

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // http://36.133.174.236:9090  http://192.168.1.127:9090 http://192.168.31.110:9090(动感光波) 192.168.58.11:9090(五楼车总)
-        target: `http://36.133.174.236:9190`,
+        // http://36.133.174.236:9190  http://192.168.1.127:9190 http://192.168.31.110:9090(动感光波) 192.168.58.11:9090(五楼车总)
+        target: `http://192.168.28.97:9190`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -44,7 +44,7 @@ module.exports = {
       },
       '/ureport': {
         target: 'http://36.133.174.236:9190',
-        ws:false,
+        ws: false,
         changeOrigin: true,
         pathRewrite: {
           '^/ureport': '/ureport'
@@ -109,7 +109,7 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()
@@ -139,8 +139,8 @@ module.exports = {
             })
           config.optimization.runtimeChunk('single'),
           {
-             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-             to: './' //到根目录下
+            from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+            to: './' //到根目录下
           }
         }
       )