From 8c2cab7124b183b86ac1a4f231e432da74d29a4d Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期二, 31 十二月 2024 13:25:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main.js | 7 ++++--- index.html | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index dd35a9b..b82490a 100644 --- a/index.html +++ b/index.html @@ -37,7 +37,8 @@ </head> <body> <div id="app"></div> -<script type='text/javascript' src='https://ztwxlims.ztt.cn:7443/web-apps/apps/api/documents/api.js'></script> +<!-- <script type='text/javascript' src='https://ztwxlims.ztt.cn:7443/onlyoffice/web-apps/apps/api/documents/api.js'></script> --> +<script type='text/javascript' src='http://192.168.22.29:9001/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 548dc3a..2aabee7 100644 --- a/src/main.js +++ b/src/main.js @@ -22,15 +22,16 @@ //鏈湴 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; // const javaApi = 'http://127.0.0.1:8001'; -const javaApi = 'http://172.20.10.5:8001'; +// const javaApi = 'http://172.20.10.5:8001'; //閫氫俊娴嬭瘯搴� // Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080"; // const javaApi = 'http://10.1.13.77:8001'; // 閫氫俊姝ｅ紡搴� -// Vue.prototype.LOCATIONVUE = "http://10.193.45.63:8080"; -// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/'; +// Vue.prototype.LOCATIONVUE = "http://192.168.22.29:8080"; +// const javaApi = 'http://192.168.22.29:8001/lims/'; +const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/'; // //浜� // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080"; -- Gitblit v1.9.3