diff --git a/src/assets/imgs/btnIcon/ignore.svg b/src/assets/imgs/btnIcon/ignore.svg
new file mode 100644
index 00000000..c9a84423
--- /dev/null
+++ b/src/assets/imgs/btnIcon/ignore.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/imgs/btnIcon/replace.svg b/src/assets/imgs/btnIcon/replace.svg
new file mode 100644
index 00000000..5468fc48
--- /dev/null
+++ b/src/assets/imgs/btnIcon/replace.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/common/table/baseTable.vue b/src/components/common/table/baseTable.vue
index 91dd0fa6..781193aa 100644
--- a/src/components/common/table/baseTable.vue
+++ b/src/components/common/table/baseTable.vue
@@ -71,6 +71,7 @@
:loading="loading"
:data="tableData"
v-bind="$attrs"
+ highlight-hover-row
:seq-config="{ startIndex: (current - 1) * size }"
:column-config="{
drag: true,
diff --git a/src/components/taskDetail/reviewData.vue b/src/components/taskDetail/reviewData.vue
new file mode 100644
index 00000000..12b90e23
--- /dev/null
+++ b/src/components/taskDetail/reviewData.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+ 上传文件
+
+ 下载文件
+
+
+ {{ getfileType(row) }}
+
+
+ {{ formatFileSize(row.fileSize) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/tenants/lyric/views/task/components/planningInformation.vue b/src/tenants/lyric/views/task/components/planningInformation.vue
index 63376b26..48c6ef22 100644
--- a/src/tenants/lyric/views/task/components/planningInformation.vue
+++ b/src/tenants/lyric/views/task/components/planningInformation.vue
@@ -40,6 +40,7 @@ const props = defineProps({
default: '机器人',
},
});
+const env = import.meta.env;
// 机器人 动画 有限元 工业设计 公差
// 1正常 2标红 3缩进
@@ -252,6 +253,9 @@ const getPageValue = (str: string) => {
const downLoadFileFun = (name: any) => {
console.log(name, 'name');
ElMessage.success('文件下载中请稍后!');
+ const url = `${env.VITE_API_STATIC_FILE}/${name.replace('《', '').replace('》', '')}.docx`;
+ // const url = `${env.VITE_API_STATIC_FILE}/测试word.docx`;
+ window.open(url);
};
diff --git a/src/utils/i18n/en.ts b/src/utils/i18n/en.ts
index f3765160..79ad4caa 100644
--- a/src/utils/i18n/en.ts
+++ b/src/utils/i18n/en.ts
@@ -43,6 +43,7 @@ const lang = {
重试: 'Retry',
加载中: 'Loading...',
加载失败请稍后再试: 'Load failed, please try again later',
+ 还原: 'Restore',
},
菜单: {
首页: 'Home',
diff --git a/src/utils/i18n/zh.ts b/src/utils/i18n/zh.ts
index 02c98b18..3391f9ec 100644
--- a/src/utils/i18n/zh.ts
+++ b/src/utils/i18n/zh.ts
@@ -43,6 +43,7 @@ const lang = {
重试: '重试',
加载中: '加载中...',
加载失败请稍后再试: '加载失败,请稍后再试',
+ 还原: '还原',
},
菜单: {
首页: '首页',
diff --git a/src/views/data/statistics/index.vue b/src/views/data/statistics/index.vue
deleted file mode 100644
index f773a9ce..00000000
--- a/src/views/data/statistics/index.vue
+++ /dev/null
@@ -1,1411 +0,0 @@
-
-
-
-
-
-
-
-
- {
- userProjectFromData.userId = '';
- changeUserGroupProjectFun();
- }
- "
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- userTaskCompleteFormData.userId = '';
- userTaskCompleteProjectChangeFun();
- }
- "
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- userDifficultyCoefficientFormData.userId = '';
- initUserDifficultyCoefficientStatistics();
- }
- "
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/recycleBin/index.vue b/src/views/system/recycleBin/index.vue
new file mode 100644
index 00000000..29ed2498
--- /dev/null
+++ b/src/views/system/recycleBin/index.vue
@@ -0,0 +1,235 @@
+
+
+
+
+ 清空回收站
+
+ 批量删除
+
+
+ 还原所有文件
+
+ 还原选定文件
+
+
+
+
+
+
+
+
+
diff --git a/src/views/task/dashboard/components/dataStatistics.vue b/src/views/task/dashboard/components/dataStatistics.vue
index ff890bf0..b51ef8d9 100644
--- a/src/views/task/dashboard/components/dataStatistics.vue
+++ b/src/views/task/dashboard/components/dataStatistics.vue
@@ -57,8 +57,8 @@ const statusColorList = [
];
const performanceColorList = [
'rgb(200, 201, 204)',
+ getThemeColor('--el-color-danger'),
getThemeColor('--el-color-success'),
- getThemeColor('--el-color-primary'),
];
// 难度系数颜色列表
const difficultyCountColorList = [
diff --git a/src/views/task/dashboard/components/dataStatistics/performanceCompletion.vue b/src/views/task/dashboard/components/dataStatistics/performanceCompletion.vue
index 910a0aa3..56908070 100644
--- a/src/views/task/dashboard/components/dataStatistics/performanceCompletion.vue
+++ b/src/views/task/dashboard/components/dataStatistics/performanceCompletion.vue
@@ -61,12 +61,12 @@ const initCompleteChart = async (formData: any) => {
res.data?.result?.map((item: any) => {
return item.name;
}) || [];
-
+ const allExeStatus = Object.keys(TASK_CALCULATE_STATUS_OBJ);
titles =
- res.data?.allExeStatus?.map((item: any) => {
- return TASK_CALCULATE_STATUS_OBJ[item] || item; // todo 返回的状态待确认
+ allExeStatus?.map((item: any) => {
+ return TASK_CALCULATE_STATUS_OBJ[item] || item;
}) || [];
- const names = res.data?.allExeStatus || [];
+ const names = allExeStatus || [];
for (let i = 0; i < names.length; i++) {
const str = names[i];
diff --git a/src/views/task/dashboard/components/dataStatistics/reviewPassed.vue b/src/views/task/dashboard/components/dataStatistics/reviewPassed.vue
index 6e94597e..1ac441cd 100644
--- a/src/views/task/dashboard/components/dataStatistics/reviewPassed.vue
+++ b/src/views/task/dashboard/components/dataStatistics/reviewPassed.vue
@@ -59,7 +59,7 @@ const initReviewPassedChart = async (formData: any) => {
return item.name;
}) || [];
- titles = res.data.allApprovalStatus;
+ titles = ['0', '1', '2', '3'];
const statusMap: any = {
0: '未评审',
1: '评审中',
diff --git a/src/views/task/execution/components/runDetailPage/index.vue b/src/views/task/execution/components/runDetailPage/index.vue
index 50e2918c..27f7ce85 100644
--- a/src/views/task/execution/components/runDetailPage/index.vue
+++ b/src/views/task/execution/components/runDetailPage/index.vue
@@ -844,6 +844,7 @@ const getSubmitParamFun = async (appPath: any) => {
const creatorId = getUserId().toString();
const subRunId = flowNodeData.value.nodeId;
const asyncTaskId = flowNodeData.value.nodeDetailInfo?.asyncTaskId;
+ const outputFormat = flowNodeParamData.value.outputFormat;
return {
runId,
runName,
@@ -867,6 +868,7 @@ const getSubmitParamFun = async (appPath: any) => {
creatorId,
subRunId,
asyncTaskId,
+ outputFormat,
};
};
diff --git a/src/views/task/execution/components/taskDetailPage/index.vue b/src/views/task/execution/components/taskDetailPage/index.vue
index ddf92574..4d6be463 100644
--- a/src/views/task/execution/components/taskDetailPage/index.vue
+++ b/src/views/task/execution/components/taskDetailPage/index.vue
@@ -10,6 +10,7 @@
+
@@ -88,6 +89,12 @@
:disabled="!showLeftOptions"
>
+
+
+