From aba94fd553f6260f3c1873d080fb87dd30f7a368 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 17 六月 2024 13:04:05 +0800
Subject: [PATCH] 1
---
.env.development | 6 +++---
src/utils/tool.js | 14 ++++++++++++--
src/views/console/soam/oss-system.vue | 8 ++++----
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/.env.development b/.env.development
index 0b0bcac..b99bd8d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
###
# @Date: 2024-03-23 09:49:06
- # @LastEditors: Sneed
- # @LastEditTime: 2024-06-06 22:02:18
+ # @LastEditors: lzhe lzhe@example.com
+ # @LastEditTime: 2024-06-17 13:02:52
# @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/.env.development
###
# 鏈湴鐜
@@ -11,7 +11,7 @@
VUE_APP_TITLE = 鍒堕�犱俊鎭鐞嗙郴缁�
# 鎺ュ彛鍦板潃
-VUE_APP_API_BASEURL = http://120.46.212.231:83
+VUE_APP_API_BASEURL = http://120.46.212.231:84
# 鏈湴绔彛
VUE_APP_PORT = 2800
diff --git a/src/utils/tool.js b/src/utils/tool.js
index bb91b7e..d14c470 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -2,7 +2,7 @@
* @Descripttion: 宸ュ叿闆�
* @version: 1.2
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-17 10:48:29
+ * @LastEditTime: 2024-06-17 13:03:38
*/
import CryptoJS from 'crypto-js';
@@ -10,6 +10,16 @@
const tool = {}
+var currentLocation = window.location.href; // 鑾峰彇瀹屾暣鐨刄RL
+var protocol = window.location.protocol; // 鑾峰彇鍗忚锛堝http:鎴杊ttps:锛�
+var hostname = window.location.hostname; // 鑾峰彇涓绘満鍚�
+var port = window.location.port; // 鑾峰彇绔彛鍙�
+var pathname = window.location.pathname; // 鑾峰彇璺緞鍚�
+if (process.env.NODE_ENV=='development') {
+ var path = "120.46.212.231:84";
+} else {
+ var path = hostname+":"+port;
+}
/* localStorage */
tool.data = {
set(key, data, datetime = 0) {
@@ -116,7 +126,7 @@
/* socket */
tool.socket = {
- url:'ws://120.46.212.231:84//ws/info',
+ url:'ws://'+path+'/ws/info',
websocket: null,
connectToWebSocket(token) { //寤虹珛閾炬帴
this.websocket = new WebSocket(this.url + "?access_token=" + token);
diff --git a/src/views/console/soam/oss-system.vue b/src/views/console/soam/oss-system.vue
index efb9007..e73727a 100644
--- a/src/views/console/soam/oss-system.vue
+++ b/src/views/console/soam/oss-system.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-08 16:28:34
+ * @LastEditTime: 2024-06-17 13:01:56
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -60,7 +60,7 @@
<li :class="{active: active.isA}" @click="changeLi('isA')">
<div class="edit" @click="editBtn('isA')">缂栬緫</div>
<div class="logo">
- <img src="http://116.63.155.153:83/api/static/images/cps.png">
+ <img src="http://116.63.155.153:84/api/static/images/cps.png">
</div>
<div class="content">
<div class="name">CPS</div>
@@ -70,7 +70,7 @@
<li :class="{active: active.isB}" @click="changeLi('isB')">
<div class="edit" @click="editBtn('isB')">缂栬緫</div>
<div class="logo">
- <img src="http://116.63.155.153:83/api/static/images/vision.png">
+ <img src="http://116.63.155.153:84/api/static/images/vision.png">
</div>
<div class="content">
<div class="name">澶у睆</div>
@@ -80,7 +80,7 @@
<li :class="{active: active.isC}" @click="changeLi('isC')">
<div class="edit" @click="editBtn('isC')">缂栬緫</div>
<div class="logo">
- <img src="http://116.63.155.153:83/api/static/images/hmi.png">
+ <img src="http://116.63.155.153:84/api/static/images/hmi.png">
</div>
<div class="content">
<div class="name">HMI</div>
--
Gitblit v1.9.3