diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
index 184ed25a..625ab571 100644
--- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java
+++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
@@ -67,6 +67,9 @@ public class TDEngineService {
         }
     }
 
+    public HikariDataSource getHikariDataSource(){
+        return hikariDataSource;
+    }
     /**
      * 创建超级表
      */
diff --git a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
index e88d9d07..e0220cf7 100644
--- a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
+++ b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StopWatch;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -85,7 +86,6 @@ public class DataServiceImpl implements DataService {
      */
     @Override
     public Map<String, Map<String, Object>> querySnapshotValues(List<SnapshotValueQueryParam> paramList) {
-        long start = System.currentTimeMillis();
         Map<String, Map<String, Object>> result = new HashMap<>(paramList.size());
         ListUtil.page(paramList, COMMIT_COUNT, list -> {
             List<String> keyList = new ArrayList<>();
@@ -122,8 +122,6 @@ public class DataServiceImpl implements DataService {
                 }
             }
         });
-        long end = System.currentTimeMillis();
-        log.debug("querySnapshotValues {}个，耗时: {}秒", paramList.size(), (end - start) / 1000.0);
         return result;
     }
 
diff --git a/das/src/main/java/com/das/modules/data/service/impl/ExportTdDataServiceImpl.java b/das/src/main/java/com/das/modules/data/service/impl/ExportTdDataServiceImpl.java
new file mode 100644
index 00000000..a9d9754b
--- /dev/null
+++ b/das/src/main/java/com/das/modules/data/service/impl/ExportTdDataServiceImpl.java
@@ -0,0 +1,122 @@
+package com.das.modules.data.service.impl;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.das.modules.data.service.TDEngineService;
+import com.das.modules.equipment.entity.SysEquipment;
+import com.das.modules.equipment.mapper.SysEquipmentMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StopWatch;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Service
+public class ExportTdDataServiceImpl {
+
+    @Autowired
+    SysEquipmentMapper sysEquipmentMapper;
+
+    @Autowired
+    private TDEngineService tdEngineService;
+
+    @Value("${zipUrl}")
+    private String fileUrl;
+
+
+    public void exportDataCsvZip() throws IOException, SQLException {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start("导出风机数据zip");
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        String yesterday = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
+
+        //获取所有风机数据
+        QueryWrapper<SysEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("object_type", 10002);
+        List<SysEquipment> sysEquipments = sysEquipmentMapper.selectList(queryWrapper);
+        //获取临时目录文件路径
+        String tempDir = String.valueOf(Files.createTempDirectory(null));
+        File zipFile = new File(fileUrl + "/data_"+yesterday+".zip");
+        List<File> fileList = new ArrayList<>();
+        try {
+            for (SysEquipment item : sysEquipments) {
+
+                String hTableName = "h" + item.getId();
+                String lTableName = "l" + item.getId();
+                File fileHighSpeed = new File(tempDir +"/" + "h_"+item.getCode()+"_"+yesterday + ".csv");
+                File fileLowSpeed = new File(tempDir +"/" + "l_"+item.getCode()+"_"+yesterday  + ".csv");
+                getYesterdayData(hTableName, yesterday, fileHighSpeed.getPath());
+                getYesterdayData(lTableName, yesterday, fileLowSpeed.getPath());
+                fileList.add(fileLowSpeed);
+                fileList.add(fileHighSpeed);
+            }
+            //压缩文件
+            // 将文件添加到压缩文件中
+            ZipUtil.zip(zipFile, false, fileList.toArray(new File[0]));
+            stopWatch.stop();
+            log.debug(stopWatch.prettyPrint(TimeUnit.SECONDS));
+        }catch (Exception e){
+            log.error("导出风机数据zip失败{}",e);
+        }
+        finally {
+            if (!CollectionUtils.isEmpty(fileList)){
+                FileUtil.del(new File(fileList.get(0).getParent()));
+            }
+        }
+
+    }
+
+    public void getYesterdayData(String tableName, String time, String csvFilePath) {
+        // TDengine 查询语句
+        String query = "SELECT * FROM " + tableName + " WHERE updatetime >= '" + time + " 00:00:00' AND updatetime < '" + time + " 23:59:59.999'";
+        try (Connection conn = tdEngineService.getHikariDataSource().getConnection();
+             Statement smt = conn.createStatement();
+             ResultSet rs = smt.executeQuery(query)) {
+            writeResultSetToCsv(rs, csvFilePath);
+        }catch (Exception e){
+            log.error(tableName +"获取数据异常{}",e);
+        }
+
+    }
+
+    private void writeResultSetToCsv(ResultSet resultSet, String csvFilePath) throws IOException, SQLException {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(csvFilePath))) {
+            // 写入列名
+            ResultSetMetaData metaData = resultSet.getMetaData();
+            int columnCount = metaData.getColumnCount();
+            for (int i = 1; i <= columnCount; i++) {
+                writer.write(metaData.getColumnName(i));
+                if (i < columnCount) writer.write(",");
+            }
+            writer.newLine();
+
+            // 写入数据
+            while (resultSet.next()) {
+                for (int i = 1; i <= columnCount; i++) {
+                    String value = resultSet.getString(i);
+                    writer.write(value == null ? "" : resultSet.getString(i));
+                    if (i < columnCount) writer.write(",");
+                }
+                writer.newLine();
+            }
+        }catch (Exception e){
+            log.error("数据写入csv文件失败{}",e);
+        }
+    }
+}
diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
index 21a25e32..02f1743b 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
@@ -32,6 +32,7 @@ import com.das.modules.node.mapper.SysCommunicationLinkMapper;
 import com.das.modules.node.mapper.SysImpTabMappingMapper;
 import com.das.modules.node.mapper.SysNodeMapper;
 import com.das.modules.node.service.SysNodeService;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
@@ -407,22 +408,21 @@ public class SysNodeServiceImpl implements SysNodeService {
      */
     @Override
     public void saveMappingList(List<SysTabMappingVo> impList) {
+        if (impList.get(0).getProtocol() == 9 || impList.get(0).getProtocol() == 17){
+            Map<Long, Integer> collect = sysImptabmappingMapper.getMappingInfoListByLinkId(impList.get(0).getLinkId()).stream().collect(Collectors.toMap(SysTabMappingVo::getId, SysTabMappingVo::getMeasPointType, (value1, value2) -> value1));
+            List<SysTabMappingVo> analogList = impList.stream().filter(item -> collect.get(item.getId()) == 138).collect(Collectors.toList());
+            List<SysTabMappingVo> accumulator = impList.stream().filter(item -> collect.get(item.getId()) == 139).collect(Collectors.toList());
+            List<SysTabMappingVo> discrete = impList.stream().filter(item -> collect.get(item.getId()) == 140).collect(Collectors.toList());
+            List<SysTabMappingVo> setPoint = impList.stream().filter(item -> collect.get(item.getId()) == 146).collect(Collectors.toList());
+            List<SysTabMappingVo> control = impList.stream().filter(item -> collect.get(item.getId()) == 147).collect(Collectors.toList());
+            //校验param里面order不重复
+            if (checkOrderRepeated(analogList) || checkOrderRepeated(accumulator) || checkOrderRepeated(discrete) || checkOrderRepeated(setPoint) || checkOrderRepeated(control)){
+                throw new ServiceException("检查顺序，排序不能重复");
+            }
+        }
         try {
             if (!CollectionUtils.isEmpty(impList)) {
                 List<SysTabMapping> list = new ArrayList<>();
-
-                if (impList.get(0).getProtocol() == 9 || impList.get(0).getProtocol() == 17){
-                    Map<Long, Integer> collect = sysImptabmappingMapper.getMappingInfoListByLinkId(impList.get(0).getLinkId()).stream().collect(Collectors.toMap(SysTabMappingVo::getId, SysTabMappingVo::getMeasPointType, (value1, value2) -> value1));
-                    List<SysTabMappingVo> analogList = impList.stream().filter(item -> collect.get(item.getId()) == 138).collect(Collectors.toList());
-                    List<SysTabMappingVo> accumulator = impList.stream().filter(item -> collect.get(item.getId()) == 139).collect(Collectors.toList());
-                    List<SysTabMappingVo> discrete = impList.stream().filter(item -> collect.get(item.getId()) == 140).collect(Collectors.toList());
-                    List<SysTabMappingVo> setPoint = impList.stream().filter(item -> collect.get(item.getId()) == 146).collect(Collectors.toList());
-                    List<SysTabMappingVo> control = impList.stream().filter(item -> collect.get(item.getId()) == 147).collect(Collectors.toList());
-                    //校验param里面order不重复
-                    if (checkOrderRepeated(analogList) || checkOrderRepeated(accumulator) || checkOrderRepeated(discrete) || checkOrderRepeated(setPoint) || checkOrderRepeated(control)){
-                        throw new ServiceException("检查顺序，排序不能重复");
-                    }
-                }
                 SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
                 for (SysTabMappingVo imp : impList) {
                     SysTabMapping rec = sysImptabmappingMapper.selectById(imp.getId());
@@ -540,12 +540,19 @@ public class SysNodeServiceImpl implements SysNodeService {
 
     private Boolean checkOrderRepeated(List<SysTabMappingVo> mappings) {
         ObjectMapper objectMapper = new ObjectMapper();
-
+        List<SysTabMappingVo> orderCollect = mappings.stream().filter(item -> {
+            try {
+                JsonNode jsonNode = objectMapper.readTree(item.getParams());
+                return StringUtils.isNotEmpty(jsonNode.get("order").asText());
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }).collect(Collectors.toList());
         Boolean orderRepeated = false;
         try {
             // 提取所有的 order 字段，转换为 Set
             Set<String> orderSet = new HashSet<>();
-            orderRepeated = mappings.stream()
+            orderRepeated = orderCollect.stream()
                     .map(SysTabMappingVo::getParams) // 提取 param 字段
                     .map(param -> {
                         try {
@@ -556,7 +563,16 @@ public class SysNodeServiceImpl implements SysNodeService {
                             throw new RuntimeException("JSON 解析失败: " + param, e);
                         }
                     })
-                    .anyMatch(order -> !orderSet.add(order));
+                    .anyMatch(order -> {
+                        if (StringUtils.isNotEmpty(order)){
+                            boolean b = !orderSet.add(order);
+                            if (b){
+                                log.error("排序重复{}",order);
+                            }
+                            return b;
+                        }
+                        return false;
+                    });
         }catch (Exception e){
             log.error("校验order不重复失败",e);
         }
diff --git a/das/src/main/java/com/das/modules/page/controller/HomeParamSetController.java b/das/src/main/java/com/das/modules/page/controller/HomeParamSetController.java
index 05e0c63a..97fa5f16 100644
--- a/das/src/main/java/com/das/modules/page/controller/HomeParamSetController.java
+++ b/das/src/main/java/com/das/modules/page/controller/HomeParamSetController.java
@@ -6,6 +6,7 @@ import com.das.modules.page.domian.dto.SysHomeParamSetDto;
 import com.das.modules.page.domian.vo.SysHomeParamSetVo;
 import com.das.modules.page.service.HomeParamSetService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +30,9 @@ public class HomeParamSetController {
     /**  新增系统参数设置页面  */
     @PostMapping("/add")
     public R<SysHomeParamSetVo> add(@RequestBody SysHomeParamSetDto sysHomeParamSetDto)  {
+        if (StringUtils.isBlank(sysHomeParamSetDto.getParamType())) {
+            throw new ServiceException("参数类型不能为空");
+        }
         SysHomeParamSetVo sysHomeParamSetVo = homeParamSetService.add(sysHomeParamSetDto);
         return R.success(sysHomeParamSetVo);
     }
@@ -50,4 +54,14 @@ public class HomeParamSetController {
         SysHomeParamSetVo sysHomeParamSetVo = homeParamSetService.update(sysHomeParamSetDto);
         return R.success(sysHomeParamSetVo);
     }
+
+    /** 删除系统参数设置 */
+    @PostMapping("/delete")
+    public R<Void> delete(@RequestBody SysHomeParamSetDto sysHomeParamSetDto)  {
+        if (sysHomeParamSetDto.getId() == null) {
+            throw new ServiceException("id不能为空");
+        }
+         homeParamSetService.delete(sysHomeParamSetDto);
+        return R.success();
+    }
 }
diff --git a/das/src/main/java/com/das/modules/page/domian/dto/SysHomeParamSetDto.java b/das/src/main/java/com/das/modules/page/domian/dto/SysHomeParamSetDto.java
index 4d25bc16..34bf57ec 100644
--- a/das/src/main/java/com/das/modules/page/domian/dto/SysHomeParamSetDto.java
+++ b/das/src/main/java/com/das/modules/page/domian/dto/SysHomeParamSetDto.java
@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class SysHomeParamSetDto  {
 
-    private Long id;
+    private String id;
 
     private String paramName;
 
@@ -15,4 +15,6 @@ public class SysHomeParamSetDto  {
     private JSONArray paramValueJson;
 
     private String paramDesc;
+
+    private String paramType;
 }
diff --git a/das/src/main/java/com/das/modules/page/domian/vo/SysHomeParamSetVo.java b/das/src/main/java/com/das/modules/page/domian/vo/SysHomeParamSetVo.java
index 98e42c03..9ca99150 100644
--- a/das/src/main/java/com/das/modules/page/domian/vo/SysHomeParamSetVo.java
+++ b/das/src/main/java/com/das/modules/page/domian/vo/SysHomeParamSetVo.java
@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class SysHomeParamSetVo {
 
-    private Long id;
+    private String id;
 
     private String paramName;
 
@@ -15,4 +15,6 @@ public class SysHomeParamSetVo {
     private JSONArray paramValueJson;
 
     private String paramDesc;
+
+    private String paramType;
 }
diff --git a/das/src/main/java/com/das/modules/page/entity/SysHomeParamSet.java b/das/src/main/java/com/das/modules/page/entity/SysHomeParamSet.java
index c2e74643..f22dc688 100644
--- a/das/src/main/java/com/das/modules/page/entity/SysHomeParamSet.java
+++ b/das/src/main/java/com/das/modules/page/entity/SysHomeParamSet.java
@@ -29,4 +29,6 @@ public class SysHomeParamSet extends BaseEntity {
     private String paramValue;
 
     private String paramDesc;
+
+    private String paramType;
 }
diff --git a/das/src/main/java/com/das/modules/page/service/HomeParamSetService.java b/das/src/main/java/com/das/modules/page/service/HomeParamSetService.java
index f3a023a5..8f29981b 100644
--- a/das/src/main/java/com/das/modules/page/service/HomeParamSetService.java
+++ b/das/src/main/java/com/das/modules/page/service/HomeParamSetService.java
@@ -12,4 +12,6 @@ public interface HomeParamSetService {
     List<SysHomeParamSetVo> getList(SysHomeParamSetDto sysHomeParamSetDto);
 
     SysHomeParamSetVo update(SysHomeParamSetDto sysHomeParamSetDto);
+
+    void delete(SysHomeParamSetDto sysHomeParamSetDto);
 }
diff --git a/das/src/main/java/com/das/modules/page/service/impl/HomeParamSetServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/HomeParamSetServiceImpl.java
index 19aa6384..f55d7c19 100644
--- a/das/src/main/java/com/das/modules/page/service/impl/HomeParamSetServiceImpl.java
+++ b/das/src/main/java/com/das/modules/page/service/impl/HomeParamSetServiceImpl.java
@@ -61,9 +61,15 @@ public class HomeParamSetServiceImpl  implements HomeParamSetService {
         if (sysHomeParamSetDto.getParamValueJson() !=null){
             sysHomeParamSet.setParamValue(sysHomeParamSetDto.getParamValueJson().toString());
         }
+        sysHomeParamSet.setId(Long.valueOf(sysHomeParamSetDto.getId()));
         sysHomeParamSetMapper.updateById(sysHomeParamSet);
         SysHomeParamSetVo sysHomeParamSetVo = new SysHomeParamSetVo();
         SysHomeParamSetVo result = BeanCopyUtils.copy(sysHomeParamSet, sysHomeParamSetVo);
         return result;
     }
+
+    @Override
+    public void delete(SysHomeParamSetDto sysHomeParamSetDto) {
+        sysHomeParamSetMapper.deleteById(Long.valueOf(sysHomeParamSetDto.getId()));
+    }
 }
diff --git a/das/src/main/resources/application-dev.yml b/das/src/main/resources/application-dev.yml
index bb481740..1c1a88fb 100644
--- a/das/src/main/resources/application-dev.yml
+++ b/das/src/main/resources/application-dev.yml
@@ -110,4 +110,6 @@ minio:
   url: http://192.168.109.187:9000
   bucket: das
   accessKey: das
-  secretKey: zaq12WSX
\ No newline at end of file
+  secretKey: zaq12WSX
+
+zipUrl: /log/zip/
\ No newline at end of file
diff --git a/das/src/main/resources/application.yml b/das/src/main/resources/application.yml
index cdd4455a..4dcd6bb7 100644
--- a/das/src/main/resources/application.yml
+++ b/das/src/main/resources/application.yml
@@ -113,4 +113,6 @@ minio:
   bucket: das
   publicBucket: das-dock
   accessKey: das
-  secretKey: zaq12WSX
\ No newline at end of file
+  secretKey: zaq12WSX
+
+zipUrl: /log/zip/
\ No newline at end of file
diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
index ce265982..f3d487b1 100644
--- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
@@ -19,6 +19,9 @@
             <if test="info.iotModelId != null and info.iotModelId != ''">
                 and t.iot_model_id = #{info.iotModelId}
             </if>
+            <if test="info.highSpeed != null and info.highSpeed != ''">
+                and t.highSpeed = #{info.highSpeed}
+            </if>
             <if test="info.attributeName != null and info.attributeName != ''">
                 and t.attribute_name like concat('%',#{info.attributeName},'%')
             </if>
diff --git a/ui/dasadmin/src/api/backend/SystemParam/request.ts b/ui/dasadmin/src/api/backend/SystemParam/request.ts
index cfb96f26..27441b84 100644
--- a/ui/dasadmin/src/api/backend/SystemParam/request.ts
+++ b/ui/dasadmin/src/api/backend/SystemParam/request.ts
@@ -15,4 +15,18 @@ export function Paramupdate(params: object = {}) {
         data: params,
     })
 }
+export function ParamAdd(params: object = {}) {
+    return createAxios({
+        url: '/api/page/home/set/add',
+        method: 'POST',
+        data: params,
+    })
+}
+export function Paramdelete(params: object = {}) {
+    return createAxios({
+        url: '/api/page/home/set/delete ',
+        method: 'POST',
+        data: params,
+    })
+}
 
diff --git a/ui/dasadmin/src/api/backend/historyData/request.ts b/ui/dasadmin/src/api/backend/historyData/request.ts
new file mode 100644
index 00000000..1411e4b3
--- /dev/null
+++ b/ui/dasadmin/src/api/backend/historyData/request.ts
@@ -0,0 +1,57 @@
+import createAxios from '/@/utils/axios'
+
+export const getTemplateListReq = (data: { category: '历史数据' & string; pageNum: number; pageSize: number }) => {
+    return createAxios<
+        never,
+        Promise<{
+            code: number
+            msg: string
+            data: {
+                total: number
+                rows: { id: string; category: '历史数据' & string; template: string }[]
+                code: number
+                msg: string
+            }
+            success: boolean
+        }>
+    >({
+        url: '/api/page/report/template/getList',
+        method: 'post',
+        data,
+    })
+}
+
+export const addTemplateListReq = (data: { category: '历史数据' & string; template: string }) => {
+    return createAxios<
+        never,
+        Promise<{
+            code: number
+            msg: string
+            data: {
+                id: string
+                category: '历史数据' & string
+                template: string
+            }[]
+            success: boolean
+        }>
+    >({
+        url: '/api/page/report/template/add',
+        method: 'post',
+        data,
+    })
+}
+
+export const delTemplateListReq = (data: { id: string }) => {
+    return createAxios<
+        never,
+        Promise<{
+            code: number
+            msg: string
+            success: boolean
+        }>
+    >({
+        url: '/api/page/report/template/del',
+        method: 'post',
+        data,
+    })
+}
\ No newline at end of file
diff --git a/ui/dasadmin/src/views/backend/SystemParam/index.vue b/ui/dasadmin/src/views/backend/SystemParam/index.vue
index f8c1caac..b8499568 100644
--- a/ui/dasadmin/src/views/backend/SystemParam/index.vue
+++ b/ui/dasadmin/src/views/backend/SystemParam/index.vue
@@ -2,7 +2,8 @@
     <div class="SystemParam">
         <el-container class="mainContainer">
             <div class="mainHeader">
-                <el-text class="mx-1 title">风机矩阵设置</el-text>
+                <el-text class="mx-1 title">系统参数设置</el-text>
+                <el-button :icon="Plus" type="primary" @click="addItem">新增</el-button>
             </div>
             <el-main class="defaultMain">
                 <el-row>
@@ -11,7 +12,7 @@
                             <el-table :data="paramData" style="width: 100%">
                                 <el-table-column prop="paramName" label="参数名称" />
                                 <el-table-column prop="paramDesc" label="中文" />
-<!--                                <el-table-column prop="paramValue" label="参数值" />-->
+                                <el-table-column prop="paramType" label="类型" />
                                 <el-table-column label="操作" width="100">
                                     <template #default="scope">
                                         <span style="color: #0064aa; cursor: pointer"
@@ -22,6 +23,9 @@
                                               v-else
                                               @click="EditLayout(scope)"
                                         >编辑</span>
+                                        <span style="color: #0064aa; cursor: pointer;margin-left: 10px;"
+                                              @click="fromDelete(scope)"
+                                        >删除</span>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -202,13 +206,61 @@
                 </div>
             </template>
         </el-dialog>
+
+        <el-dialog v-model="visibleAdd" title="新增系统参数" width="500" :before-close="handleCloseAdd" class="addPart">
+            <el-form
+                ref="formRef"
+                :inline="true"
+                label-width="auto"
+                :model="formInlineAdd"
+                :rules="rules"
+                style="padding: 24px 40px; font-size: 14px; line-height: 1.5; word-wrap: break-word; font-size: 20px"
+            >
+                <el-form-item label="参数名称:" prop="paramName">
+                    <el-input v-model="formInlineAdd.paramName" placeholder="" clearable />
+                </el-form-item>
+                <el-form-item label="中文描述:" prop="paramDesc">
+                    <el-input v-model="formInlineAdd.paramDesc" placeholder="" clearable />
+                </el-form-item>
+                <el-form-item label="类型:" prop="paramType">
+                    <el-input v-model="formInlineAdd.paramType" placeholder="" clearable />
+                </el-form-item>
+                <el-form-item label="参数值:">
+                    <el-input
+                        v-model="formInlineAdd.paramValue"
+                        :rows="2"
+                        type="textarea"
+                        placeholder="参数值为json格式"
+                        clearable
+                    />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="SaveParamAdd">保存</el-button>
+                    <el-button @click="visibleAdd = false">取消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+        <!-- 删除确认弹框 -->
+        <el-dialog v-model="dialogVisibleDelete" title="操作提示" width="500" :before-close="handleCloseDelete">
+            <span>确定是否删除?</span>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="dialogVisibleDelete1"> 确定 </el-button>
+                    <el-button @click="dialogVisibleDelete = false">取消</el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
 <script setup lang="ts">
-import {onMounted, ref,nextTick} from 'vue'
-import { getParamList,Paramupdate } from '/@/api/backend/SystemParam/request'
-import { ElMessage} from 'element-plus'
+import {onMounted, ref, nextTick, reactive} from 'vue'
+import {getParamList, ParamAdd, Paramdelete, Paramupdate} from '/@/api/backend/SystemParam/request'
+import {ElMessage, FormRules} from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import {enumTypeAdd, enumValueDelete} from "/@/api/backend/Enumeration/request";
 const paramData=ref([])
 const tableData = ref([])
 const PARAM_COLOR = 'paramColor';
@@ -323,6 +375,108 @@ const onSubmit=()=>{
         ElMessage.error(err?.response?.data?.msg ?? '查询失败')
     })
 }
+const formRef=ref()
+interface RuleForm {
+    paramName: string | undefined
+    paramDesc: string | undefined
+    paramType: string | undefined
+}
+const rules = reactive<FormRules<RuleForm>>({
+    paramName: [
+        {
+            required: true,
+            message: '参数名称不能为空',
+            trigger: 'blur',
+        },
+    ],
+    paramDesc: [
+        {
+            required: true,
+            message: '中文描述不能为空',
+            trigger: 'blur',
+        },
+    ],
+    paramType: [
+        {
+            required: true,
+            message: '类型不能为空',
+            trigger: 'blur',
+        },
+    ],
+})
+const formInlineAdd = reactive({
+    paramName: '',
+    paramDesc: '',
+    paramType: '',
+    paramValue: [],
+})
+const visibleAdd=ref(false)
+const addItem=()=>{
+    formInlineAdd.paramName = ''
+    formInlineAdd.paramDesc = ''
+    formInlineAdd.paramType = ''
+    formInlineAdd.paramValue = []
+    visibleAdd.value=true
+}
+const SaveParamAdd=()=>{
+    formRef.value.validate((valid: any) => {
+        if (valid) {
+            ParamAdd(formInlineAdd).then((res: any) => {
+                if (res.code == 200) {
+                    getList()
+                    ElMessage({
+                        message: res.msg,
+                        type: 'success',
+                    })
+                } else {
+                    ElMessage.error({
+                        message: res.msg,
+                        type: 'error',
+                    })
+                }
+            })
+
+            visibleAdd.value = false
+        }
+    })
+}
+const handleCloseAdd = () => {
+    visibleAdd.value=false
+}
+const fromDeleteData = reactive({
+    id: '',
+})
+interface fromDelete {
+    row?: any[]
+}
+const fromDelete = (data:any) => {
+    dialogVisibleDelete.value = true
+    fromDeleteData.id = data.row.id
+}
+const dialogVisibleDelete = ref(false)
+
+const handleCloseDelete = (done: () => void) => {
+    dialogVisibleDelete.value = false
+}
+const dialogVisibleDelete1 = (done: () => void) => {
+    dialogVisibleDelete.value = false
+    Paramdelete(fromDeleteData).then((res) => {
+        if (res.code == 200) {
+            setTimeout(() => {
+                ElMessage({
+                    message: res.msg,
+                    type: 'success',
+                })
+            }, 1000)
+            getList()
+        } else {
+            ElMessage.error({
+                message: res.msg,
+                type: 'error',
+            })
+        }
+    })
+}
 onMounted(() =>{
     getList()
 })
@@ -395,6 +549,11 @@ $headerHeight: 60px;
                 -webkit-animation:selected 0.3s cubic-bezier(0.250, 0.100, 0.250, 1.000);
             }
         }
+        .addPart{
+            .el-form--inline .el-form-item {
+                width: 100%;
+            }
+        }
     }
 
 @keyframes selected {
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index 746a13f5..fbc938cf 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -237,6 +237,7 @@ import { getRealValueListReq } from '/@/api/backend/deviceModel/request'
 import SelectPoint from '/@/views/backend/equipment/airBlower/selectPoint.vue'
 import RealDataChart from '/@/views/backend/equipment/airBlower/realDataChart.vue'
 import { permission } from '/@/utils/directive'
+import { table } from 'console'
 const vPermission = permission()
 
 const router = useRouter()
@@ -423,7 +424,7 @@ const defaultColumn: TableColumnType[] = [
         width: 100,
     },
 ]
-const dynamicColumn: TableColumnType[] = [
+let dynamicColumn: TableColumnType[] = [
     {
         label: '风速 (m/s)',
         prop: 'iwindspeed',
@@ -523,6 +524,17 @@ const dynamicColumn: TableColumnType[] = [
     },
 ]
 const tableColumn = ref<TableColumnType[]>([...defaultColumn, ...dynamicColumn])
+const getSaveColumn = () => {
+    const saveColumn = localStorage.getItem('airBlowerTableColumnList')
+    console.log(saveColumn,'saveColumn');
+    
+    if (saveColumn) {
+        tableColumn.value = JSON.parse(saveColumn)
+        console.log(tableColumn.value,'tableColumn.value');
+        dynamicColumn = tableColumn.value.slice(4)
+    }
+}
+getSaveColumn()
 
 const tableRef = ref<TableInstance>()
 const tableData = ref<TableDataObjType[]>([])
@@ -611,7 +623,7 @@ const getTableData = () => {
             }
         })
         .catch((err) => {
-            ElMessage.error(err)
+            // ElMessage.error(err)
         })
 }
 
@@ -702,9 +714,10 @@ const selectPointDialogRef = ref()
 const selectPointVisible = ref(false)
 const defaultAttr = computed(() => {
     return dynamicColumn.map((item) => {
+        tableColumn.value.length
         return {
             attributeName: item.label.split(' ')[0],
-            unit: item.label.split(' ')[1] ?? '',
+            unit:item.label.split(' ')[1] ?? '',
             attributeCode: item.prop as string,
         }
     })
@@ -728,7 +741,7 @@ const saveSelectPoint = () => {
             }
         })
         tableColumn.value = [...defaultColumn, ...addCoulmn]
-
+        localStorage.setItem('airBlowerTableColumnList', JSON.stringify(tableColumn.value))
         getTableData()
         selectPointVisible.value = false
         ElMessage.success('选择成功')
diff --git a/ui/dasadmin/src/views/backend/historyData/index.vue b/ui/dasadmin/src/views/backend/historyData/index.vue
new file mode 100644
index 00000000..57bca01a
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/historyData/index.vue
@@ -0,0 +1,1014 @@
+<template>
+    <div class="historyData">
+        <el-container class="container">
+            <el-header class="header">
+                <div class="timePart">
+                    <span class="label">时间</span>
+                    <div class="timeSelect">
+                        <el-date-picker
+                            v-model="searchData.time"
+                            type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss"
+                            :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]"
+                            :teleported="false"
+                            :shortcuts="shortcuts"
+                        />
+                    </div>
+                </div>
+                <div class="intervalPart">
+                    <span class="label">间隔</span>
+                    <el-select v-model="searchData.interval" placeholder="请选择间隔">
+                        <el-option v-for="v in intervalOptions" :key="v.value" :label="v.label" :value="v.value"></el-option>
+                    </el-select>
+                </div>
+                <div class="templatePart">
+                    <span class="label">模板</span>
+                    <el-select v-model="searchData.template" placeholder="请选择模板" clearable>
+                        <el-option v-for="v in templateOptions" :key="v.id" :label="v.name" :value="v.id" @click="changeTemplate">
+                            <template #default>
+                                <div class="templateOption">
+                                    <span>{{ v.name }}</span>
+                                    <el-icon :size="18" style="color: red" @click.stop="delTemplate(v.id)">
+                                        <Delete />
+                                    </el-icon>
+                                </div>
+                            </template>
+                        </el-option>
+                    </el-select>
+                </div>
+                <el-button type="primary" :icon="Crop" class="pointSelect" @click="openMeasure">测点选择</el-button>
+                <div class="opeareBtn">
+                    <el-button type="primary" :loading="searchLoading" @click="getData">查询</el-button>
+                    <el-button style="color: #0064aa" @click="exportExcel">导出</el-button>
+                    <el-button class="button" :icon="Notebook" type="primary" @click="addTemplate" plain>保存为模板</el-button>
+                </div>
+            </el-header>
+            <el-main class="main">
+                <el-table v-loading="searchLoading" :data="tableData" height="100%">
+                    <el-table-column v-for="item in tableColumn" :key="item.prop" :prop="item.prop" :label="item.label"></el-table-column>
+                </el-table>
+            </el-main>
+            <el-footer class="footer">
+                <el-pagination
+                    v-model:current-page="pageSetting.current"
+                    v-model:page-size="pageSetting.pageSize"
+                    :total="pageSetting.total"
+                    :page-sizes="pageSetting.pageSizes"
+                    background
+                    :pager-count="7"
+                    layout="prev, pager, next, jumper,sizes,total"
+                    @change="getcurrentPage"
+                ></el-pagination>
+            </el-footer>
+        </el-container>
+        <el-dialog v-model="pointDialogVisible" title="测点选择" width="1200">
+            <el-row :gutter="10" class="pointDialogRow">
+                <el-col :span="4" class="pointDialogCol">
+                    <div class="pointDialogColTitle">风机列表</div>
+                    <div class="pointDialogColContent">
+                        <el-scrollbar>
+                            <el-checkbox-group v-model="selectWindBlower">
+                                <el-checkbox
+                                    v-for="v in windBlowerOptions"
+                                    :key="v.value"
+                                    :label="v.label"
+                                    :value="v.value"
+                                    size="large"
+                                    class="windBlowerCheckbox"
+                                ></el-checkbox>
+                            </el-checkbox-group>
+                        </el-scrollbar>
+                    </div>
+                </el-col>
+                <el-col :span="15" class="pointDialogCol">
+                    <div class="pointDialogColTitle">
+                        <span class="title">测点列表</span>
+                        <div class="pointDialogColTitleInput">
+                            <el-input v-model="pointDialogSearchData.inputValue" clearable @keyup.enter="pointDialogSearch"></el-input>
+                            <el-button type="primary" @click="pointDialogSearch">查询</el-button>
+                        </div>
+                        <div class="pointDialogColTitleRightPart">
+                            <el-radio-group v-model="pointDialogSearchData.type" @change="pointDialogRaidoChange">
+                                <el-radio :value="138" label="模拟量"></el-radio>
+                                <el-radio :value="199" label="计算量"></el-radio>
+                            </el-radio-group>
+                        </div>
+                    </div>
+                    <div class="pointDialogColContent">
+                        <el-table ref="pointDialogTableRef" class="pointTable" :data="pointDialogTableData">
+                            <!-- @select="pointDialogTableSelect"
+                            @select-all="pointDialogTableSelectAll" -->
+
+                            <!-- <el-table-column type="selection" width="55"></el-table-column> -->
+                            <el-table-column label="属性名称" prop="attributeName"></el-table-column>
+                            <el-table-column label="属性编码" prop="attributeCode"></el-table-column>
+                            <el-table-column label="瞬时值" prop="interpolation" width="70">
+                                <template #default="scope">
+                                    <div class="showValueType">
+                                        <el-checkbox @change="autoSelectRow(scope, 'interpolation')" v-model="scope.row.interpolation"></el-checkbox>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="平均值" prop="average" width="70">
+                                <template #default="scope">
+                                    <div class="showValueType">
+                                        <el-checkbox @change="autoSelectRow(scope, 'average')" v-model="scope.row.average"></el-checkbox>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="最大值" prop="max" width="70">
+                                <template #default="scope">
+                                    <div class="showValueType">
+                                        <el-checkbox @change="autoSelectRow(scope, 'max')" v-model="scope.row.max"></el-checkbox>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="最小值" prop="min" width="70">
+                                <template #default="scope">
+                                    <div class="showValueType">
+                                        <el-checkbox @change="autoSelectRow(scope, 'min')" v-model="scope.row.min"></el-checkbox>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <div class="footer">
+                            <el-pagination
+                                v-model:current-page="pointDialogPageSetting.current"
+                                v-model:page-size="pointDialogPageSetting.pageSize"
+                                :total="pointDialogPageSetting.total"
+                                :page-sizes="pointDialogPageSetting.pageSizes"
+                                background
+                                :pager-count="4"
+                                layout="prev, pager, next, jumper,sizes,total"
+                                @change="getcurrentPageForPointDialog"
+                            ></el-pagination>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :span="5" class="pointDialogCol">
+                    <div class="pointDialogColTitle">
+                        <span>已选择测点列表</span>
+                        <el-button @click="clearmultipleSelection">清空</el-button>
+                    </div>
+                    <div class="pointDialogSelectedList">
+                        <el-scrollbar>
+                            <div class="selectItem" v-for="(item, index) in multipleSelection" :key="item.prop">
+                                <span>{{ item.label }}</span>
+                                <div class="moveIcon">
+                                    <el-icon v-if="index !== 0" :size="18" @click="moveUp(index)"><Top /></el-icon>
+                                    <el-icon v-if="index !== multipleSelection.length - 1" :size="18" @click="moveDown(index)"><Bottom /></el-icon>
+                                    <el-icon v-else :size="18"></el-icon>
+                                    <el-icon :size="18" @click="moveRemove(index, item)"><Close /></el-icon>
+                                </div>
+                            </div>
+                        </el-scrollbar>
+                    </div>
+                </el-col>
+            </el-row>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitPointDialog"> 确认 </el-button>
+                    <el-button @click="cancelPointDialog">取消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, computed } from 'vue'
+import { Crop, Notebook, Delete, Top, Bottom, Close } from '@element-plus/icons-vue'
+import { dayjs, ElMessageBox, ElMessage, TableInstance } from 'element-plus'
+import { getAirBlowerListReq } from '/@/api/backend/airBlower/request'
+import { getModelAttributeListReq, getRealValueRangeReq } from '/@/api/backend/deviceModel/request'
+import { getTemplateListReq, addTemplateListReq, delTemplateListReq } from '/@/api/backend/historyData/request'
+import { windowReq } from '/@/api/backend/statAnalysis/request'
+import { selectData } from '/@/views/backend/historyData/type'
+import { getCutDecimalsValue } from '/@/views/backend/equipment/airBlower/utils'
+
+const shortcuts = [
+    {
+        text: '今天',
+        value: () => {
+            const start = dayjs().startOf('day').format('YYYY-MM-DD HH:mm:ss')
+            const end = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+            return [start, end]
+        },
+    },
+    {
+        text: '昨天',
+        value: () => {
+            const start = dayjs().subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+            const end = dayjs().subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+            return [start, end]
+        },
+    },
+    {
+        text: '前3天',
+        value: () => {
+            const start = dayjs().subtract(3, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+            const end = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+            return [start, end]
+        },
+    },
+    {
+        text: '本周',
+        value: () => {
+            const start = dayjs().startOf('week').format('YYYY-MM-DD HH:mm:ss')
+            const end = dayjs().endOf('week').format('YYYY-MM-DD HH:mm:ss')
+            return [start, end]
+        },
+    },
+    {
+        text: '本月',
+        value: () => {
+            const start = dayjs().startOf('month').format('YYYY-MM-DD HH:mm:ss')
+            const end = dayjs().endOf('month').format('YYYY-MM-DD HH:mm:ss')
+            return [start, end]
+        },
+    },
+]
+
+const intervalOptions = [
+    { label: '一分钟', value: '1m' },
+    { label: '五分钟', value: '5m' },
+    { label: '十分钟', value: '10m' },
+    { label: '十五分钟', value: '15m' },
+    { label: '一小时', value: '1h' },
+    { label: '一天', value: '1d' },
+    { label: '原始', value: 'NONE' },
+]
+
+const templateOptions = ref<
+    {
+        name: string
+        time: string[]
+        id: string
+        interval: string
+        column: { label: string; prop: string; id: string }[]
+        windBlowerList: string[]
+    }[]
+>([])
+
+const changeTemplate = () => {
+    const templateData = templateOptions.value.find((item) => item.id === searchData.template)
+    if (templateData) {
+        searchData.interval = templateData?.interval ?? searchData.interval
+        searchData.time = templateData?.time ?? searchData.time
+        tableColumn.value = templateData?.column ? [...oririnTableColumn, ...templateData.column] : tableColumn.value
+        // selectWindBlower.value = templateData?.windBlowerList ?? selectWindBlower.value
+        submitParams.windBlowerList = templateData?.windBlowerList ?? selectWindBlower.value
+        submitParams.column = templateData?.column ?? multipleSelection.value
+        const selectList: any = []
+        if (templateData?.column) {
+            templateData.column.forEach((item: { label: string; prop: string; id: string }) => {
+                const realProp = item.prop.split('--')
+                const exist = selectList.find((v: any) => v.id === item.id)
+                if (exist) {
+                    exist[realProp[1]] = true
+                } else {
+                    selectList.push({
+                        id: item.id,
+                        attributeCode: realProp[0],
+                        attributeName: item.label,
+                        [realProp[1]]: true,
+                    })
+                }
+            })
+        }
+        selectRowList.value = selectList
+    }
+}
+
+const delTemplate = (id: string) => {
+    ElMessageBox.confirm('确定删除该模板吗？', '删除模板', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        delTemplateListReq({ id }).then((res) => {
+            if (res.code === 200) {
+                ElMessage.success('删除成功')
+                if (searchData.template === id) {
+                    searchData.template = ''
+                }
+                getTemplateList()
+            }
+        })
+    })
+}
+
+const openMeasure = () => {
+    selectWindBlower.value = JSON.parse(JSON.stringify(submitParams.windBlowerList))
+    multipleSelection.value = JSON.parse(JSON.stringify(submitParams.column))
+    const selectList: any = []
+    multipleSelection.value.forEach((item: { label: string; prop: string; id: string }) => {
+        const realProp = item.prop.split('--')
+        const exist = selectList.find((v: any) => v.id === item.id)
+        if (exist) {
+            exist[realProp[1]] = true
+        } else {
+            selectList.push({
+                id: item.id,
+                attributeCode: realProp[0],
+                attributeName: item.label,
+                [realProp[1]]: true,
+            })
+        }
+    })
+    selectRowList.value = selectList
+
+    pointDialogTableData.value.forEach((item) => {
+        item.interpolation = false
+        item.average = false
+        item.max = false
+        item.min = false
+    })
+    multipleSelection.value.forEach((item) => {
+        const attrList = item.prop.split('--')
+        const type = attrList[1] as 'interpolation' | 'average' | 'max' | 'min'
+        const rowIndex = pointDialogTableData.value.findIndex((r) => r.attributeCode === attrList[0])!
+        pointDialogTableData.value[rowIndex][type] = true
+    })
+    pointDialogVisible.value = true
+}
+
+const searchLoading = ref(false)
+const getData = () => {
+    searchLoading.value = true
+    getRealValueRange()
+}
+const getRealValueRange = () => {
+    const startTime = dayjs(searchData.time[0]).valueOf()
+    const endTime = dayjs(searchData.time[1]).valueOf()
+    const interval = searchData.interval
+    const interpolationAttr: string[] = []
+    const averageAttr: string[] = []
+    const maxAttr: string[] = []
+    const minAttr: string[] = []
+    const deviceNameData: any = {}
+    submitParams.windBlowerList.forEach((item: string) => {
+        deviceNameData[item] = windBlowerOptions.value.find((item1) => item1.value === item)?.label
+    })
+    for (let item of submitParams.column) {
+        const attributeCode = item.prop.split('--')
+        if (attributeCode[1] === 'interpolation') {
+            interpolationAttr.push(attributeCode[0])
+        }
+        if (attributeCode[1] === 'average') {
+            averageAttr.push(attributeCode[0])
+        }
+        if (attributeCode[1] === 'max') {
+            maxAttr.push(attributeCode[0])
+        }
+        if (attributeCode[1] === 'min') {
+            minAttr.push(attributeCode[0])
+        }
+    }
+    const reqList: any[] = [null, null, null, null]
+    if (interpolationAttr.length) {
+        const devices = submitParams.windBlowerList.map((item: string) => {
+            return {
+                deviceId: item,
+                attributes: interpolationAttr,
+            }
+        })
+        reqList[0] = getRealValueRangeReq({
+            devices,
+            interval,
+            startTime,
+            endTime,
+        })
+    }
+    if (averageAttr.length) {
+        const devices = submitParams.windBlowerList.map((item: string) => {
+            return {
+                deviceId: item,
+                attributes: averageAttr,
+            }
+        })
+        reqList[1] = windowReq({
+            devices,
+            interval,
+            startTime,
+            endTime,
+            calFunction: 'average',
+        })
+    }
+    if (maxAttr.length) {
+        const devices = submitParams.windBlowerList.map((item: string) => {
+            return {
+                deviceId: item,
+                attributes: maxAttr,
+            }
+        })
+        reqList[2] = windowReq({
+            devices,
+            interval,
+            startTime,
+            endTime,
+            calFunction: 'max',
+        })
+    }
+    if (minAttr.length) {
+        const devices = submitParams.windBlowerList.map((item: string) => {
+            return {
+                deviceId: item,
+                attributes: minAttr,
+            }
+        })
+        reqList[3] = windowReq({
+            devices,
+            interval,
+            startTime,
+            endTime,
+            calFunction: 'min',
+        })
+    }
+    const reqPromise = Promise.all(reqList)
+    reqPromise.then((res) => {
+        const [interpolationRes, averageRes, maxRes, minRes] = res
+        const tableDataList: any = []
+        if (interpolationRes && interpolationRes.code === 200) {
+            submitParams.windBlowerList.forEach((deviceId) => {
+                const device = interpolationRes.data[deviceId]
+                interpolationAttr.forEach((attr) => {
+                    device[attr].times.forEach((t: number, index: number) => {
+                        const attrNameKey = attr + '--interpolation'
+                        const val = getCutDecimalsValue(device[attr].values[index], 2)
+                        tableDataList.push({
+                            name: deviceNameData[deviceId],
+                            time: dayjs(t).format('YYYY-MM-DD HH:mm:ss'),
+                            [attrNameKey]: val,
+                        })
+                    })
+                })
+            })
+        }
+        if (averageRes && averageRes.code === 200) {
+            submitParams.windBlowerList.forEach((deviceId) => {
+                const device = averageRes.data[deviceId]
+                averageAttr.forEach((attr) => {
+                    device[attr].times.forEach((t: number, index: number) => {
+                        const attrNameKey = attr + '--average'
+                        const val = getCutDecimalsValue(device[attr].values[index], 2)
+                        const tableDataIndex = tableDataList.findIndex(
+                            (data: any) => data.name == deviceNameData[deviceId] && data.time == dayjs(t).format('YYYY-MM-DD HH:mm:ss')
+                        )
+                        tableDataList[tableDataIndex][attrNameKey] = val
+                    })
+                })
+            })
+        }
+        if (maxRes && maxRes.code === 200) {
+            submitParams.windBlowerList.forEach((deviceId) => {
+                const device = maxRes.data[deviceId]
+                maxAttr.forEach((attr) => {
+                    device[attr].times.forEach((t: number, index: number) => {
+                        const attrNameKey = attr + '--max'
+                        const val = getCutDecimalsValue(device[attr].values[index], 2)
+                        const tableDataIndex = tableDataList.findIndex(
+                            (data: any) => data.name == deviceNameData[deviceId] && data.time == dayjs(t).format('YYYY-MM-DD HH:mm:ss')
+                        )
+                        tableDataList[tableDataIndex][attrNameKey] = val
+                    })
+                })
+            })
+        }
+        if (minRes && minRes.code === 200) {
+            submitParams.windBlowerList.forEach((deviceId) => {
+                const device = minRes.data[deviceId]
+                minAttr.forEach((attr) => {
+                    device[attr].times.forEach((t: number, index: number) => {
+                        const attrNameKey = attr + '--min'
+                        const val = getCutDecimalsValue(device[attr].values[index], 2)
+                        const tableDataIndex = tableDataList.findIndex(
+                            (data: any) => data.name == deviceNameData[deviceId] && data.time == dayjs(t).format('YYYY-MM-DD HH:mm:ss')
+                        )
+                        tableDataList[tableDataIndex][attrNameKey] = val
+                    })
+                })
+            })
+        }
+        allTableData = tableDataList
+        pageSetting.total = tableDataList.length
+        pageSetting.current = 1
+        triggerTableRefresh.value = !triggerTableRefresh.value
+        searchLoading.value = false
+    })
+}
+
+const addTemplate = () => {
+    ElMessageBox.prompt('请输入模板名称', '添加模板', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+    })
+        .then(({ value }) => {
+            const template = {
+                name: value,
+                time: searchData.time,
+                interval: searchData.interval,
+                column: submitParams.column,
+                windBlowerList: submitParams.windBlowerList,
+            }
+            addTemplateListReq({
+                category: '历史数据',
+                template: JSON.stringify(template),
+            })
+                .then((res) => {
+                    ElMessage.success('添加成功')
+                    getTemplateList()
+                })
+                .catch(() => {
+                    ElMessage.error('添加失败')
+                })
+        })
+        .catch(() => {})
+}
+
+const searchData = reactive({
+    time: shortcuts[0].value(),
+    interval: '5m',
+    template: '',
+})
+
+const getTemplateList = () => {
+    getTemplateListReq({
+        category: '历史数据',
+        pageNum: 1,
+        pageSize: 100,
+    }).then((res) => {
+        if (res.code === 200) {
+            const templateData = res.data.rows.map((item) => {
+                const templateData = JSON.parse(item.template)
+                return {
+                    id: item.id,
+                    name: templateData.name,
+                    time: templateData.time,
+                    interval: templateData.interval,
+                    column: templateData.column,
+                    windBlowerList: templateData.windBlowerList,
+                }
+            })
+            templateOptions.value = templateData
+        }
+    })
+}
+getTemplateList()
+
+const oririnTableColumn = [
+    {
+        label: '风机名称',
+        prop: 'name',
+    },
+    {
+        label: '时间',
+        prop: 'time',
+    },
+]
+const tableColumn = ref(oririnTableColumn)
+
+let allTableData: any = []
+const triggerTableRefresh = ref(false)
+const tableData = computed(() => {
+    triggerTableRefresh.value
+    return allTableData.slice((pageSetting.current - 1) * pageSetting.pageSize, pageSetting.current * pageSetting.pageSize)
+})
+
+const pageSetting = reactive({
+    current: 1,
+    pageSize: 20,
+    total: 0,
+    pageSizes: [20, 50, 100],
+})
+const getcurrentPage = () => {}
+
+const pointDialogVisible = ref(false)
+
+const selectWindBlower = ref<string[]>([])
+const windBlowerOptions = ref<{ label: string; value: string }[]>([])
+
+const getAirBlowerList = () => {
+    return getAirBlowerListReq().then((res) => {
+        if (res.success) {
+            const data = res.data.map((item) => {
+                return {
+                    label: item.name,
+                    value: item.irn,
+                }
+            })
+            pointDialogSearchData.modelId = res.data?.[0].modelId ?? ''
+            windBlowerOptions.value = data
+        }
+    })
+}
+getAirBlowerList().then(() => {
+    getModelAttributeList()
+})
+const pointDialogSearchData = reactive<{
+    inputValue: string
+    type: 138 | 199
+    modelId: string
+}>({
+    inputValue: '',
+    type: 138,
+    modelId: '',
+})
+
+const pointDialogSearch = () => {
+    getModelAttributeList()
+}
+
+const pointDialogRaidoChange = () => {
+    if (!pointDialogVisible.value) return
+    getModelAttributeList()
+}
+
+const pointDialogTableRef = ref<TableInstance>()
+const pointDialogTableData = ref<selectData[]>([])
+
+const selectRowList = ref<selectData[]>([])
+const autoSelectRow = (scope: any, type: 'interpolation' | 'average' | 'max' | 'min') => {
+    const state = scope.row[type]
+    if (state) {
+        const exist = selectRowList.value.find((item) => item.id === scope.row.id)
+        if (!exist) {
+            selectRowList.value.push(scope.row)
+        } else {
+            exist[type] = state
+        }
+        getAddColumn()
+    } else {
+        const index = multipleSelection.value.findIndex((item) => {
+            const attrList = item.prop.split('--')
+            return attrList[0] === scope.row.attributeCode && attrList[1] === type
+        })
+        if (index > -1) {
+            multipleSelection.value.splice(index, 1)
+        }
+        if (!scope.row.interpolation && !scope.row.average && !scope.row.max && !scope.row.min) {
+            const index = selectRowList.value.findIndex((item) => item.id === scope.row.id)
+            if (index > -1) {
+                selectRowList.value.splice(index, 1)
+            }
+        }
+    }
+}
+
+const pointDialogPageSetting = reactive({
+    current: 1,
+    pageSize: 20,
+    total: 0,
+    pageSizes: [20, 50, 100],
+})
+
+const getModelAttributeList = () => {
+    const reqParams = {
+        iotModelId: pointDialogSearchData.modelId,
+        attributeName: pointDialogSearchData.inputValue,
+        attributeType: pointDialogSearchData.type,
+        pageNum: pointDialogPageSetting.current,
+        pageSize: pointDialogPageSetting.pageSize,
+    }
+    return getModelAttributeListReq(reqParams).then((res) => {
+        if (res.code == 200) {
+            const data = res.rows.map((item) => {
+                const compareData = {
+                    interpolation: false,
+                    average: false,
+                    max: false,
+                    min: false,
+                }
+                if (pointDialogVisible.value) {
+                    const selectedInfo = selectRowList.value.find((select) => select.id == item.id)
+                    if (selectedInfo) {
+                        compareData.interpolation = selectedInfo.interpolation
+                        compareData.average = selectedInfo.average
+                        compareData.max = selectedInfo.max
+                        compareData.min = selectedInfo.min
+                    }
+                }
+                return {
+                    id: item.id!,
+                    attributeName: item.attributeName,
+                    attributeCode: item.attributeCode,
+                    ...compareData,
+                }
+            })
+            pointDialogTableData.value = data
+            pointDialogPageSetting.total = res.total
+        }
+    })
+}
+
+const getcurrentPageForPointDialog = () => {
+    if (!pointDialogVisible.value) return
+    getModelAttributeList()
+}
+
+const getAddColumn = () => {
+    const dynamicColumn: { label: string; prop: string; id: string }[] = []
+    for (let item of selectRowList.value) {
+        if (item.interpolation) {
+            dynamicColumn.push({
+                label: item.attributeName,
+                prop: item.attributeCode + '--interpolation',
+                id: item.id,
+            })
+        }
+        if (item.average) {
+            dynamicColumn.push({
+                label: item.attributeName + '-平均值',
+                prop: item.attributeCode + '--average',
+                id: item.id,
+            })
+        }
+        if (item.max) {
+            dynamicColumn.push({
+                label: item.attributeName + '-最大值',
+                prop: item.attributeCode + '--max',
+                id: item.id,
+            })
+        }
+        if (item.min) {
+            dynamicColumn.push({
+                label: item.attributeName + '-最小值',
+                prop: item.attributeCode + '--min',
+                id: item.id,
+            })
+        }
+    }
+    multipleSelection.value = dynamicColumn
+}
+
+const submitParams: {
+    column: { label: string; prop: string }[]
+    windBlowerList: string[]
+} = {
+    column: [],
+    windBlowerList: [],
+}
+
+const multipleSelection = ref<{ label: string; prop: string; id: string }[]>([])
+const moveUp = (index: number) => {
+    const temp = multipleSelection.value[index]
+    multipleSelection.value[index] = multipleSelection.value[index - 1]
+    multipleSelection.value[index - 1] = temp
+}
+const moveDown = (index: number) => {
+    const temp = multipleSelection.value[index]
+    multipleSelection.value[index] = multipleSelection.value[index + 1]
+    multipleSelection.value[index + 1] = temp
+}
+const moveRemove = (index: number, item: { label: string; prop: string }) => {
+    multipleSelection.value.splice(index, 1)
+    const realProp = item.prop.split('--')
+    const type = realProp[1] as 'interpolation' | 'average' | 'max' | 'min'
+    const selectRowIndex = selectRowList.value.findIndex((row) => row.attributeCode === realProp[0])!
+    if (selectRowIndex > -1) {
+        selectRowList.value[selectRowIndex][type] = false
+    }
+    if (
+        !selectRowList.value[selectRowIndex]?.interpolation &&
+        !selectRowList.value[selectRowIndex]?.average &&
+        !selectRowList.value[selectRowIndex]?.max &&
+        !selectRowList.value[selectRowIndex]?.min
+    ) {
+        selectRowList.value.splice(selectRowIndex, 1)
+    }
+    const rowIndex = pointDialogTableData.value.findIndex((row) => row.attributeCode === realProp[0])!
+    if (rowIndex > -1) {
+        pointDialogTableData.value[rowIndex][type] = false
+    }
+}
+const clearmultipleSelection = () => {
+    multipleSelection.value = []
+    pointDialogTableRef.value?.clearSelection()
+    selectRowList.value.forEach((item) => {
+        const row = pointDialogTableData.value.find((row) => row.id === item.id)
+        if (row) {
+            row.interpolation = false
+            row.average = false
+            row.max = false
+            row.min = false
+        }
+    })
+    selectRowList.value = []
+}
+
+const submitPointDialog = () => {
+    if (!selectWindBlower.value.length) {
+        ElMessage.error('请选择风机')
+        return
+    }
+    if (!multipleSelection.value.length) {
+        ElMessage.error('请选择测点')
+        return
+    }
+    submitParams.windBlowerList = JSON.parse(JSON.stringify(selectWindBlower.value))
+    submitParams.column = JSON.parse(JSON.stringify(multipleSelection.value))
+    tableColumn.value = [...oririnTableColumn, ...submitParams.column]
+    pointDialogVisible.value = false
+}
+const cancelPointDialog = () => {
+    pointDialogVisible.value = false
+}
+const exportExcel = () => {
+    const title = tableColumn.value.map((item: any) => item.label).join('\t,') + '\n'
+    const titleKeyArr = tableColumn.value.map((item: any) => item.prop)
+    let str = ''
+    allTableData.forEach((item: any) => {
+        titleKeyArr.forEach((prop: any) => {
+            const val = typeof item[prop] === 'string' ? item[prop] : item[prop] ? String(item[prop]) : ''
+            str += val + '\t' + ','
+        })
+        str += '\n'
+    })
+    str = title + str
+    let uri = 'data:text/csv;charset=utf-8,\ufeff' + encodeURIComponent(str)
+    let link = document.createElement('a')
+    link.href = uri
+    link.download = '历史数据' + searchData.time[0] + '-' + searchData.time[1] + '.csv'
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+}
+
+
+
+</script>
+
+<style scoped lang="scss">
+.historyData {
+    width: 100%;
+    height: 100%;
+    .container {
+        width: 100%;
+        height: 100%;
+        .header {
+            height: 60px;
+            display: flex;
+            align-items: center;
+            .timePart {
+                display: flex;
+                justify-content: space-between;
+                width: 450px;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                .label {
+                    margin: 0 10px;
+                }
+                .timeSelect {
+                    width: 400px;
+                }
+            }
+            .intervalPart {
+                display: flex;
+                align-items: center;
+                width: 250px;
+                height: 100%;
+                .label {
+                    margin: 0 10px;
+                }
+                .el-select {
+                    width: 200px;
+                }
+                :deep(.el-select__wrapper) {
+                    width: 200px;
+                    height: 40px;
+                }
+            }
+            .templatePart {
+                display: flex;
+                align-items: center;
+                width: 250px;
+                height: 100%;
+                .label {
+                    margin: 0 10px;
+                }
+                .el-select {
+                    width: 200px;
+                    height: 40px;
+                }
+                :deep(.el-select__wrapper) {
+                    width: 200px;
+                    height: 40px;
+                }
+            }
+            .pointSelect {
+                margin: 0 10px;
+                width: 100px;
+                height: 40px;
+            }
+            .opeareBtn {
+                margin-left: auto;
+                display: flex;
+                align-items: center;
+                width: 350px;
+                height: 100%;
+                .el-button {
+                    margin: 0 10px;
+                    width: 100px;
+                    height: 40px;
+                }
+            }
+        }
+        .main {
+            height: calc(100% - 100px);
+        }
+        .footer {
+            display: flex;
+            justify-content: right;
+            align-items: center;
+            height: 40px;
+        }
+    }
+    .pointDialogRow {
+        width: 100%;
+        .pointDialogCol {
+            width: 100%;
+            height: 600px;
+            .pointDialogColTitle {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                padding: 0 10px;
+                width: 100%;
+                height: 40px;
+                background-color: #f7f9fc;
+                border-radius: 6px 6px 0 0;
+                border: 1px solid #e4e7ed;
+                border-bottom: none;
+                .title {
+                    margin: 0 10px;
+                }
+                .pointDialogColTitleInput {
+                    .el-input {
+                        width: 200px;
+                    }
+                    .el-button {
+                        margin-left: 10px;
+                    }
+                }
+                .pointDialogColTitleRightPart {
+                    margin-left: auto;
+                    width: 170px;
+                }
+            }
+            .pointDialogColContent {
+                width: 100%;
+                height: 560px;
+                padding: 0 10px;
+                border: 1px solid #e4e7ed;
+                border-top: none;
+                border-radius: 0 0 6px 6px;
+                .windBlowerCheckbox {
+                    margin: 0;
+                    width: 100%;
+                }
+                .pointTable {
+                    width: 100%;
+                    height: 520px;
+                }
+                .footer {
+                    display: flex;
+                    justify-content: right;
+                    height: 40px;
+                }
+            }
+            .pointDialogSelectedList {
+                width: 100%;
+                height: 560px;
+                border: 1px solid #e4e7ed;
+                border-top: none;
+                border-radius: 0 0 6px 6px;
+                .selectItem {
+                    margin: 5px;
+                    padding-left: 10px;
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    min-height: 40px;
+                    border-radius: 4px;
+                    background-color: #eff0f1;
+                    .moveIcon {
+                        display: flex;
+                        justify-content: right;
+                        align-items: center;
+                        width: 60px;
+                        .el-icon {
+                            cursor: pointer;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+.templateOption {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+</style>
diff --git a/ui/dasadmin/src/views/backend/historyData/type.ts b/ui/dasadmin/src/views/backend/historyData/type.ts
new file mode 100644
index 00000000..4c1a7598
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/historyData/type.ts
@@ -0,0 +1,10 @@
+export type selectData =
+    {
+        id: string
+        attributeName: string
+        attributeCode: string
+        interpolation: boolean
+        average: boolean
+        max: boolean
+        min: boolean
+    }
diff --git a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
index a85782df..2738c424 100644
--- a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
+++ b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
@@ -148,7 +148,7 @@ const props = defineProps({
 const getAnimationStyle = (item) => {
     const irotorspeed = item.attributeMap?.irotorspeed ?? 0
     let animationDuration;
-    animationDuration = 60 / irotorspeed / 3
+    animationDuration = 60 / irotorspeed / 2
     const processedoperationmode = item.attributeMap?.processedoperationmode ?? 0
     if(processedoperationmode==33||processedoperationmode==0){
         return {