diff --git a/src/components/taskDetail/taskCurve.vue b/src/components/taskDetail/taskCurve.vue
index 0f48860d..681e2ac7 100644
--- a/src/components/taskDetail/taskCurve.vue
+++ b/src/components/taskDetail/taskCurve.vue
@@ -47,33 +47,43 @@
-
-
- 列数:
-
-
-
-
-
-
-
{{ '图' + item }}
+
+
+
@@ -96,6 +106,8 @@ import AddFile from '@/components/common/addFile/index.vue';
import { getCSVDataApi, getSimulationTaskFilesApi } from '@/api/data/dataAnalysis';
import { NODE_TYPE } from '@/utils/enum/node';
import DragUploader from '@/components/common/dragUploader/index.vue';
+import Dialog from '@/components/common/dialog/index.vue';
+import { ElMessage } from 'element-plus';
const props = defineProps({
taskId: {
@@ -188,11 +200,17 @@ const deleteFun = async (row: any) => {
}
} catch {}
};
-
+const showCsvData = ref(false);
const showTableDataCurveFun = () => {
showCsv.value = false;
- const { tableData } = baseTableRef.value.tableRef.getTableData();
+ showCsvData.value = false;
+ curveNumData.value = [];
+ const tableData = baseTableRef.value.tableRef.getCheckboxRecords();
+ if (!tableData?.length) {
+ ElMessage.warning('请选择曲线后展示');
+ return;
+ }
curveList.value = tableData.map((item: any, index: any) => {
return {
...item,
@@ -206,9 +224,14 @@ const showTableDataCurveFun = () => {
if (curveList.value.length) {
showCsv.value = true;
+ showCsvData.value = true;
+
const list = curveList.value.map((item: any) => item.num);
curveNumData.value = Array.from(new Set(list));
getCommonNumCurveFun();
+ } else {
+ curveNumData.value = [];
+ showCsvData.value = false;
}
};
@@ -353,6 +376,9 @@ const beforeUploadFun = (file: any) => {
AddFileRef.value.addFileFun(file);
};
+const handleCloseFun = () => {
+ showCsv.value = false;
+};
onMounted(async () => {
getTaskRunDataFun();
accept.value = await getFileUploadAcceptFun('CANVAS_FILE_FORMAT');
@@ -416,55 +442,6 @@ onMounted(async () => {
}
}
- .task-curve-page-right {
- // width: calc(65% - 10px);
- width: 100%;
- height: 100%;
- padding-left: 20px;
-
- .task-curve-right-operate {
- width: 100%;
- height: 40px;
-
- display: flex;
- align-items: center;
- }
-
- .task-curve-right-content {
- width: 100%;
- height: calc(100% - 50px);
- display: flex;
- flex-wrap: wrap;
- overflow: auto;
-
- .img-item {
- margin-right: 10px;
- margin-bottom: 10px;
- min-height: 100px;
-
- .task-img {
- width: 100%;
- height: 100%;
- border: 1px solid #ddd;
- }
-
- .img-title {
- width: 100%;
- height: 30px;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
- }
-
- .input-style {
- width: 50px;
- margin-left: 5px;
- margin-right: 10px;
- }
-
.w50 {
width: 50px;
}
@@ -473,4 +450,53 @@ onMounted(async () => {
margin-left: 12px;
}
}
+
+.task-curve-page-right {
+ // width: calc(65% - 10px);
+ width: 100%;
+ height: 100%;
+ padding-left: 20px;
+
+ .task-curve-right-operate {
+ width: 100%;
+ height: 40px;
+
+ display: flex;
+ align-items: center;
+ }
+
+ .task-curve-right-content {
+ width: 100%;
+ height: calc(100% - 50px);
+ display: flex;
+ flex-wrap: wrap;
+ overflow: auto;
+
+ .img-item {
+ margin-right: 10px;
+ margin-bottom: 10px;
+ min-height: 100px;
+
+ .task-img {
+ width: 100%;
+ height: 100%;
+ border: 1px solid #ddd;
+ }
+
+ .img-title {
+ width: 100%;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ }
+}
+
+.input-style {
+ width: 50px;
+ margin-left: 5px;
+ margin-right: 10px;
+}
diff --git a/src/views/index/approvalPreview/components/deliverableFile.vue b/src/views/index/approvalPreview/components/deliverableFile.vue
index 740002c9..19da9d86 100644
--- a/src/views/index/approvalPreview/components/deliverableFile.vue
+++ b/src/views/index/approvalPreview/components/deliverableFile.vue
@@ -1,6 +1,4 @@
-
-