diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
index 45b33017..75bd2071 100644
--- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
+++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
@@ -41,6 +41,9 @@ public class SysMenusController {
         if(!hasPermission){
             return R.fail("没有系统管理权限");
         }
+        if (!sysMenuDto.getMenuName().matches("^[a-zA-Z]*$")){
+            return R.fail("菜单名称,必须为英文");
+        }
         return R.success(sysMenuService.createMenu(sysMenuDto));
     }
 
@@ -55,7 +58,7 @@ public class SysMenusController {
         if(!hasPermission){
             return R.fail("没有系统管理权限");
         }
-        if (StringUtils.isAllEnglishLetters(sysMenuDto.getMenuName())){
+        if (!sysMenuDto.getMenuName().matches("^[a-zA-Z]*$")){
             return R.fail("菜单名称,必须为英文");
         }
         sysMenuService.updateMenu(sysMenuDto);
diff --git a/das/src/main/java/com/das/modules/data/service/DataService.java b/das/src/main/java/com/das/modules/data/service/DataService.java
index 7d1e75e6..4cd55fdc 100644
--- a/das/src/main/java/com/das/modules/data/service/DataService.java
+++ b/das/src/main/java/com/das/modules/data/service/DataService.java
@@ -49,12 +49,12 @@ public class DataService {
                     //为空查全部
                     List<String> sysIotModelFields = sysIotModelFieldMapper.queryAllFiledNames(Long.valueOf(snapshotValueQueryParam.getDeviceId()));
                     for (String item : sysIotModelFields) {
-                        String key = String.format("RT:[%s]:[%s]", snapshotValueQueryParam.getDeviceId(), item);
+                        String key = String.format("RT:%s:%s", snapshotValueQueryParam.getDeviceId(), item);
                         keyList.add(key);
                     }
                 } else {
                     for (String item : attributes) {
-                        String key = String.format("RT:[%s]:[%s]", snapshotValueQueryParam.getDeviceId(), item);
+                        String key = String.format("RT:%s:%s", snapshotValueQueryParam.getDeviceId(), item);
                         keyList.add(key);
                     }
                 }
@@ -62,12 +62,10 @@ public class DataService {
             List<Object> dataList = adminRedisTemplate.mGet(keyList);
             for (int i = 0; i < keyList.size(); i++) {
                 String key = keyList.get(i);
-                int firstColonIndex = key.indexOf('[');
-                int firstIndex = key.indexOf(']');
-                int secondIndex = key.indexOf(']', firstIndex + 1);
-                int secondColonIndex = key.indexOf('[', firstColonIndex + 1);
-                String deviceId = key.substring(firstColonIndex + 1, firstIndex);
-                String fieldName = key.substring(secondColonIndex + 1, secondIndex);
+                int firstColonIndex = key.indexOf(':');
+                int secondColonIndex = key.indexOf(':', firstColonIndex + 1);
+                String deviceId = key.substring(firstColonIndex + 1, secondColonIndex);
+                String fieldName = key.substring(secondColonIndex + 1);
                 if (finalResult.get(deviceId) == null) {
                     Map<String, Object> valueMap = new HashMap<>();
                     valueMap.put(fieldName, dataList.get(i));
diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java b/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java
index ba161a15..dda36d3f 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java
@@ -62,6 +62,23 @@ public class SysEnumController {
     }
 
 
+    /** 更新枚举值 */
+    @PostMapping("/updateEnumValues")
+    public R<SysEnumValuesVo> updateEnumValues(@RequestBody SysEnumValuesDto sysEnumValuesDto) {
+        //判断是否有权限
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        if(!hasPermission){
+            return R.fail("没有设备管理权限");
+        }
+        if (sysEnumValuesDto.getEnumTypeId() ==null && StringUtils.isBlank(sysEnumValuesDto.getValue())
+                || sysEnumValuesDto.getOrderNumber() == null  || sysEnumValuesDto.getIsActive() ==null ||
+                sysEnumValuesDto.getId() ==null) {
+            throw new ServiceException("参数缺失");
+        }
+        SysEnumValuesVo sysEnumValuesVo = sysEnumService.updateEnumValues(sysEnumValuesDto);
+        return R.success(sysEnumValuesVo);
+    }
+
     /**
      * 查询枚举类型列表
      *
@@ -72,7 +89,7 @@ public class SysEnumController {
     }
 
     /**
-     * 查询枚举类型列表
+     * 查询枚举值列表
      *
      * */
     @PostMapping("/queryEnumValuesList")
diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java
index 836102ad..ff847d10 100644
--- a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java
+++ b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java
@@ -19,6 +19,10 @@ public class SysEnumValuesVo {
      * 关联到枚举类型表的ID
      */
     private Long enumTypeId;
+    /**
+     * 关联到枚举类型表的ID字符串类型
+     */
+    private String enumTypeIdStr;
 
     /**
      * 枚举值的具体内容
diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEnumTypesMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEnumTypesMapper.java
index 1bbc8308..b1706778 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysEnumTypesMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEnumTypesMapper.java
@@ -1,9 +1,13 @@
 package com.das.modules.equipment.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.das.modules.equipment.domain.dto.SysEnumTypesDto;
 import com.das.modules.equipment.entity.SysEnumTypes;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface SysEnumTypesMapper extends BaseMapper<SysEnumTypes> {
+
+    Long queryEnumTypesByName(@Param("sysDto") SysEnumTypesDto sysDto);
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java b/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java
index 596cc9c9..ce4f13e1 100644
--- a/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java
+++ b/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java
@@ -14,6 +14,8 @@ public interface SysEnumService {
 
     SysEnumValuesVo addEnumValues(SysEnumValuesDto sysEnumValuesDto);
 
+    SysEnumValuesVo updateEnumValues(SysEnumValuesDto sysEnumValuesDto);
+
     List<SysEnumTypesVo> queryEnumTypesList();
 
     PageDataInfo<SysEnumValuesVo> queryEnumValuesList(SysEnumValuesDto sysEnumValuesDto);
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
index 1d2c7abe..12e9b263 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
@@ -1,8 +1,10 @@
 package com.das.modules.equipment.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.das.common.config.SessionUtil;
+import com.das.common.exceptions.ServiceException;
 import com.das.common.utils.BeanCopyUtils;
 import com.das.common.utils.PageDataInfo;
 import com.das.common.utils.PageQuery;
@@ -35,13 +37,18 @@ public class SysEnumServiceImpl implements SysEnumService {
     /** 新增枚举类型 */
     @Override
     public SysEnumTypesVo addEnumTypes(SysEnumTypesDto sysEnumTypesDto) {
+        //判断枚举类型,是否重复
+        Long count = sysEnumTypesMapper.queryEnumTypesByName(sysEnumTypesDto);
+        if (count >0){
+            throw new ServiceException("枚举类型,不可重复!");
+        }
         SysEnumTypes sysEnumTypes = new SysEnumTypes();
         BeanCopyUtils.copy(sysEnumTypesDto, sysEnumTypes);
         SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
-        sysEnumTypes.setCreatedTime(new Date());
-        sysEnumTypes.setUpdatedTime(new Date());
         sysEnumTypes.setCreatedBy(sysUserVo.getAccount());
         sysEnumTypes.setUpdatedBy(sysUserVo.getAccount());
+        sysEnumTypes.setCreatedTime(new Date());
+        sysEnumTypes.setUpdatedTime(new Date());
         sysEnumTypes.setRevision(1);
         sysEnumTypesMapper.insert(sysEnumTypes);
         SysEnumTypesVo sysEnumTypesVo = new SysEnumTypesVo();
@@ -54,11 +61,18 @@ public class SysEnumServiceImpl implements SysEnumService {
     public SysEnumValuesVo addEnumValues(SysEnumValuesDto sysEnumValuesDto) {
         SysEnumValues sysEnumValues = new SysEnumValues();
         BeanCopyUtils.copy(sysEnumValuesDto,sysEnumValues);
+        QueryWrapper<SysEnumValues> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enum_type_id",sysEnumValuesDto.getEnumTypeId());
+        queryWrapper.eq("description",sysEnumValuesDto.getDescription());
+        Long count = sysEnumValuesMapper.selectCount(queryWrapper);
+        if (count >0){
+            throw new ServiceException("枚举值描述,不可重复!");
+        }
         SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
-        sysEnumValues.setCreatedTime(new Date());
-        sysEnumValues.setUpdatedTime(new Date());
         sysEnumValues.setCreatedBy(sysUserVo.getAccount());
         sysEnumValues.setUpdatedBy(sysUserVo.getAccount());
+        sysEnumValues.setCreatedTime(new Date());
+        sysEnumValues.setUpdatedTime(new Date());
         sysEnumValues.setRevision(1);
         sysEnumValuesMapper.insert(sysEnumValues);
         SysEnumValuesVo sysEnumValuesVo = new SysEnumValuesVo();
@@ -66,6 +80,26 @@ public class SysEnumServiceImpl implements SysEnumService {
         return sysEnumValuesVo;
     }
 
+    @Override
+    public SysEnumValuesVo updateEnumValues(SysEnumValuesDto sysEnumValuesDto) {
+        SysEnumValues sysEnumValues = new SysEnumValues();
+        BeanCopyUtils.copy(sysEnumValuesDto,sysEnumValues);
+        QueryWrapper<SysEnumValues> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enum_type_id",sysEnumValuesDto.getEnumTypeId());
+        queryWrapper.eq("description",sysEnumValuesDto.getDescription());
+        Long count = sysEnumValuesMapper.selectCount(queryWrapper);
+        if (count >0){
+            throw new ServiceException("枚举值描述,不可重复!");
+        }
+        SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
+        sysEnumValues.setUpdatedBy(sysUserVo.getAccount());
+        sysEnumValues.setUpdatedTime(new Date());
+        sysEnumValuesMapper.updateById(sysEnumValues);
+        SysEnumValuesVo sysEnumValuesVo = new SysEnumValuesVo();
+        BeanCopyUtils.copy(sysEnumValues, sysEnumValuesVo);
+        return sysEnumValuesVo;
+    }
+
     /**
      * 查询枚举类型列表
      * @return
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index c9be0752..159eb70a 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -60,6 +60,8 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
 
     @Override
     public SysEquipmentVo creatSysEquipment(SysEquipmentDto sysEquipmentDto) {
+        //去除空格
+        sysEquipmentDto.setCode(sysEquipmentDto.getCode().replaceAll(" ", ""));
         SysEquipment sysEquipment = new SysEquipment();
         BeanCopyUtils.copy(sysEquipmentDto, sysEquipment);
 
@@ -81,6 +83,8 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
 
     @Override
     public SysEquipmentVo updateSysEquipment(SysEquipmentDto sysEquipmentDto) {
+        //去除空格
+        sysEquipmentDto.setCode(sysEquipmentDto.getCode().replaceAll(" ", ""));
         SysEquipment sysEquipment = new SysEquipment();
         BeanCopyUtils.copy(sysEquipmentDto, sysEquipment);
         SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index 18aed703..cddb1293 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
@@ -1,6 +1,7 @@
 package com.das.modules.equipment.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -25,6 +26,7 @@ import com.das.modules.equipment.mapper.SysIotModelFieldMapper;
 import com.das.modules.equipment.mapper.SysIotModelMapper;
 import com.das.modules.equipment.mapper.SysIotModelServiceMapper;
 import com.das.modules.equipment.service.SysIotModelService;
+import com.das.modules.node.service.TDEngineService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -35,15 +37,13 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
 
 @Transactional(rollbackFor = Exception.class)
 @Service
 @Slf4j
 public class SysIotModelServiceImpl implements SysIotModelService {
+    public static final int COMMIT_COUNT = 1000;
 
     @Autowired
     private SysIotModelMapper sysIotModelMapper;
@@ -54,6 +54,8 @@ public class SysIotModelServiceImpl implements SysIotModelService {
     @Autowired
     private SysIotModelServiceMapper sysIotModelServiceMapper;
 
+    @Autowired
+    private TDEngineService tdEngineService;
 
     public SysIotModelVo creatSysIotModel(SysIotModelDto sysIotModelDto) {
         SysIotModel sysIotModel = new SysIotModel();
@@ -162,6 +164,8 @@ public class SysIotModelServiceImpl implements SysIotModelService {
             sysIotModelField.setDataType("tinyint");
         }
 
+        //动态执行创建td超级表，字段
+        createTdStableOrColumn(sysIotModelField);
         sysIotModelFieldMapper.insert(sysIotModelField);
         SysIotModelFieldVo sysIotModelFieldVo = new SysIotModelFieldVo();
         BeanCopyUtils.copy(sysIotModelField, sysIotModelFieldVo);
@@ -188,6 +192,15 @@ public class SysIotModelServiceImpl implements SysIotModelService {
 
         }
         sysIotModelFieldMapper.updateById(sysIotModelField);
+
+        SysIotModelField oldSysIotField = sysIotModelFieldMapper.selectById(sysIotModelFieldDto.getId());
+        if (oldSysIotField == null){
+            throw new ServiceException("未查找到该条记录");
+        }
+        if (!oldSysIotField.getAttributeCode().equals(sysIotModelField.getAttributeCode()) && oldSysIotField.getDataType().equals(sysIotModelField.getDataType()) && Objects.equals(oldSysIotField.getHighSpeed(), sysIotModelField.getHighSpeed())){
+            //更新td表结构
+            updateTDStableOrColumn(sysIotModelField,oldSysIotField);
+        }
         SysIotModelFieldVo sysIotModelFieldVo = new SysIotModelFieldVo();
         BeanCopyUtils.copy(sysIotModelField, sysIotModelFieldVo);
         return sysIotModelFieldVo;
@@ -195,6 +208,8 @@ public class SysIotModelServiceImpl implements SysIotModelService {
 
     @Override
     public void deleteSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto) {
+        SysIotModelField sysIotModelField = sysIotModelFieldMapper.selectById(sysIotModelFieldDto.getId());
+        deleteTDStableOrColumn(sysIotModelField);
         sysIotModelFieldMapper.deleteById(sysIotModelFieldDto.getId());
     }
 
@@ -401,11 +416,35 @@ public class SysIotModelServiceImpl implements SysIotModelService {
                 }
             }
         }
-        sysIotModelFieldMapper.insertBatch(sysIotModelFieldList);
+        if (CollectionUtils.isNotEmpty(sysIotModelFieldList)) {
+            sysIotModelFieldMapper.insertBatch(sysIotModelFieldList);
+            ListUtil.page(sysIotModelFieldList, COMMIT_COUNT, create -> {
+                for (SysIotModelField item : create){
+                    createTdStableOrColumn(item);
+                }
+            });
+        }
         if (CollectionUtils.isNotEmpty(updateSysIotModelFieldList)) {
+            ListUtil.page(updateSysIotModelFieldList, COMMIT_COUNT, update -> {
+                for (SysIotModelField item : update){
+                    SysIotModelField oldSysIotField = sysIotModelFieldMapper.selectById(item.getId());
+                    if (oldSysIotField != null){
+                        if (!oldSysIotField.getAttributeCode().equals(item.getAttributeCode()) && oldSysIotField.getDataType().equals(item.getDataType()) && Objects.equals(oldSysIotField.getHighSpeed(), item.getHighSpeed())){
+                            //更新td表结构
+                            updateTDStableOrColumn(item,oldSysIotField);
+                        }
+                    }
+                }
+            });
             sysIotModelFieldMapper.updateBatchById(updateSysIotModelFieldList);
+
         }
         if (CollectionUtils.isNotEmpty(delSysIotModelFieldList)) {
+            ListUtil.page(updateSysIotModelFieldList, COMMIT_COUNT, delete -> {
+                for (SysIotModelField item : delete){
+                    deleteTDStableOrColumn(item);
+                }
+            });
             sysIotModelFieldMapper.deleteBatchIds(delSysIotModelFieldList);
         }
     }
@@ -428,4 +467,70 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         return list;
     }
 
+    public void createTdStableOrColumn(SysIotModelField sysIotModelField){
+        //如果新增的是第一条记录 创建tdengine超级表 分为高频和低频
+        QueryWrapper<SysIotModelField> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("iot_model_id",sysIotModelField.getIotModelId());
+        queryWrapper.eq("highspeed",sysIotModelField.getHighSpeed());
+        List<SysIotModelField> sysIotModelFields = sysIotModelFieldMapper.selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(sysIotModelFields)){
+            if (sysIotModelField.getHighSpeed() == 0){
+                SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
+                Map<String,String> map = new HashMap<>();
+                map.put(sysIotModelField.getAttributeCode(), sysIotModelField.getDataType());
+                //创建低频超级表
+                tdEngineService.createStable(sysIotModel.getIotModelCode(),"l_",map);
+            }
+            if (sysIotModelField.getHighSpeed() == 1){
+                SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
+                Map<String,String> map = new HashMap<>();
+                map.put(sysIotModelField.getAttributeCode(), sysIotModelField.getDataType());
+                //创建高频超级表
+                tdEngineService.createStable(sysIotModel.getIotModelCode(),"h_",map);
+            }
+        }else {
+            //stable已经存在,新增stable列
+            if (sysIotModelField.getHighSpeed() == 0){
+                SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
+                Map<String,String> map = new HashMap<>();
+                map.put(sysIotModelField.getAttributeCode(), sysIotModelField.getDataType());
+                //创建低频超级表
+                tdEngineService.addStableColumn(sysIotModel.getIotModelCode(),"l_",map);
+            }
+            if (sysIotModelField.getHighSpeed() == 1){
+                SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
+                Map<String,String> map = new HashMap<>();
+                map.put(sysIotModelField.getAttributeCode(), sysIotModelField.getDataType());
+                //创建高频超级表
+                tdEngineService.addStableColumn(sysIotModel.getIotModelCode(),"h_",map);
+            }
+        }
+    }
+
+    public void updateTDStableOrColumn(SysIotModelField sysIotModelField,SysIotModelField oldIotModelField){
+        deleteTDStableOrColumn(oldIotModelField);
+        createTdStableOrColumn(sysIotModelField);
+    }
+
+    public void deleteTDStableOrColumn(SysIotModelField sysIotModelField){
+        String stableName = null;
+        SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
+        if(sysIotModelField.getHighSpeed() == 0) {
+             stableName = "l_" + sysIotModel.getIotModelCode();
+        }
+        if(sysIotModelField.getHighSpeed() == 1) {
+             stableName = "h_" + sysIotModel.getIotModelCode();
+        }
+        QueryWrapper<SysIotModelField> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("iot_model_id",sysIotModelField.getIotModelId());
+        queryWrapper.eq("highspeed",sysIotModelField.getHighSpeed());
+        List<SysIotModelField> sysIotModelFields = sysIotModelFieldMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(sysIotModelFields) && sysIotModelFields.size() > 1){
+            tdEngineService.deleteColumn(stableName,sysIotModelField.getAttributeCode());
+        }
+        //物模型属性只剩下最后一个删除表
+        if (CollectionUtils.isNotEmpty(sysIotModelFields) && sysIotModelFields.size() == 1){
+            tdEngineService.deleteStable(stableName);
+        }
+    }
 }
diff --git a/das/src/main/java/com/das/modules/node/domain/vo/ConfigUpdateVo.java b/das/src/main/java/com/das/modules/node/domain/vo/ConfigUpdateVo.java
index ac8e33e2..96c4713c 100644
--- a/das/src/main/java/com/das/modules/node/domain/vo/ConfigUpdateVo.java
+++ b/das/src/main/java/com/das/modules/node/domain/vo/ConfigUpdateVo.java
@@ -19,7 +19,7 @@ public class ConfigUpdateVo {
 
     private List<LinkVo> links;
 
-    private List equipments;
+    private List<EquipmentVo> equipments;
 
     public ConfigUpdateVo() {
 
diff --git a/das/src/main/java/com/das/modules/node/mapper/SysImptabmappingMapper.java b/das/src/main/java/com/das/modules/node/mapper/SysImptabmappingMapper.java
index b4e1a9ce..7bba68ef 100644
--- a/das/src/main/java/com/das/modules/node/mapper/SysImptabmappingMapper.java
+++ b/das/src/main/java/com/das/modules/node/mapper/SysImptabmappingMapper.java
@@ -28,7 +28,9 @@ public interface SysImptabmappingMapper extends BaseMapperPlus<SysImptabmapping,
 
     List<Long> getEquipmentId(Long linkId);
 
-    List<IotModelVo> getIotModelFieldByEquipmentId(Long equipmentId);
+    List<IotModelVo> getIotModelFieldByDeviceId(@Param("deviceId") Long deviceId);
+
+    List<IotModelVo> getIotModelServiceByDeviceId(@Param("deviceId") Long deviceId);
 
     List<IotModelVo> getIotModelServiceByEquipmentId(Long equipmentId);
 
diff --git a/das/src/main/java/com/das/modules/node/service/TDEngineService.java b/das/src/main/java/com/das/modules/node/service/TDEngineService.java
index d97ef9e2..44276b15 100644
--- a/das/src/main/java/com/das/modules/node/service/TDEngineService.java
+++ b/das/src/main/java/com/das/modules/node/service/TDEngineService.java
@@ -61,6 +61,7 @@ public class TDEngineService {
     /**
      * 创建超级表
      */
+    @Async
     public void createStable(String iotModelCode, String stableType, Map<String, String> fieldNameTypeMap) {
         try (Connection conn = hikariDataSource.getConnection();
              Statement pstmt = conn.createStatement()) {
@@ -94,6 +95,7 @@ public class TDEngineService {
     /**
      * 新增超级表列
      */
+    @Async
     public void addStableColumn(String iotModelCode, String stableType, Map<String, String> fieldNameTypeMap) {
         try (Connection conn = hikariDataSource.getConnection();
              Statement pstmt = conn.createStatement()) {
@@ -124,6 +126,7 @@ public class TDEngineService {
     /**
      * 删除超级表列
      */
+    @Async
     public void deleteColumn(String stableName, String fieldCode) {
         try (Connection conn = hikariDataSource.getConnection();
              Statement pstmt = conn.createStatement()) {
@@ -131,7 +134,7 @@ public class TDEngineService {
             sb.setLength(0);
             sb.append("ALTER STABLE ");
             sb.append(stableName);
-            sb.append(" DROP COLUMN");
+            sb.append(" DROP COLUMN ");
             ;
             sb.append(fieldCode);
             sb.append(";");
@@ -149,6 +152,7 @@ public class TDEngineService {
     /**
      * 删除超级表
      */
+    @Async
     public void deleteStable(String stableName) {
         try (Connection conn = hikariDataSource.getConnection();
              Statement pstmt = conn.createStatement()) {
diff --git a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java
index 22eb2074..4d5a30a7 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java
@@ -141,13 +141,12 @@ public class DataServiceImpl implements DataService {
                     ObjectNode equipJsonNode = equipObjectMapper.convertValue(map, ObjectNode.class);
                     List<NewIotModelVo> newIotModelFieldList = new ArrayList<>();
                     List<NewIotModelVo> newIotModelServiceList = new ArrayList<>();
-                    // 获取设备IOT地址
-                    String iotAddr = sysImptabmappingMapper.getIotAddrByEquipmentId(equipmentId);
                     // 根据设备Id获取对应的物模型属性和动作
-                    List<IotModelVo> iotModelFieldList = sysImptabmappingMapper.getIotModelFieldByEquipmentId(equipmentId);
+                    List<IotModelVo> iotModelFieldList = sysImptabmappingMapper.getIotModelFieldByDeviceId(equipmentId);
+                    List<IotModelVo> iotModelServiceList = sysImptabmappingMapper.getIotModelServiceByDeviceId(equipmentId);
                     if (!CollectionUtils.isEmpty(iotModelFieldList)) {
                         for (IotModelVo info : iotModelFieldList) {
-                            if (info.getServiceType() == null) {
+
                                 NewIotModelVo newIotModelVo = new NewIotModelVo();
                                 newIotModelVo.setName(info.getEquipmentAttribute());
                                 newIotModelVo.setHighSpeed(info.getHighSpeed());
@@ -164,21 +163,23 @@ public class DataServiceImpl implements DataService {
                                     newIotModelVo.setType("yx");
                                 }
                                 newIotModelFieldList.add(newIotModelVo);
-                            } else if (info.getAttributeType() == null) {
-                                NewIotModelVo newIotModelVo = new NewIotModelVo();
-                                newIotModelVo.setName(info.getEquipmentService());
-                                if (info.getParams() == null) {
-                                    newIotModelVo.setParams(equipJsonNode);
-                                } else {
-                                    newIotModelVo.setParams(equipObjectMapper.readTree(info.getParams().toString()));
-                                }
-                                if (info.getServiceType() == BaseIotModelType.TYPE_PSR_SETPOINT) {
-                                    newIotModelVo.setType("yt");
-                                } else if (info.getServiceType() == BaseIotModelType.TYPE_PSR_CONTROL) {
-                                    newIotModelVo.setType("yk");
-                                }
-                                newIotModelServiceList.add(newIotModelVo);
+                        }
+                    }
+                    if (!CollectionUtils.isEmpty(iotModelServiceList)){
+                        for (IotModelVo info : iotModelServiceList) {
+                            NewIotModelVo newIotModelVo = new NewIotModelVo();
+                            newIotModelVo.setName(info.getEquipmentService());
+                            if (info.getParams() == null) {
+                                newIotModelVo.setParams(equipJsonNode);
+                            } else {
+                                newIotModelVo.setParams(equipObjectMapper.readTree(info.getParams().toString()));
                             }
+                            if (info.getServiceType() == BaseIotModelType.TYPE_PSR_SETPOINT) {
+                                newIotModelVo.setType("yt");
+                            } else if (info.getServiceType() == BaseIotModelType.TYPE_PSR_CONTROL) {
+                                newIotModelVo.setType("yk");
+                            }
+                            newIotModelServiceList.add(newIotModelVo);
                         }
                     }
                     EquipmentVo equipment = new EquipmentVo();
@@ -247,9 +248,8 @@ public class DataServiceImpl implements DataService {
         Iterator<String> keysHigh = values.fieldNames();
         while (keysHigh.hasNext()) {
             String fieldName = keysHigh.next();
-            String key = String.format("RT:[%s]:[%s]", deviceId, fieldName);
-            keyValueMap.put(key, values.get(fieldName).asDouble());
-
+            String key = String.format("RT:%s:%s", deviceId, fieldName);
+            keyValueMap.put(key,values.get(fieldName));
         }
         adminRedisTemplate.mSet(keyValueMap);
 //        Long dataTime = data.getTime();
diff --git a/das/src/main/resources/mapper/SysEnumTypesMapper.xml b/das/src/main/resources/mapper/SysEnumTypesMapper.xml
new file mode 100644
index 00000000..c73e9a36
--- /dev/null
+++ b/das/src/main/resources/mapper/SysEnumTypesMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.das.modules.equipment.mapper.SysEnumTypesMapper">
+
+
+
+    <select id="queryEnumTypesByName"  resultType="long">
+        select
+            count(*)
+        from
+            public.sys_enum_types
+        where
+            "name" = #{sysDto.name}
+           or description = #{sysDto.description}
+    </select>
+
+
+
+</mapper>
diff --git a/das/src/main/resources/mapper/SysEnumValuesMapper.xml b/das/src/main/resources/mapper/SysEnumValuesMapper.xml
index 39c00d79..e950eda3 100644
--- a/das/src/main/resources/mapper/SysEnumValuesMapper.xml
+++ b/das/src/main/resources/mapper/SysEnumValuesMapper.xml
@@ -4,6 +4,7 @@
 
     <resultMap type="com.das.modules.equipment.domain.vo.SysEnumValuesVo" id="EnumValuesMap">
         <result property="enumTypeId" column="enum_type_id" jdbcType="BIGINT"/>
+        <result property="enumTypeIdStr" column="enum_type_id" jdbcType="VARCHAR"/>
         <result property="value" column="value" jdbcType="VARCHAR"/>
         <result property="description" column="description" jdbcType="VARCHAR"/>
         <result property="orderNumber" column="order_number" jdbcType="INTEGER"/>
@@ -22,6 +23,7 @@
             <if test="sysEnumValuesDto.isActive != null and sysEnumValuesDto.isActive != ''">
                 and e.is_active =#{sysEnumValuesDto.isActive}
             </if>
+            order by e.order_number asc
         </where>
     </select>
 
diff --git a/das/src/main/resources/mapper/SysImptabmappingMapper.xml b/das/src/main/resources/mapper/SysImptabmappingMapper.xml
index 595e8290..af03a126 100644
--- a/das/src/main/resources/mapper/SysImptabmappingMapper.xml
+++ b/das/src/main/resources/mapper/SysImptabmappingMapper.xml
@@ -58,14 +58,6 @@
         where sc.id = #{linkId}
     </select>
 
-    <select id="getIotModelFieldByEquipmentId" resultType="com.das.modules.node.domain.vo.IotModelVo">
-        select simf.attribute_type as attributeType,sims.service_type as serviceType, se.iot_addr as iotAddr,si.equipment_attribute as equipmentAttribute,si.equipment_service as equipmentService, si.params, simf.highspeed as highSpeed from sys_imptabmapping si
-        left join sys_equipment se on si.equipment_id = se.id
-        left join sys_iot_model_field simf on si.equipment_attribute  = simf.attribute_code and se.iot_model_id = simf.iot_model_id
-        left join sys_iot_model_service sims on si.equipment_service  = sims.service_code and se.iot_model_id = sims.iot_model_id
-        where si.equipment_id = #{equipmentId}
-    </select>
-
 
     <select id="getIotModelServiceByEquipmentId" resultType="com.das.modules.node.domain.vo.IotModelVo">
         select sims.service_code as name ,sims.service_type as type ,si.params from sys_imptabmapping si
@@ -95,5 +87,33 @@
         left join sys_equipment se on si.equipment_id = se.id
         where si.link_id = #{linkId}
     </select>
+    <select id="getIotModelFieldByDeviceId" resultType="com.das.modules.node.domain.vo.IotModelVo">
+        select
+            field.attribute_type as attributeType,
+            null as serviceType,
+            (select iot_addr from sys_equipment e where e.id=1846101273013739522) as iot_addr,
+            field.attribute_code as equipmentAttribute,
+            null as equipmentService,
+            si.params,
+            field.highspeed
+        from sys_iot_model_field field
+                 left join sys_imptabmapping si on (field.attribute_code=si.equipment_attribute)
+        where field.iot_model_id = (select equip.iot_model_id from sys_equipment equip where equip.id = #{deviceId}) and si.equipment_id = #{deviceId}
+        order by field.attribute_type ,field.porder
+    </select>
+    <select id="getIotModelServiceByDeviceId" resultType="com.das.modules.node.domain.vo.IotModelVo">
+        select
+            null as attributeType,
+            service.service_type as serviceType,
+            (select iot_addr from sys_equipment e where e.id=1846101273013739522) as iot_addr,
+            null as equipmentAttribute,
+            service.service_code as equipmentService,
+            si.params,
+            null as highspeed
+        from sys_iot_model_service service
+                 left join sys_imptabmapping si on (service.service_code=si.equipment_service)
+        where service.iot_model_id = (select equip.iot_model_id from sys_equipment equip where equip.id = #{deviceId}) and si.equipment_id = #{deviceId}
+        order by service.service_type ,service.porder
+    </select>
 
 </mapper>
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index b18bdbdb..24c993d0 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -4,4 +4,7 @@
   - [设备管理接口](api/equipment.md)
   - [节点管理接口](api/node.md)
   - [数据访问接口](api/data.md)
-- [数据采集](datacollect/)
\ No newline at end of file
+- [数据采集](datacollect/)
+- [系统部署](deploy/)
+  - [Linux系统部署](deploy/linux.md)
+  - [TDEngine3部署](deploy/tdengine3.md)
\ No newline at end of file
diff --git a/docs/deploy/README.md b/docs/deploy/README.md
new file mode 100644
index 00000000..121bbfcb
--- /dev/null
+++ b/docs/deploy/README.md
@@ -0,0 +1,36 @@
+# 润阳系统部署
+
+
+## 硬件环境
+
+> CPU: 24核
+
+> 内存: 32GB
+
+> 硬盘: 16T
+
+
+## 软件环境
+
+> 操作系统:  OpenEuler 24.03 (LTS)
+
+> JDK:  OpenJDK 17
+
+> 关系数据库： PostgreSQL 15.8
+
+> 缓存数据库： Redis 6
+
+> 时序数据库: TDEngine 3.3.2.0
+
+
+## 目录结构
+
+`/das` -  系统根目录
+
+`/das/data` - 系统数据目录
+
+`/das/data/tddata` - TDEngine3数据目录
+
+`/das/data/pgdata` - PostgreSQL数据目录
+
+`/das/data/redis` - Redis数据目录
diff --git a/docs/deploy/_sidebar.md b/docs/deploy/_sidebar.md
new file mode 100644
index 00000000..4d99ba2c
--- /dev/null
+++ b/docs/deploy/_sidebar.md
@@ -0,0 +1 @@
+- [首页](/)
\ No newline at end of file
diff --git a/docs/deploy/linux.md b/docs/deploy/linux.md
new file mode 100644
index 00000000..9f0b819d
--- /dev/null
+++ b/docs/deploy/linux.md
@@ -0,0 +1,3 @@
+# OpenEuler 24.03 (LTS) 安装部署
+
+!> 等待更新
\ No newline at end of file
diff --git a/docs/deploy/tdengine3.md b/docs/deploy/tdengine3.md
new file mode 100644
index 00000000..c5eb53e6
--- /dev/null
+++ b/docs/deploy/tdengine3.md
@@ -0,0 +1,4 @@
+# TDEngine3 安装部署
+
+> 当前版本:   3.3.2.0 
+
diff --git a/ui/dasadmin/.env.development b/ui/dasadmin/.env.development
index d5455a0b..0349de0f 100644
--- a/ui/dasadmin/.env.development
+++ b/ui/dasadmin/.env.development
@@ -6,7 +6,7 @@ VITE_BASE_PATH = './'
 
 # 代理配置（开发使用），必须在一行中
 # 本地
-#  VITE_APP_PROXY=[["/api","http://192.168.130.12:8080/api"]]
+#  VITE_APP_PROXY=[["/api","http://192.168.130.22:8080/api"]]
 # 线上
   VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]]
   
diff --git a/ui/dasadmin/src/api/backend/Enumeration/request.ts b/ui/dasadmin/src/api/backend/Enumeration/request.ts
index 8fd2cbf8..688a5736 100644
--- a/ui/dasadmin/src/api/backend/Enumeration/request.ts
+++ b/ui/dasadmin/src/api/backend/Enumeration/request.ts
@@ -34,7 +34,7 @@ export function enumValueAdd(params: object = {}) {
     })
 }
 
-// 枚举值新增
+// 枚举值删除
 export function enumValueDelete(params: object = {}) {
     return createAxios({
         url: '/api/enum/deleteEnumValues',
@@ -42,4 +42,12 @@ export function enumValueDelete(params: object = {}) {
         data: params,
     })
 }
+// 枚举值编辑
+export function enumValuepageEdit(params: object = {}) {
+    return createAxios({
+        url: '/api/enum/updateEnumValues',
+        method: 'POST',
+        data: params,
+    })
+}
 
diff --git a/ui/dasadmin/src/api/backend/control/request.ts b/ui/dasadmin/src/api/backend/control/request.ts
new file mode 100644
index 00000000..fc9f1e37
--- /dev/null
+++ b/ui/dasadmin/src/api/backend/control/request.ts
@@ -0,0 +1,9 @@
+import createAxios from '/@/utils/axios'
+
+export const sendValueReq = (data: any) => {
+    return createAxios({
+        url: '/api/node/link/deviceControl',
+        method: 'post',
+        data: data,
+    })
+}
\ No newline at end of file
diff --git a/ui/dasadmin/src/api/backend/dashboard.ts b/ui/dasadmin/src/api/backend/dashboard.ts
index 5caef9de..21f901fd 100644
--- a/ui/dasadmin/src/api/backend/dashboard.ts
+++ b/ui/dasadmin/src/api/backend/dashboard.ts
@@ -1,4 +1,5 @@
 import createAxios from '/@/utils/axios'
+import {addDataType, getDataReturnType, getDataType, getTreeDataReturnType} from "/@/views/backend/auth/org/type";
 
 export const url = '/admin/Dashboard/'
 
@@ -8,3 +9,11 @@ export function index() {
         method: 'get',
     })
 }
+
+export const getInstitutionalListReq = (data: getDataType) => {
+    return createAxios<addDataType, getDataReturnType<getTreeDataReturnType>>({
+        url: '/api/org/query',
+        method: 'post',
+        data: data,
+    })
+}
diff --git a/ui/dasadmin/src/api/backend/deviceModel/request.ts b/ui/dasadmin/src/api/backend/deviceModel/request.ts
index dead7a32..7a3cd1c9 100644
--- a/ui/dasadmin/src/api/backend/deviceModel/request.ts
+++ b/ui/dasadmin/src/api/backend/deviceModel/request.ts
@@ -142,8 +142,16 @@ export const downloadModelReq = (data: { id: string }) => {
 }
 
 export const getDeviceTypeEnumReq = () => {
-    return createAxios<never,RequestReturnType<DeviceType[]>>({
+    return createAxios<never, RequestReturnType<DeviceType[]>>({
         url: '/api/equipment/type',
         method: 'post',
     })
 }
+
+export const getRealValueListReq = (data: { deviceId: string, attributes: string[] }[]) => {
+    return createAxios<never, RequestReturnType<any>>({
+        url: '/api/data/snapshot',
+        method: 'post',
+        data: data,
+    })
+}
diff --git a/ui/dasadmin/src/api/backend/linkMonitor/request.ts b/ui/dasadmin/src/api/backend/linkMonitor/request.ts
new file mode 100644
index 00000000..707e53f5
--- /dev/null
+++ b/ui/dasadmin/src/api/backend/linkMonitor/request.ts
@@ -0,0 +1,24 @@
+import createAxios from '/@/utils/axios'
+import {
+    RequestReturnType,
+    RequestReturnRowType,
+    LinkMonitorTreeType,
+    GetLinkMonitorTableParam,
+    LinkMonitorTableType,
+} from '/@/views/backend/linkMonitor/type'
+
+// 左侧树节点树结构
+export const getNodeListReq = () => {
+    return createAxios<never, RequestReturnType<LinkMonitorTreeType[]>>({
+        url: '/api/node/list',
+        method: 'post',
+    })
+}
+// 链路列表
+export const getLinkListReq = (data: GetLinkMonitorTableParam) => {
+    return createAxios<never, RequestReturnRowType<LinkMonitorTableType[]>>({
+        url: '/api/node/link/list',
+        method: 'post',
+        data: data,
+    })
+}
diff --git a/ui/dasadmin/src/assets/dashboard/Standby.png b/ui/dasadmin/src/assets/dashboard/Standby.png
new file mode 100644
index 00000000..e898970f
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/Standby.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/bg1.png b/ui/dasadmin/src/assets/dashboard/bg1.png
new file mode 100644
index 00000000..f937021f
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/bg1.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/biaogan.png b/ui/dasadmin/src/assets/dashboard/biaogan.png
new file mode 100644
index 00000000..a6bfcffb
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/biaogan.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/fanlist1.png b/ui/dasadmin/src/assets/dashboard/fanlist1.png
new file mode 100644
index 00000000..049ded0f
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/fanlist1.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/fanlist2.png b/ui/dasadmin/src/assets/dashboard/fanlist2.png
new file mode 100644
index 00000000..e363af18
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/fanlist2.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/fault.png b/ui/dasadmin/src/assets/dashboard/fault.png
new file mode 100644
index 00000000..3c4036f6
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/fault.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/fdl1.png b/ui/dasadmin/src/assets/dashboard/fdl1.png
new file mode 100644
index 00000000..ac0b38d9
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/fdl1.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/fdl2.png b/ui/dasadmin/src/assets/dashboard/fdl2.png
new file mode 100644
index 00000000..07b083f8
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/fdl2.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/fdl3.png b/ui/dasadmin/src/assets/dashboard/fdl3.png
new file mode 100644
index 00000000..453ae972
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/fdl3.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/fdl4.png b/ui/dasadmin/src/assets/dashboard/fdl4.png
new file mode 100644
index 00000000..70069489
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/fdl4.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/offline.png b/ui/dasadmin/src/assets/dashboard/offline.png
new file mode 100644
index 00000000..e043ccc2
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/offline.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/run.png b/ui/dasadmin/src/assets/dashboard/run.png
new file mode 100644
index 00000000..c3e8cc4e
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/run.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/status1.png b/ui/dasadmin/src/assets/dashboard/status1.png
new file mode 100644
index 00000000..ba7bde03
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/status1.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/status2.png b/ui/dasadmin/src/assets/dashboard/status2.png
new file mode 100644
index 00000000..c8d8b118
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/status2.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/viewP.png b/ui/dasadmin/src/assets/dashboard/viewP.png
new file mode 100644
index 00000000..29078a06
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/viewP.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/viewR.png b/ui/dasadmin/src/assets/dashboard/viewR.png
new file mode 100644
index 00000000..52484464
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/viewR.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/viewW.png b/ui/dasadmin/src/assets/dashboard/viewW.png
new file mode 100644
index 00000000..e78cbaf0
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/viewW.png differ
diff --git a/ui/dasadmin/src/assets/dashboard/viewY.png b/ui/dasadmin/src/assets/dashboard/viewY.png
new file mode 100644
index 00000000..50b4ad9b
Binary files /dev/null and b/ui/dasadmin/src/assets/dashboard/viewY.png differ
diff --git a/ui/dasadmin/src/layouts/backend/components/navMenus.vue b/ui/dasadmin/src/layouts/backend/components/navMenus.vue
index f22345b0..eaebdf11 100644
--- a/ui/dasadmin/src/layouts/backend/components/navMenus.vue
+++ b/ui/dasadmin/src/layouts/backend/components/navMenus.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="nav-menus" :class="configStore.layout.layoutMode">
-        <router-link class="h100" target="_blank" :title="t('Home')" to="/">
+        <!-- <router-link class="h100" target="_blank" :title="t('Home')" to="/">
             <div class="nav-menu-item">
                 <Icon :color="configStore.getColorVal('headerBarTabColor')" class="nav-menu-icon" name="el-icon-Monitor" size="18" />
             </div>
-        </router-link>
+        </router-link> -->
         <!-- <el-dropdown
             @visible-change="onCurrentNavMenu($event, 'lang')"
             class="h100"
diff --git a/ui/dasadmin/src/stores/config.ts b/ui/dasadmin/src/stores/config.ts
index ec8766ff..27ece963 100644
--- a/ui/dasadmin/src/stores/config.ts
+++ b/ui/dasadmin/src/stores/config.ts
@@ -106,11 +106,12 @@ export const useConfig = defineStore(
 
         const getColorVal = function (name: keyof Layout): string {
             const colors = layout[name] as string[]
-            if (layout.isDark) {
-                return colors[1]
-            } else {
-                return colors[0]
-            }
+            // TODO 切换暗黑模式
+            // if (layout.isDark) {
+            //     return colors[1]
+            // } else {
+            return colors[0]
+            // }
         }
 
         return { layout, lang, menuWidth, setLang, setLayoutMode, setLayout, getColorVal, onSetLayoutColor }
diff --git a/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue b/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
index 31666896..045b2e30 100644
--- a/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
@@ -3,26 +3,6 @@
         <el-container class="containerPart">
             <el-aside class="defaultAside">
                 <el-main class="treeMain">
-<!--                    <div class="demo-collapse">-->
-<!--                        <el-collapse v-model="activeName" accordion>-->
-<!--                            <el-collapse-item name="1">-->
-<!--                                <template #title>-->
-<!--                                    <span class="collapse-title">枚举类型配置</span>-->
-<!--                                </template>-->
-<!--                                <div>-->
-<!--                                    <el-tree-->
-<!--                                        style="max-width: 600px;margin-top: 2.2%"-->
-<!--                                        ref="TypeTree"-->
-<!--                                        :data="TypeData"-->
-<!--                                        :props="defaultProps"-->
-<!--                                        node-key="id"-->
-<!--                                        @node-click="handleNodeClick"-->
-<!--                                    />-->
-<!--                                </div>-->
-<!--                            </el-collapse-item>-->
-<!--                        </el-collapse>-->
-<!--                    </div>-->
-<!--                    <label class="treeTitle">枚举类型配置</label>-->
                     <el-tree
                         style="max-width: 600px;margin-top: 2.2%"
                         ref="TypeTree"
@@ -93,7 +73,7 @@
                 </el-form>
                 <template #footer>
                     <div class="dialog-footer">
-                        <el-button @click="visibleTypeAdd = false"> 取消 </el-button>
+                        <el-button @click="visibleTypeAdd = false">取消</el-button>
                         <el-button type="primary" @click="onSubmitType">提交</el-button>
                     </div>
                 </template>
@@ -118,13 +98,16 @@
                         <el-input-number :min="0" v-model="formInlineValue.orderNumber" placeholder="" />
                     </el-form-item>
                     <el-form-item label="&nbsp;&nbsp;是否有效:">
-                        <el-switch v-model="formInlineValue.isActive" />
+                        <el-switch @change="addhandleSwitchChange"
+                                   :active-value="1"
+                                   :inactive-value="0"
+                                   v-model="formInlineValue.isActive" />
                     </el-form-item>
 
                 </el-form>
                 <template #footer>
                     <div class="dialog-footer">
-                        <el-button @click="visibleValueAdd = false"> 取消 </el-button>
+                        <el-button @click="visibleValueAdd = false">取消</el-button>
                         <el-button type="primary" @click="onSubmitvalue">提交</el-button>
                     </div>
                 </template>
@@ -139,7 +122,7 @@
                     </div>
                 </template>
             </el-dialog>
-            <!--查看枚举值-->
+            <!--编辑枚举值-->
             <el-dialog v-model="visibleValueEdit" title="查看枚举值" width="500" :before-close="edithandleClosevalue">
                 <el-form
                     ref="formRef"
@@ -158,14 +141,17 @@
                         <el-input-number :min="0" v-model="fromUpDate.orderNumber" placeholder="" />
                     </el-form-item>
                     <el-form-item label="&nbsp;&nbsp;是否有效:">
-                        <el-switch v-model="fromUpDate.isActive" />
+                        <el-switch @change="edithandleSwitchChange"
+                                   :active-value="1"
+                                   :inactive-value="0"
+                                   v-model="fromUpDate.isActive" />
                     </el-form-item>
 
                 </el-form>
                 <template #footer>
                     <div class="dialog-footer">
                         <el-button @click="visibleValueEdit = false"> 取消 </el-button>
-<!--                        <el-button type="primary" @click="onSubmitvalue">提交</el-button>-->
+                        <el-button type="primary" @click="EditonSubmitvalue">提交</el-button>
                     </div>
                 </template>
             </el-dialog>
@@ -182,13 +168,10 @@ import {
     enumTreeQuery,
     enumTypeAdd,
     enumValueAdd,
-    enumValueDelete
+    enumValueDelete, enumValuepageEdit
 } from "/@/api/backend/Enumeration/request";
 
 
-
-
-
 const activeName = ref('1')
 interface Tree {
     enumId: number,
@@ -260,7 +243,6 @@ const handleNodeClick = (data: any) => {
     queryListData.description=queryName.value,
     queryListData.pageNum=currentPage.value,
     queryListData.pageSize=currentPageSize.value
-    console.log(queryListData)
     queryenumValueMethod(queryListData)
 }
 
@@ -385,13 +367,6 @@ const queryenumValueMethod = (data: any) => {
 const onSubmitvalue = () => {
     formRef.value.validate((valid: any) => {
         if (valid) {
-            if(formInlineValue.isActive==true){
-                formInlineValue.isActive=1
-            }else{
-                formInlineValue.isActive=0
-            }
-
-            console.log(formInlineValue)
             enumValueAdd(formInlineValue).then((res: any) => {
                 if (res.code == 200) {
                     queryListData.description =queryName.value
@@ -459,40 +434,66 @@ const dialogVisibleDelete1 = (done: () => void) => {
         }
     })
 }
-// 菜单修改
+// 编辑枚举值
 const fromUpDate = reactive({
     id: '',
     enumTypeId: '',
     value:'',
     description : '',
     orderNumber: 0,
-    isActive: false
+    isActive: 0
 })
+const addhandleSwitchChange = (value: any) => {
+    formInlineValue.isActive = value ? 1 : 0
+}
+const edithandleSwitchChange = (value: any) => {
+    fromUpDate.isActive = value ? 1 : 0
+}
 const visibleValueEdit = ref(false)
 const enumValueEdit = (data: any) => {
     visibleValueEdit.value = true
     fromUpDate.id = data.row.id
-    fromUpDate.enumTypeId = data.row.enumTypeId
+    fromUpDate.enumTypeId = data.row.enumTypeIdStr
     fromUpDate.value = data.row.value
     fromUpDate.description = data.row.description
     fromUpDate.orderNumber = data.row.orderNumber
-    if(data.row.isActive==1){
-        fromUpDate.isActive = true
-    }else{
-        fromUpDate.isActive = false
-    }
+    fromUpDate.isActive = data.row.isActive
+
 
 }
+
 const edithandleClosevalue = (done: () => void) => {
     visibleValueEdit.value = false
 }
+const EditonSubmitvalue = () => {
+    formRef.value.validate((valid: any) => {
+        if (valid) {
+            enumValuepageEdit(fromUpDate).then((res: any) => {
+                if (res.code == 200) {
+                    queryListData.description =queryName.value
+                    queryListData.enumTypeId = enumTypeId.value
+                    queryListData.pageNum=currentPage.value,
+                        queryListData.pageSize=currentPageSize.value
+                    queryenumValueMethod(queryListData)
+                    ElMessage({
+                        message: res.msg,
+                        type: 'success',
+                    })
+                } else {
+                    ElMessage.error({
+                        message: res.msg,
+                        type: 'error',
+                    })
+                }
+            })
+
+            visibleValueEdit.value = false
+        }
+    })
+}
 
 onMounted(() => {
     enumTreeTypeList()
-    const firstNode = TypeTree.value.store.root.childNodes[0];
-    /*if (firstNode) {
-        handleNodeClick(firstNode.data, null, TypeTree.value);
-    }*/
 })
 </script>
 
diff --git a/ui/dasadmin/src/views/backend/auth/model/index.vue b/ui/dasadmin/src/views/backend/auth/model/index.vue
index bb831216..9fdcedd6 100644
--- a/ui/dasadmin/src/views/backend/auth/model/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/model/index.vue
@@ -11,7 +11,7 @@
                 </el-form-item>
                 <el-form-item prop="iotModelCode" :label="ModelFieldsEnums['iotModelCode']">
                     <el-input
-                        :disabled="modelDialogState === ModelDialogTitleStateType['detail']"
+                        :disabled="!(modelDialogState === ModelDialogTitleStateType['add'])"
                         v-model="modelForm.iotModelCode"
                         :placeholder="'请输入' + ModelFieldsEnums['iotModelCode']"
                     ></el-input>
@@ -960,7 +960,7 @@ const downLoadModel = () => {
 }
 
 const currentPage = ref(1)
-const currentPageSize = ref(10)
+const currentPageSize = ref(20)
 const pageTotal = ref(0)
 const pagePagination = ref([10, 20, 30])
 const getcurrentPage = () => {
diff --git a/ui/dasadmin/src/views/backend/auth/org/index.vue b/ui/dasadmin/src/views/backend/auth/org/index.vue
index b4f947bb..6548119b 100644
--- a/ui/dasadmin/src/views/backend/auth/org/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/org/index.vue
@@ -379,9 +379,9 @@ const getInstitutionList = (data: getDataType = { name: null }) => {
     })
 }
 
-const pagePagination = [5, 10, 20, 30]
+const pagePagination = [ 10, 20, 30]
 const currentPage = ref(1)
-const currentPageSize = ref(pagePagination[0])
+const currentPageSize = ref(pagePagination[1])
 const pageTotal = ref(0)
 const originData = ref<getTreeDataReturnType[]>()
 const tableData = computed(() => {
diff --git a/ui/dasadmin/src/views/backend/auth/role/index.vue b/ui/dasadmin/src/views/backend/auth/role/index.vue
index c9442f74..9c71a9ce 100644
--- a/ui/dasadmin/src/views/backend/auth/role/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/role/index.vue
@@ -203,9 +203,9 @@ const tableData = computed(() => {
     return originData.value?.slice(start, end)
 })
 
-const pagePagination = [5, 10, 20, 30]
+const pagePagination = [10, 20, 30]
 const currentPage = ref(1)
-const currentPageSize = ref(pagePagination[0])
+const currentPageSize = ref(pagePagination[1])
 const pageTotal = ref(0)
 const originData = ref<tableDataType<authorityDataListType>[]>()
 const addClick = () => {
diff --git a/ui/dasadmin/src/views/backend/auth/user/index.vue b/ui/dasadmin/src/views/backend/auth/user/index.vue
index c26c7d44..4e0e44cf 100644
--- a/ui/dasadmin/src/views/backend/auth/user/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/user/index.vue
@@ -546,9 +546,9 @@ const selectUpdataName = (data: string) => {
     formUserUpData.profilePicture = data
 }
 // 分页
-const pagePagination = [5, 10, 20, 30]
+const pagePagination = [ 10, 20, 30]
 const currentPage = ref(1)
-const currentPageSize = ref(pagePagination[0])
+const currentPageSize = ref(pagePagination[1])
 const handleSizeChange = (val: number) => {
     formQuery.pageSize = val
     RyUserQuery(formQuery)
diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index d50d1ea9..446a31c4 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -1,180 +1,301 @@
 <template>
     <div class="default-main">
-        <div class="banner">
-            <el-row :gutter="10">
-                <el-col :md="24" :lg="18">
-                    <div class="welcome suspension">
-                        <img class="welcome-img" :src="headerSvg" alt="" />
-                        <div class="welcome-text">
-                            <div class="welcome-title">{{ adminInfo.nickname + t('utils.comma') + getGreet() }}</div>
-                            <div class="welcome-note">{{ state.remark }}</div>
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :lg="6" class="hidden-md-and-down">
-                    <div class="working">
-                        <img class="working-coffee" :src="coffeeSvg" alt="" />
-                        <div class="working-text">
-                            {{ t('dashboard.You have worked today') }}<span class="time">{{ state.workingTimeFormat }}</span>
-                        </div>
-                        <div @click="onChangeWorkState()" class="working-opt working-rest">
-                            {{ state.pauseWork ? t('dashboard.Continue to work') : t('dashboard.have a bit of rest') }}
-                        </div>
-                    </div>
-                </el-col>
-            </el-row>
-        </div>
-        <div class="small-panel-box">
-            <el-row :gutter="20">
-                <el-col :sm="12" :lg="6">
-                    <div class="small-panel user-reg suspension">
-                        <div class="small-panel-title">{{ t('dashboard.Member registration') }}</div>
-                        <div class="small-panel-content">
-                            <div class="content-left">
-                                <Icon color="#8595F4" size="20" name="fa fa-line-chart" />
-                                <span id="user_reg_number">5456</span>
-                            </div>
-                            <div class="content-right">+14%</div>
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :sm="12" :lg="6">
-                    <div class="small-panel file suspension">
-                        <div class="small-panel-title">{{ t('dashboard.Number of attachments Uploaded') }}</div>
-                        <div class="small-panel-content">
-                            <div class="content-left">
-                                <Icon color="#AD85F4" size="20" name="fa fa-file-text" />
-                                <span id="file_number">1234</span>
-                            </div>
-                            <div class="content-right">+50%</div>
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :sm="12" :lg="6">
-                    <div class="small-panel users suspension">
-                        <div class="small-panel-title">{{ t('dashboard.Total number of members') }}</div>
-                        <div class="small-panel-content">
-                            <div class="content-left">
-                                <Icon color="#74A8B5" size="20" name="fa fa-users" />
-                                <span id="users_number">9486</span>
-                            </div>
-                            <div class="content-right">+28%</div>
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :sm="12" :lg="6">
-                    <div class="small-panel addons suspension">
-                        <div class="small-panel-title">{{ t('dashboard.Number of installed plug-ins') }}</div>
-                        <div class="small-panel-content">
-                            <div class="content-left">
-                                <Icon color="#F48595" size="20" name="fa fa-object-group" />
-                                <span id="addons_number">875</span>
-                            </div>
-                            <div class="content-right">+88%</div>
-                        </div>
-                    </div>
-                </el-col>
-            </el-row>
-        </div>
-        <div class="growth-chart">
-            <el-row :gutter="20">
-                <el-col class="lg-mb-20" :xs="24" :sm="24" :md="12" :lg="9">
-                    <el-card shadow="hover" :header="t('dashboard.Membership growth')">
-                        <div class="user-growth-chart" :ref="chartRefs.set"></div>
-                    </el-card>
-                </el-col>
-                <el-col class="lg-mb-20" :xs="24" :sm="24" :md="12" :lg="9">
-                    <el-card shadow="hover" :header="t('dashboard.Annex growth')">
-                        <div class="file-growth-chart" :ref="chartRefs.set"></div>
-                    </el-card>
-                </el-col>
-                <el-col :xs="24" :sm="24" :md="24" :lg="6">
-                    <el-card class="new-user-card" shadow="hover" :header="t('dashboard.New member')">
-                        <div class="new-user-growth">
-                            <el-scrollbar>
-                                <div class="new-user-item">
-                                    <img class="new-user-avatar" src="~assets/login-header.png" alt="" />
-                                    <div class="new-user-base">
-                                        <div class="new-user-name">妙码生花</div>
-                                        <div class="new-user-time">12分钟前{{ t('dashboard.Joined us') }}</div>
+        <el-row :gutter="20">
+            <el-col :span="6">
+                <div class="grid-content ep-bg-purple">
+                    <!--风场概览-->
+                    <div class="overview panelBg">
+                        <el-text class="mx-1 homelabel">风场概览</el-text>
+                        <el-row :gutter="10">
+                            <el-col :span="12">
+                                <div :sm="12" :lg="6" class="small-panel" style="margin-bottom: 10px;">
+                                    <img class="small-panel-pic" src="~assets/dashboard/viewP.png" alt="">
+                                    <div class="small-base">
+                                        <div><span class="content-number">{{overviewData.power}}</span> <span>MW</span></div>
+                                        <div>功率</div>
                                     </div>
-                                    <Icon class="new-user-arrow" color="#8595F4" name="fa fa-angle-right" />
                                 </div>
-                                <div class="new-user-item">
-                                    <img class="new-user-avatar" src="~assets/login-header.png" alt="" />
-                                    <div class="new-user-base">
-                                        <div class="new-user-name">码上生花</div>
-                                        <div class="new-user-time">12分钟前{{ t('dashboard.Joined us') }}</div>
+                                <div :sm="12" :lg="6" class="small-panel">
+                                    <img class="small-panel-pic" src="~assets/dashboard/viewW.png" alt="">
+                                    <div class="small-base">
+                                        <div><span class="content-number">{{overviewData.windSpeed}}</span> <span>m/s</span></div>
+                                        <div>风速</div>
                                     </div>
-                                    <Icon class="new-user-arrow" color="#8595F4" name="fa fa-angle-right" />
                                 </div>
-                                <div class="new-user-item">
-                                    <img class="new-user-avatar" src="~assets/login-header.png" alt="" />
-                                    <div class="new-user-base">
-                                        <div class="new-user-name">Admin</div>
-                                        <div class="new-user-time">12分钟前{{ t('dashboard.Joined us') }}</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div :sm="12" :lg="6" class="small-panel" style="margin-bottom: 10px;">
+                                    <img class="small-panel-pic" src="~assets/dashboard/viewR.png" alt="">
+                                    <div class="small-base">
+                                        <div><span class="content-number">{{overviewData.dailyUsageHours}}</span> <span>H</span></div>
+                                        <div>日利用小时</div>
                                     </div>
-                                    <Icon class="new-user-arrow" color="#8595F4" name="fa fa-angle-right" />
                                 </div>
-                                <div class="new-user-item">
-                                    <img class="new-user-avatar" :src="fullUrl('/static/images/avatar.png')" alt="" />
-                                    <div class="new-user-base">
-                                        <div class="new-user-name">纯属虚构</div>
-                                        <div class="new-user-time">12分钟前{{ t('dashboard.Joined us') }}</div>
+                                <div :sm="12" :lg="6" class="small-panel">
+                                    <img class="small-panel-pic" src="~assets/dashboard/viewY.png" alt="">
+                                    <div class="small-base">
+                                        <div><span class="content-number">{{overviewData.monthlyUsageHours}}</span> <span>H</span></div>
+                                        <div>月利用小时</div>
                                     </div>
-                                    <Icon class="new-user-arrow" color="#8595F4" name="fa fa-angle-right" />
                                 </div>
-                            </el-scrollbar>
-                        </div>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </div>
+                            </el-col>
+                        </el-row>
+                    </div>
 
-        <div class="growth-chart">
-            <el-row :gutter="20">
-                <el-col class="lg-mb-20" :xs="24" :sm="24" :md="24" :lg="12">
-                    <el-card shadow="hover" :header="t('dashboard.Member source')">
-                        <div class="user-source-chart" :ref="chartRefs.set"></div>
-                    </el-card>
-                </el-col>
-                <el-col class="lg-mb-20" :xs="24" :sm="24" :md="24" :lg="12">
-                    <el-card shadow="hover" :header="t('dashboard.Member last name')">
-                        <div class="user-surname-chart" :ref="chartRefs.set"></div>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </div>
+                    <!--今日运行状态-->
+                    <div class="status panelBg">
+                        <el-text class="mx-1 homelabel">今日运行状态</el-text>
+                        <el-row :gutter="10" class="statusrow">
+                            <el-col :span="12">
+                                <div class="status-panel">
+                                    <img class="status-panel-pic" src="~assets/dashboard/status1.png" alt="">
+                                    <div class="status-base">
+                                        <div><span class="content-number">{{currentDayStatus.windTurbineNum}}</span> <span>台</span></div>
+                                        <div>风机台数</div>
+                                    </div>
+                                </div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div class="status-panel">
+                                    <img class="status-panel-pic" src="~assets/dashboard/status2.png" alt="">
+                                    <div class="status-base">
+                                        <div><span class="content-number">{{currentDayStatus.installedCapacity}}</span> <span>MW</span></div>
+                                        <div>装机容量</div>
+                                    </div>
+                                </div>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="10" class="statusrow">
+                            <el-col :span="12">
+                                <div class="status-panel status-con">
+                                    <div>
+                                        <img class="status-panel-piczt" src="~assets/dashboard/run.png" alt="">
+                                        <p>运行</p>
+                                    </div>
+
+                                    <div class="status-base">
+                                        <div><span>容量</span> <span class="content-number">{{currentDayStatus.runCapacity}}</span> <span>MW</span></div>
+                                        <div><span>台数</span> <span class="content-number">{{currentDayStatus.runNum}}</span> <span>台</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div class="status-panel status-con">
+                                    <div>
+                                        <img class="status-panel-piczt" src="~assets/dashboard/Standby.png" alt="">
+                                        <p>待机</p>
+                                    </div>
+                                    <div class="status-base">
+                                        <div><span>容量</span> <span class="content-number">{{currentDayStatus.standbyCapacity}}</span> <span>MW</span></div>
+                                        <div><span>台数</span> <span class="content-number">{{currentDayStatus.standbyNum}}</span> <span>台</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="10">
+                            <el-col :span="12">
+                                <div class="status-panel status-con">
+                                    <div>
+                                        <img class="status-panel-piczt" src="~assets/dashboard/fault.png" alt="">
+                                        <p>故障</p>
+                                    </div>
+
+                                    <div class="status-base">
+                                        <div><span>容量</span> <span class="content-number">{{currentDayStatus.faultCapacity}}</span> <span>MW</span></div>
+                                        <div><span>台数</span> <span class="content-number">{{currentDayStatus.faultNum}}</span> <span>台</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div class="status-panel status-con">
+                                    <div>
+                                        <img class="status-panel-piczt" src="~assets/dashboard/offline.png" alt="">
+                                        <p>离线</p>
+                                    </div>
+
+                                    <div class="status-base">
+                                        <div><span>容量</span> <span class="content-number">{{currentDayStatus.offlineCapacity}}</span> <span>MW</span></div>
+                                        <div><span>台数</span> <span class="content-number">{{currentDayStatus.offlineNum}}</span> <span>台</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                        </el-row>
+                    </div>
+
+                    <!--功率趋势-->
+                    <div class="power panelBg" style="margin-bottom: 0;">
+                        <el-text class="mx-1 homelabel">功率趋势</el-text>
+                        <el-row :gutter="10">
+                            <el-col class="lg-mb-20" :span="24">
+                                <div class="power-chart" :ref="chartRefs.set"></div>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </div>
+            </el-col>
+
+
+            <el-col :span="12">
+                <div class="grid-content ep-bg-purple-light">
+                    <!--风机矩阵-->
+                    <div class="matrix panelBg">
+                        <el-text class="mx-1 homelabel">风机矩阵</el-text>
+                        <WindContent></WindContent>
+                    </div>
+                </div>
+            </el-col>
+            <el-col :span="6">
+                <div class="grid-content ep-bg-purple">
+                    <!--发电量概况-->
+                    <div class="summarize panelBg">
+                        <div class="summarize-title">
+                            <el-text class="mx-1 homelabel">发电量概况</el-text>
+                            <el-text class="mx-1" style="margin-bottom: 20px;">
+                                当日发电量
+                                <span class="content-number" style="color: #0277B3;">{{generationOverview.dailyGeneration}}</span>
+                                kWh
+                            </el-text>
+                        </div>
+                        <el-row :gutter="5">
+                            <el-col :span="6">
+                                <div class="summarize-panel">
+                                    <div class="summarize-panel-pic">
+                                        <img src="~assets/dashboard/fdl1.png" alt="">
+                                    </div>
+                                    <div class="summarize-panel-base">
+                                        <div><span class="content-number">{{generationOverview.dayGeneration}}</span></div>
+                                        <div><span>kWh</span></div>
+                                        <div><span>日发电量</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                            <el-col :span="6">
+                                <div class="summarize-panel">
+                                    <div class="summarize-panel-pic">
+                                        <img src="~assets/dashboard/fdl2.png" alt="">
+                                    </div>
+                                    <div class="summarize-panel-base">
+                                        <div><span class="content-number">{{generationOverview.monthGeneration}}</span></div>
+                                        <div><span>万kWh</span></div>
+                                        <div><span>月发电量</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                            <el-col :span="6">
+                                <div class="summarize-panel">
+                                    <div class="summarize-panel-pic">
+                                        <img src="~assets/dashboard/fdl3.png" alt="">
+                                    </div>
+                                    <div class="summarize-panel-base">
+                                        <div><span class="content-number">{{generationOverview.yearGeneration}}</span></div>
+                                        <div><span>万kWh</span></div>
+                                        <div><span>年发电量</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                            <el-col :span="6">
+                                <div class="summarize-panel">
+                                    <div class="summarize-panel-pic">
+                                        <img src="~assets/dashboard/fdl4.png" alt="">
+                                    </div>
+                                    <div class="summarize-panel-base">
+                                        <div><span class="content-number">{{generationOverview.totalGeneration}}</span></div>
+                                        <div><span>万kWh</span></div>
+                                        <div><span>总发电量</span></div>
+                                    </div>
+                                </div>
+                            </el-col>
+                        </el-row>
+                    </div>
+
+                    <!--发电量趋势-->
+                    <div class="trend panelBg">
+                        <el-text class="mx-1 homelabel">发电量趋势</el-text>
+                        <el-row :gutter="10">
+                            <el-col :span="24">
+                                <el-tabs v-model="activeName" class="demo-tabs trend-tabs" @tab-click="tabhandleClick" ref="userTab">
+                                    <el-tab-pane label="日" name="first">
+                                        <div class="trend-chart" :ref="chartRefs.set"></div>
+                                    </el-tab-pane>
+                                    <el-tab-pane label="月" name="second">
+                                        <div class="trend-chart" :ref="chartRefs.set"></div>
+                                    </el-tab-pane>
+                                </el-tabs>
+                            </el-col>
+                        </el-row>
+                    </div>
+
+                    <!--实时告警-->
+                    <div class="trend panelBg" style="margin-bottom: 0;">
+                        <el-text class="mx-1 homelabel">实时告警</el-text>
+                        <el-row :gutter="10">
+                            <el-col :span="24">
+                                <el-table :data="tableData"
+                                          class="tablePart"
+                                          height="250"
+                                          ref="myTable"
+                                          @mouseover.native="clearScroll"
+                                          @mouseleave.native="createScroll">
+                                    <el-table-column fixed prop="time" label="时间" />
+                                    <el-table-column prop="name" label="风机" />
+                                    <el-table-column prop="alertcontent" label="告警内容" />
+                                    <el-table-column label="操作">
+                                        <template #default="scope">
+                                            <a @click="">确认</a>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
     </div>
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, reactive, nextTick, onActivated, watch, onBeforeMount } from 'vue'
-import headerSvg from '/@/assets/dashboard/header-1.svg'
-import coffeeSvg from '/@/assets/dashboard/coffee.svg'
-import { CountUp } from 'countup.js'
+import {nextTick, onActivated, onMounted, reactive, ref,onBeforeMount} from "vue";
 import * as echarts from 'echarts'
-import { useNavTabs } from '/@/stores/navTabs'
-import { useTemplateRefsList } from '@vueuse/core'
-import { index } from '/@/api/backend/dashboard'
-import { useI18n } from 'vue-i18n'
-import { Local } from '/@/utils/storage'
-import { useAdminInfo } from '/@/stores/adminInfo'
-import { WORKING_TIME } from '/@/stores/constant/cacheKey'
-import { fullUrl, getGreet } from '/@/utils/common'
-import { useEventListener } from '@vueuse/core'
-let workTimer: number
+import { useTemplateRefsList,useEventListener } from '@vueuse/core'
+import {useI18n} from "vue-i18n";
+import WindContent from '/@/views/backend/home/windMatrix.vue'
+
 
-defineOptions({
-    name: 'dashboard',
-})
 
 const d = new Date()
 const { t } = useI18n()
-const navTabs = useNavTabs()
-const adminInfo = useAdminInfo()
-const chartRefs = useTemplateRefsList<HTMLDivElement>()
+let timer = null
+let myTable = ref(null)
 
+const overviewData=ref({
+    "power": 56.2,
+    "windSpeed": 45.3,
+    "dailyUsageHours": 20,
+    "monthlyUsageHours": 78
+})
+
+const currentDayStatus=ref({
+    "windTurbineNum": 40,
+    "installedCapacity": 45.32,
+    "runCapacity": 20.2,
+    "runNum": 78,
+    "standbyCapacity": 63.2,
+    "standbyNum": 35,
+    "faultCapacity": 56.4,
+    "faultNum": 53,
+    "offlineCapacity": 16.4,
+    "offlineNum": 20
+})
+
+const generationOverview=ref({
+    "dailyGeneration": 63.2,
+    "dayGeneration": 56.2,
+    "monthGeneration": 60.2,
+    "yearGeneration": 200.6,
+    "totalGeneration": 500.6
+})
+const chartRefs = useTemplateRefsList<HTMLDivElement>()
 const state: {
     charts: any[]
     remark: string
@@ -186,306 +307,307 @@ const state: {
     workingTimeFormat: '',
     pauseWork: false,
 })
+const powerChartData =  [
+    {
+        "power": 12.6,
+        "windSpeed": 56.3,
+        "dataTime": "2024-10-17 00:00:00"
+    },
+    {
+        "power": 10.6,
+        "windSpeed": 16.3,
+        "dataTime": "2024-10-17 00:05:00"
+    }
+]
+const initpowerChart = () => {
+    const initpowerChart = echarts.init(chartRefs.value[0] as HTMLElement)
+    const xAxisdata=[];
+    const powerData=[];
+    const windSpeedData=[]
+    powerChartData.forEach((item, index) => {
+        const dataTime=item.dataTime
+        const dataTimearr=dataTime.split(' ')
+        xAxisdata.push(dataTimearr[1])
+        powerData.push(item.power)
+        windSpeedData.push(item.windSpeed)
+        const option = {
+            grid: {
+                top: 50,
+                right: 10,
+                bottom: 20,
+                left: 10,
+                containLabel:true
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    type: 'shadow'
+                }
+            },
+            xAxis: {
+                type: 'category',
+                axisLine:{
+                    show:true,
+                    lineStyle: {
+                        color: '#dadada',
+                        width: 1,
+                        type: "solid"
+                    }
+                },
+                axisLabel: {//x轴文字的配置
+                    show: true,
+                    textStyle: {
+                        color: '#4E5969',
+                    },
+                    interval: 0,
+                    //rotate: 45
+                },
+                splitLine: {//分割线配置
+                    show:false,
+                    lineStyle: {
+                        color: '#999999',
+                    }
+                },
+                data: xAxisdata,
+            },
+            yAxis: [
+                {
+                    type: 'value',
+                    name: '功率MW',
+                    nameTextStyle:{
+                        color: '#4E5969',
+                    },
+                    axisLine:{
+                        show:false,
+                        lineStyle: {
+                            color: "#dadada",
+                            width: 0,
+                            type: "solid"
+                        }
+                    },
+                    axisLabel: {//x轴文字的配置
+                        show: true,
+                        textStyle: {
+                            color: '#4E5969',
+                        }
+                    },
+                    axisTick:{show:false},
+                    splitLine: {
+                        interval: 50,
+                        lineStyle: {
+                            type: 'dashed',
+                            color: '#dadada',
+                        }
+                    }
+                },
+                {
+                    type: 'value',
+                    name: '风速m/s',
+                    nameTextStyle:{
+                        color: '#4E5969',
+                    },
+                    axisLine:{
+                        show:false,
+                        lineStyle: {
+                            color: "#dadada",
+                            width: 0,
+                            type: "solid"
+                        }
+                    },
+                    axisLabel: {//x轴文字的配置
+                        show: true,
+                        textStyle: {
+                            color: '#4E5969',
+                        }
+                    },
+                    axisTick:{show:false},
+                    splitLine: {
+                        interval: 50,
+                        lineStyle: {
+                            type: 'dashed',
+                            color: '#dadada',
+                        }
+                    },
 
-index().then((res) => {
-    state.remark = res.data.remark
-})
+                }
+            ],
+            legend: {
+                data: ['功率','风速'],
+                textStyle: {
+                    color: '#73767a'
+                },
+            },
+            series:[
+                {
+                    name: '功率',
+                    type: 'bar',
+                    barWidth: 20,
+                    itemStyle: {
+                        color: '#00A7EB',
+                        barBorderRadius: 2
+                    },
+                    data: powerData
 
-const countUpFun = (id: string) => {
-    nextTick(() => {
-        let value = document.getElementById(id)?.innerText
-        if (value) {
-            new CountUp(id, parseInt(value), {
-                startVal: 0,
-                duration: 3,
-            }).start()
+                },{
+                    name: '风速',
+                    type: 'line',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#FF7E00',
+                        barBorderRadius: 2
+                    },
+                    areaStyle: {
+                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                            {
+                                offset: 0,
+                                color: 'rgba(255,126,0,0.8)'
+                            }
+                        ])
+                    },
+                    data: windSpeedData
+                }
+            ]
         }
+        initpowerChart.setOption(option)
+        state.charts.push(initpowerChart)
+    });
+
+}
+
+const TrendData=[
+    {
+        "currentPeriod": 56.3,
+        "samePeriod": 63.5,
+        "generationTime": "2024-10-01"
+    },
+    {
+        "currentPeriod": 66.3,
+        "samePeriod": 73.5,
+        "generationTime": "2024-10-02"
+    },
+    {
+        "currentPeriod": 66.3,
+        "samePeriod": 73.5,
+        "generationTime": "2024-10-03"
+    }
+]
+const timeType="日"
+
+const inittrendChart = (t,u) => {
+    const currentPeriod=[];
+    const samePeriod=[]
+    const xAxisdata=[]
+    TrendData.forEach((item, index) => {
+        const generationTime=item.generationTime
+        const generationTimearr=generationTime.split('-')
+        xAxisdata.push(generationTimearr[2])
+        currentPeriod.push(item.currentPeriod)
+        samePeriod.push(item.samePeriod)
+
+        const inittrendChart = echarts.init(chartRefs.value[u] as HTMLElement)
+        const option = {
+            grid: {
+                top: 30,
+                right: 10,
+                bottom: 20,
+                left: 25,
+                borderColor:'#dadada'
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    type: 'shadow'
+                }
+            },
+            xAxis: {
+                type: 'category',
+                axisLine:{
+                    show:true,
+                    lineStyle: {
+                        color: '#dadada',
+                        width: 1,
+                        type: "solid"
+                    }
+                },
+                axisLabel: {//x轴文字的配置
+                    show: true,
+                    textStyle: {
+                        color: '#4E5969',
+                    }
+                },
+                splitLine: {//分割线配置
+                    show:false,
+                    lineStyle: {
+                        color: '#999999',
+                    }
+                },
+                data: xAxisdata,
+            },
+            yAxis: [
+                {
+                    type: 'value',
+                    name: 'kWh',
+                    nameTextStyle:{
+                        color: '#4E5969',
+                    },
+                    axisLine:{
+                        show:false,
+                        lineStyle: {
+                            color: "#dadada",
+                            width: 0,
+                            type: "solid"
+                        }
+                    },
+                    axisLabel: {//x轴文字的配置
+                        show: true,
+                        textStyle: {
+                            color: '#4E5969',
+                        }
+                    },
+                    axisTick:{show:false},
+                    splitLine: {
+                        interval: 50,
+                        lineStyle: {
+                            type: 'dashed',
+                            color: '#dadada',
+                        }
+                    }
+                },
+
+            ],
+            legend: {
+                data: ['本期','同期'],
+                textStyle: {
+                    color: '#73767a',
+                },
+            },
+            series:
+                [
+                {
+                    name: '本期',
+                    data: currentPeriod,
+                    type: 'bar',
+                    smooth: true,
+                    itemStyle: {
+                        color: '#0277B3'
+                    }
+                },{
+                    name: '同期',
+                    data: samePeriod,
+                    type: 'bar',
+                    smooth: true,
+                    itemStyle: {
+                        color: '#00A096'
+                    }
+                },
+
+            ],
+        }
+        inittrendChart.setOption(option)
+        state.charts.push(inittrendChart)
     })
 }
 
-const initCountUp = () => {
-    countUpFun('user_reg_number')
-    countUpFun('file_number')
-    countUpFun('users_number')
-    countUpFun('addons_number')
-}
-
-const initUserGrowthChart = () => {
-    const userGrowthChart = echarts.init(chartRefs.value[0] as HTMLElement)
-    const option = {
-        grid: {
-            top: 0,
-            right: 0,
-            bottom: 20,
-            left: 0,
-        },
-        xAxis: {
-            data: [
-                t('dashboard.Monday'),
-                t('dashboard.Tuesday'),
-                t('dashboard.Wednesday'),
-                t('dashboard.Thursday'),
-                t('dashboard.Friday'),
-                t('dashboard.Saturday'),
-                t('dashboard.Sunday'),
-            ],
-        },
-        yAxis: {},
-        legend: {
-            data: [t('dashboard.Visits'), t('dashboard.Registration volume')],
-            textStyle: {
-                color: '#73767a',
-            },
-        },
-        series: [
-            {
-                name: t('dashboard.Visits'),
-                data: [100, 160, 280, 230, 190, 200, 480],
-                type: 'line',
-                smooth: true,
-                areaStyle: {
-                    color: '#8595F4',
-                },
-            },
-            {
-                name: t('dashboard.Registration volume'),
-                data: [45, 180, 146, 99, 210, 127, 288],
-                type: 'line',
-                smooth: true,
-                areaStyle: {
-                    color: '#F48595',
-                    opacity: 0.5,
-                },
-            },
-        ],
-    }
-    userGrowthChart.setOption(option)
-    state.charts.push(userGrowthChart)
-}
-
-const initFileGrowthChart = () => {
-    const fileGrowthChart = echarts.init(chartRefs.value[1] as HTMLElement)
-    const option = {
-        grid: {
-            top: 30,
-            right: 0,
-            bottom: 20,
-            left: 0,
-        },
-        tooltip: {
-            trigger: 'item',
-        },
-        legend: {
-            type: 'scroll',
-            bottom: 15,
-            data: (function () {
-                var list = []
-                for (var i = 1; i <= 12; i++) {
-                    list.push(i + t('dashboard.month'))
-                }
-                return list
-            })(),
-            textStyle: {
-                color: '#73767a',
-            },
-        },
-        visualMap: {
-            top: 'middle',
-            right: 10,
-            color: ['red', 'yellow'],
-            calculable: true,
-        },
-        radar: {
-            indicator: [
-                { name: t('dashboard.picture') },
-                { name: t('dashboard.file') },
-                { name: t('dashboard.table') },
-                { name: t('dashboard.Compressed package') },
-            ],
-        },
-        series: (function () {
-            var series = []
-            for (var i = 1; i <= 12; i++) {
-                series.push({
-                    type: 'radar',
-                    symbol: 'none',
-                    lineStyle: {
-                        width: 1,
-                    },
-                    emphasis: {
-                        areaStyle: {
-                            color: 'rgba(0,250,0,0.3)',
-                        },
-                    },
-                    data: [
-                        {
-                            value: [(40 - i) * 10, (38 - i) * 4 + 60, i * 5 + 10, i * 20],
-                            name: i + t('dashboard.month'),
-                        },
-                    ],
-                })
-            }
-            return series
-        })(),
-    }
-    fileGrowthChart.setOption(option)
-    state.charts.push(fileGrowthChart)
-}
-
-const initUserSourceChart = () => {
-    const UserSourceChart = echarts.init(chartRefs.value[2] as HTMLElement)
-    const pathSymbols = {
-        reindeer:
-            'path://M-22.788,24.521c2.08-0.986,3.611-3.905,4.984-5.892 c-2.686,2.782-5.047,5.884-9.102,7.312c-0.992,0.005-0.25-2.016,0.34-2.362l1.852-0.41c0.564-0.218,0.785-0.842,0.902-1.347 c2.133-0.727,4.91-4.129,6.031-6.194c1.748-0.7,4.443-0.679,5.734-2.293c1.176-1.468,0.393-3.992,1.215-6.557 c0.24-0.754,0.574-1.581,1.008-2.293c-0.611,0.011-1.348-0.061-1.959-0.608c-1.391-1.245-0.785-2.086-1.297-3.313 c1.684,0.744,2.5,2.584,4.426,2.586C-8.46,3.012-8.255,2.901-8.04,2.824c6.031-1.952,15.182-0.165,19.498-3.937 c1.15-3.933-1.24-9.846-1.229-9.938c0.008-0.062-1.314-0.004-1.803-0.258c-1.119-0.771-6.531-3.75-0.17-3.33 c0.314-0.045,0.943,0.259,1.439,0.435c-0.289-1.694-0.92-0.144-3.311-1.946c0,0-1.1-0.855-1.764-1.98 c-0.836-1.09-2.01-2.825-2.992-4.031c-1.523-2.476,1.367,0.709,1.816,1.108c1.768,1.704,1.844,3.281,3.232,3.983 c0.195,0.203,1.453,0.164,0.926-0.468c-0.525-0.632-1.367-1.278-1.775-2.341c-0.293-0.703-1.311-2.326-1.566-2.711 c-0.256-0.384-0.959-1.718-1.67-2.351c-1.047-1.187-0.268-0.902,0.521-0.07c0.789,0.834,1.537,1.821,1.672,2.023 c0.135,0.203,1.584,2.521,1.725,2.387c0.102-0.259-0.035-0.428-0.158-0.852c-0.125-0.423-0.912-2.032-0.961-2.083 c-0.357-0.852-0.566-1.908-0.598-3.333c0.4-2.375,0.648-2.486,0.549-0.705c0.014,1.143,0.031,2.215,0.602,3.247 c0.807,1.496,1.764,4.064,1.836,4.474c0.561,3.176,2.904,1.749,2.281-0.126c-0.068-0.446-0.109-2.014-0.287-2.862 c-0.18-0.849-0.219-1.688-0.113-3.056c0.066-1.389,0.232-2.055,0.277-2.299c0.285-1.023,0.4-1.088,0.408,0.135 c-0.059,0.399-0.131,1.687-0.125,2.655c0.064,0.642-0.043,1.768,0.172,2.486c0.654,1.928-0.027,3.496,1,3.514 c1.805-0.424,2.428-1.218,2.428-2.346c-0.086-0.704-0.121-0.843-0.031-1.193c0.221-0.568,0.359-0.67,0.312-0.076 c-0.055,0.287,0.031,0.533,0.082,0.794c0.264,1.197,0.912,0.114,1.283-0.782c0.15-0.238,0.539-2.154,0.545-2.522 c-0.023-0.617,0.285-0.645,0.309,0.01c0.064,0.422-0.248,2.646-0.205,2.334c-0.338,1.24-1.105,3.402-3.379,4.712 c-0.389,0.12-1.186,1.286-3.328,2.178c0,0,1.729,0.321,3.156,0.246c1.102-0.19,3.707-0.027,4.654,0.269 c1.752,0.494,1.531-0.053,4.084,0.164c2.26-0.4,2.154,2.391-1.496,3.68c-2.549,1.405-3.107,1.475-2.293,2.984 c3.484,7.906,2.865,13.183,2.193,16.466c2.41,0.271,5.732-0.62,7.301,0.725c0.506,0.333,0.648,1.866-0.457,2.86 c-4.105,2.745-9.283,7.022-13.904,7.662c-0.977-0.194,0.156-2.025,0.803-2.247l1.898-0.03c0.596-0.101,0.936-0.669,1.152-1.139 c3.16-0.404,5.045-3.775,8.246-4.818c-4.035-0.718-9.588,3.981-12.162,1.051c-5.043,1.423-11.449,1.84-15.895,1.111 c-3.105,2.687-7.934,4.021-12.115,5.866c-3.271,3.511-5.188,8.086-9.967,10.414c-0.986,0.119-0.48-1.974,0.066-2.385l1.795-0.618 C-22.995,25.682-22.849,25.035-22.788,24.521z',
-        plane: 'path://M1.112,32.559l2.998,1.205l-2.882,2.268l-2.215-0.012L1.112,32.559z M37.803,23.96 c0.158-0.838,0.5-1.509,0.961-1.904c-0.096-0.037-0.205-0.071-0.344-0.071c-0.777-0.005-2.068-0.009-3.047-0.009 c-0.633,0-1.217,0.066-1.754,0.18l2.199,1.804H37.803z M39.738,23.036c-0.111,0-0.377,0.325-0.537,0.924h1.076 C40.115,23.361,39.854,23.036,39.738,23.036z M39.934,39.867c-0.166,0-0.674,0.705-0.674,1.986s0.506,1.986,0.674,1.986 s0.672-0.705,0.672-1.986S40.102,39.867,39.934,39.867z M38.963,38.889c-0.098-0.038-0.209-0.07-0.348-0.073 c-0.082,0-0.174,0-0.268-0.001l-7.127,4.671c0.879,0.821,2.42,1.417,4.348,1.417c0.979,0,2.27-0.006,3.047-0.01 c0.139,0,0.25-0.034,0.348-0.072c-0.646-0.555-1.07-1.643-1.07-2.967C37.891,40.529,38.316,39.441,38.963,38.889z M32.713,23.96 l-12.37-10.116l-4.693-0.004c0,0,4,8.222,4.827,10.121H32.713z M59.311,32.374c-0.248,2.104-5.305,3.172-8.018,3.172H39.629 l-25.325,16.61L9.607,52.16c0,0,6.687-8.479,7.95-10.207c1.17-1.6,3.019-3.699,3.027-6.407h-2.138 c-5.839,0-13.816-3.789-18.472-5.583c-2.818-1.085-2.396-4.04-0.031-4.04h0.039l-3.299-11.371h3.617c0,0,4.352,5.696,5.846,7.5 c2,2.416,4.503,3.678,8.228,3.87h30.727c2.17,0,4.311,0.417,6.252,1.046c3.49,1.175,5.863,2.7,7.199,4.027 C59.145,31.584,59.352,32.025,59.311,32.374z M22.069,30.408c0-0.815-0.661-1.475-1.469-1.475c-0.812,0-1.471,0.66-1.471,1.475 s0.658,1.475,1.471,1.475C21.408,31.883,22.069,31.224,22.069,30.408z M27.06,30.408c0-0.815-0.656-1.478-1.466-1.478 c-0.812,0-1.471,0.662-1.471,1.478s0.658,1.477,1.471,1.477C26.404,31.885,27.06,31.224,27.06,30.408z M32.055,30.408 c0-0.815-0.66-1.475-1.469-1.475c-0.808,0-1.466,0.66-1.466,1.475s0.658,1.475,1.466,1.475 C31.398,31.883,32.055,31.224,32.055,30.408z M37.049,30.408c0-0.815-0.658-1.478-1.467-1.478c-0.812,0-1.469,0.662-1.469,1.478 s0.656,1.477,1.469,1.477C36.389,31.885,37.049,31.224,37.049,30.408z M42.039,30.408c0-0.815-0.656-1.478-1.465-1.478 c-0.811,0-1.469,0.662-1.469,1.478s0.658,1.477,1.469,1.477C41.383,31.885,42.039,31.224,42.039,30.408z M55.479,30.565 c-0.701-0.436-1.568-0.896-2.627-1.347c-0.613,0.289-1.551,0.476-2.73,0.476c-1.527,0-1.639,2.263,0.164,2.316 C52.389,32.074,54.627,31.373,55.479,30.565z',
-        rocket: 'path://M-244.396,44.399c0,0,0.47-2.931-2.427-6.512c2.819-8.221,3.21-15.709,3.21-15.709s5.795,1.383,5.795,7.325C-237.818,39.679-244.396,44.399-244.396,44.399z M-260.371,40.827c0,0-3.881-12.946-3.881-18.319c0-2.416,0.262-4.566,0.669-6.517h17.684c0.411,1.952,0.675,4.104,0.675,6.519c0,5.291-3.87,18.317-3.87,18.317H-260.371z M-254.745,18.951c-1.99,0-3.603,1.676-3.603,3.744c0,2.068,1.612,3.744,3.603,3.744c1.988,0,3.602-1.676,3.602-3.744S-252.757,18.951-254.745,18.951z M-255.521,2.228v-5.098h1.402v4.969c1.603,1.213,5.941,5.069,7.901,12.5h-17.05C-261.373,7.373-257.245,3.558-255.521,2.228zM-265.07,44.399c0,0-6.577-4.721-6.577-14.896c0-5.942,5.794-7.325,5.794-7.325s0.393,7.488,3.211,15.708C-265.539,41.469-265.07,44.399-265.07,44.399z M-252.36,45.15l-1.176-1.22L-254.789,48l-1.487-4.069l-1.019,2.116l-1.488-3.826h8.067L-252.36,45.15z',
-        train: 'path://M67.335,33.596L67.335,33.596c-0.002-1.39-1.153-3.183-3.328-4.218h-9.096v-2.07h5.371 c-4.939-2.07-11.199-4.141-14.89-4.141H19.72v12.421v5.176h38.373c4.033,0,8.457-1.035,9.142-5.176h-0.027 c0.076-0.367,0.129-0.751,0.129-1.165L67.335,33.596L67.335,33.596z M27.999,30.413h-3.105v-4.141h3.105V30.413z M35.245,30.413 h-3.104v-4.141h3.104V30.413z M42.491,30.413h-3.104v-4.141h3.104V30.413z M49.736,30.413h-3.104v-4.141h3.104V30.413z  M14.544,40.764c1.143,0,2.07-0.927,2.07-2.07V35.59V25.237c0-1.145-0.928-2.07-2.07-2.07H-9.265c-1.143,0-2.068,0.926-2.068,2.07 v10.351v3.105c0,1.144,0.926,2.07,2.068,2.07H14.544L14.544,40.764z M8.333,26.272h3.105v4.141H8.333V26.272z M1.087,26.272h3.105 v4.141H1.087V26.272z M-6.159,26.272h3.105v4.141h-3.105V26.272z M-9.265,41.798h69.352v1.035H-9.265V41.798z',
-    }
-    const option = {
-        tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-                type: 'none',
-            },
-            formatter: function (params: any) {
-                return params[0].name + ': ' + params[0].value
-            },
-        },
-        xAxis: {
-            data: [t('dashboard.Baidu'), t('dashboard.Direct access'), t('dashboard.take a plane'), t('dashboard.Take the high-speed railway')],
-            axisTick: { show: false },
-            axisLine: { show: false },
-            axisLabel: {
-                color: '#e54035',
-            },
-        },
-        yAxis: {
-            splitLine: { show: false },
-            axisTick: { show: false },
-            axisLine: { show: false },
-            axisLabel: { show: false },
-        },
-        color: ['#e54035'],
-        series: [
-            {
-                name: 'hill',
-                type: 'pictorialBar',
-                barCategoryGap: '-130%',
-                symbol: 'path://M0,10 L10,10 C5.5,10 5.5,5 5,0 C4.5,5 4.5,10 0,10 z',
-                itemStyle: {
-                    opacity: 0.5,
-                },
-                emphasis: {
-                    itemStyle: {
-                        opacity: 1,
-                    },
-                },
-                data: [123, 60, 25, 80],
-                z: 10,
-            },
-            {
-                name: 'glyph',
-                type: 'pictorialBar',
-                barGap: '-100%',
-                symbolPosition: 'end',
-                symbolSize: 50,
-                symbolOffset: [0, '-120%'],
-                data: [
-                    {
-                        value: 123,
-                        symbol: pathSymbols.reindeer,
-                        symbolSize: [60, 60],
-                    },
-                    {
-                        value: 60,
-                        symbol: pathSymbols.rocket,
-                        symbolSize: [50, 60],
-                    },
-                    {
-                        value: 25,
-                        symbol: pathSymbols.plane,
-                        symbolSize: [65, 35],
-                    },
-                    {
-                        value: 80,
-                        symbol: pathSymbols.train,
-                        symbolSize: [50, 30],
-                    },
-                ],
-            },
-        ],
-    }
-    UserSourceChart.setOption(option)
-    state.charts.push(UserSourceChart)
-}
-
-const initUserSurnameChart = () => {
-    const userSurnameChart = echarts.init(chartRefs.value[3] as HTMLElement)
-    const data = genData(50)
-    const option = {
-        tooltip: {
-            trigger: 'item',
-            formatter: '{a} <br/>{b} : {c} ({d}%)',
-        },
-        legend: {
-            type: 'scroll',
-            orient: 'vertical',
-            right: 10,
-            top: 20,
-            bottom: 20,
-            data: data.legendData,
-            textStyle: {
-                color: '#73767a',
-            },
-        },
-        series: [
-            {
-                name: t('dashboard.full name'),
-                type: 'pie',
-                radius: '55%',
-                center: ['40%', '50%'],
-                data: data.seriesData,
-                emphasis: {
-                    itemStyle: {
-                        shadowBlur: 10,
-                        shadowOffsetX: 0,
-                        shadowColor: 'rgba(0, 0, 0, 0.5)',
-                    },
-                },
-            },
-        ],
-    }
-    function genData(count: any) {
-        // prettier-ignore
-        const nameList = [
-            '赵', '钱', '孙', '李', '周', '吴', '郑', '王', '冯', '陈', '褚', '卫', '蒋', '沈', '韩', '杨', '朱', '秦', '尤', '许', '何', '吕', '施', '张', '孔', '曹', '严', '华', '金', '魏', '陶', '姜', '戚', '谢', '邹', '喻', '柏', '水', '窦', '章', '云', '苏', '潘', '葛', '奚', '范', '彭', '郎', '鲁', '韦', '昌', '马', '苗', '凤', '花', '方', '俞', '任', '袁', '柳', '酆', '鲍', '史', '唐', '费', '廉', '岑', '薛', '雷', '贺', '倪', '汤', '滕', '殷', '罗', '毕', '郝', '邬', '安', '常', '乐', '于', '时', '傅', '皮', '卞', '齐', '康', '伍', '余', '元', '卜', '顾', '孟', '平', '黄', '和', '穆', '萧', '尹', '姚', '邵', '湛', '汪', '祁', '毛', '禹', '狄', '米', '贝', '明', '臧', '计', '伏', '成', '戴', '谈', '宋', '茅', '庞', '熊', '纪', '舒', '屈', '项', '祝', '董', '梁', '杜', '阮', '蓝', '闵', '席', '季', '麻', '强', '贾', '路', '娄', '危'
-        ];
-        const legendData = []
-        const seriesData = []
-        for (var i = 0; i < count; i++) {
-            var name = Math.random() > 0.65 ? makeWord(4, 1) + '·' + makeWord(3, 0) : makeWord(2, 1)
-            legendData.push(name)
-            seriesData.push({
-                name: name,
-                value: Math.round(Math.random() * 100000),
-            })
-        }
-        return {
-            legendData: legendData,
-            seriesData: seriesData,
-        }
-        function makeWord(max: any, min: any) {
-            const nameLen = Math.ceil(Math.random() * max + min)
-            const name = []
-            for (var i = 0; i < nameLen; i++) {
-                name.push(nameList[Math.round(Math.random() * nameList.length - 1)])
-            }
-            return name.join('')
-        }
-    }
-    userSurnameChart.setOption(option)
-    state.charts.push(userSurnameChart)
-}
 
 const echartsResize = () => {
     nextTick(() => {
@@ -494,323 +616,254 @@ const echartsResize = () => {
         }
     })
 }
-
-const onChangeWorkState = () => {
-    const time = parseInt((new Date().getTime() / 1000).toString())
-    const workingTime = Local.get(WORKING_TIME)
-    if (state.pauseWork) {
-        // 继续工作
-        workingTime.pauseTime += time - workingTime.startPauseTime
-        workingTime.startPauseTime = 0
-        Local.set(WORKING_TIME, workingTime)
-        state.pauseWork = false
-        startWork()
-    } else {
-        // 暂停工作
-        workingTime.startPauseTime = time
-        Local.set(WORKING_TIME, workingTime)
-        clearInterval(workTimer)
-        state.pauseWork = true
-    }
-}
-
-const startWork = () => {
-    const workingTime = Local.get(WORKING_TIME) || { date: '', startTime: 0, pauseTime: 0, startPauseTime: 0 }
-    const currentDate = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate()
-    const time = parseInt((new Date().getTime() / 1000).toString())
-
-    if (workingTime.date != currentDate) {
-        workingTime.date = currentDate
-        workingTime.startTime = time
-        workingTime.pauseTime = workingTime.startPauseTime = 0
-        Local.set(WORKING_TIME, workingTime)
-    }
-
-    let startPauseTime = 0
-    if (workingTime.startPauseTime <= 0) {
-        state.pauseWork = false
-        startPauseTime = 0
-    } else {
-        state.pauseWork = true
-        startPauseTime = time - workingTime.startPauseTime // 已暂停时间
-    }
-
-    let workingSeconds = time - workingTime.startTime - workingTime.pauseTime - startPauseTime
-
-    state.workingTimeFormat = formatSeconds(workingSeconds)
-    if (!state.pauseWork) {
-        workTimer = window.setInterval(() => {
-            workingSeconds++
-            state.workingTimeFormat = formatSeconds(workingSeconds)
-        }, 1000)
-    }
-}
-
-const formatSeconds = (seconds: number) => {
-    var secondTime = 0 // 秒
-    var minuteTime = 0 // 分
-    var hourTime = 0 // 小时
-    var dayTime = 0 // 天
-    var result = ''
-
-    if (seconds < 60) {
-        secondTime = seconds
-    } else {
-        // 获取分钟，除以60取整数，得到整数分钟
-        minuteTime = Math.floor(seconds / 60)
-        // 获取秒数，秒数取佘，得到整数秒数
-        secondTime = Math.floor(seconds % 60)
-        // 如果分钟大于60，将分钟转换成小时
-        if (minuteTime >= 60) {
-            // 获取小时，获取分钟除以60，得到整数小时
-            hourTime = Math.floor(minuteTime / 60)
-            // 获取小时后取佘的分，获取分钟除以60取佘的分
-            minuteTime = Math.floor(minuteTime % 60)
-            if (hourTime >= 24) {
-                // 获取天数， 获取小时除以24，得到整数天
-                dayTime = Math.floor(hourTime / 24)
-                // 获取小时后取余小时，获取分钟除以24取余的分；
-                hourTime = Math.floor(hourTime % 24)
-            }
-        }
-    }
-
-    result =
-        hourTime +
-        t('dashboard.hour') +
-        ((minuteTime >= 10 ? minuteTime : '0' + minuteTime) + t('dashboard.minute')) +
-        ((secondTime >= 10 ? secondTime : '0' + secondTime) + t('dashboard.second'))
-    if (dayTime > 0) {
-        result = dayTime + t('dashboard.day') + result
-    }
-    return result
-}
-
 onActivated(() => {
     echartsResize()
 })
 
+
+const tableData = ref([
+    {
+        time: '2016-05-03',
+        name: 'SC-01',
+        alertcontent: '故障',
+    },
+    {
+        time: '2016-05-02',
+        name: 'SC-02',
+        alertcontent: '待机',
+    },
+    {
+        time: '2016-05-04',
+        name: 'SC-03',
+        alertcontent: '停机',
+    },
+    {
+        time: '2016-05-01',
+        name: 'SC-04',
+        alertcontent: '变桨叶1伺服驱动器故障',
+    },
+    {
+        time: '2016-05-03',
+        name: 'SC-01',
+        alertcontent: '故障',
+    },
+    {
+        time: '2016-05-02',
+        name: 'SC-02',
+        alertcontent: '待机',
+    },
+    {
+        time: '2016-05-04',
+        name: 'SC-03',
+        alertcontent: '停机',
+    },
+    {
+        time: '2016-05-01',
+        name: 'SC-04',
+        alertcontent: '变桨叶1伺服驱动器故障',
+    }
+])
+
+
+const clearScroll = () => {
+    clearInterval(timer)
+    timer = null
+}
+const createScroll = () => {
+    clearScroll()
+    const table = myTable.value.layout.table.refs
+    const tableWrapper = table.bodyWrapper.firstElementChild.firstElementChild
+
+    timer = setInterval(() => {
+        tableWrapper.scrollTop += 1
+        if (tableWrapper.clientHeight + tableWrapper.scrollTop == tableWrapper.scrollHeight) {
+            tableWrapper.scrollTop = 0
+        }
+    }, 30)
+}
+
+
 onMounted(() => {
-    startWork()
-    initCountUp()
-    initUserGrowthChart()
-    initFileGrowthChart()
-    initUserSourceChart()
-    initUserSurnameChart()
+    inittrendChart('日','1')
+    initpowerChart()
+    createScroll()
     useEventListener(window, 'resize', echartsResize)
 })
-
 onBeforeMount(() => {
     for (const key in state.charts) {
         state.charts[key].dispose()
     }
 })
-
-onUnmounted(() => {
-    clearInterval(workTimer)
-})
-
-watch(
-    () => navTabs.state.tabFullScreen,
-    () => {
+const activeName = ref('first')
+const tabhandleClick = (tabName) => {
+    setTimeout(() => {
         echartsResize()
+    }, 10)
+    debugger
+    if(tabName.props.label=="日"){
+        inittrendChart('日','1')
+    }else if(tabName.props.label=="月"){
+        inittrendChart('月','2')
     }
-)
+
+}
+
+
+
+
+
+
 </script>
 
 <style scoped lang="scss">
-.welcome {
-    background: #e1eaf9;
-    border-radius: 6px;
-    display: flex;
-    align-items: center;
-    padding: 15px 20px !important;
-    box-shadow: 0 0 30px 0 rgba(82, 63, 105, 0.05);
-    .welcome-img {
-        height: 100px;
-        margin-right: 10px;
-        user-select: none;
-    }
-    .welcome-title {
-        font-size: 1.5rem;
-        line-height: 30px;
-        color: var(--ba-color-primary-light);
-    }
-    .welcome-note {
-        padding-top: 6px;
-        font-size: 15px;
-        color: var(--el-text-color-primary);
-    }
-}
-.working {
-    height: 130px;
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-    height: 100%;
-    position: relative;
-    &:hover {
-        .working-coffee {
-            -webkit-transform: translateY(-4px) scale(1.02);
-            -moz-transform: translateY(-4px) scale(1.02);
-            -ms-transform: translateY(-4px) scale(1.02);
-            -o-transform: translateY(-4px) scale(1.02);
-            transform: translateY(-4px) scale(1.02);
-            z-index: 999;
-        }
-    }
-    .working-coffee {
-        transition: all 0.3s ease;
-        width: 80px;
-    }
-    .working-text {
-        display: block;
-        width: 100%;
-        font-size: 15px;
-        text-align: center;
-        color: var(--el-text-color-primary);
-    }
-    .working-opt {
-        position: absolute;
-        top: -40px;
-        right: 10px;
-        background-color: rgba($color: #000000, $alpha: 0.3);
-        padding: 10px 20px;
-        border-radius: 20px;
-        color: var(--ba-bg-color-overlay);
-        transition: all 0.3s ease;
-        cursor: pointer;
-        opacity: 0;
-        z-index: 999;
-        &:active {
-            background-color: rgba($color: #000000, $alpha: 0.6);
-        }
-    }
-    &:hover {
-        .working-opt {
-            opacity: 1;
-            top: 0;
-        }
-        .working-done {
-            opacity: 1;
-            top: 50px;
-        }
-    }
-}
-.small-panel-box {
-    margin-top: 20px;
-}
-.small-panel {
-    background-color: #e9edf2;
-    border-radius: var(--el-border-radius-base);
-    padding: 25px;
-    margin-bottom: 20px;
-    .small-panel-title {
-        color: #92969a;
-        font-size: 15px;
-    }
-    .small-panel-content {
-        display: flex;
-        align-items: flex-end;
-        margin-top: 20px;
-        color: #2c3f5d;
-        .content-left {
-            font-size: 24px;
-            .icon {
-                margin-right: 10px;
-            }
-            span {
-                display: inline-block;
-                font-size: 28px;
-            }
-        }
-        .content-right {
-            font-size: 18px;
-            margin-left: auto;
-        }
-        .color-success {
-            color: var(--el-color-success);
-        }
-        .color-warning {
-            color: var(--el-color-warning);
-        }
-        .color-danger {
-            color: var(--el-color-danger);
-        }
-        .color-info {
-            color: var(--el-text-color-secondary);
-        }
-    }
-}
-.growth-chart {
-    margin-bottom: 20px;
-}
-.user-growth-chart,
-.file-growth-chart {
-    height: 260px;
-}
-.new-user-growth {
-    height: 300px;
-}
-
-.user-source-chart,
-.user-surname-chart {
-    height: 400px;
-}
-.new-user-item {
-    display: flex;
-    align-items: center;
-    padding: 20px;
-    margin: 10px 15px;
-    box-shadow: 0 0 30px 0 rgba(82, 63, 105, 0.05);
-    background-color: var(--ba-bg-color-overlay);
-    .new-user-avatar {
-        height: 48px;
-        width: 48px;
-        border-radius: 50%;
-    }
-    .new-user-base {
-        margin-left: 10px;
-        color: #2c3f5d;
-        .new-user-name {
-            font-size: 15px;
-        }
-        .new-user-time {
-            font-size: 13px;
-        }
-    }
-    .new-user-arrow {
-        margin-left: auto;
-    }
-}
-.new-user-card :deep(.el-card__body) {
+.default-main {
     padding: 0;
-}
-
-@media screen and (max-width: 425px) {
-    .welcome-img {
-        display: none;
+    margin: 0;
+    color: #4E5969;
+    background-color: #F2F3F5;
+    .content-number{
+        color: #333333;
+        font-size: 20px;
     }
-}
-@media screen and (max-width: 1200px) {
-    .lg-mb-20 {
+    .homelabel{
+        font-family: PingFangSC-Semibold;
+        font-size: 18px;
+        color: #4E5969;
+        letter-spacing: 0;
+        line-height: 18px;
+        font-weight: 600;
         margin-bottom: 20px;
+        display: block;
     }
-}
-html.dark {
-    .welcome {
-        background-color: var(--ba-bg-color-overlay);
-    }
-    .small-panel {
-        background-color: var(--ba-bg-color-overlay);
-        .small-panel-content {
-            color: var(--el-text-color-regular);
+    .grid-content{
+        height: 100%;
+        .panelBg{
+            background-color: #ffffff;
+            padding: 20px;
+            border-radius: 5px;
+            margin-bottom: 20px;
         }
-    }
-    .new-user-item {
-        .new-user-base {
-            color: var(--el-text-color-regular);
+        .overview{
+            .small-panel{
+                display: flex;
+                border: 1px solid #E1EDF6;
+                border-radius: 10px;
+                padding: 10px;
+                .small-panel-pic{
+                    width: 36px;
+                    height: 36px;
+                }
+                .small-base{
+                    margin-left: 10px;
+                    color: #2c3f5d;
+                }
+            }
         }
+        .status{
+            .statusrow{
+                margin-bottom: 10px;
+            }
+            .status-con{
+                padding-left: 20px !important;
+                background: #F0F6FF;
+                border-radius: 10px;
+            }
+            .status-panel{
+                display: flex;
+                padding: 10px;
+                font-size: 12px;
+                .status-panel-pic{
+                    width: 60px;
+                    height: 60px;
+                }
+                .status-base{
+                    margin-left: 10px;
+                    line-height: 23px;
+                    padding-top: 6px;
+                }
+                .status-panel-piczt{
+                    width: 36px;
+                    height: 36px;
+                }
+            }
+
+        }
+        .power{
+            .power-chart{
+                width: 100%;
+                height: 300px;
+            }
+        }
+        .matrix{
+            background: url("/@/assets/dashboard/bg1.png") no-repeat #ffffff;
+            background-size: 100% 100%;
+            height: 100%;
+        }
+        .summarize{
+            .summarize-title{
+                display: flex;
+                justify-content: space-between;
+            }
+            .summarize-panel{
+                background: #F0F6FF;
+                border-radius: 10px;
+                margin: 5px;
+                padding: 10px;
+                .summarize-panel-pic{
+                    text-align: center;
+                }
+                .summarize-panel-base{
+                    text-align: center;
+                }
+
+            }
+
+        }
+        .trend{
+            height: 350px;
+            overflow: hidden;
+            .trend-tabs{
+                :deep(.el-tabs__item){
+                    border: none;
+                    text-align: center;
+                    width: 40px;
+                    padding: 0;
+                    line-height: 24px;
+                    height: 24px;
+                }
+                :deep(.el-tabs__header .el-tabs__nav){
+                    border-radius: 0;
+                    border: none;
+                }
+                :deep(.el-tabs__header){
+                    border-bottom: 0;
+                    float: right;
+                    margin-top:-43px
+                }
+                :deep(.el-tabs__content){
+                    clear: both;
+                }
+                :deep(.el-tabs__item.is-active){
+                    background: rgba(2,119,179,0.20);
+                    border-radius: 4px;
+                    border: none;
+                }
+                :deep(.el-tabs__nav-wrap:after){
+                    background: none;
+                }
+                :deep(.el-tabs__active-bar){
+                    background: none;
+                }
+
+            }
+            .trend-chart{
+                width: 100%;
+                height: 260px;
+            }
+        }
+
     }
+
+
 }
 </style>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue
new file mode 100644
index 00000000..ba81cf05
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/control.vue
@@ -0,0 +1,274 @@
+<template>
+    <div class="controlPage" v-loading="loading" element-loading-text="提交中...">
+        <h1 class="pageName">遥调遥控调试</h1>
+        <div class="control">
+            <el-form :model="serviceType147Form" :rules="validData(147)" ref="serviceType147Ref">
+                <el-row>
+                    <el-col :span="2">
+                        <div class="title">遥控</div>
+                    </el-col>
+                    <el-col :span="10">
+                        <div class="center">
+                            <el-form-item label="服务名" prop="serviceName">
+                                <el-select v-model="serviceType147Form.serviceName" placeholder="请选择服务名">
+                                    <el-option
+                                        v-for="item in deviceServiceType147List"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="7" :offset="1">
+                        <el-form-item label="设定值" prop="opValue">
+                            <el-select v-model="serviceType147Form.opValue" placeholder="请选择设定值">
+                                <el-option :value="0"></el-option>
+                                <el-option :value="1"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2" :offset="1">
+                        <el-button type="primary" @click="submit(147)">提交</el-button>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <br />
+            <el-form :model="serviceType146Form" :rules="validData(146)" ref="serviceType146Ref">
+                <el-row>
+                    <el-col :span="2">
+                        <div class="title">遥调</div>
+                    </el-col>
+                    <el-col :span="10">
+                        <div class="center">
+                            <el-form-item label="服务名" prop="serviceName">
+                                <el-select v-model="serviceType146Form.serviceName" placeholder="请选择服务名">
+                                    <el-option
+                                        v-for="item in deviceServiceType146List"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="7" :offset="1">
+                        <el-form-item label="设定值" prop="opValue">
+                            <el-input v-model="serviceType146Form.opValue" placeholder="请输入设定值"> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2" :offset="1">
+                        <el-button type="primary" @click="submit(146)">提交</el-button>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </div>
+        <div style="height: 20px"></div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { sendValueReq } from '/@/api/backend/control/request'
+import { ElMessage, FormInstance } from 'element-plus'
+import { getModelServiceListReq } from '/@/api/backend/deviceModel/request'
+
+const props = defineProps({
+    iotModelId: {
+        type: String,
+        default: '',
+    },
+    deviceId: {
+        type: String,
+        default: '',
+    },
+    show: {
+        type: Boolean,
+        default: false,
+    },
+})
+
+const loading = ref(false)
+
+const serviceType147Ref = ref<FormInstance>()
+const serviceType146Ref = ref<FormInstance>()
+const serviceType147Form = ref({
+    //节点ID
+    nodeId: '1',
+    //服务名
+    serviceName: '',
+    //操作值
+    opValue: null,
+})
+
+const serviceType146Form = ref({
+    //节点ID
+    nodeId: '1',
+    //服务名
+    serviceName: '',
+    //操作值
+    opValue: null,
+})
+
+const deviceServiceType147List = ref<any[]>([])
+const deviceServiceType146List = ref<any[]>([])
+
+const init = () => {
+    getModelServiceListReq({ iotModelId: props.iotModelId, pageNum: 1, pageSize: 100000 }).then((res) => {
+        const type147: { label: string; value: string }[] = []
+        const type146: { label: string; value: string }[] = []
+        res.rows.forEach((item) => {
+            if (item.serviceType === 147) {
+                type147.push({ label: item.serviceName, value: item.serviceCode })
+            } else if (item.serviceType === 146) {
+                type146.push({ label: item.serviceName, value: item.serviceCode })
+            }
+        })
+        deviceServiceType147List.value = type147
+        deviceServiceType146List.value = type146
+    })
+}
+
+const validData = (type: number) => {
+    if (type === 147) {
+        return {
+            serviceName: [
+                {
+                    required: true,
+                    message: '请输入服务名',
+                    trigger: 'change',
+                },
+            ],
+            opValue: [
+                {
+                    required: true,
+                    message: '请选择操作值',
+                    trigger: 'change',
+                },
+            ],
+        }
+    } else if (type === 146) {
+        return {
+            serviceName: [
+                {
+                    required: true,
+                    message: '请输入服务名',
+                    trigger: 'change',
+                },
+            ],
+            opValue: [
+                {
+                    required: true,
+                    message: '请输入操作值',
+                    trigger: 'blur',
+                },
+                {
+                    pattern: /^[0-9]+$/,
+                    message: '请输入数字',
+                    trigger: 'blur',
+                },
+            ],
+        }
+    }
+}
+const submit = (type: number) => {
+    if (type === 147) {
+        serviceType147Ref.value?.validate((valid) => {
+            if (valid) {
+                loading.value = true
+                sendValue(serviceType147Form.value)
+            }
+        })
+    } else if (type === 146) {
+        serviceType146Ref.value?.validate((valid) => {
+            if (valid) {
+                loading.value = true
+                sendValue(serviceType146Form.value)
+            }
+        })
+    }
+}
+
+const sendValue = (data: any) => {
+    const val = JSON.parse(JSON.stringify(data))
+    val.deviceId = props.deviceId
+    sendValueReq(val)
+        .then((res) => {
+            console.log(res)
+            ElMessage.success('发送成功！')
+        })
+        .catch((err) => {
+            ElMessage.error('发送失败！')
+        })
+        .finally(() => {
+            loading.value = false
+        })
+}
+
+watch(
+    () => props.deviceId,
+    () => {
+        if (props.iotModelId) {
+            init()
+        } else {
+            deviceServiceType147List.value = []
+            deviceServiceType146List.value = []
+        }
+    },
+    {
+        immediate: true,
+    }
+)
+watch(
+    () => props.show,
+    (newVal) => {
+        if (newVal) {
+            serviceType147Form.value = {
+                nodeId: '1',
+                serviceName: '',
+                opValue: null,
+            }
+            serviceType146Form.value = {
+                nodeId: '1',
+                serviceName: '',
+                opValue: null,
+            }
+            serviceType147Ref.value?.resetFields()
+            serviceType146Ref.value?.resetFields()
+        }
+    }
+)
+</script>
+
+<style scoped lang="scss">
+.controlPage {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    // justify-content: center;
+    font-size: 18px;
+    .pageName {
+        margin: 20px auto;
+        margin-bottom: 30px;
+    }
+    .control {
+        width: 100%;
+        height: 100px;
+        .title {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .el-form-item {
+            margin: 0;
+        }
+    }
+}
+</style>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index cba1ed83..16e50248 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -49,9 +49,13 @@
                         <el-table-column property="model" label="规格型号" />
                         <el-table-column property="address" label="操作">
                             <template #default="scope">
-                                <span style="color: #0064aa; cursor: pointer" @click="viewDeviceDetails(scope)">查看 </span>
+                                <span style="color: #0064aa; cursor: pointer" @click="openMeasure(scope)">量测</span>
                                 <span style="color: #0064aa"> | </span>
-                                <span style="color: #0064aa; cursor: pointer" @click="deviceDeletion(scope)"> 删除 </span>
+                                <span style="color: #0064aa; cursor: pointer" @click="openControl(scope)">调控</span>
+                                <span style="color: #0064aa"> | </span>
+                                <span style="color: #0064aa; cursor: pointer" @click="viewDeviceDetails(scope)">查看</span>
+                                <span style="color: #0064aa"> | </span>
+                                <span style="color: #0064aa; cursor: pointer" @click="deviceDeletion(scope)">删除</span>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -418,11 +422,39 @@
                 </template>
             </el-dialog>
         </el-container>
+        <el-dialog v-model="showControlPage" :width="800">
+            <div class="controlSlot">
+                <ControlPage :deviceId="contorlData.deviceId" :iotModelId="contorlData.iotModelId" :show="showControlPage"></ControlPage>
+            </div>
+        </el-dialog>
+        <el-dialog v-model="showMeasure" title="量测" :width="800">
+            <template #header>
+                <div class="measureSlotHeader">
+                    <span style="font-size: 20px">量测</span>
+                    <div class="measureSlotHeaderRight">
+                        <span>自动更新：</span>
+                        <el-switch
+                            v-model="measureData.autoUpdate"
+                            class="ml-2"
+                            style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+                        ></el-switch>
+                    </div>
+                </div>
+            </template>
+            <div class="measureSlot">
+                <MeasurementPage
+                    :show="showMeasure"
+                    :deviceId="measureData.deviceId"
+                    :iotModelId="measureData.iotModelId"
+                    :autoUpdate="measureData.autoUpdate"
+                ></MeasurementPage>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick, watch } from 'vue'
 import { Search, CirclePlusFilled, Upload, Download } from '@element-plus/icons-vue'
 import {
     equipTree,
@@ -437,9 +469,10 @@ import {
     equipDetailsOrg,
 } from '/@/api/backend'
 import { ElTable, ElMessage, ElMessageBox } from 'element-plus'
-import type Node from 'element-plus/es/components/tree/src/model/node'
 import { useAdminInfo } from '/@/stores/adminInfo'
 import { encrypt_aes, generateRandomNumber } from '/@/utils/crypto'
+import ControlPage from './control.vue'
+import MeasurementPage from './measurement.vue'
 
 const adminInfo = useAdminInfo()
 interface Tree {
@@ -615,9 +648,9 @@ const deviceTypeQuery = () => {
 }
 
 // 分页
-const pagePagination = [5, 10, 20, 30]
+const pagePagination = [10, 20, 30]
 const currentPage = ref(1)
-const currentPageSize = ref(pagePagination[0])
+const currentPageSize = ref(pagePagination[1])
 const handleSizeChange = (val: number) => {
     formQuery.pageSize = val
     deviceQuery(formQuery)
@@ -939,6 +972,43 @@ const Export = () => {
         document.body.removeChild(a)
     })
 }
+
+const showControlPage = ref(false)
+const contorlData = reactive({
+    deviceId: '',
+    iotModelId: '',
+})
+const openControl = (data: any) => {
+    contorlData.deviceId = data.row.id
+    contorlData.iotModelId = data.row.iotModelId
+    if (contorlData.iotModelId) {
+        showControlPage.value = true
+    } else {
+        ElMessage.warning('该设备没有绑定物模型！')
+    }
+}
+
+const measureData = reactive({
+    deviceId: '',
+    iotModelId: '',
+    autoUpdate: false,
+})
+const showMeasure = ref(false)
+const openMeasure = (data: any) => {
+    measureData.deviceId = data.row.id
+    measureData.iotModelId = data.row.iotModelId
+    if (measureData.iotModelId) {
+        showMeasure.value = true
+    } else {
+        ElMessage.warning('该设备没有绑定物模型！')
+    }
+}
+watch(
+    showMeasure,
+    (newVal: boolean) => {
+        !newVal && (measureData.autoUpdate = false)
+    }
+)
 </script>
 
 <style scoped lang="scss">
@@ -1030,4 +1100,10 @@ $paginationHeight: 32px;
         }
     }
 }
+.measureSlotHeader {
+    display: flex;
+    .measureSlotHeaderRight {
+        margin-left: 20px;
+    }
+}
 </style>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
new file mode 100644
index 00000000..c111b895
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
@@ -0,0 +1,233 @@
+<template>
+    <div class="measurement">
+        <el-table :columns="tableColumn" :data="tableData" @sort-change="sortChange" max-height="495">
+            <el-table-column
+                v-for="item in tableColumn"
+                :key="item.prop"
+                :label="item.label"
+                :prop="item.prop"
+                :width="item.width ?? ''"
+                :align="item.align"
+                :sortable="item.sortable"
+            >
+                <template #default="scope">
+                    <div v-if="item.prop === 'realTimeValue'">
+                        <el-button @click="openChart(scope.row)" text type="primary">{{ scope.row.realTimeValue }}</el-button>
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div>
+            <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>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ModelAttributeFieldsEnums, GetModelAttributeType } from '/@/views/backend/auth/model/type'
+import { getModelAttributeListReq, getRealValueListReq } from '/@/api/backend/deviceModel/request'
+
+const props = defineProps({
+    iotModelId: {
+        type: String,
+        default: '',
+    },
+    deviceId: {
+        type: String,
+        default: '',
+    },
+    show: {
+        type: Boolean,
+        default: false,
+    },
+    autoUpdate: {
+        type: Boolean,
+        default: false,
+    },
+})
+
+const tableColumn = [
+    {
+        label: '序号',
+        prop: 'porder',
+        width: 76,
+        align: 'center',
+        sortable:'custom'
+    },
+    {
+        label: '属性名称',
+        prop: 'attributeName',
+        align: 'left',
+        sortable:'custom'
+    },
+    {
+        label: '属性编码',
+        prop: 'attributeCode',
+        align: 'left',
+        width: 200,
+        sortable:'custom'
+    },
+    {
+        label: '子系统',
+        prop: 'subSystem',
+        align: 'left',
+        width: 110,
+        sortable:false
+    },
+    {
+        label: '实时值',
+        prop: 'realTimeValue',
+        width: 140,
+        align: 'center',
+        sortable:false
+    },
+]
+const tableData = ref<any[]>([])
+
+const getAttributeList = () => {
+    const requestData: GetModelAttributeType = {
+        iotModelId: props.iotModelId,
+        pageNum: pageSetting.current,
+        pageSize: pageSetting.pageSize,
+        orderColumn: sortData.orderColumn,
+        orderType: sortData.orderType,
+    }
+
+    return new Promise((resolve) => {
+        getModelAttributeListReq(requestData)
+            .then((res) => {
+                if (res.rows && res.rows.length > 0) {
+                    const codeList: any = []
+                    const data = res.rows!.map((item) => {
+                        codeList.push(item.attributeCode)
+                        return {
+                            ...item,
+                            attributeTypeName:
+                                item.attributeType === 138
+                                    ? '模拟量'
+                                    : item.attributeType === 139
+                                      ? '累积量'
+                                      : item.attributeType === 140
+                                        ? '离散量'
+                                        : item.attributeType!,
+                        }
+                    })
+                    pageSetting.total = res.total
+                    resolve({ data, codeList })
+                } else {
+                    if (res.rows && res.rows.length === 0) {
+                        tableData.value = []
+                    } else {
+                        ElMessage.error(res.msg)
+                    }
+                }
+            })
+            .catch((err) => {
+                ElMessage.error(err?.response?.data?.msg ?? '查询失败')
+            })
+    })
+}
+
+const getRealValueList = (data: { deviceId: string; attributes: string[] }, list?: any) => {
+    return new Promise((resolve) => {
+        getRealValueListReq([data]).then((res) => {
+            if (res.success && res.data) {
+                resolve({ realVal: res.data, list })
+            }
+        })
+    })
+}
+
+const getCompleteData = () => {
+    getAttributeList()
+        .then(({ data, codeList }: any) => {
+            return getRealValueList({ deviceId: props.deviceId, attributes: codeList }, data)
+        })
+        .then((realData: any) => {
+            const data = realData.list.map((item: any) => {
+                const realValItem = realData.realVal[props.deviceId]?.[item.attributeCode] ?? '-'
+                return {
+                    ...item,
+                    realTimeValue: realValItem % 1 === 0 ? realValItem : realValItem.toFixed(3),
+                }
+            })
+
+            tableData.value = data
+        })
+}
+
+const sortData = reactive<{ orderColumn?: keyof typeof ModelAttributeFieldsEnums; orderType?: 'asc' | 'desc' }>({
+    orderColumn: 'porder',
+    orderType: 'asc',
+})
+
+const sortChange = ({ prop, order }: { prop: keyof typeof ModelAttributeFieldsEnums; order: 'ascending' | 'descending' | null }) => {
+    const propEnums = {
+        attributeCode: 'attribute_code',
+        attributeName: 'attribute_name',
+        attributeTypeName: 'attribute_type',
+        porder: 'porder',
+        serviceCode: 'service_code',
+        serviceName: 'service_name',
+        serviceTypeName: 'service_type',
+    }
+    const orderType = order === 'ascending' ? 'asc' : order === 'descending' ? 'desc' : undefined
+    const filed = propEnums[prop as keyof typeof propEnums] as keyof typeof ModelAttributeFieldsEnums
+    sortData.orderColumn = orderType ? filed : undefined
+    sortData.orderType = orderType
+    getCompleteData()
+}
+
+const pageSetting = reactive({
+    current: 1,
+    pageSize: 20,
+    total: 0,
+    pageSizes: [10, 20, 30],
+})
+
+const getcurrentPage = () => {
+    getCompleteData()
+}
+
+const openChart = (data: any) => {}
+
+watch(
+    () => props.show,
+    (newVal) => {
+        newVal && getCompleteData()
+    },
+    {
+        immediate: true,
+    }
+)
+let autoUpdateTimer: any = null
+watch(
+    () => props.autoUpdate,
+    (newVal) => {
+        if (newVal) {
+            if (!autoUpdateTimer) {
+                autoUpdateTimer = setInterval(() => {
+                    console.log('刷新')
+                    getCompleteData()
+                }, 2000)
+            }
+        } else {
+            clearInterval(autoUpdateTimer)
+            autoUpdateTimer = null
+        }
+    }
+)
+</script>
+
+<style scoped></style>
diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue
new file mode 100644
index 00000000..7314248b
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue
@@ -0,0 +1,237 @@
+<template>
+    <div class="FanList-content">
+        <el-row :gutter="10">
+            <el-col :span="8" v-for="(item, index) in FanList" style="margin-bottom: 10px;">
+                <div class="grid-content ep-bg-purple">
+                    <div class="FanList-panel" :class="item.standard==true ? 'wind-mark' : 'wind-default'">
+                        <div class="fanlist-top">
+                            <span :class="item.standard==true ? 'wind-mark-icon' : 'fanlist-icon'">
+                                <img :class="item.standard==true ? '' : 'wind-picture'" src="~assets/dashboard/biaogan.png" alt="">
+                            </span>
+                            <span class="fanlist-name"> {{ item.windTurbine }}</span>
+                            <el-tag class="tag-panel" :class="getItemClass(item)" type="primary">{{ item.windStatus }}</el-tag>
+                        </div>
+                        <div class="fanlist-main">
+                            <el-row>
+                                <el-col :span="24">
+                                    <div class="fanlist-pic">
+<!--                                        <div class="mask">
+                                            <div class="leafs">
+                                                <div class="leaf_1"></div>
+                                                <div class="leaf_2"></div>
+                                                <div class="leaf_3"></div>
+                                            </div>
+                                        </div>-->
+                                        <img src="~assets/dashboard/fanlist1.png" alt="">
+<!--                                        <img class="fc" src="~assets/dashboard/fanlist1.png" alt=""></img>-->
+<!--                                       <img :style="{ transform: `rotate(${rotationDegrees}deg)`  }" src="~assets/dashboard/fanlist1.png" alt="">-->
+                                    </div>
+                                    <div class="fanlist-pic">
+                                        <img src="~assets/dashboard/fanlist2.png" alt="">
+                                    </div>
+                                </el-col>
+                            </el-row>
+                            <el-row class="fanlist-data">
+                                <el-col :span="8">
+                                    <div class="fanlist-text"><span class="content-number">{{ item.windSpeed }}</span><span>风速m/s</span></div>
+                                </el-col>
+                                <el-col :span="8">
+                                    <div class="fanlist-text"><span class="content-number">{{ item.power }}</span><span>功率MW</span></div>
+                                </el-col>
+                                <el-col :span="8">
+                                    <div class="fanlist-text"><span class="content-number">{{ item.dayGeneration }}</span><span>日发电量kWh</span></div>
+                                </el-col>
+                            </el-row>
+                        </div>
+
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref ,onMounted,onUnmounted } from 'vue'
+
+const FanList = ref([
+    {windSpeed:'10.34','power':'10.34','dayGeneration':'10.34',windStatus:'并网',windTurbine:'A-001',standard:true},
+    {windSpeed:'34','power':'10.34','dayGeneration':'10.34',windStatus:'待机',windTurbine:'A-002',standard:false},
+    {windSpeed:'11','power':'10.34','dayGeneration':'10.34',windStatus:'启动',windTurbine:'A-003',standard:false},
+    {windSpeed:'45','power':'10.34','dayGeneration':'10.34',windStatus:'解缆',windTurbine:'A-004',standard:false},
+    {windSpeed:'12','power':'10.34','dayGeneration':'10.34',windStatus:'电网故障停机',windTurbine:'A-005',standard:false},
+    {windSpeed:'10','power':'10.34','dayGeneration':'10.34',windStatus:'维护',windTurbine:'A-006',standard:false}
+])
+
+const getItemClass = (FanList) => {
+    switch (FanList.windStatus) {
+        case '并网':
+            return 'is-primary';
+        case '并网- AGC限功率':
+            return 'is-primary';
+        case '解缆':
+            return 'is-info';
+        case '待机':
+            return 'is-warning';
+        case '故障':
+            return 'is-warning';
+        case '启动':
+            return 'is-success';
+        case '电网故障停机':
+            return 'is-danger';
+        case '风速超限停机':
+            return 'is-danger';
+        case '故障停机':
+            return 'is-danger';
+        case '塔基手动停机':
+            return 'is-danger';
+        case '远程监控停机':
+            return 'is-danger';
+        case 'AGC停机':
+            return 'is-danger';
+        case '集控停机':
+            return 'is-danger';
+        case '小风停机':
+            return 'is-danger';
+        case '维护':
+            return 'is-maintenance';
+        default:
+            return '';
+    }
+    return { FanList, getItemClass };
+};
+
+const rotationDegrees = ref(0)
+const speed = 5; // 设定一个基本旋转速度
+function startRotation(speed) {
+    return setInterval(() => {
+        rotationDegrees.value += 100;
+    }, 100); // 每100毫秒旋转一次
+}
+let intervalId;
+
+
+
+onMounted(() => {
+    // 当组件挂载时开始旋转
+    intervalId = startRotation(speed);
+});
+
+onUnmounted(() => {
+    // 当组件卸载时清除定时器
+    clearInterval(intervalId);
+});
+
+</script>
+
+<style scoped lang="scss">
+    .wind-mark{
+        background-image: linear-gradient(140deg, #FFE3E3 0%, #FFFFFF 93%);
+        border: 1px solid #FFE3E3;
+    }
+    .wind-default{
+        background-image: linear-gradient(180deg, #F0F6FF 0%, #FFFFFF 50%);
+        border: 1px solid #E1EDF6;
+    }
+    .wind-picture{
+        display: none;
+    }
+    .wind-mark-icon{
+        background: #FFFFFF;
+        border: 1px solid #FFE3E3;
+        border-radius: 8px 0 100px 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 40px;
+        height: 40px;
+        vertical-align: middle;
+    }
+
+    .FanList-panel{
+        border-radius: 8px;
+        .fanlist-top{
+            display: flex;
+            width: 100%;
+        }
+        .fanlist-icon{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 40px;
+            height: 40px;
+            vertical-align: middle;
+        }
+        .fanlist-name{
+            width: 100%;
+            margin-top: 5px;
+        }
+        .tag-panel{
+            border-radius: 0 8px 0 0;
+            line-height: 20px;
+        }
+        .is-primary{
+            background: rgba(2,119,179,0.20);
+            border: 1px solid #0277B3;
+            color: #0277B3;
+        }
+        .is-success{
+            background: rgba(6,180,41,0.20);
+            border: 1px solid #06B429;
+            color: #06B429;
+        }
+        .is-info{
+            background: rgba(48,89,236,0.20);
+            border: 1px solid #3059EC;
+            color: #3059EC;
+        }
+        .is-warning{
+            background: rgba(255,126,0,0.20);
+            border: 1px solid #FF7E00;
+            color: #FF7E00;
+        }
+        .is-danger{
+            background: rgba(254,55,49,0.20);
+            border: 1px solid #FE3731;
+            color: #FE3731;
+        }
+        .is-offline{
+            background: rgba(153,153,153,0.20);
+            border: 1px solid #999999;
+            color: #999999;
+        }
+        .is-maintenance{
+            background: rgba(0,160,150,0.20);
+            border: 1px solid #00A096;
+            color: #00A096;
+        }
+        .fanlist-main{
+            width: 100%;
+            display: flex;
+            padding: 10px;
+            text-align: center;
+            .fanlist-pic{
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                margin-top: -10px;
+                .mask{
+                    width: 43px;
+                    height: 38px;
+                }
+            }
+            .fanlist-text{
+                margin-top:30px;
+                .content-number{
+                    color: #333333;
+                    font-size: 20px;
+                }
+
+            }
+            .fanlist-text span{
+                display: inline-block;
+            }
+
+        }
+    }
+</style>
diff --git a/ui/dasadmin/src/views/backend/linkMonitor/index.vue b/ui/dasadmin/src/views/backend/linkMonitor/index.vue
new file mode 100644
index 00000000..a2a79381
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/linkMonitor/index.vue
@@ -0,0 +1,459 @@
+<template>
+    <div class="linkMonitor">
+        <el-container class="containerPart">
+            <el-aside class="asidePart">
+                <el-header class="asideHeader">
+                    <el-input
+                        v-model="searchLinkTreeInputValue"
+                        :suffix-icon="Search"
+                        clearable
+                        @input="debounceSearchLinkTree"
+                        placeholder="搜索"
+                        class="searchLinkTreeInput"
+                    ></el-input>
+                </el-header>
+                <el-main class="treeMain">
+                    <el-tree
+                        ref="linkTreeRef"
+                        node-key="id"
+                        :data="treeData"
+                        @node-click="linkTreeNodeClick"
+                        @node-expand="linkTreeNodeExpand"
+                        @node-collapse="linkTreeNodeCollapse"
+                        :props="LinkTreePropReplace"
+                        class="treePart"
+                        highlight-current
+                        :render-content="renderContent"
+                        :default-expanded-keys="linkTreeNodeExpandKeys"
+                    >
+                        <!-- <template #default="{ node, data }">
+                            <span>{{ node.label }}</span>
+                        </template> -->
+                    </el-tree>
+                </el-main>
+            </el-aside>
+            <el-container class="mainContainer">
+                <el-header class="mainHeader">
+                    <div class="mainHeaderCenter">
+                        <el-input clearable placeholder="请输入链路名称" class="linkMonitorInput" v-model="linkMonitorInputValue"></el-input>
+                        <el-button :icon="Search" type="primary" @click="searchLinkMonitor">查询</el-button>
+                    </div>
+                </el-header>
+                <el-main class="mainMain">
+                    <div class="tabsPart">
+                        <el-table :data="linkMonitorTableData" class="tablePart" highlight-current-row>
+                            <el-table-column prop="linkName" :label="LinkMonitorFieldsEnums['linkName']" align="left"> </el-table-column>
+                            <el-table-column prop="status" :label="LinkMonitorFieldsEnums['status']" align="center" width="80">
+                                <template #default="scope">
+                                    <div class="status-container">
+                                        <span
+                                            :class="{
+                                                'status-dot-online': !scope.row.status,
+                                                'status-dot-offline': scope.row.status,
+                                            }"
+                                        ></span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="protocolName" :label="LinkMonitorFieldsEnums['protocolName']" align="center">
+                                <template #default="scope"> </template>
+                            </el-table-column>
+                            <!-- <el-table-column prop="remoteRegulation" :label="LinkMonitorFieldsEnums['remoteRegulation']" align="center">
+                                <template #default="scope">
+                                    <span style="cursor: pointer; color: #0064aa; font-weight: 600">查看参数</span>
+                                </template>
+                            </el-table-column> -->
+                            <el-table-column label="操作" width="200" align="center">
+                                <template #default="scope">
+                                    <div class="tableOperate">
+                                        <a @click="opneLog(scope.row)">日志</a>
+                                        <a>|</a>
+                                        <a @click="startLink(scope.row)">启动</a>
+                                        <a>|</a>
+                                        <el-popconfirm title="确定停止么？" @confirm="stopLink(scope.row)">
+                                            <template #reference>
+                                                <a style="color: red">停止</a>
+                                            </template>
+                                        </el-popconfirm>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div class="mainFooter">
+                        <el-pagination
+                            v-model:current-page="paginationOptions.current"
+                            v-model:page-size="paginationOptions.pageSize"
+                            :total="paginationOptions.total"
+                            :page-sizes="paginationOptions.pageSizes"
+                            background
+                            :pager-count="7"
+                            layout="prev, pager, next, jumper,sizes,total"
+                            @change="getcurrentPage"
+                        ></el-pagination>
+                    </div>
+                </el-main>
+            </el-container>
+        </el-container>
+        <el-dialog v-model="linkLogVisible" title="日志" @close="closeLinklog" :width="900">
+            <template #footer> </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, nextTick } from 'vue'
+import { ElContainer, ElAside, ElHeader, ElMain, ElTree, ElInput, ElMessage, ElButton, ElTable, TreeInstance } from 'element-plus'
+import { Search } from '@element-plus/icons-vue'
+import { LinkMonitorFieldsEnums, LinkMonitorTreeType, LinkMonitorTableType } from './type'
+import { getNodeListReq, getLinkListReq } from '/@/api/backend/linkMonitor/request'
+import { debounce, cloneDeep } from 'lodash'
+
+const LinkTreePropReplace = {
+    label: 'nodeName',
+    children: 'children',
+}
+const linkTreeRef = ref<TreeInstance>()
+const treeData = ref<LinkMonitorTreeType[]>([])
+const originTreeData = ref<LinkMonitorTreeType[]>([])
+const curContextMenuTreeData = ref<LinkMonitorTreeType>()
+const searchLinkTreeInputValue = ref('')
+const getlinkTreeList = () => {
+    return new Promise((resolve) => {
+        getNodeListReq()
+            .then((res) => {
+                if (res.success) {
+                    originTreeData.value = res.data!
+                    treeData.value = res.data!
+                    // originTreeData.value = res.data!
+                    // const other = [
+                    //     {
+                    //         id: '5555',
+                    //         nodeName: '鱼丸吃人111112222222222222222222222222222222',
+                    //         nodeIp: '',
+                    //         orgName: '',
+                    //         orgId: '',
+                    //         revision: 0,
+                    //         children: [
+                    //             {
+                    //                 id: '1111',
+                    //                 nodeName: '鱼丸吃人22222',
+                    //                 nodeIp: '',
+                    //                 orgName: '',
+                    //                 orgId: '',
+                    //                 revision: 0,
+                    //                 children: [],
+                    //             },
+                    //         ],
+                    //     },
+                    // ]
+                    // originTreeData.value[0].children = [...other]
+                    // originTreeData.value[1] = {
+                    //     id: '55654',
+                    //     nodeName: '鱼丸吃人33',
+                    //     nodeIp: '',
+                    //     orgName: '',
+                    //     orgId: '',
+                    //     revision: 0,
+                    //     children: [
+                    //         {
+                    //             id: '324232',
+                    //             nodeName: '鱼丸吃人11',
+                    //             nodeIp: '',
+                    //             orgName: '',
+                    //             orgId: '',
+                    //             revision: 0,
+                    //             children: [],
+                    //         },
+                    //     ],
+                    // }
+                    // const tree: LinkMonitorTreeType[] = [...originTreeData.value]
+                    // treeData.value = tree
+
+                    resolve(res.data![0])
+                } else {
+                    ElMessage.error(res.msg)
+                }
+            })
+            .catch((err) => {
+                ElMessage.error(err?.response?.data?.msg ?? '查询失败')
+            })
+    })
+}
+
+getlinkTreeList().then((res) => {
+    curContextMenuTreeData.value = cloneDeep(res as LinkMonitorTreeType)
+    linkTreeRef.value?.setCurrentKey(curContextMenuTreeData.value!.id!)
+    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+})
+
+const searchLinkTree = () => {
+    if (searchLinkTreeInputValue.value === '') {
+        treeData.value = originTreeData.value
+        nextTick(() => {
+            linkTreeRef.value?.setCurrentKey(curContextMenuTreeData.value!.id!)
+        })
+        return
+    }
+    treeData.value = filterAndHighlightTreeArray(cloneDeep(originTreeData.value), searchLinkTreeInputValue.value) as LinkMonitorTreeType[]
+    linkTreeNodeExpandKeys.value = Array.from(new Set([...linkTreeNodeExpandKeys.value, ...getAllIds(treeData.value)]))
+    nextTick(() => {
+        linkTreeRef.value?.setCurrentKey(curContextMenuTreeData.value!.id!)
+    })
+}
+const getAllIds = (nodes: LinkMonitorTreeType[]) => {
+    let ids: any = []
+    nodes.forEach((node) => {
+        ids.push(node.id)
+        if (node.children && node.children.length > 0) {
+            ids = ids.concat(getAllIds(node.children))
+        }
+    })
+    return ids
+}
+const filterAndHighlightTreeArray = (treeArray: LinkMonitorTreeType[], searchQuery: string) => {
+    return treeArray.map((tree: LinkMonitorTreeType) => filterAndHighlightTree(tree, searchQuery)).filter(Boolean)
+}
+const filterAndHighlightTree = (tree: LinkMonitorTreeType, searchQuery: string): (LinkMonitorTreeType & { isMatch?: boolean }) | null => {
+    const isMatch = tree.nodeName.toLowerCase().includes(searchQuery.toLowerCase())
+    if (isMatch) {
+        return {
+            ...tree,
+            children: tree?.children?.map((child) => filterAndHighlightTree(child, searchQuery)).filter(Boolean) as LinkMonitorTreeType[],
+            isMatch: true,
+        }
+    }
+    if (tree.children && tree.children.length > 0) {
+        const filteredChildren = tree.children.map((child) => filterAndHighlightTree(child, searchQuery)).filter(Boolean) as LinkMonitorTreeType[]
+
+        if (filteredChildren.length > 0) {
+            return { ...tree, children: filteredChildren }
+        }
+    }
+    return null
+}
+
+const debounceSearchLinkTree = debounce(searchLinkTree, 200)
+
+const linkTreeNodeExpandKeys = ref([] as any)
+const linkTreeNodeExpand = (node: any) => {
+    if (!linkTreeNodeExpandKeys.value.includes(node.id)) {
+        linkTreeNodeExpandKeys.value.push(node.id)
+    }
+}
+const linkTreeNodeCollapse = (node: any) => {
+    const index = linkTreeNodeExpandKeys.value.indexOf(node.id)
+    if (index > -1) {
+        linkTreeNodeExpandKeys.value.splice(index, 1)
+    }
+}
+const linkTreeNodeClick = (target: LinkMonitorTreeType) => {
+    curContextMenuTreeData.value = cloneDeep(target)
+    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+}
+const renderContent = (h: any, { node, data }: any) => {
+    const label = node.label || ''
+    const searchTerm = searchLinkTreeInputValue.value.toLowerCase()
+    const startIndex = label.toLowerCase().indexOf(searchTerm)
+    if (startIndex === -1) {
+        return h('span', {}, label)
+    }
+    const beforeMatch = label.substring(0, startIndex)
+    const matchText = label.substring(startIndex, startIndex + searchLinkTreeInputValue.value.length)
+    const afterMatch = label.substring(startIndex + searchLinkTreeInputValue.value.length)
+    return h('span', {}, [beforeMatch, h('span', { style: { color: '#f14c4c', fontWeight: 'bold' } }, matchText), afterMatch])
+}
+const linkMonitorInputValue = ref('')
+const searchLinkMonitor = () => {
+    if (linkMonitorInputValue.value === '') {
+        getlinkMonitorList(curContextMenuTreeData.value!.id!)
+        return
+    }
+    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+}
+
+const linkMonitorTableData = ref<LinkMonitorTableType[]>([])
+
+// 链路监视列表
+const paginationOptions = reactive({
+    current: 1,
+    pageSize: 10,
+    total: 0,
+    pageSizes: [10, 20, 30],
+})
+const getcurrentPage = () => {
+    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+}
+const protocolList = [
+    { label: 'IEC104主 *', value: 8 },
+    { label: 'IEC104从 *', value: 9 },
+    { label: 'MODBUSRTU主 *', value: 12 },
+    { label: 'MODBUSTCP主 *', value: 16 },
+]
+const getlinkMonitorList = (nodeId: string, linkName?: string) => {
+    getLinkListReq({ nodeId, linkName, pageNum: paginationOptions.current, pageSize: paginationOptions.pageSize })
+        .then((res) => {
+            if (res.rows) {
+                linkMonitorTableData.value = res.rows.map((item) => {
+                    return {
+                        ...item,
+                        protocolName: protocolList.find((i) => i.value === item.protocol)?.label,
+                    }
+                })
+                paginationOptions.total = res.total
+            } else {
+                ElMessage.error(res.msg ?? '查询失败')
+            }
+        })
+        .catch((err) => {
+            ElMessage.error(err?.response?.data?.msg ?? '查询失败')
+        })
+}
+
+const linkLogVisible = ref(false)
+const closeLinklog = () => {
+    linkLogVisible.value = false
+}
+const opneLog = (val: LinkMonitorTableType) => {
+    // linkLogVisible.value = true
+}
+const startLink = (val: LinkMonitorTableType) => {
+    console.log('startLink')
+}
+const stopLink = (val: LinkMonitorTableType) => {
+    console.log('stopLink')
+}
+</script>
+
+<style lang="scss" scoped>
+$headerHeight: 60px;
+$defaultBackgroundColor: #fff;
+$defaultAsideWidth: 260px;
+$paginationHeight: 32px;
+.linkMonitor {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    .containerPart {
+        width: 100%;
+        height: 100%;
+        .asidePart {
+            width: $defaultAsideWidth;
+            height: 100%;
+            border-right: 1px solid #eaebed;
+            .asideHeader {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                .searchLinkTreeInput {
+                    height: 40px;
+                }
+            }
+            .treeMain {
+                height: calc(100% - $headerHeight);
+                overflow-y: auto;
+
+                .treePart {
+                    min-width: 100%;
+                    overflow: auto;
+                    display: inline-block;
+                    background-color: $defaultBackgroundColor;
+                }
+            }
+        }
+        .mainContainer {
+            width: calc(100% - $defaultAsideWidth);
+            height: 100%;
+            .mainHeader {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                height: $headerHeight;
+                padding: 0 20px;
+                border-bottom: 1px solid #eaebed;
+                .linkMonitorInput {
+                    height: 40px;
+                    width: 220px;
+                }
+                .mainHeaderCenter {
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    width: 320px;
+                }
+            }
+            .mainMain {
+                height: calc(100% - $headerHeight);
+                .tabsPart {
+                    height: calc(100% - $paginationHeight);
+                    padding-bottom: 5px;
+                    :deep(.el-tabs__content) {
+                        height: calc(100% - 55px);
+                        .el-tab-pane {
+                            height: 100%;
+                        }
+                    }
+                    .tablePart {
+                        height: 100%;
+                    }
+                    .tableOperate {
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+                        a {
+                            margin: 5px;
+                            color: #0064aa;
+                            font-weight: 600;
+                            &:hover {
+                                cursor: pointer;
+                            }
+                        }
+                    }
+                }
+                .mainFooter {
+                    display: flex;
+                    justify-content: right;
+                    background-color: #fff;
+                }
+            }
+        }
+    }
+    .modelOperate {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+        width: 80px;
+        height: 150px;
+        .el-button {
+            margin: 0;
+        }
+    }
+}
+
+// 状态
+.status-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.status-dot-online,
+.status-dot-offline {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+}
+
+.status-dot-online {
+    background-color: #06b429;
+}
+
+.status-dot-offline {
+    background-color: red;
+}
+.highlight {
+    background-color: yellow; /* 高亮背景颜色 */
+    color: red; /* 字体颜色 */
+    font-weight: bold; /* 加粗字体 */
+}
+</style>
diff --git a/ui/dasadmin/src/views/backend/linkMonitor/type.ts b/ui/dasadmin/src/views/backend/linkMonitor/type.ts
new file mode 100644
index 00000000..74d87393
--- /dev/null
+++ b/ui/dasadmin/src/views/backend/linkMonitor/type.ts
@@ -0,0 +1,45 @@
+export type RequestReturnType<T = never> = Promise<{
+    code: number
+    msg: string
+    success: boolean
+    data?: T
+}>
+
+export type RequestReturnRowType<T = never> = Promise<{
+    code: number
+    msg: string
+    rows: T
+    total: number
+}>
+export type LinkMonitorTreeType = {
+    id?: string
+    nodeName: string
+    nodeIp: string
+    orgName?: string
+    orgId: string
+    revision?: number
+    children?: LinkMonitorTreeType[]
+}
+export type LinkMonitorTableType = {
+    id?: string
+    linkName: string
+    protocol?: number
+    protocolName?: string
+    params: string
+    nodeName: string
+    nodeId: string
+    revision: number
+}
+export type GetLinkMonitorTableParam = {
+    nodeId: string
+    linkName?: string
+    pageNum: number
+    pageSize: number
+}
+
+export enum LinkMonitorFieldsEnums {
+    'id' = 'id',
+    'linkName' = '链路名称',
+    'status' = '状态',
+    'protocolName' = '协议类型',
+}
diff --git a/ui/dasadmin/src/views/backend/login.vue b/ui/dasadmin/src/views/backend/login.vue
index a45b14c1..9c890874 100644
--- a/ui/dasadmin/src/views/backend/login.vue
+++ b/ui/dasadmin/src/views/backend/login.vue
@@ -103,7 +103,8 @@ let timer: number
 
 const config = useConfig()
 const adminInfo = useAdminInfo()
-toggleDark(config.layout.isDark)
+
+// TODO 切换暗黑 toggleDark(config.layout.isDark)
 
 const formRef = ref<FormInstance>()
 const usernameRef = ref<InputInstance>()
diff --git a/ui/dasadmin/src/views/backend/node/index.vue b/ui/dasadmin/src/views/backend/node/index.vue
index bd6211cb..7093f10b 100644
--- a/ui/dasadmin/src/views/backend/node/index.vue
+++ b/ui/dasadmin/src/views/backend/node/index.vue
@@ -484,7 +484,7 @@ const submitLinkForm = () => {
 
 const paginationOptions = reactive({
     current: 1,
-    pageSize: 10,
+    pageSize: 20,
     total: 0,
     pageSizes: [10, 20, 30],
 })
diff --git a/ui/dasadmin/vite.config.ts.timestamp-1721615163299-e1531267e82f8.mjs b/ui/dasadmin/vite.config.ts.timestamp-1721615163299-e1531267e82f8.mjs
deleted file mode 100644
index c5c5ce65..00000000
--- a/ui/dasadmin/vite.config.ts.timestamp-1721615163299-e1531267e82f8.mjs
+++ /dev/null
@@ -1,177 +0,0 @@
-// vite.config.ts
-import vue from "file:///E:/softstoneFile/ry-das/ui/dasadmin/node_modules/@vitejs/plugin-vue/dist/index.mjs";
-import { resolve } from "path";
-import { loadEnv } from "file:///E:/softstoneFile/ry-das/ui/dasadmin/node_modules/vite/dist/node/index.js";
-
-// src/utils/vite.ts
-var customHotUpdate = () => {
-  const closeHmr = /* @__PURE__ */ new Map();
-  return {
-    name: "vite-plugin-custom-hot-update",
-    configureServer(server) {
-      server.ws.on("custom:close-hot", (data) => {
-        closeHmr.set(data.type, true);
-        server.watcher.removeAllListeners("add");
-        server.watcher.removeAllListeners("unlink");
-      });
-      server.ws.on("custom:open-hot", (data) => {
-        closeHmr.set(data.type, false);
-        server.watcher.on("add", () => {
-          server.restart();
-        });
-        server.watcher.on("unlink", () => {
-          server.restart();
-        });
-      });
-      server.ws.on("custom:reload-hot", () => {
-        server.restart();
-      });
-    },
-    handleHotUpdate() {
-      const closeHmrs = Array.from(closeHmr.values());
-      let closeHmrsBool = false;
-      for (const key in closeHmrs) {
-        closeHmrsBool = closeHmrsBool || closeHmrs[key];
-      }
-      if (closeHmrsBool)
-        return [];
-    }
-  };
-};
-
-// src/components/icon/svg/index.ts
-import { readFileSync, readdirSync } from "fs";
-var idPerfix = "";
-var iconNames = [];
-var svgTitle = /<svg([^>+].*?)>/;
-var clearHeightWidth = /(width|height)="([^>+].*?)"/g;
-var hasViewBox = /(viewBox="[^>+].*?")/g;
-var clearReturn = /(\r)|(\n)/g;
-var clearFill = /(fill="[^>+].*?")/g;
-function findSvgFile(dir) {
-  const svgRes = [];
-  const dirents = readdirSync(dir, {
-    withFileTypes: true
-  });
-  for (const dirent of dirents) {
-    iconNames.push(`${idPerfix}-${dirent.name.replace(".svg", "")}`);
-    if (dirent.isDirectory()) {
-      svgRes.push(...findSvgFile(dir + dirent.name + "/"));
-    } else {
-      const svg = readFileSync(dir + dirent.name).toString().replace(clearReturn, "").replace(clearFill, 'fill=""').replace(svgTitle, ($1, $2) => {
-        let width = 0;
-        let height = 0;
-        let content = $2.replace(clearHeightWidth, (s1, s2, s3) => {
-          if (s2 === "width") {
-            width = s3;
-          } else if (s2 === "height") {
-            height = s3;
-          }
-          return "";
-        });
-        if (!hasViewBox.test($2)) {
-          content += `viewBox="0 0 ${width} ${height}"`;
-        }
-        return `<symbol id="${idPerfix}-${dirent.name.replace(".svg", "")}" ${content}>`;
-      }).replace("</svg>", "</symbol>");
-      svgRes.push(svg);
-    }
-  }
-  return svgRes;
-}
-var svgBuilder = (path, perfix = "local") => {
-  if (path === "")
-    return;
-  idPerfix = perfix;
-  const res = findSvgFile(path);
-  return {
-    name: "svg-transform",
-    transformIndexHtml(html) {
-      return html.replace(
-        "<body>",
-        `
-                <body>
-                <svg id="local-icon" data-icon-name="${iconNames.join(
-          ","
-        )}" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position: absolute; width: 0; height: 0">
-                ${res.join("")}
-                </svg>
-                `
-      );
-    }
-  };
-};
-
-// vite.config.ts
-var __vite_injected_original_dirname = "E:\\softstoneFile\\ry-das\\ui\\dasadmin";
-var pathResolve = (dir) => {
-  return resolve(__vite_injected_original_dirname, ".", dir);
-};
-var viteConfig = ({ mode }) => {
-  const { VITE_PORT, VITE_OPEN, VITE_BASE_PATH, VITE_OUT_DIR, VITE_APP_PROXY } = loadEnv(mode, process.cwd());
-  const alias = {
-    "/@": pathResolve("./src/"),
-    assets: pathResolve("./src/assets"),
-    "vue-i18n": "vue-i18n/dist/vue-i18n.cjs.js"
-  };
-  const createProxy = (proxyList) => {
-    const ret = {};
-    if (proxyList) {
-      proxyList = JSON.parse(proxyList);
-      for (const [prefix, target] of proxyList) {
-        ret[prefix] = {
-          target,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(new RegExp(`^${prefix}`), "")
-        };
-      }
-    }
-    return ret;
-  };
-  return {
-    plugins: [vue(), svgBuilder("./src/assets/icons/"), customHotUpdate()],
-    root: process.cwd(),
-    resolve: { alias },
-    base: VITE_BASE_PATH,
-    server: {
-      port: parseInt(VITE_PORT),
-      open: VITE_OPEN != "false",
-      proxy: {
-        ...createProxy(VITE_APP_PROXY)
-      }
-    },
-    build: {
-      cssCodeSplit: false,
-      sourcemap: false,
-      outDir: VITE_OUT_DIR,
-      emptyOutDir: true,
-      chunkSizeWarningLimit: 1500,
-      terserOptions: {
-        compress: {
-          keep_infinity: true,
-          // Used to delete console in production environment
-          drop_console: true,
-          drop_debugger: true
-        },
-        output: {
-          comments: true
-          // 去掉注释内容
-        }
-      },
-      rollupOptions: {
-        output: {
-          manualChunks: {
-            // 分包配置，配置完成自动按需加载
-            vue: ["vue", "vue-router", "pinia", "vue-i18n", "element-plus"],
-            echarts: ["echarts"]
-          }
-        }
-      }
-    }
-  };
-};
-var vite_config_default = viteConfig;
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "src/utils/vite.ts", "src/components/icon/svg/index.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\softstoneFile\\\\ry-das\\\\ui\\\\dasadmin\";const __vite_injected_original_filename = \"E:\\\\softstoneFile\\\\ry-das\\\\ui\\\\dasadmin\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/softstoneFile/ry-das/ui/dasadmin/vite.config.ts\";import vue from '@vitejs/plugin-vue'\r\nimport { resolve } from 'path'\r\nimport { loadEnv } from 'vite'\r\nimport type { UserConfig, ConfigEnv, ProxyOptions } from 'vite'\r\nimport { isProd, customHotUpdate } from '/@/utils/vite'\r\nimport { svgBuilder } from '/@/components/icon/svg/index'\r\n\r\nconst pathResolve = (dir: string): any => {\r\n    return resolve(__dirname, '.', dir)\r\n}\r\n\r\n// https://vitejs.cn/config/\r\nconst viteConfig = ({ mode }: ConfigEnv): UserConfig => {\r\n    const { VITE_PORT, VITE_OPEN, VITE_BASE_PATH, VITE_OUT_DIR, VITE_APP_PROXY } = loadEnv(mode, process.cwd())\r\n\r\n    const alias: Record<string, string> = {\r\n        '/@': pathResolve('./src/'),\r\n        assets: pathResolve('./src/assets'),\r\n        'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js',\r\n    }\r\n\r\n    const createProxy = (proxyList: any) => {\r\n        const ret = {} as Record<string, ProxyOptions>\r\n        if (proxyList) {\r\n            proxyList = JSON.parse(proxyList)\r\n            for (const [prefix, target] of proxyList) {\r\n                ret[prefix] = {\r\n                    target: target,\r\n                    changeOrigin: true,\r\n                    rewrite: (path) => path.replace(new RegExp(`^${prefix}`), ''),\r\n                }\r\n            }\r\n        }\r\n\r\n        return ret\r\n    }\r\n\r\n    // let proxy: Record<string, string | ProxyOptions> = {}\r\n    // if (VITE_PROXY_URL) {\r\n    //     proxy = {\r\n    //         '/': {\r\n    //             target: VITE_PROXY_URL,\r\n    //             changeOrigin: true,\r\n    //         },\r\n    //     }\r\n    // }\r\n\r\n    return {\r\n        plugins: [vue(), svgBuilder('./src/assets/icons/'), customHotUpdate()],\r\n        root: process.cwd(),\r\n        resolve: { alias },\r\n        base: VITE_BASE_PATH,\r\n        server: {\r\n            port: parseInt(VITE_PORT),\r\n            open: VITE_OPEN != 'false',\r\n            proxy: {\r\n                ...createProxy(VITE_APP_PROXY),\r\n            },\r\n        },\r\n        build: {\r\n            cssCodeSplit: false,\r\n            sourcemap: false,\r\n            outDir: VITE_OUT_DIR,\r\n            emptyOutDir: true,\r\n            chunkSizeWarningLimit: 1500,\r\n            terserOptions: {\r\n                compress: {\r\n                    keep_infinity: true,\r\n                    // Used to delete console in production environment\r\n                    drop_console: true,\r\n                    drop_debugger: true,\r\n                },\r\n                output: {\r\n                    comments: true, // \u53BB\u6389\u6CE8\u91CA\u5185\u5BB9\r\n                },\r\n            },\r\n            rollupOptions: {\r\n                output: {\r\n                    manualChunks: {\r\n                        // \u5206\u5305\u914D\u7F6E\uFF0C\u914D\u7F6E\u5B8C\u6210\u81EA\u52A8\u6309\u9700\u52A0\u8F7D\r\n                        vue: ['vue', 'vue-router', 'pinia', 'vue-i18n', 'element-plus'],\r\n                        echarts: ['echarts'],\r\n                    },\r\n                },\r\n            },\r\n        },\r\n    }\r\n}\r\n\r\nexport default viteConfig\r\n", "const __vite_injected_original_dirname = \"E:\\\\softstoneFile\\\\ry-das\\\\ui\\\\dasadmin\\\\src\\\\utils\";const __vite_injected_original_filename = \"E:\\\\softstoneFile\\\\ry-das\\\\ui\\\\dasadmin\\\\src\\\\utils\\\\vite.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/softstoneFile/ry-das/ui/dasadmin/src/utils/vite.ts\";import { Plugin } from 'vite'\r\n\r\n/**\r\n * \u662F\u5426\u5728\u5F00\u53D1\u73AF\u5883\r\n */\r\nexport function isDev(mode: string): boolean {\r\n    return mode === 'development'\r\n}\r\n\r\n/**\r\n * \u662F\u5426\u5728\u751F\u4EA7\u73AF\u5883\r\n */\r\nexport function isProd(mode: string | undefined): boolean {\r\n    return mode === 'production'\r\n}\r\n\r\n/**\r\n * \u81EA\u5B9A\u4E49\u70ED\u66F4\u65B0\u5904\u7406\u63D2\u4EF6\r\n */\r\nexport const customHotUpdate = (): Plugin => {\r\n    const closeHmr = new Map<string, boolean>()\r\n\r\n    return {\r\n        name: 'vite-plugin-custom-hot-update',\r\n        configureServer(server) {\r\n            server.ws.on('custom:close-hot', (data) => {\r\n                closeHmr.set(data.type, true)\r\n\r\n                // \u5173\u95ED\u6587\u4EF6\u6DFB\u52A0\u548C\u5220\u9664\u7684\u76D1\u542C\r\n                server.watcher.removeAllListeners('add')\r\n                server.watcher.removeAllListeners('unlink')\r\n            })\r\n            server.ws.on('custom:open-hot', (data) => {\r\n                closeHmr.set(data.type, false)\r\n\r\n                server.watcher.on('add', () => {\r\n                    server.restart()\r\n                })\r\n                server.watcher.on('unlink', () => {\r\n                    server.restart()\r\n                })\r\n            })\r\n            server.ws.on('custom:reload-hot', () => {\r\n                server.restart()\r\n            })\r\n        },\r\n        handleHotUpdate() {\r\n            const closeHmrs = Array.from(closeHmr.values())\r\n            let closeHmrsBool = false\r\n            for (const key in closeHmrs) {\r\n                closeHmrsBool = closeHmrsBool || closeHmrs[key]\r\n            }\r\n            if (closeHmrsBool) return []\r\n        },\r\n    }\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\softstoneFile\\\\ry-das\\\\ui\\\\dasadmin\\\\src\\\\components\\\\icon\\\\svg\";const __vite_injected_original_filename = \"E:\\\\softstoneFile\\\\ry-das\\\\ui\\\\dasadmin\\\\src\\\\components\\\\icon\\\\svg\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/softstoneFile/ry-das/ui/dasadmin/src/components/icon/svg/index.ts\";import { readFileSync, readdirSync } from 'fs'\r\n\r\nlet idPerfix = ''\r\nconst iconNames: string[] = []\r\nconst svgTitle = /<svg([^>+].*?)>/\r\nconst clearHeightWidth = /(width|height)=\"([^>+].*?)\"/g\r\nconst hasViewBox = /(viewBox=\"[^>+].*?\")/g\r\nconst clearReturn = /(\\r)|(\\n)/g\r\n// \u6E05\u7406 svg \u7684 fill\r\nconst clearFill = /(fill=\"[^>+].*?\")/g\r\n\r\nfunction findSvgFile(dir: string): string[] {\r\n    const svgRes = []\r\n    const dirents = readdirSync(dir, {\r\n        withFileTypes: true,\r\n    })\r\n    for (const dirent of dirents) {\r\n        iconNames.push(`${idPerfix}-${dirent.name.replace('.svg', '')}`)\r\n        if (dirent.isDirectory()) {\r\n            svgRes.push(...findSvgFile(dir + dirent.name + '/'))\r\n        } else {\r\n            const svg = readFileSync(dir + dirent.name)\r\n                .toString()\r\n                .replace(clearReturn, '')\r\n                .replace(clearFill, 'fill=\"\"')\r\n                .replace(svgTitle, ($1, $2) => {\r\n                    let width = 0\r\n                    let height = 0\r\n                    let content = $2.replace(clearHeightWidth, (s1: string, s2: string, s3: number) => {\r\n                        if (s2 === 'width') {\r\n                            width = s3\r\n                        } else if (s2 === 'height') {\r\n                            height = s3\r\n                        }\r\n                        return ''\r\n                    })\r\n                    if (!hasViewBox.test($2)) {\r\n                        content += `viewBox=\"0 0 ${width} ${height}\"`\r\n                    }\r\n                    return `<symbol id=\"${idPerfix}-${dirent.name.replace('.svg', '')}\" ${content}>`\r\n                })\r\n                .replace('</svg>', '</symbol>')\r\n            svgRes.push(svg)\r\n        }\r\n    }\r\n    return svgRes\r\n}\r\n\r\nexport const svgBuilder = (path: string, perfix = 'local') => {\r\n    if (path === '') return\r\n    idPerfix = perfix\r\n    const res = findSvgFile(path)\r\n    return {\r\n        name: 'svg-transform',\r\n        transformIndexHtml(html: string) {\r\n            /* eslint-disable */\r\n            return html.replace(\r\n                '<body>',\r\n                `\r\n                <body>\r\n                <svg id=\"local-icon\" data-icon-name=\"${iconNames.join(\r\n                    ','\r\n                )}\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"position: absolute; width: 0; height: 0\">\r\n                ${res.join('')}\r\n                </svg>\r\n                `\r\n            )\r\n            /* eslint-enable */\r\n        },\r\n    }\r\n}\r\n"],
  "mappings": ";AAAqS,OAAO,SAAS;AACrT,SAAS,eAAe;AACxB,SAAS,eAAe;;;ACiBjB,IAAM,kBAAkB,MAAc;AACzC,QAAM,WAAW,oBAAI,IAAqB;AAE1C,SAAO;AAAA,IACH,MAAM;AAAA,IACN,gBAAgB,QAAQ;AACpB,aAAO,GAAG,GAAG,oBAAoB,CAAC,SAAS;AACvC,iBAAS,IAAI,KAAK,MAAM,IAAI;AAG5B,eAAO,QAAQ,mBAAmB,KAAK;AACvC,eAAO,QAAQ,mBAAmB,QAAQ;AAAA,MAC9C,CAAC;AACD,aAAO,GAAG,GAAG,mBAAmB,CAAC,SAAS;AACtC,iBAAS,IAAI,KAAK,MAAM,KAAK;AAE7B,eAAO,QAAQ,GAAG,OAAO,MAAM;AAC3B,iBAAO,QAAQ;AAAA,QACnB,CAAC;AACD,eAAO,QAAQ,GAAG,UAAU,MAAM;AAC9B,iBAAO,QAAQ;AAAA,QACnB,CAAC;AAAA,MACL,CAAC;AACD,aAAO,GAAG,GAAG,qBAAqB,MAAM;AACpC,eAAO,QAAQ;AAAA,MACnB,CAAC;AAAA,IACL;AAAA,IACA,kBAAkB;AACd,YAAM,YAAY,MAAM,KAAK,SAAS,OAAO,CAAC;AAC9C,UAAI,gBAAgB;AACpB,iBAAW,OAAO,WAAW;AACzB,wBAAgB,iBAAiB,UAAU,GAAG;AAAA,MAClD;AACA,UAAI;AAAe,eAAO,CAAC;AAAA,IAC/B;AAAA,EACJ;AACJ;;;ACvDyW,SAAS,cAAc,mBAAmB;AAEnZ,IAAI,WAAW;AACf,IAAM,YAAsB,CAAC;AAC7B,IAAM,WAAW;AACjB,IAAM,mBAAmB;AACzB,IAAM,aAAa;AACnB,IAAM,cAAc;AAEpB,IAAM,YAAY;AAElB,SAAS,YAAY,KAAuB;AACxC,QAAM,SAAS,CAAC;AAChB,QAAM,UAAU,YAAY,KAAK;AAAA,IAC7B,eAAe;AAAA,EACnB,CAAC;AACD,aAAW,UAAU,SAAS;AAC1B,cAAU,KAAK,GAAG,QAAQ,IAAI,OAAO,KAAK,QAAQ,QAAQ,EAAE,CAAC,EAAE;AAC/D,QAAI,OAAO,YAAY,GAAG;AACtB,aAAO,KAAK,GAAG,YAAY,MAAM,OAAO,OAAO,GAAG,CAAC;AAAA,IACvD,OAAO;AACH,YAAM,MAAM,aAAa,MAAM,OAAO,IAAI,EACrC,SAAS,EACT,QAAQ,aAAa,EAAE,EACvB,QAAQ,WAAW,SAAS,EAC5B,QAAQ,UAAU,CAAC,IAAI,OAAO;AAC3B,YAAI,QAAQ;AACZ,YAAI,SAAS;AACb,YAAI,UAAU,GAAG,QAAQ,kBAAkB,CAAC,IAAY,IAAY,OAAe;AAC/E,cAAI,OAAO,SAAS;AAChB,oBAAQ;AAAA,UACZ,WAAW,OAAO,UAAU;AACxB,qBAAS;AAAA,UACb;AACA,iBAAO;AAAA,QACX,CAAC;AACD,YAAI,CAAC,WAAW,KAAK,EAAE,GAAG;AACtB,qBAAW,gBAAgB,KAAK,IAAI,MAAM;AAAA,QAC9C;AACA,eAAO,eAAe,QAAQ,IAAI,OAAO,KAAK,QAAQ,QAAQ,EAAE,CAAC,KAAK,OAAO;AAAA,MACjF,CAAC,EACA,QAAQ,UAAU,WAAW;AAClC,aAAO,KAAK,GAAG;AAAA,IACnB;AAAA,EACJ;AACA,SAAO;AACX;AAEO,IAAM,aAAa,CAAC,MAAc,SAAS,YAAY;AAC1D,MAAI,SAAS;AAAI;AACjB,aAAW;AACX,QAAM,MAAM,YAAY,IAAI;AAC5B,SAAO;AAAA,IACH,MAAM;AAAA,IACN,mBAAmB,MAAc;AAE7B,aAAO,KAAK;AAAA,QACR;AAAA,QACA;AAAA;AAAA,uDAEuC,UAAU;AAAA,UAC7C;AAAA,QACJ,CAAC;AAAA,kBACC,IAAI,KAAK,EAAE,CAAC;AAAA;AAAA;AAAA,MAGlB;AAAA,IAEJ;AAAA,EACJ;AACJ;;;AFtEA,IAAM,mCAAmC;AAOzC,IAAM,cAAc,CAAC,QAAqB;AACtC,SAAO,QAAQ,kCAAW,KAAK,GAAG;AACtC;AAGA,IAAM,aAAa,CAAC,EAAE,KAAK,MAA6B;AACpD,QAAM,EAAE,WAAW,WAAW,gBAAgB,cAAc,eAAe,IAAI,QAAQ,MAAM,QAAQ,IAAI,CAAC;AAE1G,QAAM,QAAgC;AAAA,IAClC,MAAM,YAAY,QAAQ;AAAA,IAC1B,QAAQ,YAAY,cAAc;AAAA,IAClC,YAAY;AAAA,EAChB;AAEA,QAAM,cAAc,CAAC,cAAmB;AACpC,UAAM,MAAM,CAAC;AACb,QAAI,WAAW;AACX,kBAAY,KAAK,MAAM,SAAS;AAChC,iBAAW,CAAC,QAAQ,MAAM,KAAK,WAAW;AACtC,YAAI,MAAM,IAAI;AAAA,UACV;AAAA,UACA,cAAc;AAAA,UACd,SAAS,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,IAAI,MAAM,EAAE,GAAG,EAAE;AAAA,QAChE;AAAA,MACJ;AAAA,IACJ;AAEA,WAAO;AAAA,EACX;AAYA,SAAO;AAAA,IACH,SAAS,CAAC,IAAI,GAAG,WAAW,qBAAqB,GAAG,gBAAgB,CAAC;AAAA,IACrE,MAAM,QAAQ,IAAI;AAAA,IAClB,SAAS,EAAE,MAAM;AAAA,IACjB,MAAM;AAAA,IACN,QAAQ;AAAA,MACJ,MAAM,SAAS,SAAS;AAAA,MACxB,MAAM,aAAa;AAAA,MACnB,OAAO;AAAA,QACH,GAAG,YAAY,cAAc;AAAA,MACjC;AAAA,IACJ;AAAA,IACA,OAAO;AAAA,MACH,cAAc;AAAA,MACd,WAAW;AAAA,MACX,QAAQ;AAAA,MACR,aAAa;AAAA,MACb,uBAAuB;AAAA,MACvB,eAAe;AAAA,QACX,UAAU;AAAA,UACN,eAAe;AAAA;AAAA,UAEf,cAAc;AAAA,UACd,eAAe;AAAA,QACnB;AAAA,QACA,QAAQ;AAAA,UACJ,UAAU;AAAA;AAAA,QACd;AAAA,MACJ;AAAA,MACA,eAAe;AAAA,QACX,QAAQ;AAAA,UACJ,cAAc;AAAA;AAAA,YAEV,KAAK,CAAC,OAAO,cAAc,SAAS,YAAY,cAAc;AAAA,YAC9D,SAAS,CAAC,SAAS;AAAA,UACvB;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ;AAEA,IAAO,sBAAQ;",
  "names": []
}
