From 1db24af640a271fd1814220dbd724a0c71509a9a Mon Sep 17 00:00:00 2001
From: zk <1057786341@qq.com>
Date: Thu, 13 Oct 2022 15:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BF=AE=E6=94=B9=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=9A=84=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/config.js            |  4 ++--
 src/utils/http.js              |  1 +
 src/utils/request.js           |  2 +-
 src/utils/websocket_service.js |  4 +++-
 src/views/Login.vue            | 12 +-----------
 src/views/NewMainPage.vue      |  2 +-
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/utils/config.js b/src/utils/config.js
index 0aa94b7..d91a448 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -2,6 +2,6 @@ module.exports = {
   // baseUrl: 'localhost:2011'
   // baseUrl: '49.234.81.196:2011'
   // baseUrl: '120.25.106.20:2011'
-  // baseUrl: 'localhost:40000'
-  baseUrl: '192.168.0.107:2011'
+  baseUrl: 'localhost:40000'
+  // baseUrl: '192.168.0.107:2011'
 }
diff --git a/src/utils/http.js b/src/utils/http.js
index 13c8ec6..2e2e0aa 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -74,6 +74,7 @@ export function putRequest(url, params) {
 export function deleteRequest(url, params) {
   return http.delete(url, params)
 }
+// 下载请求
 export function download(url, params) {
   return http.download(url, params)
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 59a251d..51aca45 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -54,7 +54,7 @@ service.interceptors.response.use(success => {
   } else if (error.response.data.message) {
     Message.error({ message: error.response.data.message })
   } else {
-    Message.error({ message: '未知错误' })
+    Message.error({ message: '后台正在启动中，请稍后再试' })
   }
 })
 
diff --git a/src/utils/websocket_service.js b/src/utils/websocket_service.js
index dea5f27..b79fc3e 100644
--- a/src/utils/websocket_service.js
+++ b/src/utils/websocket_service.js
@@ -16,6 +16,8 @@ ws = null
 // 存储回调函数
 callBackMapping = {}
 
+ipAddress = JSON.parse(localStorage.getItem('ipAddress'))
+
 // 标识是否连接成功
 connected = false
 
@@ -32,7 +34,7 @@ connect() {
 /*   if (!Window.WebSocket) {
     return console.log('您的浏览器不支持WebSocket')
   } */
-  this.ws = new WebSocket(`ws://${baseUrl}/WebSocket/${window.localStorage.getItem('staffNumber')}`) // Websocket ip+端口
+  this.ws = new WebSocket('ws://' + this.ipAddress + `:40000/WebSocket/${window.localStorage.getItem('staffNumber')}`) // Websocket ip+端口
   // 连接成功
   this.ws.onopen = () => {
     // Message.success('WebSocket连接成功')
diff --git a/src/views/Login.vue b/src/views/Login.vue
index c37db3e..8d8a2ea 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,13 +1,6 @@
 <!-- 登录界面 -->
 <template>
   <div class="login">
-    <div v-if="show" id="Loading">
-      <div class="loader-inner ball-beat">
-        <div />
-        <div />
-        <div />
-      </div>
-    </div>
     <div v-if="!show" class="login-box">
       <el-form ref="loginForm" :model="loginForm" :rules="rules">
         <h3 class="title">
@@ -49,7 +42,6 @@ import { login } from '@/utils/SystemSettingApi'
 export default {
   data() {
     return {
-      show: true,
       loginForm: {
         staffNumber: '',
         password: ''
@@ -65,9 +57,6 @@ export default {
     }
   },
   mounted() {
-    setTimeout(() => {
-      this.show = false
-    }, 4000)
   },
   methods: {
     // 登录提交
@@ -79,6 +68,7 @@ export default {
             if (res.data) {
               window.localStorage.setItem('menuList', JSON.stringify(res.data.menuList))
               window.localStorage.setItem('userName', JSON.stringify(res.data.userName))
+              window.localStorage.setItem('ipAddress', JSON.stringify(res.data.ipAddress))
               window.localStorage.setItem('staffNumber', JSON.stringify(this.loginForm.staffNumber))
             }
             await this.$router.replace('/NewMainPage')
diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue
index b569168..e729bab 100644
--- a/src/views/NewMainPage.vue
+++ b/src/views/NewMainPage.vue
@@ -63,7 +63,7 @@
               IP地址:{{ netWorkIp }}
             </span><br>
             <span>
-              端口号:41111
+              端口号:20001
             </span>
           </div>
           <!--     服务器文字     -->
-- 
Gitee