update:tag搜索

src/api/data/dataAnalysis.ts

@@ -1,10 +1,12 @@
 import { get, post, download } from '@/api/request';
+import { resListFormat } from '@/utils/common';
 
 const env = import.meta.env;
 const PREFIX = env.VITE_API_PREFIX_DATA;
 
-export const getSimulationTaskFileApi = (params: any) => {
-  return post(`${PREFIX}dataAnalysis/getSimulationTaskFile`, params);
+export const getSimulationTaskFileApi = async (params: any) => {
+  const res = await post(`${PREFIX}dataAnalysis/getSimulationTaskFile`, params);
+  return resListFormat(res);
 };
 
 export const getCSVDataApi = (params: any) => {
@@ -14,6 +16,7 @@ export const getCSVDataApi = (params: any) => {
 export const exportTaskFileByScriptApi = (params: any, filename: string) => {
   return download(`${PREFIX}dataAnalysis/exportTaskFileByScript`, params, filename);
 };
-export const getSimulationTaskFilesApi = (params: any) => {
-  return post(`${PREFIX}dataAnalysis/getSimulationTaskFile`, params);
+export const getSimulationTaskFilesApi = async (params: any) => {
+  const res = await post(`${PREFIX}dataAnalysis/getSimulationTaskFile`, params);
+  return resListFormat(res);
 };

src/api/data/dataOverView.ts

@@ -1,11 +1,13 @@
 import { post, upload } from '@/api/request';
+import { resListFormat } from '@/utils/common';
 
 const env = import.meta.env;
 const PREFIX = env.VITE_API_PREFIX_DATA;
 
 // 查询目录详情
-export const dataOverViewListSimulationNodeFilesApi = (params: any) => {
-  return post(`${PREFIX}dataOverView/listSimulationNodeFiles`, params);
+export const dataOverViewListSimulationNodeFilesApi = async (params: any) => {
+  const res = await post(`${PREFIX}dataOverView/listSimulationNodeFiles`, params);
+  return resListFormat(res);
 };
 // 删除文件
 export const dataOverViewDeleteSimulationNodeFilesApi = (params: any) => {

src/components/common/table/baseTable.vue

@@ -428,13 +428,24 @@ const getTableDataFun = () => {
     setDataFun(props.data);
     return;
   }
-  const reqParams: ApiParams = {
+  const reqParams: any = {
     current: current.value,
     size: size.value,
     ...props.params,
     ...searchData.value,
     ...headSearchParams.value,
+    tagReq: {},
   };
+  // 格式化tagReq搜索字段
+  for (const key in reqParams) {
+    const tag = tableHeadVisible.value.find(
+      (val: any) => [val.key, val.searchKey].includes(key) && val.type === 3
+    );
+    if (tag) {
+      reqParams.tagReq[key] = reqParams[key];
+      delete reqParams[key];
+    }
+  }
   loading.value = true;
   tableData.value = [];
   emit('tableDataquery');

src/components/common/table/tableFormDia.vue

@@ -83,6 +83,7 @@
                 <el-select v-model="row.type" placeholder="请选择" :disabled="disabled">
                   <el-option label="默认" :value="1" />
                   <el-option label="扩展" :value="2" />
+                  <el-option label="Tag" :value="3" />
                 </el-select>
               </template>
             </vxe-column>

src/utils/common.ts

@@ -151,3 +151,15 @@ export const projectCodeName = (data: any) => {
   const code = data.nodeCode || '';
   return `${showCode && code ? `【${code}】` : ''}${name}`;
 };
+
+// 列表返回数据格式化
+export const resListFormat = (res: any) => {
+  res?.data?.data?.forEach((item: any) => {
+    if (item.tagReq) {
+      for (const key in item.tagReq) {
+        item[key] = item.tagReq[key];
+      }
+    }
+  });
+  return res;
+};