Merge branch 'master' of http://git.fast-fun.cn:92/ruili/zk-station-control-frontend

default.conf

@@ -18,9 +18,18 @@ server {
         try_files $uri $uri/ /index.html;
         index  start.html index.html;
     }
+    
+    location /api {
+        proxy_read_timeout 300;
+        proxy_pass   http://172.16.121.248:8080;
+    }
 
+    location /ws {
+        proxy_read_timeout 300;
+        proxy_pass   http://172.16.121.248:8080/ws;
+    }
     # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
+    
     # location /api {
     #     proxy_pass   http://api-server:8082;
     # }

vue.config.js

@@ -1,116 +1,116 @@
-'use strict'
-const path = require('path')
-
-function resolve(dir) {
-  return path.join(__dirname, dir)
-}
-const name = '重卡换电智能站控系统'
-module.exports = {
-  publicPath: "/",
-  outputDir: 'dist',
-  assetsDir: 'static',
-  lintOnSave: false,
-  
-  productionSourceMap: false,
-  devServer: {
-    host: 'localhost',
-    port: 808,
-    open: true,
-    overlay: {
-      warning: false,
-      error: true,
-    },
-    proxy: {
-      '/api': {
-        // target: `http://192.168.3.177:8080`,
-        target: `http://zk.li-ai.com.cn:8080`,
-        ws: true,
-        changeOrigin: true,
-      },
-      '/ws': {
-        // target: `ws://192.168.3.177:8080/ws`,
-        target: `ws://zk.li-ai.com.cn:8080/ws`,
-        ws: true,
-        changeOrigin: true,
-      },
-      '/video':{
-        // target: `ws://192.168.3.177:8082/`,
-        target: `ws://zk.li-ai.com.cn:8080/ws`,
-        ws: true,
-        changeOrigin: true,
-      }
-    },
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    }
-  },
-  chainWebpack(config) {
-    config.plugin('preload').tap(() => [
-      {
-        rel: 'preload',
-        fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/],
-        include: 'initial'
-      }
-    ])
-
-    config.plugins.delete('prefetch')
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
-
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' 
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', 
-                  priority: 20, 
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ 
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), 
-                  minChunks: 3, 
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single')
-        }
-      )
-  }
-}
+'use strict'
+const path = require('path')
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+const name = '重卡换电智能站控系统'
+module.exports = {
+  publicPath: "/",
+  outputDir: 'dist',
+  assetsDir: 'static',
+  lintOnSave: false,
+  
+  productionSourceMap: false,
+  devServer: {
+    host: 'localhost',
+    port: 808,
+    open: true,
+    overlay: {
+      warning: false,
+      error: true,
+    },
+    proxy: {
+      '/api': {
+        // target: `http://192.168.3.177:8080`,
+        target: `http://zk.li-ai.com.cn:8080`,
+        ws: true,
+        changeOrigin: true,
+      },
+      '/ws': {
+        // target: `ws://192.168.3.177:8080/ws`,
+        target: `ws://zk.li-ai.com.cn:8080/ws`,
+        ws: true,
+        changeOrigin: true,
+      },
+      '/video':{
+        // target: `ws://192.168.3.177:8082/`,
+        target: `ws://zk.li-ai.com.cn:8080/ws`,
+        ws: true,
+        changeOrigin: true,
+      }
+    },
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src')
+      }
+    }
+  },
+  chainWebpack(config) {
+    config.plugin('preload').tap(() => [
+      {
+        rel: 'preload',
+        fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/],
+        include: 'initial'
+      }
+    ])
+
+    config.plugins.delete('prefetch')
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
+
+    config
+      .when(process.env.NODE_ENV !== 'development',
+        config => {
+          config
+            .plugin('ScriptExtHtmlWebpackPlugin')
+            .after('html')
+            .use('script-ext-html-webpack-plugin', [{
+              inline: /runtime\..*\.js$/
+            }])
+            .end()
+          config
+            .optimization.splitChunks({
+              chunks: 'all',
+              cacheGroups: {
+                libs: {
+                  name: 'chunk-libs',
+                  test: /[\\/]node_modules[\\/]/,
+                  priority: 10,
+                  chunks: 'initial' 
+                },
+                elementUI: {
+                  name: 'chunk-elementUI', 
+                  priority: 20, 
+                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ 
+                },
+                commons: {
+                  name: 'chunk-commons',
+                  test: resolve('src/components'), 
+                  minChunks: 3, 
+                  priority: 5,
+                  reuseExistingChunk: true
+                }
+              }
+            })
+          config.optimization.runtimeChunk('single')
+        }
+      )
+  }
+}