From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
vue.config.js | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index 1ef0d9a..46ed856 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,8 +1,15 @@
+/*
+ * @Date: 2024-03-23 09:49:06
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2025-11-04 22:19:58
+ * @FilePath: /cps-web/vue.config.js
+ */
const { defineConfig } = require('@vue/cli-service')
module.exports = defineConfig({
+ lintOnSave: false,
//璁剧疆涓虹┖鎵撳寘鍚庝笉鍒嗘洿鐩綍杩樻槸澶氱骇鐩綍
- publicPath:'',
+ publicPath: '',
//build缂栬瘧鍚庡瓨鏀鹃潤鎬佹枃浠剁殑鐩綍
//assetsDir: "static",
@@ -11,17 +18,56 @@
//寮�鍙戞湇鍔�,build鍚庣殑鐢熶骇妯″紡杩橀渶nginx浠ｇ悊
devServer: {
- allowedHosts: 'all',
+ client: {
+ overlay: false
+ },
+ allowedHosts: 'all',
open: false, //杩愯鍚庤嚜鍔ㄦ墦寮�娴忚鍣�
port: process.env.VUE_APP_PORT, //鎸傝浇绔彛
proxy: {
- '/api': {
- target: process.env.VUE_APP_API_BASEURL,
- ws: true,
+ /*
+ '/api/smart-collect': {
+ target: 'http://120.46.212.231:5102',
+ // ws: true,
+ changeOrigin: true,
pathRewrite: {
'^/api': '/'
}
- }
+ },
+ '/workinghour': {
+ target: 'http://120.46.212.231:5102',
+ // ws: true,
+ changeOrigin: true,
+ pathRewrite: {
+ '^/api': '/'
+ }
+ },
+ '/api/smis/workstation/saveDatapoints': {
+ target: 'http://120.46.212.231:5102',
+ // ws: true,
+ changeOrigin: true,
+ pathRewrite: {
+ '^/api': '/'
+ }
+ },
+ '/api/smis/workstation/export-dp': {
+ target: 'http://120.46.212.231:5102',
+ // ws: true,
+ changeOrigin: true,
+ pathRewrite: {
+ '^/api': '/'
+ }
+ },*/
+ '/api': {
+ // target: 'http://localhost:4102',
+ target: process.env.VUE_APP_API_BASEURL,
+ ws: true,
+ pathRewrite: {
+ //'^/api': '/api'
+ '^/api': '/'
+ }
+ },
+
}
},
--
Gitblit v1.9.3