Merge branch 'hotfix' of http://carsafe.uicp.cn/Front_Team/SPDM into hotfix

src/components/common/table/baseTable.vue

@@ -200,7 +200,12 @@
         @current-change="currentChangeFun"
       />
     </div>
-    <TableFormDia v-model="formDiaVisible" :name="tableName" @update="getHeadDataFun" />
+    <TableFormDia
+      v-if="formDiaVisible"
+      v-model="formDiaVisible"
+      :name="tableName"
+      @update="getHeadDataFun"
+    />
   </div>
 </template>
 
@@ -424,12 +429,13 @@ const getHeadDataFun = () => {
   });
 };
 // 获取表单数据
+let reqParams: any = {};
 const getTableDataFun = () => {
   if (props.data.length > 0) {
     setDataFun(props.data);
     return;
   }
-  const reqParams: any = {
+  reqParams = {
     current: current.value,
     size: size.value,
     ...props.params,
@@ -606,8 +612,9 @@ const actionClickFun = (row: any, action: any, index: number) => {
 
 const exportFun = () => {
   exportFile(props.exportApi, props.tableName, props.exportFileName, {
-    ...searchData.value,
-    ...props.exportParams,
+    ...reqParams,
+    size: null,
+    current: null,
   });
 };
 

src/components/common/table/tableFormDia.vue

@@ -117,16 +117,24 @@
                   <el-option label="项目编号(多选)" value="projectIdSelectMultiple" />
                   <el-option label="审核模版" value="approveList" />
                   <el-option label="阶段名称" value="tag2" />
-                  <el-option label="机台名称" value="tag4" />
-                  <el-option label="工位名称" value="tag5" />
-                  <el-option label="学科名称" value="tag6" />
-                  <el-option label="任务名称" value="task" />
-                  <el-option label="算例名称" value="run" />
                   <el-option label="阶段名称(多选)" value="tag2Multiple" />
-                  <el-option label="机台名称(多选)" value="tag4Multiple" />
-                  <el-option label="工位名称(多选)" value="tag5Multiple" />
-                  <el-option label="学科名称(多选)" value="tag6Multiple" />
+                  <!-- tag3-10通过查字典 -->
+                  <template v-for="item in tagList" :key="item.value">
+                    <el-option :label="`${item.label}名称`" :value="item.value" />
+                    <el-option
+                      :label="`${item.label}名称(多选)`"
+                      :value="`${item.value}Multiple`"
+                    />
+                  </template>
+                  <!-- <el-option label="机台名称" value="tag4" />
+                  <el-option label="机台名称(多选)" value="tag4Multiple" /> -->
+                  <!-- <el-option label="工位名称" value="tag5" />
+                  <el-option label="工位名称(多选)" value="tag5Multiple" /> -->
+                  <!-- <el-option label="学科名称" value="tag6" />
+                  <el-option label="学科名称(多选)" value="tag6Multiple" /> -->
+                  <el-option label="任务名称" value="task" />
                   <el-option label="任务名称(多选)" value="taskMultiple" />
+                  <el-option label="算例名称" value="run" />
                   <el-option label="算例名称(多选)" value="runMultiple" />
                   <el-option label="插槽" value="slot" />
                 </el-select>
@@ -333,6 +341,9 @@ import {
 } from '@/api/system/systemData';
 import { hasPermission } from '@/utils/permission';
 import { resetTableColumnSize } from '@/utils/common';
+import { CommonStore } from '@/stores/common';
+
+const commonStore = CommonStore();
 
 interface Props {
   modelValue: boolean;
@@ -363,6 +374,25 @@ watch(
   }
 );
 
+const activeTagFun = () => {
+  const data: any = [];
+  const arr1 = commonStore.getDictData('POOL_CATEGORY_TYPE')?.A || [];
+  const arr2 = commonStore.getDictData('TAG_TYPE_MAP_LIST')?.A || [];
+  arr1.forEach((item: any) => {
+    arr2.some((val: any) => {
+      if (item.value === val.value) {
+        data.push({
+          label: item.label,
+          value: val.label,
+        });
+        return true;
+      }
+    });
+  });
+  return data;
+};
+const tagList = activeTagFun();
+
 const getHeadDataFun = (name?: string) => {
   const params = {
     formName: name || props.name,

src/views/data/analysis/components/pedigree/pedigreeDetail.vue

@@ -174,7 +174,6 @@ import { getSimulationTaskFileApi } from '@/api/data/dataAnalysis';
 import { getRunPerformanceApi } from '@/api/task/taskpool';
 import { FILE_TYPE } from '@/utils/enum/file';
 import FlowNodeParamTable from '@/components/flow/flowNodeParamTable.vue';
-import RunDataPage from '@/views/task/execution/components/runDetailPage/runPagecomponent/runDataPage.vue';
 import { listSimulationFlowNodeApi } from '@/api/project/run';
 import { getRunListByRunIdListApi } from '@/api/project/node';
 import { queryFlowTemplateDetailApi } from '@/api/capability/flow';