Merge remote-tracking branch 'origin/master'

src/views/tunnel-simulate/index.vue

@@ -333,8 +333,8 @@ const handleLogout = () => {
 const initWebSocket = () => {
   // let wsUrl = `ws://frp.toomewhy.top:38000/wstunnel/websocket/simulate/${token}/123`;
   // let wsUrl = `ws://192.168.31.175:9000/websocket/simulate/${token}/${serialNumber.value}`;
-  // let wsUrl = `ws://tunnel.feashow.com/api/wstunnel/websocket/simulate/${token}/${serialNumber.value}`;
-  let wsUrl = import.meta.env.VITE_BASE_WSURL + `/${token}/${serialNumber.value}`;
+  let wsUrl = `ws://tunnel.feashow.com/api/wstunnel/websocket/simulate/${token}/${serialNumber.value}`;
+  // let wsUrl = import.meta.env.VITE_BASE_WSURL + `/${token}/${serialNumber.value}`;
   // let wsUrl = `ws://clay.frp.feashow.cn/wstunnel/websocket/equipment/${token}/${serialNumber.value}`;
   // let wsUrl = `ws://frp.toomewhy.top:39000/websocket/simulate/${token}/${serialNumber.value}`;
   socket = new WebSocket(wsUrl);
@@ -363,7 +363,7 @@ const initWebSocket = () => {
           socketData.windSpeed = data;
         }
         nextTick(() => {
-          previewRef.value.changePointValue(item)
+          previewRef.value?.changePointValue(item)
         })
       });
     }

src/views/tunnel/index.vue

@@ -193,7 +193,7 @@
           <el-button @click="handleReset">重置</el-button>
         </el-form-item>
       </el-form>
-      <div class="device-table" :style="{ marginTop: roleKey === 'administrator' ? '40px' : '0' }">
+      <div class="device-table" :style="{ marginTop: roleKey === 'administrator' ? '10px' : '0' }">
         <el-table stripe v-loading="loading" :empty-text="tableEmptyText"
           style="background-color: #011c29;--el-table-border-color: none;"
           :header-cell-style="{ backgroundColor: '#064B66', color: '#fff', fontSize: '40px', borderBottom: 'none' }"
@@ -232,13 +232,13 @@
         </el-table>
         <div
           class="pagination"
-          :style="{ bottom: roleKey === 'administrator' ? '40px' : '0' }"
+          :style="{ bottom: roleKey === 'administrator' ? '-7px' : '0' }"
         >
           <el-pagination
             background
             v-model:current-page="pageInfo.pageNum"
             v-model:page-size="pageInfo.pageSize"
-            :total="total"
+            :total="total" :pager-count="8"
             prev-text="上一页"
             next-text="下一页"
             layout="prev, pager, next"
@@ -353,7 +353,7 @@ let send = {
 };
 const pageInfo = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 40,
 });
 const queryForm = ref();
 const total = ref(10);
@@ -742,6 +742,30 @@ const initWebSocket = () => {
 </script>
 
 <style lang="scss">
+.alarm-tunnel .device-table{
+
+  height: 1158px!important;
+  overflow-y: scroll;
+  .el-dialog__body{
+    height: 1158px!important;
+    overflow-y: scroll;
+  }
+  &::-webkit-scrollbar {
+    width: 16px;
+  }
+
+  // 滚动条轨道
+  &::-webkit-scrollbar-track {
+    background: transparent;
+    border-radius: 2px;
+  }
+
+  // 小滑块
+  &::-webkit-scrollbar-thumb {
+    background: rgb(8, 183, 184);
+    border-radius: 10px;
+  }
+}
 .el-drawer__header {
   display: none;
 }
@@ -1103,7 +1127,7 @@ const initWebSocket = () => {
   }
 
   :deep(.el-pager li.is-active) {
-    width: 70px;
+    min-width: 70px;
     height: 70px;
     background: #60ddde;
     border-radius: 50%;
@@ -1117,7 +1141,7 @@ const initWebSocket = () => {
   }
 
   :deep(.el-pager li:not(.is-active)) {
-    width: 70px;
+    min-width: 70px;
     height: 70px;
     border: 1px solid #60ddde;
     border-radius: 50%;