Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/utils/request.js

src/style.css

@@ -67,8 +67,10 @@ button:focus-visible {
 }
 
 #app {
-    width: 1080px;
-    min-width: 1080px;
+    width: 100%;
+    overflow-x: hidden;
+    /*width: 1080px;*/
+    /*min-width: 1080px;*/
     margin: 0 auto;
 }
 

src/utils/request.js

@@ -4,7 +4,7 @@ import { ElMessage } from "element-plus";
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
 
 const service = axios.create({
-    baseURL: import.meta.env.MODE === 'development' ? '/dev-api' : 'https://192.168.1.123:5000', timeout: 100000
+    baseURL: import.meta.env.PROD ? 'https://www.scrin.xyz/prod-api' : '/dev-api', timeout: 100000
 });
 
 service.interceptors.request.use(config => {

src/views/index.vue

@@ -1352,7 +1352,8 @@ const table1Current1 = (e,) => {
 // ws连接
 const getSocket = () => {
 
-  const socket = new WebSocket("ws://192.168.1.123:7789/ws");
+  // const socket = new WebSocket("ws://192.168.1.123:7789/ws");
+  const socket = import.meta.env.MODE === 'development' ? new WebSocket("ws://192.168.1.123:7789/ws") : new WebSocket("wss://www.scrin.xyz/ws");
 
   socket.addEventListener("open", () => {
     // console.log("✅ WebSocket 连接成功");