Merge branch 'master' of https://git.united-us.net/United_Software/k_online_ui

src/views/SystemSettings/src/components/MonitoringTable/src/MonitoringTable.vue

@@ -45,18 +45,12 @@ const datatest = ref([])
 const tableData = ref<VxeGridProps<any>>({
   border: true,
   round: true,
-  minHeight: 660,
   maxHeight: 660,
+  minHeight: 660,
   columns: [],
   data: [],
-  cellConfig: {
-    height: 40
-  },
-  headerCellConfig: {
-    height: 40
-  },
-  scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
+  scrollY: { enabled: true, oSize: 20, gt: 20, scrollToTopOnChange: true },
+  scrollX: { enabled: true, gt: 10, scrollToLeftOnChange: true },
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,
@@ -64,7 +58,7 @@ const tableData = ref<VxeGridProps<any>>({
     backgroundColor: 'var(--color-table-header-bg)'
   },
   columnConfig: { resizable: true, useKey: true },
-  rowConfig: { isHover: true }
+  rowConfig: { isHover: true, isCurrent: true },
 })
 
 const tableRef = ref<VxeGridInstance | null>(null)
@@ -283,7 +277,10 @@ onMounted(() => {
 :deep(.el-icon svg) {
   width: 1em !important;
 }
-
+:deep(.vxe-table--body-inner-wrapper) {
+  min-height: 610px !important;
+  max-height: 610px !important;
+}
 :deep(.vxe-table--empty-placeholder) {
   height: 500px !important;
 }