浏览代码

常规上传

wangb 1 周之前
父节点
当前提交
79341662f9
共有 4 个文件被更改,包括 103 次插入81 次删除
  1. 16 27
      .env.development
  2. 11 24
      .env.production
  3. 15 13
      npminstall-debug.log
  4. 61 17
      vue.config.js

+ 16 - 27
.env.development

@@ -4,46 +4,35 @@ NODE_ENV = 'development'
 # 页面标题
 VUE_APP_TITLE = '页面标题'
 
-# 开发环境/重写路径(公共路径)
+VUE_APP_PROJECT = '172'
 
 # 登录
-# VUE_APP_LOGIN_URL = 'https://123.60.219.66:48080'
-# 马力军
-# VUE_APP_LOGIN_URL = 'https://192.168.2.45:48080'
-# 王波
-VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
+VUE_APP_LOGIN_URL = '/api48080'
+# VUE_APP_LOGIN_URL = 'https://10.127.7.241:48080'
 # VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
 
 # 发电能力分析
-# VUE_APP_GENERAT_URL = 'https://192.168.0.102:9002'
-# 马力军
-# VUE_APP_GENERAT_URL = 'https://192.168.2.45:9002'
-# 王波
-VUE_APP_GENERAT_URL = 'https://172.16.12.101:9002'
-# VUE_APP_GENERAT_URL = 'https://127.0.0.1:9002'
+VUE_APP_GENERAT_URL = '/api9002'
+# VUE_APP_GENERAT_URL = 'https://10.127.7.241:9002'
+# VUE_APP_GENERAT_URL = 'https://172.16.12.101:9002'
 
 # 智能报表
-# VUE_APP_REPORT_URL = 'https://192.168.0.102:9001'
-# 马力军
-# VUE_APP_REPORT_URL = 'https://192.168.2.45:9001'
-# 王波
-VUE_APP_REPORT_URL = 'https://172.16.12.101:9001'
+VUE_APP_REPORT_URL = '/rib'
+# VUE_APP_REPORT_URL = 'https://10.127.7.241:9001'
+# VUE_APP_REPORT_URL = 'https://172.16.12.101:9001'
 
 # 功率预测
-# 徐世利
-# VUE_APP_BASE_URL = 'https://192.168.2.150:8086'
-# 马力军
-# VUE_APP_BASE_URL = 'https://192.168.2.45:8086'
-# 王波
-VUE_APP_BASE_URL = 'https://172.16.12.101:8086'
+VUE_APP_BASE_URL = '/api8086'
+# VUE_APP_BASE_URL = 'https://10.127.7.241:8086'
+# VUE_APP_BASE_URL = 'https://172.16.12.101:8086'
 
 # 综合报警
-# VUE_APP_ALARM = 'https://10.127.7.241:6015'
-VUE_APP_ALARM = 'https://172.16.12.101:7095'
-# VUE_APP_ALARM = 'https://localhost:6015'
+VUE_APP_ALARM = '/api7095'
+# VUE_APP_ALARM = 'https://10.127.7.241:7095'
+# VUE_APP_ALARM = 'https://172.16.12.101:7095'
 
 # VUE_APP_ADP_BASE_URL = 'https://10.127.7.241:6015'
-VUE_APP_ADP_BASE_URL = 'https://172.16.12.103'
+VUE_APP_ADP_BASE_URL = 'https://172.16.12.101'
 
 # 百度地图KEY
 VUE_APP_BAIDU_MAP_KEY = ''

+ 11 - 24
.env.production

@@ -11,44 +11,31 @@ NODE_ENV = 'production'
 # 页面标题
 VUE_APP_TITLE = '页面标题'
 
+VUE_APP_PROJECT = '10'
+
 # 登录
-# VUE_APP_LOGIN_URL = 'https://123.60.219.66:48080'
-# VUE_APP_LOGIN_URL = 'https://192.168.0.105:48080'
+VUE_APP_LOGIN_URL = '/api48080'
 # VUE_APP_LOGIN_URL = 'https://10.127.7.241:48080'
 # VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
-# VUE_APP_LOGIN_URL = 'https://192.168.2.231:48080'
-# VUE_APP_LOGIN_URL = 'https://127.0.0.1:48080'
-
-VUE_APP_LOGIN_URL = 'https://10.127.7.241:48080'
-# VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
-
-# 生产环境/重写路径(公共路径)
 
 # 发电能力分析
-# VUE_APP_GENERAT_URL = 'https://123.60.219.66:9002'
-VUE_APP_GENERAT_URL = 'https://10.127.7.241:9002'
+VUE_APP_GENERAT_URL = '/api9002'
+# VUE_APP_GENERAT_URL = 'https://10.127.7.241:9002'
 # VUE_APP_GENERAT_URL = 'https://172.16.12.101:9002'
-# VUE_APP_GENERAT_URL = 'https://192.168.2.231:9002'
-# VUE_APP_GENERAT_URL = 'https://127.0.0.1:9002'
 
 # 智能报表
-# VUE_APP_REPORT_URL = 'https://123.60.219.66:9001'
-# VUE_APP_REPORT_URL = 'https://192.168.0.105:9001'
-VUE_APP_REPORT_URL = 'https://10.127.7.241:9001'
+VUE_APP_REPORT_URL = '/rib'
+# VUE_APP_REPORT_URL = 'https://10.127.7.241:9001'
 # VUE_APP_REPORT_URL = 'https://172.16.12.101:9001'
-# VUE_APP_REPORT_URL = 'https://192.168.2.231:9001'
-# VUE_APP_REPORT_URL = 'https://127.0.0.1:9001'
 
 # 功率预测
-# VUE_APP_BASE_URL = 'https://123.60.219.66:8086'
-# VUE_APP_BASE_URL = 'https://192.168.0.105:8086'
-VUE_APP_BASE_URL = 'https://10.127.7.241:8086'
+VUE_APP_BASE_URL = '/api8086'
+# VUE_APP_BASE_URL = 'https://10.127.7.241:8086'
 # VUE_APP_BASE_URL = 'https://172.16.12.101:8086'
-# VUE_APP_BASE_URL = 'https://192.168.2.231:8086'
-# VUE_APP_BASE_URL = 'https://127.0.0.1:8086'
 
 # 综合报警
-VUE_APP_ALARM = 'https://10.127.7.241:7095'
+VUE_APP_ALARM = '/api7095'
+# VUE_APP_ALARM = 'https://10.127.7.241:7095'
 # VUE_APP_ALARM = 'https://172.16.12.101:7095'
 
 # VUE_APP_ADP_BASE_URL = 'https://10.127.7.241:6015'

+ 15 - 13
npminstall-debug.log

@@ -1,19 +1,19 @@
 {
-  root: 'D:\\windLifecontrolPro',
+  root: 'D:\\work\\workspaces\\wind\\windLifecontrolPro',
   registry: 'https://registry.npmmirror.com',
   pkgs: [],
   production: false,
   cacheStrict: false,
-  cacheDir: 'C:\\Users\\GYEE\\.npminstall_tarball',
+  cacheDir: 'C:\\Users\\26678\\.npminstall_tarball',
   env: {
     npm_config_registry: 'https://registry.npmmirror.com',
-    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\GYEE\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\GYEE\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}',
-    npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v22.19.0 win32 x64',
-    npm_config_cache: 'C:\\Users\\GYEE\\.npminstall_tarball',
-    NODE: 'C:\\Program Files\\nodejs\\node.exe',
-    npm_node_execpath: 'C:\\Program Files\\nodejs\\node.exe',
-    npm_execpath: 'C:\\Users\\GYEE\\AppData\\Roaming\\npm\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
-    npm_config_userconfig: 'C:\\Users\\GYEE\\.cnpmrc',
+    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\26678\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\26678\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}',
+    npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v16.14.2 win32 x64',
+    npm_config_cache: 'C:\\Users\\26678\\.npminstall_tarball',
+    NODE: 'D:\\software\\nodejs\\node.exe',
+    npm_node_execpath: 'D:\\software\\nodejs\\node.exe',
+    npm_execpath: 'D:\\software\\nvm\\node_global\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
+    npm_config_userconfig: 'C:\\Users\\26678\\.cnpmrc',
     npm_config_disturl: 'https://cdn.npmmirror.com/binaries/node',
     npm_config_r: 'https://registry.npmmirror.com',
     COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
@@ -45,8 +45,9 @@
     npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
     npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs',
     npm_config_gl_binary_host: 'https://cdn.npmmirror.com/binaries/gl',
-    npm_rootpath: 'D:\\windLifecontrolPro',
-    INIT_CWD: 'D:\\windLifecontrolPro'
+    RIPGREP_PREBUILT_BINARIES_MIRROR: 'https://registry.npmmirror.com/-/binary/ripgrep-prebuilt',
+    npm_rootpath: 'D:\\work\\workspaces\\wind\\windLifecontrolPro',
+    INIT_CWD: 'D:\\work\\workspaces\\wind\\windLifecontrolPro'
   },
   binaryMirrors: {
     ENVS: {
@@ -78,7 +79,8 @@
       npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
       npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
       npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs',
-      npm_config_gl_binary_host: 'https://cdn.npmmirror.com/binaries/gl'
+      npm_config_gl_binary_host: 'https://cdn.npmmirror.com/binaries/gl',
+      RIPGREP_PREBUILT_BINARIES_MIRROR: 'https://registry.npmmirror.com/-/binary/ripgrep-prebuilt'
     },
     '@ali/s2': { host: 'https://cdn.npmmirror.com/binaries/looksgood-s2' },
     sharp: { replaceHostFiles: [Array], replaceHostMap: [Object] },
@@ -188,7 +190,7 @@
   disableFallbackStore: false,
   workspacesMap: Map(0) {},
   enableWorkspace: false,
-  workspaceRoot: 'D:\\windLifecontrolPro',
+  workspaceRoot: 'D:\\work\\workspaces\\wind\\windLifecontrolPro',
   isWorkspaceRoot: true,
   isWorkspacePackage: false,
   offline: false,

+ 61 - 17
vue.config.js

@@ -98,22 +98,66 @@ module.exports = defineConfig({
     port: port,
     open: false,
     proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      // [process.env.VUE_APP_GENERAT_URL]: {
-      //     // target: 'http://123.60.219.66:9002',
-      //     target: 'http://192.168.2.12:9002',
-      //     changeOrigin: true, //开启代理
-      //     pathRewrite: {
-      //         [process.env.VUE_APP_GENERAT_URL]: ''
-      //     }
-      // },
-      // [process.env.VUE_APP_BASE_URL]: {
-      //     target: 'http://123.60.219.66:8086',
-      //     changeOrigin: true,
-      //     pathRewrite: {
-      //         [process.env.VUE_APP_BASE_URL]: ''
-      //     }
-      // }
+      "/rib": {
+        target: (process.env.NODE_ENV === "10" ? "https://10.127.7.241:9001" : "https://172.16.12.101:9001"), // 请求地址
+
+        changeOrigin: true, // 在vue-cli3中,默认changeOrigin的值是true,意味着服务器host设置成target,这与vue-cli2不一致,vue-cli2这个默认值是false
+        // changeOrigin的值是true,target是host, request URL是http://baidu.com
+        // 如果设置changeOrigin: false,host就是浏览器发送过来的host,也就是localhost:8082。
+
+        pathRewrite: {
+          // 路径重写,eg:把api接口替换为''
+          "^/api48080": "",
+        },
+      },
+      "/api48080": {
+        target: (process.env.NODE_ENV === "10" ? "https://10.127.7.241:48080" : "https://172.16.12.101:48080"), // 请求地址
+
+        changeOrigin: true, // 在vue-cli3中,默认changeOrigin的值是true,意味着服务器host设置成target,这与vue-cli2不一致,vue-cli2这个默认值是false
+        // changeOrigin的值是true,target是host, request URL是http://baidu.com
+        // 如果设置changeOrigin: false,host就是浏览器发送过来的host,也就是localhost:8082。
+
+        pathRewrite: {
+          // 路径重写,eg:把api接口替换为''
+          "^/api48080": "",
+        },
+      },
+      "/api9002": {
+        target: (process.env.NODE_ENV === "10" ? "https://10.127.7.241:9002" : "https://172.16.12.101:9002"), // 请求地址
+
+        changeOrigin: true, // 在vue-cli3中,默认changeOrigin的值是true,意味着服务器host设置成target,这与vue-cli2不一致,vue-cli2这个默认值是false
+        // changeOrigin的值是true,target是host, request URL是http://baidu.com
+        // 如果设置changeOrigin: false,host就是浏览器发送过来的host,也就是localhost:8082。
+
+        pathRewrite: {
+          // 路径重写,eg:把api接口替换为''
+          "^/api9002": "",
+        },
+      },
+      "/api8086": {
+        target: (process.env.NODE_ENV === "10" ? "https://10.127.7.241:8086" : "https://172.16.12.101:8086"), // 请求地址
+
+        changeOrigin: true, // 在vue-cli3中,默认changeOrigin的值是true,意味着服务器host设置成target,这与vue-cli2不一致,vue-cli2这个默认值是false
+        // changeOrigin的值是true,target是host, request URL是http://baidu.com
+        // 如果设置changeOrigin: false,host就是浏览器发送过来的host,也就是localhost:8082。
+
+        pathRewrite: {
+          // 路径重写,eg:把api接口替换为''
+          "^/api8086": "",
+        },
+      },
+      "/api7095": {
+        target: (process.env.NODE_ENV === "10" ? "https://10.127.7.241:7095" : "https://172.16.12.101:7095"), // 请求地址
+
+        changeOrigin: true, // 在vue-cli3中,默认changeOrigin的值是true,意味着服务器host设置成target,这与vue-cli2不一致,vue-cli2这个默认值是false
+        // changeOrigin的值是true,target是host, request URL是http://baidu.com
+        // 如果设置changeOrigin: false,host就是浏览器发送过来的host,也就是localhost:8082。
+
+        pathRewrite: {
+          // 路径重写,eg:把api接口替换为''
+          "^/api7095": "",
+        },
+      },
     }
   },
   // 和webpapck属性完全一致,最后会进行合并
@@ -207,4 +251,4 @@ module.exports = defineConfig({
         ]),
       });
   }
-})
+})