From 691b8f7112f82613b49d223dbd7a0c2b2da77fc3 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Fri, 9 May 2025 17:32:39 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/dataCleansing.vue | 10 ----------
 src/views/data/dataManage.vue    | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue
index fd87bba..0400c4c 100644
--- a/src/views/data/dataCleansing.vue
+++ b/src/views/data/dataCleansing.vue
@@ -126,16 +126,6 @@ export default {
           align: "center",
           dataIndex: 'dataNum'
         },
-        {
-          title: '开始时间',
-          align: "center",
-          dataIndex: 'startTime'
-        },
-        {
-          title: '最后更新时间',
-          align: "center",
-          dataIndex: 'endTime'
-        },
         {
           title: '标签类型',
           align: "center",
diff --git a/src/views/data/dataManage.vue b/src/views/data/dataManage.vue
index b550a2c..f95e71c 100644
--- a/src/views/data/dataManage.vue
+++ b/src/views/data/dataManage.vue
@@ -128,16 +128,6 @@
             align:"center",
             dataIndex: 'tableMessName'
           },
-          {
-            title: '开始时间',
-            align:"center",
-            dataIndex: 'startTime'
-          },
-          {
-            title: '最后更新时间',
-            align:"center",
-            dataIndex: 'endTime'
-          },
           {
             title: '标签类型',
             align:"center",

From a41172471aad1333fa41c88d1f4bdb4dc14d1a38 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Fri, 9 May 2025 21:38:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fileManage/fullSearch.vue | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/views/fileManage/fullSearch.vue b/src/views/fileManage/fullSearch.vue
index 9c19938..6ad72da 100644
--- a/src/views/fileManage/fullSearch.vue
+++ b/src/views/fileManage/fullSearch.vue
@@ -20,8 +20,18 @@
                 </a-form>
             </div>
             <div style="margin-top: 15px">
-                <a-table ref="table" bordered size="middle" rowKey="id" :columns="columns" class="fileTable"
-                    :dataSource="dataSource" :loading="loading"
+               
+                 <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange}"
+                    @change="handleTableChange">
                     >
                     <span slot="action" slot-scope="text, record">
                         <a @click="download(record,$event)">下载</a>&nbsp; <a @click="viewFile(record,$event)">预览</a>
@@ -124,6 +134,16 @@ export default {
 
     },
     methods: {
+        handleTableChange(pagination, filters, sorter) {
+            //分页、排序、筛选变化时触发
+            //TODO 筛选
+            if (Object.keys(sorter).length > 0) {
+            this.isorter.column = sorter.field;
+            this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+            }
+            this.ipagination = pagination;
+            this.getFileList();
+        },
         download(item){
             let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
             window.open(apiBaseUrl+"/file/downloadFile?fileId="+item.id);
@@ -154,6 +174,10 @@ export default {
             fullTextSearching(this.searchFile).then((res) => {
                 if (res.success) {
                     this.dataSource = res.result
+                    if(res.result.total)
+                    {
+                    this.ipagination.total = res.result.total;
+                    }
                 } else {
                     this.$message.warning(res.message);
                 }

From 36adff7ab2853945137842a547159b7a80b3100b Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Fri, 9 May 2025 23:54:22 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E6=96=87?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fileManage/fullSearch.vue | 60 ++++++++++++-----------------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/views/fileManage/fullSearch.vue b/src/views/fileManage/fullSearch.vue
index 6ad72da..404ef9f 100644
--- a/src/views/fileManage/fullSearch.vue
+++ b/src/views/fileManage/fullSearch.vue
@@ -21,18 +21,9 @@
             </div>
             <div style="margin-top: 15px">
                
-                 <a-table
-                    ref="table"
-                    size="middle"
-                    bordered
-                    rowKey="id"
-                    :columns="columns"
-                    :dataSource="dataSource"
-                    :pagination="ipagination"
-                    :loading="loading"
-                    :rowSelection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange}"
-                    @change="handleTableChange">
-                    >
+                 <a-table size="middle" bordered :columns="columns" :data-source="dataSource" :loading="loading"
+                        :pagination="pagination" :scroll="{ y: 'calc(100vh - 420px)' }" rowKey="id"
+                        @change="handleTableChange">
                     <span slot="action" slot-scope="text, record">
                         <a @click="download(record,$event)">下载</a>&nbsp; <a @click="viewFile(record,$event)">预览</a>
                     </span>
@@ -43,6 +34,7 @@
 <script>
 import {createDir,logicDelDir,renameDir,dirtreeList} from '@/api/dirapi'
 import {downloadFile,filePreview,fullTextSearching} from '@/api/fileapi'
+
 export default {
     name: "fileManage",
     data() {
@@ -80,12 +72,6 @@ export default {
                     width: 80,
                     dataIndex: 'fileTypeName'
                 },
-                {
-                    title: '创建人',
-                    align: "center",
-                    width: 100,
-                    dataIndex: 'createByName'
-                },
                 {
                     title: '操作',
                     dataIndex: 'action',
@@ -122,6 +108,17 @@ export default {
             searchFile:{
                 "queryCriteria":"",
                 "fileType":"",
+                pageNum: 1,
+                pageSize: 10
+            },
+            pagination: {
+                defaultCurrent: 1, // 默认当前页数
+                defaultPageSize: 10, // 默认当前页显示数据的大小total: 0, // 总数，必须先有
+                showSizeChanger: true,
+                showQuickJumper: false,
+                pageSizeOptions: ['10', '20', '30'],
+                showTotal: total => `总共 ${total} 个项目`, // 显示总数
+                onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize)
             },
         }
     },
@@ -135,14 +132,11 @@ export default {
     },
     methods: {
         handleTableChange(pagination, filters, sorter) {
-            //分页、排序、筛选变化时触发
-            //TODO 筛选
-            if (Object.keys(sorter).length > 0) {
-            this.isorter.column = sorter.field;
-            this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
-            }
-            this.ipagination = pagination;
-            this.getFileList();
+            this.pagination = pagination
+            this.searchFile.pageNum = pagination.current
+            this.searchFile.pageSize = pagination.pageSize
+            console.log(pagination.pageSize)
+            this.getFileList()
         },
         download(item){
             let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
@@ -166,18 +160,14 @@ export default {
             this.getFileList();
         },
         getFileList(){
-            if(this.selectId == "0"){
-                this.$message.warning("必须选择查询目录");
-                return;
-            }
             this.searchFile.fileType = this.checkboxValue.join()
             fullTextSearching(this.searchFile).then((res) => {
+                console.log(res)
                 if (res.success) {
-                    this.dataSource = res.result
-                    if(res.result.total)
-                    {
-                    this.ipagination.total = res.result.total;
-                    }
+                    const pagination = { ...this.pagination }
+                    this.dataSource = res.result.rows
+                    pagination.total = res.result.total
+                    this.pagination = pagination
                 } else {
                     this.$message.warning(res.message);
                 }

From 3a358e7ac3e10ebd20cfe17d99d3a2f694a2471d Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Sat, 10 May 2025 13:45:28 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BC=98=E5=8C=9655?=
 =?UTF-8?q?=EF=BC=8C60?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/datalink/modules/SliceUpload.vue   |  9 ++++++++-
 src/views/fileManage/modules/SliceUpload.vue | 10 +++++++++-
 src/views/task/modules/taskModal.vue         |  1 -
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/datalink/modules/SliceUpload.vue b/src/views/datalink/modules/SliceUpload.vue
index 7c7feab..9a5f2b7 100644
--- a/src/views/datalink/modules/SliceUpload.vue
+++ b/src/views/datalink/modules/SliceUpload.vue
@@ -75,7 +75,7 @@ export default {
     maxFile: Number,
     accept: {
       type: String,
-      default: '.jpg,.png,.doc,.docx,.pdf,.txt,.jpeg'
+      default: '.txt,.csv'
     },
     autoUpload: { // 自动上传
       type: Boolean,
@@ -200,6 +200,13 @@ export default {
         this.$message.warning("请先选择上传的模式");
         return 
       }
+      const isValidExtension = this.accept.split(',').some(ext => 
+        file.name.toLowerCase().endsWith(ext)
+      );
+      if (!isValidExtension) {
+        this.$message.error(file.name+'文件类型错误阻止上传！');
+        return false;
+      }
       // 开始执行上传逻辑
       const currentRow = this.tableDate.find((row) => row.uid === file.uid)
       if (currentRow) {
diff --git a/src/views/fileManage/modules/SliceUpload.vue b/src/views/fileManage/modules/SliceUpload.vue
index 61fff0e..63daef3 100644
--- a/src/views/fileManage/modules/SliceUpload.vue
+++ b/src/views/fileManage/modules/SliceUpload.vue
@@ -75,7 +75,7 @@ export default {
     maxFile: Number,
     accept: {
       type: String,
-      default: '.jpg,.png,.doc,.docx,.pdf,.txt,.jpeg'
+      default: '.jpg,.png,.doc,.docx,.pdf,.txt,.jpeg,.bmp,.mp4,.avi,.wmv,.mkv,.flv,.mp3,.sql,.db,.dmp,.xls,.xlsx,.wps,.et,.csv,.xml,.json,.other'
     },
     autoUpload: { // 自动上传
       type: Boolean,
@@ -209,10 +209,18 @@ export default {
         this.$message.error('文件目录选择异常请刷新页面')
         return;
       }
+
       // if(this.taskId.length <= 0){
       //   this.$message.error('请选择任务')
       //   return;
       // }
+      const isValidExtension = this.accept.split(',').some(ext => 
+        file.name.toLowerCase().endsWith(ext)
+      );
+      if (!isValidExtension) {
+        this.$message.error(file.name+'文件类型错误阻止上传！');
+        return false;
+      }
       const currentRow = this.tableDate.find((row) => row.uid === file.uid)
       if (currentRow) {
         // 当前上传进度归0
diff --git a/src/views/task/modules/taskModal.vue b/src/views/task/modules/taskModal.vue
index b3e6a3f..cd77517 100644
--- a/src/views/task/modules/taskModal.vue
+++ b/src/views/task/modules/taskModal.vue
@@ -226,7 +226,6 @@ import { taskCreate,
                 }
               }).finally(() => {
                 that.confirmLoading = false;
-                that.close();
               })
             }
           }

From 3427f0900745cee03ac54f5fafd3b2258ea16097 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Sat, 10 May 2025 14:28:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=85=B3=E9=97=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/modules/taskModal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/task/modules/taskModal.vue b/src/views/task/modules/taskModal.vue
index cd77517..1011ad2 100644
--- a/src/views/task/modules/taskModal.vue
+++ b/src/views/task/modules/taskModal.vue
@@ -212,7 +212,6 @@ import { taskCreate,
                 }
               }).finally(() => {
                 that.confirmLoading = false;
-                that.close();
               })
             }else{
               taskUpdateById({id:this.model.id,name:values.name,describe:values.describe,shipModelId:values.shipModelId,shipNumId:values.shipNumId,

From dfb2faefc2ca04c9ce45a90d9b6546345e323382 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Sat, 10 May 2025 22:05:58 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/dataSearch.vue        | 14 +++++++-------
 src/views/task/modules/taskModal.vue |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/data/dataSearch.vue b/src/views/data/dataSearch.vue
index 4f7e977..3c97e67 100644
--- a/src/views/data/dataSearch.vue
+++ b/src/views/data/dataSearch.vue
@@ -91,8 +91,8 @@ export default {
       tableParams: {
         schemaMass: null,
         tableName: null,
-        startDateString: null,
-        endDateString: null,
+        startTime: null,
+        endTime: null,
         pageSize: 10,
         pageNum: 1
       },
@@ -182,14 +182,14 @@ export default {
     onChangeTime(date, dateString) {
       if (date.length == 0) {
         this.defaultTime = []
-        this.tableParams.startDateString = null
-        this.tableParams.endDateString = null
+        this.tableParams.startTime = null
+        this.tableParams.endTime = null
         this.tableParams.pageNum = 1
         this.getTableDataList()
       } else {
-        this.tableParams.startDateString = moment(date[0]).format(this.dateFormat);
-        this.tableParams.endDateString = moment(date[1]).format(this.dateFormat);
-        this.defaultTime = [this.tableParams.startDateString, this.tableParams.endDateString]
+        this.tableParams.startTime = moment(date[0]).format(this.dateFormat);
+        this.tableParams.endTime = moment(date[1]).format(this.dateFormat);
+        this.defaultTime = [this.tableParams.startTime, this.tableParams.endTime]
         this.tableParams.pageNum = 1
         this.getTableDataList()
       }
diff --git a/src/views/task/modules/taskModal.vue b/src/views/task/modules/taskModal.vue
index 1011ad2..c1f9388 100644
--- a/src/views/task/modules/taskModal.vue
+++ b/src/views/task/modules/taskModal.vue
@@ -207,6 +207,7 @@ import { taskCreate,
                 if(res.success){
                   that.$message.success(res.message);
                   that.$emit('ok');
+                  this.close()
                 }else{
                   that.$message.warning(res.message);
                 }
@@ -220,6 +221,7 @@ import { taskCreate,
                 if(res.success){
                   that.$message.success(res.message);
                   that.$emit('ok');
+                  this.close()
                 }else{
                   that.$message.warning(res.message);
                 }