Merge branch 'master' of http://adicom-hxx.natapp1.cc/CQ_ADI/airoptweb

src/views/home.vue

@@ -3381,7 +3381,7 @@ function initWebSocket() {
   //初始化weosocket
   // const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid; ws://192.168.0.131/diswebsocket?projectId=5
  // const wsurl = "ws://192.168.108:8188//websocket?projectId=" + pid.value;
- const wsurl = "ws://192.168.0.131:8188//websocket?projectId=" + pid.value;
+ const wsurl = import.meta.env.VITE_WEBSOCKET_URL + pid.value;
   // const wsurl =
   //   "ws://" +
   //   process.env.VUE_APP_BASE_websokt +

src/views/home/newfile.vue

@@ -219,7 +219,7 @@ eldialog.value=true;
         justify-content: center;
         align-items: center;
         text-align: center;
-        margin: 0 10px;
+        margin: 0 5px;
     }
 }
 </style>
@@ -251,7 +251,7 @@ text-transform: none;
 }
 
 .custom-collapse .el-collapse-item__content{
-  padding-bottom: 10px;
+  padding-bottom: 5px;
 }
 
 </style>