merge

src/views/data/analysis/index.vue

@@ -214,6 +214,7 @@
       :analysis-data="selectAnalysisData"
     ></analysisDataDialog>
     <FilePreview v-model="previewVisible" :fileId="currentRow?.id" />
+    <editPerformancePage v-if="showPerformanceInfoDialog" :performance-info="currentPerformance" @cancel="showPerformanceInfoDialog = false" @submit="updatePerformanceFun"></editPerformancePage>
   </div>
 </template>
 <script setup lang="ts">
@@ -232,6 +233,7 @@ import taskDetail from '@/views/task/projectDetail/components/taskDetail.vue';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import runDetailPage from './components/runDetailPage.vue';
 import { useDict } from '@/utils/useDict';
+import editPerformancePage from '@/components/taskDetail/editPerformancePage.vue';
 
 const { RESULT_ACHIEVE_STATUS, TASK_ACHIEVE_STATUS } = useDict(
   'RESULT_ACHIEVE_STATUS',
@@ -239,6 +241,7 @@ const { RESULT_ACHIEVE_STATUS, TASK_ACHIEVE_STATUS } = useDict(
 );
 const showTaskDetailDialog = ref(false);
 const showRunDetailDialog = ref(false);
+const showPerformanceInfoDialog = ref(false);
 
 const tableRef = ref();
 
@@ -317,6 +320,7 @@ const modeOptions = ref<any>([
   { label: '结果云图', value: '结果云图' },
 ]);
 
+const currentPerformance = ref<any>({})
 const actionList = ref<any>([
   {
     title: '查看详情',
@@ -356,6 +360,19 @@ const actionList = ref<any>([
       );
     },
   },
+  {
+    title: '编辑',
+    type: 'primary',
+    click: (row: any) => {
+      currentPerformance.value = row;
+
+    },
+    hide: () => {
+      return !['数据指标'].includes(
+        currentModel.value
+      );
+    },
+  },
 ]);
 
 const modeChangeFun = () => {
@@ -747,6 +764,11 @@ const previewFileFun = (row: any) => {
   previewVisible.value = true;
 };
 
+
+const updatePerformanceFun = (data:any)=>{
+
+}
+
 onMounted(() => {
   getProjectOptionsFun();
 });

src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue

@@ -135,14 +135,18 @@ const runResultDirChangeFun = () => {
   if (name === '图片结果') {
     tableName.value = 'RUN_RESULT_IMAGE_TABLE';
     keyResultType.value = '1';
+    accept.value = '.jpg/.jpeg/.png/.gif';
   }
   if (name === '曲线结果') {
     tableName.value = 'RUN_RESULT_CANVAS_TABLE';
     keyResultType.value = '2';
+    accept.value = '.csv';
   }
   if (name === '报告结果') {
     tableName.value = 'RUN_RESULT_REPORT_TABLE';
     keyResultType.value = '3';
+    accept.value = '.ppt(x).pptx/.doc(x).docx/.pdf';
+
   }
 };
 
@@ -163,7 +167,7 @@ watch(
   }
 );
 
-const accept = ref<any>('');
+const accept = ref<any>('.jpg/.jpeg/.png/.gif');
 const getFileType = () => {
   let type: any = FILE_TYPE.CALCULATION_FILE;
   const dirName = runDirNameList.value.find((item: any) => {
@@ -172,17 +176,16 @@ const getFileType = () => {
 
   if (dirName === '图片结果') {
     type = FILE_TYPE.PNG_FILE;
-    accept.value = '.jpg/.jpeg/.png/.gif';
+    
   }
 
   if (dirName === '曲线结果') {
     type = FILE_TYPE.CANVAS_FILE;
-    accept.value = '.csv';
+  
   }
 
   if (dirName === '报告结果') {
     type = FILE_TYPE.REPORT_FILE;
-    accept.value = '.ppt(x).pptx/.doc(x).docx/.pdf';
   }
 
   return type;
@@ -210,6 +213,10 @@ const submitFun = async () => {
     const suffix = getfileSuffix(name);
 
     if (!accept.value.includes(suffix)) {
+
+      console.log(suffix,'suffix');
+      console.log(accept.value,'accept.value');
+      
       ElMessage.warning('不可上传该类型文件！');
       return;
     }

src/views/task/projectList/components/taskDialog.vue

@@ -224,7 +224,7 @@
       <div>
         <el-button @click="closeFun">取消</el-button>
         <el-button @click="prePageFun" v-if="props.dialogType === 'create'">上一步</el-button>
-        <el-button @click="addOrEditTaskFun">完成</el-button>
+        <el-button @click="addOrEditTaskFun" type="primary">{{ $t('通用.确定') }}</el-button>
       </div>
     </template>
   </Dialog>