From 3845f43c43252185a134566a63670de9d1c2d253 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 28 十月 2024 15:06:45 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master

---
 src/main.js |    4 ++++
 index.html  |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/index.html b/index.html
index bf9d2d7..c2bd28a 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@
 </head>
 <body>
 <div id="app"></div>
-<script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
+<script type='text/javascript' src='https://ztwxlims.ztt.cn:7443/web-apps/apps/api/documents/api.js'></script>
 </body>
 <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
 <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script>
diff --git a/src/main.js b/src/main.js
index 9be5ec0..fc53eef 100644
--- a/src/main.js
+++ b/src/main.js
@@ -31,6 +31,10 @@
 // Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
 // const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
 
+// 閫氫俊姝e紡搴�
+Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
+const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+
 //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
 // const javaApi = 'http://10.1.13.77/:1234';

--
Gitblit v1.9.3