Merge branch 'hotfix' of http://192.168.65.198:3000/Front_Team/SPDM into hotfix

src/views/data/analysis/components/analysisDataDialog.vue

@@ -201,7 +201,6 @@ const changeChceckFun = async () => {
   // isLoading.value = true;
   // showComponents.value = false;
   checktableData.value = checkTableRef.value.tableRef.getCheckboxRecords();
-
   const fileType = analysisType.value;
 
   for (let i = 0; i < checkAnalysisList.value.length; i++) {

src/views/data/analysis/components/calculationFileResult.vue

@@ -34,6 +34,7 @@ import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream } from '@/utils/file';
 import FileIcon from '@/components/common/fileIcon/index.vue';
+import { cloneDeep } from 'lodash-es';
 // import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
@@ -65,11 +66,11 @@ const modelAttribute = ref<any>([
   },
   {
     name: '所属项目',
-    value: 'ownProjectName',
+    value: 'tag1Name',
   },
   {
     name: '所属阶段',
-    value: 'ownPhaseName',
+    value: 'tag2Name',
   },
   // {
   //   name: '所属机台',
@@ -81,11 +82,11 @@ const modelAttribute = ref<any>([
   // },
   {
     name: '所属工况',
-    value: 'owntaskName',
+    value: 'taskName',
   },
   {
     name: '所属算例',
-    value: 'ownRunName',
+    value: 'runName',
   },
   {
     name: '文件大小',
@@ -100,8 +101,11 @@ const modelAttribute = ref<any>([
     value: 'operate',
   },
 ]);
+const fileList = ref<any>([]);
 
 const getTableColumnFun = (data: any) => {
+  fileList.value = cloneDeep(data);
+
   const titles = data.map((item: any) => {
     const name =
       item.taskName && item.runName ? item.taskName + '_' + item.runName : item.originalName;
@@ -182,13 +186,20 @@ const getTableColumnFun = (data: any) => {
   });
 };
 
+// 预览文件
 const reviewFun = (column: any) => {
-  fileId.value = column.key;
+  const file = fileList.value.find((item: any) => {
+    return item.originalName === tableData.value[0][column.key];
+  });
+  fileId.value = file.id;
   previewVisible.value = true;
 };
 
 const downLoadFun = (column: any) => {
-  fileId.value = column.key;
+  const file = fileList.value.find((item: any) => {
+    return item.originalName === tableData.value[0][column.key];
+  });
+  fileId.value = file.id;
   downloadFileByStream(fileId.value);
 };
 

src/views/data/analysis/components/modelFileResult.vue

@@ -34,6 +34,7 @@ import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream } from '@/utils/file';
 import FileIcon from '@/components/common/fileIcon/index.vue';
+import { cloneDeep } from 'lodash-es';
 // import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
@@ -65,11 +66,11 @@ const modelAttribute = ref<any>([
   },
   {
     name: '所属项目',
-    value: 'ownProjectName',
+    value: 'tag1Name',
   },
   {
     name: '所属阶段',
-    value: 'ownPhaseName',
+    value: 'tag2Name',
   },
   // {
   //   name: '所属机台',
@@ -81,11 +82,11 @@ const modelAttribute = ref<any>([
   // },
   {
     name: '所属工况',
-    value: 'owntaskName',
+    value: 'taskName',
   },
   {
     name: '所属算例',
-    value: 'ownRunName',
+    value: 'runName',
   },
   {
     name: '文件大小',
@@ -101,7 +102,9 @@ const modelAttribute = ref<any>([
   },
 ]);
 
+const fileList = ref<any>([]);
 const getTableColumnFun = (data: any) => {
+  fileList.value = cloneDeep(data);
   const titles = data.map((item: any) => {
     const name =
       item.taskName && item.runName ? item.taskName + '_' + item.runName : item.originalName;
@@ -183,12 +186,18 @@ const getTableColumnFun = (data: any) => {
 
 // 预览文件
 const reviewFun = (column: any) => {
-  fileId.value = column.key;
+  const file = fileList.value.find((item: any) => {
+    return item.originalName === tableData.value[0][column.key];
+  });
+  fileId.value = file.id;
   previewVisible.value = true;
 };
 
 const downLoadFun = (column: any) => {
-  fileId.value = column.key;
+  const file = fileList.value.find((item: any) => {
+    return item.originalName === tableData.value[0][column.key];
+  });
+  fileId.value = file.id;
   downloadFileByStream(fileId.value);
 };
 

src/views/data/analysis/components/reportComparison.vue

@@ -63,11 +63,11 @@ const modelAttribute = ref<any>([
   },
   {
     name: '所属项目',
-    value: 'ownProjectName',
+    value: 'tag1Name',
   },
   {
     name: '所属阶段',
-    value: 'ownPhaseName',
+    value: 'tag2Name',
   },
   // {
   //   name: '所属机台',
@@ -79,11 +79,11 @@ const modelAttribute = ref<any>([
   // },
   {
     name: '所属工况',
-    value: 'owntaskName',
+    value: 'taskName',
   },
   {
     name: '所属算例',
-    value: 'ownRunName',
+    value: 'runName',
   },
   {
     name: '文件大小',
@@ -101,12 +101,20 @@ const modelAttribute = ref<any>([
 
 // 预览文件
 const reviewFun = (column: any) => {
-  fileId.value = column.key;
+  console.log(column, 'column');
+  console.log(tableData.value, 'tableData.value');
+  const file = fileList.value.find((item: any) => {
+    return item.originalName === tableData.value[0][column.key];
+  });
+  fileId.value = file.id;
   previewVisible.value = true;
 };
 
 const downLoadFun = (column: any) => {
-  fileId.value = column.key;
+  const file = fileList.value.find((item: any) => {
+    return item.originalName === tableData.value[0][column.key];
+  });
+  fileId.value = file.id;
   downloadFileByStream(fileId.value);
 };