Merge branch 'main' of http://git.hivekion.com:3000/IDCDatasync/IDCDatasync-vue

src/views/data/dataCleansing.vue

@@ -266,8 +266,8 @@
   background: linear-gradient(180deg, rgb(43,97,48),rgb(75,160,75),rgb(43,97,48));
 }
 
-.datacleanResult .ant-progress-text{
+/deep/ .datacleanResult .ant-progress-text{
-  color:#fff;
+  color:#fff !important;
 }
 .datacleanResult .ant-list-items{
   border-bottom:1px dashed rgb(35,72,100);

src/views/data/dataManage.vue

@@ -268,8 +268,8 @@
   background: linear-gradient(180deg, rgb(43,97,48),rgb(75,160,75),rgb(43,97,48));
 }
 
-.datacleanResult .ant-progress-text{
+/deep/ .datacleanResult .ant-progress-text{
-  color:#fff;
+  color:#fff !important;
 }
 .datacleanResult .ant-list-items{
   border-bottom:1px dashed rgb(35,72,100);

src/views/fileManage/index.vue

@@ -122,8 +122,9 @@
             rowKey="id"
             :columns="columns"
             class="fileTable"
+            :pagination="false"
+            :scroll="{ x:false,y:tableScrollY  }"
             :dataSource="dataSource"
-            :pagination="searchFileTable"
             :loading="loading"
             @change="handleTableChange"
           >
@@ -160,6 +161,7 @@ export default {
       selectedKeys: [],
       treeData: [],
       isopen: false,
+      tableScrollY: 0,
       columns: [
         {
           title: '序号',
@@ -171,7 +173,6 @@ export default {
           align: 'center',
           dataIndex: 'fileName',
           width: 120,
-          sorter: true,
         },
         {
           title: '文件后缀',
@@ -206,18 +207,6 @@ export default {
           width: 170,
         },
       ],
-      /* 分页参数 */
-      searchFileTable: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['5', '10', '20', '50', '100'],
-        showTotal: (total, range) => {
-          return range[0] + '-' + range[1] + ' 共' + total + '条'
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0,
-      },
       dataSource: [],
       loading: false,
       selectedRowKeys: [],
@@ -244,9 +233,16 @@ export default {
   mounted() {
     this.getDirList()
     this.getcountFileNum()
+    this.calculateScrollY();
   },
   computed: {},
   methods: {
+    calculateScrollY() {
+      // 获取父容器高度（需减去表格内其他元素的高度，如分页栏）
+      const container = this.$refs.tableContainer;
+      const paginationHeight = 64; // 根据实际分页栏高度调整
+      this.tableScrollY = container.clientHeight - paginationHeight;
+    },
     clickfile() {
       if (this.selectId.length <= 0) {
         this.$message.warning('必须选择文件上传目录')
@@ -429,6 +425,9 @@ export default {
 </script>
 
 <style scoped>
+/deep/ .ant-table-bordered .ant-table-header > table {
+  border: none !important;
+}
 .menu {
   background: #ffffff !important;
 }