From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
vue.config.js | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index 91b41a0..4f8c558 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,15 +2,16 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-//const url = 'http://192.168.2.7:9999'
-//const url = 'http://192.168.32.45:9999'
-// const url = 'http://192.168.0.23:9999'
-const url = 'http://localhost:9999'
+
+// const url = 'http://192.168.2.7:9999'
+// const url = 'https://ztms-mes.chinaztt.cn/'
+
+const url = 'http://192.168.0.104:9999'
const localUrl = 'http://localhost:8089'
-//const localUrl = 'http://10.88.15.95:8089'
+// const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
const productionGzipExtensions = ['js', 'css']
--
Gitblit v1.9.3