Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '数字四平态势感知监管平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,10 +34,10 @@ module.exports = {
     host: '0.0.0.0',
     port: port,
     open: true,
-    https:{
-      cert : fs.readFileSync(ssl_path.join(__dirname,'src/ssl/supermap.pem')),
-      key : fs.readFileSync(ssl_path.join(__dirname,'src/ssl/supermap.key'))
-    },
+    // https:{
+    //   cert : fs.readFileSync(ssl_path.join(__dirname,'src/ssl/supermap.pem')),
+    //   key : fs.readFileSync(ssl_path.join(__dirname,'src/ssl/supermap.key'))
+    // },
 
     /**
      * 昨夜星辰昨夜风
@@ -52,9 +52,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `https://www.sunyishi.com:3031`,
-        // target: `https://117.78.49.164:3031`,
-        target: `https://www.py.com:3031`,
+         // target: `https://127.0.0.1:3031`,
+         target: `http://117.78.49.164:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''