merge

src/components/common/table/baseTable.vue

@@ -606,7 +606,6 @@ defineExpose({
   setSearchParamsFun,
   setSearchParamByKeyFun,
   setOptionsFun,
-  getTableDataFun,
 });
 </script>
 

src/components/taskDetail/taskInfo.vue

@@ -93,6 +93,7 @@ watch(
           expStatus: localDetail.value.expStatus ? '1' : '0',
           eMemberList: getMemberListIds(localDetail.value.eMemberList),
           pMemberList: getMemberListIds(localDetail.value.pMemberList),
+          planTime: [localDetail.value.beginTime, localDetail.value.endTime],
         });
         standard.value = localDetail.value.standard;
         if (localDetail.value.flowTemplate) {

src/views/data/analysis/index.vue

@@ -979,7 +979,7 @@ const updatePerformanceFun = async (data: any) => {
   const res: any = await editPerformanceApi(data);
   if (res && res.code === 200) {
     ElMessage.success('操作成功');
-    tableRef.value.getTableDataFun();
+    tableRef.value.resetFun();
   }
 };
 

src/views/system/recycleBin/index.vue

@@ -44,7 +44,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import BaseTable from '@/components/common/table/baseTable.vue';
+// import BaseTable from '@/components/common/table/baseTable.vue';
 import FileTable from '@/components/common/fileTable/index.vue';
 import { formatFileSize } from '@/utils/file';
 import {
@@ -108,7 +108,7 @@ const clickDeleteFun = () => {
 // 清空回收站
 const deleteAllLoading = ref(false);
 const clearAll = () => {
-  ElMessageBox.confirm('是否确认清空回收站？', '提示', {
+  ElMessageBox.confirm('该操作会删除回收站中所有文件，是否继续？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',