样式修改，问题修改

.env.development

@@ -25,4 +25,8 @@ VUE_APP_URL=https://10.220.1.5:5300
 VUE_APP_REPORT=http://10.220.1.5:8001
 # VUE_APP_REPORT=https://10.112.33.5:8001
 
-VUE_APP_GENERAT_URL=http://10.220.1.5:6060
+VUE_APP_GENERAT_URL=http://10.220.1.5:6060
+# VUE_APP_GENERAT_URL=http://10.112.33.5:6060
+
+VUE_APP_WS_URL=ws://10.220.1.11:6015
+# VUE_APP_WS_URL=ws://10.112.33.5:6015

.env.production

@@ -35,6 +35,9 @@ VUE_APP_URL=https://10.112.33.5:5300
 # VUE_APP_REPORT=http://10.220.1.5:8001
 VUE_APP_REPORT=http://10.112.33.5:8001
 
+VUE_APP_WS_URL=ws://10.220.1.11:6015
+# VUE_APP_WS_URL=ws://10.112.33.5:6015
+
 
 # # 趋势对比数据条数
 # VUE_APP_DIALOG_NUM = 8

src/components/alarm-badge/index.vue

@@ -533,7 +533,7 @@ export default {
     // websocket启动
     createWebSocket1() {
       //   let webSocketLink = `ws://192.168.1.102:6014/websocket/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`;
-      let webSocketLink1 = `ws://10.220.1.11:6015/websocket/nxf_${this.$store.state.user.authToken}`; // webSocket地址
+      let webSocketLink1 = `${process.env.VUE_APP_WS_URL}/websocket/nxf_${this.$store.state.user.authToken}`; // webSocket地址
       try {
         if ("WebSocket" in window) {
           this.socketObj1 = new WebSocket(webSocketLink1);

src/views/IntegratedAlarm/alarmConfig/customConfig/index.vue

@@ -2112,6 +2112,7 @@ const enabledConvert = (val) => {
   .el-table::v-deep {
     .el-table__body-wrapper {
       height: calc(100% - 45px) !important;
+      overflow-y: auto;
     }
   }
   .pagination-wrapper ::v-deep {

src/views/IntegratedAlarm/alarmConfig/historyConfig/index.vue

@@ -1218,9 +1218,11 @@ const relatePartConvert = (val) => {
       margin-left: 25px;
     }
   }
+
   .el-table::v-deep {
     .el-table__body-wrapper {
       height: calc(100% - 45px) !important;
+      overflow-y: auto;
     }
   }
   .pagination-wrapper ::v-deep {

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -811,6 +811,12 @@ p {
         margin-left: 25px;
       }
     }
+    .el-table {
+      .el-table__body-wrapper{
+        height: 100%;
+        overflow-y: auto;
+      }
+    }
     .pagination-wrapper :deep {
       text-align: right;
       margin-top: 10px;

src/views/IntegratedAlarm/safe/historyWarning/index.vue

@@ -858,6 +858,12 @@ p {
         margin-left: 25px;
       }
     }
+    .el-table {
+      .el-table__body-wrapper{
+        height: 100%;
+        overflow-y: auto;
+      }
+    }
     .pagination-wrapper :deep {
       text-align: right;
       margin-top: 10px;